commit
03e623fe20
@ -0,0 +1 @@
|
|||||||
|
SOURCES/FCGI-0.79.tar.gz
|
@ -0,0 +1 @@
|
|||||||
|
2c6d7ec8481009c23028ac37086b3ddc2ddb177b SOURCES/FCGI-0.79.tar.gz
|
@ -0,0 +1,84 @@
|
|||||||
|
Description: fix CVE-2012-6687 in bundled libfcgi
|
||||||
|
Origin: https://bugs.launchpad.net/ubuntu/+source/libfcgi/+bug/933417
|
||||||
|
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=815840
|
||||||
|
Forwarded: https://rt.cpan.org/Ticket/Display.html?id=118405
|
||||||
|
|
||||||
|
--- a/os_unix.c
|
||||||
|
+++ b/os_unix.c
|
||||||
|
@@ -36,6 +36,7 @@
|
||||||
|
#include <sys/time.h>
|
||||||
|
#include <sys/un.h>
|
||||||
|
#include <signal.h>
|
||||||
|
+#include <poll.h>
|
||||||
|
|
||||||
|
#ifdef HAVE_NETDB_H
|
||||||
|
#include <netdb.h>
|
||||||
|
@@ -97,6 +98,9 @@
|
||||||
|
static int shutdownPending = FALSE;
|
||||||
|
static int shutdownNow = FALSE;
|
||||||
|
|
||||||
|
+static int libfcgiOsClosePollTimeout = 2000;
|
||||||
|
+static int libfcgiIsAfUnixKeeperPollTimeout = 2000;
|
||||||
|
+
|
||||||
|
void OS_ShutdownPending()
|
||||||
|
{
|
||||||
|
shutdownPending = TRUE;
|
||||||
|
@@ -162,6 +166,16 @@
|
||||||
|
if(libInitialized)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
+ char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" );
|
||||||
|
+ if(libfcgiOsClosePollTimeoutStr) {
|
||||||
|
+ libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" );
|
||||||
|
+ if(libfcgiIsAfUnixKeeperPollTimeoutStr) {
|
||||||
|
+ libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo));
|
||||||
|
if(asyncIoTable == NULL) {
|
||||||
|
errno = ENOMEM;
|
||||||
|
@@ -751,19 +765,16 @@
|
||||||
|
{
|
||||||
|
if (shutdown(fd, 1) == 0)
|
||||||
|
{
|
||||||
|
- struct timeval tv;
|
||||||
|
- fd_set rfds;
|
||||||
|
+ struct pollfd pfd;
|
||||||
|
int rv;
|
||||||
|
char trash[1024];
|
||||||
|
|
||||||
|
- FD_ZERO(&rfds);
|
||||||
|
+ pfd.fd = fd;
|
||||||
|
+ pfd.events = POLLIN;
|
||||||
|
|
||||||
|
do
|
||||||
|
{
|
||||||
|
- FD_SET(fd, &rfds);
|
||||||
|
- tv.tv_sec = 2;
|
||||||
|
- tv.tv_usec = 0;
|
||||||
|
- rv = select(fd + 1, &rfds, NULL, NULL, &tv);
|
||||||
|
+ rv = poll(&pfd, 1, libfcgiOsClosePollTimeout);
|
||||||
|
}
|
||||||
|
while (rv > 0 && read(fd, trash, sizeof(trash)) > 0);
|
||||||
|
}
|
||||||
|
@@ -1113,13 +1124,11 @@
|
||||||
|
*/
|
||||||
|
static int is_af_unix_keeper(const int fd)
|
||||||
|
{
|
||||||
|
- struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL };
|
||||||
|
- fd_set read_fds;
|
||||||
|
-
|
||||||
|
- FD_ZERO(&read_fds);
|
||||||
|
- FD_SET(fd, &read_fds);
|
||||||
|
+ struct pollfd pfd;
|
||||||
|
+ pfd.fd = fd;
|
||||||
|
+ pfd.events = POLLIN;
|
||||||
|
|
||||||
|
- return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds);
|
||||||
|
+ return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN);
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
@ -0,0 +1,232 @@
|
|||||||
|
Name: perl-FCGI
|
||||||
|
Summary: FastCGI Perl bindings
|
||||||
|
# needed to properly replace/obsolete fcgi-perl
|
||||||
|
Epoch: 1
|
||||||
|
Version: 0.79
|
||||||
|
Release: 8%{?dist}
|
||||||
|
# same as fcgi
|
||||||
|
License: OML
|
||||||
|
|
||||||
|
Source0: https://cpan.metacpan.org/authors/id/E/ET/ETHER/FCGI-%{version}.tar.gz
|
||||||
|
# Fix CVE-2012-6687 in the bundled fcgi library, bug #1190294, CPAN RT#118405,
|
||||||
|
# patch copied from Debian's libfcgi-perl.
|
||||||
|
Patch0: FCGI-0.78-CVE-2012-6687.patch
|
||||||
|
URL: https://metacpan.org/release/FCGI
|
||||||
|
BuildRequires: coreutils
|
||||||
|
BuildRequires: findutils
|
||||||
|
BuildRequires: gcc
|
||||||
|
BuildRequires: make
|
||||||
|
BuildRequires: perl-devel
|
||||||
|
BuildRequires: perl-generators
|
||||||
|
BuildRequires: perl-interpreter
|
||||||
|
BuildRequires: perl(Config)
|
||||||
|
BuildRequires: perl(Cwd)
|
||||||
|
# ExtUtils::Liblist not used
|
||||||
|
BuildRequires: perl(ExtUtils::MakeMaker) >= 6.76
|
||||||
|
BuildRequires: perl(File::Copy)
|
||||||
|
# File::Spec not used on Linux
|
||||||
|
BuildRequires: perl(Getopt::Long)
|
||||||
|
BuildRequires: perl(IO::File)
|
||||||
|
# Run-time:
|
||||||
|
# Carp not used at tests
|
||||||
|
BuildRequires: perl(strict)
|
||||||
|
BuildRequires: perl(XSLoader)
|
||||||
|
# Tests:
|
||||||
|
BuildRequires: perl(Test)
|
||||||
|
Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
|
||||||
|
Requires: perl(Carp)
|
||||||
|
Requires: perl(XSLoader)
|
||||||
|
# fcgiapp.c, os_unix.c, os_win32.c are copied and modified from FastCGI
|
||||||
|
# Developer's Kit of an unknown version, bug #736612
|
||||||
|
Provides: bundled(fcgi)
|
||||||
|
|
||||||
|
%{?perl_default_filter}
|
||||||
|
|
||||||
|
%description
|
||||||
|
%{summary}.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n FCGI-%{version}
|
||||||
|
%patch0 -p1
|
||||||
|
find . -type f -exec chmod -c -x {} +
|
||||||
|
|
||||||
|
%build
|
||||||
|
perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="%{optflags}" NO_PACKLIST=1 \
|
||||||
|
NO_PERLLOCAL=1
|
||||||
|
%make_build
|
||||||
|
|
||||||
|
%install
|
||||||
|
%make_install
|
||||||
|
%{_fixperms} %{buildroot}/*
|
||||||
|
|
||||||
|
%check
|
||||||
|
make test
|
||||||
|
|
||||||
|
%files
|
||||||
|
%license LICENSE
|
||||||
|
%doc ChangeLog README
|
||||||
|
%{perl_vendorarch}/*
|
||||||
|
%exclude %dir %{perl_vendorarch}/auto
|
||||||
|
%{_mandir}/man3/*.3*
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.79-8
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.79-7
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.79-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.79-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jun 22 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.79-4
|
||||||
|
- Perl 5.32 rebuild
|
||||||
|
|
||||||
|
* Tue Feb 04 2020 Tom Stellard <tstellar@redhat.com> - 1:0.79-3
|
||||||
|
- Spec file cleanups: Use make_build and make_install macros
|
||||||
|
- https://docs.fedoraproject.org/en-US/packaging-guidelines/#_parallel_make
|
||||||
|
- https://fedoraproject.org/wiki/Perl/Tips#ExtUtils::MakeMake
|
||||||
|
|
||||||
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.79-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Dec 15 2019 Emmanuel Seyman <emmanuel@seyman.fr> - 1:0.79-1
|
||||||
|
- Update to 0.79
|
||||||
|
|
||||||
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.78-14
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.78-13
|
||||||
|
- Perl 5.30 rebuild
|
||||||
|
|
||||||
|
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.78-12
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jan 15 2019 Petr Pisar <ppisar@redhat.com> - 1:0.78-11
|
||||||
|
- Document an fcgi library is bundled (bug #736612)
|
||||||
|
- Fix CVE-2012-6687 in the bundled fcgi library (bug #1190294)
|
||||||
|
|
||||||
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.78-10
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jun 27 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.78-9
|
||||||
|
- Perl 5.28 rebuild
|
||||||
|
|
||||||
|
* Sun Mar 11 2018 Emmanuel Seyman <emmanuel@seyman.fr> - 1:0.78-8
|
||||||
|
- Add missing build-requirements
|
||||||
|
|
||||||
|
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.78-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.78-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.78-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jun 04 2017 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.78-4
|
||||||
|
- Perl 5.26 rebuild
|
||||||
|
|
||||||
|
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.78-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat May 14 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.78-2
|
||||||
|
- Perl 5.24 rebuild
|
||||||
|
|
||||||
|
* Fri Mar 11 2016 Emmanuel Seyman <emmanuel@seyman.fr> - 1:0.78-1
|
||||||
|
- Update to 0.78
|
||||||
|
- Pass NO_PACKLIST to Makefile.PL
|
||||||
|
- Drop Obsolete Obsoletes
|
||||||
|
|
||||||
|
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.77-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.77-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jun 03 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.77-5
|
||||||
|
- Perl 5.22 rebuild
|
||||||
|
|
||||||
|
* Wed Jan 14 2015 Petr Pisar <ppisar@redhat.com> - 1:0.77-4
|
||||||
|
- Specify all dependencies
|
||||||
|
|
||||||
|
* Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1:0.77-3
|
||||||
|
- Perl 5.20 rebuild
|
||||||
|
|
||||||
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.77-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Aug 17 2014 Emmanuel Seyman <emmanuel@seyman.fr> - 1:0.77-1
|
||||||
|
- Update to 0.77
|
||||||
|
- Use %%license
|
||||||
|
|
||||||
|
* Sun Jul 20 2014 Emmanuel Seyman <emmanuel@seyman.fr> - 1:0.75-1
|
||||||
|
- Update to 0.75
|
||||||
|
- Remove the Group macro
|
||||||
|
|
||||||
|
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.74-11
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Sep 02 2013 Petr Pisar <ppisar@redhat.com> - 1:0.74-10
|
||||||
|
- Correct tests sub-package obsoleteness
|
||||||
|
- Old fcgi-perl provides removed
|
||||||
|
|
||||||
|
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.74-9
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Jul 15 2013 Petr Pisar <ppisar@redhat.com> - 1:0.74-8
|
||||||
|
- Perl 5.18 rebuild
|
||||||
|
|
||||||
|
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.74-7
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon Nov 26 2012 Petr Šabata <contyk@redhat.com> - 1:0.74-6
|
||||||
|
- Add missing buildtime dependencies
|
||||||
|
- Drop command macros
|
||||||
|
- Drop the tests subpackage
|
||||||
|
|
||||||
|
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.74-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jun 06 2012 Petr Pisar <ppisar@redhat.com> - 1:0.74-4
|
||||||
|
- Perl 5.16 rebuild
|
||||||
|
|
||||||
|
* Fri Jun 01 2012 Petr Pisar <ppisar@redhat.com> - 1:0.74-3
|
||||||
|
- Specify all dependencies
|
||||||
|
|
||||||
|
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.74-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sat Sep 24 2011 Iain Arnell <iarnell@gmail.com> 1:0.74-1
|
||||||
|
- update to latest upstream
|
||||||
|
- drop cve-2011-2766 patch
|
||||||
|
|
||||||
|
* Fri Sep 23 2011 Iain Arnell <iarnell@gmail.com> 1:0.73-3
|
||||||
|
- patch to resolve rhbz#736604 cve-2011-2766
|
||||||
|
|
||||||
|
* Fri Jun 17 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1:0.73-2
|
||||||
|
- Perl mass rebuild
|
||||||
|
|
||||||
|
* Thu Jun 16 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1:0.73-1
|
||||||
|
- update to 0.73, clean spec file
|
||||||
|
|
||||||
|
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.71-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Dec 16 2010 Marcela Maslanova <mmaslano@redhat.com> - 1:0.71-4
|
||||||
|
- 661697 rebuild for fixing problems with vendorach/lib
|
||||||
|
|
||||||
|
* Sat May 15 2010 Chris Weyl <cweyl@alumni.drew.edu> 1:0.71-3
|
||||||
|
- and fix our tests subpackage included files
|
||||||
|
|
||||||
|
* Sat May 15 2010 Chris Weyl <cweyl@alumni.drew.edu> 1:0.71-2
|
||||||
|
- fix license: BSD => OML
|
||||||
|
|
||||||
|
* Sat May 08 2010 Chris Weyl <cweyl@alumni.drew.edu> 1:0.71-1
|
||||||
|
- specfile by Fedora::App::MaintainerTools 0.006
|
||||||
|
|
||||||
|
|
Loading…
Reference in new issue