Guest User

php-zts_7.2.12

a guest
Nov 9th, 2018
180
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
  1. diff --git a/PKGBUILD b/PKGBUILD
  2. index 35dd211..961e529 100644
  3. --- a/PKGBUILD
  4. +++ b/PKGBUILD
  5. @@ -21,7 +21,7 @@ pkgname=("${pkgbase}"
  6.           "${pkgbase}-sqlite"
  7.           "${pkgbase}-tidy"
  8.           "${pkgbase}-xsl")
  9. -pkgver=7.2.1
  10. +pkgver=7.2.12
  11.  pkgrel=1
  12.  arch=('x86_64')
  13.  license=('PHP')
  14. @@ -31,13 +31,13 @@ makedepends=('apache' 'aspell' 'c-client' 'db' 'enchant' 'gd' 'gmp' 'icu' 'libso
  15.  checkdepends=('procps-ng')
  16.  source=("https://php.net/distributions/${_pkgbase}-${pkgver}.tar.xz"{,.asc}
  17.          'apache.patch' 'apache.conf' 'php-fpm.patch' 'php-fpm.tmpfiles' 'php.ini.patch')
  18. -sha512sums=('2445f2cff20214b521c48592e5ab42b770c291702178d7cb2a84912c81b7e5d2cc45948a3a4a7830194fa444708d544c73efbaa8e90c95ab77937f7feffb2ffc'
  19. +sha512sums=('bbeaed1278d0d2f1ecb2249dab1ebaab1489ef43be0797dac57d8b523d8e5d284166e6cbf52095f5d34eef447fbdeb0c6916caaa5770221a180ec064f4ffcad8'
  20.              'SKIP'
  21. -            '65ea5cb38c1fc1874b2a4d08bc52443f9ed5dcc92cf99023a74292c78f9074516296f56c768f7efa8a1f0838feac47b356d3da6fdb1199419bebec3a93204ae6'
  22. +            '9909867cf8c11e6e150c1f10a7ea2257873d55482efaab9ee68f76be3fea13c0d5438a9f47a68d605ec470a5d56b38a776d4f538a8858d9142e42fe3d60b7a37'
  23.              'eccbe1a0c7b2757ab3c982c871cc591a66ad70f085aaa0d44f93cacacedc7b8fd21b8d0c66471327ff070db1bab1ab83a802f6fa190f33bdd74c134975e3910e'
  24. -            '87453c9f41204bc7a20cbf2a85ee44965f7754529e2c17fb60bdfe42ded7a894d6e7fcc30fe6c650ea5f92f95920161522ef3ce0f355686a2fed7f0857abdd5c'
  25. +            'c9efb3f50770d6ddfa908b7f562355121f07ce528271e72ba188a4f1c788e264fc117c220053aaded42040825c03f3f17131a62a67d96cc91fd9da472e085deb'
  26.              '824e9a0d10063283357d49a81ab49bf834afd24f098482bdbaa9ab60bbad2b0dea6f5879259b73717d437626b02fb4f2d3ef68b7bcbb26bee274a7b61144720f'
  27. -            '1606178f55dee8ca6a3cf47c7db486dca0c261bfffbaf4f69450a3497643910c65f8ee1543839ae4213d8b396afc6e5f86141accac553545c35fe234a50f56e6')
  28. +            '85000bcb4f5674bfcbac7f32aeb28c523904a23da716e7fd982ac225845843e0acb33c0b8552107c234b1dd106337ad0a6792253f200980b88a6f6239ec982d0')
  29.  validpgpkeys=('B1B44D8F021E4E2D6021E995DC9FF8D3EE5AF27F'
  30.                '1729F83938DA44E27BA0F4D3DBDB397470D12172')
  31.  
  32. diff --git a/apache.patch b/apache.patch
  33. index 81b2cd8..9c45849 100644
  34. --- a/apache.patch
  35. +++ b/apache.patch
  36. @@ -10,7 +10,7 @@
  37.       fi
  38.  --- configure.orig
  39.  +++ configure
  40. -@@ -7018,7 +7018,6 @@
  41. +@@ -7019,7 +7019,6 @@
  42.  
  43.       fi
  44.     else
  45. @@ -18,3 +18,55 @@
  46.       if test -n "$APACHE_THREADED_MPM"; then
  47.  
  48.     enable_maintainer_zts=yes
  49. +@@ -30232,6 +30231,9 @@
  50. +               if test -f $i/include/enchant/enchant.h; then
  51. +                       ENCHANT_DIR=$i
  52. +                       ENCHANT_INCDIR=$i/include/enchant
  53. ++              elif test -f $i/include/enchant-2/enchant.h; then
  54. ++                      ENCHANT_DIR=$i
  55. ++                      ENCHANT_INCDIR=$i/include/enchant-2
  56. +               elif test -f $i/include/enchant.h; then
  57. +                       ENCHANT_DIR=$i
  58. +                       ENCHANT_INCDIR=$i/include
  59. +@@ -34362,15 +34364,16 @@
  60. +   if test "$PHP_FREETYPE_DIR" != "no"; then
  61. +
  62. +     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
  63. +-      if test -f "$i/bin/freetype-config"; then
  64. +-        FREETYPE2_DIR=$i
  65. +-        FREETYPE2_CONFIG="$i/bin/freetype-config"
  66. ++
  67. ++      if test -d "$i/include/freetype2"; then
  68. ++              FREETYPE2_DIR=$i/include/freetype2
  69. ++              FREETYPE2_CONFIG="pkg-config freetype2"
  70. +         break
  71. +       fi
  72. +     done
  73. +
  74. +     if test -z "$FREETYPE2_DIR"; then
  75. +-      as_fn_error $? "freetype-config not found." "$LINENO" 5
  76. ++              as_fn_error $? "freetype2 not found." "$LINENO" 5
  77. +     fi
  78. +
  79. +     FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
  80. +@@ -36033,15 +36036,16 @@
  81. +   if test "$PHP_FREETYPE_DIR" != "no"; then
  82. +
  83. +     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
  84. +-      if test -f "$i/bin/freetype-config"; then
  85. +-        FREETYPE2_DIR=$i
  86. +-        FREETYPE2_CONFIG="$i/bin/freetype-config"
  87. ++
  88. ++      if test -d "$i/include/freetype2"; then
  89. ++              FREETYPE2_DIR=$i/include/freetype2
  90. ++              FREETYPE2_CONFIG="pkg-config freetype2"
  91. +         break
  92. +       fi
  93. +     done
  94. +
  95. +     if test -z "$FREETYPE2_DIR"; then
  96. +-      as_fn_error $? "freetype-config not found." "$LINENO" 5
  97. ++              as_fn_error $? "freetype2 not found." "$LINENO" 5
  98. +     fi
  99. +
  100. +     FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
  101. diff --git a/generate_patches b/generate_patches
  102. index 3288fcb..2a64a44 100755
  103. --- a/generate_patches
  104. +++ b/generate_patches
  105. @@ -6,7 +6,15 @@ makepkg -o --nodeps --noprepare --skipinteg
  106.  
  107.  pushd src/${_pkgbase}-${pkgver}
  108.  
  109. -sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4 -i.orig configure
  110. +sed '/APACHE_THREADED_MPM=/d' -i.orig sapi/apache2handler/config.m4
  111. +
  112. +sed \
  113. +       -e '/APACHE_THREADED_MPM=/d' \
  114. +       -e '/elif test -f $i\/include\/enchant.h; then/i\\t\telif test -f $i/include/enchant-2/enchant.h; then\n\t\t\tENCHANT_DIR=$i\n\t\t\tENCHANT_INCDIR=$i/include/enchant-2' \
  115. +       -e '/for i in $PHP_FREETYPE_DIR \/usr\/local \/usr; do/a\\n\tif test -d "$i/include/freetype2"; then\n\t\tFREETYPE2_DIR=$i/include/freetype2\n\t\tFREETYPE2_CONFIG="pkg-config freetype2"' \
  116. +       -e '/if test -f "$i\/bin\/freetype-config"; then/, +2d' \
  117. +       -e '/freetype-config not found/c\\t\tas_fn_error $? "freetype2 not found." "$LINENO" 5' \
  118. +       -i.orig configure
  119.  
  120.  sed 's/.conf.default/.conf/g' -i.orig sapi/fpm/Makefile.frag
  121.  
  122. diff --git a/php-fpm.patch b/php-fpm.patch
  123. index d32d392..c827d2e 100644
  124. --- a/php-fpm.patch
  125. +++ b/php-fpm.patch
  126. @@ -9,7 +9,7 @@
  127.  +              $(INSTALL_DATA) sapi/fpm/php-fpm.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.conf; \
  128.  +              $(INSTALL_DATA) sapi/fpm/www.conf $(INSTALL_ROOT)$(sysconfdir)/php-fpm.d/www.conf; \
  129.         fi
  130. -      
  131. +
  132.         @echo "Installing PHP FPM man page:      $(INSTALL_ROOT)$(mandir)/man8/"
  133.  --- sapi/fpm/php-fpm.conf.in.orig
  134.  +++ sapi/fpm/php-fpm.conf.in
  135. @@ -52,7 +52,7 @@
  136.   ;listen.mode = 0660
  137.   ; When POSIX Access Control Lists are supported you can set them using
  138.   ; these options, value is a comma separated list of user/group names.
  139. -@@ -356,7 +356,7 @@
  140. +@@ -362,7 +362,7 @@
  141.   ; Chdir to this directory at the start.
  142.   ; Note: relative path can be used.
  143.   ; Default Value: current directory or / when chroot
  144. diff --git a/php.ini.patch b/php.ini.patch
  145. index e0248fc..2c84444 100644
  146. --- a/php.ini.patch
  147. +++ b/php.ini.patch
  148. @@ -15,7 +15,6 @@
  149.   ;
  150.  -; Notes for Windows environments :
  151.  -;
  152. --; - ODBC support is built in, so no dll is needed for it.
  153.  -; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
  154.  -;   extension folders as well as the separate PECL DLL download (PHP 5+).
  155.  -;   Be sure to appropriately set the extension_dir directive.
  156. @@ -45,9 +44,9 @@
  157.  -;extension=exif      ; Must be after mbstring as it depends on it
  158.   ;extension=mysqli
  159.  -;extension=oci8_12c  ; Use with Oracle Database 12c Instant Client
  160. + ;extension=odbc
  161.  -;extension=openssl
  162.  -;extension=pdo_firebird
  163. -+;extension=odbc
  164.  +;zend_extension=opcache
  165.  +;extension=pdo_dblib
  166.   ;extension=pdo_mysql
RAW Paste Data