Skip to content

Commit cb77d9c

Browse files
committed
[ci skip] Remove oniguruma and libzip leftovers
Oniguruma and libzip are unbundled from php-src.
1 parent d6dac94 commit cb77d9c

File tree

4 files changed

+33
-36
lines changed

4 files changed

+33
-36
lines changed

.gitignore

-2
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@ config.h.in
110110
/ext/iconv/php_iconv_supports_errno.h
111111
/ext/iconv/php_php_iconv_h_path.h
112112
/ext/iconv/php_php_iconv_impl.h
113-
/ext/mbstring/oniguruma/oniguruma.h
114113
/main/build-defs.h
115114
/main/php_config.h.in
116115
/main/php_config.h
@@ -300,6 +299,5 @@ tmp-php.ini
300299
!/ext/fileinfo/libmagic/config.h
301300
!/ext/fileinfo/libmagic.patch
302301
!/ext/fileinfo/magicdata.patch
303-
!/ext/mbstring/oniguruma.patch
304302
!/ext/pcre/pcre2lib/config.h
305303
!/win32/build/Makefile

Makefile.gcov

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ php_lcov.info: lcov-test
5656
cp $$x.bbg lcov_data/$$y.bbg ; \
5757
fi; \
5858
done; \
59-
for dir in ext/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/mbstring/oniguruma ext/pcre/pcre2lib ext/zip/lib; do \
59+
for dir in ext/date/lib ext/fileinfo/libmagic ext/gd/libgd ext/pcre/pcre2lib; do \
6060
if test -d lcov_data/$$dir; then \
6161
rm -rf lcov_data/$$dir ; \
6262
fi; \

Makefile.global

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ clean:
121121
distclean: clean
122122
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
123123
rm -f php7.spec main/build-defs.h scripts/phpize
124-
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
124+
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
125125
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
126126
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
127127
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

README.REDIST.BINS

+31-32
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,23 @@
11
1. libmagic (ext/fileinfo) see ext/fileinfo/libmagic/LICENSE
2-
2. Oniguruma (ext/mbstring) see ext/mbstring/oniguruma/COPYING
3-
3. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE
4-
4. pcre2lib (ext/pcre)
5-
5. ext/standard crypt
6-
6. ext/standard crypt's blowfish implementation
7-
7. ext/standard/rand
8-
8. ext/standard/scanf
9-
9. ext/standard/strnatcmp.c
10-
10. ext/standard/uuencode
11-
11. libxmlrpc ext/xmlrpc
12-
12. main/snprintf.c
13-
13. main/strlcat
14-
14. main/strlcpy
15-
15. libgd see ext/gd/libgd/COPYING
16-
16. ext/phar portions of tar implementations
17-
17. ext/phar/zip.c portion extracted from libzip
18-
18. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/COPYING.LIB
19-
20-
21-
4. pcre2lib (ext/pcre)
2+
2. libmbfl (ext/mbstring) see ext/mbstring/libmbfl/LICENSE
3+
3. pcre2lib (ext/pcre)
4+
4. ext/standard crypt
5+
5. ext/standard crypt's blowfish implementation
6+
6. ext/standard/rand
7+
7. ext/standard/scanf
8+
8. ext/standard/strnatcmp.c
9+
9. ext/standard/uuencode
10+
10. libxmlrpc ext/xmlrpc
11+
11. main/snprintf.c
12+
12. main/strlcat
13+
13. main/strlcpy
14+
14. libgd see ext/gd/libgd/COPYING
15+
15. ext/phar portions of tar implementations
16+
16. ext/phar/zip.c portion extracted from libzip
17+
17. libbcmath (ext/bcmath) see ext/bcmath/libbcmath/COPYING.LIB
18+
19+
20+
3. pcre2lib (ext/pcre)
2221

2322
PCRE2 LICENCE
2423
-------------
@@ -116,7 +115,7 @@ PCRE2 independently.
116115
End
117116

118117

119-
5. ext/standard crypt
118+
4. ext/standard crypt
120119

121120
FreeSec: libcrypt for NetBSD
122121

@@ -148,7 +147,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
148147
SUCH DAMAGE.
149148

150149

151-
6. ext/standard crypt's blowfish implementation
150+
5. ext/standard crypt's blowfish implementation
152151

153152
The crypt_blowfish homepage is:
154153

@@ -194,7 +193,7 @@ Blowfish library (I can't be sure if I would think of something if I
194193
hadn't seen his code).
195194

196195

197-
7. ext/standard/rand
196+
6. ext/standard/rand
198197

199198
The following php_mt_...() functions are based on a C++ class MTRand by
200199
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
248247
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
249248

250249

251-
8. ext/standard/scanf
250+
7. ext/standard/scanf
252251

253252
scanf.c --
254253

@@ -296,7 +295,7 @@ permission to use and distribute the software in accordance with the
296295
terms specified in this license.
297296

298297

299-
9. ext/standard/strnatcmp.c
298+
8. ext/standard/strnatcmp.c
300299

301300
strnatcmp.c -- Perform 'natural order' comparisons of strings in C.
302301
Copyright (C) 2000 by Martin Pool <mbp@humbug.org.au>
@@ -318,7 +317,7 @@ freely, subject to the following restrictions:
318317
3. This notice may not be removed or altered from any source distribution.
319318

320319

321-
10. ext/standard/uuencode
320+
9. ext/standard/uuencode
322321

323322
Portions of this code are based on Berkeley's uuencode/uudecode
324323
implementation.
@@ -355,7 +354,7 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
355354
SUCH DAMAGE.
356355

357356

358-
11. libxmlrpc ext/xmlrpc
357+
10. libxmlrpc ext/xmlrpc
359358

360359
Copyright 2000 Epinions, Inc.
361360

@@ -380,7 +379,7 @@ NEGLIGENCE), EVEN IF EPINIONS, INC. IS AWARE OF THE POSSIBILITY OF SUCH
380379
DAMAGES.
381380

382381

383-
12. main/snprintf.c
382+
11. main/snprintf.c
384383

385384
Copyright (c) 2002, 2006 Todd C. Miller <Todd.Miller@courtesan.com>
386385

@@ -455,8 +454,8 @@ SIO stdio-replacement strx_* functions by Panos Tsirigotis
455454
<panos@alumni.cs.colorado.edu> for xinetd.
456455

457456

458-
13. main/strlcat
459-
14. main/strlcpy
457+
12. main/strlcat
458+
13. main/strlcpy
460459

461460
Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
462461
All rights reserved.
@@ -484,7 +483,7 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
484483
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
485484

486485

487-
16. ext/phar portions of tar implementations
486+
15. ext/phar portions of tar implementations
488487

489488
portions of tar implementations in ext/phar - phar_tar_octal() are based on an
490489
implementation by Tim Kientzle from libarchive, licensed with this license:
@@ -513,7 +512,7 @@ implementation by Tim Kientzle from libarchive, licensed with this license:
513512
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
514513

515514

516-
17. ext/phar/zip.c portion extracted from libzip
515+
16. ext/phar/zip.c portion extracted from libzip
517516

518517
zip_dirent.c -- read directory entry (local or central), clean dirent
519518
Copyright (C) 1999, 2003, 2004, 2005 Dieter Baron and Thomas Klausner

0 commit comments

Comments
 (0)