inetutils: Update to 2.6 (#5433)

Sync with cygwin

001-missing-include.patch: fixed upstream
This commit is contained in:
Christoph Reiter 2025-06-03 09:17:43 +02:00 committed by GitHub
parent 96808d595e
commit 9dcda8aee9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 2080 additions and 6995 deletions

View File

@ -1,10 +0,0 @@
--- inetutils-2.5/libinetutils/daemon.c.orig 2024-01-05 16:45:26.007983700 +0100
+++ inetutils-2.5/libinetutils/daemon.c 2024-01-05 16:48:55.477628100 +0100
@@ -55,6 +55,7 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <attribute.h>
+#include <string.h>
/*
According to Unix-FAQ maintained by Andrew Gierth:

View File

@ -1,11 +1,12 @@
# Maintainer: Martell Malone <martellmalone@gmail.com>
pkgname=inetutils
pkgver=2.5
pkgrel=2
pkgver=2.6
pkgrel=1
pkgdesc="A collection of common network programs."
arch=('i686' 'x86_64')
url="https://www.gnu.org/software/inetutils/"
msys2_repository_url="https://cgit.git.savannah.gnu.org/cgit/inetutils.git"
msys2_references=(
"cpe: cpe:/a:gnu:inetutils"
)
@ -14,17 +15,15 @@ depends=('gcc-libs' 'libintl' 'libreadline' 'ncurses')
makedepends=('gettext-devel' 'libreadline-devel' 'ncurses-devel' 'autotools' 'gcc' 'tftp-hpa' 'help2man')
options=('!emptydirs')
source=(https://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.xz
inetutils-2.5-1.src.patch
inetutils-2.6-1.src.patch
icmp6.h
osockaddr.h
talkd.h
001-missing-include.patch)
sha256sums=('87697d60a31e10b5cb86a9f0651e1ec7bee98320d048c0739431aac3d5764fb6'
'acfdafc29876e5f5f88aef09f2cde18c4d31fc48363e6564f5e2fe4d68cbbc1e'
talkd.h)
sha256sums=('68bedbfeaf73f7d86be2a7d99bcfbd4093d829f52770893919ae174c0b2357ca'
'7898c2ae17f74e9462da7faf5599ad82a02e687054d50bfc779f09e44a39b15b'
'efad23dea555319c503c0b6ed7ec6b46c8faa48c138c763749686fc66e98c4b8'
'e19596afff3b2ed163cf1a5c8a8d034208f9f996ace1ac76fd877a2d16aa448d'
'b9e2401b0756c9bebcb0b0835d3c8f218198a121013f4990637ed1b9af0c72fd'
'29c3b108acf09e6d1e4671c3c37e370a22cf9ea14347005f711b0a9559764f5c')
'b9e2401b0756c9bebcb0b0835d3c8f218198a121013f4990637ed1b9af0c72fd')
prepare() {
cd ${srcdir}/${pkgname}-${pkgver}
@ -35,9 +34,7 @@ prepare() {
cp ${srcdir}/talkd.h headers/protocols/talkd.h
mkdir -p headers/netinet
cp ${srcdir}/icmp6.h headers/netinet/icmp6.h
patch -p2 -i ${srcdir}/inetutils-2.5-1.src.patch
patch -p1 -i ${srcdir}/001-missing-include.patch
patch -p2 -i ${srcdir}/inetutils-2.6-1.src.patch
autoreconf -fiv
}
@ -49,10 +46,7 @@ build() {
# copied from cygwin
export ac_cv_func_mmap_fixed_mapped=no
# the cygwin patch adds talkd.h, but not in a way configure can detect it
# so force it here
export ac_cv_header_protocols_talkd_h=yes
export CPPFLAGS+=" -I${srcdir}/${pkgname}-${pkgver}/headers"
# this isn't set in ./configure but needed to get a valid Makefile -- don't ask me...
export EXEEXT=.exe

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff