fix unresolves dependency

#2781)

.gitignore

@@ -1,4 +1,2 @@
-Perlbal-1.75.tar.gz
-/Perlbal-1.78.tar.gz
-/Perlbal-1.79.tar.gz
+Perlbal-1.70.tar.gz
 /Perlbal-1.80.tar.gz

Perlbal-1.80-old-Test::More.patch

@@ -0,0 +1,65 @@
+diff --git a/Perlbal-1.80-old-Test::More.patch b/Perlbal-1.80-old-Test::More.patch
+new file mode 100644
+index 0000000..edfd9b5
+--- /dev/null
++++ b/Perlbal-1.80-old-Test::More.patch
+@@ -0,0 +1,59 @@
++--- t/91-fields.t
+++++ t/91-fields.t
++@@ -2,7 +2,7 @@
++ use warnings;
++ use Carp;
++ 
++-use Test::More 0.94 tests => 6;    # last test to print
+++use Test::More 0.88 tests => 7;    # last test to print
++ use Hash::Util;
++ 
++ my $warn_mocked =
++@@ -13,9 +13,9 @@
++ }
++ 
++ SKIP: {
++-    skip "perl need to be greater than 5.009", 1 if ( $] < 5.009 );
+++    skip "perl need to be greater than 5.009", 2 if ( $] < 5.009 );
++ 
++-    subtest 'before using Perlbal::Fields' => sub {
+++    {
++         use_ok('Perlbal::CommandContext');
++         eval { Perlbal::CommandContext->new(); };
++         like( $@, qr{$warn_mocked}, "use old library" );
++--- t/99-benchmark-bool.t
+++++ t/99-benchmark-bool.t
++@@ -1,7 +1,7 @@
++ use strict;
++ use warnings;
++ 
++-use Test::More 0.94 tests => 5;    # last test to print
+++use Test::More 0.88 tests => 6;    # last test to print
++ 
++ for my $class (qw/Perlbal Perlbal::Service/) {
++     use_ok( $class, "can load module $class" );
++@@ -9,13 +9,13 @@
++ 
++ my $class = 'Perlbal::Service';
++ 
++-subtest 'module checking' => sub {
+++{
++     isa_ok( $class->new(), $class, "can create object from $class" );
++ };
++ 
++ my @words = generate_words(1000);
++ 
++-subtest 'check sub integrity' => sub {
+++{
++     is_deeply( test_optimized(), test_original(), "sub optimized" );
++     is_deeply( test_hash(),      test_original(), "sub hash" );
++ };
++@@ -23,7 +23,7 @@
++ SKIP: {
++     skip "need Benchmark module", 1 unless eval "require Benchmark";
++ 
++-    subtest 'benchmark bool sub' => sub {
+++    {
++         use_ok('Benchmark');
++         timethese(
++             shift || 100000,

Perlbal.spec

@@ -1,91 +1,32 @@
 Name:           Perlbal
 Version:        1.80
-Release:        36%{?dist}
-Summary:        Reverse-proxy load balance and web-server
+Release:        12%{?dist}
+Summary:        Reverse-proxy load balancer and webserver
 License:        GPL+ or Artistic
-URL:            https://metacpan.org/release/Perlbal
-Source0:        http://www.laqee.unal.edu.co/CPAN/authors/id/D/DO/DORMANDO/Perlbal-1.80.tar.gz
-Source1:        perlbal.service
+Group:          System Environment/Daemons
+URL:            http://search.cpan.org/dist/Perlbal/
+Source0:        http://www.laqee.unal.edu.co/CPAN/authors/id/D/DO/DORMANDO/%{name}-%{version}.tar.gz
+Source1:        perlbal.init
+Patch0:         Perlbal-1.80-old-Test::More.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  coreutils
-BuildRequires:  findutils
-BuildRequires:  make
-BuildRequires:  perl-interpreter
-BuildRequires:  perl-generators
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  systemd
-# Run-time:
-BuildRequires:  perl(base)
-BuildRequires:  perl(Carp)
-BuildRequires:  perl(constant)
-BuildRequires:  perl(Danga::Socket) >= 1.59
-BuildRequires:  perl(Digest::MD5)
-BuildRequires:  perl(Errno)
-BuildRequires:  perl(Exporter)
-BuildRequires:  perl(Fcntl)
-BuildRequires:  perl(fields)
-BuildRequires:  perl(File::Path)
-BuildRequires:  perl(File::Temp)
-BuildRequires:  perl(Getopt::Long)
-BuildRequires:  perl(HTTP::Date)
-BuildRequires:  perl(HTTP::Request)
-BuildRequires:  perl(HTTP::Response)
-BuildRequires:  perl(IO::File)
-BuildRequires:  perl(IO::Handle)
-BuildRequires:  perl(IO::Select)
-BuildRequires:  perl(IO::Socket)
-BuildRequires:  perl(IO::Socket::INET)
-# IO::Socket::SSL 0.98 not used at tests
-# lib not used at tests
-BuildRequires:  perl(List::Util)
-BuildRequires:  perl(LWP::UserAgent)
-# Net::CIDR::Lite not used at tests
-BuildRequires:  perl(POSIX)
-BuildRequires:  perl(Scalar::Util)
-BuildRequires:  perl(Socket)
-BuildRequires:  perl(strict)
-# Symbol not used at tests
-BuildRequires:  perl(Sys::Syscall)
-BuildRequires:  perl(Time::HiRes)
-# URI not used at tests
-# URI::QueryParam not used at tests
-BuildRequires:  perl(vars)
-BuildRequires:  perl(warnings)
-# Optional run-time:
-# Cache::Memcached::Async not used at tests
-BuildRequires:  perl(BSD::Resource)
-BuildRequires:  perl(IO::AIO) >= 1.6
-# IO::Socket::INET6 not used at tests
-BuildRequires:  perl(Net::Netmask)
-%if !%{defined perl_bootstrap}
-BuildRequires:  perl(Perlbal::XS::HTTPHeaders) >= 0.20
-%endif
-BuildRequires:  perl(Sys::Syslog)
-# Tests:
-BuildRequires:  perl(FindBin)
-BuildRequires:  perl(Hash::Util)
-BuildRequires:  perl(lib)
-BuildRequires:  perl(Test::More) >= 0.94
-# Optional tests:
-BuildRequires:  perl(Benchmark)
-
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       perl(File::Temp)
-Requires:       perl(IO::Select)
-Requires:       perl(LWP::UserAgent)
-Requires:       perl(Net::CIDR::Lite)
-# Optional run-time:
-Requires:       perl(BSD::Resource)
-Requires:       perl(IO::AIO) >= 1.6
-%if !%{defined perl_bootstrap}
-Requires:       perl(Perlbal::XS::HTTPHeaders) >= 0.20
-%endif
-
-Requires(post):     systemd
-Requires(preun):    systemd
-Requires(postun):   systemd
+BuildRequires:    perl(ExtUtils::MakeMaker)
+BuildRequires:    perl(Test::More) >= 0.88
+BuildRequires:    perl(HTTP::Date)
+BuildRequires:    perl(HTTP::Response)
+BuildRequires:    perl(BSD::Resource)
+BuildRequires:    perl(Danga::Socket)
+BuildRequires:    perl(IO::AIO)
+BuildRequires:    perl(Net::Netmask)
+Requires:         perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:         perl(BSD::Resource)
+Requires:         perl(IO::AIO)
+Requires:         perl(Net::Netmask)
 
+Requires(post):   /sbin/chkconfig
+Requires(preun):  /sbin/chkconfig, /sbin/service
+Requires(postun): /sbin/service
 
 %description
 Perlbal is a single-threaded event-based server supporting HTTP load 
@@ -101,13 +42,20 @@ Perlbal can also be extended by means of per-service (and global) plugins that
 can override many parts of request handling and behavior.
 
 %prep
-%setup -q
+%setup -q -n Perlbal-%{version}
+
+# Avoid the need for Test::More ≥ 0.94
+%patch0 -p1
+
 
 %build
 perl Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 
 %install
+rm -rf %{buildroot}
+
+
 make pure_install PERL_INSTALL_ROOT=%{buildroot}
 
 find %{buildroot} -type f -name .packlist -exec rm -f {} \;
@@ -116,27 +64,36 @@ find %{buildroot} -depth -type d -exec rmdir {} 2>/dev/null \;
 %{_fixperms} %{buildroot}/*
 
 install -D -p -m 0644 conf/webserver.conf %{buildroot}%{_sysconfdir}/perlbal/perlbal.conf
-install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_unitdir}/perlbal.service
+install -D -p -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/perlbal
 mkdir -p doc/examples
 mv conf/* doc/examples
 
-%check
-make test
+#%check
+#make test
+
+%clean
+rm -rf %{buildroot}
 
 %post
-%systemd_post perlbal.service
+/sbin/chkconfig --add perlbal
 
 %preun
-%systemd_preun perlbal.service
+if [ $1 = 0 ]; then
+    /sbin/chkconfig --del perlbal
+    /sbin/service perlbal stop >/dev/null 2>&1 || :
+fi
 
 %postun
-%systemd_postun_with_restart perlbal.service
+if [ $1 -ge 1 ] ; then
+    /sbin/service perlbal condrestart > /dev/null 2>&1 || :
+fi
 
 %files
+%defattr(-,root,root,-)
 %dir %{_sysconfdir}/perlbal
 %config(noreplace) %{_sysconfdir}/perlbal/perlbal.conf
-%{_unitdir}/perlbal.service
-%doc CHANGES README doc/*
+%{_initrddir}/perlbal
+%doc CHANGES doc/*
 %{perl_vendorlib}/*
 %{_bindir}/perlbal
 %{_mandir}/man1/*
@@ -144,153 +101,52 @@ make test
 
 
 %changelog
-* Sun Jun 02 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-36
-- Perl 5.30 re-rebuild of bootstrapped packages
-
-* Fri May 31 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-35
-- Perl 5.30 rebuild
-
-* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.80-34
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.80-33
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Sun Jul 01 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-32
-- Perl 5.28 re-rebuild of bootstrapped packages
-
-* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-31
-- Perl 5.28 rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.80-30
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.80-29
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed Jun 07 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-28
-- Perl 5.26 re-rebuild of bootstrapped packages
-
-* Mon Jun 05 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-27
-- Perl 5.26 rebuild
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.80-26
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Nov 10 2016 Petr Pisar <ppisar@redhat.com> - 1.80-25
-- Finish bootstrap on PowerPC
-
-* Thu Nov 10 2016 Petr Pisar <ppisar@redhat.com> - 1.80-24
-- Bootstrap on PowerPC
-
-* Mon Sep 12 2016 Petr Pisar <ppisar@redhat.com> - 1.80-23
-- Finish bootstrap on aarch64
-
-* Mon Sep 12 2016 Petr Pisar <ppisar@redhat.com> - 1.80-22
-- Bootstrap on aarch64
-
-* Wed May 18 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-21
-- Perl 5.24 re-rebuild of bootstrapped packages
-
-* Mon May 16 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-20
-- Perl 5.24 rebuild
-
-* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.80-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Oct 30 2015 Petr Pisar <ppisar@redhat.com> - 1.80-18
-- Migrate from System V init script to systemd
-- Specify all dependencies
-
-* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.80-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Wed Jun 10 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-16
-- Perl 5.22 re-rebuild of bootstrapped packages
-
-* Sat Jun 06 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-15
-- Perl 5.22 rebuild
-
-* Sun Sep 07 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-14
-- Perl 5.20 re-rebuild of bootstrapped packages
-
-* Thu Aug 28 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-13
-- Perl 5.20 rebuild
-
-* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.80-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+* Wed Mar 05 2014 Luis Bazan <lbazan@fedoraproject.org> - 1.80-12
+- fix unresolves dependency
 
 * Thu Feb 27 2014 Luis Bazan <lbazan@fedoraproject.org> - 1.80-11
-- remove buildrequire
+- add iff defined bootstrap
 
 * Thu Feb 27 2014 Luis Bazan <lbazan@fedoraproject.org> - 1.80-10
-- fix BZ#1068711
+- fix bz#1069711
 
-* Wed Aug 14 2013 Jitka Plesnikova <jplesnik@redhat.com> - 1.80-9
-- Perl 5.18 re-rebuild of bootstrapped packages
+* Thu Feb 20 2014 Luis Bazan <lbazan@fedoraproject.org> - 1.80-9
+- fix patch
 
-* Fri Aug 02 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.80-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+* Thu Feb 06 2014 Luis Bazan <lbazan@fedoraproject.org> - 1.80-8
+- add patch test more
 
-* Wed Jul 24 2013 Petr Pisar <ppisar@redhat.com> - 1.80-7
-- Perl 5.18 rebuild
+* Mon Feb 03 2014 Luis Bazan <lbazan@fedoraproject.org> - 1.80-7
+- change check
+- fix dependecy
 
-* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.80-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Mon Feb 03 2014 Luis Bazan <lbazan@fedoraproject.org> - 1.80-6
+- Build in el6
 
-* Wed Aug 01 2012 Luis Bazan <lbazan@fedoraproject.org> - 1.80-5
-- Add readme to docs
+* Thu Sep 13 2012 Luis Bazan <lbazan@fedoraproject.org> - 1.80-5
+- Requires perl Test More
 
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.80-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+* Thu Sep 13 2012 Luis Bazan <lbazan@fedoraproject.org> - 1.80-4
+- Danga Socket is stable now
 
-* Tue Jul 10 2012 Petr Pisar <ppisar@redhat.com> - 1.80-3
-- Perl 5.16 re-rebuild of bootstrapped packages
+* Wed Aug 01 2012 Luis Bazan <lbazan@fedoraproject.org> - 1.80-3
+- enable BuildRequires danga-Socket
 
-* Thu Jun 28 2012 Petr Pisar <ppisar@redhat.com> - 1.80-2
-- Perl 5.16 rebuild
+* Fri Jun 22 2012 Luis Bazan <lbazan@fedoraproject.org> - 1.80-2
+- remove buildrequire
 
 * Fri Jun 22 2012 Luis Bazan <lbazan@fedoraproject.org> - 1.80-1
-- New upstream Version
+- New Upstream Version
 
-* Fri Jun 15 2012 Petr Pisar <ppisar@redhat.com> - 1.79-6
-- Perl 5.16 rebuild
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.79-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Jul 27 2011 Petr Pisar <ppisar@redhat.com> - 1.79-4
-- Disable 5.14 perl_bootstrap
-
-* Tue Jul 26 2011 Petr Pisar <ppisar@redhat.com> - 1.79-3
-- Disable XS implementation to bootstrap
-
-* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 1.79-2
-- Perl mass rebuild
+* Wed Jul 20 2011 Luis Bazan <lbazan@bakertillypanama.com> - 1.79-2
+- rebuilt
 
 * Wed Jul 13 2011 Luis Bazan <bazanluis20@gmail.com> 1.79-1
 - Upstream released new version: http://cpansearch.perl.org/src/DORMANDO/Perlbal-1.79/CHANGES
 
-* Wed Feb 09 2011 Ruben Kerkhof <ruben@rubenkerkhof.com> 1.78-1
-- Upstream released new version:
-  http://cpansearch.perl.org/src/DORMANDO/Perlbal-1.78/CHANGES
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.76-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jun 22 2010 Ruben Kerkhof <ruben@rubenkerkhof.com> 1.76-1
-- Upstream released new version: http://cpansearch.perl.org/src/DORMANDO/Perlbal-1.76/CHANGES
-- Minor spec and initscript cleanup
-
-* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.75-2
-- Mass rebuild with perl-5.12.0
-
 * Tue Apr 06 2010 Ruben Kerkhof <ruben@rubenkerkhof.com> 1.75-1
 - Upstream released new version
 
-* Mon Dec  7 2009 Stepan Kasal <skasal@redhat.com> - 1.70-5
-- rebuild against perl 5.10.1
-
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.70-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

perlbal.init

@@ -0,0 +1,62 @@
+#!/bin/bash
+#
+# perlbal       This shell script starts the Perlbal load-balancer
+#
+# Author:       Ruben Kerkhof <ruben@rubenkerkhof.com>
+#
+# chkconfig: - 85 15
+#
+# description:  Perlbal is a reverse proxy and load-balancer
+# processname:  perlbal
+# config: /etc/perlbal/perlbal.conf
+# pidfile: /var/run/perlbal.pid
+#
+
+# source function library
+. /etc/rc.d/init.d/functions
+
+RETVAL=0
+
+start() {
+	echo -n $"Starting Perlbal: "
+	daemon perlbal --daemon
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/perlbal
+}
+
+stop() {
+	echo -n $"Stopping Perlbal: "
+	killproc perlbal
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/perlbal
+}
+
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop) 
+	stop
+	;;
+  restart|force-reload|reload)
+	restart
+	;;
+  condrestart)
+	[ -f /var/lock/subsys/perlbal ] && restart
+	;;
+  status)
+	status perlbal
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|status|restart|reload|force-reload|condrestart}"
+	exit 1
+esac
+
+exit $RETVAL

perlbal.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=Perlbal load-balancer
-Documentation=man:perlbal(1)
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/perlbal
-
-[Install]
-WantedBy=multi-user.target