archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

[ci skip] Remove oniguruma and libzip leftovers

Browse source 
Oniguruma and libzip are unbundled from php-src.
This commit is contained in:
Peter Kokot 2019-03-04 01:26:56 +01:00
parent d6dac94ab1
commit cb77d9c3cc
4 changed files with 31 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -110,7 +110,6 @@ config.h.in
/ext/iconv/php_iconv_supports_errno.h /ext/iconv/php_iconv_supports_errno.h
/ext/iconv/php_php_iconv_h_path.h /ext/iconv/php_php_iconv_h_path.h
/ext/iconv/php_php_iconv_impl.h /ext/iconv/php_php_iconv_impl.h
/ext/mbstring/oniguruma/oniguruma.h
/main/build-defs.h /main/build-defs.h
/main/php_config.h.in /main/php_config.h.in
/main/php_config.h /main/php_config.h
@ -300,6 +299,5 @@ tmp-php.ini
!/ext/fileinfo/libmagic/config.h !/ext/fileinfo/libmagic/config.h
!/ext/fileinfo/libmagic.patch !/ext/fileinfo/libmagic.patch
!/ext/fileinfo/magicdata.patch !/ext/fileinfo/magicdata.patch
!/ext/mbstring/oniguruma.patch
!/ext/pcre/pcre2lib/config.h !/ext/pcre/pcre2lib/config.h
!/win32/build/Makefile !/win32/build/Makefile

2
Makefile.gcov
View file

@ -56,7 +56,7 @@ php_lcov.info: lcov-test
cp $$x.bbg lcov_data/$$y.bbg ; \ cp $$x.bbg lcov_data/$$y.bbg ; \
fi; \ fi; \
done; \ done; \
for dir in ext/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/oniguruma ext/pcre/pcre2lib ext/zip/lib; do \ for dir in ext/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/pcre/pcre2lib; do \
if test -d lcov_data/$$dir; then \ if test -d lcov_data/$$dir; then \
rm -rf lcov_data/$$dir ; \ rm -rf lcov_data/$$dir ; \
fi; \ fi; \

2
Makefile.global
View file

@ -121,7 +121,7 @@ clean:
distclean: clean distclean: clean
rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c buildmk.stamp Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
rm -f php7.spec main/build-defs.h scripts/phpize rm -f php7.spec main/build-defs.h scripts/phpize
rm -f ext/date/lib/timelib_config.h ext/mbstring/oniguruma/config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak rm -f ext/date/lib/timelib_config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1 rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h

59
README.REDIST.BINS
View file

@ -1,24 +1,23 @@
1. libmagic (ext/fileinfo) see ext/fileinfo/libmagic/LICENSE 1. libmagic (ext/fileinfo) see ext/fileinfo/libmagic/LICENSE
2. Oniguruma (ext/mbstring) see ext/mbstring/oniguruma/COPYING 2. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE
3. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE 3. pcre2lib (ext/pcre)
4. pcre2lib (ext/pcre) 4. ext/standard crypt
5. ext/standard crypt 5. ext/standard crypt's blowfish implementation
6. ext/standard crypt's blowfish implementation 6. ext/standard/rand
7. ext/standard/rand 7. ext/standard/scanf
8. ext/standard/scanf 8. ext/standard/strnatcmp.c
9. ext/standard/strnatcmp.c 9. ext/standard/uuencode
10. ext/standard/uuencode 10. libxmlrpc ext/xmlrpc
11. libxmlrpc ext/xmlrpc 11. main/snprintf.c
12. main/snprintf.c 12. main/strlcat
13. main/strlcat 13. main/strlcpy
14. main/strlcpy 14. libgd see ext/gd/libgd/COPYING
15. libgd see ext/gd/libgd/COPYING 15. ext/phar portions of tar implementations
16. ext/phar portions of tar implementations 16. ext/phar/zip.c portion extracted from libzip
17. ext/phar/zip.c portion extracted from libzip 17. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/COPYING.LIB
18. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/COPYING.LIB
4. pcre2lib (ext/pcre) 3. pcre2lib (ext/pcre)
PCRE2 LICENCE PCRE2 LICENCE
------------- -------------
@ -116,7 +115,7 @@ PCRE2 independently.
End End
5. ext/standard crypt 4. ext/standard crypt
FreeSec: libcrypt for NetBSD FreeSec: libcrypt for NetBSD
@ -148,7 +147,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE. SUCH DAMAGE.
6. ext/standard crypt's blowfish implementation 5. ext/standard crypt's blowfish implementation
The crypt_blowfish homepage is: The crypt_blowfish homepage is:
@ -194,7 +193,7 @@ Blowfish library (I can't be sure if I would think of something if I
hadn't seen his code). hadn't seen his code).
7. ext/standard/rand 6. ext/standard/rand
The following php_mt_...() functions are based on a C++ class MTRand by The following php_mt_...() functions are based on a C++ class MTRand by
Richard J. Wagner. For more information see the web page at Richard J. Wagner. For more information see the web page at
@ -248,7 +247,7 @@ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
8. ext/standard/scanf 7. ext/standard/scanf
scanf.c -- scanf.c --
@ -296,7 +295,7 @@ permission to use and distribute the software in accordance with the
terms specified in this license. terms specified in this license.
9. ext/standard/strnatcmp.c 8. ext/standard/strnatcmp.c
strnatcmp.c -- Perform 'natural order' comparisons of strings in C. strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au> Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
@ -318,7 +317,7 @@ freely, subject to the following restrictions:
3. This notice may not be removed or altered from any source distribution. 3. This notice may not be removed or altered from any source distribution.
10. ext/standard/uuencode 9. ext/standard/uuencode
Portions of this code are based on Berkeley's uuencode/uudecode Portions of this code are based on Berkeley's uuencode/uudecode
implementation. implementation.
@ -355,7 +354,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE. SUCH DAMAGE.
11. libxmlrpc ext/xmlrpc 10. libxmlrpc ext/xmlrpc
Copyright 2000 Epinions, Inc. Copyright 2000 Epinions, Inc.
@ -380,7 +379,7 @@ NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH
DAMAGES. DAMAGES.
12. main/snprintf.c 11. main/snprintf.c
Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com> Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
@ -455,8 +454,8 @@ SIO stdio-replacement strx_* functions by Panos Tsirigotis
<panos@alumni.cs.colorado.edu> for xinetd. <panos@alumni.cs.colorado.edu> for xinetd.
13. main/strlcat 12. main/strlcat
14. main/strlcpy 13. main/strlcpy
Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
All rights reserved. All rights reserved.
@ -484,7 +483,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
16. ext/phar portions of tar implementations 15. ext/phar portions of tar implementations
portions of tar implementations in ext/phar - phar_tar_octal() are based on an portions of tar implementations in ext/phar - phar_tar_octal() are based on an
implementation by Tim Kientzle from libarchive, licensed with this license: implementation by Tim Kientzle from libarchive, licensed with this license:
@ -513,7 +512,7 @@ implementation by Tim Kientzle from libarchive, licensed with this license:
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
17. ext/phar/zip.c portion extracted from libzip 16. ext/phar/zip.c portion extracted from libzip
zip_dirent.c -- read directory entry (local or central), clean dirent zip_dirent.c -- read directory entry (local or central), clean dirent
Copyright (C) 1999, 2003, 2004, 2005 Dieter Baron and Thomas Klausner Copyright (C) 1999, 2003, 2004, 2005 Dieter Baron and Thomas Klausner