diff --git a/.gitignore b/.gitignore index 0817c0f..8f361cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /mingw-fcgi-2.4.1.tar.gz +/mingw-fcgi-2.4.2.tar.gz diff --git a/fcgi-autogen.sh b/fcgi-autogen.sh deleted file mode 100755 index ec82f47..0000000 --- a/fcgi-autogen.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -libtoolize --automake --copy --force -aclocal-1.9 -autoheader -automake-1.9 --add-missing --force-missing --copy -autoconf diff --git a/fcgi_CPPFLAGS.patch b/fcgi_CPPFLAGS.patch deleted file mode 100644 index 86fefdd..0000000 --- a/fcgi_CPPFLAGS.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -rupN fcgi-2.4.0/cgi-fcgi/Makefile.am fcgi-2.4.0-new/cgi-fcgi/Makefile.am ---- fcgi-2.4.0/cgi-fcgi/Makefile.am 2001-12-22 04:16:22.000000000 +0100 -+++ fcgi-2.4.0-new/cgi-fcgi/Makefile.am 2015-06-24 14:48:14.007896154 +0200 -@@ -2,7 +2,7 @@ - bin_PROGRAMS = cgi-fcgi - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ -diff -rupN fcgi-2.4.0/examples/Makefile.am fcgi-2.4.0-new/examples/Makefile.am ---- fcgi-2.4.0/examples/Makefile.am 2001-12-22 04:16:21.000000000 +0100 -+++ fcgi-2.4.0-new/examples/Makefile.am 2015-06-24 14:48:14.007896154 +0200 -@@ -11,7 +11,7 @@ noinst_PROGRAMS = authorizer - EXTRA_PROGRAMS = threaded echo-cpp - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ -diff -rupN fcgi-2.4.0/libfcgi/Makefile.am fcgi-2.4.0-new/libfcgi/Makefile.am ---- fcgi-2.4.0/libfcgi/Makefile.am 2001-12-22 04:16:20.000000000 +0100 -+++ fcgi-2.4.0-new/libfcgi/Makefile.am 2015-06-24 14:48:14.008896172 +0200 -@@ -1,7 +1,7 @@ - # $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $ - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ diff --git a/fcgi_build.patch b/fcgi_build.patch deleted file mode 100644 index 6c5cfe2..0000000 --- a/fcgi_build.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up fcgi-2.4.0/libfcgi/fcgio.cpp.gcc44_fixes fcgi-2.4.0/libfcgi/fcgio.cpp ---- fcgi-2.4.0/libfcgi/fcgio.cpp.gcc44_fixes 2002-02-24 21:12:22.000000000 +0100 -+++ fcgi-2.4.0/libfcgi/fcgio.cpp 2009-02-15 11:35:18.000000000 +0100 -@@ -23,6 +23,7 @@ - #endif - - #include -+#include - #include "fcgio.h" - - using std::streambuf; diff --git a/fcgi_configure.in.patch b/fcgi_configure.in.patch deleted file mode 100644 index bea20ef..0000000 --- a/fcgi_configure.in.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -rupN fcgi2-2.4.1/configure.in fcgi2-2.4.1-new/configure.in ---- fcgi2-2.4.1/configure.in 2017-03-28 02:44:54.000000000 +0200 -+++ fcgi2-2.4.1-new/configure.in 2017-08-31 22:26:19.337806481 +0200 -@@ -4,15 +4,15 @@ dnl This file is an input file used - dnl generate the file "configure", which is run during the build - dnl to configure the system for the local environment. - --AC_INIT --AM_INIT_AUTOMAKE(fcgi, 2.4.1-SNAP-0910052249) -+AC_INIT(fcgi, 2.4.1) -+AM_INIT_AUTOMAKE(1.9 foreign) - --AM_CONFIG_HEADER(fcgi_config.h) -+AC_CONFIG_HEADERS(fcgi_config.h) - - AC_PROG_CC - AC_PROG_CPP - AC_PROG_INSTALL --AC_PROG_LIBTOOL -+LT_INIT - - AC_PROG_CXX - -diff -rupN fcgi2-2.4.1/perl/configure.in fcgi2-2.4.1-new/perl/configure.in ---- fcgi2-2.4.1/perl/configure.in 2017-03-28 02:44:54.000000000 +0200 -+++ fcgi2-2.4.1-new/perl/configure.in 2017-08-31 22:26:27.561790532 +0200 -@@ -6,7 +6,7 @@ dnl to configure the system for the - - AC_INIT - --AM_CONFIG_HEADER([fcgi_config.h]) -+AC_CONFIG_HEADERS([fcgi_config.h]) - - AC_PROG_CC - AC_PROG_CPP diff --git a/fcgi_mingw.patch b/fcgi_mingw.patch deleted file mode 100644 index 3ffc806..0000000 --- a/fcgi_mingw.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -rupN fcgi-2.4.0/configure.in fcgi-2.4.0-new/configure.in ---- fcgi-2.4.0/configure.in 2003-01-19 18:19:41.000000000 +0100 -+++ fcgi-2.4.0-new/configure.in 2015-06-24 15:08:45.459162489 +0200 -@@ -63,7 +63,7 @@ AC_C_INLINE - # Windows builds don't run configure so we should be safe fixing - # this to 'unix' (at least for now). - #-------------------------------------------------------------------- --SYSTEM=unix -+SYSTEM=win32 - AC_SUBST([SYSTEM]) - - AC_PROG_CC_WARNINGS -diff -rupN fcgi-2.4.0/examples/log-dump.c fcgi-2.4.0-new/examples/log-dump.c ---- fcgi-2.4.0/examples/log-dump.c 2001-09-01 03:12:26.000000000 +0200 -+++ fcgi-2.4.0-new/examples/log-dump.c 2015-06-24 15:11:21.308982103 +0200 -@@ -54,7 +54,9 @@ int main(void) - while(FCGI_Accept() >= 0) { - rolePtr = getenv("FCGI_ROLE"); - if(rolePtr == NULL) { -- kill(getpid(), SIGQUIT); -+#if defined __linux__ -+ kill(getpid(), SIGSTOP); -+#endif - exit(-1); - } - if(strstr(rolePtr, "AUTHORIZER")) { -diff -rupN fcgi-2.4.0/libfcgi/Makefile.am fcgi-2.4.0-new/libfcgi/Makefile.am ---- fcgi-2.4.0/libfcgi/Makefile.am 2001-12-22 04:16:20.000000000 +0100 -+++ fcgi-2.4.0-new/libfcgi/Makefile.am 2015-06-24 15:08:45.459162489 +0200 -@@ -18,10 +18,11 @@ libfcgi_la_SOURCES = $(INCLUDE_FILES) \ - os_@SYSTEM@.c - libfcgi_la_CC = @PTHREAD_CC@ - libfcgi_la_CFLAGS = @PTHREAD_CFLAGS@ -+libfcgi_la_LDFLAGS = -no-undefined -lwsock32 -lws2_32 - - libfcgi___la_SOURCES = $(INCLUDE_FILES) \ - $(INCLUDEDIR)/fcgio.h \ - fcgio.cpp - libfcgi___la_CFLAGS = @PTHREAD_CFLAGS@ --libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@ -+libfcgi___la_LDFLAGS = -no-undefined -lfcgi -rpath @libdir@ - diff --git a/mingw-fcgi.spec b/mingw-fcgi.spec index cae5260..98a6f78 100644 --- a/mingw-fcgi.spec +++ b/mingw-fcgi.spec @@ -3,25 +3,14 @@ %global pkgname fcgi Name: mingw-%{pkgname} -Version: 2.4.1 -Release: 4%{?dist} +Version: 2.4.2 +Release: 1%{?dist} Summary: MinGW Windows %{pkgname} library BuildArch: noarch License: OML URL: https://fastcgi-archives.github.io/ Source0: https://github.com/FastCGI-Archives/fcgi2/archive/%{version}/%{name}-%{version}.tar.gz -Source1: fcgi-autogen.sh - -# Fix configure.in AC_INIT and AM_INIT, replace some obsolete macros -Patch0: fcgi_configure.in.patch -# Fix CPPFLAGS -> AM_CPPFLAGS -Patch1: fcgi_CPPFLAGS.patch -# Fix build with gcc >= 4.4 -Patch2: fcgi_build.patch -# Adapt for mingw -Patch3: fcgi_mingw.patch - BuildRequires: autoconf automake libtool @@ -55,9 +44,6 @@ MinGW Windows %{pkgname} library. %prep %autosetup -p1 -n %{pkgname}2-%{version} - -autoreconf -ifv - # remove DOS End Of Line Encoding sed -i 's/\r//' doc/fastcgi-prog-guide/ch2c.htm # fix file permissions @@ -65,9 +51,9 @@ chmod a-x include/fcgios.h libfcgi/os_unix.c %build +autoreconf -ifv %mingw_configure --disable-static -# does not build with parallel make flags -%mingw_make +%mingw_make %{?_smp_mflags} %install @@ -84,6 +70,8 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{mingw32_bindir}/libfcgi++-0.dll %{mingw32_libdir}/libfcgi.dll.a %{mingw32_libdir}/libfcgi++.dll.a +%{mingw32_libdir}/pkgconfig/fcgi.pc +%{mingw32_libdir}/pkgconfig/fcgi++.pc %{mingw32_includedir}/* %files -n mingw64-%{pkgname} @@ -93,10 +81,15 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';' %{mingw64_bindir}/libfcgi++-0.dll %{mingw64_libdir}/libfcgi.dll.a %{mingw64_libdir}/libfcgi++.dll.a +%{mingw64_libdir}/pkgconfig/fcgi.pc +%{mingw64_libdir}/pkgconfig/fcgi++.pc %{mingw64_includedir}/* %changelog +* Mon Apr 29 2019 Sandro Mani - 2.4.2-1 +- Update to 2.4.2 + * Fri Feb 01 2019 Fedora Release Engineering - 2.4.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index ccd4941..197acb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mingw-fcgi-2.4.1.tar.gz) = c5a64478522155f5348fd7b6ebf6c995b9ede604fd1a7de8db979e135a4a2ba7901f7beea8968b404a176059ac9b595e4b3fea848f47a126ab185ddfe2939c24 +SHA512 (mingw-fcgi-2.4.2.tar.gz) = 03aca9899eacfd54c878b30691cc4f8db957a065b46426d764003fd057cbf24b4e12ddd26c9b980d5d8965ca40831e415d330e9830529c0d4153400b5c2c8c02