Hello community,
here is the log from the commit of package krb5-appl for openSUSE:Factory
checked in at Mon May 2 14:27:50 CEST 2011.
--------
--- krb5-appl/krb5-appl.changes 2010-03-04 11:06:47.000000000 +0100
+++ /mounts/work_src_done/STABLE/krb5-appl/krb5-appl.changes 2011-04-29 14:18:18.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Apr 29 13:46:26 CEST 2011 - mc@suse.de
+
+- update to version 1.0.1
+- fix telnet issue (bnc#688281)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
krb5-appl-1.0.tar.bz2
New:
----
krb5-appl-1.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ krb5-appl.spec ++++++
--- /var/tmp/diff_new_pack.H4yDQb/_old 2011-05-02 14:26:26.000000000 +0200
+++ /var/tmp/diff_new_pack.H4yDQb/_new 2011-05-02 14:26:26.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package krb5-appl (Version 1.0)
+# spec file for package krb5-appl
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
# norootforbuild
-%define srcRoot krb5-appl-1.0/
+%define srcRoot krb5-appl-1.0.1/
%define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/
%define krb5docdir %{_defaultdocdir}/krb5
@@ -25,11 +25,11 @@
License: MIT License (or similar)
Url: http://web.mit.edu/kerberos/www/
BuildRequires: bison krb5-devel libcom_err-devel ncurses-devel
-Version: 1.0
+Version: 1.0.1
Release: 1
Summary: MIT Kerberos5 Implementation--Applications
Group: Productivity/Networking/Security
-Source0: krb5-appl-1.0.tar.bz2
+Source0: krb5-appl-1.0.1.tar.bz2
Source1: vendor-files.tar.bz2
Source2: README.Source
Source3: spx.c
++++++ krb5-appl-1.0.tar.bz2 -> krb5-appl-1.0.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-appl-1.0/configure new/krb5-appl-1.0.1/configure
--- old/krb5-appl-1.0/configure 2010-03-03 00:59:12.000000000 +0100
+++ new/krb5-appl-1.0.1/configure 2010-05-22 14:17:15.000000000 +0200
@@ -8840,9 +8840,7 @@
-
-
-for ac_func in line_push logwtmp openpty ptsname revoke rmufile rresvport_af
+for ac_func in line_push ptsname revoke rmufile rresvport_af
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -9330,6 +9328,106 @@
done
+# Check for functions found in libutil.
+old_LIBS="$LIBS"
+LIBS="$UTIL_LIB $LIBS"
+
+
+for ac_func in logwtmp openpty
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+{ echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case declares $ac_func.
+ For example, HP-UX 11i declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer to if __STDC__ is defined, since
+ exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include
+#else
+# include
+#endif
+
+#undef $ac_func
+
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_$ac_func || defined __stub___$ac_func
+choke me
+#endif
+
+int
+main ()
+{
+return $ac_func ();
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ eval "$as_ac_var=no"
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+ac_res=`eval echo '${'$as_ac_var'}'`
+ { echo "$as_me:$LINENO: result: $ac_res" >&5
+echo "${ECHO_T}$ac_res" >&6; }
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+LIBS="$old_LIBS"
+
# Determine which functions to define in libmissing.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-appl-1.0/configure.ac new/krb5-appl-1.0.1/configure.ac
--- old/krb5-appl-1.0/configure.ac 2009-11-21 22:46:39.000000000 +0100
+++ new/krb5-appl-1.0.1/configure.ac 2010-05-22 14:08:50.000000000 +0200
@@ -105,12 +105,18 @@
AC_CHECK_FUNCS(_getpty cgetent getcwd getenv gettosbyname getusershell getutmp)
AC_CHECK_FUNCS(getutmpx grantpt inet_aton initgroups isatty killpg killpg)
-AC_CHECK_FUNCS(line_push logwtmp openpty ptsname revoke rmufile rresvport_af)
+AC_CHECK_FUNCS(line_push ptsname revoke rmufile rresvport_af)
AC_CHECK_FUNCS(seteuid setlogin setpgid setpriority setresuid setreuid)
AC_CHECK_FUNCS(setutent setutsent setutxent strsave tcgetpgrp tcsetpgrp)
AC_CHECK_FUNCS(ttyname unsetenv updwtmp updwtmpx utimes utmpname utmpxname)
AC_CHECK_FUNCS(vhangup vsnprintf waitpid)
+# Check for functions found in libutil.
+old_LIBS="$LIBS"
+LIBS="$UTIL_LIB $LIBS"
+AC_CHECK_FUNCS(logwtmp openpty)
+LIBS="$old_LIBS"
+
# Determine which functions to define in libmissing.
AC_REPLACE_FUNCS(daemon getdtablesize getopt herror parsetos setenv setsid)
AC_REPLACE_FUNCS(strcasecmp strdup strerror strftime strlcpy asprintf)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/krb5-appl-1.0/telnet/libtelnet/kerberos5.c new/krb5-appl-1.0.1/telnet/libtelnet/kerberos5.c
--- old/krb5-appl-1.0/telnet/libtelnet/kerberos5.c 2009-07-08 23:22:07.000000000 +0200
+++ new/krb5-appl-1.0.1/telnet/libtelnet/kerberos5.c 2010-05-22 14:11:26.000000000 +0200
@@ -498,23 +498,28 @@
if (authenticator->checksum) {
char type_check[2];
krb5_checksum *cksum = authenticator->checksum;
- krb5_keyblock *key;
+ krb5_key key;
+ krb5_boolean valid;
+ krb5_data d;
type_check[0] = ap->type;
type_check[1] = ap->way;
- r = krb5_auth_con_getkey(telnet_context, auth_context,
- &key);
+ r = krb5_auth_con_getkey_k(telnet_context, auth_context,
+ &key);
if (r) {
(void) snprintf(errbuf, sizeof(errbuf),
"krb5_auth_con_getkey failed: %s",
error_message(r));
goto errout;
}
- r = krb5_verify_checksum(telnet_context,
- cksum->checksum_type, cksum,
- &type_check, 2, key->contents,
- key->length);
+
+ d.magic = KV5M_DATA;
+ d.data = type_check;
+ d.length = 2;
+ r = krb5_k_verify_checksum(telnet_context, key,
+ cksum->checksum_type,
+ &d, cksum, &valid);
/*
* Note that krb5_verify_checksum() will fail if a pre-
* MIT Kerberos Beta 5 client is attempting to connect
@@ -524,13 +529,12 @@
* checksums (like in klogind). Such an option is not
* present at this time.
*/
- if (r) {
+ if (r != 0 || !valid) {
(void) snprintf(errbuf, sizeof(errbuf),
- "checksum verification failed: %s",
- error_message(r));
+ "checksum verification failed");
goto errout;
}
- krb5_free_keyblock(telnet_context, key);
+ krb5_k_free_key(telnet_context, key);
}
krb5_free_authenticator(telnet_context, authenticator);
if ((ap->way & AUTH_HOW_MASK) == AUTH_HOW_MUTUAL) {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org