summaryrefslogtreecommitdiff
path: root/package/heimdal
diff options
context:
space:
mode:
Diffstat (limited to 'package/heimdal')
-rw-r--r--package/heimdal/Config.in63
-rw-r--r--package/heimdal/Config.in.backend23
-rw-r--r--package/heimdal/Makefile124
-rw-r--r--package/heimdal/files/heimdal.init6
-rw-r--r--package/heimdal/patches/patch-configure11
-rw-r--r--package/heimdal/patches/patch-lib_roken_Makefile_in54
-rw-r--r--package/heimdal/patches/patch-lib_vers_Makefile_in4
7 files changed, 162 insertions, 123 deletions
diff --git a/package/heimdal/Config.in b/package/heimdal/Config.in
deleted file mode 100644
index 449d4c5f3..000000000
--- a/package/heimdal/Config.in
+++ /dev/null
@@ -1,63 +0,0 @@
-config ADK_COMPILE_HEIMDAL
- prompt "heimdal........................... Heimdal kerberos software"
- bool
- default n
-
-config ADK_COMPILE_HEIMDAL_WITH_PKINIT
- prompt "Enable PK-INIT"
- bool
- depends on ADK_COMPILE_HEIMDAL
- default n
-
-config ADK_PACKAGE_HEIMDAL_SERVER
- prompt "heimdal-server.................... heimdal kerberos server"
- tristate
- depends on ADK_COMPILE_HEIMDAL
- select ADK_PACKAGE_LIBPTHREAD
- select ADK_PACKAGE_LIBOPENSSL
- select ADK_PACKAGE_LIBNCURSES
- select ADK_PACKAGE_HEIMDAL_LIBS
- select ADK_PACKAGE_HEIMDAL_CLIENT_LIBS
- default n
- help
- http://www.h5l.org
-
-choice
-prompt "Database backend"
-depends on ADK_PACKAGE_HEIMDAL_SERVER
-default ADK_COMPILE_HEIMDAL_WITH_DB_BDB
-
-config ADK_COMPILE_HEIMDAL_WITH_DB_BDB
- bool "Berkeley DB backend"
- select ADK_PACKAGE_LIBDB
- help
- Use Oracle Berkeley DB as kerberos database backend.
-
-config ADK_COMPILE_HEIMDAL_WITH_DB_LDAP
- bool "LDAP backend"
- select ADK_PACKAGE_LIBOPENLDAP
- help
- Use OpenLDAP as kerberos database backend.
- (Useful for SSO setup)
-
-endchoice
-
-config ADK_PACKAGE_HEIMDAL_LIBS
- prompt "heimdal-libs...................... heimdal kerberos libraries"
- tristate
- depends on ADK_COMPILE_HEIMDAL
- select ADK_PACKAGE_LIBPTHREAD
- select ADK_PACKAGE_LIBOPENSSL
- default n
- help
- http://www.h5l.org
-
-config ADK_PACKAGE_HEIMDAL_CLIENT_LIBS
- prompt "heimdal-client-libs............... heimdal kerberos client libraries"
- tristate
- depends on ADK_COMPILE_HEIMDAL
- select ADK_PACKAGE_LIBPTHREAD
- select ADK_PACKAGE_LIBOPENSSL
- default n
- help
- http://www.h5l.org
diff --git a/package/heimdal/Config.in.backend b/package/heimdal/Config.in.backend
new file mode 100644
index 000000000..f606c15c2
--- /dev/null
+++ b/package/heimdal/Config.in.backend
@@ -0,0 +1,23 @@
+choice
+prompt "Database backend"
+depends on ADK_PACKAGE_HEIMDAL_SERVER
+default ADK_COMPILE_HEIMDAL_WITH_DB_BDB
+
+config ADK_COMPILE_HEIMDAL_WITH_DB_BDB
+ bool "Berkeley DB backend"
+ select ADK_PACKAGE_LIBDB
+ help
+ Use Oracle Berkeley DB as kerberos database backend.
+
+config ADK_COMPILE_HEIMDAL_WITH_DB_LDAP
+ bool "LDAP backend"
+ select ADK_PACKAGE_LIBOPENLDAP
+ select ADK_PACKAGE_LIBNCURSES
+ select ADK_PACKAGE_LIBCOM_ERR
+ select ADK_COMPILE_HEIMDAL
+ help
+ Use OpenLDAP as kerberos database backend.
+ (Useful for SSO setup)
+
+endchoice
+
diff --git a/package/heimdal/Makefile b/package/heimdal/Makefile
index 3ae793bc0..96e1e2406 100644
--- a/package/heimdal/Makefile
+++ b/package/heimdal/Makefile
@@ -9,7 +9,15 @@ PKG_RELEASE:= 1
PKG_MD5SUM:= 6e5028077e2a6b101a4a72801ba71b9e
PKG_DESCR:= Kerberos 5 server
PKG_SECTION:= net
-PKG_DEPENDS:= heimdal-libs heimdal-client-libs libncurses
+PKG_NOPARALLEL:= 1
+PKG_DEPENDS:= libheimdal libheimdal-client libncurses libcom-err
+PKG_BUILDDEP+= openssl ncurses e2fsprogs
+ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_BDB},y)
+PKG_BUILDDEP+= libdb
+endif
+ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
+PKG_BUILDDEP+= openldap
+endif
PKG_URL:= http://www.h5l.org
PKG_SITES:= http://www.h5l.org/dist/src/
@@ -19,6 +27,9 @@ PKG_SECTION_1:= libs
PKG_DESCR_2:= Kerberos 5 client libraries
PKG_SECTION_2:= libs
+PKG_FLAVOURS:= PKINIT
+PKGFD_PKINIT:= Enable PK-INIT
+
include $(TOPDIR)/mk/package.mk
ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_BDB),y)
@@ -30,21 +41,17 @@ PKG_DEPENDS+= libopenldap
endif
$(eval $(call PKG_template,HEIMDAL_SERVER,heimdal-server,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-$(eval $(call PKG_template,HEIMDAL_LIBS,heimdal-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
-$(eval $(call PKG_template,HEIMDAL_CLIENT_LIBS,heimdal-client-libs,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
+$(eval $(call PKG_template,LIBHEIMDAL,libheimdal,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_1},${PKG_SECTION_1}))
+$(eval $(call PKG_template,LIBHEIMDAL_CLIENT,libheimdal-client,$(PKG_VERSION)-${PKG_RELEASE},,${PKG_DESCR_2},${PKG_SECTION_2}))
CONFIGURE_OPTS:= --with-hdbdir=/etc/heimdal \
--disable-otp \
--disable-ndbm-db \
+ --libdir=/usr/lib/heimdal \
--libexecdir=/usr/sbin \
+ --with-ipv6 \
--sysconfdir=/etc/heimdal
-ifeq ($(ADK_IPV6),y)
-CONFIGURE_OPTS+= --with-ipv6
-else
-CONFIGURE_OPTS+= --without-ipv6
-endif
-
ifeq ($(ADK_COMPILE_HEIMDAL_WITH_DB_BDB),y)
CONFIGURE_ARGS+= --enable-berkeley-db
else
@@ -59,37 +66,36 @@ else
CONFIGURE_ARGS+= --without-openldap
endif
-ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
+ifeq ($(ADK_PACKAGE_HEIMDAL_PKINIT),y)
CONFIGURE_OPTS+= --enable-pk-init
else
CONFIGURE_OPTS+= --disable-pk-init
endif
-TCFLAGS+= -pthread
-CONFIGURE_STYLE= gnu
+TCFLAGS+= -I${STAGING_DIR}/usr/include/et -pthread
+
CONFIGURE_ARGS+= ${CONFIGURE_OPTS}
CONFIGURE_ENV+= ac_cv_func_getaddrinfo_numserv=yes
-BUILD_STYLE= auto
-INSTALL_STYLE= auto confprog
+
+ifeq ($(ADK_HOST_CYGWIN),y)
+EXEEXT:= .exe
+endif
pre-configure:
(cd ${WRKBUILD}; rm -rf config.{cache,status} ; \
- CFLAGS="-static" \
./configure ${CONFIGURE_OPTS} \
);
${MAKE} -C ${WRKBUILD}/lib/roken
${MAKE} -C ${WRKBUILD}/lib/vers
${MAKE} -C ${WRKBUILD}/lib/editline
- ${MAKE} -C ${WRKBUILD}/lib/com_err compile_et
- ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile
- ${MAKE} -C ${WRKBUILD}/lib/sl slc
- ${INSTALL_BIN} ${WRKBUILD}/lib/com_err/compile_et \
- ${STAGING_TOOLS}/bin
- ${INSTALL_BIN} ${WRKBUILD}/lib/asn1/asn1_compile \
+ ${MAKE} -C ${WRKBUILD}/lib/asn1 asn1_compile$(EXEEXT)
+ ${MAKE} -C ${WRKBUILD}/lib/sl slc$(EXEEXT)
+ ${INSTALL_BIN} ${WRKBUILD}/lib/asn1/asn1_compile$(EXEEXT) \
${STAGING_TOOLS}/bin
- ${INSTALL_BIN} ${WRKBUILD}/lib/sl/slc \
+ ${INSTALL_BIN} ${WRKBUILD}/lib/sl/slc$(EXEEXT) \
${STAGING_TOOLS}/bin
- ${MAKE} -C ${WRKBUILD}/lib/com_err clean
+ ${MAKE} -C ${WRKBUILD}/lib/asn1 clean
+ ${MAKE} -C ${WRKBUILD}/lib/roken clean
${MAKE} -C ${WRKBUILD} clean
post-install:
@@ -100,36 +106,54 @@ ifeq (${ADK_COMPILE_HEIMDAL_WITH_DB_LDAP},y)
endif
${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/etc/heimdal
${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/sbin
- ${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libkdc.so* ${IDIR_HEIMDAL_SERVER}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libkadm5srv.so* ${IDIR_HEIMDAL_SERVER}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libhdb.so* ${IDIR_HEIMDAL_SERVER}/usr/lib
- ${INSTALL_DATA} ./files/krb5.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal
- ${INSTALL_DATA} ./files/kdc.conf ${IDIR_HEIMDAL_SERVER}/etc/heimdal
- ${INSTALL_DATA} ./files/kadmind.acl ${IDIR_HEIMDAL_SERVER}/etc/heimdal
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/kdc ${IDIR_HEIMDAL_SERVER}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmind ${IDIR_HEIMDAL_SERVER}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/kpasswdd ${IDIR_HEIMDAL_SERVER}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/kstash ${IDIR_HEIMDAL_SERVER}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/ktutil ${IDIR_HEIMDAL_SERVER}/usr/sbin/
- ${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmin ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${INSTALL_DIR} ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkdc.so* \
+ ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkadm5srv.so* \
+ ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libhdb.so* \
+ ${IDIR_HEIMDAL_SERVER}/usr/lib/heimdal
+ ${INSTALL_DATA} ./files/{krb5.conf,kdc.conf,kadmind.acl} \
+ ${IDIR_HEIMDAL_SERVER}/etc/heimdal
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/kdc \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmind \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/kpasswdd \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/kstash \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/ktutil \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
+ ${INSTALL_BIN} ${WRKINST}/usr/sbin/kadmin \
+ ${IDIR_HEIMDAL_SERVER}/usr/sbin/
# heimdal libs
- ${INSTALL_DIR} ${IDIR_HEIMDAL_LIBS}/usr/lib
+ ${INSTALL_DIR} ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
ifeq ($(ADK_COMPILE_HEIMDAL_WITH_PKINIT),y)
- ${CP} ${WRKINST}/usr/lib/libhx509.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/heimdal/libhx509.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
endif
- ${CP} ${WRKINST}/usr/lib/libheimntlm.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libwind.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgssapi.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libkafs.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libkrb5.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libcom_err.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libasn1.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libroken.so* ${IDIR_HEIMDAL_LIBS}/usr/lib
+ ${CP} ${WRKINST}/usr/lib/heimdal/libheimntlm.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libwind.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libgssapi.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkafs.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkrb5.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libasn1.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libroken.so* \
+ ${IDIR_LIBHEIMDAL}/usr/lib/heimdal
# heimdal client libs
- ${INSTALL_DIR} ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libeditline.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libsl.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libkadm5clnt.so* ${IDIR_HEIMDAL_CLIENT_LIBS}/usr/lib
+ ${INSTALL_DIR} ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libeditline.so* \
+ ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libsl.so* \
+ ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
+ ${CP} ${WRKINST}/usr/lib/heimdal/libkadm5clnt.so* \
+ ${IDIR_LIBHEIMDAL_CLIENT}/usr/lib/heimdal
include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/heimdal/files/heimdal.init b/package/heimdal/files/heimdal.init
index 2e87f4932..33692f111 100644
--- a/package/heimdal/files/heimdal.init
+++ b/package/heimdal/files/heimdal.init
@@ -15,9 +15,9 @@ start)
/usr/sbin/kpasswdd &
;;
stop)
- killall kdc
- killall kadmind
- killall kpasswdd
+ pkill kdc
+ pkill kadmind
+ pkill kpasswdd
;;
restart)
sh $0 stop
diff --git a/package/heimdal/patches/patch-configure b/package/heimdal/patches/patch-configure
index d92f7cdbc..53601d6db 100644
--- a/package/heimdal/patches/patch-configure
+++ b/package/heimdal/patches/patch-configure
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- heimdal-1.2.1.orig/configure 2008-07-28 14:05:20.000000000 +0200
-+++ heimdal-1.2.1/configure 2009-01-04 18:24:14.421500455 +0100
++++ heimdal-1.2.1/configure 2009-11-19 21:01:07.000000000 +0100
@@ -47096,9 +47096,6 @@ end
EOF
if ${COMPILE_ET} conftest_et.et >/dev/null 2>&1; then
@@ -11,3 +11,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
if test "$cross_compiling" = yes; then
krb_cv_compile_et="yes" krb_cv_compile_et_cross=yes
else
+@@ -47183,7 +47180,7 @@ rm -fr conftest*
+ fi
+
+ if test "${krb_cv_compile_et_cross}" = yes ; then
+- krb_cv_com_err="cross"
++ krb_cv_com_err="yes"
+ elif test "${krb_cv_compile_et}" = "yes"; then
+ krb_cv_save_LIBS="${LIBS}"
+ LIBS="${LIBS} -lcom_err"
diff --git a/package/heimdal/patches/patch-lib_roken_Makefile_in b/package/heimdal/patches/patch-lib_roken_Makefile_in
index 1e83ad590..8cc110503 100644
--- a/package/heimdal/patches/patch-lib_roken_Makefile_in
+++ b/package/heimdal/patches/patch-lib_roken_Makefile_in
@@ -1,7 +1,53 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- heimdal-1.2.1.orig/lib/roken/Makefile.in 2008-07-28 14:05:33.000000000 +0200
-+++ heimdal-1.2.1/lib/roken/Makefile.in 2009-01-02 22:22:25.000000000 +0100
-@@ -665,9 +665,6 @@ getaddrinfo-test$(EXEEXT): $(getaddrinfo
++++ heimdal-1.2.1/lib/roken/Makefile.in 2009-12-20 21:40:29.312500000 +0100
+@@ -58,13 +58,12 @@ DIST_COMMON = $(am__dist_include_HEADERS
+ strptime.c strsep.c strsep_copy.c strtok_r.c strupr.c swab.c \
+ timegm.c unsetenv.c verr.c verrx.c vsyslog.c vwarn.c vwarnx.c \
+ warn.c warnx.c writev.c
+-noinst_PROGRAMS = make-roken$(EXEEXT) snprintf-test$(EXEEXT) \
++noinst_PROGRAMS = make-roken$(EXEEXT) \
+ resolve-test$(EXEEXT) rkpty$(EXEEXT)
+ check_PROGRAMS = base64-test$(EXEEXT) getaddrinfo-test$(EXEEXT) \
+ hex-test$(EXEEXT) test-readenv$(EXEEXT) \
+ parse_bytes-test$(EXEEXT) parse_reply-test$(EXEEXT) \
+- parse_time-test$(EXEEXT) snprintf-test$(EXEEXT) \
+- strpftime-test$(EXEEXT)
++ parse_time-test$(EXEEXT)
+ @have_socket_wrapper_TRUE@am__append_1 = socket_wrapper.c socket_wrapper.h
+ @have_socket_wrapper_TRUE@am__append_2 = socket_wrapper.h
+ subdir = lib/roken
+@@ -170,13 +169,6 @@ libroken_la_OBJECTS = $(am_libroken_la_O
+ libroken_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(libroken_la_LDFLAGS) $(LDFLAGS) -o $@
+-libtest_la_LIBADD =
+-am_libtest_la_OBJECTS = libtest_la-strftime.lo libtest_la-strptime.lo \
+- libtest_la-snprintf.lo
+-libtest_la_OBJECTS = $(am_libtest_la_OBJECTS)
+-libtest_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
+- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libtest_la_CFLAGS) \
+- $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ PROGRAMS = $(noinst_PROGRAMS)
+ base64_test_SOURCES = base64-test.c
+ base64_test_OBJECTS = base64-test.$(OBJEXT)
+@@ -504,12 +496,12 @@ lib_LTLIBRARIES = libroken.la
+ libroken_la_LDFLAGS = -version-info 19:0:1
+ libroken_la_CPPFLAGS = -DBUILD_ROKEN_LIB
+ nodist_make_roken_SOURCES = make-roken.c
+-TESTS = $(check_PROGRAMS)
++TESTS =
+ LDADD = libroken.la $(LIB_crypt)
+ make_roken_LDADD =
+-noinst_LTLIBRARIES = libtest.la
++noinst_LTLIBRARIES =
+ libtest_la_SOURCES = strftime.c strptime.c snprintf.c
+-libtest_la_CFLAGS = -DTEST_SNPRINTF -DTEST_STRPFTIME
++libtest_la_CFLAGS =
+ parse_reply_test_SOURCES = parse_reply-test.c resolve.c
+ parse_reply_test_CFLAGS = -DTEST_RESOLVE
+ test_readenv_SOURCES = test-readenv.c test-mem.c
+@@ -665,9 +657,6 @@ getaddrinfo-test$(EXEEXT): $(getaddrinfo
hex-test$(EXEEXT): $(hex_test_OBJECTS) $(hex_test_DEPENDENCIES)
@rm -f hex-test$(EXEEXT)
$(LINK) $(hex_test_OBJECTS) $(hex_test_LDADD) $(LIBS)
@@ -11,12 +57,12 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
parse_bytes-test$(EXEEXT): $(parse_bytes_test_OBJECTS) $(parse_bytes_test_DEPENDENCIES)
@rm -f parse_bytes-test$(EXEEXT)
$(LINK) $(parse_bytes_test_OBJECTS) $(parse_bytes_test_LDADD) $(LIBS)
-@@ -1818,6 +1815,10 @@ roken.h: make-roken$(EXEEXT)
+@@ -1818,6 +1807,10 @@ roken.h: make-roken$(EXEEXT)
make-roken.c: roken.h.in roken.awk
$(AWK) -f $(srcdir)/roken.awk $(srcdir)/roken.h.in > make-roken.c
+
-+make-roken: make-roken.c
++make-roken$(EXEEXT): make-roken.c
+ $(HOSTCC) $(HOSTCFLAGS) -I$(top_builddir)/include -DHAVE_CONFIG_H \
+ -o $@ $<
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/package/heimdal/patches/patch-lib_vers_Makefile_in b/package/heimdal/patches/patch-lib_vers_Makefile_in
index 4f4aec554..993a60784 100644
--- a/package/heimdal/patches/patch-lib_vers_Makefile_in
+++ b/package/heimdal/patches/patch-lib_vers_Makefile_in
@@ -1,6 +1,6 @@
$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
--- heimdal-1.2.1.orig/lib/vers/Makefile.in 2008-07-28 14:05:34.000000000 +0200
-+++ heimdal-1.2.1/lib/vers/Makefile.in 2009-01-02 22:22:25.000000000 +0100
++++ heimdal-1.2.1/lib/vers/Makefile.in 2009-12-20 21:43:13.359375000 +0100
@@ -403,9 +403,6 @@ clean-noinstPROGRAMS:
echo " rm -f $$p $$f"; \
rm -f $$p $$f ; \
@@ -16,7 +16,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
./make-print-version$(EXEEXT) print_version.h
-make-print-version.o: $(top_builddir)/include/version.h
-+make-print-version: $(top_builddir)/include/version.h
++make-print-version$(EXEEXT): $(top_builddir)/include/version.h
+ $(HOSTCC) $(HOSTCFLAGS) -DKRB5 -I$(top_builddir)/include -o $@ \
+ $(make_print_version_SOURCES)
# Tell versions [3.59,3.63) of GNU make to not export all variables.