From f7981ad0ce32523e4028e8d3c8c078ec1fb4eaac2d37e6933501661a0cf0e087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Lorenzen?= Date: Sat, 7 Jan 2017 23:58:55 +0000 Subject: [PATCH] Accepting request 449141 from home:enzokiel:branches:network OBS-URL: https://build.opensuse.org/request/show/449141 OBS-URL: https://build.opensuse.org/package/show/network/libheimdal?expand=0&rev=9 --- heimdal-1.6rc2-patched.tar.bz2 | 3 - heimdal-7.1.0-patched.tar.bz2 | 3 + heimdal-patched.diff | 211 +++++++++++------------- heimdal-version-script-client.map.patch | 60 ------- libheimdal.changes | 10 ++ libheimdal.spec | 10 +- 6 files changed, 117 insertions(+), 180 deletions(-) delete mode 100644 heimdal-1.6rc2-patched.tar.bz2 create mode 100644 heimdal-7.1.0-patched.tar.bz2 delete mode 100644 heimdal-version-script-client.map.patch diff --git a/heimdal-1.6rc2-patched.tar.bz2 b/heimdal-1.6rc2-patched.tar.bz2 deleted file mode 100644 index d0460f0..0000000 --- a/heimdal-1.6rc2-patched.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c272118da8c4f9581af8d1b0ebfa1855317b8ea34b049ec5290228789de8036a -size 4662363 diff --git a/heimdal-7.1.0-patched.tar.bz2 b/heimdal-7.1.0-patched.tar.bz2 new file mode 100644 index 0000000..7c9dfd3 --- /dev/null +++ b/heimdal-7.1.0-patched.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dc1da4ff8d176c44cda87ba9022a5f1b1e5addfe2db48e148e23e88b45b41754 +size 7448895 diff --git a/heimdal-patched.diff b/heimdal-patched.diff index 356406d..edea0fe 100644 --- a/heimdal-patched.diff +++ b/heimdal-patched.diff @@ -1,15 +1,15 @@ -diff -uNr heimdal-1.6rc2/configure.ac heimdal-1.6rc2-patched/configure.ac ---- heimdal-1.6rc2/configure.ac 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/configure.ac 2015-09-05 09:24:51.370168157 +0200 +diff -uNr heimdal-7.1.0/configure.ac heimdal-7.1.0-patched/configure.ac +--- heimdal-7.1.0/configure.ac 2016-12-20 04:27:06.000000000 +0100 ++++ heimdal-7.1.0-patched/configure.ac 2017-01-07 22:38:34.618849987 +0100 @@ -3,7 +3,6 @@ AC_PREREQ(2.62) test -z "$CFLAGS" && CFLAGS="-g" - AC_INIT([Heimdal],[1.6rc2],[heimdal-bugs@h5l.org]) + AC_INIT([Heimdal],[7.1.0],[https://github.com/heimdal/heimdal/issues]) -AC_CONFIG_SRCDIR([kuser/kinit.c]) AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_MACRO_DIR([cf]) -@@ -604,7 +603,6 @@ +@@ -589,7 +588,6 @@ AM_CONDITIONAL(HEIMDAL_DOCUMENTATION, test "$enable_heimdal_documentation" != no) AC_CONFIG_FILES(Makefile \ @@ -17,7 +17,7 @@ diff -uNr heimdal-1.6rc2/configure.ac heimdal-1.6rc2-patched/configure.ac include/Makefile \ include/gssapi/Makefile \ include/hcrypto/Makefile \ -@@ -629,50 +627,8 @@ +@@ -614,35 +612,8 @@ lib/sqlite/Makefile \ lib/vers/Makefile \ lib/wind/Makefile \ @@ -31,24 +31,9 @@ diff -uNr heimdal-1.6rc2/configure.ac heimdal-1.6rc2-patched/configure.ac - appl/Makefile \ - appl/afsutil/Makefile \ - appl/dbutils/Makefile \ -- appl/ftp/Makefile \ -- appl/ftp/common/Makefile \ -- appl/ftp/ftp/Makefile \ -- appl/ftp/ftpd/Makefile \ - appl/gssmask/Makefile \ -- appl/kx/Makefile \ -- appl/login/Makefile \ - appl/otp/Makefile \ -- appl/popper/Makefile \ -- appl/push/Makefile \ -- appl/rsh/Makefile \ -- appl/rcp/Makefile \ - appl/su/Makefile \ -- appl/xnlock/Makefile \ -- appl/telnet/Makefile \ -- appl/telnet/libtelnet/Makefile \ -- appl/telnet/telnet/Makefile \ -- appl/telnet/telnetd/Makefile \ - appl/test/Makefile \ - appl/kf/Makefile \ - appl/dceutils/Makefile \ @@ -68,9 +53,9 @@ diff -uNr heimdal-1.6rc2/configure.ac heimdal-1.6rc2-patched/configure.ac ) AC_OUTPUT -diff -uNr heimdal-1.6rc2/doc/Makefile.am heimdal-1.6rc2-patched/doc/Makefile.am ---- heimdal-1.6rc2/doc/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/doc/Makefile.am 2015-09-04 19:39:16.152643582 +0200 +diff -uNr heimdal-7.1.0/doc/Makefile.am heimdal-7.1.0-patched/doc/Makefile.am +--- heimdal-7.1.0/doc/Makefile.am 2016-12-15 21:00:41.000000000 +0100 ++++ heimdal-7.1.0-patched/doc/Makefile.am 2017-01-07 22:44:10.588388824 +0100 @@ -10,50 +10,6 @@ info_TEXINFOS = heimdal.texi hx509.texi @@ -120,17 +105,15 @@ diff -uNr heimdal-1.6rc2/doc/Makefile.am heimdal-1.6rc2-patched/doc/Makefile.am - mv wind.dxy.tmp wind.dxy - texi_subst = sed -e 's,[@]dbdir[@],$(localstatedir),g' \ + -e 's,[@]dbtype[@],$(db_type),g' \ -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g' - -@@ -62,51 +18,6 @@ +@@ -63,54 +19,6 @@ chmod +x vars.texi.tmp mv vars.texi.tmp vars.texi -PROJECTS = base hdb hx509 gssapi krb5 ntlm wind - --if !HAVE_OPENSSL -PROJECTS += hcrypto --endif - -doxyout doxygen: base.dxy hdb.dxy hx509.dxy hcrypto.dxy gssapi.dxy krb5.dxy ntlm.dxy wind.dxy - @find $(srcdir)/doxyout -type d ! -perm -200 -exec chmod u+w {} ';' ; \ @@ -139,7 +122,12 @@ diff -uNr heimdal-1.6rc2/doc/Makefile.am heimdal-1.6rc2-patched/doc/Makefile.am - for a in $(PROJECTS) ; do \ - echo $$a ; \ - doxygen $$a.dxy; \ -- (cd $(srcdir)/doxyout && find $$a/man -type f > $$a/manpages ) ; \ +- (cd $(srcdir)/doxyout && \ +- find $$a/man -name '_*' -type f -print | \ +- perl -lne unlink && \ +- find $$a/html -name 'dir_*.html' -type f -print | \ +- perl -lne unlink && \ +- find $$a/man -type f > $$a/manpages ) ; \ - done - -install-data-hook: install-doxygen-manpage @@ -174,7 +162,7 @@ diff -uNr heimdal-1.6rc2/doc/Makefile.am heimdal-1.6rc2-patched/doc/Makefile.am heimdal_TEXINFOS = \ ack.texi \ apps.texi \ -@@ -124,32 +35,5 @@ +@@ -128,35 +36,6 @@ win2k.texi EXTRA_DIST = \ @@ -195,6 +183,9 @@ diff -uNr heimdal-1.6rc2/doc/Makefile.am heimdal-1.6rc2-patched/doc/Makefile.am - layman.asc \ - doxytmpl.dxy \ - wind.din \ +- base.hhp \ + heimdal.hhp \ +- hx509.hhp \ vars.tin - -CLEANFILES = \ @@ -207,9 +198,9 @@ diff -uNr heimdal-1.6rc2/doc/Makefile.am heimdal-1.6rc2-patched/doc/Makefile.am - ntlm.dxy* \ - wind.dxy* \ - vars.texi* -diff -uNr heimdal-1.6rc2/kdc/Makefile.am heimdal-1.6rc2-patched/kdc/Makefile.am ---- heimdal-1.6rc2/kdc/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/kdc/Makefile.am 2015-09-04 19:46:34.796409612 +0200 +diff -uNr heimdal-7.1.0/kdc/Makefile.am heimdal-7.1.0-patched/kdc/Makefile.am +--- heimdal-7.1.0/kdc/Makefile.am 2016-11-29 02:35:27.000000000 +0100 ++++ heimdal-7.1.0-patched/kdc/Makefile.am 2017-01-07 22:49:06.830692956 +0100 @@ -6,35 +6,6 @@ lib_LTLIBRARIES = libkdc.la @@ -246,7 +237,7 @@ diff -uNr heimdal-1.6rc2/kdc/Makefile.am heimdal-1.6rc2-patched/kdc/Makefile.am libkdc_la_SOURCES = \ default_config.c \ set_dbinfo.c \ -@@ -53,15 +24,7 @@ +@@ -54,15 +25,7 @@ KDC_PROTOS = $(srcdir)/kdc-protos.h $(srcdir)/kdc-private.h @@ -254,7 +245,7 @@ diff -uNr heimdal-1.6rc2/kdc/Makefile.am heimdal-1.6rc2-patched/kdc/Makefile.am -ALL_OBJECTS += $(kdc_replay_OBJECTS) -ALL_OBJECTS += $(kdc_tester_OBJECTS) -ALL_OBJECTS += $(libkdc_la_OBJECTS) --ALL_OBJECTS += $(string_to_key_OBJECTS) +-ALL_OBJECTS += $(string2key_OBJECTS) -ALL_OBJECTS += $(kstash_OBJECTS) -ALL_OBJECTS += $(hprop_OBJECTS) -ALL_OBJECTS += $(hpropd_OBJECTS) @@ -263,7 +254,7 @@ diff -uNr heimdal-1.6rc2/kdc/Makefile.am heimdal-1.6rc2-patched/kdc/Makefile.am $(ALL_OBJECTS): $(KDC_PROTOS) -@@ -79,24 +42,6 @@ +@@ -80,24 +43,6 @@ cd $(srcdir) && perl ../cf/make-proto.pl -q -P comment -p kdc-private.h $(libkdc_la_SOURCES) || rm -f kdc-private.h @@ -274,7 +265,7 @@ diff -uNr heimdal-1.6rc2/kdc/Makefile.am heimdal-1.6rc2-patched/kdc/Makefile.am - $(LIB_hcrypto) \ - $(top_builddir)/lib/asn1/libasn1.la \ - $(LIB_roken) \ -- $(DBLIB) +- $(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB) - -hpropd_LDADD = \ - $(top_builddir)/lib/hdb/libhdb.la \ @@ -283,14 +274,14 @@ diff -uNr heimdal-1.6rc2/kdc/Makefile.am heimdal-1.6rc2-patched/kdc/Makefile.am - $(LIB_hcrypto) \ - $(top_builddir)/lib/asn1/libasn1.la \ - $(LIB_roken) \ -- $(DBLIB) +- $(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB) - if PKINIT LIB_pkinit = $(top_builddir)/lib/hx509/libhx509.la endif -@@ -119,21 +64,6 @@ +@@ -121,21 +66,6 @@ $(LIB_roken) \ - $(DBLIB) + $(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB) -kdc_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(CAPNG_LIBS) - @@ -310,7 +301,7 @@ diff -uNr heimdal-1.6rc2/kdc/Makefile.am heimdal-1.6rc2-patched/kdc/Makefile.am include_HEADERS = kdc.h $(srcdir)/kdc-protos.h noinst_HEADERS = $(srcdir)/kdc-private.h -@@ -144,11 +74,6 @@ +@@ -146,11 +76,6 @@ build_HEADERZ = $(krb5_HEADERS) # XXX EXTRA_DIST = \ @@ -323,9 +314,9 @@ diff -uNr heimdal-1.6rc2/kdc/Makefile.am heimdal-1.6rc2-patched/kdc/Makefile.am libkdc-exports.def \ - NTMakefile $(man_MANS) version-script.map + NTMakefile version-script.map -diff -uNr heimdal-1.6rc2/lib/asn1/Makefile.am heimdal-1.6rc2-patched/lib/asn1/Makefile.am ---- heimdal-1.6rc2/lib/asn1/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/lib/asn1/Makefile.am 2015-09-05 00:08:33.586141698 +0200 +diff -uNr heimdal-7.1.0/lib/asn1/Makefile.am heimdal-7.1.0-patched/lib/asn1/Makefile.am +--- heimdal-7.1.0/lib/asn1/Makefile.am 2016-12-15 21:00:41.000000000 +0100 ++++ heimdal-7.1.0-patched/lib/asn1/Makefile.am 2017-01-07 22:51:20.320151260 +0100 @@ -44,9 +44,7 @@ gen_files_digest = asn1_digest_asn1.x gen_files_kx509 = asn1_kx509_asn1.x @@ -337,14 +328,14 @@ diff -uNr heimdal-1.6rc2/lib/asn1/Makefile.am heimdal-1.6rc2-patched/lib/asn1/Ma TESTS = check-der check-gen check-timegm check-ber check-template check_PROGRAMS = $(TESTS) -diff -uNr heimdal-1.6rc2/lib/com_err/Makefile.am heimdal-1.6rc2-patched/lib/com_err/Makefile.am ---- heimdal-1.6rc2/lib/com_err/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/lib/com_err/Makefile.am 2015-09-04 20:13:18.571363404 +0200 +diff -uNr heimdal-7.1.0/lib/com_err/Makefile.am heimdal-7.1.0-patched/lib/com_err/Makefile.am +--- heimdal-7.1.0/lib/com_err/Makefile.am 2016-12-15 21:00:41.000000000 +0100 ++++ heimdal-7.1.0-patched/lib/com_err/Makefile.am 2017-01-07 22:53:45.293356105 +0100 @@ -13,12 +13,8 @@ libcom_err_la_LIBADD = $(LIB_libintl) --bin_PROGRAMS = compile_et +-noinst_PROGRAMS = compile_et - include_HEADERS = com_err.h com_right.h @@ -353,18 +344,18 @@ diff -uNr heimdal-1.6rc2/lib/com_err/Makefile.am heimdal-1.6rc2-patched/lib/com_ libcom_err_la_CPPFLAGS = $(ROKEN_RENAME) $(INCLUDE_libintl) dist_libcom_err_la_SOURCES = error.c com_err.c roken_rename.h -@@ -42,7 +38,6 @@ - +@@ -43,7 +39,6 @@ EXTRA_DIST = \ NTMakefile \ + com_err.3 \ - compile_et-version.rc \ libcom_err-version.rc \ libcom_err-exports.def \ version-script.map -diff -uNr heimdal-1.6rc2/lib/gssapi/Makefile.am heimdal-1.6rc2-patched/lib/gssapi/Makefile.am ---- heimdal-1.6rc2/lib/gssapi/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/lib/gssapi/Makefile.am 2015-09-04 22:47:19.476020949 +0200 -@@ -228,8 +228,6 @@ +diff -uNr heimdal-7.1.0/lib/gssapi/Makefile.am heimdal-7.1.0-patched/lib/gssapi/Makefile.am +--- heimdal-7.1.0/lib/gssapi/Makefile.am 2016-12-15 21:00:41.000000000 +0100 ++++ heimdal-7.1.0-patched/lib/gssapi/Makefile.am 2017-01-07 22:56:26.486216239 +0100 +@@ -227,8 +227,6 @@ $(LIB_hcrypto) \ $(LIBADD_roken) @@ -373,15 +364,15 @@ diff -uNr heimdal-1.6rc2/lib/gssapi/Makefile.am heimdal-1.6rc2-patched/lib/gssap include_HEADERS = gssapi.h noinst_HEADERS = \ gssapi_mech.h \ -@@ -301,7 +299,6 @@ +@@ -303,7 +301,6 @@ check_PROGRAMS = test_acquire_cred $(TESTS) -bin_PROGRAMS = gsstool - noinst_PROGRAMS = test_cred test_kcred test_context test_ntlm + noinst_PROGRAMS = test_cred test_kcred test_context test_ntlm test_add_store_cred test_context_SOURCES = test_context.c test_common.c test_common.h -@@ -318,25 +315,13 @@ +@@ -322,15 +319,6 @@ # gss @@ -397,20 +388,18 @@ diff -uNr heimdal-1.6rc2/lib/gssapi/Makefile.am heimdal-1.6rc2-patched/lib/gssap gss-commands.c gss-commands.h: gss-commands.in $(SLC) $(srcdir)/gss-commands.in --$(gsstool_OBJECTS): gss-commands.h -- - EXTRA_DIST = \ +@@ -340,7 +328,6 @@ NTMakefile \ libgssapi-version.rc \ libgssapi-exports.def \ - $(man_MANS) \ - krb5/gkrb5_err.et \ - mech/gssapi.asn1 \ - spnego/spnego.asn1 \ -diff -uNr heimdal-1.6rc2/lib/hx509/Makefile.am heimdal-1.6rc2-patched/lib/hx509/Makefile.am ---- heimdal-1.6rc2/lib/hx509/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/lib/hx509/Makefile.am 2015-09-04 20:20:21.631460276 +0200 -@@ -138,7 +138,6 @@ + gen-oid.pl \ + gssapi/gssapi_netlogon.h \ + krb5/test_acquire_cred.c \ +diff -uNr heimdal-7.1.0/lib/hx509/Makefile.am heimdal-7.1.0-patched/lib/hx509/Makefile.am +--- heimdal-7.1.0/lib/hx509/Makefile.am 2016-12-15 21:00:41.000000000 +0100 ++++ heimdal-7.1.0-patched/lib/hx509/Makefile.am 2017-01-07 22:59:56.746084317 +0100 +@@ -141,7 +141,6 @@ $(heim_verbose)$(ASN1_COMPILE) $(srcdir)/crmf.asn1 crmf_asn1 || (rm -f crmf_asn1_files ; exit 1) ALL_OBJECTS = $(libhx509_la_OBJECTS) @@ -418,7 +407,7 @@ diff -uNr heimdal-1.6rc2/lib/hx509/Makefile.am heimdal-1.6rc2-patched/lib/hx509/ HX509_PROTOS = $(srcdir)/hx509-protos.h $(srcdir)/hx509-private.h -@@ -153,24 +152,6 @@ +@@ -156,23 +155,6 @@ $(srcdir)/hx509-private.h: $(dist_libhx509_la_SOURCES) $(heim_verbose)cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -p hx509-private.h $(dist_libhx509_la_SOURCES) || rm -f hx509-private.h @@ -432,7 +421,6 @@ diff -uNr heimdal-1.6rc2/lib/hx509/Makefile.am heimdal-1.6rc2-patched/lib/hx509/ - -$(hxtool_OBJECTS): hxtool-commands.h hx509_err.h - --hxtool_CPPFLAGS = $(INCLUDE_hcrypto) -hxtool_LDADD = \ - libhx509.la \ - $(top_builddir)/lib/asn1/libasn1.la \ @@ -443,7 +431,7 @@ diff -uNr heimdal-1.6rc2/lib/hx509/Makefile.am heimdal-1.6rc2-patched/lib/hx509/ CLEANFILES = $(BUILT_SOURCES) sel-gram.c sel-lex.c \ $(gen_files_ocsp) ocsp_asn1_files ocsp_asn1{,-priv}.h* \ ocsp_asn1-template.[chx]* \ -@@ -179,7 +160,7 @@ +@@ -181,7 +163,7 @@ $(gen_files_crmf) crmf_asn1_files crmf_asn1{,-priv}.h* \ crmf_asn1-template.[chx]* \ $(TESTS) \ @@ -452,7 +440,7 @@ diff -uNr heimdal-1.6rc2/lib/hx509/Makefile.am heimdal-1.6rc2-patched/lib/hx509/ request.out \ out.pem out2.pem \ sd sd.pem \ -@@ -312,12 +293,10 @@ +@@ -311,12 +293,10 @@ EXTRA_DIST = \ NTMakefile \ @@ -465,10 +453,10 @@ diff -uNr heimdal-1.6rc2/lib/hx509/Makefile.am heimdal-1.6rc2-patched/lib/hx509/ quote.py \ ocsp.asn1 \ ocsp.opt \ -diff -uNr heimdal-1.6rc2/lib/kadm5/Makefile.am heimdal-1.6rc2-patched/lib/kadm5/Makefile.am ---- heimdal-1.6rc2/lib/kadm5/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/lib/kadm5/Makefile.am 2015-09-04 20:25:19.689896290 +0200 -@@ -11,10 +11,6 @@ +diff -uNr heimdal-7.1.0/lib/kadm5/Makefile.am heimdal-7.1.0-patched/lib/kadm5/Makefile.am +--- heimdal-7.1.0/lib/kadm5/Makefile.am 2016-11-29 04:57:20.000000000 +0100 ++++ heimdal-7.1.0-patched/lib/kadm5/Makefile.am 2017-01-07 23:04:16.188923265 +0100 +@@ -13,10 +13,6 @@ libkadm5srv_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map endif @@ -479,7 +467,7 @@ diff -uNr heimdal-1.6rc2/lib/kadm5/Makefile.am heimdal-1.6rc2-patched/lib/kadm5/ noinst_LTLIBRARIES = sample_passwd_check.la sample_passwd_check_la_SOURCES = sample_passwd_check.c -@@ -26,8 +22,6 @@ +@@ -28,8 +24,6 @@ libkadm5clnt_la_LIBADD = \ $(LIB_com_err) ../krb5/libkrb5.la $(LIBADD_roken) @@ -488,7 +476,7 @@ diff -uNr heimdal-1.6rc2/lib/kadm5/Makefile.am heimdal-1.6rc2-patched/lib/kadm5/ default_keys_SOURCES = default_keys.c kadm5includedir = $(includedir)/kadm5 -@@ -117,15 +111,6 @@ +@@ -120,15 +114,6 @@ libkadm5srv_la_DEPENDENCIES = \ version-script.map @@ -504,7 +492,7 @@ diff -uNr heimdal-1.6rc2/lib/kadm5/Makefile.am heimdal-1.6rc2-patched/lib/kadm5/ LDADD = \ libkadm5srv.la \ $(top_builddir)/lib/hdb/libhdb.la \ -@@ -137,25 +122,8 @@ +@@ -140,26 +125,8 @@ $(LIB_dlopen) \ $(LIB_pidfile) @@ -517,20 +505,21 @@ diff -uNr heimdal-1.6rc2/lib/kadm5/Makefile.am heimdal-1.6rc2-patched/lib/kadm5/ - $(top_builddir)/lib/sl/libsl.la \ - $(LIB_readline) \ - $(LIB_roken) \ -- $(DBLIB) \ +- $(DB3LIB) $(DB1LIB) $(LMDBLIB) $(NDBMLIB) \ - $(LIB_dlopen) \ - $(LIB_pidfile) - - -iprop-commands.c iprop-commands.h: iprop-commands.in - $(SLC) $(srcdir)/iprop-commands.in - +- $(libkadm5srv_la_OBJECTS): kadm5_err.h + $(libkadm5clnt_la_OBJECTS): kadm5_err.h -$(iprop_log_OBJECTS): iprop-commands.h client_glue.lo server_glue.lo: $(srcdir)/common_glue.c -@@ -167,12 +135,7 @@ +@@ -171,12 +138,7 @@ ALL_OBJECTS = $(libkadm5clnt_la_OBJECTS) ALL_OBJECTS += $(libkadm5srv_la_OBJECTS) @@ -542,8 +531,8 @@ diff -uNr heimdal-1.6rc2/lib/kadm5/Makefile.am heimdal-1.6rc2-patched/lib/kadm5/ -ALL_OBJECTS += $(default_keys_OBJECTS) $(ALL_OBJECTS): $(srcdir)/kadm5-protos.h $(srcdir)/kadm5-private.h - -@@ -203,7 +166,6 @@ + $(ALL_OBJECTS): kadm5_err.h +@@ -208,7 +170,6 @@ libkadm5srv-exports.def \ kadm5_err.et \ iprop-commands.in \ @@ -551,10 +540,10 @@ diff -uNr heimdal-1.6rc2/lib/kadm5/Makefile.am heimdal-1.6rc2-patched/lib/kadm5/ check-cracklib.pl \ flush.c \ sample_passwd_check.c \ -diff -uNr heimdal-1.6rc2/lib/kafs/Makefile.am heimdal-1.6rc2-patched/lib/kafs/Makefile.am ---- heimdal-1.6rc2/lib/kafs/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/lib/kafs/Makefile.am 2015-09-04 22:50:43.024175942 +0200 -@@ -73,8 +73,6 @@ +diff -uNr heimdal-7.1.0/lib/kafs/Makefile.am heimdal-7.1.0-patched/lib/kafs/Makefile.am +--- heimdal-7.1.0/lib/kafs/Makefile.am 2016-11-29 02:35:27.000000000 +0100 ++++ heimdal-7.1.0-patched/lib/kafs/Makefile.am 2017-01-07 23:05:24.459561114 +0100 +@@ -74,8 +74,6 @@ EXTRA_DIST = NTMakefile afsl.exp afslib.exp $(man_MANS) @@ -563,19 +552,19 @@ diff -uNr heimdal-1.6rc2/lib/kafs/Makefile.am heimdal-1.6rc2-patched/lib/kafs/Ma # AIX: this almost works with gcc, but somehow it fails to use the # correct ld, use ld instead afslib.so: afslib.o -diff -uNr heimdal-1.6rc2/lib/krb5/Makefile.am heimdal-1.6rc2-patched/lib/krb5/Makefile.am ---- heimdal-1.6rc2/lib/krb5/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/lib/krb5/Makefile.am 2015-09-04 20:28:52.362924277 +0200 +diff -uNr heimdal-7.1.0/lib/krb5/Makefile.am heimdal-7.1.0-patched/lib/krb5/Makefile.am +--- heimdal-7.1.0/lib/krb5/Makefile.am 2016-12-15 21:00:41.000000000 +0100 ++++ heimdal-7.1.0-patched/lib/krb5/Makefile.am 2017-01-07 23:08:14.036174775 +0100 @@ -4,8 +4,6 @@ - AM_CPPFLAGS += $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err $(INCLUDE_sqlite3) $(INCLUDE_libintl) + AM_CPPFLAGS += -I../com_err -I$(srcdir)/../com_err $(INCLUDE_sqlite3) $(INCLUDE_libintl) $(INCLUDE_openssl_crypto) -bin_PROGRAMS = verify_krb5_conf - noinst_PROGRAMS = \ krbhst-test \ test_alname \ -@@ -252,7 +250,6 @@ +@@ -258,7 +256,6 @@ endif ALL_OBJECTS = $(libkrb5_la_OBJECTS) @@ -583,7 +572,7 @@ diff -uNr heimdal-1.6rc2/lib/krb5/Makefile.am heimdal-1.6rc2-patched/lib/krb5/Ma ALL_OBJECTS += $(librfc3961_la_OBJECTS) ALL_OBJECTS += $(librfc3961_la_OBJECTS) ALL_OBJECTS += $(krbhst_test_OBJECTS) -@@ -313,52 +310,6 @@ +@@ -322,52 +319,6 @@ $(srcdir)/krb5-private.h: $(headerdeps) @cd $(srcdir) && perl ../../cf/make-proto.pl -q -P comment -p krb5-private.h $(dist_libkrb5_la_SOURCES) || rm -f krb5-private.h @@ -636,7 +625,7 @@ diff -uNr heimdal-1.6rc2/lib/krb5/Makefile.am heimdal-1.6rc2-patched/lib/krb5/Ma dist_include_HEADERS = \ krb5.h \ $(srcdir)/krb5-protos.h \ -@@ -397,7 +348,6 @@ +@@ -409,7 +360,6 @@ krb_err.et \ heim_err.et \ k524_err.et \ @@ -644,10 +633,10 @@ diff -uNr heimdal-1.6rc2/lib/krb5/Makefile.am heimdal-1.6rc2-patched/lib/krb5/Ma version-script.map \ test_config_strings.cfg \ krb5.moduli -diff -uNr heimdal-1.6rc2/lib/roken/Makefile.am heimdal-1.6rc2-patched/lib/roken/Makefile.am ---- heimdal-1.6rc2/lib/roken/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/lib/roken/Makefile.am 2015-09-04 20:30:50.804711515 +0200 -@@ -203,8 +203,6 @@ +diff -uNr heimdal-7.1.0/lib/roken/Makefile.am heimdal-7.1.0-patched/lib/roken/Makefile.am +--- heimdal-7.1.0/lib/roken/Makefile.am 2016-12-16 19:06:32.000000000 +0100 ++++ heimdal-7.1.0-patched/lib/roken/Makefile.am 2017-01-07 23:09:27.658703525 +0100 +@@ -209,8 +209,6 @@ rokenincludedir = $(includedir)/roken nodist_rokeninclude_HEADERS = $(XHEADERS) @@ -656,17 +645,17 @@ diff -uNr heimdal-1.6rc2/lib/roken/Makefile.am heimdal-1.6rc2-patched/lib/roken/ SUFFIXES += .hin .hin.h: cp $< $@ -@@ -238,7 +236,6 @@ +@@ -244,7 +242,6 @@ EXTRA_DIST = \ NTMakefile \ roken.awk roken.h.in \ - $(man_MANS) \ - test-mem.h \ - ndbm_wrap.c \ - ndbm_wrap.h \ -diff -uNr heimdal-1.6rc2/lib/sl/Makefile.am heimdal-1.6rc2-patched/lib/sl/Makefile.am ---- heimdal-1.6rc2/lib/sl/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/lib/sl/Makefile.am 2015-09-04 23:28:26.528060425 +0200 + dirent.c \ + dirent.hin \ + dirent-test.c \ +diff -uNr heimdal-7.1.0/lib/sl/Makefile.am heimdal-7.1.0-patched/lib/sl/Makefile.am +--- heimdal-7.1.0/lib/sl/Makefile.am 2016-11-29 02:35:27.000000000 +0100 ++++ heimdal-7.1.0-patched/lib/sl/Makefile.am 2017-01-07 23:10:31.289431529 +0100 @@ -25,16 +25,8 @@ # install these? @@ -684,9 +673,9 @@ diff -uNr heimdal-1.6rc2/lib/sl/Makefile.am heimdal-1.6rc2-patched/lib/sl/Makefi strtok_r.c: $(LN_S) $(srcdir)/../roken/strtok_r.c . snprintf.c: -diff -uNr heimdal-1.6rc2/lib/wind/Makefile.am heimdal-1.6rc2-patched/lib/wind/Makefile.am ---- heimdal-1.6rc2/lib/wind/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/lib/wind/Makefile.am 2015-09-04 22:48:51.878275308 +0200 +diff -uNr heimdal-7.1.0/lib/wind/Makefile.am heimdal-7.1.0-patched/lib/wind/Makefile.am +--- heimdal-7.1.0/lib/wind/Makefile.am 2016-11-29 02:35:28.000000000 +0100 ++++ heimdal-7.1.0-patched/lib/wind/Makefile.am 2017-01-07 23:11:32.444208705 +0100 @@ -83,12 +83,6 @@ $(test_punycode_OBJECTS): $(built_tests) @@ -700,9 +689,9 @@ diff -uNr heimdal-1.6rc2/lib/wind/Makefile.am heimdal-1.6rc2-patched/lib/wind/Ma PYTHON = python if !MAINTAINER_MODE -diff -uNr heimdal-1.6rc2/Makefile.am heimdal-1.6rc2-patched/Makefile.am ---- heimdal-1.6rc2/Makefile.am 2014-02-18 17:33:47.000000000 +0100 -+++ heimdal-1.6rc2-patched/Makefile.am 2015-09-04 19:33:46.242832430 +0200 +diff -uNr heimdal-7.1.0/Makefile.am heimdal-7.1.0-patched/Makefile.am +--- heimdal-7.1.0/Makefile.am 2016-12-15 21:00:41.000000000 +0100 ++++ heimdal-7.1.0-patched/Makefile.am 2017-01-07 23:12:58.254424837 +0100 @@ -2,12 +2,7 @@ include $(top_srcdir)/Makefile.am.common diff --git a/heimdal-version-script-client.map.patch b/heimdal-version-script-client.map.patch deleted file mode 100644 index a64a750..0000000 --- a/heimdal-version-script-client.map.patch +++ /dev/null @@ -1,60 +0,0 @@ ---- lib/kadm5/version-script-client.map.orig 1970-01-01 01:00:00.000000000 +0100 -+++ lib/kadm5/version-script-client.map 2015-08-30 12:45:34.395109701 +0200 -@@ -0,0 +1,57 @@ -+HEIMDAL_KADM5_CLIENT_1.0 { -+ global: -+ et_kadm5_error_table; -+ initialize_kadm5_error_table; -+ initialize_kadm5_error_table_r; -+ kadm5_ad_init_with_password; -+ kadm5_ad_init_with_password_ctx; -+ kadm5_c_chpass_principal; -+ kadm5_c_chpass_principal_with_key; -+ kadm5_c_create_principal; -+ kadm5_c_delete_principal; -+ kadm5_c_destroy; -+ kadm5_c_flush; -+ kadm5_c_get_principal; -+ kadm5_c_get_principals; -+ kadm5_c_get_privs; -+ kadm5_c_init_with_creds; -+ kadm5_c_init_with_creds_ctx; -+ kadm5_c_init_with_password; -+ kadm5_c_init_with_password_ctx; -+ kadm5_c_init_with_skey; -+ kadm5_c_init_with_skey_ctx; -+ kadm5_c_modify_principal; -+ kadm5_c_randkey_principal; -+ kadm5_c_rename_principal; -+ kadm5_chpass_principal; -+ kadm5_chpass_principal_with_key; -+ kadm5_create_principal; -+ kadm5_delete_principal; -+ kadm5_destroy; -+ kadm5_flush; -+ kadm5_free_key_data; -+ kadm5_free_name_list; -+ kadm5_free_principal_ent; -+ kadm5_get_principal; -+ kadm5_get_principals; -+ kadm5_get_privs; -+ kadm5_init_with_creds; -+ kadm5_init_with_creds_ctx; -+ kadm5_init_with_password; -+ kadm5_init_with_password_ctx; -+ kadm5_init_with_skey; -+ kadm5_init_with_skey_ctx; -+ kadm5_modify_principal; -+ kadm5_randkey_principal; -+ kadm5_rename_principal; -+ kadm5_ret_key_data; -+ kadm5_ret_principal_ent; -+ kadm5_ret_principal_ent_mask; -+ kadm5_ret_tl_data; -+ kadm5_store_key_data; -+ kadm5_store_principal_ent; -+ kadm5_store_principal_ent_mask; -+ kadm5_store_tl_data; -+ local: -+ *; -+}; diff --git a/libheimdal.changes b/libheimdal.changes index f088b5f..374a1c3 100644 --- a/libheimdal.changes +++ b/libheimdal.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Sat Jan 07 22:57:23 UTC 2017 - joerg.lorenzen@ki.tng.de + +- Update to version 7.1.0 +- Removed heimdal-version-script-client.map.patch, fixed upstream. +- Fixed heimdal-patched.diff. +- Unfortunately there is no updated changelog file in tarball, + changes can be seen in source code version control systems + history log. + ------------------------------------------------------------------- Sat Sep 05 07:57:33 UTC 2015 - joerg.lorenzen@ki.tng.de diff --git a/libheimdal.spec b/libheimdal.spec index 3591fbf..062bf8f 100644 --- a/libheimdal.spec +++ b/libheimdal.spec @@ -1,7 +1,7 @@ # # spec file for package libheimdal # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,15 +20,14 @@ Name: libheimdal Summary: Libraries of Kerberos 5 implementation License: BSD-3-Clause Group: System/Libraries -Version: 1.6rc2 +Version: 7.1.0 Release: 0 Url: http://www.h5l.org # patched source can be created with script heimdal-patch-source.sh: # ./heimdal-patch-source.sh heimdal-%{version}.tar.gz Source0: heimdal-%{version}-patched.tar.bz2 Source2: heimdal-patch-source.sh -Patch0: heimdal-version-script-client.map.patch -Patch1: heimdal-patched.diff +Patch0: heimdal-patched.diff %if 0%{?sles_version} == 11 BuildRequires: libcom_err-devel BuildRequires: sqlite3-devel @@ -97,8 +96,7 @@ libraries are required by 64bit package of ICAClient version 13.2. %prep %setup -q -n heimdal-%{version} -%patch0 -p0 -%patch1 -p1 +%patch0 -p1 %build autoreconf -fi