9 changed files with 392 additions and 16 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
+1
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1 @@
-SOURCES/Socket6-0.28.tar.gz
-/Socket6-0.28.tar.gz
+/Socket6-[0-9.]*.tar.gz
--- a/Socket6-0.29-remove_support_of_gethostname2.patch
+++ b/Socket6-0.29-remove_support_of_gethostname2.patch
@ -0,0 +1,238 @@
+Pouze v Socket6-0.29/: autom4te.cache
+Pouze v Socket6-0.29/: blib
+Pouze v Socket6-0.29/: config.h
+Pouze v Socket6-0.29/: config.log
+Pouze v Socket6-0.29/: config.pl
+Pouze v Socket6-0.29/: config.status
+diff -ru Socket6-0.29.orig/configure Socket6-0.29/configure
+--- Socket6-0.29.orig/configure	2021-07-07 12:53:06.767571002 +0200
+++ Socket6-0.29/configure	2021-07-07 12:55:20.938951403 +0200
+@@ -3439,166 +3439,6 @@
+ fi
+ 
+ 
+-ac_fn_c_check_func "$LINENO" "gethostbyname2" "ac_cv_func_gethostbyname2"
+-if test "x$ac_cv_func_gethostbyname2" = xyes; then :
+-    ac_cv_lib_socket_gethostbyname2=no
+-  ac_cv_lib_inet6_gethostbyname2=no
+-
+-else
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname2 in -lsocket" >&5
+-$as_echo_n "checking for gethostbyname2 in -lsocket... " >&6; }
+-if ${ac_cv_lib_socket_gethostbyname2+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsocket  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gethostbyname2 ();
+-int
+-main ()
+-{
+-return gethostbyname2 ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_socket_gethostbyname2=yes
+-else
+-  ac_cv_lib_socket_gethostbyname2=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_gethostbyname2" >&5
+-$as_echo "$ac_cv_lib_socket_gethostbyname2" >&6; }
+-if test "x$ac_cv_lib_socket_gethostbyname2" = xyes; then :
+-      LIBS="$LIBS -lsocket -lnsl"
+-    ac_cv_lib_inet6_gethostbyname2=no
+-
+-else
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether your system has IPv6 directory" >&5
+-$as_echo_n "checking whether your system has IPv6 directory... " >&6; }
+-    if ${ipv6_cv_dir+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-        for ipv6_cv_dir in /usr/local/v6 /usr/inet6 no; do
+-	if test $ipv6_cv_dir = no -o -d $ipv6_cv_dir; then
+-	  break
+-	fi
+-      done
+-fi
+-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ipv6_cv_dir" >&5
+-$as_echo "$ipv6_cv_dir" >&6; }
+-    if test $ipv6_cv_dir = no; then
+-      ac_cv_lib_inet6_gethostbyname2=no
+-    else
+-      if test x$ipv6_libinet6 = x; then
+-	ipv6_libinet6=no
+-	SAVELDFLAGS="$LDFLAGS"
+-	LDFLAGS="$LDFLAGS -L$ipv6_cv_dir/lib"
+-      fi
+-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname2 in -linet6" >&5
+-$as_echo_n "checking for gethostbyname2 in -linet6... " >&6; }
+-if ${ac_cv_lib_inet6_gethostbyname2+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-linet6  $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gethostbyname2 ();
+-int
+-main ()
+-{
+-return gethostbyname2 ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_inet6_gethostbyname2=yes
+-else
+-  ac_cv_lib_inet6_gethostbyname2=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_inet6_gethostbyname2" >&5
+-$as_echo "$ac_cv_lib_inet6_gethostbyname2" >&6; }
+-if test "x$ac_cv_lib_inet6_gethostbyname2" = xyes; then :
+-  	if test $ipv6_libinet6 = no; then
+-	  ipv6_libinet6=yes
+-	  LIBS="$LIBS -linet6"
+-	fi
+-fi
+-      if test $ipv6_libinet6 = no; then
+-	LDFLAGS="$SAVELDFLAGS"
+-      fi
+-    fi
+-fi
+-
+-fi
+-ipv6_cv_gethostbyname2=no
+-if test $ac_cv_func_gethostbyname2 = yes -o $ac_cv_lib_socket_gethostbyname2 = yes \
+-     -o $ac_cv_lib_inet6_gethostbyname2 = yes
+-then
+-  ipv6_cv_gethostbyname2=yes
+-fi
+-if test $ipv6_cv_gethostbyname2 = no; then
+-  if test gethostbyname2 = getaddrinfo; then
+-    for ipv6_cv_pfx in o n; do
+-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-#include <netdb.h>
+-
+-_ACEOF
+-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "${ipv6_cv_pfx}gethostbyname2" >/dev/null 2>&1; then :
+-  as_ac_var=`$as_echo "ac_cv_func_${ipv6_cv_pfx}gethostbyname2" | $as_tr_sh`
+-ac_fn_c_check_func "$LINENO" "${ipv6_cv_pfx}gethostbyname2" "$as_ac_var"
+-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+-
+-fi
+-
+-fi
+-rm -f conftest*
+-
+-      if eval test X\$ac_cv_func_${ipv6_cv_pfx}gethostbyname2 = Xyes; then
+-	ipv6_cv_gethostbyname2=yes
+-	break
+-      fi
+-    done
+-  fi
+-fi
+-if test $ipv6_cv_gethostbyname2 = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_GETHOSTBYNAME2 1
+-_ACEOF
+-
+-  :
+-else
+-  :
+-fi
+-
+-
+ ac_fn_c_check_func "$LINENO" "getipnodebyname" "ac_cv_func_getipnodebyname"
+ if test "x$ac_cv_func_getipnodebyname" = xyes; then :
+     ac_cv_lib_socket_getipnodebyname=no
+diff -ru Socket6-0.29.orig/configure.in Socket6-0.29/configure.in
+--- Socket6-0.29.orig/configure.in	2021-07-07 12:53:06.767571002 +0200
+++ Socket6-0.29/configure.in	2021-07-07 12:55:11.497854270 +0200
+@@ -53,7 +53,6 @@
+ 
+ IPv6_CHECK_FUNC(getaddrinfo)
+ IPv6_CHECK_FUNC(getnameinfo)
+-IPv6_CHECK_FUNC(gethostbyname2)
+ IPv6_CHECK_FUNC(getipnodebyname)
+ IPv6_CHECK_FUNC(getipnodebyaddr)
+ IPv6_CHECK_FUNC(inet_pton)
+Pouze v Socket6-0.29/: gailookup.pl
+Pouze v Socket6-0.29/: Makefile
+Pouze v Socket6-0.29/: MYMETA.json
+Pouze v Socket6-0.29/: MYMETA.yml
+Pouze v Socket6-0.29/: pm_to_blib
+Pouze v Socket6-0.29/: Socket6.bs
+Pouze v Socket6-0.29/: Socket6.c
+Pouze v Socket6-0.29/: Socket6.o
+diff -ru Socket6-0.29.orig/Socket6.pm Socket6-0.29/Socket6.pm
+--- Socket6-0.29.orig/Socket6.pm	2021-07-07 12:53:06.767571002 +0200
+++ Socket6-0.29/Socket6.pm	2021-07-07 12:56:54.604915071 +0200
+@@ -129,6 +129,8 @@
+ 
+ =item gethostbyname2 HOSTNAME, FAMILY
+ 
+    This function doesn't supported.
+
+ =item getaddrinfo NODENAME, SERVICENAME, [FAMILY, SOCKTYPE, PROTOCOL, FLAGS]
+ 
+     This function converts node names to addresses and service names
+diff -ru Socket6-0.29.orig/Socket6.xs Socket6-0.29/Socket6.xs
+--- Socket6-0.29.orig/Socket6.xs	2021-07-07 12:53:06.767571002 +0200
+++ Socket6-0.29/Socket6.xs	2021-07-07 12:53:41.416927491 +0200
+@@ -443,27 +443,7 @@
+ 	int	af;
+ 	PPCODE:
+ {
+-#ifdef HAVE_GETHOSTBYNAME2
+-	struct hostent *phe;
+-	int count, i;
+-
+-	if ((phe = gethostbyname2(host, af)) != NULL) {
+-		for (count = 0; phe->h_addr_list[count]; ++count);
+-		EXTEND(sp, 4 + count);
+-		PUSHs(sv_2mortal(newSVpv((char *) phe->h_name,
+-					 strlen(phe->h_name))));
+-		PUSHs(sv_2mortal(newSVpv((char *) phe->h_aliases,
+-					 sizeof(char *))));
+-		PUSHs(sv_2mortal(newSViv((IV) phe->h_addrtype)));
+-		PUSHs(sv_2mortal(newSViv((IV) phe->h_length)));
+-		for (i = 0; i < count; ++i) {
+-			PUSHs(sv_2mortal(newSVpv((char *)phe->h_addr_list[i],
+-						 phe->h_length)));
+-		}
+-	}
+-#else
+ 	ST(0) = (SV *) not_here("gethostbyname2");
+-#endif
+ }
+ 
+ void
--- a/gating.yaml
+++ b/gating.yaml
@ -0,0 +1,7 @@
+# RHEL
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
--- a/perl-Socket6.rpmlintrc
+++ b/perl-Socket6.rpmlintrc
@ -0,0 +1,2 @@
+from Config import *
+addFilter("spelling-error %description -l en_US get(addr|name)info ")
--- a/perl-Socket6.spec
+++ b/perl-Socket6.spec
@ -1,20 +1,21 @@
 Name:           perl-Socket6
-Version:        0.28
-Release:        6%{?dist}
+Version:        0.29
+Release:        25%{?dist}
 Summary:        IPv6 related part of the C socket.h defines and structure manipulators
-License:        BSD
-URL:            http://search.cpan.org/dist/Socket6/
-Source0:        http://www.cpan.org/authors/id/U/UM/UMEMOTO/Socket6-%{version}.tar.gz
+License:        BSD-3-Clause
+URL:            https://metacpan.org/release/Socket6
+Source0:        https://cpan.metacpan.org/modules/by-module/Socket6/Socket6-%{version}.tar.gz
+Patch0:         Socket6-0.29-remove_support_of_gethostname2.patch
 # Build:
 BuildRequires:  coreutils
 BuildRequires:  findutils
 BuildRequires:  gcc
 BuildRequires:  make
-BuildRequires:  perl-interpreter
 BuildRequires:  perl-devel
 BuildRequires:  perl-generators
+BuildRequires:  perl-interpreter
 BuildRequires:  perl(Config)
-BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(ExtUtils::MakeMaker) >= 6.76
 # Module:
 BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
@ -26,7 +27,6 @@ BuildRequires:  perl(vars)
 BuildRequires:  perl(Socket)
 BuildRequires:  perl(Test)
 # Run-time:
-Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))

 # Filter the Perl extension module
 %{?perl_default_filter}
@ -36,18 +36,40 @@ This module supports getaddrinfo() and getnameinfo() to intend to enable
 protocol independent programming. If your environment supports IPv6, IPv6
 related defines such as AF_INET6 are included.

+%package tests
+Summary:        Tests for %{name}
+Requires:       %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires:       perl-Test-Harness
+
+%description tests
+Tests from %{name}. Execute them
+with "%{_libexecdir}/%{name}/test".
+
 %prep
 %setup -q -n Socket6-%{version}
+%patch -P0 -p1
+# Help generators to recognize Perl scripts
+for F in t/*.t; do
+    perl -i -MConfig -ple 'print $Config{startperl} if $. == 1 && !s{\A#!.*perl\b}{$Config{startperl}}' "$F"
+    chmod +x "$F"
+done

 %build
-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}"
-make %{?_smp_mflags}
+perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 OPTIMIZE="%{optflags}"
+%{make_build}

 %install
-make pure_install DESTDIR=%{buildroot}
-find %{buildroot} -type f -name .packlist -delete
+%{make_install}
 find %{buildroot} -type f -name '*.bs' -empty -delete
-%{_fixperms} %{buildroot}
+%{_fixperms} -c %{buildroot}
+# Install tests
+mkdir -p %{buildroot}%{_libexecdir}/%{name}
+cp -a t %{buildroot}%{_libexecdir}/%{name}
+cat > %{buildroot}%{_libexecdir}/%{name}/test << 'EOF'
+#!/bin/sh
+cd %{_libexecdir}/%{name} && exec prove -I . -j "$(getconf _NPROCESSORS_ONLN)"
+EOF
+chmod +x %{buildroot}%{_libexecdir}/%{name}/test

 %check
 make test
@ -58,7 +80,97 @@ make test
 %{perl_vendorarch}/auto/Socket6/
 %{_mandir}/man3/Socket6.3*

+%files tests
+%{_libexecdir}/%{name}
+
 %changelog
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.29-25
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Thu Aug 08 2024 Troy Dawson <tdawson@redhat.com> - 0.29-24
+- Bump release for Aug 2024 java mass rebuild
+
+* Wed Jul 17 2024 Michal Josef Špaček <mspacek@redhat.com> - 0.29-23
+- Fix patch macro
+- Package tests
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.29-22
+- Bump release for June 2024 mass rebuild
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-20
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Tue Jul 11 2023 Jitka Plesnikova <jplesnik@redhat.com> - 0.29-18
+- Perl 5.38 rebuild
+
+* Thu Mar 23 2023 Michal Josef Špaček <mspacek@redhat.com> - 0.29-17
+- Update license to SPDX format
+
+* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Mon May 30 2022 Jitka Plesnikova <jplesnik@redhat.com> - 0.29-14
+- Perl 5.36 rebuild
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Jul 07 2021 Michal Josef Spacek - 0.29-11
+- Remove support of gethostbyname2
+
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 0.29-10
+- Perl 5.34 rebuild
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 0.29-7
+- Perl 5.32 rebuild
+
+* Thu Feb 06 2020 Tom Stellard <tstellar@redhat.com> - 0.29-6
+- Spec file cleanups: Use make_build and make_install macros, use NO_PACKLIST=1
+  - https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
+  - https://fedoraproject.org/wiki/Perl/Tips#ExtUtils::MakeMaker
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 0.29-3
+- Perl 5.30 rebuild
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.29-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Oct  1 2018 Paul Howarth <paul@city-fan.org> - 0.29-1
+- Update to 0.29
+  - Socket6.xs: Update the tests for handling the correct headers on NetBSD
+    and DragonFly BSD
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.28-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 0.28-7
+- Perl 5.28 rebuild
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.28-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

--- a/plans/sanity.fmf
+++ b/plans/sanity.fmf
@ -0,0 +1,5 @@
+summary: Sanity tests
+discover:
+    how: fmf
+execute:
+    how: tmt
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (Socket6-0.28.tar.gz) = 6f7ea283b0eabbe3051ec6d54e070a0290aa1cec6bb82b949a5a23b38b591766d19d2ae7e085c86cf44dac19784c5df3c2bf25a011b77281d5cb7d025beaafce
+SHA512 (Socket6-0.29.tar.gz) = 51d05a04563519010f515a50fb1082c4e72eb4537137ad55f117458c71ec8429a5674083bd68adcbbf2e57632a1cb1bf60693ea98364e7f96c826ff8c9655b33
--- a/tests/upstream-tests.fmf
+++ b/tests/upstream-tests.fmf
@ -0,0 +1,12 @@
+summary: Upstream tests
+contact: Michal Josef Spacek <mspacek@redhat.com>
+component: perl-Socket6
+require: perl-Socket6-tests
+test: /usr/libexec/perl-Socket6/test
+enabled: true
+tag:
+  - rhel-buildroot
+adjust:
+  - enabled: false
+    when: distro < rhel-10 or distro < centos-stream-10
+    continue: false