* [gentoo-commits] repo/gentoo:master commit in: app-crypt/mit-krb5-appl/, app-crypt/mit-krb5-appl/files/
@ 2020-09-19 19:10 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2020-09-19 19:10 UTC (permalink / raw
To: gentoo-commits
commit: 0b286443e106cf3f1853fddc9ec12844f084c7af
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 19:10:29 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 19:10:29 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b286443
app-crypt/mit-krb5-appl: bump to EAPI 7
Closes: https://bugs.gentoo.org/724202
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mit-krb5-appl/files/mit-krb5-appl-tinfo.patch | 4 +--
app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild | 39 ++++++++++++----------
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
index 54c18665d33..7a81f244cfb 100644
--- a/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
+++ b/app-crypt/mit-krb5-appl/files/mit-krb5-appl-tinfo.patch
@@ -1,5 +1,5 @@
---- configure.ac 2011-07-11 22:34:17.000000000 +0300
-+++ configure.ac 2013-02-28 15:12:24.693841664 +0200
+--- a/configure.ac 2011-07-11 22:34:17.000000000 +0300
++++ b/configure.ac 2013-02-28 15:12:24.693841664 +0200
@@ -152,7 +152,8 @@
[AC_DEFINE(TERMCAP,1,[Define if termcap library is available])
LIBS="$LIBS -ltermcap"])
diff --git a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
index 73a6522b469..6493b2d6f54 100644
--- a/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
+++ b/app-crypt/mit-krb5-appl/mit-krb5-appl-1.0.3.ebuild
@@ -1,28 +1,31 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=4
+EAPI=7
-inherit autotools eutils flag-o-matic toolchain-funcs versionator
+inherit autotools flag-o-matic toolchain-funcs
MY_P=${P/mit-}
-MAJOR_MINOR="$( get_version_component_range 1-2 )"
+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"
-IUSE=""
+BDEPEND="virtual/pkgconfig"
RDEPEND=">=app-crypt/mit-krb5-1.8.0
sys-libs/e2fsprogs-libs
sys-libs/ncurses"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
+DEPEND="${RDEPEND}"
-S=${WORKDIR}/${MY_P}
+PATCHES=(
+ "${FILESDIR}/${PN}-tinfo.patch"
+ "${FILESDIR}/${PN}-sig_t.patch"
+)
src_unpack() {
unpack ${A}
@@ -30,9 +33,9 @@ src_unpack() {
}
src_prepare() {
- epatch "${FILESDIR}/${PN}-tinfo.patch"
- epatch "${FILESDIR}/${PN}-sig_t.patch"
- sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" configure.ac
+ default
+
+ sed -i -e "s/-lncurses/$($(tc-getPKG_CONFIG) --libs ncurses)/" configure.ac || die
eautoreconf
}
@@ -44,19 +47,19 @@ src_configure() {
}
src_install() {
- emake DESTDIR="${D}" install
+ emake DESTDIR="${ED}" install
for i in {telnetd,ftpd} ; do
- mv "${D}"/usr/share/man/man8/${i}.8 "${D}"/usr/share/man/man8/k${i}.8 \
- || die "mv failed (man)"
- mv "${D}"/usr/sbin/${i} "${D}"/usr/sbin/k${i} || die "mv failed"
+ 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 "${D}"/usr/share/man/man1/${i}.1 "${D}"/usr/share/man/man1/k${i}.1 \
- || die "mv failed (man)"
- mv "${D}"/usr/bin/${i} "${D}"/usr/bin/k${i} || die "mv failed"
+ 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 "${D}"/usr/share/man/man1/tmac.doc
+ rm "${ED}"/usr/share/man/man1/tmac.doc || die
dodoc README
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/mit-krb5-appl/, app-crypt/mit-krb5-appl/files/
@ 2024-01-05 5:14 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2024-01-05 5:14 UTC (permalink / raw
To: gentoo-commits
commit: 6cdc746112f557b44a8c8f895e30fe5a9da6eb83
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 5 05:11:57 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 5 05:11:57 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cdc7461
app-crypt/mit-krb5-appl: fix autoconf-2.72 compat
Closes: https://bugs.gentoo.org/920878
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/mit-krb5-appl-autoconf-2.72.patch | 30 ++++++++++
.../mit-krb5-appl/mit-krb5-appl-1.0.3-r4.ebuild | 67 ++++++++++++++++++++++
2 files changed, 97 insertions(+)
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/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
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-01-05 5:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-01-05 5:14 [gentoo-commits] repo/gentoo:master commit in: app-crypt/mit-krb5-appl/, app-crypt/mit-krb5-appl/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2020-09-19 19:10 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox