.gitignore

@@ -1 +1 @@
-SOURCES/perl-ldap-0.68.tar.gz
+SOURCES/perl-ldap-0.66.tar.gz

.perl-LDAP.metadata

@@ -1 +1 @@
-718991c58b454b9748398dc9542d4488a85c16a9 SOURCES/perl-ldap-0.68.tar.gz
+b6dbc774a7d42a994a103a7d5fd934f6c918e8e6 SOURCES/perl-ldap-0.66.tar.gz

SOURCES/perl-ldap-0.66-Correct-a-shell-bang-in-data-regenerate_cert.sh.patch

@@ -0,0 +1,26 @@
+From 4e63491c2a9ba2d9e9f5ad22360051038918c19d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
+Date: Tue, 29 Oct 2019 14:49:09 +0100
+Subject: [PATCH] Correct a shell bang in data/regenerate_cert.sh
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+---
+ data/regenerate_cert.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/regenerate_cert.sh b/data/regenerate_cert.sh
+index 9bf1879..8980fbe 100755
+--- a/data/regenerate_cert.sh
++++ b/data/regenerate_cert.sh
+@@ -1,4 +1,4 @@
+-#/bin/sh
++#!/bin/sh
+ # regenerate server certificate for the SSL tests
+ 
+ if [ -e openssl.cnf ]; then
+-- 
+2.21.0
+

SOURCES/perl-ldap-0.68-Do-not-default-IO-Socket-IP-to-AI_ADDRCONFIG-flag.patch

@@ -1,51 +0,0 @@
-From 957a39309fa2f8a85a6b8a0a2c5b1751a151cb8b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Tue, 16 Feb 2021 15:29:58 +0100
-Subject: [PATCH] Do not default IO::Socket::IP to AI_ADDRCONFIG flag
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-t/40connect.t fails if the only available network interface is
-loopback and IO::Socket::IP is installed:
-
-    # perl -Ilib -I. t/40connect.t
-    1..3
-    ok 1 - client with IPv4/IPv6 auto-selection, bound to ::1
-    ldap://localhost:9009/ Name or service not known at t/common.pl line 157.
-    # Looks like your test exited with 22 just after 1.
-
-The reason is that IO::Socket::IP by default resolves host names with
-AI_ADDRCONFIG flag and in the particular case (no interfaces other
-than loopback) a system resolver (glibc in my case) hides both IPv4
-and IPv6 addreses of the hostname (e.g. localhost).
-
-See <https://rt.cpan.org/Ticket/Display.html?id=104793> for more
-details.
-
-I applied a workaround similar to one found in IO-Socket-SSL.
-I believe that other Socket implementations perl-ldap can use do not
-suffer from this problem.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- lib/Net/LDAP.pm | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/Net/LDAP.pm b/lib/Net/LDAP.pm
-index 5dfe3e3..be11d12 100644
---- a/lib/Net/LDAP.pm
-+++ b/lib/Net/LDAP.pm
-@@ -167,6 +167,9 @@ sub connect_ldap {
-     LocalAddr  => $arg->{localaddr} || undef,
-     Proto      => 'tcp',
-     ($class eq 'IO::Socket::IP' ? 'Family' : 'Domain')     => $domain,
-+    # Work around IO::Socket::IP defaulting to AI_ADDRCONFIG which breaks
-+    # resolution if only a loopback interface is available. CPAN RT#104793.
-+    ($class eq 'IO::Socket::IP' and $domain ne AF_UNSPEC ? ('GetAddrInfoFlags' => 0) : ()),
-     MultiHomed => $arg->{multihomed},
-     Timeout    => defined $arg->{timeout}
- 		 ? $arg->{timeout}
--- 
-2.26.2
-

SPECS/perl-LDAP.spec

@@ -8,8 +8,8 @@
 %endif
 
 Name:           perl-LDAP
-Version:        0.68
-Release:        5%{?dist}
+Version:        0.66
+Release:        7%{?dist}
 Epoch:          1
 Summary:        LDAP Perl module
 License:        GPL+ or Artistic
@@ -19,14 +19,12 @@ Source0:        https://cpan.metacpan.org/authors/id/M/MA/MARSCHAP/perl-ldap-%{v
 Patch0:         perl-ldap-0.65-Configure-usr-sbin-slapd-for-tests.patch
 # Remove an unreliable cancelling test
 Patch1:         perl-ldap-0.66-test-Remove-a-test-for-cancelling-asynchronous-calls.patch
-# Fix resolving localhost on loopback-only machines,
-# <https://github.com/perl-ldap/perl-ldap/pull/60>, CPAN RT#104793
-Patch2:         perl-ldap-0.68-Do-not-default-IO-Socket-IP-to-AI_ADDRCONFIG-flag.patch
+# Fix a shell bang in a certificate generator script,
+# <https://github.com/perl-ldap/perl-ldap/pull/55>, bug #1663063
+Patch2:         perl-ldap-0.66-Correct-a-shell-bang-in-data-regenerate_cert.sh.patch
 BuildArch:      noarch
-BuildRequires:  coreutils
-BuildRequires:  make
-BuildRequires:  perl-generators
 BuildRequires:  perl-interpreter
+BuildRequires:  perl-generators
 BuildRequires:  perl(inc::Module::Install)
 BuildRequires:  perl(Module::Install::AutoInstall)
 BuildRequires:  perl(Module::Install::Metadata)
@@ -172,20 +170,21 @@ chmod -c 644 bin/* contrib/* lib/Net/LDAP/DSML.pm
 perl -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' contrib/*
 # Remove bundled libraries
 rm -rf inc
-perl -i -ne 'print $_ unless m{^inc/}' MANIFEST
+sed -i -e '/^inc\// d' MANIFEST
 # Remove tests specific for XML support if the support is disabled
 %if !%{with perl_LDAP_enables_xml}
 rm t/05dsml.t
-perl -i -ne 'print $_ unless m{^t/05dsml\.t}' MANIFEST
+sed -i -e '/^t\/05dsml\.t/ d' MANIFEST
 %endif
 find -type f \! -name 'regenerate_cert.sh' -exec chmod -x {} +
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 < /dev/null
-%{make_build}
+perl Makefile.PL INSTALLDIRS=vendor < /dev/null
+make %{?_smp_mflags}
 
 %install
-%{make_install}
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -delete
 mkdir -p %{buildroot}/%{_libexecdir}/%{name}
 # FIXME: Generators should scan these non-executable files
 cp -a data t test.cfg %{buildroot}/%{_libexecdir}/%{name}
@@ -227,35 +226,12 @@ make test
 %{_libexecdir}/%{name}
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.68-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Tue Oct 29 2019 Petr Pisar <ppisar@redhat.com> - 1:0.66-7
+- Fix tests subpackage test script (bug #1663063)
+- Fix a shell bang in a certificate generator script (bug #1663063)
 
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.68-4
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Feb 16 2021 Petr Pisar <ppisar@redhat.com> - 1:0.68-3
-- Fix resolving localhost on loopback-only machines
-  (https://github.com/perl-ldap/perl-ldap/pull/60)
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.68-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jan 05 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.68-1
-- 0.68 bump
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.66-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jun 23 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.66-8
-- Perl 5.32 rebuild
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.66-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Tue Oct 29 2019 Petr Pisar <ppisar@redhat.com> - 1:0.66-6
-- Fix tests subpackage test script
-- Fix a shell bang in a certificate generator script
+* Tue Sep 17 2019 Petr Pisar <ppisar@redhat.com> - 1:0.66-6
+- Bump a release to replace the EPEL package (bug #1663063)
 
 * Mon Aug 26 2019 Petr Pisar <ppisar@redhat.com> - 1:0.66-5
 - Package tests