sapi/milter removed upstream in 7.0

- https://github.com/php/php-src/commit/e6f62c50cc2b27d7efd3644c3791fc238a705aa6
- https://wiki.php.net/rfc/removal_of_dead_sapis_and_exts
- https://www.php.net/manual/en/migration70.removed-exts-sapis.php

diff --git a/milter.patch b/milter.patch
deleted file mode 100644 (file)
index 5ed3573..0000000
--- a/milter.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- php-5.6.0RC4/sapi/milter/config.m4~        2014-08-14 03:54:13.000000000 +0300
-+++ php-5.6.0RC4/sapi/milter/config.m4 2014-08-21 19:57:21.584244904 +0300
-@@ -6,18 +6,13 @@
- [  --with-milter[=DIR]       Build PHP as Milter application], no, no)
- 
- if test "$PHP_MILTER" != "no"; then
--  if test "$PHP_MILTER" = "yes"; then
--    if test -f /usr/lib/libmilter.a ; then
--      MILTERPATH=/usr/lib
--    else
--      if test -f /usr/lib/libmilter/libmilter.a ; then
--        MILTERPATH=/usr/lib/libmilter
--      else
--        AC_MSG_ERROR([Unable to find libmilter.a])
--      fi
--    fi
--  else
--    MILTERPATH=$PHP_MILTER
-+  for i in $PHP_MILTER /usr/lib/libmilter /usr/local /usr; do
-+    test -f $i/$PHP_LIBDIR/libmilter.a && MILTERPATH=$i/$PHP_LIBDIR && break
-+    test -f $i/libmilter.a && MILTERPATH=$i && break
-+  done
-+
-+  if test -z "$MILTERPATH"; then
-+    AC_MSG_ERROR([Unable to find libmilter.a])
-   fi
-   
-   SAPI_MILTER_PATH=sapi/milter/php-milter

diff --git a/php.spec b/php.spec
index f6b23dd78c7d41b24376b6bb4483e337a4076a73..ed4a3c7ee4d6f1a4fa709c961896929a760eede5 100644 (file)
--- a/php.spec
+++ b/php.spec
@@ -26,7 +26,6 @@
 %bcond_without cgi             # disable CGI/FCGI SAPI
 %bcond_without fpm             # disable FPM SAPI
 %bcond_without litespeed       # build litespeed SAPI
-%bcond_with    milter          # disable Milter SAPI
 %bcond_without phpdbg          # disable phpdbg SAPI
 # - Extensions
 %bcond_without bcmath          # without bcmath extension module
@@ -113,11 +112,6 @@
 %undefine      with_mm
 %endif
 
-# milter requires ZTS
-%if %{with milter} && %{without zts}
-%undefine      with_milter
-%endif
-
 %if %{without odbc}
 %undefine      with_pdo_odbc
 %endif
@@ -185,7 +179,6 @@ Patch2:             %{orgname}-mail.patch
 Patch3:                %{orgname}-link-libs.patch
 Patch4:                intl-stdc++.patch
 Patch7:                %{orgname}-sapi-ini-file.patch
-Patch8:                milter.patch
 Patch9:                libtool-tag.patch
 Patch10:       %{orgname}-ini.patch
 Patch11:       embed.patch
@@ -1877,7 +1870,6 @@ cp -p php.ini-production php.ini
 %patch4 -p1
 
 %patch7 -p1
-%{?with_milter:%patch8 -p1}
 %patch9 -p1
 %patch10 -p1
 %patch14 -p1
@@ -2108,7 +2100,7 @@ export PEAR_INSTALLDIR=%{php_pear_dir}
 # configure once (for faster debugging purposes)
 if [ ! -f _built-conf ]; then
        # now remove Makefile copies
-       rm -f Makefile.{cgi-fcgi,fpm,cli,apxs2,litespeed,phpdbg,milter}
+       rm -f Makefile.{cgi-fcgi,fpm,cli,apxs2,litespeed,phpdbg}
 
        # Force use of system libtool:
        mv build/libtool.m4 build/libtool.m4.saved
@@ -2154,9 +2146,6 @@ apxs2
 %if %{with phpdbg}
 phpdbg
 %endif
-%if %{with milter}
-milter
-%endif
 "
 for sapi in $sapis; do
        : SAPI $sapi
@@ -2187,9 +2176,6 @@ for sapi in $sapis; do
        phpdbg)
                sapi_args='--enable-phpdbg %{?debug:--enable-phpdbg-debug}'
        ;;
-       milter)
-               sapi_args='--with-milter'
-       ;;
        esac
 
        %configure \
@@ -2334,10 +2320,6 @@ cp -af Makefile.cli Makefile
        PHPDBG_EXTRA_LIBS=-lreadline
 %endif
 
-%if %{with milter}
-%{__make} -f Makefile.milter milter
-%endif
-
 # CGI/FCGI
 %if %{with cgi}
 cp -pf php_config.h.cgi-fcgi main/php_config.h
@@ -2466,11 +2448,6 @@ libtool --mode=install install -p sapi/litespeed/php $RPM_BUILD_ROOT%{_sbindir}/
 %endif
 %endif
 
-%if %{with milter}
-%{__make} -f Makefile.milter install-milter \
-       INSTALL_ROOT=$RPM_BUILD_ROOT
-%endif
-
 libtool --mode=install install -p libphp_common.la $RPM_BUILD_ROOT%{_libdir}
 
 # install CGI/FCGI
@@ -2826,12 +2803,6 @@ fi
 %{_mandir}/man1/phpdbg%{php_suffix}.1*
 %endif
 
-%if %{with milter}
-%files milter
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/php-milter
-%endif
-
 %files common
 %defattr(644,root,root,755)
 %doc EXTENSIONS LICENSE NEWS UPGRADING* Zend/{LICENSE.Zend,README*} php.ini-* .gdbinit