inetutils: update to 2.6.

This commit is contained in:
Đoàn Trần Công Danh 2025-05-27 15:03:47 +07:00
parent 90d5b75f7b
commit 68980f41c7
3 changed files with 70 additions and 24 deletions

View file

@ -0,0 +1,10 @@
--- a/ifconfig/system/linux.h
+++ b/ifconfig/system/linux.h
@@ -35,6 +35,7 @@ struct system_ifconfig
};
+#define PATH_PROCNET_DEV "/proc/net/dev"
/* Output format support. */

View file

@ -0,0 +1,46 @@
--- a/configure
+++ b/configure
@@ -55104,9 +55104,7 @@ else $as_nop
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <curses.h>
-#ifndef _XOPEN_CURSES
# include <term.h>
-#endif
int
main (void)
{
@@ -55178,9 +55176,7 @@ then :
fi
ac_fn_check_decl "$LINENO" "tgetent" "ac_cv_have_decl_tgetent" "#include <curses.h>
-#ifndef _XOPEN_CURSES
# include <term.h>
-#endif
" "$ac_c_undeclared_builtin_options" "CFLAGS"
if test "x$ac_cv_have_decl_tgetent" = xyes
then :
--- a/telnet/telnet.c
+++ b/telnet/telnet.c
@@ -75,9 +75,7 @@
# include <termcap.h>
#elif defined HAVE_CURSES_TGETENT
# include <curses.h>
-# ifndef _XOPEN_CURSES
# include <term.h>
-# endif
#endif
#ifdef AUTHENTICATION
--- a/telnetd/utility.c
+++ b/telnetd/utility.c
@@ -39,9 +39,7 @@
# include <termcap.h>
#elif defined HAVE_CURSES_TGETENT
# include <curses.h>
-# ifndef _XOPEN_CURSES
# include <term.h>
-# endif
#endif
#if defined HAVE_STREAMSPTY && defined HAVE_GETMSG \

View file

@ -1,7 +1,7 @@
# Template file for 'inetutils'
pkgname=inetutils
version=2.4
revision=2
version=2.6
revision=1
build_style=gnu-configure
configure_args="--without-wrap --with-pam"
makedepends="pam-devel readline-devel"
@ -11,45 +11,35 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.gnu.org/software/inetutils/"
distfiles="${GNU_SITE}/inetutils/inetutils-${version}.tar.xz"
checksum=1789d6b1b1a57dfe2a7ab7b533ee9f5dfd9cbf5b59bb1bb3c2612ed08d0f68b2
checksum=68bedbfeaf73f7d86be2a7d99bcfbd4093d829f52770893919ae174c0b2357ca
subpackages="inetutils-dnsdomainname inetutils-ftp inetutils-hostname
inetutils-ifconfig inetutils-inetd inetutils-ping inetutils-rexec
inetutils-syslog inetutils-telnet inetutils-tftp inetutils-traceroute
inetutils-uucpd inetutils-whois"
CFLAGS="-fcommon"
# CFLAGS="-fcommon"
# hostname test can't run in CI
make_check=ci-skip
if [ "$XBPS_TARGET_LIBC" = "glibc" ]; then
case "$XBPS_TARGET_LIBC" in
glibc)
makedepends+=" libxcrypt-devel"
fi
case "$XBPS_TARGET_MACHINE" in
*-musl)
# Some packages don't build on musl, so explicitly disable them
configure_args+=" --disable-rcp --disable-rlogin --disable-rlogind --disable-rsh --disable-rshd --disable-talk --disable-talkd"
;;
*)
subpackages+=" inetutils-rcp inetutils-rlogin inetutils-rsh inetutils-talk"
;;
musl)
# Some packages don't build on musl, so explicitly disable them
configure_args+=" --disable-rcp --disable-rlogin --disable-rlogind"
configure_args+=" --disable-rsh --disable-rshd --disable-talk --disable-talkd"
;;
esac
depends="${subpackages}"
pre_configure() {
vsed -i 's|_GL_WARN_ON_USE (gets|//_GL_WARN_ON_USE (gets|' lib/stdio.in.h
# Create a definition to allow the ifconfig program to build properly
echo '#define PATH_PROCNET_DEV "/proc/net/dev"' >> ifconfig/system/linux.h
# Use the standard name ("nicname") for the "whois" service.
vsed -i 's|port : "whois"|port : "nicname"|' whois/whois.c
# Changing the whois/whois.c triggers help2man invocation. This is not
# necessary because no option has changed. Moreover, launching help2man
# fails for the cross compilations. Let's make sure the build process
# is not triggered to run it then.
touch man/whois.1
post_patch() {
sed -i 's/@ENABLE_ping_TRUE@/#/' tests/Makefile.in
}
post_install() {
# Keep just usr/share/info/inetutils.info.gz
rm -r ${DESTDIR}/usr/bin