pool/libheimdal
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 329265 from home:enzokiel:branches:network

Browse Source 
- Added a patched instead of the original tarball because only
  shared libraries will be build and source files of these (not to
  be build) programs have problematic licenses.
- Added script heimdal-patch-source.sh to sources.
- Added patch heimdal-patched.diff that fixes configure.ac and
  several Makefile.am files to successfully build patched source.
- Removed unneeded dependencies in spec file for build.

OBS-URL: https://build.opensuse.org/request/show/329265
OBS-URL: https://build.opensuse.org/package/show/network/libheimdal?expand=0&rev=7
This commit is contained in:
Jörg Lorenzen 2015-09-05 11:04:36 +00:00 committed by Git OBS Bridge
parent 76c4f6bbd8
commit d31e954f39
7 changed files with 806 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
heimdal-1.6rc2-patched.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c272118da8c4f9581af8d1b0ebfa1855317b8ea34b049ec5290228789de8036a
size 4662363

3
heimdal-1.6rc2.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8fe19e0f12ff0d0c2f20a6cf56727deaabd89db9c197288022fb489e103b730d
size 7198147

11
heimdal-1.6rc2.tar.gz.asc
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (Darwin)
iQEcBAABAgAGBQJTA4+7AAoJEMMkPNBweJLFoOYIAIkYYPhqPVZHtrHGEU0LBOPq
xTOjwTUR6YZUqDkZKJnnfrR1KD+rDc2n6BGffri9jZU1YH0P1ibxUu1nq2EaWzcp
Z8/hRejQ/6/k+YbEBS1rIim7sdg5/pB2jPUYYanEUSRlelk3umQoaksXstWF3qSn
ktU7B/x/pxksGjbap2bB+sg/33X0fs3S5bYa8fUcg6vmU6zNkTdVaVWw/iOxPNRq
AloZRhH1mCwdUu0wSVmNvRA3FeU5P0BPpY9rioG1cKVVN1FwlIe56XtAPTi/95c0
SeAh0SLUcEVazPt3CtI0QxpCU2EkdVwNaoXErnsJg/gaRzJOC2+Pq44yOxg1j0Q=
=lhSJ
-----END PGP SIGNATURE-----

46
heimdal-patch-source.sh Normal file
View File

@ -0,0 +1,46 @@
#!/bin/bash
REMOVE_DIRS=(
admin
appl
etc
kadmin
kcm
kpasswd
kuser
packages
po
tests
tools
windows
)
set -o errexit
CMDNAME=${0##*/}
SOURCEDIR=${0%$CMDNAME}
BASENAME=${1%.tar.gz}
trap "rm -rf \"$BASENAME-patched.tar\" \"$BASENAME-patched.tar.bz2\"" ERR
for (( N=0; N<${#REMOVE_DIRS[@]}; N++ )) ; do
REMOVE_DIRS[N]="*/${REMOVE_DIRS[N]}"
done
cd "$SOURCEDIR" > /dev/null
if [ ! -f "$BASENAME.tar.gz" ]; then
exit 0
fi
if [ -f "$BASENAME-patched.tar.bz2" ] && [ "$BASENAME.tar.gz" -ot "$BASENAME-patched.tar.bz2" ]; then
if [ $CMDNAME -ot "$BASENAME-patched.tar.bz2" ]; then
exit 0
fi
fi
gzip -d "$BASENAME.tar.gz"
mv -f "$BASENAME.tar" "$BASENAME-patched.tar"
tar --wildcards --delete -f "$BASENAME-patched.tar" "${REMOVE_DIRS[@]}"
bzip2 "$BASENAME-patched.tar"

719
heimdal-patched.diff Normal file
View File

@ -0,0 +1,719 @@
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
@@ -3,7 +3,6 @@
AC_PREREQ(2.62)
test -z "$CFLAGS" && CFLAGS="-g"
AC_INIT([Heimdal],[1.6rc2],[heimdal-bugs@h5l.org])
-AC_CONFIG_SRCDIR([kuser/kinit.c])
AC_CONFIG_HEADERS(include/config.h)
AC_CONFIG_MACRO_DIR([cf])
@@ -604,7 +603,6 @@
AM_CONDITIONAL(HEIMDAL_DOCUMENTATION, test "$enable_heimdal_documentation" != no)
AC_CONFIG_FILES(Makefile \
- etc/Makefile \
include/Makefile \
include/gssapi/Makefile \
include/hcrypto/Makefile \
@@ -629,50 +627,8 @@
lib/sqlite/Makefile \
lib/vers/Makefile \
lib/wind/Makefile \
- po/Makefile \
- kuser/Makefile \
- kpasswd/Makefile \
- kadmin/Makefile \
- admin/Makefile \
- kcm/Makefile \
kdc/Makefile \
- 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 \
- tests/Makefile \
- tests/bin/Makefile \
- tests/can/Makefile \
- tests/db/Makefile \
- tests/kdc/Makefile \
- tests/ldap/Makefile \
- tests/gss/Makefile \
- tests/java/Makefile \
- tests/plugin/Makefile \
- packages/Makefile \
- packages/mac/Makefile \
doc/Makefile \
- tools/Makefile \
)
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
@@ -10,50 +10,6 @@
info_TEXINFOS = heimdal.texi hx509.texi
-dxy_subst = sed -e 's,[@]srcdir[@],$(srcdir),g' \
- -e 's,[@]objdir[@],.,g' \
- -e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g'
-
-hcrypto.dxy: hcrypto.din Makefile
- $(dxy_subst) < $(srcdir)/hcrypto.din > hcrypto.dxy.tmp
- chmod +x hcrypto.dxy.tmp
- mv hcrypto.dxy.tmp hcrypto.dxy
-
-hdb.dxy: hdb.din Makefile
- $(dxy_subst) < $(srcdir)/hdb.din > hdb.dxy.tmp
- chmod +x hdb.dxy.tmp
- mv hdb.dxy.tmp hdb.dxy
-
-base.dxy: base.din Makefile
- $(dxy_subst) < $(srcdir)/base.din > base.dxy.tmp
- chmod +x base.dxy.tmp
- mv base.dxy.tmp base.dxy
-
-hx509.dxy: hx509.din Makefile
- $(dxy_subst) < $(srcdir)/hx509.din > hx509.dxy.tmp
- chmod +x hx509.dxy.tmp
- mv hx509.dxy.tmp hx509.dxy
-
-gssapi.dxy: gssapi.din Makefile
- $(dxy_subst) < $(srcdir)/gssapi.din > gssapi.dxy.tmp
- chmod +x gssapi.dxy.tmp
- mv gssapi.dxy.tmp gssapi.dxy
-
-krb5.dxy: krb5.din Makefile
- $(dxy_subst) < $(srcdir)/krb5.din > krb5.dxy.tmp
- chmod +x krb5.dxy.tmp
- mv krb5.dxy.tmp krb5.dxy
-
-ntlm.dxy: ntlm.din Makefile
- $(dxy_subst) < $(srcdir)/ntlm.din > ntlm.dxy.tmp
- chmod +x ntlm.dxy.tmp
- mv ntlm.dxy.tmp ntlm.dxy
-
-wind.dxy: wind.din Makefile
- $(dxy_subst) < $(srcdir)/wind.din > wind.dxy.tmp
- chmod +x wind.dxy.tmp
- mv wind.dxy.tmp wind.dxy
-
texi_subst = sed -e 's,[@]dbdir[@],$(localstatedir),g' \
-e 's,[@]PACKAGE_VERSION[@],$(PACKAGE_VERSION),g'
@@ -62,51 +18,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 {} ';' ; \
- rm -rf $(srcdir)/doxyout ; \
- mkdir $(srcdir)/doxyout ; \
- for a in $(PROJECTS) ; do \
- echo $$a ; \
- doxygen $$a.dxy; \
- (cd $(srcdir)/doxyout && find $$a/man -type f > $$a/manpages ) ; \
- done
-
-install-data-hook: install-doxygen-manpage
-uninstall-hook: uninstall-doxygen-manpage
-dist-hook: doxygen
-
-install-doxygen-manpage:
- for a in $(PROJECTS) ; do \
- f="$(srcdir)/doxyout/$$a/manpages" ; \
- test -f $$f || continue ; \
- echo "install $$a manual pages $$(wc -l < $$f)" ; \
- while read x ; do \
- section=`echo "$$x" | sed 's/.*\.\([0-9]\)/\1/'` ; \
- $(mkinstalldirs) "$(DESTDIR)$(mandir)/man$$section" ; \
- $(INSTALL_DATA) $(srcdir)/doxyout/$$x "$(DESTDIR)$(mandir)/man$$section" ; \
- done < $$f ; \
- done ; exit 0
-
-uninstall-doxygen-manpage:
- @for a in $(PROJECTS) ; do \
- f="$(srcdir)/doxyout/$$a/manpages" ; \
- test -f $$f || continue ; \
- echo "removing $$a manual pages" ; \
- while read x ; do \
- section=`echo "$$x" | sed 's/.*\.\([0-9]\)/\1/'` ; \
- base=`basename $$x` ; \
- rm "$(DESTDIR)$(mandir)/man$$section/$$base" ; \
- done < $$f ; \
- done
-
-
heimdal_TEXINFOS = \
ack.texi \
apps.texi \
@@ -124,32 +35,5 @@
win2k.texi
EXTRA_DIST = \
- NTMakefile \
- doxyout \
- footer.html \
- gssapi.din \
- hdb.din \
- hcrypto.din \
- header.html \
heimdal.css \
- base.din \
- hx509.din \
- krb5.din \
- ntlm.din \
- init-creds \
- latin1.tex \
- layman.asc \
- doxytmpl.dxy \
- wind.din \
vars.tin
-
-CLEANFILES = \
- hcrypto.dxy* \
- base.dxy* \
- hx509.dxy* \
- hdb.dxy* \
- gssapi.dxy* \
- krb5.dxy* \
- 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
@@ -6,35 +6,6 @@
lib_LTLIBRARIES = libkdc.la
-bin_PROGRAMS = string2key
-
-sbin_PROGRAMS = kstash
-
-libexec_PROGRAMS = hprop hpropd kdc digest-service
-
-noinst_PROGRAMS = kdc-replay kdc-tester
-
-man_MANS = kdc.8 kstash.8 hprop.8 hpropd.8 string2key.8
-
-hprop_SOURCES = hprop.c mit_dump.c hprop.h
-hpropd_SOURCES = hpropd.c hprop.h
-
-kstash_SOURCES = kstash.c headers.h
-
-string2key_SOURCES = string2key.c headers.h
-
-digest_service_SOURCES = \
- digest-service.c
-
-kdc_SOURCES = connect.c \
- config.c \
- announce.c \
- main.c
-
-kdc_tester_SOURCES = \
- config.c \
- kdc-tester.c
-
libkdc_la_SOURCES = \
default_config.c \
set_dbinfo.c \
@@ -53,15 +24,7 @@
KDC_PROTOS = $(srcdir)/kdc-protos.h $(srcdir)/kdc-private.h
-ALL_OBJECTS = $(kdc_OBJECTS)
-ALL_OBJECTS += $(kdc_replay_OBJECTS)
-ALL_OBJECTS += $(kdc_tester_OBJECTS)
-ALL_OBJECTS += $(libkdc_la_OBJECTS)
-ALL_OBJECTS += $(string_to_key_OBJECTS)
-ALL_OBJECTS += $(kstash_OBJECTS)
-ALL_OBJECTS += $(hprop_OBJECTS)
-ALL_OBJECTS += $(hpropd_OBJECTS)
-ALL_OBJECTS += $(digest_service_OBJECTS)
+ALL_OBJECTS = $(libkdc_la_OBJECTS)
$(ALL_OBJECTS): $(KDC_PROTOS)
@@ -79,24 +42,6 @@
cd $(srcdir) && perl ../cf/make-proto.pl -q -P comment -p kdc-private.h $(libkdc_la_SOURCES) || rm -f kdc-private.h
-hprop_LDADD = \
- $(top_builddir)/lib/hdb/libhdb.la \
- $(top_builddir)/lib/krb5/libkrb5.la \
- $(LIB_kdb) \
- $(LIB_hcrypto) \
- $(top_builddir)/lib/asn1/libasn1.la \
- $(LIB_roken) \
- $(DBLIB)
-
-hpropd_LDADD = \
- $(top_builddir)/lib/hdb/libhdb.la \
- $(top_builddir)/lib/krb5/libkrb5.la \
- $(LIB_kdb) \
- $(LIB_hcrypto) \
- $(top_builddir)/lib/asn1/libasn1.la \
- $(LIB_roken) \
- $(DBLIB)
-
if PKINIT
LIB_pkinit = $(top_builddir)/lib/hx509/libhx509.la
endif
@@ -119,21 +64,6 @@
$(LIB_roken) \
$(DBLIB)
-kdc_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(CAPNG_LIBS)
-
-if FRAMEWORK_SECURITY
-kdc_LDFLAGS = -framework SystemConfiguration -framework CoreFoundation
-endif
-kdc_CFLAGS = $(CAPNG_CFLAGS)
-
-digest_service_LDADD = \
- libkdc.la \
- $(top_builddir)/lib/ntlm/libheimntlm.la \
- $(top_builddir)/lib/ipc/libheim-ipcs.la \
- $(LDADD) $(LIB_pidfile)
-kdc_replay_LDADD = libkdc.la $(LDADD) $(LIB_pidfile)
-kdc_tester_LDADD = libkdc.la $(LDADD) $(LIB_pidfile) $(LIB_heimbase)
-
include_HEADERS = kdc.h $(srcdir)/kdc-protos.h
noinst_HEADERS = $(srcdir)/kdc-private.h
@@ -144,11 +74,6 @@
build_HEADERZ = $(krb5_HEADERS) # XXX
EXTRA_DIST = \
- hprop-version.rc \
- hpropd-version.rc \
- kdc-version.rc \
- kstash-version.rc \
libkdc-version.rc \
- string2key-version.rc \
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
@@ -44,9 +44,7 @@
gen_files_digest = asn1_digest_asn1.x
gen_files_kx509 = asn1_kx509_asn1.x
-noinst_PROGRAMS = asn1_gen
-
-libexec_heimdal_PROGRAMS = asn1_compile asn1_print
+noinst_PROGRAMS = asn1_gen asn1_compile asn1_print
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
@@ -13,12 +13,8 @@
libcom_err_la_LIBADD = $(LIB_libintl)
-bin_PROGRAMS = compile_et
-
include_HEADERS = com_err.h com_right.h
-compile_et_SOURCES = compile_et.c compile_et.h parse.y lex.l lex.h
-
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 @@
EXTRA_DIST = \
NTMakefile \
- 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 @@
$(LIB_hcrypto) \
$(LIBADD_roken)
-man_MANS = gssapi.3 gss_acquire_cred.3 mech/mech.5
-
include_HEADERS = gssapi.h
noinst_HEADERS = \
gssapi_mech.h \
@@ -301,7 +299,6 @@
check_PROGRAMS = test_acquire_cred $(TESTS)
-bin_PROGRAMS = gsstool
noinst_PROGRAMS = test_cred test_kcred test_context test_ntlm
test_context_SOURCES = test_context.c test_common.c test_common.h
@@ -318,25 +315,13 @@
# gss
-dist_gsstool_SOURCES = gsstool.c
-nodist_gsstool_SOURCES = gss-commands.c gss-commands.h
-
-gsstool_LDADD = libgssapi.la \
- $(top_builddir)/lib/sl/libsl.la \
- $(top_builddir)/lib/krb5/libkrb5.la \
- $(LIB_readline) \
- $(LIB_roken)
-
gss-commands.c gss-commands.h: gss-commands.in
$(SLC) $(srcdir)/gss-commands.in
-$(gsstool_OBJECTS): gss-commands.h
-
EXTRA_DIST = \
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 @@
$(heim_verbose)$(ASN1_COMPILE) $(srcdir)/crmf.asn1 crmf_asn1 || (rm -f crmf_asn1_files ; exit 1)
ALL_OBJECTS = $(libhx509_la_OBJECTS)
-ALL_OBJECTS += $(hxtool_OBJECTS)
HX509_PROTOS = $(srcdir)/hx509-protos.h $(srcdir)/hx509-private.h
@@ -153,24 +152,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
-bin_PROGRAMS = hxtool
-
-hxtool-commands.c hxtool-commands.h: hxtool-commands.in $(SLC)
- $(heim_verbose)$(SLC) $(srcdir)/hxtool-commands.in
-
-dist_hxtool_SOURCES = hxtool.c
-nodist_hxtool_SOURCES = hxtool-commands.c hxtool-commands.h
-
-$(hxtool_OBJECTS): hxtool-commands.h hx509_err.h
-
-hxtool_CPPFLAGS = $(INCLUDE_hcrypto)
-hxtool_LDADD = \
- libhx509.la \
- $(top_builddir)/lib/asn1/libasn1.la \
- $(LIB_hcrypto) \
- $(LIB_roken) \
- $(top_builddir)/lib/sl/libsl.la
-
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 @@
$(gen_files_crmf) crmf_asn1_files crmf_asn1{,-priv}.h* \
crmf_asn1-template.[chx]* \
$(TESTS) \
- hxtool-commands.c hxtool-commands.h *.tmp \
+ *.tmp \
request.out \
out.pem out2.pem \
sd sd.pem \
@@ -312,12 +293,10 @@
EXTRA_DIST = \
NTMakefile \
- hxtool-version.rc \
libhx509-exports.def \
version-script.map \
crmf.asn1 \
hx509_err.et \
- hxtool-commands.in \
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 @@
libkadm5srv_la_LDFLAGS += $(LDFLAGS_VERSION_SCRIPT)$(srcdir)/version-script.map
endif
-sbin_PROGRAMS = iprop-log
-check_PROGRAMS = default_keys
-noinst_PROGRAMS = test_pw_quality
-
noinst_LTLIBRARIES = sample_passwd_check.la
sample_passwd_check_la_SOURCES = sample_passwd_check.c
@@ -26,8 +22,6 @@
libkadm5clnt_la_LIBADD = \
$(LIB_com_err) ../krb5/libkrb5.la $(LIBADD_roken)
-libexec_PROGRAMS = ipropd-master ipropd-slave
-
default_keys_SOURCES = default_keys.c
kadm5includedir = $(includedir)/kadm5
@@ -117,15 +111,6 @@
libkadm5srv_la_DEPENDENCIES = \
version-script.map
-dist_iprop_log_SOURCES = iprop-log.c
-nodist_iprop_log_SOURCES = iprop-commands.c
-
-ipropd_master_SOURCES = ipropd_master.c ipropd_common.c iprop.h kadm5_locl.h
-
-ipropd_slave_SOURCES = ipropd_slave.c ipropd_common.c iprop.h kadm5_locl.h
-
-man_MANS = kadm5_pwcheck.3 iprop.8 iprop-log.8
-
LDADD = \
libkadm5srv.la \
$(top_builddir)/lib/hdb/libhdb.la \
@@ -137,25 +122,8 @@
$(LIB_dlopen) \
$(LIB_pidfile)
-iprop_log_LDADD = \
- libkadm5srv.la \
- $(top_builddir)/lib/hdb/libhdb.la \
- $(top_builddir)/lib/krb5/libkrb5.la \
- $(top_builddir)/lib/asn1/libasn1.la \
- $(LIB_hcrypto) \
- $(top_builddir)/lib/sl/libsl.la \
- $(LIB_readline) \
- $(LIB_roken) \
- $(DBLIB) \
- $(LIB_dlopen) \
- $(LIB_pidfile)
-
-
-iprop-commands.c iprop-commands.h: iprop-commands.in
- $(SLC) $(srcdir)/iprop-commands.in
$(libkadm5srv_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 @@
ALL_OBJECTS = $(libkadm5clnt_la_OBJECTS)
ALL_OBJECTS += $(libkadm5srv_la_OBJECTS)
-ALL_OBJECTS += $(ipropd_master_OBJECTS)
-ALL_OBJECTS += $(ipropd_slave_OBJECTS)
-ALL_OBJECTS += $(iprop_log_OBJECTS)
-ALL_OBJECTS += $(test_pw_quality_OBJECTS)
ALL_OBJECTS += $(sample_passwd_check_la_OBJECTS)
-ALL_OBJECTS += $(default_keys_OBJECTS)
$(ALL_OBJECTS): $(srcdir)/kadm5-protos.h $(srcdir)/kadm5-private.h
@@ -203,7 +166,6 @@
libkadm5srv-exports.def \
kadm5_err.et \
iprop-commands.in \
- $(man_MANS) \
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 @@
EXTRA_DIST = NTMakefile afsl.exp afslib.exp $(man_MANS)
-man_MANS = kafs.3
-
# 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
@@ -4,8 +4,6 @@
AM_CPPFLAGS += $(INCLUDE_hcrypto) -I../com_err -I$(srcdir)/../com_err $(INCLUDE_sqlite3) $(INCLUDE_libintl)
-bin_PROGRAMS = verify_krb5_conf
-
noinst_PROGRAMS = \
krbhst-test \
test_alname \
@@ -252,7 +250,6 @@
endif
ALL_OBJECTS = $(libkrb5_la_OBJECTS)
-ALL_OBJECTS += $(verify_krb5_conf_OBJECTS)
ALL_OBJECTS += $(librfc3961_la_OBJECTS)
ALL_OBJECTS += $(librfc3961_la_OBJECTS)
ALL_OBJECTS += $(krbhst_test_OBJECTS)
@@ -313,52 +310,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
-man_MANS = \
- kerberos.8 \
- krb5.conf.5 \
- krb5-plugin.7 \
- krb524_convert_creds_kdc.3 \
- krb5_425_conv_principal.3 \
- krb5_acl_match_file.3 \
- krb5_aname_to_localname.3 \
- krb5_appdefault.3 \
- krb5_auth_context.3 \
- krb5_c_make_checksum.3 \
- krb5_check_transited.3 \
- krb5_create_checksum.3 \
- krb5_creds.3 \
- krb5_digest.3 \
- krb5_eai_to_heim_errno.3 \
- krb5_encrypt.3 \
- krb5_find_padata.3 \
- krb5_generate_random_block.3 \
- krb5_get_all_client_addrs.3 \
- krb5_get_credentials.3 \
- krb5_get_creds.3 \
- krb5_get_forwarded_creds.3 \
- krb5_get_in_cred.3 \
- krb5_get_init_creds.3 \
- krb5_get_krbhst.3 \
- krb5_getportbyname.3 \
- krb5_init_context.3 \
- krb5_is_thread_safe.3 \
- krb5_krbhst_init.3 \
- krb5_mk_req.3 \
- krb5_mk_safe.3 \
- krb5_openlog.3 \
- krb5_parse_name.3 \
- krb5_principal.3 \
- krb5_rcache.3 \
- krb5_rd_error.3 \
- krb5_rd_safe.3 \
- krb5_set_default_realm.3 \
- krb5_set_password.3 \
- krb5_string_to_key.3 \
- krb5_timeofday.3 \
- krb5_verify_init_creds.3 \
- krb5_verify_user.3 \
- verify_krb5_conf.8
-
dist_include_HEADERS = \
krb5.h \
$(srcdir)/krb5-protos.h \
@@ -397,7 +348,6 @@
krb_err.et \
heim_err.et \
k524_err.et \
- $(man_MANS) \
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 @@
rokenincludedir = $(includedir)/roken
nodist_rokeninclude_HEADERS = $(XHEADERS)
-man_MANS = getarg.3 parse_time.3 rtbl.3 ecalloc.3
-
SUFFIXES += .hin
.hin.h:
cp $< $@
@@ -238,7 +236,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
@@ -25,16 +25,8 @@
# install these?
-libexec_heimdal_PROGRAMS = slc
-
-slc_SOURCES = slc-gram.y slc-lex.l slc.h
-
CLEANFILES = snprintf.c strtok_r.c strdup.c strupr.c slc-lex.c
-LDADD = libsl.la $(LIB_roken)
-
-slc_LDADD = $(LEXLIB) $(LDADD)
-
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
@@ -83,12 +83,6 @@
$(test_punycode_OBJECTS): $(built_tests)
-bin_PROGRAMS = idn-lookup
-
-idn_lookup_SOURCES = idn-lookup.c
-
-LDADD = libwind.la $(LIB_roken)
-
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
@@ -2,12 +2,7 @@
include $(top_srcdir)/Makefile.am.common
-if KCM
-kcm_dir = kcm
-endif
-
-SUBDIRS= include lib kuser kdc admin kadmin kpasswd
-SUBDIRS+= $(kcm_dir) appl tools tests packages etc po
+SUBDIRS= include lib kdc
if HEIMDAL_DOCUMENTATION
SUBDIRS+= doc

11
libheimdal.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Sep 05 07:57:33 UTC 2015 - joerg.lorenzen@ki.tng.de
- Added a patched instead of the original tarball because only
shared libraries will be build and source files of these (not to
be build) programs have problematic licenses.
- Added script heimdal-patch-source.sh to sources.
- Added patch heimdal-patched.diff that fixes configure.ac and
several Makefile.am files to successfully build patched source.
- Removed unneeded dependencies in spec file for build.
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Sep 02 08:04:33 UTC 2015 - joerg.lorenzen@ki.tng.de Wed Sep 02 08:04:33 UTC 2015 - joerg.lorenzen@ki.tng.de

60
libheimdal.spec
View File

@ -23,33 +23,32 @@ Group: System/Libraries
Version: 1.6rc2 Version: 1.6rc2
Release: 0 Release: 0
Url: http://www.h5l.org Url: http://www.h5l.org
Source0: http://www.h5l.org/dist/src/heimdal-%{version}.tar.gz # patched source can be created with script heimdal-patch-source.sh:
Source1: http://www.h5l.org/dist/src/heimdal-%{version}.tar.gz.asc # ./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 Patch0: heimdal-version-script-client.map.patch
Patch1: heimdal-patched.diff
%if 0%{?sles_version} == 11 %if 0%{?sles_version} == 11
BuildRequires: libcom_err-devel
BuildRequires: sqlite3-devel BuildRequires: sqlite3-devel
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXau-devel
BuildRequires: xorg-x11-libXt-devel
%else %else
BuildRequires: pkgconfig(com_err)
BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(sqlite3)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xau)
BuildRequires: pkgconfig(xt)
%endif %endif
%if 0%{suse_version} > 1315 %if 0%{suse_version} > 1315
BuildRequires: pkgconfig(ncurses) >= 5.3 BuildRequires: pkgconfig(ncurses) >= 5.3
%else %else
BuildRequires: ncurses-devel >= 5.3 BuildRequires: ncurses-devel >= 5.3
%endif %endif
BuildRequires: bison
BuildRequires: db-devel >= 4.8 BuildRequires: db-devel >= 4.8
BuildRequires: e2fsprogs-devel BuildRequires: readline-devel
BuildRequires: automake >= 1.11
BuildRequires: bison
BuildRequires: flex BuildRequires: flex
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pam-devel BuildRequires: pam-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: readline-devel
BuildRequires: texinfo BuildRequires: texinfo
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -68,6 +67,20 @@ libraries are required by 64bit package of ICAClient version 13.2.
Summary: Libraries of Kerberos 5 implementation Summary: Libraries of Kerberos 5 implementation
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libheimdal = %{version} Requires: libheimdal = %{version}
%if 0%{?sles_version} == 11
Requires: libcom_err-devel
Requires: sqlite3-devel
%else
Requires: pkgconfig(com_err)
Requires: pkgconfig(sqlite3)
%endif
%if 0%{suse_version} > 1315
Requires: pkgconfig(ncurses) >= 5.3
%else
Requires: ncurses-devel >= 5.3
%endif
Requires: db-devel >= 4.8
Requires: glibc-devel
Conflicts: krb5-devel Conflicts: krb5-devel
Conflicts: krb5-mini-devel Conflicts: krb5-mini-devel
@ -84,9 +97,11 @@ libraries are required by 64bit package of ICAClient version 13.2.
%prep %prep
%setup -q -n heimdal-%{version} %setup -q -n heimdal-%{version}
%patch0 %patch0 -p0
%patch1 -p1
%build %build
autoreconf -fi
%configure \ %configure \
--with-sqlite3=%{_prefix} --with-sqlite3=%{_prefix}
make %{?_smp_mflags} make %{?_smp_mflags}
@ -94,24 +109,8 @@ make %{?_smp_mflags}
%install %install
%make_install %make_install
rm -rf %{buildroot}%{_bindir}
rm -rf %{buildroot}%{_sbindir}
rm -rf %{buildroot}%{_mandir}
rm -rf %{buildroot}%{_libdir}/*.a rm -rf %{buildroot}%{_libdir}/*.a
rm -rf %{buildroot}%{_libdir}/*.la rm -rf %{buildroot}%{_libdir}/*.la
%ifarch x86_64
%if 0%{?sles_version} == 11
shopt -s extglob
rm -rf %{buildroot}%{_libexecdir}/!(*.so*|pkgconfig)
shopt -u extglob
%else
rm -rf %{buildroot}%{_libexecdir}
%endif
%else
shopt -s extglob
rm -rf %{buildroot}%{_libexecdir}/!(*.so*|pkgconfig)
shopt -u extglob
%endif
%post %post
/sbin/ldconfig /sbin/ldconfig
@ -130,9 +129,6 @@ shopt -u extglob
%defattr(-,root,root) %defattr(-,root,root)
%doc LICENSE NEWS README TODO %doc LICENSE NEWS README TODO
%{_libdir}/libasn1.so.8* %{_libdir}/libasn1.so.8*
%if 0%{?sles_version} == 11
%{_libdir}/libcom_err.so.1*
%endif
%{_libdir}/libgssapi.so.3* %{_libdir}/libgssapi.so.3*
%{_libdir}/libhcrypto.so.4* %{_libdir}/libhcrypto.so.4*
%{_libdir}/libhdb.so.9* %{_libdir}/libhdb.so.9*
@ -149,7 +145,6 @@ shopt -u extglob
%{_libdir}/libroken.so.18* %{_libdir}/libroken.so.18*
%{_libdir}/libsl.so.0* %{_libdir}/libsl.so.0*
%{_libdir}/libwind.so.0* %{_libdir}/libwind.so.0*
%{_libdir}/windc.so.0*
%{_infodir}/*.info.gz %{_infodir}/*.info.gz
%files devel %files devel
@ -167,6 +162,5 @@ shopt -u extglob
%dir %{_includedir}/roken %dir %{_includedir}/roken
%{_includedir}/roken/*.h %{_includedir}/roken/*.h
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%changelog %changelog