* [gentoo-commits] repo/gentoo:master commit in: app-crypt/heimdal/files/, app-crypt/heimdal/
@ 2017-10-31 6:04 Eray Aslan
0 siblings, 0 replies; 4+ messages in thread
From: Eray Aslan @ 2017-10-31 6:04 UTC (permalink / raw
To: gentoo-commits
commit: 2cced84a4ae58d3f6211ee36ab49ab33243dc809
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 31 06:03:40 2017 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Oct 31 06:03:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cced84a
app-crypt/heimdal: remove vulnerable
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-crypt/heimdal/Manifest | 3 -
app-crypt/heimdal/files/heimdal_db6.patch | 41 -----
app-crypt/heimdal/files/heimdal_link_order.patch | 41 -----
.../heimdal/files/heimdal_missing-include.patch | 11 --
.../heimdal/files/heimdal_missing_symbols.patch | 28 ---
app-crypt/heimdal/files/heimdal_texinfo-5.patch | 28 ---
app-crypt/heimdal/heimdal-1.5.3-r2.ebuild | 193 ---------------------
app-crypt/heimdal/heimdal-7.1.0.ebuild | 175 -------------------
app-crypt/heimdal/heimdal-7.3.0.ebuild | 175 -------------------
9 files changed, 695 deletions(-)
diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index f182453c8de..c8eef7ab1ca 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -1,4 +1 @@
-DIST heimdal-1.5.3.tar.gz 6798305 SHA256 aac27bedb33c341b6aed202af07ccc816146a893148721f8123abbbf93bbfea5 SHA512 5c7890f60d6fe6b5034fca204eb7cdb33fdc397fe09b169212b6267310b83bb0b3b06a4c2888841be34c92cbd701bd95734b4019c33c147459c4a449861c4431 WHIRLPOOL 8202b1bdf76e84b4a0fea1aa89935dfb3fbcceca38c84ffb3e3e8454691398c9a7cecfad40c6661426be5e82f4e3f43b6d6494cf287900ff958e06603b602e19
-DIST heimdal-7.1.0.tar.gz 9925587 SHA256 cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d SHA512 5afc9d183ff0db6e82e83d47955cc77e775bc60569e2905f9106c31b8a33e8d67fbc042dd4836ebae094db38bf70ba858c224189fed8d55f277738ee6e76352e WHIRLPOOL cd6507c5f6a800e645a146d94fac41d1fbf4c3283c5c4ab4a40bd2229efa4f1a16be71aa74fc5d8f41023bdff8ff141419ce0b99f5cb7aaf09f22824db1d2df8
-DIST heimdal-7.3.0.tar.gz 9927966 SHA256 351df17c11f723681a4eab832e880af4a28693d1ed6996b02671d676dcb3b7b5 SHA512 2a2a76e073ce429086c6e673d83974ba57c7778500f9b007fba033a0e31aed4c4e060d123c10c6d54eda9cda35faabc3df5fa92b560531e92eb8f3dff4eb9dc2 WHIRLPOOL 2a60146a6ca0edcef6072cdbdb1a7a986da82a14b459062530b390ab5d895b0e671f4e46c9a707ea846bcbc832585b1a2e78a593f065c6929fdd2b4b41f49e95
DIST heimdal-7.4.0.tar.gz 9928553 SHA256 3de14ecd36ad21c1694a13da347512b047f4010d176fe412820664cb5d1429ad SHA512 3bb83974180e0f6fe2e1b2a11c51cf136c9a64f13f9ed7592f0039ccccd03c1a22081b7d88ae631f94cf46589ed399b79666eb814104f915faa70b53749863a7 WHIRLPOOL 337a6da67bb48e08ecab2119598c19e2ca9b0cdbd7ca163f6ea55ccb0a1290cc2906eee106b625a43243edd7d1677ff36ae318ab82f2d3e439b8f25002f7f001
diff --git a/app-crypt/heimdal/files/heimdal_db6.patch b/app-crypt/heimdal/files/heimdal_db6.patch
deleted file mode 100644
index 316cf153379..00000000000
--- a/app-crypt/heimdal/files/heimdal_db6.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- a/cf/db.m4
-+++ b/cf/db.m4
-@@ -51,6 +51,8 @@ dnl db_create is used by db3 and db4 and db5
- #include <stdio.h>
- #ifdef HAVE_DBHEADER
- #include <$dbheader/db.h>
-+ #elif HAVE_DB6_DB_H
-+ #include <db6/db.h>
- #elif HAVE_DB5_DB_H
- #include <db5/db.h>
- #elif HAVE_DB4_DB_H
---- a/lib/hdb/db3.c
-+++ b/lib/hdb/db3.c
-@@ -276,7 +276,7 @@
- }
- db->hdb_db = d;
-
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- ret = (*d->open)(db->hdb_db, NULL, fn, NULL, DB_BTREE, myflags, mode);
- #else
- ret = (*d->open)(db->hdb_db, fn, NULL, DB_BTREE, myflags, mode);
-@@ -284,7 +284,7 @@
-
- if (ret == ENOENT) {
- /* try to open without .db extension */
--#if (DB_VERSION_MAJOR >= 4) && (DB_VERSION_MINOR >= 1)
-+#if (DB_VERSION_MAJOR > 4) || ((DB_VERSION_MAJOR == 4) && (DB_VERSION_MINOR >= 1))
- ret = (*d->open)(db->hdb_db, NULL, db->hdb_name, NULL, DB_BTREE,
- myflags, mode);
- #else
---- a/cf/db.m4
-+++ b/cf/db.m4
-@@ -38,6 +38,7 @@ AS_IF([test "x$with_berkeley_db" != xno],
- fi
- ])],
- [AC_CHECK_HEADERS([ \
-+ db6/db.h \
- db5/db.h \
- db4/db.h \
- db3/db.h \
diff --git a/app-crypt/heimdal/files/heimdal_link_order.patch b/app-crypt/heimdal/files/heimdal_link_order.patch
deleted file mode 100644
index fdf6a0af9bc..00000000000
--- a/app-crypt/heimdal/files/heimdal_link_order.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- kadmin/Makefile.am.orig 2010-11-25 12:39:31.000000000 +0000
-+++ kadmin/Makefile.am 2011-02-14 21:37:29.000000000 +0000
-@@ -64,10 +64,10 @@
- $(top_builddir)/lib/krb5/libkrb5.la \
- $(LIB_hcrypto) \
- $(top_builddir)/lib/asn1/libasn1.la \
-- $(LIB_roken) \
- $(DBLIB)
-
- kadmind_LDADD = $(top_builddir)/lib/kadm5/libkadm5srv.la \
-+ $(LIB_roken) \
- ../lib/gssapi/libgssapi.la \
- $(LDADD_common) \
- $(LIB_pidfile) \
-@@ -78,12 +78,14 @@
- $(top_builddir)/lib/kadm5/libkadm5srv.la \
- $(top_builddir)/lib/sl/libsl.la \
- $(LIB_readline) \
-+ $(LIB_roken) \
- $(LDADD_common) \
- $(LIB_dlopen)
-
- add_random_users_LDADD = \
- $(top_builddir)/lib/kadm5/libkadm5clnt.la \
- $(top_builddir)/lib/kadm5/libkadm5srv.la \
-+ $(LIB_roken) \
- $(LDADD_common) \
- $(LIB_dlopen)
-
---- tests/plugin/check-pac.in.orig 2010-11-25 12:39:31.000000000 +0000
-+++ tests/plugin/check-pac.in 2011-02-16 13:24:50.000000000 +0000
-@@ -62,7 +62,8 @@
- test_apreq="${TESTS_ENVIRONMENT} ../../lib/krb5/test_ap-req"
-
- KRB5_CONFIG="${objdir}/krb5.conf"
--export KRB5_CONFIG
-+LD_PRELOAD="../../lib/roken/.libs/libroken.so"
-+export KRB5_CONFIG LD_PRELOAD
-
- rm -f ${keytabfile}
- rm -f current-db*
diff --git a/app-crypt/heimdal/files/heimdal_missing-include.patch b/app-crypt/heimdal/files/heimdal_missing-include.patch
deleted file mode 100644
index e245cf8fff0..00000000000
--- a/app-crypt/heimdal/files/heimdal_missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/test_base.c 2011-09-30 15:58:45.000000000 +0300
-+++ base/test_base.c 2011-12-27 23:04:50.482955923 +0200
-@@ -39,6 +39,8 @@
- #include "heimbase.h"
- #include "heimbasepriv.h"
-
-+#include <stdlib.h>
-+
- static void
- memory_free(heim_object_t obj)
- {
diff --git a/app-crypt/heimdal/files/heimdal_missing_symbols.patch b/app-crypt/heimdal/files/heimdal_missing_symbols.patch
deleted file mode 100644
index aa915fb130d..00000000000
--- a/app-crypt/heimdal/files/heimdal_missing_symbols.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Add missing symbols. Cherry picked from upstream master.
-Bug #420821.
-
---- a/lib/krb5/version-script.map 2012-01-10 21:53:51.000000000 +0000
-+++ b/lib/krb5/version-script.map 2012-06-13 16:23:26.000000000 +0000
-@@ -42,6 +42,7 @@
- krb5_auth_con_getrcache;
- krb5_auth_con_getremoteseqnumber;
- krb5_auth_con_getremotesubkey;
-+ krb5_auth_con_getsendsubkey;
- krb5_auth_con_init;
- krb5_auth_con_removeflags;
- krb5_auth_con_setaddrs;
-@@ -383,6 +384,14 @@
- krb5_h_errno_to_heim_errno;
- krb5_have_error_string;
- krb5_hmac;
-+ krb5_init_creds_init;
-+ krb5_init_creds_set_service;
-+ krb5_init_creds_set_keytab;
-+ krb5_init_creds_get;
-+ krb5_init_creds_set_password;
-+ krb5_init_creds_free;
-+ krb5_init_creds_get_creds;
-+ krb5_init_creds_get_error;
- krb5_init_context;
- krb5_init_ets;
- krb5_initlog;
diff --git a/app-crypt/heimdal/files/heimdal_texinfo-5.patch b/app-crypt/heimdal/files/heimdal_texinfo-5.patch
deleted file mode 100644
index b16a90cefdb..00000000000
--- a/app-crypt/heimdal/files/heimdal_texinfo-5.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/doc/whatis.texi
-+++ b/doc/whatis.texi
-@@ -35,10 +35,11 @@ services can authenticate each other.
- @end macro
- @end ifinfo
-
--@tex
--@def@xsub#1{$_{#1}$}
--@global@let@sub=@xsub
--@end tex
-+@iftex
-+@macro sub{arg}
-+@textsubscript{\arg\}
-+@end macro
-+@end iftex
-
- @ifhtml
- @macro sub{arg}
---- a/doc/win2k.texi
-+++ b/doc/win2k.texi
-@@ -311,4 +311,5 @@ Other useful programs include these:
-
- @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
-
diff --git a/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild b/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild
deleted file mode 100644
index b1ddcdedd4e..00000000000
--- a/app-crypt/heimdal/heimdal-1.5.3-r2.ebuild
+++ /dev/null
@@ -1,193 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 toolchain-funcs virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="http://www.h5l.org/dist/src/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 otp +pkinit selinux ssl static-libs threads test X"
-
-CDEPEND="ssl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
- berkdb? ( >=sys-libs/db-4.8.30-r1[${MULTILIB_USEDEP}] )
- !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
- caps? ( sys-libs/libcap-ng )
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
- sys-libs/ncurses:0=
- >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
- afs? ( net-fs/openafs )
- hdb-ldap? ( >=net-nds/openldap-2.3.0 )
- X? ( x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXt )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r1
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
- !!app-crypt/mit-krb5
- !!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- >=sys-devel/autoconf-2.62
- test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/krb5-types.h
- /usr/include/cms_asn1.h
- /usr/include/digest_asn1.h
- /usr/include/hdb_asn1.h
- /usr/include/krb5_asn1.h
- /usr/include/pkcs12_asn1.h
- /usr/include/pkinit_asn1.h
- /usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-src_prepare() {
- epatch "${FILESDIR}/heimdal_missing-include.patch"
- epatch "${FILESDIR}/heimdal_db6.patch"
- epatch "${FILESDIR}/heimdal_disable-check-iprop.patch"
- epatch "${FILESDIR}/heimdal_link_order.patch"
- epatch "${FILESDIR}/heimdal_missing_symbols.patch"
- epatch "${FILESDIR}/heimdal_texinfo-5.patch"
- epatch "${FILESDIR}/heimdal_tinfo.patch"
- eautoreconf
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=()
- if use berkdb; then
- myconf+=(
- --with-berkeley-db
- --with-berkeley-db-include="$(db_includedir)"
- )
- else
- myconf+=(
- --without-berkeley-db
- )
- fi
-
- ECONF_SOURCE=${S} \
- econf \
- --enable-kcm \
- --disable-osfc2 \
- --enable-shared \
- --with-libintl=/usr \
- --with-readline=/usr \
- --with-sqlite3=/usr \
- --libexecdir=/usr/sbin \
- $(use_enable afs afs-support) \
- $(use_enable otp) \
- $(use_enable pkinit kx509) \
- $(use_enable pkinit pk-init) \
- $(use_enable static-libs static) \
- $(use_enable threads pthread-support) \
- $(multilib_native_use_with caps capng) \
- $(multilib_native_use_with hdb-ldap openldap /usr) \
- $(use_with ipv6) \
- $(use_with ssl openssl /usr) \
- $(multilib_native_use_with X x) \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake -j1
- else
- emake -C include -j1
- emake -C base -j1
- emake -C lib -j1
- emake -C kdc -j1
- emake -C tools -j1
- emake -C tests/plugin -j1
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
- else
- emake -C include DESTDIR="${D}" install
- emake -C base DESTDIR="${D}" install
- emake -C lib DESTDIR="${D}" install
- emake -C kdc DESTDIR="${D}" install
- emake -C tools DESTDIR="${D}" install
- emake -C tests/plugin DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog README NEWS TODO
-
- # Begin client rename and install
- for i in {telnetd,ftpd,rshd,popper}
- do
- mv "${D}"/usr/share/man/man8/{,k}${i}.8
- mv "${D}"/usr/sbin/{,k}${i}
- done
-
- for i in {rcp,rsh,telnet,ftp,su,login,pagsh,kf}
- do
- mv "${D}"/usr/share/man/man1/{,k}${i}.1
- mv "${D}"/usr/bin/{,k}${i}
- done
-
- mv "${D}"/usr/share/man/man5/{,k}ftpusers.5
- mv "${D}"/usr/share/man/man5/{,k}login.access.5
-
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
- insinto /etc
- newins "${FILESDIR}"/krb5.conf krb5.conf.example
-
- if use hdb-ldap; then
- insinto /etc/openldap/schema
- doins "${S}/lib/hdb/hdb.schema"
- fi
-
- prune_libtool_files
-
- # default database dir
- keepdir /var/heimdal
-
- # Ugly hack for broken symlink - bug #417081
- rm "${D}"/usr/share/man/man5/qop.5 || die
- dosym mech.5 /usr/share/man/man5/qop.5
-}
diff --git a/app-crypt/heimdal/heimdal-7.1.0.ebuild b/app-crypt/heimdal/heimdal-7.1.0.ebuild
deleted file mode 100644
index 5a5572526bb..00000000000
--- a/app-crypt/heimdal/heimdal-7.1.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
-
-CDEPEND="
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- )
- berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
- !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
- caps? ( sys-libs/libcap-ng )
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
- sys-libs/ncurses:0=
- >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
- afs? ( net-fs/openafs )
- hdb-ldap? ( >=net-nds/openldap-2.3.0 )
- X? ( x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXt )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r1
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
- !!app-crypt/mit-krb5
- !!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- >=sys-devel/autoconf-2.62
- test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/krb5-types.h
- /usr/include/cms_asn1.h
- /usr/include/digest_asn1.h
- /usr/include/hdb_asn1.h
- /usr/include/krb5_asn1.h
- /usr/include/pkcs12_asn1.h
- /usr/include/pkinit_asn1.h
- /usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-src_prepare() {
- eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
- eapply "${FILESDIR}/heimdal_tinfo.patch"
- eautoreconf
- eapply_user
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=()
- if use berkdb; then
- myconf+=(
- --with-berkeley-db
- --with-berkeley-db-include="$(db_includedir)"
- )
- else
- myconf+=(
- --without-berkeley-db
- )
- fi
-
- ECONF_SOURCE=${S} \
- econf \
- --enable-kcm \
- --disable-osfc2 \
- --enable-shared \
- --with-libintl=/usr \
- --with-readline=/usr \
- --with-sqlite3=/usr \
- --libexecdir=/usr/sbin \
- --enable-pthread-support \
- $(use_enable afs afs-support) \
- $(use_enable otp) \
- $(use_enable pkinit kx509) \
- $(use_enable pkinit pk-init) \
- $(use_enable static-libs static) \
- $(multilib_native_use_with caps capng) \
- $(multilib_native_use_with hdb-ldap openldap /usr) \
- $(use_with ipv6) \
- $(use_with ssl openssl /usr) \
- $(multilib_native_use_with X x) \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake -j1
- else
- emake -C include -j1
- emake -C lib -j1
- emake -C kdc -j1
- emake -C tools -j1
- emake -C tests/plugin -j1
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
- else
- emake -C include DESTDIR="${D}" install
- emake -C lib DESTDIR="${D}" install
- emake -C kdc DESTDIR="${D}" install
- emake -C tools DESTDIR="${D}" install
- emake -C tests/plugin DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog* README NEWS TODO
-
- # client rename
- mv "${D}"/usr/share/man/man1/{,k}su.1
- mv "${D}"/usr/bin/{,k}su
-
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
- insinto /etc
- newins "${S}"/krb5.conf krb5.conf.example
-
- if use hdb-ldap; then
- insinto /etc/openldap/schema
- doins "${S}/lib/hdb/hdb.schema"
- fi
-
- prune_libtool_files
-
- # default database dir
- keepdir /var/heimdal
-}
diff --git a/app-crypt/heimdal/heimdal-7.3.0.ebuild b/app-crypt/heimdal/heimdal-7.3.0.ebuild
deleted file mode 100644
index 5a5572526bb..00000000000
--- a/app-crypt/heimdal/heimdal-7.3.0.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
-
-CDEPEND="
- ssl? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- )
- berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
- !berkdb? ( >=sys-libs/gdbm-1.10-r1[${MULTILIB_USEDEP}] )
- caps? ( sys-libs/libcap-ng )
- >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
- >=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
- sys-libs/ncurses:0=
- >=sys-libs/readline-6.2_p5-r1[${MULTILIB_USEDEP}]
- afs? ( net-fs/openafs )
- hdb-ldap? ( >=net-nds/openldap-2.3.0 )
- X? ( x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXt )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r1
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
- !!app-crypt/mit-krb5
- !!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
- ${PYTHON_DEPS}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- >=sys-devel/autoconf-2.62
- test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
- selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/krb5-types.h
- /usr/include/cms_asn1.h
- /usr/include/digest_asn1.h
- /usr/include/hdb_asn1.h
- /usr/include/krb5_asn1.h
- /usr/include/pkcs12_asn1.h
- /usr/include/pkinit_asn1.h
- /usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/krb5-config
-)
-
-src_prepare() {
- eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
- eapply "${FILESDIR}/heimdal_tinfo.patch"
- eautoreconf
- eapply_user
-}
-
-src_configure() {
- # QA
- append-flags -fno-strict-aliasing
-
- multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
- local myconf=()
- if use berkdb; then
- myconf+=(
- --with-berkeley-db
- --with-berkeley-db-include="$(db_includedir)"
- )
- else
- myconf+=(
- --without-berkeley-db
- )
- fi
-
- ECONF_SOURCE=${S} \
- econf \
- --enable-kcm \
- --disable-osfc2 \
- --enable-shared \
- --with-libintl=/usr \
- --with-readline=/usr \
- --with-sqlite3=/usr \
- --libexecdir=/usr/sbin \
- --enable-pthread-support \
- $(use_enable afs afs-support) \
- $(use_enable otp) \
- $(use_enable pkinit kx509) \
- $(use_enable pkinit pk-init) \
- $(use_enable static-libs static) \
- $(multilib_native_use_with caps capng) \
- $(multilib_native_use_with hdb-ldap openldap /usr) \
- $(use_with ipv6) \
- $(use_with ssl openssl /usr) \
- $(multilib_native_use_with X x) \
- "${myconf[@]}"
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake -j1
- else
- emake -C include -j1
- emake -C lib -j1
- emake -C kdc -j1
- emake -C tools -j1
- emake -C tests/plugin -j1
- fi
-}
-
-multilib_src_test() {
- multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
- else
- emake -C include DESTDIR="${D}" install
- emake -C lib DESTDIR="${D}" install
- emake -C kdc DESTDIR="${D}" install
- emake -C tools DESTDIR="${D}" install
- emake -C tests/plugin DESTDIR="${D}" install
- fi
-}
-
-multilib_src_install_all() {
- dodoc ChangeLog* README NEWS TODO
-
- # client rename
- mv "${D}"/usr/share/man/man1/{,k}su.1
- mv "${D}"/usr/bin/{,k}su
-
- newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
- newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
- newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
- newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
- newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
- newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
- newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
- newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
- insinto /etc
- newins "${S}"/krb5.conf krb5.conf.example
-
- if use hdb-ldap; then
- insinto /etc/openldap/schema
- doins "${S}/lib/hdb/hdb.schema"
- fi
-
- prune_libtool_files
-
- # default database dir
- keepdir /var/heimdal
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/heimdal/files/, app-crypt/heimdal/
@ 2021-03-20 6:29 Eray Aslan
0 siblings, 0 replies; 4+ messages in thread
From: Eray Aslan @ 2021-03-20 6:29 UTC (permalink / raw
To: gentoo-commits
commit: e00c050d8db2767817094d1701a6744337ac9076
Author: Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 20 06:29:15 2021 +0000
Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Sat Mar 20 06:29:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e00c050d
app-crypt/heimdal: fix building with autoconf-2.70
Closes: https://bugs.gentoo.org/776241
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
.../heimdal/files/heimdal_fix-autoconf-2.70.patch | 29 ++++++++++++++++++++++
app-crypt/heimdal/heimdal-7.7.0-r1.ebuild | 1 +
2 files changed, 30 insertions(+)
diff --git a/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch
new file mode 100644
index 00000000000..0dcc3102620
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch
@@ -0,0 +1,29 @@
+From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Wed, 17 Mar 2021 17:49:18 +0100
+Subject: [PATCH] autoconf-2.70 fix
+
+autoconf-2.70 and newer are more strict with quoting etc. and thus generate
+a broken configure file:
+
+ configure: 20855: Syntax error: ")" unexpected (expecting "fi")
+
+Gentoo-bug: https://bugs.gentoo.org/776241
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ cf/check-var.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cf/check-var.m4 b/cf/check-var.m4
+index 2fd7bca6f0..71d6f70ca8 100644
+--- a/cf/check-var.m4
++++ b/cf/check-var.m4
+@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo)
+ if test "$ac_foo" = yes; then
+ AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1,
+ [Define if you have the `]$1[' variable.])
+- m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2]))
++ m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])])
+ fi
+ ])
+
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
index e6fabf4e954..1140bf30c50 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r1.ebuild
@@ -73,6 +73,7 @@ PATCHES=(
"${FILESDIR}/heimdal_hcrypto.patch"
"${FILESDIR}/heimdal_build-headers-before-use.patch"
"${FILESDIR}/heimdal_fix-db60.patch"
+ "${FILESDIR}/heimdal_fix-autoconf-2.70.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/heimdal/files/, app-crypt/heimdal/
@ 2023-02-09 4:20 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-02-09 4:20 UTC (permalink / raw
To: gentoo-commits
commit: 8ea98796eb18ab898c602e5f4c447eb310090435
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 04:19:34 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 04:19:44 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ea98796
app-crypt/heimdal: fix CVE-2022-45142
Bug: https://bugs.gentoo.org/893722
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/heimdal-7.8.0-CVE-2022-45142.patch | 36 ++++
app-crypt/heimdal/heimdal-7.8.0-r1.ebuild | 187 +++++++++++++++++++++
2 files changed, 223 insertions(+)
diff --git a/app-crypt/heimdal/files/heimdal-7.8.0-CVE-2022-45142.patch b/app-crypt/heimdal/files/heimdal-7.8.0-CVE-2022-45142.patch
new file mode 100644
index 000000000000..dad75df4b3b8
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-7.8.0-CVE-2022-45142.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/893722
+https://www.openwall.com/lists/oss-security/2023/02/08/1
+
+From: Helmut Grohne <helmut@...divi.de>
+Subject: [PATCH v3] CVE-2022-45142: gsskrb5: fix accidental logic inversions
+
+The referenced commit attempted to fix miscompilations with gcc-9 and
+gcc-10 by changing `memcmp(...)` to `memcmp(...) != 0`. Unfortunately,
+it also inverted the result of the comparison in two occasions. This
+inversion happened during backporting the patch to 7.7.1 and 7.8.0.
+
+Fixes: f6edaafcfefd ("gsskrb5: CVE-2022-3437 Use constant-time memcmp()
+ for arcfour unwrap")
+Signed-off-by: Helmut Grohne <helmut@...divi.de>
+--- a/lib/gssapi/krb5/arcfour.c
++++ b/lib/gssapi/krb5/arcfour.c
+@@ -365,7 +365,7 @@ _gssapi_verify_mic_arcfour(OM_uint32 * minor_status,
+ return GSS_S_FAILURE;
+ }
+
+- cmp = (ct_memcmp(cksum_data, p + 8, 8) == 0);
++ cmp = (ct_memcmp(cksum_data, p + 8, 8) != 0);
+ if (cmp) {
+ *minor_status = 0;
+ return GSS_S_BAD_MIC;
+@@ -730,7 +730,7 @@ OM_uint32 _gssapi_unwrap_arcfour(OM_uint32 *minor_status,
+ return GSS_S_FAILURE;
+ }
+
+- cmp = (ct_memcmp(cksum_data, p0 + 16, 8) == 0); /* SGN_CKSUM */
++ cmp = (ct_memcmp(cksum_data, p0 + 16, 8) != 0); /* SGN_CKSUM */
+ if (cmp) {
+ _gsskrb5_release_buffer(minor_status, output_message_buffer);
+ *minor_status = 0;
+--
+2.38.1
diff --git a/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild b/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild
new file mode 100644
index 000000000000..7852376dbebc
--- /dev/null
+++ b/app-crypt/heimdal/heimdal-7.8.0-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+VIRTUALX_REQUIRED="manual"
+
+inherit autotools db-use multilib-minimal python-any-r1 virtualx flag-o-matic
+
+MY_P="${P}"
+DESCRIPTION="Kerberos 5 implementation from KTH"
+HOMEPAGE="https://www.heimdal.software/"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+ virtual/libcrypt:=[${MULTILIB_USEDEP}]
+ ssl? (
+ >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+ )
+ berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
+ gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
+ lmdb? ( dev-db/lmdb:= )
+ caps? ( sys-libs/libcap-ng )
+ >=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+ >=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
+ sys-libs/ncurses:0=
+ >=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
+ afs? ( net-fs/openafs )
+ hdb-ldap? ( >=net-nds/openldap-2.3.0:= )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXau
+ x11-libs/libXt
+ )
+ !!app-crypt/mit-krb5
+ !!app-crypt/mit-krb5-appl"
+
+DEPEND="${CDEPEND}
+ ${PYTHON_DEPS}
+ dev-perl/JSON
+ virtual/pkgconfig
+ sys-apps/texinfo
+ >=sys-devel/autoconf-2.62
+ test? ( X? ( ${VIRTUALX_DEPEND} ) )"
+
+RDEPEND="${CDEPEND}
+ selinux? ( sec-policy/selinux-kerberos )"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/krb5-types.h
+ /usr/include/cms_asn1.h
+ /usr/include/digest_asn1.h
+ /usr/include/hdb_asn1.h
+ /usr/include/krb5_asn1.h
+ /usr/include/pkcs12_asn1.h
+ /usr/include/pkinit_asn1.h
+ /usr/include/rfc2459_asn1.h
+)
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/krb5-config
+)
+
+PATCHES=(
+ "${FILESDIR}/heimdal_disable-check-iprop.patch"
+ "${FILESDIR}/heimdal_tinfo.patch"
+ "${FILESDIR}/heimdal_build-headers-before-use.patch"
+ "${FILESDIR}/heimdal_fix-db60.patch"
+ "${FILESDIR}/heimdal-7.8.0-CVE-2022-45142.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ # QA
+ append-flags -fno-strict-aliasing
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --enable-kcm
+ --disable-osfc2
+ --enable-shared
+ --with-libintl="${EPREFIX}"/usr
+ --with-readline="${EPREFIX}"/usr
+ --with-sqlite3="${EPREFIX}"/usr
+ --libexecdir="${EPREFIX}"/usr/sbin
+ --enable-pthread-support
+ --enable-kx509
+ --enable-pk-init
+ --with-ipv6
+ $(use_enable afs afs-support)
+ $(use_enable gdbm ndbm-db)
+ $(use_enable lmdb mdb-db)
+ $(use_enable otp)
+ $(use_enable static-libs static)
+ $(multilib_native_use_with caps capng)
+ $(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr)
+ $(use_with ssl openssl "${EPREFIX}"/usr)
+ $(multilib_native_use_with X x)
+ )
+ if use berkdb; then
+ myeconfargs+=(
+ --with-berkeley-db
+ --with-berkeley-db-include="$(db_includedir)"
+ )
+ else
+ myeconfargs+=(
+ --without-berkeley-db
+ )
+ fi
+
+ CONFIG_SHELL="${BROOT}"/bin/bash ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+ if multilib_is_native_abi; then
+ emake
+ else
+ emake -C include
+ emake -C lib
+ emake -C kdc
+ emake -C tools
+ emake -C tests/plugin
+ fi
+}
+
+multilib_src_test() {
+ multilib_is_native_abi && emake -j1 check
+}
+
+multilib_src_install() {
+ if multilib_is_native_abi; then
+ INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
+ else
+ emake -C include DESTDIR="${D}" install
+ emake -C lib DESTDIR="${D}" install
+ emake -C kdc DESTDIR="${D}" install
+ emake -C tools DESTDIR="${D}" install
+ emake -C tests/plugin DESTDIR="${D}" install
+ fi
+}
+
+multilib_src_install_all() {
+ dodoc ChangeLog* README NEWS TODO
+
+ # client rename
+ mv "${ED}"/usr/share/man/man1/{,k}su.1
+ mv "${ED}"/usr/bin/{,k}su
+
+ newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
+ newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
+ newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
+ newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
+
+ newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
+ newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
+ newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
+ newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
+
+ insinto /etc
+ newins "${S}"/krb5.conf krb5.conf.example
+
+ if use hdb-ldap; then
+ insinto /etc/openldap/schema
+ doins "${S}/lib/hdb/hdb.schema"
+ fi
+
+ if ! use static-libs ; then
+ find "${ED}" -name "*.la" -delete || die
+ fi
+
+ # default database dir
+ keepdir /var/heimdal
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-crypt/heimdal/files/, app-crypt/heimdal/
@ 2024-10-23 16:08 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2024-10-23 16:08 UTC (permalink / raw
To: gentoo-commits
commit: 4036148dcb02c300544f5d39735cbb9fc93d7829
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 23 16:07:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 16:07:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4036148d
app-crypt/heimdal: fix build w/ autoconf-2.72
Closes: https://bugs.gentoo.org/924213
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../heimdal/files/heimdal-7.8.0-autoconf-2.72.patch | 19 +++++++++++++++++++
app-crypt/heimdal/heimdal-7.8.0-r3.ebuild | 1 +
2 files changed, 20 insertions(+)
diff --git a/app-crypt/heimdal/files/heimdal-7.8.0-autoconf-2.72.patch b/app-crypt/heimdal/files/heimdal-7.8.0-autoconf-2.72.patch
new file mode 100644
index 000000000000..5528af696680
--- /dev/null
+++ b/app-crypt/heimdal/files/heimdal-7.8.0-autoconf-2.72.patch
@@ -0,0 +1,19 @@
+https://github.com/heimdal/heimdal/pull/1229
+
+From 2b372170c894ed9aa3fe2fca976f3541ea7041d9 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd@kuhls.net>
+Date: Sat, 10 Feb 2024 09:33:48 +0100
+Subject: [PATCH] cf/largefile.m4: Fix build with autoconf-2.72
+
+Fixes https://github.com/heimdal/heimdal/issues/1201
+--- a/cf/largefile.m4
++++ b/cf/largefile.m4
+@@ -10,7 +10,7 @@ dnl with generated code, such as lex
+ if test "$enable_largefile" != no -a "$ac_cv_sys_large_files" != no; then
+ CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
+ fi
+-if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no; then
++if test "$enable_largefile" != no -a "$ac_cv_sys_file_offset_bits" != no && test -n "$ac_cv_sys_file_offset_bits"; then
+ CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
+ fi
+ ])
diff --git a/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild b/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
index 5c703d0db52e..11e4adcdf1af 100644
--- a/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
+++ b/app-crypt/heimdal/heimdal-7.8.0-r3.ebuild
@@ -68,6 +68,7 @@ PATCHES=(
"${FILESDIR}/heimdal_fix-db60.patch"
"${FILESDIR}/heimdal-7.8.0-CVE-2022-45142.patch"
"${FILESDIR}/heimdal-7.8.0-configure-clang16.patch"
+ "${FILESDIR}/heimdal-7.8.0-autoconf-2.72.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-10-23 16:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-10-31 6:04 [gentoo-commits] repo/gentoo:master commit in: app-crypt/heimdal/files/, app-crypt/heimdal/ Eray Aslan
-- strict thread matches above, loose matches on Subject: below --
2021-03-20 6:29 Eray Aslan
2023-02-09 4:20 Sam James
2024-10-23 16:08 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox