-diff -urNbB heimdal-0.7.org/cf/Makefile.am.common heimdal-0.7/cf/Makefile.am.common
---- heimdal-0.7.org/cf/Makefile.am.common 2005-06-16 18:28:31.000000000 +0200
-+++ heimdal-0.7/cf/Makefile.am.common 2005-07-03 19:11:48.112415176 +0200
-@@ -126,84 +126,7 @@
- .x.c:
+--- heimdal-7.1.0/cf/Makefile.am.common.orig 2017-01-25 20:23:32.137466687 +0100
++++ heimdal-7.1.0/cf/Makefile.am.common 2017-01-25 20:23:36.384133306 +0100
+@@ -149,99 +149,7 @@
+ .hx.h:
@cmp -s $< $@ 2> /dev/null || cp $< $@
--SUFFIXES += .1 .3 .5 .8 .cat1 .cat3 .cat5 .cat8
+-SUFFIXES += .1 .3 .5 .7 .8 .cat1 .cat3 .cat5 .cat7 .cat8
-
-NROFF_MAN = groff -mandoc -Tascii
-#NROFF_MAN = nroff -man
- $(NROFF_MAN) $< > $@
-.5.cat5:
- $(NROFF_MAN) $< > $@
+-.7.cat7:
+- $(NROFF_MAN) $< > $@
-.8.cat8:
- $(NROFF_MAN) $< > $@
-
- $(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x; \
- done
-
+-dist-cat7-mans:
+- @foo='$(man7_MANS)'; \
+- bar='$(man_MANS)'; \
+- for i in $$bar; do \
+- case $$i in \
+- *.7) foo="$$foo $$i";; \
+- esac; done ;\
+- for i in $$foo; do \
+- x=`echo $$i | sed 's/\.[^.]*$$/.cat7/'`; \
+- echo "$(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x"; \
+- $(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x; \
+- done
+-
-dist-cat8-mans:
- @foo='$(man8_MANS)'; \
- bar='$(man_MANS)'; \
- $(NROFF_MAN) $(srcdir)/$$i > $(distdir)/$$x; \
- done
-
--dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat8-mans
+-dist-hook: dist-cat1-mans dist-cat3-mans dist-cat5-mans dist-cat7-mans dist-cat8-mans
-
-install-cat-mans:
-- $(SHELL) $(top_srcdir)/cf/install-catman.sh install "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS)
+- $(SHELL) $(top_srcdir)/cf/install-catman.sh install "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man7_MANS) $(man8_MANS)
-
-uninstall-cat-mans:
-- $(SHELL) $(top_srcdir)/cf/install-catman.sh uninstall "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man8_MANS)
+- $(SHELL) $(top_srcdir)/cf/install-catman.sh uninstall "$(INSTALL_DATA)" "$(mkinstalldirs)" "$(srcdir)" "$(DESTDIR)$(mandir)" '$(CATMANEXT)' $(man_MANS) $(man1_MANS) $(man3_MANS) $(man5_MANS) $(man7_MANS) $(man8_MANS)
-
-install-data-hook: install-cat-mans
-uninstall-hook: uninstall-cat-mans
-
-+SUFFIXES += .1 .3 .5 .8
++SUFFIXES += .1 .3 .5 .7 .8
.et.h:
$(COMPILE_ET) $<
-
--- /dev/null
+--- heimdal-7.1.0/lib/hdb/hdb-protos.h.orig 2016-12-20 05:24:44.000000000 +0100
++++ heimdal-7.1.0/lib/hdb/hdb-protos.h 2017-01-25 21:51:26.547406462 +0100
+@@ -370,6 +370,7 @@
+ const hdb_entry */*e*/,
+ krb5_kvno /*kvno*/);
+
++#ifndef OPENLDAP_MODULE
+ krb5_error_code
+ hdb_ldap_create (
+ krb5_context /*context*/,
+@@ -381,6 +382,7 @@
+ krb5_context /*context*/,
+ HDB ** /*db*/,
+ const char */*arg*/);
++#endif
+
+ krb5_error_code
+ hdb_list_builtin (
---- heimdal-1.4/tools/krb5-config.in.orig 2010-09-13 09:23:34.000000000 +0200
-+++ heimdal-1.4/tools/krb5-config.in 2010-10-07 08:45:53.207740205 +0200
-@@ -120,7 +120,7 @@
- fi
-
- if test "$do_libs" = "yes"; then
-- lib_flags="-L${libdir}"
-+ lib_flags=
- case $library in
- gssapi)
- lib_flags="$lib_flags -lgssapi -lheimntlm"
-@@ -142,7 +142,7 @@
- echo $lib_flags
- fi
- if test "$do_cflags" = "yes"; then
-- echo "-I${includedir} @INCLUDE_hcrypto@"
-+ echo "@INCLUDE_hcrypto@"
- fi
-
- exit 0
+--- heimdal-7.1.0/tools/krb5-config.in.orig 2016-11-29 02:35:28.000000000 +0100
++++ heimdal-7.1.0/tools/krb5-config.in 2017-01-25 20:56:54.544110490 +0100
+@@ -236,7 +236,7 @@
+ if test X"$do_lib_deps" = X"yes"; then
+ lib_flags="$lib_flags $deplibs"
+ fi
+- if test X"$libdir" != X/usr/lib; then
++ if test X"$libdir" != X/usr/lib -a X"$libdir" != X/usr/lib64 -a X"$libdir" != X/usr/libx32; then
+ lib_flags="-L${libdir} $lib_flags"
+ if test X"$rpath_flag" != X; then
+ lib_flags="${rpath_flag}${libdir} $lib_flags"
--- 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,19 +98,21 @@
+++ /dev/null
-diff -urN heimdal-0.7.org/appl/ftp/ftpd/pathnames.h heimdal-0.7/appl/ftp/ftpd/pathnames.h
---- heimdal-0.7.org/appl/ftp/ftpd/pathnames.h 2005-06-16 18:29:12.000000000 +0200
-+++ heimdal-0.7/appl/ftp/ftpd/pathnames.h 2005-07-03 18:55:47.464455864 +0200
-@@ -50,14 +50,14 @@
- #endif
-
- #ifndef _PATH_FTPUSERS
--#define _PATH_FTPUSERS SYSCONFDIR "/ftpusers"
-+#define _PATH_FTPUSERS "/etc/ftpd/ftpusers"
- #endif
-
--#define _PATH_FTPCHROOT SYSCONFDIR "/ftpchroot"
--#define _PATH_FTPWELCOME SYSCONFDIR "/ftpwelcome"
--#define _PATH_FTPLOGINMESG SYSCONFDIR "/motd"
-+#define _PATH_FTPCHROOT "/etc/ftpd/ftpchroot"
-+#define _PATH_FTPWELCOME "/etc/ftpd/ftpwelcome"
-+#define _PATH_FTPLOGINMESG "/etc/ftpd/motd"
-
- #ifndef _PATH_ISSUE
--#define _PATH_ISSUE SYSCONFDIR "/issue"
-+#define _PATH_ISSUE "/etc/ftpd/issue"
- #endif
--#define _PATH_ISSUE_NET SYSCONFDIR "/issue.net"
-+#define _PATH_ISSUE_NET "/etc/ftpd/issue.net"
dpagaix_CFLAGS = $(dpagaix_cflags)
dpagaix_LDFLAGS = $(dpagaix_ldflags)
-diff -ur heimdal-1.3.1/appl/ftp/ftpd/Makefile.am heimdal-1.3.1-sbin/appl/ftp/ftpd/Makefile.am
---- heimdal-1.3.1/appl/ftp/ftpd/Makefile.am 2009-11-21 16:41:51.000000000 +0100
-+++ heimdal-1.3.1-sbin/appl/ftp/ftpd/Makefile.am 2009-12-07 17:20:32.678628545 +0100
-@@ -4,7 +4,7 @@
-
- AM_CPPFLAGS += -I$(srcdir)/../common $(INCLUDE_krb4) -DFTP_SERVER
-
--libexec_PROGRAMS = ftpd
-+sbin_PROGRAMS = ftpd
-
- CHECK_LOCAL =
-
diff -ur heimdal-1.3.1/appl/kf/Makefile.am heimdal-1.3.1-sbin/appl/kf/Makefile.am
--- heimdal-1.3.1/appl/kf/Makefile.am 2009-11-21 16:41:51.000000000 +0100
+++ heimdal-1.3.1-sbin/appl/kf/Makefile.am 2009-12-07 17:20:32.681638741 +0100
man_MANS = kf.1 kfd.8
-diff -ur heimdal-1.3.1/appl/kx/Makefile.am heimdal-1.3.1-sbin/appl/kx/Makefile.am
---- heimdal-1.3.1/appl/kx/Makefile.am 2009-11-21 16:41:51.000000000 +0100
-+++ heimdal-1.3.1-sbin/appl/kx/Makefile.am 2009-12-07 17:20:32.684638988 +0100
-@@ -10,13 +10,13 @@
-
- bin_PROGRAMS = kx
- bin_SCRIPTS = rxterm rxtelnet tenletxr
--libexec_PROGRAMS = kxd
-+sbin_PROGRAMS = kxd
-
- else
-
- bin_PROGRAMS =
- bin_SCRIPTS =
--libexec_PROGRAMS =
-+sbin_PROGRAMS =
-
- endif
-
-diff -ur heimdal-1.3.1/appl/popper/Makefile.am heimdal-1.3.1-sbin/appl/popper/Makefile.am
---- heimdal-1.3.1/appl/popper/Makefile.am 2009-11-21 16:41:51.000000000 +0100
-+++ heimdal-1.3.1-sbin/appl/popper/Makefile.am 2009-12-07 17:20:32.687628025 +0100
-@@ -4,7 +4,7 @@
-
- noinst_PROGRAMS = pop_debug
-
--libexec_PROGRAMS = popper
-+sbin_PROGRAMS = popper
-
- popper_SOURCES = \
- pop_auth.c \
-diff -ur heimdal-1.3.1/appl/push/Makefile.am heimdal-1.3.1-sbin/appl/push/Makefile.am
---- heimdal-1.3.1/appl/push/Makefile.am 2009-11-21 16:41:51.000000000 +0100
-+++ heimdal-1.3.1-sbin/appl/push/Makefile.am 2009-12-07 17:20:32.690628323 +0100
+--- heimdal-7.1.0/kadmin/Makefile.am.orig 2017-01-25 21:23:47.817425405 +0100
++++ heimdal-7.1.0/kadmin/Makefile.am 2017-01-25 21:26:46.720756697 +0100
@@ -6,7 +6,7 @@
- bin_SCRIPTS = pfrom
+ bin_PROGRAMS = kadmin
--libexec_PROGRAMS = push
-+sbin_PROGRAMS = push
-
- push_SOURCES = push.c push_locl.h
-
-diff -ur heimdal-1.3.1/appl/rsh/Makefile.am heimdal-1.3.1-sbin/appl/rsh/Makefile.am
---- heimdal-1.3.1/appl/rsh/Makefile.am 2009-11-21 16:41:51.000000000 +0100
-+++ heimdal-1.3.1-sbin/appl/rsh/Makefile.am 2009-12-07 17:20:32.693503567 +0100
-@@ -8,7 +8,7 @@
-
- man_MANS = rsh.1 rshd.8
-
--libexec_PROGRAMS = rshd
-+sbin_PROGRAMS = rshd
-
- rsh_SOURCES = rsh.c common.c rsh_locl.h
-
-diff -ur heimdal-1.3.1/appl/telnet/telnetd/Makefile.am heimdal-1.3.1-sbin/appl/telnet/telnetd/Makefile.am
---- heimdal-1.3.1/appl/telnet/telnetd/Makefile.am 2009-11-21 16:41:51.000000000 +0100
-+++ heimdal-1.3.1-sbin/appl/telnet/telnetd/Makefile.am 2009-12-07 17:20:32.696628158 +0100
-@@ -4,7 +4,7 @@
-
- AM_CPPFLAGS += -I$(srcdir)/.. $(INCLUDE_hcrypto)
-
--libexec_PROGRAMS = telnetd
-+sbin_PROGRAMS = telnetd
-
- CHECK_LOCAL =
-
-diff -ur heimdal-1.3.1/kadmin/Makefile.am heimdal-1.3.1-sbin/kadmin/Makefile.am
---- heimdal-1.3.1/kadmin/Makefile.am 2009-12-07 17:20:42.684504134 +0100
-+++ heimdal-1.3.1-sbin/kadmin/Makefile.am 2009-12-07 17:20:57.712503501 +0100
-@@ -4,9 +4,7 @@
-
- AM_CPPFLAGS += $(INCLUDE_libintl) $(INCLUDE_readline) $(INCLUDE_hcrypto) -I$(srcdir)/../lib/krb5 -I$(top_builddir)/include/gssapi
-
--sbin_PROGRAMS = kadmin
--
-libexec_PROGRAMS = kadmind
-+sbin_PROGRAMS = kadmin kadmind
++sbin_PROGRAMS = kadmind
- man_MANS = kadmin.8 kadmind.8
+ man_MANS = kadmin.1 kadmind.8
diff -ur heimdal-1.3.1/kcm/Makefile.am heimdal-1.3.1-sbin/kcm/Makefile.am
--- heimdal-1.3.1/kcm/Makefile.am 2009-12-07 17:20:42.687503717 +0100
+++ /dev/null
-origin:
-http://kerberos.996246.n3.nabble.com/build-failure-with-texinfo-5-td36872.html
-http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=711221
---- a/doc/whatis.texi 2012-12-10 00:06:44.000000000 +0200
-+++ b/doc/whatis.texi 2013-04-08 15:11:44.646165777 +0300
-@@ -36,8 +36,9 @@
- @end ifinfo
-
--@tex
--@def@xsub#1{$_{#1}$}
--@global@let@sub=@xsub
--@end tex
-+@iftex
-+@macro sub{arg}
-+@textsubscript{\arg\}
-+@end macro
-+@end iftex
-
- @ifhtml
---- a/doc/win2k.texi 2012-12-10 00:06:44.000000000 +0200
-+++ b/doc/win2k.texi 2013-04-08 16:17:21.316961234 +0300
-@@ -311,4 +311,5 @@
-
- @itemize @bullet
- @item pwdump2
--@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}@end itemize
-+@uref{http://www.bindview.com/Support/RAZOR/Utilities/Windows/pwdump2_readme.cfm}
-+@end itemize
---- heimdal-1.5.3/doc/hx509.texi.orig 2013-11-01 22:28:15.135110213 +0100
-+++ heimdal-1.5.3/doc/hx509.texi 2013-11-02 08:18:15.646957931 +0100
-@@ -34,9 +34,20 @@
- @subtitle 2008
- @author Love Hörnquist Åstrand
-
-+@iftex
- @def@copynext{@vskip 20pt plus 1fil}
- @def@copyrightstart{}
- @def@copyrightend{}
-+@end iftex
-+@ifinfo
-+@macro copynext
-+@end macro
-+@macro copyrightstart
-+@end macro
-+@macro copyrightend
-+@end macro
-+@end ifinfo
-+
- @page
- @copyrightstart
- Copyright (c) 1994-2008 Kungliga Tekniska Högskolan
-@@ -183,6 +194,13 @@
- * CMS signing and encryption::
- * Certificate matching::
- * Software PKCS 11 module::
-+* Creating a CA certificate::
-+* Issuing certificates::
-+* Issuing CRLs::
-+* Application requirements::
-+* CMS background::
-+* Matching syntax::
-+* How to use the PKCS11 module::
-
- @detailmenu
- --- The Detailed Node Listing ---
Source9: %{name}-rshd.inetd
Source10: %{name}-telnetd.inetd
Source11: %{name}-kadmind.inetd
-Patch0: %{name}-paths.patch
+#Patch0: %{name}-paths.patch
+Patch0: %{name}-hdb-ldap.patch
Patch1: %{name}-am_man_fixes.patch
Patch2: %{name}-amfix.patch
Patch3: %{name}-dbpaths.patch
Patch11: %{name}-krb5config-nosysdirs.patch
Patch12: %{name}-tinfo.patch
Patch13: %{name}-missing-exports.patch
-Patch14: %{name}-texinfo.patch
+#Patch14: %{name}-texinfo.patch
URL: http://www.h5l.org/
BuildRequires: autoconf >= 2.62
BuildRequires: automake >= 1:1.10.3
%package common
Summary: Heimdal essential config files and documentation
-Summary(pl.UTF-8): Niezbędne pliki konfiguracyjne i dokumentacja dla heimdala
+Summary(pl.UTF-8): Niezbędne pliki konfiguracyjne i dokumentacja dla Heimdala
Group: Networking
%description common
Package contains essential configs and documentation required by
-heimdal packages.
+Heimdal packages.
%description common -l pl.UTF-8
Pakiet zawiera niezbędne pliki konfiguracyjne i dokumentację dla
-heimdala.
+Heimdala.
%package libs
Summary: Heimdal shared libraries
-Summary(pl.UTF-8): Biblioteki współdzielone dla heimdala
+Summary(pl.UTF-8): Biblioteki współdzielone dla Heimdala
Group: Libraries
Requires: libcom_err >= 1.41.11
%description libs
This package contains shared libraries required by several of the
-other heimdal packages.
+other Heimdal packages.
%description libs -l pl.UTF-8
Ten pakiet zawiera biblioteki współdzielone wymagane przez kilka
-innych pakietów składowych heimdala.
+innych pakietów składowych Heimdala.
%package libs-common
Summary: Common libraries used by Heimdal programs
serwera KDC z projektu Heimdal.
%package devel
-Summary: Header files for heimdal
-Summary(pl.UTF-8): Pliki nagłówkowe i dokumentacja do bibliotek heimdal
+Summary: Header files for Heimdal
+Summary(pl.UTF-8): Pliki nagłówkowe i dokumentacja do bibliotek Heimdal
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
Requires: %{name}-libs-common = %{version}-%{release}
Conflicts: libgssglue-devel
%description devel
-contains files needed to compile and link software using the kerberos
-libraries.
+This package contains files needed to compile and link software using
+the Heimdal libraries.
%description devel -l pl.UTF-8
-Pliki nagłówkowe i dokumentacja do bibliotek heimdal.
+Pliki nagłówkowe do kompilowania programów przy użyciu bibliotek
+Heimdal.
%package static
-Summary: Static heimdal libraries
-Summary(pl.UTF-8): Biblioteki statyczne heimdal
+Summary: Static Heimdal libraries
+Summary(pl.UTF-8): Biblioteki statyczne Heimdal
Group: Development/Libraries
Requires: %{name}-devel = %{version}-%{release}
%description static
-Satatic heimdal libraries.
+Satatic Heimdal libraries.
%description static -l pl.UTF-8
-Biblioteki statyczne heimdal.
+Biblioteki statyczne Heimdal.
%package ldap
Summary: LDAP HDB plugin
%description ftp
The FTP package provides the standard UNIX command-line FTP client
-with kerberos authentication support. FTP is the file transfer
+with Kerberos authentication support. FTP is the file transfer
protocol, which is a widely used Internet protocol for transferring
files and for archiving files.
%description ftp -l pl.UTF-8
Ten pakiet dostarcza standardowego klienta FTP z wbudowaną obsługą
-kerberosa. FTP jest protokołem do przesyłania plików szeroko
+Kerberosa. FTP jest protokołem do przesyłania plików szeroko
rozpowszechnionym w Internecie.
%package rsh
%package daemons
Summary: Kerberos daemons programs for use on servers
-Summary(pl.UTF-8): Serwery popularnych usług, autoryzujące przy pomocy kerberosa
+Summary(pl.UTF-8): Serwery popularnych usług, autoryzujące przy pomocy Kerberosa
Group: Networking
Requires: %{name}-libs-common = %{version}-%{release}
%prep
%setup -q
-#%patch0 -p1 appl/ftp/ftpd is no longer there, along with more apps
-#%patch1 -p1
+%patch0 -p1
+%patch1 -p1
#%patch2 -p1 outdated?
%patch3 -p1
%patch4 -p1
%patch6 -p1
#%patch7 -p1
%patch8 -p1
-#%patch9 -p1 most of the apps are gone
+%patch9 -p1
%patch10 -p1
-#%patch11 -p1
+%patch11 -p1
%patch12 -p1
%patch13 -p1
-#%patch14 -p1
%{__rm} acinclude.m4
# cf/{libtool,lt*}.m4
--enable-kcm \
--enable-pthread-support \
--enable-shared \
+ --disable-silent-rules \
--enable-static \
--with-hdbdir=%{_localstatedir} \
--with-ipv6 \
cp -p lib/hdb/hdb.schema $RPM_BUILD_ROOT%{schemadir}
-mv $RPM_BUILD_ROOT%{_sbindir}/kcm $RPM_BUILD_ROOT/sbin/kcm
+%{__mv} $RPM_BUILD_ROOT%{_sbindir}/kcm $RPM_BUILD_ROOT/sbin/kcm
-mv $RPM_BUILD_ROOT%{_bindir}/su $RPM_BUILD_ROOT%{_bindir}/ksu
-mv $RPM_BUILD_ROOT%{_mandir}/man1/su.1 $RPM_BUILD_ROOT%{_mandir}/man1/ksu.1
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/su $RPM_BUILD_ROOT%{_bindir}/ksu
+%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/su.1 $RPM_BUILD_ROOT%{_mandir}/man1/ksu.1
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/kpasswdd
for l in $RPM_BUILD_ROOT%{_libdir}/lib{asn1,gssapi,heimbase,heimntlm,hx509,kafs,krb5,roken,wind}.so %{!?with_openssl:libhcrypto.so}; do
lib=`basename $l`
- mv -f $RPM_BUILD_ROOT%{_libdir}/$lib.* $RPM_BUILD_ROOT/%{_lib}
+ %{__mv} $RPM_BUILD_ROOT%{_libdir}/$lib.* $RPM_BUILD_ROOT/%{_lib}
ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/$lib.*.*) $RPM_BUILD_ROOT%{_libdir}/$lib
done
projects / packages / heimdal.git / commitdiff