Author: baggins Date: Mon Aug 1 12:15:36 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.5 (seems unofficial?)
- libgssapi soname changed
- kcm patch applied
- fix linking with tinfo/ncurses
---- Files affected:
packages/heimdal:
heimdal-krb5config-nosysdirs.patch (1.2 -> 1.3) , heimdal-make.patch (1.6 ->
1.7) , heimdal-ntlm-digest.patch (1.3 -> 1.4) , heimdal-sbindir.patch (1.2 ->
1.3) , heimdal.spec (1.235 -> 1.236)
---- Diffs:
================================================================
Index: packages/heimdal/heimdal-krb5config-nosysdirs.patch
diff -u packages/heimdal/heimdal-krb5config-nosysdirs.patch:1.2
packages/heimdal/heimdal-krb5config-nosysdirs.patch:1.3
--- packages/heimdal/heimdal-krb5config-nosysdirs.patch:1.2 Fri Oct 8
22:47:06 2010
+++ packages/heimdal/heimdal-krb5config-nosysdirs.patch Mon Aug 1 14:15:30 2011
@@ -20,18 +20,20 @@
exit 0
--- heimdal-1.4/cf/test-package.m4.orig 2010-09-13 09:23:34.000000000
+0200
+++ heimdal-1.4/cf/test-package.m4 2010-10-08 20:18:05.375741882 +0200
-@@ -98,18 +98,20 @@
+@@ -98,19 +98,21 @@
found=yes])
fi
if test "$found" = no; then
- ires= lres=
- for i in $header_dirs; do
- CFLAGS="-I$i $save_CFLAGS"
+- m4_ifval([$8],[AC_CHECK_HEADERS([[$8]])])
-
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[ires=$i;break])
+ ires=no lres=no
+ for i in '' $header_dirs; do
+ iopt="${i:+-I$i}"
+ CFLAGS="$iopt $save_CFLAGS"
++ m4_ifval([$8],[AC_CHECK_HEADERS([[$8]])])
+
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[$2]],[[]])],[ires=$iopt;break])
done
- for i in $lib_dirs; do
================================================================
Index: packages/heimdal/heimdal-make.patch
diff -u packages/heimdal/heimdal-make.patch:1.6
packages/heimdal/heimdal-make.patch:1.7
--- packages/heimdal/heimdal-make.patch:1.6 Mon Oct 18 18:22:09 2010
+++ packages/heimdal/heimdal-make.patch Mon Aug 1 14:15:31 2011
@@ -38,51 +38,3 @@
$(libkadm5clnt_la_OBJECTS) $(libkadm5srv_la_OBJECTS):
$(srcdir)/kadm5-protos.h $(srcdir)/kadm5-private.h
proto_opts = -q -R '^(_|kadm5_c_|kadm5_s_|kadm5_log)' -P comment
---- heimdal-1.4/lib/otp/Makefile.am~ 2010-10-02 12:17:36.532815203 +0200
-+++ heimdal-1.4/lib/otp/Makefile.am 2010-10-02 12:29:52.970815205 +0200
-@@ -74,3 +74,5 @@
- strlcpy.c \
- strlwr.c \
- strncasecmp.c
-+
-+EXTRA_DIST = version-script.map
---- /dev/null 2010-10-02 12:15:38.061000000 +0200
-+++ heimdal-1.4/lib/otp/version-script.map 2010-10-02 12:18:06.229815205
+0200
-@@ -0,0 +1,25 @@
-+HEIMDAL_OTP_1.0 {
-+ global:
-+ otp_challenge;
-+ otp_checksum;
-+ otp_db_close;
-+ otp_db_open;
-+ otp_delete;
-+ otp_error;
-+ otp_find_alg;
-+ otp_get;
-+ otp_parse;
-+ otp_parse_altdict;
-+ otp_parse_hex;
-+ otp_parse_stddict;
-+ otp_print_hex;
-+ otp_print_hex_extended;
-+ otp_print_stddict;
-+ otp_print_stddict_extended;
-+ otp_put;
-+ otp_simple_get;
-+ otp_verify_user;
-+ otp_verify_user_1;
-+ local:
-+ *;
-+};
-diff --git a/lib/krb5/version-script.map b/lib/krb5/version-script.map
-index f31620c..39f5146 100644
---- a/lib/krb5/version-script.map
-+++ b/lib/krb5/version-script.map
-@@ -105,6 +105,7 @@ HEIMDAL_KRB5_2.0 {
- krb5_cc_get_type;
- krb5_cc_get_version;
- krb5_cc_initialize;
-+ krb5_cc_last_change_time;
- krb5_cc_move;
- krb5_cc_new_unique;
- krb5_cc_next_cred;
================================================================
Index: packages/heimdal/heimdal-ntlm-digest.patch
diff -u packages/heimdal/heimdal-ntlm-digest.patch:1.3
packages/heimdal/heimdal-ntlm-digest.patch:1.4
--- packages/heimdal/heimdal-ntlm-digest.patch:1.3 Sat Oct 2 11:18:59 2010
+++ packages/heimdal/heimdal-ntlm-digest.patch Mon Aug 1 14:15:31 2011
@@ -2,7 +2,7 @@
+++ heimdal-1.3.1/lib/gssapi/ntlm/accept_sec_context.c 2009-12-09
12:36:21.000000000 +0100
@@ -44,7 +44,24 @@
struct ntlm_server_interface *ns_interface = NULL;
-
+
#ifdef DIGEST
+ krb5_context context = NULL;
+ krb5_error_code ret;
================================================================
Index: packages/heimdal/heimdal-sbindir.patch
diff -u packages/heimdal/heimdal-sbindir.patch:1.2
packages/heimdal/heimdal-sbindir.patch:1.3
--- packages/heimdal/heimdal-sbindir.patch:1.2 Sat Oct 2 11:18:59 2010
+++ packages/heimdal/heimdal-sbindir.patch Mon Aug 1 14:15:31 2011
@@ -159,11 +159,11 @@
@@ -16,7 +16,7 @@
kimpersonate.8
- bin_PROGRAMS = kinit klist kdestroy kgetcred kswitch
+ bin_PROGRAMS = kinit kdestroy kgetcred kcc
-libexec_PROGRAMS = kdigest kimpersonate
+sbin_PROGRAMS = kdigest kimpersonate
- noinst_PROGRAMS = kverify kdecode_ticket generate-requests copy_cred_cache
+ noinst_PROGRAMS = kverify kdecode_ticket generate-requests
diff -ur heimdal-1.3.1/lib/kadm5/Makefile.am
heimdal-1.3.1-sbin/lib/kadm5/Makefile.am
--- heimdal-1.3.1/lib/kadm5/Makefile.am 2009-12-07 17:20:42.696503142
+0100
================================================================
Index: packages/heimdal/heimdal.spec
diff -u packages/heimdal/heimdal.spec:1.235 packages/heimdal/heimdal.spec:1.236
--- packages/heimdal/heimdal.spec:1.235 Mon Aug 1 12:36:17 2011
+++ packages/heimdal/heimdal.spec Mon Aug 1 14:15:31 2011
@@ -8,12 +8,12 @@
Summary: Heimdal implementation of Kerberos V5 system
Summary(pl.UTF-8): Implementacja Heimdal systemu Kerberos V5
Name: heimdal
-Version: 1.4
-Release: 12.1
+Version: 1.5
+Release: 0.1
License: Free
Group: Networking
Source0: http://www.h5l.org/dist/src/%{name}-%{version}.tar.gz
-# Source0-md5: 31d08bbf47a77827fe97ef3f52b4c9c4
+# Source0-md5: f717a9255e9140f18ce4d36728548b72
Source1: %{name}.init
Source2: %{name}-kpasswdd.init
Source3: %{name}-ipropd.init
@@ -37,7 +37,7 @@
Patch9: %{name}-sbindir.patch
Patch10: %{name}-ntlm-digest.patch
Patch11: %{name}-krb5config-nosysdirs.patch
-Patch12: %{name}-kcm.patch
+Patch12: %{name}-tinfo.patch
URL: http://www.h5l.org/
BuildRequires: autoconf >= 2.62
BuildRequires: automake >= 1:1.10.3
@@ -409,6 +409,11 @@
%{__aclocal} -I cf
%{__autoconf}
%{__automake}
+cd lib/libedit
+%{__aclocal}
+%{__autoconf}
+%{__automake}
+cd ../..
%configure \
%if %{with ldap}
--enable-hdb-openldap-module \
@@ -484,8 +489,6 @@
%{__rm} $RPM_BUILD_ROOT%{_libdir}/hdb_ldap.{la,a}
# resolve heimdal-libs/krb5-libs conflict
%{__mv} $RPM_BUILD_ROOT%{_mandir}/man5/{krb5.conf.5,krb5.conf.5h}
-# resolve conflict with gss
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/{gss,gsscmd}
# unpackaged
%{__rm} $RPM_BUILD_ROOT%{_infodir}/dir
@@ -592,10 +595,8 @@
%defattr(644,root,root,755)
%doc ChangeLog NEWS README TODO
%attr(755,root,root) %{_bindir}/afslog
-%attr(755,root,root) %{_bindir}/gsscmd
%attr(755,root,root) %{_bindir}/hxtool
%attr(755,root,root) %{_bindir}/idn-lookup
-%attr(755,root,root) %{_bindir}/kauth
%attr(755,root,root) %{_bindir}/kdestroy
%attr(755,root,root) %{_bindir}/kf
%attr(755,root,root) %{_bindir}/kgetcred
@@ -667,7 +668,7 @@
%attr(755,root,root) /%{_lib}/libasn1.so.*.*.*
%attr(755,root,root) %ghost /%{_lib}/libasn1.so.8
%attr(755,root,root) /%{_lib}/libgssapi.so.*.*.*
-%attr(755,root,root) %ghost /%{_lib}/libgssapi.so.2
+%attr(755,root,root) %ghost /%{_lib}/libgssapi.so.3
%attr(755,root,root) /%{_lib}/libheimntlm.so.*.*.*
%attr(755,root,root) %ghost /%{_lib}/libheimntlm.so.0
%attr(755,root,root) /%{_lib}/libhx509.so.*.*.*
@@ -859,6 +860,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.236 2011/08/01 12:15:31 baggins
+- updated to 1.5 (seems unofficial?)
+- libgssapi soname changed
+- kcm patch applied
+- fix linking with tinfo/ncurses
+
Revision 1.235 2011/08/01 10:36:17 baggins
- moved configs and docs out of libs and into common package so non-users
don't keep useless files
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-krb5config-nosysdirs.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-make.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-ntlm-digest.patch?r1=1.3&r2=1.4&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal-sbindir.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/heimdal/heimdal.spec?r1=1.235&r2=1.236&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
