4 files changed, 101 insertions, 4 deletions
diff --git a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-autoconf-2.72.patch b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-autoconf-2.72.patch
new file mode 100644
index 000000000000..3d682ab799a9
--- /dev/null
+++ b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-autoconf-2.72.patch
@@ -0,0 +1,30 @@
+https://github.com/krb5/krb5/commit/d864d740d019fdf2c640460f2aa2760c7fa4d5e9 (rebased)
+
+From d864d740d019fdf2c640460f2aa2760c7fa4d5e9 Mon Sep 17 00:00:00 2001
+From: Julien Rische <jrische@redhat.com>
+Date: Thu, 17 Nov 2022 15:01:24 +0100
+Subject: [PATCH] Fix aclocal.m4 syntax error for autoconf 2.72
+
+An incorrect closure inside KRB5_AC_INET6 is innocuous with autoconf
+versions up to 2.71, but will cause an error at configure time with
+the forthcoming autoconf 2.72.
+
+[ghudson@mit.edu: added more context to commit message]
+
+ticket: 9077 (new)
+tags: pullup
+target_version: 1.20-next
+target_version: 1.19-next
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -193,8 +193,8 @@ AC_TRY_COMPILE([
+   struct sockaddr_in6 in;
+   AF_INET6;
+   IN6_IS_ADDR_LINKLOCAL (&in.sin6_addr);
+-],krb5_cv_inet6=yes,krb5_cv_inet6=no)])
+-fi
++],[krb5_cv_inet6=yes],[krb5_cv_inet6=no])
++fi])
+ AC_MSG_RESULT($krb5_cv_inet6)
+ if test "$krb5_cv_inet6" = no && test "$ac_cv_func_inet_ntop" = yes; then
+ AC_MSG_CHECKING(for IPv6 compile-time support with -DINET6)
diff --git a/app-crypt/mit-krb5-appl/metadata.xml b/app-crypt/mit-krb5-appl/metadata.xml
index b02e0cad4528..839bf946d5ee 100644
--- a/app-crypt/mit-krb5-appl/metadata.xml
+++ b/app-crypt/mit-krb5-appl/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
 	<email>kerberos@gentoo.org</email>
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r2.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild
index 17ea47dc8a37..6b8ddc9b0c32 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r2.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,11 +14,11 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="openafs-krb5-a BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 sparc x86"
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND=">=app-crypt/mit-krb5-1.8.0
-	sys-libs/e2fsprogs-libs
+	sys-fs/e2fsprogs
 	sys-libs/ncurses:=
 	virtual/libcrypt:="
 DEPEND="${RDEPEND}"
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r4.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r4.ebuild
new file mode 100644
index 000000000000..3155167a82d3
--- /dev/null
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3-r4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs
+
+MY_P=${P/mit-}
+MAJOR_MINOR="$(ver_cut 1-2)"
+DESCRIPTION="Kerberized applications split from the main MIT Kerberos V distribution"
+HOMEPAGE="http://web.mit.edu/kerberos/www/"
+SRC_URI="http://web.mit.edu/kerberos/dist/krb5-appl/${MAJOR_MINOR}/${MY_P}-signed.tar"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="openafs-krb5-a BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND=">=app-crypt/mit-krb5-1.8.0
+	sys-fs/e2fsprogs
+	sys-libs/ncurses:=
+	virtual/libcrypt:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-tinfo.patch"
+	"${FILESDIR}/${PN}-sig_t.patch"
+	"${FILESDIR}/${PN}-autoconf-2.72.patch"
+)
+
+src_unpack() {
+	unpack ${A}
+	unpack ./"${MY_P}".tar.gz
+}
+
+src_prepare() {
+	default
+
+	sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags "-I/usr/include/et"
+	append-cppflags -fno-strict-aliasing
+	append-cppflags -fno-strict-overflow
+	econf
+}
+
+src_install() {
+	emake DESTDIR="${ED}" install
+	for i in {telnetd,ftpd} ; do
+		mv "${ED}"/usr/share/man/man8/${i}.8 "${ED}"/usr/share/man/man8/k${i}.8 \
+			|| die "mv failed (man)"
+		mv "${ED}"/usr/sbin/${i} "${ED}"/usr/sbin/k${i} || die "mv failed"
+	done
+
+	for i in {rcp,rlogin,rsh,telnet,ftp} ; do
+		mv "${ED}"/usr/share/man/man1/${i}.1 "${ED}"/usr/share/man/man1/k${i}.1 \
+			|| die "mv failed (man)"
+		mv "${ED}"/usr/bin/${i} "${ED}"/usr/bin/k${i} || die "mv failed"
+	done
+
+	rm "${ED}"/usr/share/man/man1/tmac.doc || die
+	dodoc README
+}