from:"glen"

[packages/eventum] Up to 3.9.6

2020-10-14 Thread glen

commit 56ec18ac8e59fbc37a19bff8058aca04689f97ce
Author: Elan Ruusamäe 
Date:   Wed Oct 14 14:33:01 2020 +0300

Up to 3.9.6

 eventum-paths.patch | 7 ---
 eventum.spec| 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 810e719..102f94b 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -9,12 +9,12 @@
 Summary:   Eventum Issue / Bug tracking system
 Summary(pl.UTF-8): Eventum - system śledzenia spraw/błędów
 Name:  eventum
-Version:   3.9.5
+Version:   3.9.6
 Release:   %{?subver:1.%{subver}.%{?githash:g%{githash}.}}%{rel}
 License:   GPL v2+
 Group: Applications/WWW
 Source0:   
https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: a983c36bc990e8534786af01d71d560b
+# Source0-md5: 51f2e1f129090df2aac2a9e7d3931317
 #Source0:  
https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
 Source1:   %{name}-apache.conf
 Source2:   %{name}-mail-queue.cron
diff --git a/eventum-paths.patch b/eventum-paths.patch
index 003fb6b..509e46a 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,6 +1,6 @@
 eventum-3.9.4/src/Config/Paths.php~2020-08-10 16:32:37.0 
+0300
-+++ eventum-3.9.4/src/Config/Paths.php 2020-08-24 14:18:12.547339038 +0300
-@@ -22,18 +22,16 @@
+--- eventum-3.9.6/src/Config/Paths.php~2020-08-21 18:50:08.0 
+0300
 eventum-3.9.6/src/Config/Paths.php 2020-10-14 14:34:44.081698316 +0300
+@@ -22,19 +22,17 @@
  public const APP_PUBLIC_PATH = APP_PATH . '/htdocs';
  public const APP_INC_PATH = APP_PATH . '/lib/eventum';
  
@@ -22,6 +22,7 @@
  // fonts directory for phplot
 -public const APP_FONTS_PATH = APP_PATH . '/vendor/fonts/liberation';
 +public const APP_FONTS_PATH = '/usr/share/fonts/TTF';
+ public const APP_HELP_PATH = APP_PATH . '/docs/help';
  }
 --- eventum-3.5.6-98-g5b87d2b0/src/Setup/Requirements.php~ 2019-01-23 
01:50:42.0 +0200
 +++ eventum-3.5.6-98-g5b87d2b0/src/Setup/Requirements.php  2019-01-24 
22:18:56.047816296 +0200


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/56ec18ac8e59fbc37a19bff8058aca04689f97ce

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/rpm-build-tools] Restore tab-indenting

2020-10-13 Thread glen

commit 4a857a1f845b2624bf1e8827c77caea3cc1cb189
Author: Elan Ruusamäe 
Date:   Tue Oct 13 11:50:52 2020 +0300

Restore tab-indenting

refs ac1281919568d928bdefe8cbc5436cdf3fa5906d

 builder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/builder.sh b/builder.sh
index 918692d..04f7fe1 100755
--- a/builder.sh
+++ b/builder.sh
@@ -687,7 +687,7 @@ EOF
 %_sourcedir ./
 EOF
fi
-if rpm --version 2>&1 | grep -qE '5\.[0-9]+\.[0-9]+'; then
+   if rpm --version 2>&1 | grep -qE '5\.[0-9]+\.[0-9]+'; then
safe_macrofiles=$(rpm $TARGET_SWITCH --showrc | awk -F: 
'/^macrofiles/ { gsub(/^macrofiles[ \t]+:/, "", $0); print $0 } ')
eval PATH=$CLEAN_PATH $RPMBUILD $TARGET_SWITCH --macros 
"$safe_macrofiles:$BUILDER_MACROS" $QUIET $RPMOPTS $RPMBUILDOPTS $BCOND $* 2>&1
else


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-tools.git/commitdiff/4a857a1f845b2624bf1e8827c77caea3cc1cb189

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php] Deleted branch dev-8.0

2020-10-09 Thread glen

The branch 'dev-8.0' was deleted at 3812f95c6f6decd7a3a7cabca74d1adbe4dcae19.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php: 18/18] Merge branch 'dev-8.0' into master

2020-10-09 Thread glen

commit 7ec738a4a3483de177409682e1c59a9e91451002
Merge: bbc3f40 3812f95
Author: Elan Ruusamäe 
Date:   Fri Oct 9 19:14:40 2020 +0300

Merge branch 'dev-8.0' into master

 bug-52078-fileinode.patch   | 347 
 libdb-info.patch|  16 +-
 opcache.ini |   5 +
 php-both-apxs.patch |  14 +-
 php-ini.patch   |  33 ++--
 php-readline.patch  |  11 --
 php-sapi-ini-file.patch |  18 +--
 php-shared.patch|  70 
 php-systzdata.patch |  39 ++---
 php-use-prog_sendmail.patch |  12 +-
 php-zlib-for-getimagesize.patch |  12 +-
 php.spec|  87 +++---
 skip-tests.sh   |   9 --
 13 files changed, 137 insertions(+), 536 deletions(-)
---


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/7ec738a4a3483de177409682e1c59a9e91451002

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php] (18 commits) ...Merge branch 'dev-8.0' into master

2020-10-09 Thread glen

Summary of changes:

  ae934c4... Update to 8.0.0 beta4 (*)
  328e0ec... Remove xmlrpc: moved to pecl (*)
  060f741... Update systzdata.patch to v19 (*)
  157310a... Update version macros (*)
  77a6083... Drop unsupported configure option --enable-inline-optimizat (*)
  3382407... Enable ext-json being always built (*)
  d9f1af7... Update shared.patch (*)
  f56d706... Drop bug-52078-fileinode.patch (*)
  fd83cc8... Update php-ini.patch and opcache.ini (*)
  8b96ecd... Update both-apxs.patch (*)
  704e26a... Update to 8.0.0rc1 (*)
  2d53431... Bulding embed is broken (*)
  6b96e74... Updated php-sapi-ini-file.patch (*)
  6cfd6f4... Merge -readline.patch into -shared.patch (*)
  b886188... Update zlib-for-getimagesize.patch (*)
  eadfe6c... Update php-use-prog_sendmail.patch (*)
  3812f95... Update libdb-info.patch (*)
  7ec738a... Merge branch 'dev-8.0' into master

(*) This commit already existed in another branch; no separate mail sent
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 2/12] Update shared.patch

2020-10-09 Thread glen

commit d9f1af785833269c2511878b4eb8b5793eb8c24b
Author: Elan Ruusamäe 
Date:   Mon Sep 28 10:51:10 2020 +0300

Update shared.patch

 php-shared.patch | 70 
 php.spec |  2 +-
 2 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/php.spec b/php.spec
index e49aff1..e24748b 100644
--- a/php.spec
+++ b/php.spec
@@ -1857,7 +1857,7 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 %endif
 
 cp -p php.ini-production php.ini
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 #%patch2 -p1 -b .mail
 %patch3 -p1
diff --git a/php-shared.patch b/php-shared.patch
index ac15661..b2360fa 100644
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -10,45 +10,45 @@
  dnl Checks for some support/generator progs.
  PHP_PROG_AWK
  PHP_PROG_BISON([3.0.0])
 php-7.4.0RC3/build/Makefile.global~2019-10-04 16:11:24.0 
+0300
-+++ php-7.4.0RC3/build/Makefile.global 2019-10-09 15:21:11.198544363 +0300
+--- php-8.0.0beta4/build/Makefile.global~  2020-09-28 07:54:00.0 
+0300
 php-8.0.0beta4/build/Makefile.global   2020-09-28 07:54:42.203157017 
+0300
 @@ -13,8 +13,12 @@

  build-modules: $(PHP_MODULES)
  
--libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
--  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) 
$(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+-libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+-  $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) 
-rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
$(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 +libphp_common.la: $(PHP_GLOBAL_OBJS)
-+  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
++  $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) 
-rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
 +  -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 
2>&1
 +
-+libphp$(PHP_MAJOR_VERSION).la: libphp_common.la $(PHP_SAPI_OBJS)
++libphp.la: libphp_common.la $(PHP_SAPI_OBJS)
 +  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
$(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) 
$(ZEND_EXTRA_LIBS) -o $@
-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 
2>&1
  
  libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-@@ -25,10 +29,10 @@
+@@ -31,10 +31,10 @@
  install-sapi: $(OVERALL_TARGET)
@echo "Installing PHP SAPI module:   $(PHP_SAPI)"
-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
--  -@if test ! -r 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
+-  -@if test ! -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); then \
 +  -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); 
then \
for i in 0.0.0 0.0 0; do \
--  if test -r 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
--  $(LN_S) 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
+-  if test -r 
$(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+-  $(LN_S) 
$(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); \
 +  if test -r 
$(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
 +  $(LN_S) 
$(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); \
break; \
fi; \
done; \
 php-7.4.0RC2/sapi/cgi/config9.m4~  2019-09-17 19:37:54.0 +0300
-+++ php-7.4.0RC2/sapi/cgi/config9.m4   2019-09-20 13:43:03.654012130 +0300
+--- php-8.0.0beta4/sapi/cgi/config9.m4~2020-09-15 21:36:33.0 
+0300
 php-8.0.0beta4/sapi/cgi/config9.m4 2020-09-28 08:00:34.341402924 +0300
 @@ -55,7 +55,7 @@
- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) 
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS) 
\$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(PHP_FRAMEWORKS) 
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) 
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) 
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) 
\$(PHP_FASTCGI_OBJS:.lo=.o)

[packages/php/dev-8.0: 4/12] Update php-ini.patch and opcache.ini

2020-10-09 Thread glen

commit fd83cc8f1b59a15042e5a712ab5c1bfb1c2d53bc
Author: Elan Ruusamäe 
Date:   Sat Oct 3 12:57:54 2020 +0300

Update php-ini.patch and opcache.ini

 opcache.ini   |  5 +
 php-ini.patch | 33 -
 php.spec  |  2 +-
 3 files changed, 22 insertions(+), 18 deletions(-)
---
diff --git a/php.spec b/php.spec
index 3446c77..870530c 100644
--- a/php.spec
+++ b/php.spec
@@ -1864,7 +1864,7 @@ cp -p php.ini-production php.ini
 
 #%patch7 -p1 -b .sapi-ini-file
 %patch9 -p1
-#%patch10 -p1 -b .ini
+%patch10 -p1 -b .ini
 %patch14 -p1
 #%patch17 -p1 -b readline
 %patch18 -p1
diff --git a/opcache.ini b/opcache.ini
index b2931f6..67c0381 100644
--- a/opcache.ini
+++ b/opcache.ini
@@ -40,6 +40,11 @@
 ; size of the optimized code.
 ;opcache.save_comments=1
 
+; If enabled, compilation warnings (including notices and deprecations) will
+; be recorded and replayed each time a file is included. Otherwise, compilation
+; warnings will only be emitted when the file is first cached.
+;opcache.record_warnings=0
+
 ; Allow file existence override (file_exists, etc.) performance feature.
 ;opcache.enable_file_override=0
 
diff --git a/php-ini.patch b/php-ini.patch
index a6c58b5..6022546 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
 php-7.4.0RC2/php.ini~  2019-09-23 10:43:53.0 +0300
-+++ php-7.4.0RC2/php.ini   2019-09-23 11:52:45.049464720 +0300
+--- php-8.0.0beta4/php.ini~2020-10-03 12:50:10.0 +0300
 php-8.0.0beta4/php.ini 2020-10-03 12:54:30.499681036 +0300
 @@ -82,6 +82,20 @@
  ; much more verbose when it comes to errors. We recommending using the
  ; development version only in development environments as errors shown to
@@ -127,24 +127,16 @@
  
  ; File Uploads ;
  
-@@ -856,50 +856,10 @@ default_socket_timeout = 60
- ; deprecated in a future PHP major version. So, when it is possible, please
- ; move to the new ('extension=) syntax.
- ;
--; Notes for Windows environments :
- ;
--; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
--;   extension folders as well as the separate PECL DLL download (PHP 5+).
--;   Be sure to appropriately set the extension_dir directive.
-+; Ideally in PLD Linux you should install appropriate php74- or
-+; php74-pecl- package.
+@@ -871,44 +871,8 @@
+ ;   extension folders as well as the separate PECL DLL download (PHP 5+).
+ ;   Be sure to appropriately set the extension_dir directive.
  ;
 -;extension=bz2
 -;extension=curl
 -;extension=ffi
 -;extension=ftp
 -;extension=fileinfo
--;extension=gd2
+-;extension=gd
 -;extension=gettext
 -;extension=gmp
 -;extension=intl
@@ -174,12 +166,14 @@
 -;extension=sodium
 -;extension=sqlite3
 -;extension=tidy
--;extension=xmlrpc
 -;extension=xsl
 -
+-;zend_extension=opcache
++; In PLD Linux you can install appropriate php80- or 
php80-pecl- package.
++;
+ 
  ;;;
  ; Module Settings ;
- ;;;
 @@ -954,8 +867,9 @@
  
  [Date]
@@ -233,7 +227,7 @@
  
  ; (time to live) Sets the number of second while cached file will be used
  ; instead of original one.
-@@ -1670,155 +1670,6 @@
+@@ -1674,160 +1674,6 @@
  [dba]
  ;dba.default_handler=
  
@@ -279,6 +273,11 @@
 -; size of the optimized code.
 -;opcache.save_comments=1
 -
+-; If enabled, compilation warnings (including notices and deprecations) will
+-; be recorded and replayed each time a file is included. Otherwise, 
compilation
+-; warnings will only be emitted when the file is first cached.
+-;opcache.record_warnings=0
+-
 -; Allow file existence override (file_exists, etc.) performance feature.
 -;opcache.enable_file_override=0
 -


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 10/12] Update zlib-for-getimagesize.patch

2020-10-09 Thread glen

commit b886188fa08b76e271d68a1e3759140b389dc8c0
Author: Elan Ruusamäe 
Date:   Fri Oct 9 18:54:48 2020 +0300

Update zlib-for-getimagesize.patch

 php-zlib-for-getimagesize.patch | 12 ++--
 php.spec|  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/php.spec b/php.spec
index 2c02b6f..fe35950 100644
--- a/php.spec
+++ b/php.spec
@@ -1869,7 +1869,7 @@ cp -p php.ini-production php.ini
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
-#%patch24 -p1 -b .zlib-for-getimagesize
+%patch24 -p1 -b .zlib-for-getimagesize
 %patch25 -p1
 %patch27 -p1
 %patch29 -p1
diff --git a/php-zlib-for-getimagesize.patch b/php-zlib-for-getimagesize.patch
index 50a3ec3..a72a4fa 100644
--- a/php-zlib-for-getimagesize.patch
+++ b/php-zlib-for-getimagesize.patch
@@ -2,8 +2,8 @@ make compressed .swf parsing possible,
 link core php with -lz for getimagesize()
 see also http://bugs.php.net/bug.php?id=29611
 
 php-7.0/ext/standard/image.c~  2015-05-21 23:10:45.0 +0300
-+++ php-7.0/ext/standard/image.c   2015-05-21 23:11:22.424948534 +0300
+--- php-8.0.0rc1/ext/standard/image.c~ 2020-10-09 18:50:01.0 +0300
 php-8.0.0rc1/ext/standard/image.c  2020-10-09 18:53:44.278879164 +0300
 @@ -31,7 +31,7 @@
  #endif
  #include "php_image.h"
@@ -22,15 +22,15 @@ see also http://bugs.php.net/bug.php?id=29611
REGISTER_LONG_CONSTANT("IMAGETYPE_SWC", IMAGE_FILETYPE_SWC, 
CONST_CS | CONST_PERSISTENT);
  #endif
REGISTER_LONG_CONSTANT("IMAGETYPE_IFF", IMAGE_FILETYPE_IFF, 
CONST_CS | CONST_PERSISTENT);
-@@ -184,7 +184,7 @@
+@@ -186,7 +186,7 @@
  }
  /* }}} */
  
 -#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
 +#if HAVE_ZLIB
- /* {{{ php_handle_swc
-  */
- static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
+ /* {{{ php_handle_swc */
+ static struct gfxinfo *php_handle_swc(php_stream * stream)
+ {
 @@ -1321,7 +1321,7 @@
result = php_handle_swf(stream);
break;


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 12/12] Update libdb-info.patch

2020-10-09 Thread glen

commit 3812f95c6f6decd7a3a7cabca74d1adbe4dcae19
Author: Elan Ruusamäe 
Date:   Fri Oct 9 19:01:44 2020 +0300

Update libdb-info.patch

 libdb-info.patch | 16 
 php.spec |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/php.spec b/php.spec
index 6c062e5..fccbf46 100644
--- a/php.spec
+++ b/php.spec
@@ -150,7 +150,7 @@ Summary(ru.UTF-8):  PHP Версии 7 - язык препроцессирова
 Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, 
виконувана на сервері
 Name:  %{orgname}%{php_suffix}
 Version:   8.0.0
-Release:   0.rc1.0
+Release:   0.rc1.1
 Epoch: 4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -1890,7 +1890,7 @@ cp -p php.ini-production php.ini
 %patch66 -p1
 %patch67 -p1 -b .mysql-lib-ver-mismatch
 #%patch68 -p1 DROP or update to 7.0 APIs
-#%patch71 -p1 -b .libdb-info
+%patch71 -p1 -b .libdb-info
 
 sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
   ext/ext_skel.php \
diff --git a/libdb-info.patch b/libdb-info.patch
index ee25732..f2fcdfb 100644
--- a/libdb-info.patch
+++ b/libdb-info.patch
@@ -1,16 +1,16 @@
 php-7.0.0beta1/ext/dba/dba.c.libdb 2015-07-08 02:24:59.119020904 +0200
-+++ php-7.0.0beta1/ext/dba/dba.c   2015-07-08 07:01:43.158767655 +0200
-@@ -52,6 +52,10 @@
- #include "php_qdbm.h"
- #include "php_tcadb.h"
+--- php-8.0.0rc1/ext/dba/dba.c~2020-10-09 19:00:25.0 +0300
 php-8.0.0rc1/ext/dba/dba.c 2020-10-09 19:01:14.638869747 +0300
+@@ -50,6 +50,10 @@
+ #include "php_lmdb.h"
+ #include "dba_arginfo.h"
  
 +#ifdef DB4_INCLUDE_FILE
 +#include DB4_INCLUDE_FILE
 +#endif
 +
- /* {{{ arginfo */
- ZEND_BEGIN_ARG_INFO_EX(arginfo_dba_popen, 0, 0, 2)
-   ZEND_ARG_INFO(0, path)
+ PHP_MINIT_FUNCTION(dba);
+ PHP_MSHUTDOWN_FUNCTION(dba);
+ PHP_MINFO_FUNCTION(dba);
 @@ -545,6 +549,10 @@ PHP_MINFO_FUNCTION(dba)
  
php_info_print_table_start();


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php] Created branch PHP_7_4

2020-10-09 Thread glen

The branch 'PHP_7_4' was created pointing to:

 bbc3f40... - release 3 (by relup.sh)

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 9/12] Merge -readline.patch into -shared.patch

2020-10-09 Thread glen

commit 6cfd6f4cd5cc47753bdc9ddcc595eedc06229f90
Author: Elan Ruusamäe 
Date:   Fri Oct 9 18:49:08 2020 +0300

Merge -readline.patch into -shared.patch

 php-readline.patch | 11 ---
 php-shared.patch   |  2 +-
 php.spec   |  2 --
 3 files changed, 1 insertion(+), 14 deletions(-)
---
diff --git a/php.spec b/php.spec
index bab110f..2c02b6f 100644
--- a/php.spec
+++ b/php.spec
@@ -181,7 +181,6 @@ Patch9: libtool-tag.patch
 Patch10:   %{orgname}-ini.patch
 Patch11:   embed.patch
 Patch14:   %{orgname}-no_pear_install.patch
-Patch17:   %{orgname}-readline.patch
 Patch18:   %{orgname}-nohttpd.patch
 Patch21:   %{orgname}-dba-link.patch
 Patch22:   %{orgname}-both-apxs.patch
@@ -1866,7 +1865,6 @@ cp -p php.ini-production php.ini
 %patch9 -p1
 %patch10 -p1 -b .ini
 %patch14 -p1
-#%patch17 -p1 -b readline
 %patch18 -p1
 %patch21 -p1
 %patch22 -p1
diff --git a/php-readline.patch b/php-readline.patch
deleted file mode 100644
index 8980fca..000
--- a/php-readline.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 php-7.4.0RC2/sapi/cli/config.m4~   2019-09-23 11:55:05.0 +0300
-+++ php-7.4.0RC2/sapi/cli/config.m42019-09-23 11:56:17.340191296 +0300
-@@ -42,7 +42,7 @@
- BUILD_CLI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) 
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS) 
\$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) 
\$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
- ;;
-   *)
--BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic 
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) 
\$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) 
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
-+BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic 
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) 
\$(PHP_RPATHS) libphp_common.la \$(PHP_BINARY_OBJS) \$(PHP_CLI_OBJS) 
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) \$(READLINE_SHARED_LIBADD) -o 
\$(SAPI_CLI_PATH)"
- ;;
-   esac
- 
diff --git a/php-shared.patch b/php-shared.patch
index b2360fa..92129ee 100644
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -69,7 +69,7 @@
  ;;
*)
 -BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic 
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) 
\$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) 
\$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
-+BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic 
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) 
\$(PHP_RPATHS) libphp_common.la   \$(PHP_BINARY_OBJS:.lo=.o) 
\$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)"
++BUILD_CLI="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic 
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) 
\$(PHP_RPATHS) libphp_common.la   \$(PHP_BINARY_OBJS:.lo=.o) 
\$(PHP_CLI_OBJS:.lo=.o) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) 
\$(READLINE_SHARED_LIBADD) -o \$(SAPI_CLI_PATH)"
  ;;
esac
  


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 11/12] Update php-use-prog_sendmail.patch

2020-10-09 Thread glen

commit eadfe6ca81e68ed53304422eff6c8b5a4aea1b9e
Author: Elan Ruusamäe 
Date:   Fri Oct 9 18:58:44 2020 +0300

Update php-use-prog_sendmail.patch

 php-use-prog_sendmail.patch | 12 ++--
 php.spec|  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/php.spec b/php.spec
index fe35950..6c062e5 100644
--- a/php.spec
+++ b/php.spec
@@ -1874,7 +1874,7 @@ cp -p php.ini-production php.ini
 %patch27 -p1
 %patch29 -p1
 %patch31 -p1
-#%patch39 -p1 -b .use-prog_sendmail
+%patch39 -p1 -b .use-prog_sendmail
 %patch41 -p1
 %patch43 -p1
 %patch44 -p1
diff --git a/php-use-prog_sendmail.patch b/php-use-prog_sendmail.patch
index 161e446..dafbcd5 100644
--- a/php-use-prog_sendmail.patch
+++ b/php-use-prog_sendmail.patch
@@ -1,14 +1,14 @@
 php-5.2.6/build/php.m4~2008-10-15 13:44:25.0 +0300
-+++ php-5.2.6/build/php.m4 2008-10-15 13:55:05.359850285 +0300
-@@ -2037,8 +2037,10 @@
- dnl Search for the sendmail binary
+--- php-8.0.0rc1/build/php.m4~ 2020-10-09 18:56:11.0 +0300
 php-8.0.0rc1/build/php.m4  2020-10-09 18:58:11.039360902 +0300
+@@ -1710,8 +1710,10 @@
+ dnl Search for the sendmail binary.
  dnl
  AC_DEFUN([PHP_PROG_SENDMAIL], [
 -  PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
--  AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
+-  AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/sbin/sendmail, 
$PATH:$PHP_ALT_PATH)
 +  if test -z "$PROG_SENDMAIL"; then
 +PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
-+AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
++AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/sbin/sendmail, 
$PATH:$PHP_ALT_PATH)
 +  fi
PHP_SUBST(PROG_SENDMAIL)
  ])


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 8/12] Updated php-sapi-ini-file.patch

2020-10-09 Thread glen

commit 6b96e74954f2923d3541e2b155e751de234462a2
Author: Elan Ruusamäe 
Date:   Fri Oct 9 18:43:10 2020 +0300

Updated php-sapi-ini-file.patch

 php-sapi-ini-file.patch | 18 --
 php.spec|  2 +-
 2 files changed, 9 insertions(+), 11 deletions(-)
---
diff --git a/php.spec b/php.spec
index c946092..bab110f 100644
--- a/php.spec
+++ b/php.spec
@@ -1862,7 +1862,7 @@ cp -p php.ini-production php.ini
 %patch3 -p1
 %patch4 -p1
 
-#%patch7 -p1 -b .sapi-ini-file
+%patch7 -p1 -b .sapi-ini-file
 %patch9 -p1
 %patch10 -p1 -b .ini
 %patch14 -p1
diff --git a/php-sapi-ini-file.patch b/php-sapi-ini-file.patch
index 598be44..5da800a 100644
--- a/php-sapi-ini-file.patch
+++ b/php-sapi-ini-file.patch
@@ -25,22 +25,20 @@ $ php -r 
'var_dump(array(get_cfg_var("cfg_file_path"),php_ini_loaded_file()));'
 
 https://github.com/pld-linux/php/commit/762ec2e
 
-diff --git a/main/php_ini.c b/main/php_ini.c
-index d508c13b50..2cf28eb7f5 100644
 a/main/php_ini.c
-+++ b/main/php_ini.c
-@@ -410,6 +410,11 @@ static void php_load_zend_extension_cb(void *arg) { }
- #endif
- /* }}} */
+--- php-8.0.0rc1/main/php_ini.c~   2020-10-09 18:15:48.0 +0300
 php-8.0.0rc1/main/php_ini.c2020-10-09 18:42:20.087488856 +0300
+@@ -65,6 +65,11 @@
+ PHPAPI char *php_ini_scanned_path=NULL;
+ PHPAPI char *php_ini_scanned_files=NULL;
  
 +static int php_csort(const struct dirent **a, const struct dirent **b)
 +{
 +  return strcmp((*a)->d_name,(*b)->d_name);
 +}
 +
- /* {{{ php_init_config
-  */
- int php_init_config(void)
+ /* {{{ php_ini_displayer_cb */
+ static ZEND_COLD void php_ini_displayer_cb(zend_ini_entry *ini_entry, int 
type)
+ {
 @@ -661,12 +666,14 @@ int php_init_config(void)
zend_llist scanned_ini_list;
zend_llist_element *element;


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 6/12] Update to 8.0.0rc1

2020-10-09 Thread glen

commit 704e26ad8ec6a764f352064a45be2a14eb3f7e11
Author: Elan Ruusamäe 
Date:   Sat Oct 3 13:41:53 2020 +0300

Update to 8.0.0rc1

 php.spec | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/php.spec b/php.spec
index 503df5a..b7699d3 100644
--- a/php.spec
+++ b/php.spec
@@ -150,7 +150,7 @@ Summary(ru.UTF-8):  PHP Версии 7 - язык препроцессирова
 Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, 
виконувана на сервері
 Name:  %{orgname}%{php_suffix}
 Version:   8.0.0
-Release:   0.beta4.0
+Release:   0.rc1.0
 Epoch: 4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -158,8 +158,8 @@ Epoch:  4
 License:   PHP 3.01 and Zend and BSD
 Group: Libraries
 #Source0:  https://php.net/distributions/%{orgname}-%{version}.tar.xz
-Source0:   https://downloads.php.net/~pollita/php-%{version}beta4.tar.xz
-# Source0-md5: a30173dc7d5b75d82253dcbf4c7f2fe4
+Source0:   
https://downloads.php.net/~carusogabriel/php-%{version}rc1.tar.xz
+# Source0-md5: 95923f24e336801d704d4177fcb3e0ce
 Source1:   opcache.ini
 Source2:   %{orgname}-mod_php.conf
 Source3:   %{orgname}-cgi-fcgi.ini
@@ -284,7 +284,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define_sysconfdir %{php_sysconfdir}
 
 # must be in sync with source. extra check ensuring that it is so is done in 
%%build
-%definephp_api_version 20200804
+%definephp_api_version 20200930
 %definezend_module_api %{php_api_version}
 %definezend_extension_api  4%{zend_module_api}
 %definephp_pdo_api_version 20170320
@@ -298,7 +298,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %definejsonver %{version}
 %definepharver %{version}
 %definesqlite3ver  %{version}
-%definezipver  1.19.1-dev
+%definezipver  1.19.1
 %definephpdbgver   %{version}
 %definesodiumver   %{version}
 
@@ -1852,7 +1852,7 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 %if 0
 %setup -q -n %{orgname}-%{version}
 %else
-%setup -q -n %{orgname}-%{version}beta4
+%setup -q -n %{orgname}-%{version}rc1
 %endif
 
 cp -p php.ini-production php.ini


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 7/12] Bulding embed is broken

2020-10-09 Thread glen

commit 2d53431c5248afef237b0bafa881c1ec59bfd3eb
Author: Elan Ruusamäe 
Date:   Tue Oct 6 06:00:20 2020 +0300

Bulding embed is broken

 php.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index b7699d3..c946092 100644
--- a/php.spec
+++ b/php.spec
@@ -16,7 +16,7 @@
 %bcond_without alternatives# use alternatives system to select default 
phar and php-fpm
 %bcond_withdefault_php # build this PHP as default PHP in system 
(disables alternatives)
 # - General options:
-%bcond_without embed   # disable building Embedded API
+%bcond_withembed   # disable building Embedded API
 %bcond_withgcov# Enable Code coverage reporting
 %bcond_without kerberos5   # without Kerberos5 support
 %bcond_withsystemtap   # systemtap/DTrace support


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 3/12] Drop bug-52078-fileinode.patch

2020-10-09 Thread glen

commit f56d7068c9d95fd3d309ef0084aa6ebf94768937
Author: Elan Ruusamäe 
Date:   Sat Oct 3 12:47:39 2020 +0300

Drop bug-52078-fileinode.patch

Not upstreamed, and pointless to maintain it here

 bug-52078-fileinode.patch | 347 --
 php.spec  |   3 +-
 2 files changed, 1 insertion(+), 349 deletions(-)
---
diff --git a/php.spec b/php.spec
index e24748b..3446c77 100644
--- a/php.spec
+++ b/php.spec
@@ -197,7 +197,6 @@ Patch43:%{orgname}-silent-session-cleanup.patch
 Patch44:   %{orgname}-include_path.patch
 Patch50:   extension-shared-optional-dep.patch
 Patch53:   fix-test-run.patch
-Patch55:   bug-52078-fileinode.patch
 Patch59:   %{orgname}-systzdata.patch
 Patch60:   %{orgname}-oracle-instantclient.patch
 Patch66:   php-db.patch
@@ -1885,7 +1884,7 @@ cp -p php.ini-production php.ini
 
 %patch53 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
-#%patch55 -p1
+
 %patch59 -p1 -b .systzdata
 %if %{with instantclient}
 %patch60 -p1 -b .instantclient
diff --git a/bug-52078-fileinode.patch b/bug-52078-fileinode.patch
deleted file mode 100644
index 059267e..000
--- a/bug-52078-fileinode.patch
+++ /dev/null
@@ -1,347 +0,0 @@
 php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt~2007-11-05 
19:43:21.0 +0200
-+++ php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt 2010-07-26 
19:31:43.613553760 +0300
-@@ -28,9 +28,9 @@
- ?>
- --EXPECTF--
- *** Testing fileinode() with file, directory ***
--%d
--%d
--%d
--%d
-+%i
-+%i
-+%i
-+%i
- 
- *** Done ***
 php-5.3.3/ext/standard/tests/file/fileinode_variation.phpt~
2007-11-05 19:43:21.0 +0200
-+++ php-5.3.3/ext/standard/tests/file/fileinode_variation.phpt 2010-07-26 
19:34:01.610414378 +0300
-@@ -89,24 +89,24 @@
- --EXPECTF--
- *** Testing fileinode() with files, links and directories ***
- -- Testing with files --
--%d
--%d
-+%i
-+%i
- -- Testing with links: hard link --
--%d
--%d
-+%i
-+%i
- -- Testing with links: soft link --
--%d
--%d
-+%i
-+%i
- -- Testing after copying a file --
--%d
--%d
-+%i
-+%i
- -- Testing after renaming the file --
--%d
--%d
-+%i
-+%i
- -- Testing with directories --
--%d
--%d
-+%i
-+%i
- -- Testing with binary input --
--%d
--%d
-+%i
-+%i
- *** Done ***
 php-5.3.3/ext/standard/tests/file/fileinode_variation1.phpt~   
2008-11-26 12:10:19.0 +0200
-+++ php-5.3.3/ext/standard/tests/file/fileinode_variation1.phpt
2010-07-26 19:35:31.216291870 +0300
-@@ -42,7 +42,7 @@
- 
- --EXPECTF--
- *** Testing fileinode() with links ***
--int(%d)
--int(%d)
-+int(%i)
-+int(%i)
- 
- *** Done ***
 php-5.3.3/ext/standard/tests/file/lstat_stat_variation18.phpt~ 
2010-07-26 19:43:12.0 +0300
-+++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation18.phpt  
2010-07-26 19:43:14.470984630 +0300
-@@ -66,7 +66,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -92,7 +92,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
-@@ -122,7 +122,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -148,7 +148,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
 php-5.3.3/ext/standard/tests/file/lstat_stat_variation19.phpt~ 
2007-11-05 19:43:21.0 +0200
-+++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation19.phpt  
2010-07-26 19:44:58.320079730 +0300
-@@ -67,7 +67,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -93,7 +93,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
-@@ -121,7 +121,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -147,7 +147,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
-@@ -177,7 +177,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -203,7 +203,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
-@@ -231,7 +231,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -257,7 +257,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
 php-5.3.3/ext/standard/tests/file/lstat_stat_variation20.phpt~ 
2007-07-26 16:38:24.0 +0300
-+++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation20.phpt  
2010-07-26 19:46:33.907004377 +0300
-@@ -69,7 +69,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -95,7 +95,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
-@@ -125,7 +125,7 @@
-   [0]=>
-

[packages/php/dev-8.0: 5/12] Update both-apxs.patch

2020-10-09 Thread glen

commit 8b96ecd2b00401abf5299ca2610f825db70efef0
Author: Elan Ruusamäe 
Date:   Sat Oct 3 13:03:03 2020 +0300

Update both-apxs.patch

 php-both-apxs.patch | 14 +++---
 php.spec|  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/php.spec b/php.spec
index 870530c..503df5a 100644
--- a/php.spec
+++ b/php.spec
@@ -1869,7 +1869,7 @@ cp -p php.ini-production php.ini
 #%patch17 -p1 -b readline
 %patch18 -p1
 %patch21 -p1
-#%patch22 -p1 -b .both-apxs
+%patch22 -p1
 %patch23 -p1
 #%patch24 -p1 -b .zlib-for-getimagesize
 %patch25 -p1
diff --git a/php-both-apxs.patch b/php-both-apxs.patch
index 3cba2ae..21260e6 100644
--- a/php-both-apxs.patch
+++ b/php-both-apxs.patch
@@ -1,15 +1,15 @@
 php-5.2.4/build/Makefile.global~   2007-08-31 19:35:54.0 +0300
-+++ php-5.2.4/build/Makefile.global2007-08-31 19:40:18.287528480 +0300
-@@ -21,6 +21,12 @@
-   $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) 
$(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+--- php-8.0.0beta4/build/Makefile.global~  2020-10-03 12:59:22.0 
+0300
 php-8.0.0beta4/build/Makefile.global   2020-10-03 13:02:40.788491363 
+0300
+@@ -23,6 +23,12 @@
+   $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
$(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) 
$(ZEND_EXTRA_LIBS) -o $@
-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 
2>&1
  
 +$(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS)
-+  $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) 
$(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
++  $(LIBTOOL) --mode=link $(CC)   -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
$(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) 
$(ZEND_EXTRA_LIBS) -o $@
 +  -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 
2>&1
 +
 +libtool-sapi: $(LIBTOOL_SAPI)
 +
- libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-   $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) 
$(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ 
libs/libphp$(PHP_MAJOR_VERSION).so
+ libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+   $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) 
$(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp.so
  


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 1/12] Enable ext-json being always built

2020-10-09 Thread glen

commit 33824073bcfa5feb263024801e03a684ed77dfd2
Author: Elan Ruusamäe 
Date:   Fri Oct 2 16:00:20 2020 +0300

Enable ext-json being always built

- https://php.watch/versions/8.0#ext-json

 php.spec | 6 --
 1 file changed, 6 deletions(-)
---
diff --git a/php.spec b/php.spec
index 6cd0d93..e49aff1 100644
--- a/php.spec
+++ b/php.spec
@@ -49,7 +49,6 @@
 %bcond_without iconv   # without iconv extension module
 %bcond_without imap# without IMAP extension module
 %bcond_without intl# without Intl extension module
-%bcond_without json# without json extension module
 %bcond_without ldap# without LDAP extension module
 %bcond_without mbstring# without mbstring extension module
 %bcond_without mhash   # without mhash extension (supported by hash 
extension)
@@ -2205,7 +2204,6 @@ for sapi in $sapis; do
--enable-mbregex \
%{__enable_disable pcntl pcntl shared} \
%{__enable_disable pdo pdo shared} \
-   %{__enable_disable json json shared} \
--enable-xmlwriter=shared \
 %if %{with fpm}
--with-fpm-user=http \
@@ -2972,13 +2970,9 @@ fi
 %attr(755,root,root) %{php_extensiondir}/intl.so
 %endif
 
-%if %{with json}
 %files json
 %defattr(644,root,root,755)
 %doc ext/json/CREDITS
-%config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/conf.d/??_json.ini
-%attr(755,root,root) %{php_extensiondir}/json.so
-%endif
 
 %if %{with ldap}
 %files ldap


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/3812f95c6f6decd7a3a7cabca74d1adbe4dcae19

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php] (12 commits) Non-fast-forward update to branch dev-8.0

2020-10-09 Thread glen

The branch 'dev-8.0' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch.

Commits removed from the branch:

  92f6ea5... Enable ext-json being always built
  a1c04cc... Update shared.patch
  bf859db... Drop bug-52078-fileinode.patch
  2f47fe1... Update php-ini.patch and opcache.ini
  ad7b7af... Update both-apxs.patch
  1c9ef3b... Update to 8.0.0rc1
  1f6c7d2... Bulding embed is broken
  44287d5... fixup! Enable ext-json being always built

Commits added to the branch:

  3382407... Enable ext-json being always built
  d9f1af7... Update shared.patch
  f56d706... Drop bug-52078-fileinode.patch
  fd83cc8... Update php-ini.patch and opcache.ini
  8b96ecd... Update both-apxs.patch
  704e26a... Update to 8.0.0rc1
  2d53431... Bulding embed is broken
  6b96e74... Updated php-sapi-ini-file.patch
  6cfd6f4... Merge -readline.patch into -shared.patch
  b886188... Update zlib-for-getimagesize.patch
  eadfe6c... Update php-use-prog_sendmail.patch
  3812f95... Update libdb-info.patch
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 3/14] Remove xmlrpc: moved to pecl

2020-10-09 Thread glen

commit 328e0ecd2d817a0cbcfcb42c95705981cd467a9a
Author: Elan Ruusamäe 
Date:   Fri Oct 2 15:31:01 2020 +0300

Remove xmlrpc: moved to pecl

- https://php.watch/versions/8.0/xmlrpc

 php.spec  | 37 +++--
 skip-tests.sh |  9 -
 2 files changed, 3 insertions(+), 43 deletions(-)
---
diff --git a/php.spec b/php.spec
index f4d3a0c..f222aa7 100644
--- a/php.spec
+++ b/php.spec
@@ -1,5 +1,7 @@
 # NOTES
 # - mysqlnd driver doesn't support reconnect: 
https://bugs.php.net/bug.php?id=52561
+# TODO 8.0:
+# - removed packages: xmlrpc
 # TODO 5.6:
 # - enable --with-fpm-systemd, but ensure it checks for sd_booted()
 # TODO:
@@ -78,7 +80,6 @@
 %bcond_without sqlite2 # without SQLite extension module
 %bcond_without sqlite3 # without SQLite3 extension module
 %bcond_without tidy# without Tidy extension module
-%bcond_without xmlrpc  # without XML-RPC extension module
 %bcond_without xsl # without xsl extension module
 %bcond_without zip # without zip extension module
 # extensions options
@@ -271,7 +272,6 @@ BuildRequires:  tar >= 1:1.22
 %{?with_tidy:BuildRequires:tidy-devel}
 BuildRequires: tokyocabinet-devel
 %{?with_odbc:BuildRequires:unixODBC-devel}
-%{?with_xmlrpc:BuildRequires:  xmlrpc-epi-devel >= 0.54.1}
 BuildRequires: xz
 BuildRequires: zlib-devel >= 1.2.0.4
 %if %{with apache2}
@@ -1776,23 +1776,6 @@ Moduł PHP umożliwiający analizę plików XML w trybie 
Pull. Czytnik
 działa jako kursor przechodzący przez strumień dokumentu i
 zatrzymujący się na każdym węźle po drodze.
 
-%package xmlrpc
-Summary:   xmlrpc extension module for PHP
-Summary(pl.UTF-8): Moduł xmlrpc dla PHP
-Group: Libraries
-URL:   http://php.net/manual/en/book.xmlrpc.php
-Requires:  %{name}-common = %{epoch}:%{version}-%{release}
-Requires:  %{name}-xml = %{epoch}:%{version}-%{release}
-Provides:  php(xmlrpc)
-Obsoletes: php-xmlrpc < 4:5.3.28-7
-
-%description xmlrpc
-This is a dynamic shared object (DSO) for PHP that will add XMLRPC
-support.
-
-%description xmlrpc -l pl.UTF-8
-Moduł PHP dodający obsługę XMLRPC.
-
 %package xmlwriter
 Summary:   Fast, non-cached, forward-only means to write XML data
 Summary(pl.UTF-8): Szybka, nie cachowana metoda zapisu danych w formacie 
XML
@@ -1917,8 +1900,6 @@ sed -E -i -e 
'1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
   ext/ext_skel.php \
   run-tests.php
 
-%{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' 
ext/xmlrpc/config.m4
-
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -1936,7 +1917,6 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs 
-0 -r -l512 rm -f
 #%{__rm} -r ext/mbstring/libmbfl
 #%{__rm} -r ext/pcre/pcre2lib
 #%{__rm} -r ext/soap/interop
-%{__rm} -r ext/xmlrpc/libxmlrpc
 #%{__rm} -r ext/zip/lib
 %{__rm} ext/date/lib/timezonedb.h
 
@@ -2129,8 +2109,7 @@ if [ ! -f _built-conf ]; then
touch _built-conf
 fi
 export PROG_SENDMAIL="/usr/lib/sendmail"
-export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags} \
-   -I%{_includedir}/xmlrpc-epi"
+export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags}"
 
 # This should be detected by configure and set there,
 # but looks like the build system is hosed on 7.3
@@ -2296,7 +2275,6 @@ for sapi in $sapis; do
%{__with_without sqlite3 sqlite3 shared} \
%{?with_tidy:--with-tidy=shared} \
%{?with_odbc:--with-unixODBC=shared} \
-   %{__with_without xmlrpc xmlrpc shared,/usr} \
%{?with_xsl:--with-xsl=shared} \
--with-zlib=shared \
%{?with_zip:--with-zip=shared} \
@@ -2729,7 +2707,6 @@ fi \
 %extension_scripts tokenizer
 %extension_scripts xml
 %extension_scripts xmlreader
-%extension_scripts xmlrpc
 %extension_scripts xmlwriter
 %extension_scripts xsl
 %extension_scripts zip
@@ -3304,14 +3281,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/conf.d/??_xmlreader.ini
 %attr(755,root,root) %{php_extensiondir}/xmlreader.so
 
-%if %{with xmlrpc}
-%files xmlrpc
-%defattr(644,root,root,755)
-%doc ext/xmlrpc/CREDITS
-%config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/conf.d/??_xmlrpc.ini
-%attr(755,root,root) %{php_extensiondir}/xmlrpc.so
-%endif
-
 %files xmlwriter
 %defattr(644,root,root,755)
 %doc ext/xmlwriter/CREDITS
diff --git a/skip-tests.sh b/skip-tests.sh
index 0180e32..d378d72 100644
--- a/skip-tests.sh
+++ b/skip-tests.sh
@@ -83,15 +83,6 @@ mv 
ext/standard/tests/general_functions/proc_nice_basic.phpt{,.skip}
 mv ext/standard/tests/general_functions/proc_open02.phpt{,.skip}
 # Test setlocale() function : usage variations - Setting all available locales 
in the platform
 mv ext/standard/tests/strings/setlocale_variation2.phpt{,.skip}
-# xmlrpc_encode_request() and various arguments
-mv ext/xmlrpc/tests/002.phpt{,.skip}
-# Bug #40576 (double values are

[packages/php/dev-8.0: 4/14] Update systzdata.patch to v19

2020-10-09 Thread glen

commit 060f741a02050299a868eda19d1fa1d76497d873
Author: Elan Ruusamäe 
Date:   Mon Sep 28 07:57:08 2020 +0300

Update systzdata.patch to v19

- 
https://git.remirepo.net/cgit/rpms/php/php80.git/plain/php-8.0.0-systzdata-v19.patch

 php-systzdata.patch | 39 ---
 php.spec|  2 +-
 2 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/php.spec b/php.spec
index f222aa7..ceb479b 100644
--- a/php.spec
+++ b/php.spec
@@ -1887,7 +1887,7 @@ cp -p php.ini-production php.ini
 %patch53 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 #%patch55 -p1
-#%patch59 -p1 -b .systzdata
+%patch59 -p1 -b .systzdata
 %if %{with instantclient}
 %patch60 -p1 -b .instantclient
 %endif
diff --git a/php-systzdata.patch b/php-systzdata.patch
index eac3cc3..902d3ce 100644
--- a/php-systzdata.patch
+++ b/php-systzdata.patch
@@ -5,6 +5,7 @@ Add support for use of the system timezone database, rather
 than embedding a copy.  Discussed upstream but was not desired.
 
 History:
+r19: adapt for timelib 2020.02 (in 8.0.0beta2)
 r18: adapt for autotool change in 7.3.3RC1
 r17: adapt for timelib 2018.01 (in 7.3.2RC1)
 r16: adapt for timelib 2017.06 (in 7.2.3RC1)
@@ -29,10 +30,10 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist 
(Raphael Geissert)
 r2: add filesystem trawl to set up name alias index
 r1: initial revision
 
-diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata 
php-7.3.3RC1/ext/date/config0.m4
 php-7.3.3RC1/ext/date/config0.m4.systzdata 2019-02-19 14:57:51.314601701 
+0100
-+++ php-7.3.3RC1/ext/date/config0.m4   2019-02-19 14:58:29.050812587 +0100
-@@ -9,6 +9,19 @@ io.h
+diff -up php-8.0.0beta3/ext/date/config0.m4.systzdata 
php-8.0.0beta3/ext/date/config0.m4
+--- php-8.0.0beta3/ext/date/config0.m4.systzdata   2020-09-01 
19:13:26.0 +0200
 php-8.0.0beta3/ext/date/config0.m4 2020-09-02 08:07:51.039979873 +0200
+@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
  dnl Check for strtoll, atoll
  AC_CHECK_FUNCS(strtoll atoll)
  
@@ -52,10 +53,10 @@ diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata 
php-7.3.3RC1/ext/date/config
  PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 
-DHAVE_TIMELIB_CONFIG_H=1"
  timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
   lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c 
lib/parse_iso_intervals.c lib/interval.c"
-diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 
php-7.3.3RC1/ext/date/lib/parse_tz.c
 php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 2019-02-19 
12:18:27.0 +0100
-+++ php-7.3.3RC1/ext/date/lib/parse_tz.c   2019-02-19 14:57:20.397428931 
+0100
-@@ -25,8 +25,21 @@
+diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata 
php-8.0.0beta3/ext/date/lib/parse_tz.c
+--- php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata   2020-09-01 
19:13:26.0 +0200
 php-8.0.0beta3/ext/date/lib/parse_tz.c 2020-09-02 08:07:51.039979873 
+0200
+@@ -26,8 +26,21 @@
  #include "timelib.h"
  #include "timelib_private.h"
  
@@ -77,7 +78,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 
php-7.3.3RC1/ext/date/li
  
  #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) 
|| defined(__LITTLE_ENDIAN__))
  # if defined(__LITTLE_ENDIAN__)
-@@ -87,6 +100,11 @@ static int read_php_preamble(const unsig
+@@ -94,6 +107,11 @@ static int read_php_preamble(const unsig
  {
uint32_t version;
  
@@ -89,11 +90,11 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 
php-7.3.3RC1/ext/date/li
/* read ID */
version = (*tzf)[3] - '0';
*tzf += 4;
-@@ -411,7 +429,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
+@@ -418,7 +436,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
}
  }
  
--static int seek_to_tz_position(const unsigned char **tzf, char *timezone, 
const timelib_tzdb *tzdb)
+-static int seek_to_tz_position(const unsigned char **tzf, const char 
*timezone, const timelib_tzdb *tzdb)
 +#ifdef HAVE_SYSTEM_TZDATA
 +
 +#ifdef HAVE_SYSTEM_TZDATA_PREFIX
@@ -516,15 +517,15 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 
php-7.3.3RC1/ext/date/li
 +
 +#endif
 +
-+static int inmem_seek_to_tz_position(const unsigned char **tzf, char 
*timezone, const timelib_tzdb *tzdb)
++static int inmem_seek_to_tz_position(const unsigned char **tzf, const char 
*timezone, const timelib_tzdb *tzdb)
  {
int left = 0, right = tzdb->index_size - 1;
  
-@@ -437,9 +877,48 @@ static int seek_to_tz_position(const uns
+@@ -444,9 +884,48 @@ static int seek_to_tz_position(const uns
return 0;
  }
  
-+static int seek_to_tz_position(const unsigned char **tzf, char *timezone,
++static int seek_to_tz_position(const unsigned char **tzf, const char 
*timezone,
 + char **map, size_t *maplen,
 + const timelib_tzdb *tzdb)
 +{
@@ -569,8 +570,8 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata

[packages/php/dev-8.0: 14/14] fixup! Enable ext-json being always built

2020-10-09 Thread glen

commit 44287d5a9f54c942e59f23c357e4bde082b23d8d
Author: Elan Ruusamäe 
Date:   Fri Oct 9 18:03:12 2020 +0300

fixup! Enable ext-json being always built

 php.spec | 2 --
 1 file changed, 2 deletions(-)
---
diff --git a/php.spec b/php.spec
index 9563438..c946092 100644
--- a/php.spec
+++ b/php.spec
@@ -2972,8 +2972,6 @@ fi
 %files json
 %defattr(644,root,root,755)
 %doc ext/json/CREDITS
-%config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/conf.d/??_json.ini
-%attr(755,root,root) %{php_extensiondir}/json.so
 
 %if %{with ldap}
 %files ldap


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/44287d5a9f54c942e59f23c357e4bde082b23d8d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 13/14] Bulding embed is broken

2020-10-09 Thread glen

commit 1f6c7d2e227804da0bd4ab4ae822a0049c0d7f6d
Author: Elan Ruusamäe 
Date:   Tue Oct 6 06:00:20 2020 +0300

Bulding embed is broken

 php.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index 107dde3..9563438 100644
--- a/php.spec
+++ b/php.spec
@@ -16,7 +16,7 @@
 %bcond_without alternatives# use alternatives system to select default 
phar and php-fpm
 %bcond_withdefault_php # build this PHP as default PHP in system 
(disables alternatives)
 # - General options:
-%bcond_without embed   # disable building Embedded API
+%bcond_withembed   # disable building Embedded API
 %bcond_withgcov# Enable Code coverage reporting
 %bcond_without kerberos5   # without Kerberos5 support
 %bcond_withsystemtap   # systemtap/DTrace support


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/44287d5a9f54c942e59f23c357e4bde082b23d8d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 9/14] Drop bug-52078-fileinode.patch

2020-10-09 Thread glen

commit bf859db51a1c200e5d2ad51d11a155f6bee90188
Author: Elan Ruusamäe 
Date:   Sat Oct 3 12:47:39 2020 +0300

Drop bug-52078-fileinode.patch

Not upstreamed, and pointless to maintain it here

 bug-52078-fileinode.patch | 347 --
 php.spec  |   3 +-
 2 files changed, 1 insertion(+), 349 deletions(-)
---
diff --git a/php.spec b/php.spec
index ef953d5..a4336a9 100644
--- a/php.spec
+++ b/php.spec
@@ -197,7 +197,6 @@ Patch43:%{orgname}-silent-session-cleanup.patch
 Patch44:   %{orgname}-include_path.patch
 Patch50:   extension-shared-optional-dep.patch
 Patch53:   fix-test-run.patch
-Patch55:   bug-52078-fileinode.patch
 Patch59:   %{orgname}-systzdata.patch
 Patch60:   %{orgname}-oracle-instantclient.patch
 Patch66:   php-db.patch
@@ -1885,7 +1884,7 @@ cp -p php.ini-production php.ini
 
 %patch53 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
-#%patch55 -p1
+
 %patch59 -p1 -b .systzdata
 %if %{with instantclient}
 %patch60 -p1 -b .instantclient
diff --git a/bug-52078-fileinode.patch b/bug-52078-fileinode.patch
deleted file mode 100644
index 059267e..000
--- a/bug-52078-fileinode.patch
+++ /dev/null
@@ -1,347 +0,0 @@
 php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt~2007-11-05 
19:43:21.0 +0200
-+++ php-5.3.3/ext/standard/tests/file/fileinode_basic.phpt 2010-07-26 
19:31:43.613553760 +0300
-@@ -28,9 +28,9 @@
- ?>
- --EXPECTF--
- *** Testing fileinode() with file, directory ***
--%d
--%d
--%d
--%d
-+%i
-+%i
-+%i
-+%i
- 
- *** Done ***
 php-5.3.3/ext/standard/tests/file/fileinode_variation.phpt~
2007-11-05 19:43:21.0 +0200
-+++ php-5.3.3/ext/standard/tests/file/fileinode_variation.phpt 2010-07-26 
19:34:01.610414378 +0300
-@@ -89,24 +89,24 @@
- --EXPECTF--
- *** Testing fileinode() with files, links and directories ***
- -- Testing with files --
--%d
--%d
-+%i
-+%i
- -- Testing with links: hard link --
--%d
--%d
-+%i
-+%i
- -- Testing with links: soft link --
--%d
--%d
-+%i
-+%i
- -- Testing after copying a file --
--%d
--%d
-+%i
-+%i
- -- Testing after renaming the file --
--%d
--%d
-+%i
-+%i
- -- Testing with directories --
--%d
--%d
-+%i
-+%i
- -- Testing with binary input --
--%d
--%d
-+%i
-+%i
- *** Done ***
 php-5.3.3/ext/standard/tests/file/fileinode_variation1.phpt~   
2008-11-26 12:10:19.0 +0200
-+++ php-5.3.3/ext/standard/tests/file/fileinode_variation1.phpt
2010-07-26 19:35:31.216291870 +0300
-@@ -42,7 +42,7 @@
- 
- --EXPECTF--
- *** Testing fileinode() with links ***
--int(%d)
--int(%d)
-+int(%i)
-+int(%i)
- 
- *** Done ***
 php-5.3.3/ext/standard/tests/file/lstat_stat_variation18.phpt~ 
2010-07-26 19:43:12.0 +0300
-+++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation18.phpt  
2010-07-26 19:43:14.470984630 +0300
-@@ -66,7 +66,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -92,7 +92,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
-@@ -122,7 +122,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -148,7 +148,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
 php-5.3.3/ext/standard/tests/file/lstat_stat_variation19.phpt~ 
2007-11-05 19:43:21.0 +0200
-+++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation19.phpt  
2010-07-26 19:44:58.320079730 +0300
-@@ -67,7 +67,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -93,7 +93,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
-@@ -121,7 +121,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -147,7 +147,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
-@@ -177,7 +177,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -203,7 +203,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
-@@ -231,7 +231,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -257,7 +257,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
 php-5.3.3/ext/standard/tests/file/lstat_stat_variation20.phpt~ 
2007-07-26 16:38:24.0 +0300
-+++ php-5.3.3/ext/standard/tests/file/lstat_stat_variation20.phpt  
2010-07-26 19:46:33.907004377 +0300
-@@ -69,7 +69,7 @@
-   [0]=>
-   int(%d)
-   [1]=>
--  int(%d)
-+  int(%i)
-   [2]=>
-   int(%d)
-   [3]=>
-@@ -95,7 +95,7 @@
-   ["dev"]=>
-   int(%d)
-   ["ino"]=>
--  int(%d)
-+  int(%i)
-   ["mode"]=>
-   int(%d)
-   ["nlink"]=>
-@@ -125,7 +125,7 @@
-   [0]=>
-

[packages/php/dev-8.0: 10/14] Update php-ini.patch and opcache.ini

2020-10-09 Thread glen

commit 2f47fe1349c5701ba31300a8217ec40d132dca53
Author: Elan Ruusamäe 
Date:   Sat Oct 3 12:57:54 2020 +0300

Update php-ini.patch and opcache.ini

 opcache.ini   |  5 +
 php-ini.patch | 33 -
 php.spec  |  2 +-
 3 files changed, 22 insertions(+), 18 deletions(-)
---
diff --git a/php.spec b/php.spec
index a4336a9..a17d706 100644
--- a/php.spec
+++ b/php.spec
@@ -1864,7 +1864,7 @@ cp -p php.ini-production php.ini
 
 #%patch7 -p1 -b .sapi-ini-file
 %patch9 -p1
-#%patch10 -p1 -b .ini
+%patch10 -p1 -b .ini
 %patch14 -p1
 #%patch17 -p1 -b readline
 %patch18 -p1
diff --git a/opcache.ini b/opcache.ini
index b2931f6..67c0381 100644
--- a/opcache.ini
+++ b/opcache.ini
@@ -40,6 +40,11 @@
 ; size of the optimized code.
 ;opcache.save_comments=1
 
+; If enabled, compilation warnings (including notices and deprecations) will
+; be recorded and replayed each time a file is included. Otherwise, compilation
+; warnings will only be emitted when the file is first cached.
+;opcache.record_warnings=0
+
 ; Allow file existence override (file_exists, etc.) performance feature.
 ;opcache.enable_file_override=0
 
diff --git a/php-ini.patch b/php-ini.patch
index a6c58b5..6022546 100644
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -1,5 +1,5 @@
 php-7.4.0RC2/php.ini~  2019-09-23 10:43:53.0 +0300
-+++ php-7.4.0RC2/php.ini   2019-09-23 11:52:45.049464720 +0300
+--- php-8.0.0beta4/php.ini~2020-10-03 12:50:10.0 +0300
 php-8.0.0beta4/php.ini 2020-10-03 12:54:30.499681036 +0300
 @@ -82,6 +82,20 @@
  ; much more verbose when it comes to errors. We recommending using the
  ; development version only in development environments as errors shown to
@@ -127,24 +127,16 @@
  
  ; File Uploads ;
  
-@@ -856,50 +856,10 @@ default_socket_timeout = 60
- ; deprecated in a future PHP major version. So, when it is possible, please
- ; move to the new ('extension=) syntax.
- ;
--; Notes for Windows environments :
- ;
--; - Many DLL files are located in the extensions/ (PHP 4) or ext/ (PHP 5+)
--;   extension folders as well as the separate PECL DLL download (PHP 5+).
--;   Be sure to appropriately set the extension_dir directive.
-+; Ideally in PLD Linux you should install appropriate php74- or
-+; php74-pecl- package.
+@@ -871,44 +871,8 @@
+ ;   extension folders as well as the separate PECL DLL download (PHP 5+).
+ ;   Be sure to appropriately set the extension_dir directive.
  ;
 -;extension=bz2
 -;extension=curl
 -;extension=ffi
 -;extension=ftp
 -;extension=fileinfo
--;extension=gd2
+-;extension=gd
 -;extension=gettext
 -;extension=gmp
 -;extension=intl
@@ -174,12 +166,14 @@
 -;extension=sodium
 -;extension=sqlite3
 -;extension=tidy
--;extension=xmlrpc
 -;extension=xsl
 -
+-;zend_extension=opcache
++; In PLD Linux you can install appropriate php80- or 
php80-pecl- package.
++;
+ 
  ;;;
  ; Module Settings ;
- ;;;
 @@ -954,8 +867,9 @@
  
  [Date]
@@ -233,7 +227,7 @@
  
  ; (time to live) Sets the number of second while cached file will be used
  ; instead of original one.
-@@ -1670,155 +1670,6 @@
+@@ -1674,160 +1674,6 @@
  [dba]
  ;dba.default_handler=
  
@@ -279,6 +273,11 @@
 -; size of the optimized code.
 -;opcache.save_comments=1
 -
+-; If enabled, compilation warnings (including notices and deprecations) will
+-; be recorded and replayed each time a file is included. Otherwise, 
compilation
+-; warnings will only be emitted when the file is first cached.
+-;opcache.record_warnings=0
+-
 -; Allow file existence override (file_exists, etc.) performance feature.
 -;opcache.enable_file_override=0
 -


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/44287d5a9f54c942e59f23c357e4bde082b23d8d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 11/14] Update both-apxs.patch

2020-10-09 Thread glen

commit ad7b7af66e5639e432cab3ecac304f8bed7cb9d9
Author: Elan Ruusamäe 
Date:   Sat Oct 3 13:03:03 2020 +0300

Update both-apxs.patch

 php-both-apxs.patch | 14 +++---
 php.spec|  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/php.spec b/php.spec
index a17d706..8838ea5 100644
--- a/php.spec
+++ b/php.spec
@@ -1869,7 +1869,7 @@ cp -p php.ini-production php.ini
 #%patch17 -p1 -b readline
 %patch18 -p1
 %patch21 -p1
-#%patch22 -p1 -b .both-apxs
+%patch22 -p1
 %patch23 -p1
 #%patch24 -p1 -b .zlib-for-getimagesize
 %patch25 -p1
diff --git a/php-both-apxs.patch b/php-both-apxs.patch
index 3cba2ae..21260e6 100644
--- a/php-both-apxs.patch
+++ b/php-both-apxs.patch
@@ -1,15 +1,15 @@
 php-5.2.4/build/Makefile.global~   2007-08-31 19:35:54.0 +0300
-+++ php-5.2.4/build/Makefile.global2007-08-31 19:40:18.287528480 +0300
-@@ -21,6 +21,12 @@
-   $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) 
$(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+--- php-8.0.0beta4/build/Makefile.global~  2020-10-03 12:59:22.0 
+0300
 php-8.0.0beta4/build/Makefile.global   2020-10-03 13:02:40.788491363 
+0300
+@@ -23,6 +23,12 @@
+   $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
$(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) 
$(ZEND_EXTRA_LIBS) -o $@
-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 
2>&1
  
 +$(LIBTOOL_SAPI): libphp_common.la $(PHP_SAPI_OBJS)
-+  $(LIBTOOL) --mode=link $(CC) -rpath $(phptempdir) $(EXTRA_LDFLAGS) 
$(LDFLAGS) $(PHP_RPATHS) $(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
++  $(LIBTOOL) --mode=link $(CC)   -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
$(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) 
$(ZEND_EXTRA_LIBS) -o $@
 +  -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 
2>&1
 +
 +libtool-sapi: $(LIBTOOL_SAPI)
 +
- libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-   $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) 
$(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ 
libs/libphp$(PHP_MAJOR_VERSION).so
+ libs/libphp.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+   $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
$(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) 
$(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp.so
  


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/44287d5a9f54c942e59f23c357e4bde082b23d8d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 12/14] Update to 8.0.0rc1

2020-10-09 Thread glen

commit 1c9ef3bdc9ea5f8ed1f6494a2a41ab5c63fea6d6
Author: Elan Ruusamäe 
Date:   Sat Oct 3 13:41:53 2020 +0300

Update to 8.0.0rc1

 php.spec | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/php.spec b/php.spec
index 8838ea5..107dde3 100644
--- a/php.spec
+++ b/php.spec
@@ -150,7 +150,7 @@ Summary(ru.UTF-8):  PHP Версии 7 - язык препроцессирова
 Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, 
виконувана на сервері
 Name:  %{orgname}%{php_suffix}
 Version:   8.0.0
-Release:   0.beta4.0
+Release:   0.rc1.0
 Epoch: 4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
@@ -158,8 +158,8 @@ Epoch:  4
 License:   PHP 3.01 and Zend and BSD
 Group: Libraries
 #Source0:  https://php.net/distributions/%{orgname}-%{version}.tar.xz
-Source0:   https://downloads.php.net/~pollita/php-%{version}beta4.tar.xz
-# Source0-md5: a30173dc7d5b75d82253dcbf4c7f2fe4
+Source0:   
https://downloads.php.net/~carusogabriel/php-%{version}rc1.tar.xz
+# Source0-md5: 95923f24e336801d704d4177fcb3e0ce
 Source1:   opcache.ini
 Source2:   %{orgname}-mod_php.conf
 Source3:   %{orgname}-cgi-fcgi.ini
@@ -284,7 +284,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define_sysconfdir %{php_sysconfdir}
 
 # must be in sync with source. extra check ensuring that it is so is done in 
%%build
-%definephp_api_version 20200804
+%definephp_api_version 20200930
 %definezend_module_api %{php_api_version}
 %definezend_extension_api  4%{zend_module_api}
 %definephp_pdo_api_version 20170320
@@ -298,7 +298,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %definejsonver %{version}
 %definepharver %{version}
 %definesqlite3ver  %{version}
-%definezipver  1.19.1-dev
+%definezipver  1.19.1
 %definephpdbgver   %{version}
 %definesodiumver   %{version}
 
@@ -1852,7 +1852,7 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 %if 0
 %setup -q -n %{orgname}-%{version}
 %else
-%setup -q -n %{orgname}-%{version}beta4
+%setup -q -n %{orgname}-%{version}rc1
 %endif
 
 cp -p php.ini-production php.ini


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/44287d5a9f54c942e59f23c357e4bde082b23d8d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: php: php-8.0.0rc1.tar.xz

2020-10-09 Thread glen

Request by: glen


Files fetched: 1

STORED: https://downloads.php.net/~carusogabriel/php-8.0.0rc1.tar.xz
95923f24e336801d704d4177fcb3e0ce  php-8.0.0rc1.tar.xz
Size: 10665620 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 7/14] Enable ext-json being always built

2020-10-09 Thread glen

commit 92f6ea5beaca1f04ba8918c59f525d58f378bc87
Author: Elan Ruusamäe 
Date:   Fri Oct 2 16:00:20 2020 +0300

Enable ext-json being always built

- https://php.watch/versions/8.0#ext-json

 php.spec | 4 
 1 file changed, 4 deletions(-)
---
diff --git a/php.spec b/php.spec
index 6cd0d93..202b1ee 100644
--- a/php.spec
+++ b/php.spec
@@ -49,7 +49,6 @@
 %bcond_without iconv   # without iconv extension module
 %bcond_without imap# without IMAP extension module
 %bcond_without intl# without Intl extension module
-%bcond_without json# without json extension module
 %bcond_without ldap# without LDAP extension module
 %bcond_without mbstring# without mbstring extension module
 %bcond_without mhash   # without mhash extension (supported by hash 
extension)
@@ -2205,7 +2204,6 @@ for sapi in $sapis; do
--enable-mbregex \
%{__enable_disable pcntl pcntl shared} \
%{__enable_disable pdo pdo shared} \
-   %{__enable_disable json json shared} \
--enable-xmlwriter=shared \
 %if %{with fpm}
--with-fpm-user=http \
@@ -2972,13 +2970,11 @@ fi
 %attr(755,root,root) %{php_extensiondir}/intl.so
 %endif
 
-%if %{with json}
 %files json
 %defattr(644,root,root,755)
 %doc ext/json/CREDITS
 %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/conf.d/??_json.ini
 %attr(755,root,root) %{php_extensiondir}/json.so
-%endif
 
 %if %{with ldap}
 %files ldap


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/44287d5a9f54c942e59f23c357e4bde082b23d8d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 8/14] Update shared.patch

2020-10-09 Thread glen

commit a1c04cc88019e2e647848bfd662acf00aa792233
Author: Elan Ruusamäe 
Date:   Mon Sep 28 10:51:10 2020 +0300

Update shared.patch

 php-shared.patch | 70 
 php.spec |  2 +-
 2 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/php.spec b/php.spec
index 202b1ee..ef953d5 100644
--- a/php.spec
+++ b/php.spec
@@ -1857,7 +1857,7 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 %endif
 
 cp -p php.ini-production php.ini
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 #%patch2 -p1 -b .mail
 %patch3 -p1
diff --git a/php-shared.patch b/php-shared.patch
index ac15661..b2360fa 100644
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -10,45 +10,45 @@
  dnl Checks for some support/generator progs.
  PHP_PROG_AWK
  PHP_PROG_BISON([3.0.0])
 php-7.4.0RC3/build/Makefile.global~2019-10-04 16:11:24.0 
+0300
-+++ php-7.4.0RC3/build/Makefile.global 2019-10-09 15:21:11.198544363 +0300
+--- php-8.0.0beta4/build/Makefile.global~  2020-09-28 07:54:00.0 
+0300
 php-8.0.0beta4/build/Makefile.global   2020-09-28 07:54:42.203157017 
+0300
 @@ -13,8 +13,12 @@

  build-modules: $(PHP_MODULES)
  
--libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
--  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) 
$(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+-libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+-  $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) 
-rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
$(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 +libphp_common.la: $(PHP_GLOBAL_OBJS)
-+  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
++  $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) 
-rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
 +  -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 
2>&1
 +
-+libphp$(PHP_MAJOR_VERSION).la: libphp_common.la $(PHP_SAPI_OBJS)
++libphp.la: libphp_common.la $(PHP_SAPI_OBJS)
 +  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
$(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) 
$(ZEND_EXTRA_LIBS) -o $@
-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 
2>&1
  
  libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-@@ -25,10 +29,10 @@
+@@ -31,10 +31,10 @@
  install-sapi: $(OVERALL_TARGET)
@echo "Installing PHP SAPI module:   $(PHP_SAPI)"
-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
--  -@if test ! -r 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
+-  -@if test ! -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); then \
 +  -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); 
then \
for i in 0.0.0 0.0 0; do \
--  if test -r 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
--  $(LN_S) 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
+-  if test -r 
$(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+-  $(LN_S) 
$(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); \
 +  if test -r 
$(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
 +  $(LN_S) 
$(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); \
break; \
fi; \
done; \
 php-7.4.0RC2/sapi/cgi/config9.m4~  2019-09-17 19:37:54.0 +0300
-+++ php-7.4.0RC2/sapi/cgi/config9.m4   2019-09-20 13:43:03.654012130 +0300
+--- php-8.0.0beta4/sapi/cgi/config9.m4~2020-09-15 21:36:33.0 
+0300
 php-8.0.0beta4/sapi/cgi/config9.m4 2020-09-28 08:00:34.341402924 +0300
 @@ -55,7 +55,7 @@
- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) 
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS) 
\$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(PHP_FRAMEWORKS) 
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) 
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) 
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) 
\$(PHP_FASTCGI_OBJS:.lo=.o)

[packages/php/dev-8.0: 6/14] Drop unsupported configure option --enable-inline-optimization

2020-10-09 Thread glen

commit 77a6083952c5dee7d1f7a37f0a0314ec1fc79547
Author: Elan Ruusamäe 
Date:   Fri Oct 2 16:01:08 2020 +0300

Drop unsupported configure option --enable-inline-optimization

 php.spec | 1 -
 1 file changed, 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index ccc3d7d..6cd0d93 100644
--- a/php.spec
+++ b/php.spec
@@ -2189,7 +2189,6 @@ for sapi in $sapis; do
%{?with_argon2:--with-password-argon2} \
--%{!?with_debug:dis}%{?with_debug:en}able-debug \
%{?with_zts:--enable-maintainer-zts} \
-   --enable-inline-optimization \
--enable-option-checking=fatal \
%{__enable_disable bcmath bcmath shared} \
%{__enable_disable calendar calendar shared} \


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/44287d5a9f54c942e59f23c357e4bde082b23d8d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 2/14] Update to 8.0.0 beta4

2020-10-09 Thread glen

commit ae934c480b5ec043fa77cfba8c2c9ac1cc4e99af
Author: Elan Ruusamäe 
Date:   Mon Sep 28 07:38:57 2020 +0300

Update to 8.0.0 beta4

- https://php.watch/articles/php8-alpha1

 php.spec | 40 +++-
 1 file changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/php.spec b/php.spec
index 7a8b6d1..f4d3a0c 100644
--- a/php.spec
+++ b/php.spec
@@ -140,7 +140,7 @@
 %endif
 
 %defineorgname php
-%definever_suffix 74
+%definever_suffix 80
 %definephp_suffix %{!?with_default_php:%{ver_suffix}}
 Summary:   PHP: Hypertext Preprocessor
 Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
@@ -149,16 +149,17 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP
 Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, 
выполняемый на сервере
 Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, 
виконувана на сервері
 Name:  %{orgname}%{php_suffix}
-Version:   7.4.6
-Release:   3
+Version:   8.0.0
+Release:   0.beta4.0
 Epoch: 4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
 License:   PHP 3.01 and Zend and BSD
 Group: Libraries
-Source0:   https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 523b7d61e5fa8ea15375f6d1f7e2876a
+#Source0:  https://php.net/distributions/%{orgname}-%{version}.tar.xz
+Source0:   https://downloads.php.net/~pollita/php-%{version}beta4.tar.xz
+# Source0-md5: a30173dc7d5b75d82253dcbf4c7f2fe4
 Source1:   opcache.ini
 Source2:   %{orgname}-mod_php.conf
 Source3:   %{orgname}-cgi-fcgi.ini
@@ -1867,29 +1868,34 @@ compression support to PHP.
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
+%if 0
 %setup -q -n %{orgname}-%{version}
+%else
+%setup -q -n %{orgname}-%{version}beta4
+%endif
+
 cp -p php.ini-production php.ini
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1 -b .mail
 %patch3 -p1
 %patch4 -p1
 
-%patch7 -p1
+#%patch7 -p1 -b .sapi-ini-file
 %patch9 -p1
-%patch10 -p1
+#%patch10 -p1 -b .ini
 %patch14 -p1
-%patch17 -p1
+#%patch17 -p1 -b readline
 %patch18 -p1
 %patch21 -p1
-%patch22 -p1
+#%patch22 -p1 -b .both-apxs
 %patch23 -p1
-%patch24 -p1
+#%patch24 -p1 -b .zlib-for-getimagesize
 %patch25 -p1
 %patch27 -p1
 %patch29 -p1
 %patch31 -p1
-%patch39 -p1
+#%patch39 -p1 -b .use-prog_sendmail
 %patch41 -p1
 %patch43 -p1
 %patch44 -p1
@@ -1897,15 +1903,15 @@ cp -p php.ini-production php.ini
 
 %patch53 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
-%patch55 -p1
-%patch59 -p1 -b .systzdata
+#%patch55 -p1
+#%patch59 -p1 -b .systzdata
 %if %{with instantclient}
 %patch60 -p1 -b .instantclient
 %endif
 %patch66 -p1
-%patch67 -p1
+%patch67 -p1 -b .mysql-lib-ver-mismatch
 #%patch68 -p1 DROP or update to 7.0 APIs
-%patch71 -p1
+#%patch71 -p1 -b .libdb-info
 
 sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
   ext/ext_skel.php \


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/44287d5a9f54c942e59f23c357e4bde082b23d8d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 5/14] Update version macros

2020-10-09 Thread glen

commit 157310a6111fbb9f54a312b5a206972f0483a1e6
Author: Elan Ruusamäe 
Date:   Fri Oct 2 15:59:09 2020 +0300

Update version macros

 php.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index ceb479b..ccc3d7d 100644
--- a/php.spec
+++ b/php.spec
@@ -286,9 +286,9 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define_sysconfdir %{php_sysconfdir}
 
 # must be in sync with source. extra check ensuring that it is so is done in 
%%build
-%definephp_api_version 20190902
+%definephp_api_version 20200804
 %definezend_module_api %{php_api_version}
-%definezend_extension_api  3%{zend_module_api}
+%definezend_extension_api  4%{zend_module_api}
 %definephp_pdo_api_version 20170320
 
 # Extension versions
@@ -300,7 +300,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %definejsonver %{version}
 %definepharver %{version}
 %definesqlite3ver  %{version}
-%definezipver  1.15.6
+%definezipver  1.19.1-dev
 %definephpdbgver   %{version}
 %definesodiumver   %{version}
 


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/44287d5a9f54c942e59f23c357e4bde082b23d8d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php] (14 commits) Non-fast-forward update to branch dev-8.0

2020-10-09 Thread glen

The branch 'dev-8.0' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch.

Commits removed from the branch:

  6d89b42... Update to 8.0.0 beta4
  1b8e862... Remove xmlrpc: moved to pecl
  524e55a... Update systzdata.patch to v19
  670abd5... Update version macros
  621371e... Drop unsupported configure option --enable-inline-optimizat
  7b51b5f... Enable ext-json being always built
  c4bc784... Update shared.patch

Commits added to the branch:

  bbc3f40... - release 3 (by relup.sh) (*)
  ae934c4... Update to 8.0.0 beta4
  328e0ec... Remove xmlrpc: moved to pecl
  060f741... Update systzdata.patch to v19
  157310a... Update version macros
  77a6083... Drop unsupported configure option --enable-inline-optimizat
  92f6ea5... Enable ext-json being always built
  a1c04cc... Update shared.patch
  bf859db... Drop bug-52078-fileinode.patch
  2f47fe1... Update php-ini.patch and opcache.ini
  ad7b7af... Update both-apxs.patch
  1c9ef3b... Update to 8.0.0rc1
  1f6c7d2... Bulding embed is broken
  44287d5... fixup! Enable ext-json being always built

(*) This commit already existed in another branch; no separate mail sent
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 7/7] Update shared.patch

2020-10-03 Thread glen

commit c4bc7846ae393282f74cda4f16f390add142b943
Author: Elan Ruusamäe 
Date:   Mon Sep 28 10:51:10 2020 +0300

Update shared.patch

 php-shared.patch | 70 
 php.spec |  2 +-
 2 files changed, 36 insertions(+), 36 deletions(-)
---
diff --git a/php.spec b/php.spec
index 106a8ac..ec06eb5 100644
--- a/php.spec
+++ b/php.spec
@@ -1857,7 +1857,7 @@ Moduł PHP umożliwiający używanie kompresji zlib.
 %endif
 
 cp -p php.ini-production php.ini
-#%patch0 -p1
+%patch0 -p1
 %patch1 -p1
 #%patch2 -p1
 %patch3 -p1
diff --git a/php-shared.patch b/php-shared.patch
index ac15661..b2360fa 100644
--- a/php-shared.patch
+++ b/php-shared.patch
@@ -10,45 +10,45 @@
  dnl Checks for some support/generator progs.
  PHP_PROG_AWK
  PHP_PROG_BISON([3.0.0])
 php-7.4.0RC3/build/Makefile.global~2019-10-04 16:11:24.0 
+0300
-+++ php-7.4.0RC3/build/Makefile.global 2019-10-09 15:21:11.198544363 +0300
+--- php-8.0.0beta4/build/Makefile.global~  2020-09-28 07:54:00.0 
+0300
 php-8.0.0beta4/build/Makefile.global   2020-09-28 07:54:42.203157017 
+0300
 @@ -13,8 +13,12 @@

  build-modules: $(PHP_MODULES)
  
--libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
--  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) 
$(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
+-libphp.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
+-  $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) 
-rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
$(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@
 +libphp_common.la: $(PHP_GLOBAL_OBJS)
-+  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
++  $(LIBTOOL) --mode=link $(CC) $(LIBPHP_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) 
-rpath $(phptempdir) -avoid-version $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) 
$(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ -release $(PHP_VERSION)
 +  -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 
2>&1
 +
-+libphp$(PHP_MAJOR_VERSION).la: libphp_common.la $(PHP_SAPI_OBJS)
++libphp.la: libphp_common.la $(PHP_SAPI_OBJS)
 +  $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath 
$(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) 
$(phptempdir)/libphp_common.la $(PHP_SAPI_OBJS) $(EXTRA_LIBS) 
$(ZEND_EXTRA_LIBS) -o $@
-@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 
2>&1
  
  libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS)
-@@ -25,10 +29,10 @@
+@@ -31,10 +31,10 @@
  install-sapi: $(OVERALL_TARGET)
@echo "Installing PHP SAPI module:   $(PHP_SAPI)"
-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
--  -@if test ! -r 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \
+-  -@if test ! -r $(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); then \
 +  -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); 
then \
for i in 0.0.0 0.0 0; do \
--  if test -r 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \
--  $(LN_S) 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \
+-  if test -r 
$(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
+-  $(LN_S) 
$(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp.$(SHLIB_DL_SUFFIX_NAME); \
 +  if test -r 
$(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i; then \
 +  $(LN_S) 
$(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME).$$i 
$(phptempdir)/libphp_common.$(SHLIB_DL_SUFFIX_NAME); \
break; \
fi; \
done; \
 php-7.4.0RC2/sapi/cgi/config9.m4~  2019-09-17 19:37:54.0 +0300
-+++ php-7.4.0RC2/sapi/cgi/config9.m4   2019-09-20 13:43:03.654012130 +0300
+--- php-8.0.0beta4/sapi/cgi/config9.m4~2020-09-15 21:36:33.0 
+0300
 php-8.0.0beta4/sapi/cgi/config9.m4 2020-09-28 08:00:34.341402924 +0300
 @@ -55,7 +55,7 @@
- BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) 
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS) 
\$(PHP_BINARY_OBJS) \$(PHP_FASTCGI_OBJS) \$(PHP_CGI_OBJS) \$(PHP_FRAMEWORKS) 
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
+ BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) 
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) 
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_BINARY_OBJS:.lo=.o) 
\$(PHP_FASTCGI_OBJS:.lo=.o) \$(PHP_CGI_OBJS:.lo=.o)

DISTFILES: php: php-8.0.0beta4.tar.xz

2020-10-03 Thread glen

Request by: glen


Files fetched: 1

STORED: https://downloads.php.net/~pollita/php-8.0.0beta4.tar.xz
a30173dc7d5b75d82253dcbf4c7f2fe4  php-8.0.0beta4.tar.xz
Size: 10703556 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 5/7] Drop unsupported configure option --enable-inline-optimization

2020-10-03 Thread glen

commit 621371e1bb0f1064821772a2b0880b1cc0a2c11d
Author: Elan Ruusamäe 
Date:   Fri Oct 2 16:01:08 2020 +0300

Drop unsupported configure option --enable-inline-optimization

 php.spec | 1 -
 1 file changed, 1 deletion(-)
---
diff --git a/php.spec b/php.spec
index 4653c62..77f4bf5 100644
--- a/php.spec
+++ b/php.spec
@@ -2189,7 +2189,6 @@ for sapi in $sapis; do
%{?with_argon2:--with-password-argon2} \
--%{!?with_debug:dis}%{?with_debug:en}able-debug \
%{?with_zts:--enable-maintainer-zts} \
-   --enable-inline-optimization \
--enable-option-checking=fatal \
%{__enable_disable bcmath bcmath shared} \
%{__enable_disable calendar calendar shared} \


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/c4bc7846ae393282f74cda4f16f390add142b943

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 6/7] Enable ext-json being always built

2020-10-03 Thread glen

commit 7b51b5ff631f7965da7d45de3e0dd82cf1758bbf
Author: Elan Ruusamäe 
Date:   Fri Oct 2 16:00:20 2020 +0300

Enable ext-json being always built

- https://php.watch/versions/8.0#ext-json

 php.spec | 4 
 1 file changed, 4 deletions(-)
---
diff --git a/php.spec b/php.spec
index 77f4bf5..106a8ac 100644
--- a/php.spec
+++ b/php.spec
@@ -49,7 +49,6 @@
 %bcond_without iconv   # without iconv extension module
 %bcond_without imap# without IMAP extension module
 %bcond_without intl# without Intl extension module
-%bcond_without json# without json extension module
 %bcond_without ldap# without LDAP extension module
 %bcond_without mbstring# without mbstring extension module
 %bcond_without mhash   # without mhash extension (supported by hash 
extension)
@@ -2205,7 +2204,6 @@ for sapi in $sapis; do
--enable-mbregex \
%{__enable_disable pcntl pcntl shared} \
%{__enable_disable pdo pdo shared} \
-   %{__enable_disable json json shared} \
--enable-xmlwriter=shared \
 %if %{with fpm}
--with-fpm-user=http \
@@ -2972,13 +2970,11 @@ fi
 %attr(755,root,root) %{php_extensiondir}/intl.so
 %endif
 
-%if %{with json}
 %files json
 %defattr(644,root,root,755)
 %doc ext/json/CREDITS
 %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/conf.d/??_json.ini
 %attr(755,root,root) %{php_extensiondir}/json.so
-%endif
 
 %if %{with ldap}
 %files ldap


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/c4bc7846ae393282f74cda4f16f390add142b943

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 3/7] Update systzdata.patch to v19

2020-10-03 Thread glen

commit 524e55a51d798dfe6dbe15fa14b7cc21ba096f20
Author: Elan Ruusamäe 
Date:   Mon Sep 28 07:57:08 2020 +0300

Update systzdata.patch to v19

- 
https://git.remirepo.net/cgit/rpms/php/php80.git/plain/php-8.0.0-systzdata-v19.patch

 php-systzdata.patch | 39 ---
 php.spec|  2 +-
 2 files changed, 21 insertions(+), 20 deletions(-)
---
diff --git a/php.spec b/php.spec
index d4b9075..64aebc0 100644
--- a/php.spec
+++ b/php.spec
@@ -1887,7 +1887,7 @@ cp -p php.ini-production php.ini
 %patch53 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
 #%patch55 -p1
-#%patch59 -p1 -b .systzdata
+%patch59 -p1 -b .systzdata
 %if %{with instantclient}
 %patch60 -p1 -b .instantclient
 %endif
diff --git a/php-systzdata.patch b/php-systzdata.patch
index eac3cc3..902d3ce 100644
--- a/php-systzdata.patch
+++ b/php-systzdata.patch
@@ -5,6 +5,7 @@ Add support for use of the system timezone database, rather
 than embedding a copy.  Discussed upstream but was not desired.
 
 History:
+r19: adapt for timelib 2020.02 (in 8.0.0beta2)
 r18: adapt for autotool change in 7.3.3RC1
 r17: adapt for timelib 2018.01 (in 7.3.2RC1)
 r16: adapt for timelib 2017.06 (in 7.2.3RC1)
@@ -29,10 +30,10 @@ r3: fix a crash if /usr/share/zoneinfo doesn't exist 
(Raphael Geissert)
 r2: add filesystem trawl to set up name alias index
 r1: initial revision
 
-diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata 
php-7.3.3RC1/ext/date/config0.m4
 php-7.3.3RC1/ext/date/config0.m4.systzdata 2019-02-19 14:57:51.314601701 
+0100
-+++ php-7.3.3RC1/ext/date/config0.m4   2019-02-19 14:58:29.050812587 +0100
-@@ -9,6 +9,19 @@ io.h
+diff -up php-8.0.0beta3/ext/date/config0.m4.systzdata 
php-8.0.0beta3/ext/date/config0.m4
+--- php-8.0.0beta3/ext/date/config0.m4.systzdata   2020-09-01 
19:13:26.0 +0200
 php-8.0.0beta3/ext/date/config0.m4 2020-09-02 08:07:51.039979873 +0200
+@@ -4,6 +4,19 @@ AC_CHECK_HEADERS([io.h])
  dnl Check for strtoll, atoll
  AC_CHECK_FUNCS(strtoll atoll)
  
@@ -52,10 +53,10 @@ diff -up php-7.3.3RC1/ext/date/config0.m4.systzdata 
php-7.3.3RC1/ext/date/config
  PHP_DATE_CFLAGS="-I@ext_builddir@/lib -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 
-DHAVE_TIMELIB_CONFIG_H=1"
  timelib_sources="lib/astro.c lib/dow.c lib/parse_date.c lib/parse_tz.c
   lib/timelib.c lib/tm2unixtime.c lib/unixtime2tm.c 
lib/parse_iso_intervals.c lib/interval.c"
-diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 
php-7.3.3RC1/ext/date/lib/parse_tz.c
 php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 2019-02-19 
12:18:27.0 +0100
-+++ php-7.3.3RC1/ext/date/lib/parse_tz.c   2019-02-19 14:57:20.397428931 
+0100
-@@ -25,8 +25,21 @@
+diff -up php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata 
php-8.0.0beta3/ext/date/lib/parse_tz.c
+--- php-8.0.0beta3/ext/date/lib/parse_tz.c.systzdata   2020-09-01 
19:13:26.0 +0200
 php-8.0.0beta3/ext/date/lib/parse_tz.c 2020-09-02 08:07:51.039979873 
+0200
+@@ -26,8 +26,21 @@
  #include "timelib.h"
  #include "timelib_private.h"
  
@@ -77,7 +78,7 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 
php-7.3.3RC1/ext/date/li
  
  #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) 
|| defined(__LITTLE_ENDIAN__))
  # if defined(__LITTLE_ENDIAN__)
-@@ -87,6 +100,11 @@ static int read_php_preamble(const unsig
+@@ -94,6 +107,11 @@ static int read_php_preamble(const unsig
  {
uint32_t version;
  
@@ -89,11 +90,11 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 
php-7.3.3RC1/ext/date/li
/* read ID */
version = (*tzf)[3] - '0';
*tzf += 4;
-@@ -411,7 +429,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
+@@ -418,7 +436,429 @@ void timelib_dump_tzinfo(timelib_tzinfo
}
  }
  
--static int seek_to_tz_position(const unsigned char **tzf, char *timezone, 
const timelib_tzdb *tzdb)
+-static int seek_to_tz_position(const unsigned char **tzf, const char 
*timezone, const timelib_tzdb *tzdb)
 +#ifdef HAVE_SYSTEM_TZDATA
 +
 +#ifdef HAVE_SYSTEM_TZDATA_PREFIX
@@ -516,15 +517,15 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata 
php-7.3.3RC1/ext/date/li
 +
 +#endif
 +
-+static int inmem_seek_to_tz_position(const unsigned char **tzf, char 
*timezone, const timelib_tzdb *tzdb)
++static int inmem_seek_to_tz_position(const unsigned char **tzf, const char 
*timezone, const timelib_tzdb *tzdb)
  {
int left = 0, right = tzdb->index_size - 1;
  
-@@ -437,9 +877,48 @@ static int seek_to_tz_position(const uns
+@@ -444,9 +884,48 @@ static int seek_to_tz_position(const uns
return 0;
  }
  
-+static int seek_to_tz_position(const unsigned char **tzf, char *timezone,
++static int seek_to_tz_position(const unsigned char **tzf, const char 
*timezone,
 + char **map, size_t *maplen,
 + const timelib_tzdb *tzdb)
 +{
@@ -569,8 +570,8 @@ diff -up php-7.3.3RC1/ext/date/lib/parse_tz.c.systzdata

[packages/php/dev-8.0: 4/7] Update version macros

2020-10-03 Thread glen

commit 670abd5d1a44d6a76d842eb9733f5e2dea77a2f6
Author: Elan Ruusamäe 
Date:   Fri Oct 2 15:59:09 2020 +0300

Update version macros

 php.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/php.spec b/php.spec
index 64aebc0..4653c62 100644
--- a/php.spec
+++ b/php.spec
@@ -286,9 +286,9 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define_sysconfdir %{php_sysconfdir}
 
 # must be in sync with source. extra check ensuring that it is so is done in 
%%build
-%definephp_api_version 20190902
+%definephp_api_version 20200804
 %definezend_module_api %{php_api_version}
-%definezend_extension_api  3%{zend_module_api}
+%definezend_extension_api  4%{zend_module_api}
 %definephp_pdo_api_version 20170320
 
 # Extension versions
@@ -300,7 +300,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %definejsonver %{version}
 %definepharver %{version}
 %definesqlite3ver  %{version}
-%definezipver  1.15.6
+%definezipver  1.19.1-dev
 %definephpdbgver   %{version}
 %definesodiumver   %{version}
 


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/c4bc7846ae393282f74cda4f16f390add142b943

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 1/7] Update to 8.0.0 beta4

2020-10-03 Thread glen

commit 6d89b423ebc1cae78adb57f6fa6a4f483f93e8bc
Author: Elan Ruusamäe 
Date:   Mon Sep 28 07:38:57 2020 +0300

Update to 8.0.0 beta4

- https://php.watch/articles/php8-alpha1

 php.spec | 40 +++-
 1 file changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/php.spec b/php.spec
index 805caa5..8c35920 100644
--- a/php.spec
+++ b/php.spec
@@ -140,7 +140,7 @@
 %endif
 
 %defineorgname php
-%definever_suffix 74
+%definever_suffix 80
 %definephp_suffix %{!?with_default_php:%{ver_suffix}}
 Summary:   PHP: Hypertext Preprocessor
 Summary(fr.UTF-8): Le langage de script embarque-HTML PHP
@@ -149,16 +149,17 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP
 Summary(ru.UTF-8): PHP Версии 7 - язык препроцессирования HTML-файлов, 
выполняемый на сервере
 Summary(uk.UTF-8): PHP Версії 7 - мова препроцесування HTML-файлів, 
виконувана на сервері
 Name:  %{orgname}%{php_suffix}
-Version:   7.4.6
-Release:   2
+Version:   8.0.0
+Release:   0.beta4.0
 Epoch: 4
 # All files licensed under PHP version 3.01, except
 # Zend is licensed under Zend
 # TSRM is licensed under BSD
 License:   PHP 3.01 and Zend and BSD
 Group: Libraries
-Source0:   https://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 523b7d61e5fa8ea15375f6d1f7e2876a
+#Source0:  https://php.net/distributions/%{orgname}-%{version}.tar.xz
+Source0:   https://downloads.php.net/~pollita/php-%{version}beta4.tar.xz
+# Source0-md5: a30173dc7d5b75d82253dcbf4c7f2fe4
 Source1:   opcache.ini
 Source2:   %{orgname}-mod_php.conf
 Source3:   %{orgname}-cgi-fcgi.ini
@@ -1867,29 +1868,34 @@ compression support to PHP.
 Moduł PHP umożliwiający używanie kompresji zlib.
 
 %prep
+%if 0
 %setup -q -n %{orgname}-%{version}
+%else
+%setup -q -n %{orgname}-%{version}beta4
+%endif
+
 cp -p php.ini-production php.ini
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 
-%patch7 -p1
+#%patch7 -p1
 %patch9 -p1
-%patch10 -p1
+#%patch10 -p1
 %patch14 -p1
-%patch17 -p1
+#%patch17 -p1
 %patch18 -p1
 %patch21 -p1
-%patch22 -p1
+#%patch22 -p1
 %patch23 -p1
-%patch24 -p1
+#%patch24 -p1
 %patch25 -p1
 %patch27 -p1
 %patch29 -p1
 %patch31 -p1
-%patch39 -p1
+#%patch39 -p1
 %patch41 -p1
 %patch43 -p1
 %patch44 -p1
@@ -1897,15 +1903,15 @@ cp -p php.ini-production php.ini
 
 %patch53 -p1
 %undos ext/spl/tests/SplFileInfo_getInode_basic.phpt
-%patch55 -p1
-%patch59 -p1 -b .systzdata
+#%patch55 -p1
+#%patch59 -p1 -b .systzdata
 %if %{with instantclient}
 %patch60 -p1 -b .instantclient
 %endif
 %patch66 -p1
-%patch67 -p1
+#%patch67 -p1
 #%patch68 -p1 DROP or update to 7.0 APIs
-%patch71 -p1
+#%patch71 -p1
 
 sed -E -i -e '1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
   ext/ext_skel.php \


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/c4bc7846ae393282f74cda4f16f390add142b943

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php/dev-8.0: 2/7] Remove xmlrpc: moved to pecl

2020-10-03 Thread glen

commit 1b8e8627bbcc9e200bfb302fd2bdf0277e1d0122
Author: Elan Ruusamäe 
Date:   Fri Oct 2 15:31:01 2020 +0300

Remove xmlrpc: moved to pecl

- https://php.watch/versions/8.0/xmlrpc

 php.spec  | 37 +++--
 skip-tests.sh |  9 -
 2 files changed, 3 insertions(+), 43 deletions(-)
---
diff --git a/php.spec b/php.spec
index 8c35920..d4b9075 100644
--- a/php.spec
+++ b/php.spec
@@ -1,5 +1,7 @@
 # NOTES
 # - mysqlnd driver doesn't support reconnect: 
https://bugs.php.net/bug.php?id=52561
+# TODO 8.0:
+# - removed packages: xmlrpc
 # TODO 5.6:
 # - enable --with-fpm-systemd, but ensure it checks for sd_booted()
 # TODO:
@@ -78,7 +80,6 @@
 %bcond_without sqlite2 # without SQLite extension module
 %bcond_without sqlite3 # without SQLite3 extension module
 %bcond_without tidy# without Tidy extension module
-%bcond_without xmlrpc  # without XML-RPC extension module
 %bcond_without xsl # without xsl extension module
 %bcond_without zip # without zip extension module
 # extensions options
@@ -271,7 +272,6 @@ BuildRequires:  tar >= 1:1.22
 %{?with_tidy:BuildRequires:tidy-devel}
 BuildRequires: tokyocabinet-devel
 %{?with_odbc:BuildRequires:unixODBC-devel}
-%{?with_xmlrpc:BuildRequires:  xmlrpc-epi-devel >= 0.54.1}
 BuildRequires: xz
 BuildRequires: zlib-devel >= 1.2.0.4
 %if %{with apache2}
@@ -1776,23 +1776,6 @@ Moduł PHP umożliwiający analizę plików XML w trybie 
Pull. Czytnik
 działa jako kursor przechodzący przez strumień dokumentu i
 zatrzymujący się na każdym węźle po drodze.
 
-%package xmlrpc
-Summary:   xmlrpc extension module for PHP
-Summary(pl.UTF-8): Moduł xmlrpc dla PHP
-Group: Libraries
-URL:   http://php.net/manual/en/book.xmlrpc.php
-Requires:  %{name}-common = %{epoch}:%{version}-%{release}
-Requires:  %{name}-xml = %{epoch}:%{version}-%{release}
-Provides:  php(xmlrpc)
-Obsoletes: php-xmlrpc < 4:5.3.28-7
-
-%description xmlrpc
-This is a dynamic shared object (DSO) for PHP that will add XMLRPC
-support.
-
-%description xmlrpc -l pl.UTF-8
-Moduł PHP dodający obsługę XMLRPC.
-
 %package xmlwriter
 Summary:   Fast, non-cached, forward-only means to write XML data
 Summary(pl.UTF-8): Szybka, nie cachowana metoda zapisu danych w formacie 
XML
@@ -1917,8 +1900,6 @@ sed -E -i -e 
'1s,#!\s*/usr/bin/env\s+(.*),#!%{__bindir}\1,' \
   ext/ext_skel.php \
   run-tests.php
 
-%{__sed} -i -e '/PHP_ADD_LIBRARY_WITH_PATH/s#xmlrpc,#xmlrpc-epi,#' 
ext/xmlrpc/config.m4
-
 # cleanup backups after patching
 find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
 
@@ -1936,7 +1917,6 @@ find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs 
-0 -r -l512 rm -f
 #%{__rm} -r ext/mbstring/libmbfl
 #%{__rm} -r ext/pcre/pcre2lib
 #%{__rm} -r ext/soap/interop
-%{__rm} -r ext/xmlrpc/libxmlrpc
 #%{__rm} -r ext/zip/lib
 %{__rm} ext/date/lib/timezonedb.h
 
@@ -2129,8 +2109,7 @@ if [ ! -f _built-conf ]; then
touch _built-conf
 fi
 export PROG_SENDMAIL="/usr/lib/sendmail"
-export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags} \
-   -I%{_includedir}/xmlrpc-epi"
+export CPPFLAGS="-DDEBUG_FASTCGI -DHAVE_STRNDUP %{rpmcppflags}"
 
 # This should be detected by configure and set there,
 # but looks like the build system is hosed on 7.3
@@ -2296,7 +2275,6 @@ for sapi in $sapis; do
%{__with_without sqlite3 sqlite3 shared} \
%{?with_tidy:--with-tidy=shared} \
%{?with_odbc:--with-unixODBC=shared} \
-   %{__with_without xmlrpc xmlrpc shared,/usr} \
%{?with_xsl:--with-xsl=shared} \
--with-zlib=shared \
%{?with_zip:--with-zip=shared} \
@@ -2729,7 +2707,6 @@ fi \
 %extension_scripts tokenizer
 %extension_scripts xml
 %extension_scripts xmlreader
-%extension_scripts xmlrpc
 %extension_scripts xmlwriter
 %extension_scripts xsl
 %extension_scripts zip
@@ -3304,14 +3281,6 @@ fi
 %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/conf.d/??_xmlreader.ini
 %attr(755,root,root) %{php_extensiondir}/xmlreader.so
 
-%if %{with xmlrpc}
-%files xmlrpc
-%defattr(644,root,root,755)
-%doc ext/xmlrpc/CREDITS
-%config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/conf.d/??_xmlrpc.ini
-%attr(755,root,root) %{php_extensiondir}/xmlrpc.so
-%endif
-
 %files xmlwriter
 %defattr(644,root,root,755)
 %doc ext/xmlwriter/CREDITS
diff --git a/skip-tests.sh b/skip-tests.sh
index 0180e32..d378d72 100644
--- a/skip-tests.sh
+++ b/skip-tests.sh
@@ -83,15 +83,6 @@ mv 
ext/standard/tests/general_functions/proc_nice_basic.phpt{,.skip}
 mv ext/standard/tests/general_functions/proc_open02.phpt{,.skip}
 # Test setlocale() function : usage variations - Setting all available locales 
in the platform
 mv ext/standard/tests/strings/setlocale_variation2.phpt{,.skip}
-# xmlrpc_encode_request() and various arguments
-mv ext/xmlrpc/tests/002.phpt{,.skip}
-# Bug #40576 (double values are

[packages/php] (7 commits) Created branch dev-8.0

2020-10-03 Thread glen

The branch 'dev-8.0' was created.

Summary of new commits:

  6d89b42... Update to 8.0.0 beta4
  1b8e862... Remove xmlrpc: moved to pecl
  524e55a... Update systzdata.patch to v19
  670abd5... Update version macros
  621371e... Drop unsupported configure option --enable-inline-optimizat
  7b51b5f... Enable ext-json being always built
  c4bc784... Update shared.patch
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-phpmailer] Up to 5.2.28

2020-09-21 Thread glen

commit 99f333d16b8168246434bea126cf7b89ae487504
Author: Elan Ruusamäe 
Date:   Tue Sep 22 06:59:50 2020 +0300

Up to 5.2.28

 php-phpmailer.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/php-phpmailer.spec b/php-phpmailer.spec
index abb77ee..1d2ef90 100644
--- a/php-phpmailer.spec
+++ b/php-phpmailer.spec
@@ -7,12 +7,12 @@
 Summary:   Full featured email transfer class for PHP
 Summary(pl.UTF-8): W pełni funkcjonalna klasa PHP do przesyłania e-maili
 Name:  php-%{pkgname}
-Version:   5.2.27
-Release:   2
+Version:   5.2.28
+Release:   1
 License:   LGPL v2.1
 Group: Development/Languages/PHP
 Source0:   
https://github.com/PHPMailer/PHPMailer/archive/v%{version}/%{pkgname}-%{version}.tar.gz
-# Source0-md5: a2e45c0fdacea30e4b582b37880ca53e
+# Source0-md5: 7cc68ae383b4300212880534fb399844
 URL:   https://github.com/PHPMailer/PHPMailer
 BuildRequires: php-devel
 BuildRequires: php-pear-PhpDocumentor


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-phpmailer.git/commitdiff/99f333d16b8168246434bea126cf7b89ae487504

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: php-phpmailer: phpmailer-5.2.28.tar.gz

2020-09-21 Thread glen

Request by: glen


Files fetched: 1

STORED: 
https://github.com/PHPMailer/PHPMailer/archive/v5.2.28/phpmailer-5.2.28.tar.gz
7cc68ae383b4300212880534fb399844  phpmailer-5.2.28.tar.gz
Size: 159284 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pecl-xdebug] Requires PHP 7.1

2020-09-20 Thread glen

commit 60d94e0aff308a1db3d8d9760ac8f28dbc1f700f
Author: Elan Ruusamäe 
Date:   Sun Sep 20 10:24:56 2020 +0300

Requires PHP 7.1

Check for supported PHP versions... configure: error: not supported.
Need a PHP version >= 7.1.0 and < 8.0.0 (found 7.0.33)

 php-pecl-xdebug.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec
index 6219e82..358ba04 100644
--- a/php-pecl-xdebug.spec
+++ b/php-pecl-xdebug.spec
@@ -23,7 +23,7 @@ Source0:  https://xdebug.org/files/xdebug-%{version}.tgz
 Source1:   %{modname}.ini
 Source2:   vim-xt-filetype.vim
 URL:   https://xdebug.org/
-BuildRequires: %{php_name}-devel >= 4:7.0
+BuildRequires: %{php_name}-devel >= 4:7.1.0
 BuildRequires: libedit-devel
 BuildRequires: libtool
 BuildRequires: rpmbuild(macros) >= 1.650


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-xdebug.git/commitdiff/60d94e0aff308a1db3d8d9760ac8f28dbc1f700f

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pecl-xdebug] Up to 2.9.7

2020-09-20 Thread glen

commit 763c3192536c8fc82e7cda76a4ef0ff40934da4c
Author: Elan Ruusamäe 
Date:   Sun Sep 20 09:52:43 2020 +0300

Up to 2.9.7

- https://xdebug.org/announcements/2020-09-16

 php-pecl-xdebug.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/php-pecl-xdebug.spec b/php-pecl-xdebug.spec
index c981aa7..6219e82 100644
--- a/php-pecl-xdebug.spec
+++ b/php-pecl-xdebug.spec
@@ -12,14 +12,14 @@
 Summary:   %{modname} - provides functions for functions traces and 
profiling
 Summary(pl.UTF-8): %{modname} - funkcje do śledzenia i profilowania funkcji
 Name:  %{php_name}-pecl-%{modname}
-Version:   2.9.6
+Version:   2.9.7
 Release:   1
 # The Xdebug License, version 1.01
 # (Based on "The PHP License", version 3.0)
 License:   PHP
 Group: Development/Languages/PHP
 Source0:   https://xdebug.org/files/xdebug-%{version}.tgz
-# Source0-md5: ee9fdb480d5a3f9edd8f4c6f465f4df9
+# Source0-md5: 95e31dc47037c274d6683ec21946b07e
 Source1:   %{modname}.ini
 Source2:   vim-xt-filetype.vim
 URL:   https://xdebug.org/


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-xdebug.git/commitdiff/763c3192536c8fc82e7cda76a4ef0ff40934da4c

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: php-pecl-xdebug: xdebug-2.9.7.tgz

2020-09-20 Thread glen

Request by: glen


Files fetched: 1

STORED: https://xdebug.org/files/xdebug-2.9.7.tgz
95e31dc47037c274d6683ec21946b07e  xdebug-2.9.7.tgz
Size: 245140 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: php-pecl-solr: solr-2.5.1.tgz

2020-09-17 Thread glen

Request by: glen


Files fetched: 1

STORED: https://pecl.php.net/get/solr-2.5.1.tgz
29fc866198d61bccdbc4c4f53fb7ef06  solr-2.5.1.tgz
Size: 619983 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pecl-solr] Up to 2.5.1

2020-09-17 Thread glen

commit ecfcb5b4cbbd8f4ad033196291344b5507ec8773
Author: Elan Ruusamäe 
Date:   Thu Sep 17 15:56:36 2020 +0300

Up to 2.5.1

 php-pecl-solr.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/php-pecl-solr.spec b/php-pecl-solr.spec
index 5e3209b..506fde1 100644
--- a/php-pecl-solr.spec
+++ b/php-pecl-solr.spec
@@ -8,12 +8,12 @@
 Summary:   Object oriented API to Apache Solr
 Summary(fr.UTF-8): API orientée objet pour Apache Solr
 Name:  %{php_name}-pecl-solr
-Version:   2.5.0
-Release:   3
+Version:   2.5.1
+Release:   1
 License:   PHP v3.01
 Group: Development/Languages
 Source0:   https://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: 5034f5d274e2c80b8ac63f601d0beb01
+# Source0-md5: 29fc866198d61bccdbc4c4f53fb7ef06
 Patch0:tests-online.patch
 URL:   https://pecl.php.net/package/solr
 BuildRequires: %{php_name}-cli


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-solr.git/commitdiff/ecfcb5b4cbbd8f4ad033196291344b5507ec8773

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/syncthing] Sync ExclusiveArch from golang package

2020-09-17 Thread glen

commit 7aa7397524bea95b1a193f17be66c28207c2c12c
Author: Elan Ruusamäe 
Date:   Thu Sep 17 14:09:15 2020 +0300

Sync ExclusiveArch from golang package

 syncthing.spec | 1 +
 1 file changed, 1 insertion(+)
---
diff --git a/syncthing.spec b/syncthing.spec
index 7aadc52..dabb011 100644
--- a/syncthing.spec
+++ b/syncthing.spec
@@ -18,6 +18,7 @@ Source0:  
https://github.com/syncthing/syncthing/releases/download/v%{version}/%{
 # Source0-md5: de188d86224e83d537c2a66f2f2dea71
 URL:   https://syncthing.net/
 BuildRequires: golang >= 1.14
+ExclusiveArch: %{ix86} %{x8664} %{arm} aarch64 mips64 mips64le ppc64 ppc64le 
s390x
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define_enable_debug_packages 0


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/syncthing.git/commitdiff/7aa7397524bea95b1a193f17be66c28207c2c12c

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/syncthing] Update to 1.9.0

2020-09-17 Thread glen

commit 9637aa3293c5dfd355bd03068397d30a18953168
Author: Elan Ruusamäe 
Date:   Tue Sep 15 10:39:25 2020 +0300

Update to 1.9.0

 syncthing.spec | 49 +
 1 file changed, 21 insertions(+), 28 deletions(-)
---
diff --git a/syncthing.spec b/syncthing.spec
index 695d38d..7aadc52 100644
--- a/syncthing.spec
+++ b/syncthing.spec
@@ -5,14 +5,19 @@
 
 Summary:   Open Source Continuous File Synchronization
 Name:  syncthing
-Version:   0.14.7
+Version:   1.9.0
 Release:   1
-License:   MPL-2.0
+# syncthing (MPLv2.0) bundles
+# - angular, bootstrap, daterangepicker, fancytree, jQuery, moment (MIT),
+# - ForkAwesome (MIT and OFL and CC-BY 3.0), and
+# - a number of go packages (MIT and MPLv2.0 and BSD and ASL 2.0 and CC0 and 
ISC)
+License:   MPLv2.0 and MIT and OFL and CC-BY and BSD and ASL 2.0 and CC0 
and ISC
 Group: Applications/Networking
-Source0:   
https://github.com/syncthing/syncthing/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 761a57eaeb8438e08fc1a46b12d6bc2b
+# Use official release tarball (contains vendored dependencies)
+Source0:   
https://github.com/syncthing/syncthing/releases/download/v%{version}/%{name}-source-v%{version}.tar.gz
+# Source0-md5: de188d86224e83d537c2a66f2f2dea71
 URL:   https://syncthing.net/
-BuildRequires: golang >= 1.5
+BuildRequires: golang >= 1.14
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define_enable_debug_packages 0
@@ -27,21 +32,24 @@ you deserve to choose where it is stored, if it is shared 
with some
 third party and how it's transmitted over the Internet.
 
 %prep
-%setup -q
+%setup -qc
 
-GOPATH=$(pwd)/src
-install -d $(dirname $GOPATH/%{import_path})
-ln -s ../../.. $GOPATH/%{import_path}
-ln -s .. vendor/src
+install -d build/src/$(dirname %{import_path})
+mv %{name}/{AUTHORS,*.md} .
+mv %{name} build/src/%{import_path}
 
 %build
-export GOPATH=$(pwd)
-cd src/%{import_path}
-go run build.go -version "v%{version}" -no-upgrade
+export GOPATH=$(pwd)/build
+cd build/src/%{import_path}
+
+go run build.go -version "v%{version}" -no-upgrade build
+go run build.go -version "v%{version}" -no-upgrade install
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man{1,5,7}}
+
+cd build/src/%{import_path}
 install -p bin/* $RPM_BUILD_ROOT%{_bindir}
 cp -p man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 cp -p man/*.5 $RPM_BUILD_ROOT%{_mandir}/man5
@@ -53,22 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.md AUTHORS CONTRIBUTING.md
-%attr(755,root,root) %{_bindir}/stbench
-%attr(755,root,root) %{_bindir}/stcompdirs
-%attr(755,root,root) %{_bindir}/stdisco
-%attr(755,root,root) %{_bindir}/stdiscosrv
-%attr(755,root,root) %{_bindir}/stevents
-%attr(755,root,root) %{_bindir}/stfileinfo
-%attr(755,root,root) %{_bindir}/stfinddevice
-%attr(755,root,root) %{_bindir}/stgenfiles
-%attr(755,root,root) %{_bindir}/stindex
-%attr(755,root,root) %{_bindir}/strelaypoolsrv
-%attr(755,root,root) %{_bindir}/strelaysrv
-%attr(755,root,root) %{_bindir}/stsigtool
-%attr(755,root,root) %{_bindir}/stvanity
-%attr(755,root,root) %{_bindir}/stwatchfile
 %attr(755,root,root) %{_bindir}/syncthing
-%attr(755,root,root) %{_bindir}/testutil
 %{_mandir}/man1/stdiscosrv.1*
 %{_mandir}/man1/strelaysrv.1*
 %{_mandir}/man1/syncthing.1*


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/syncthing.git/commitdiff/9637aa3293c5dfd355bd03068397d30a18953168

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: syncthing: syncthing-source-v1.9.0.tar.gz

2020-09-17 Thread glen

Request by: glen


Files fetched: 1

STORED: 
https://github.com/syncthing/syncthing/releases/download/v1.9.0/syncthing-source-v1.9.0.tar.gz
de188d86224e83d537c2a66f2f2dea71  syncthing-source-v1.9.0.tar.gz
Size: 11142643 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: golang: go1.14.9.src.tar.gz

2020-09-15 Thread glen

Request by: glen


Files fetched: 1

STORED: https://storage.googleapis.com/golang/go1.14.9.src.tar.gz
6f6dd1377421d27ca4bb607283b31738  go1.14.9.src.tar.gz
Size: 22540282 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/golang] Up to 1.14.9

2020-09-15 Thread glen

commit 7e2ec210ecd43a7b6cf55a6d5ae879fa2b8f4d03
Author: Elan Ruusamäe 
Date:   Tue Sep 15 10:03:40 2020 +0300

Up to 1.14.9

 golang.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/golang.spec b/golang.spec
index c04821f..7c07186 100644
--- a/golang.spec
+++ b/golang.spec
@@ -26,17 +26,17 @@
 Summary:   Go compiler and tools
 Summary(pl.UTF-8): Kompilator języka Go i narzędzia
 Name:  golang
-Version:   1.13.8
+Version:   1.14.9
 Release:   1
 # source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under 
Public Domain
 License:   BSD and Public Domain
 Group: Development/Languages
 # Source0Download: https://golang.org/dl/
 Source0:   https://storage.googleapis.com/golang/go%{version}.src.tar.gz
-# Source0-md5: 984c244563f2d2f48103e8d6db8a8308
+# Source0-md5: 6f6dd1377421d27ca4bb607283b31738
 Patch0:ca-certs.patch
 Patch1:
0001-Don-t-use-the-bundled-tzdata-at-runtime-except-for-t.patch
-URL:   http://golang.org/
+URL:   https://golang.org/
 BuildRequires: bash
 BuildRequires: rpm-pythonprov
 # The compiler is written in Go. Needs go(1.4+) compiler for build.


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/golang.git/commitdiff/7e2ec210ecd43a7b6cf55a6d5ae879fa2b8f4d03

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/megacmd] Up to 1.3.0

2020-09-03 Thread glen

commit 8108e4fcd4a8dbf2d2e919d6eb4d2cbe8d5ff67f
Author: Elan Ruusamäe 
Date:   Thu Sep 3 12:00:41 2020 +0300

Up to 1.3.0

 megacmd.spec | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/megacmd.spec b/megacmd.spec
index 9090b65..fe73653 100644
--- a/megacmd.spec
+++ b/megacmd.spec
@@ -7,15 +7,16 @@
 
 Summary:   Command Line Interactive and Scriptable Application to access 
MEGA
 Name:  megacmd
-Version:   1.2.0
+Version:   1.3.0
 Release:   1
 # 
https://github.com/meganz/MEGAcmd/commit/b366c77370c277223be123e05e5ef15fafbce185#r31261647
 License:   BSD 2-Clause "Simplified" License
 Group: Applications
+# Releases: https://github.com/meganz/MEGAcmd/releases
 Source0:   
https://github.com/meganz/MEGAcmd/archive/%{version}_Linux/%{name}-%{version}.tar.gz
-# Source0-md5: 879d5d2b70508736eff30db420b12cd1
-Source1:   
https://github.com/meganz/sdk/archive/de4ff325d/mega-sdk-v3.5.3-1921-gde4ff325d.tar.gz
-# Source1-md5: 8fcb952d8909d3d5deb1c82072d41afe
+# Source0-md5: c308194923ff1114ba0d01ff363e30bf
+Source1:   
https://github.com/meganz/sdk/archive/b2948c7c7/mega-sdk-v3.7.0-18-gb2948c7c7.tar.gz
+# Source1-md5: 8668b1089f0dd290959e1059cee3508d
 URL:   https://mega.nz/
 %{?with_freeimage:BuildRequires:   FreeImage-devel}
 BuildRequires: autoconf
@@ -176,7 +177,7 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libmega.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmega.so.30609
+%attr(755,root,root) %ghost %{_libdir}/libmega.so.30700
 
 %files devel
 %defattr(644,root,root,755)


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/megacmd.git/commitdiff/8108e4fcd4a8dbf2d2e919d6eb4d2cbe8d5ff67f

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: megacmd: megacmd-1.3.0.tar.gz mega-sdk-v3.7.0-18-gb2948c7c7.tar.gz

2020-09-03 Thread glen

Request by: glen


Files fetched: 2

STORED: 
https://github.com/meganz/MEGAcmd/archive/1.3.0_Linux/megacmd-1.3.0.tar.gz
c308194923ff1114ba0d01ff363e30bf  megacmd-1.3.0.tar.gz
Size: 2025196 bytes
STORED: 
https://github.com/meganz/sdk/archive/b2948c7c7/mega-sdk-v3.7.0-18-gb2948c7c7.tar.gz
8668b1089f0dd290959e1059cee3508d  mega-sdk-v3.7.0-18-gb2948c7c7.tar.gz
Size: 3285130 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: eventum: eventum-3.9.5.tar.xz updown2.gif

2020-09-02 Thread glen

Request by: glen


Files fetched: 1

STORED: 
https://github.com/eventum/eventum/releases/download/v3.9.5/eventum-3.9.5.tar.xz
a983c36bc990e8534786af01d71d560b  eventum-3.9.5.tar.xz
Size: 4461428 bytes
ALREADY GOT: http://www.isocra.com/images/updown2.gif
deb6eeb2552ba757d3a949ed10c4107d  updown2.gif


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/eventum] Up to 3.9.5

2020-09-02 Thread glen

commit 7447e62b66ea6502b2a4010f10bab9b3c70a8f03
Author: Elan Ruusamäe 
Date:   Wed Sep 2 14:59:47 2020 +0300

Up to 3.9.5

 eventum.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 218572c..810e719 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -9,12 +9,12 @@
 Summary:   Eventum Issue / Bug tracking system
 Summary(pl.UTF-8): Eventum - system śledzenia spraw/błędów
 Name:  eventum
-Version:   3.9.4
+Version:   3.9.5
 Release:   %{?subver:1.%{subver}.%{?githash:g%{githash}.}}%{rel}
 License:   GPL v2+
 Group: Applications/WWW
 Source0:   
https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 02c1fb442cb445c9003c992a7f2ea019
+# Source0-md5: a983c36bc990e8534786af01d71d560b
 #Source0:  
https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
 Source1:   %{name}-apache.conf
 Source2:   %{name}-mail-queue.cron


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/7447e62b66ea6502b2a4010f10bab9b3c70a8f03

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/eventum] Move all code to main package

2020-08-24 Thread glen

commit e48720675ca8fef3c00a2e6fdf33a65305d18277
Author: Elan Ruusamäe 
Date:   Wed Aug 19 13:39:56 2020 +0300

Move all code to main package

The subpackages would contain only specific cron jobs

 eventum.spec | 20 +---
 1 file changed, 5 insertions(+), 15 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 3fe1637..585c61e 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -462,12 +462,17 @@ fi
 %{_appdir}/config
 
 %dir %{_appdir}/bin
+%attr(755,root,root) %{_appdir}/bin/check_reminders.php
 %attr(755,root,root) %{_appdir}/bin/console.php
+%attr(755,root,root) %{_appdir}/bin/download_emails.php
 %attr(755,root,root) %{_appdir}/bin/export-issues.php
 %attr(755,root,root) %{_appdir}/bin/extension.php
 %attr(755,root,root) %{_appdir}/bin/ldapsync.php
 %attr(755,root,root) %{_appdir}/bin/migrate_storage_adapter.php
+%attr(755,root,root) %{_appdir}/bin/monitor.php
 %attr(755,root,root) %{_appdir}/bin/process_all_emails.php
+%attr(755,root,root) %{_appdir}/bin/process_mail_queue.php
+%attr(755,root,root) %{_appdir}/bin/truncate_mail_queue.php
 %attr(755,root,root) %{_appdir}/bin/upgrade.php
 
 %{_appdir}/autoload.php
@@ -499,11 +504,6 @@ fi
 %{_appdir}/vendor
 %dir %{_appdir}/lib
 %{_appdir}/lib/eventum
-%exclude %{_appdir}/src/Console/Command/MailDownloadCommand.php
-%exclude %{_appdir}/src/Console/Command/MailQueueProcessCommand.php
-%exclude %{_appdir}/src/Console/Command/MailQueueTruncateCommand.php
-%exclude %{_appdir}/src/Console/Command/MonitorCommand.php
-%exclude %{_appdir}/src/Console/Command/ReminderCheckCommand.php
 
 %dir %{_libdir}
 
@@ -533,28 +533,18 @@ fi
 
 %files mail-queue
 %defattr(644,root,root,755)
-%{_appdir}/src/Console/Command/MailQueueProcessCommand.php
-%{_appdir}/src/Console/Command/MailQueueTruncateCommand.php
-%attr(755,root,root) %{_appdir}/bin/process_mail_queue.php
-%attr(755,root,root) %{_appdir}/bin/truncate_mail_queue.php
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
/etc/cron.d/%{name}-mail-queue
 
 %files mail-download
 %defattr(644,root,root,755)
-%{_appdir}/src/Console/Command/MailDownloadCommand.php
-%attr(755,root,root) %{_appdir}/bin/download_emails.php
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
/etc/cron.d/%{name}-mail-download
 
 %files reminder
 %defattr(644,root,root,755)
-%{_appdir}/src/Console/Command/ReminderCheckCommand.php
-%attr(755,root,root) %{_appdir}/bin/check_reminders.php
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
/etc/cron.d/%{name}-reminder
 
 %files monitor
 %defattr(644,root,root,755)
-%{_appdir}/src/Console/Command/MonitorCommand.php
-%attr(755,root,root) %{_appdir}/bin/monitor.php
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
/etc/cron.d/%{name}-monitor
 
 %files router-postfix


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/7d2cac86bb2ca0758e4b9449559e1a81432be8da

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/dropbox] up to 85.4.155

2020-08-24 Thread glen

commit 08d27aedb100e9578e65e3b8be639eda451e04fc
Author: Elan Ruusamäe 
Date:   Fri Nov 22 11:23:12 2019 +0200

up to 85.4.155

 dropbox.spec | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/dropbox.spec b/dropbox.spec
index 6a3ff08..46fdb4c 100644
--- a/dropbox.spec
+++ b/dropbox.spec
@@ -10,15 +10,15 @@
 Summary:   Sync and backup files between computers
 Name:  dropbox
 # 
https://www.dropboxforum.com/hc/en-us/community/posts/206682016-New-Versioning-Scheme
-Version:   74.4.115
+Version:   85.4.155
 Release:   1
 License:   Proprietary
 Group: Daemons
 Source0:   
https://clientupdates.dropboxstatic.com/dbx-releng/client/%{name}-lnx.x86-%{version}.tar.gz
-# NoSource0-md5:   197b4caf00a2c05494f894b5ef578994
+# NoSource0-md5:   3b69411fc86c140331aa3866f201f48f
 NoSource:  0
 Source1:   
https://clientupdates.dropboxstatic.com/dbx-releng/client/%{name}-lnx.x86_64-%{version}.tar.gz
-# NoSource1-md5:   9766ca09c132a47a0763c840ecc3a5e7
+# NoSource1-md5:   83b0175cdaa5e93cb4ac879d7d919d6c
 NoSource:  1
 URL:   https://www.dropbox.com/
 BuildRequires: rpmbuild(macros) >= 1.566
@@ -127,7 +127,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/*-linux-gnu.so
 %attr(755,root,root) %{_libdir}/%{name}/dropbox
 %attr(755,root,root) %{_libdir}/%{name}/dropboxd
+%attr(755,root,root) %{_libdir}/%{name}/libdropbox_apex.so
+%attr(755,root,root) %{_libdir}/%{name}/libdropbox_nucleus.so
 %attr(755,root,root) %{_libdir}/%{name}/libdropbox_sqlite_ext.so
+%attr(755,root,root) %{_libdir}/%{name}/libdropbox_tprt.so
 %attr(755,root,root) %{_libdir}/%{name}/libicudata.so.*
 %attr(755,root,root) %{_libdir}/%{name}/libicui18n.so.*
 %attr(755,root,root) %{_libdir}/%{name}/libicuuc.so.*


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dropbox.git/commitdiff/08d27aedb100e9578e65e3b8be639eda451e04fc

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/dropbox] Up to 89.4.278

2020-08-24 Thread glen

commit f2abb7e58fd0b1f9064b8a8938be902599e96170
Author: Elan Ruusamäe 
Date:   Fri Aug 21 11:23:17 2020 +0300

Up to 89.4.278

 dropbox.spec | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/dropbox.spec b/dropbox.spec
index 46fdb4c..194ae99 100644
--- a/dropbox.spec
+++ b/dropbox.spec
@@ -10,15 +10,15 @@
 Summary:   Sync and backup files between computers
 Name:  dropbox
 # 
https://www.dropboxforum.com/hc/en-us/community/posts/206682016-New-Versioning-Scheme
-Version:   85.4.155
+Version:   89.4.278
 Release:   1
 License:   Proprietary
 Group: Daemons
 Source0:   
https://clientupdates.dropboxstatic.com/dbx-releng/client/%{name}-lnx.x86-%{version}.tar.gz
-# NoSource0-md5:   3b69411fc86c140331aa3866f201f48f
+# NoSource0-md5:   c8f19efec158b4aec27ac65aea4b2c95
 NoSource:  0
 Source1:   
https://clientupdates.dropboxstatic.com/dbx-releng/client/%{name}-lnx.x86_64-%{version}.tar.gz
-# NoSource1-md5:   83b0175cdaa5e93cb4ac879d7d919d6c
+# NoSource1-md5:   2c285c6c95f68b4082e1f60b1fe6
 NoSource:  1
 URL:   https://www.dropbox.com/
 BuildRequires: rpmbuild(macros) >= 1.566
@@ -37,7 +37,7 @@ BuildRoot:%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %defineicu_libslibicudata.so.42 libicui18n.so.42 
libicuuc.so.42
 
 # provided by package itself, but autodeps disabled
-%define_noautoreq  libwx_.*.so %{icu_libs} 
libffi.so.6 librsync.so.1
+%define_noautoreq  libwx_.*.so %{icu_libs} 
libffi.so.6 librsync.so.1 libdropbox_apex.so libdropbox_nucleus.so 
libdropbox_tprt.so
 
 # a zip and executable at the same time
 %define_noautostrip.*/library.zip\\|.*/dropbox
@@ -95,13 +95,13 @@ test -f librsync.so.1
 %if 1
 # fun, let's delete non-linux files from archive
 d=.delete-lib.txt
-unzip -l python-packages-37.zip | \
+unzip -l python-packages.zip | \
grep -E 
'(arch|dropbox)/(mac|win32)|_(win32|mac)\.py|pymac|ui/cocoa|unittest' | \
grep -vE 'pymac/(__init__|constants|types|lazydll|lazyframework)\.py' | 
\
grep -vE 'dropbox/mac/(version|__init__)\.py' | \
grep -vF 'dropbox/client/features/files/local/operations/_mac.py' | \
awk '{print $NF}' > $d
-zip python-packages-37.zip -d $(cat $d)
+zip python-packages.zip -d $(cat $d)
 %endif
 
 %install
@@ -127,6 +127,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/*-linux-gnu.so
 %attr(755,root,root) %{_libdir}/%{name}/dropbox
 %attr(755,root,root) %{_libdir}/%{name}/dropboxd
+%attr(755,root,root) %{_libdir}/%{name}/libatomic.so.1
 %attr(755,root,root) %{_libdir}/%{name}/libdropbox_apex.so
 %attr(755,root,root) %{_libdir}/%{name}/libdropbox_nucleus.so
 %attr(755,root,root) %{_libdir}/%{name}/libdropbox_sqlite_ext.so
@@ -135,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/libicui18n.so.*
 %attr(755,root,root) %{_libdir}/%{name}/libicuuc.so.*
 %attr(755,root,root) %{_libdir}/%{name}/librsync.so.1
-%{_libdir}/%{name}/python-packages-*.zip
+%{_libdir}/%{name}/python-packages.zip
 
 # need +x bits for .so files
 %defattr(-,root,root,-)


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dropbox.git/commitdiff/f2abb7e58fd0b1f9064b8a8938be902599e96170

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: eventum: eventum-3.9.4.tar.xz updown2.gif

2020-08-24 Thread glen

Request by: glen


Files fetched: 1

STORED: 
https://github.com/eventum/eventum/releases/download/v3.9.4/eventum-3.9.4.tar.xz
02c1fb442cb445c9003c992a7f2ea019  eventum-3.9.4.tar.xz
Size: 4466164 bytes
ALREADY GOT: http://www.isocra.com/images/updown2.gif
deb6eeb2552ba757d3a949ed10c4107d  updown2.gif


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/eventum] Up to 3.9.4

2020-08-24 Thread glen

commit 7d2cac86bb2ca0758e4b9449559e1a81432be8da
Author: Elan Ruusamäe 
Date:   Mon Aug 24 14:16:42 2020 +0300

Up to 3.9.4

 autoload.patch  |  8 
 eventum-paths.patch | 33 +
 eventum.spec|  4 ++--
 3 files changed, 15 insertions(+), 30 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 585c61e..218572c 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -9,12 +9,12 @@
 Summary:   Eventum Issue / Bug tracking system
 Summary(pl.UTF-8): Eventum - system śledzenia spraw/błędów
 Name:  eventum
-Version:   3.9.3
+Version:   3.9.4
 Release:   %{?subver:1.%{subver}.%{?githash:g%{githash}.}}%{rel}
 License:   GPL v2+
 Group: Applications/WWW
 Source0:   
https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 46ed9b3c3b6c07e3d5db5b01ed43684b
+# Source0-md5: 02c1fb442cb445c9003c992a7f2ea019
 #Source0:  
https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
 Source1:   %{name}-apache.conf
 Source2:   %{name}-mail-queue.cron
diff --git a/autoload.patch b/autoload.patch
index bade48a..8cc27a8 100644
--- a/autoload.patch
+++ b/autoload.patch
@@ -235,8 +235,8 @@
  'd12685060d57775f2bc3adf90c7d62bd' => $baseDir . 
'/lib/eventum/gettext.php',
 +'b2b3f01361f3aaeab67fde08ae76446f' => $phpDir. 
'/Smarty3/plugins/block.t.php',
  );
 eventum-3.8.5/vendor/composer/autoload_psr4.php~   2019-10-26 
04:19:31.788361290 +0300
-+++ eventum-3.8.5/vendor/composer/autoload_psr4.php2019-10-26 
04:53:23.625455791 +0300
+--- eventum-3.9.4/vendor/composer/autoload_psr4.php~   2020-08-24 
14:19:46.755998476 +0300
 eventum-3.9.4/vendor/composer/autoload_psr4.php2020-08-24 
14:20:11.918973775 +0300
 @@ -4,10 +4,10 @@
  
  $vendorDir = dirname(dirname(__FILE__));
@@ -257,14 +257,14 @@
  'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
  'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
  'Port\\Tests\\' => array($vendorDir . '/portphp/portphp/tests'),
-@@ -64,7 +64,6 @@
+@@ -65,7 +65,6 @@
  'Phlib\\Flysystem\\Pdo\\' => array($vendorDir . 
'/phlib/flysystem-pdo/src'),
  'Phinx\\' => array($vendorDir . '/robmorgan/phinx/src/Phinx'),
  'PackageVersions\\' => array($vendorDir . 
'/ocramius/package-versions/src/PackageVersions'),
 -'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
+ 'League\\MimeTypeDetection\\' => array($vendorDir . 
'/league/mime-type-detection/src'),
  'League\\HTMLToMarkdown\\' => array($vendorDir . 
'/league/html-to-markdown/src'),
  'League\\Flysystem\\' => array($vendorDir . '/league/flysystem/src'),
- 'League\\CommonMark\\Ext\\TaskList\\' => array($vendorDir . 
'/league/commonmark-ext-task-list/src'),
 @@ -45,7 +53,6 @@
  'League\\CommonMark\\' => array($vendorDir . '/league/commonmark/src'),
  'Invoker\\' => array($vendorDir . '/php-di/invoker/src'),
diff --git a/eventum-paths.patch b/eventum-paths.patch
index c940fa1..003fb6b 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -1,8 +1,11 @@
 eventum-3.7.4-440-gcc5ad3db5/src/Config/Paths.php  2019-08-21 
23:32:40.826463576 +0300
-+++ eventum-3.7.4-440-gcc5ad3db5/src/Config/Paths.php  2019-08-21 
23:38:04.548486455 +0300
-@@ -24,14 +24,13 @@
- // "/var" path for writable data
--public const APP_VAR_PATH = APP_PATH . '/var';
+--- eventum-3.9.4/src/Config/Paths.php~2020-08-10 16:32:37.0 
+0300
 eventum-3.9.4/src/Config/Paths.php 2020-08-24 14:18:12.547339038 +0300
+@@ -22,18 +22,16 @@
+ public const APP_PUBLIC_PATH = APP_PATH . '/htdocs';
+ public const APP_INC_PATH = APP_PATH . '/lib/eventum';
+ 
+-// "/var" path for writable data
+-private const APP_VAR_PATH = APP_PATH . '/var';
 -public const APP_CACHE_PATH = self::APP_VAR_PATH . '/cache';
 +public const APP_CACHE_PATH = '/var/cache/eventum';
  
@@ -11,6 +14,7 @@
  public const APP_TPL_COMPILE_PATH = self::APP_CACHE_PATH . '/smarty';
 -public const APP_LOG_PATH = self::APP_VAR_PATH . '/log';
 +public const APP_LOG_PATH = '/var/log/eventum';
+ /** @deprecated */
  public const APP_ERROR_LOG = self::APP_LOG_PATH . '/errors.log';
 -public const APP_LOCKS_PATH = self::APP_VAR_PATH . '/lock';
 +public const APP_LOCKS_PATH = '/var/run/eventum';
@@ -68,22 +72,3 @@
  
  /**
   * @var MountManager
 eventum-3.9.3/res/services.yml~2020-07-29 23:40:22.0 +0300
-+++ eventum-3.9.3/res/services.yml 2020-08-10 16:29:01.591109700 +0300
-@@ -15,13 +15,13 @@
-   # makes classes in src/ available to be used as services
-   # this creates a service per class whose id is the fully-qualified class 
name
-   Eventum\:
--resource: '../src/*'
--exclude: '../src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
-+resource: '/usr/share/eventum/src/*'
-+exclude:

[packages/eventum] Update path for smarty templates cleanup

2020-08-18 Thread glen

commit b452fa5d0f4d8530688a47ae84421a1be1edef03
Author: Elan Ruusamäe 
Date:   Tue Aug 18 13:51:51 2020 +0300

Update path for smarty templates cleanup

 eventum.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/eventum.spec b/eventum.spec
index 67cfdc7..2e4283e 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -398,7 +398,7 @@ test -s %{_webappdir}/setup.php && \
 sudo -H -u http -- %{_appdir}/bin/upgrade.php || :
 
 # nuke Smarty templates cache after upgrade
-rm -f /var/cache/eventum/*.php
+rm -f /var/cache/eventum/smarty/*.php
 
 # Restart webserver on upgrade to get .mo translations reloaded.
 # actually php engines "php-fcgi" and "php-fpm" needed only, apache is 
restarted anyway via webapp trigger.


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/1fa3398f88232af2e5a282837729d8b7f71fb13d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/eventum] Skip smarty cache removal on uninstall

2020-08-18 Thread glen

commit 1fa3398f88232af2e5a282837729d8b7f71fb13d
Author: Elan Ruusamäe 
Date:   Tue Aug 18 13:52:00 2020 +0300

Skip smarty cache removal on uninstall

There's more data to delete, seems weird to delete only smarty data

 eventum.spec | 6 --
 1 file changed, 6 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 2e4283e..3fe1637 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -404,12 +404,6 @@ rm -f /var/cache/eventum/smarty/*.php
 # actually php engines "php-fcgi" and "php-fpm" needed only, apache is 
restarted anyway via webapp trigger.
 %php_webserver_restart
 
-%preun
-if [ "$1" = "0" ]; then
-   # nuke cache
-   rm -f /var/cache/eventum/*.php 2>/dev/null || :
-fi
-
 %postun
 if [ "$1" = "0" ]; then
%userremove %{name}


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/1fa3398f88232af2e5a282837729d8b7f71fb13d

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/sphinx-pdg] Restore python3-devel-tools dependency

2020-08-18 Thread glen

commit 8470b33bd9616ee84e74ea75f8154c7f3845b4f1
Author: Elan Ruusamäe 
Date:   Tue Aug 18 10:38:50 2020 +0300

Restore python3-devel-tools dependency

pdb module is required oin certain use cases, and the application dies
off with not much useful exception what to do next.

If someone wants to make it back optional, make exception message useful
(install foo bar package to use foo and baz feature)

refs:
- 
http://lists.pld-linux.org/mailman/pipermail/pld-devel-en/2020-August/025945.html
- 19a390668dbedff5b42e37f8df75a0f2244d9057

 sphinx-pdg.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/sphinx-pdg.spec b/sphinx-pdg.spec
index e9ce615..0cb86ae 100644
--- a/sphinx-pdg.spec
+++ b/sphinx-pdg.spec
@@ -11,7 +11,7 @@ Summary:  Sphinx - Python documentation generator
 Summary(pl.UTF-8): Sphinx - narzędzie do tworzenia dokumentacji dla Pythona
 Name:  sphinx-pdg
 Version:   2.4.4
-Release:   1
+Release:   2
 License:   BSD
 Group: Development/Languages/Python
 #Source0Download: https://pypi.org/simple/Sphinx/
@@ -121,6 +121,7 @@ Summary:Sphinx Python documentation generator (Python 
3.x modules)
 Summary(pl.UTF-8): Sphinx - narzędzie do tworzenia dokumentacji dla 
Pythona (moduły Pythona 3.x)
 Group: Development/Languages/Python
 Requires:  python3-modules >= 1:3.5
+Requires:  python3-devel-tools
 Conflicts: sphinx-pdg-3 < 1.0.7-2
 
 %description -n python3-Sphinx


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sphinx-pdg.git/commitdiff/660f45afb76f175cba218110ff963e0c64a6887c

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/sphinx-pdg] too many subpackages here, add todo for merge

2020-08-18 Thread glen

commit 660f45afb76f175cba218110ff963e0c64a6887c
Author: Elan Ruusamäe 
Date:   Tue Aug 18 10:42:37 2020 +0300

too many subpackages here, add todo for merge

 sphinx-pdg.spec | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/sphinx-pdg.spec b/sphinx-pdg.spec
index 0cb86ae..bd9def8 100644
--- a/sphinx-pdg.spec
+++ b/sphinx-pdg.spec
@@ -2,6 +2,9 @@
 # therefore the name for this package is sphinx-pdg (pdg - python
 # documentation generator)
 # NOTE: for last python2 version see python-Sphinx.spec
+
+# TODO
+# - drop "sphinx-pdg-3": merge into sphinx-pdg, as only python3 is supported.
 #
 # Conditional build:
 %bcond_without doc # documentation


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/sphinx-pdg.git/commitdiff/660f45afb76f175cba218110ff963e0c64a6887c

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: eventum: eventum-3.9.3.tar.xz updown2.gif

2020-08-10 Thread glen

Request by: glen


Files fetched: 1

STORED: 
https://github.com/eventum/eventum/releases/download/v3.9.3/eventum-3.9.3.tar.xz
46ed9b3c3b6c07e3d5db5b01ed43684b  eventum-3.9.3.tar.xz
Size: 4476968 bytes
ALREADY GOT: http://www.isocra.com/images/updown2.gif
deb6eeb2552ba757d3a949ed10c4107d  updown2.gif


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/eventum] Up to 3.9.3

2020-08-10 Thread glen

commit cbcc369ebf3f08c3a2a279ae6e82ed001eb21098
Author: Elan Ruusamäe 
Date:   Mon Aug 10 16:28:06 2020 +0300

Up to 3.9.3

 eventum-paths.patch | 32 
 eventum.spec|  5 ++---
 2 files changed, 18 insertions(+), 19 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index a925b8d..67cfdc7 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -9,12 +9,12 @@
 Summary:   Eventum Issue / Bug tracking system
 Summary(pl.UTF-8): Eventum - system śledzenia spraw/błędów
 Name:  eventum
-Version:   3.9.2
+Version:   3.9.3
 Release:   %{?subver:1.%{subver}.%{?githash:g%{githash}.}}%{rel}
 License:   GPL v2+
 Group: Applications/WWW
 Source0:   
https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: d2d2f7826c9cf7aed600f3de57ba143a
+# Source0-md5: 46ed9b3c3b6c07e3d5db5b01ed43684b
 #Source0:  
https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
 Source1:   %{name}-apache.conf
 Source2:   %{name}-mail-queue.cron
@@ -477,7 +477,6 @@ fi
 %attr(755,root,root) %{_appdir}/bin/upgrade.php
 
 %{_appdir}/autoload.php
-%{_appdir}/globals.php
 %{_appdir}/init.php
 %{_appdir}/phinx.php
 %dir %{_appdir}/htdocs
diff --git a/eventum-paths.patch b/eventum-paths.patch
index 0a4ce5a..c940fa1 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -68,22 +68,22 @@
  
  /**
   * @var MountManager
 eventum/res/services.yml~  2019-08-02 01:33:18.681001511 +0300
-+++ eventum/res/services.yml   2019-08-02 01:33:20.290978222 +0300
+--- eventum-3.9.3/res/services.yml~2020-07-29 23:40:22.0 +0300
 eventum-3.9.3/res/services.yml 2020-08-10 16:29:01.591109700 +0300
 @@ -15,13 +15,13 @@
- # makes classes in src/ available to be used as services
- # this creates a service per class whose id is the fully-qualified class 
name
- Eventum\:
--resource: '../src/*'
--exclude: 
'../src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
-+resource: '/usr/share/eventum/src/*'
-+exclude: 
'/usr/share/eventum/src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
+   # makes classes in src/ available to be used as services
+   # this creates a service per class whose id is the fully-qualified class 
name
+   Eventum\:
+-resource: '../src/*'
+-exclude: '../src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
++resource: '/usr/share/eventum/src/*'
++exclude: 
'/usr/share/eventum/src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
  
- # controllers are imported separately to make sure services can be 
injected
- # as action arguments even if you don't extend any base controller class
- Eventum\Controller\:
--resource: '../src/Controller'
-+resource: '/usr/share/eventum/src/Controller'
- tags: ['controller.service_arguments']
+   # controllers are imported separately to make sure services can be injected
+   # as action arguments even if you don't extend any base controller class
+   Eventum\Controller\:
+-resource: '../src/Controller'
++resource: '/usr/share/eventum/src/Controller'
+ tags: ['controller.service_arguments']
  
- # add more service definitions when explicit configuration is needed
+   # add more service definitions when explicit configuration is needed


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/cbcc369ebf3f08c3a2a279ae6e82ed001eb21098

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: php-pecl-mongodb: mongodb-1.7.4.tgz

2020-08-03 Thread glen

Request by: glen


Files fetched: 1

STORED: https://pecl.php.net/get/mongodb-1.7.4.tgz
e48806cdcf1a04e08ec0cd3f2bf05ae0  mongodb-1.7.4.tgz
Size: 1223416 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pecl-mongodb] Update to 1.7.4. Last version with PHP 5.6 support

2020-08-03 Thread glen

commit 8808cfb4f39a9b851099f060b532a0f79de46090
Author: Elan Ruusamäe 
Date:   Mon Aug 3 09:59:32 2020 +0300

Update to 1.7.4. Last version with PHP 5.6 support

 php-pecl-mongodb.spec | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/php-pecl-mongodb.spec b/php-pecl-mongodb.spec
index df4b845..10daba9 100644
--- a/php-pecl-mongodb.spec
+++ b/php-pecl-mongodb.spec
@@ -13,12 +13,12 @@
 %definemodname mongodb
 Summary:   MongoDB driver for PHP
 Name:  %{php_name}-pecl-%{modname}
-Version:   1.6.1
+Version:   1.7.4
 Release:   1
 License:   Apache v2.0
 Group: Development/Languages/PHP
 Source0:   https://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: 123e48da2f674de6d567b0bebbe049ac
+# Source0-md5: e48806cdcf1a04e08ec0cd3f2bf05ae0
 Source1:   mongodb.ini
 URL:   https://pecl.php.net/package/mongodb
 BuildRequires: %{php_name}-cli
@@ -28,13 +28,15 @@ BuildRequires:  %{php_name}-pcre
 BuildRequires: %{php_name}-spl
 %{?with_sasl:BuildRequires:cyrus-sasl-devel}
 %if %{without bundled}
-BuildRequires: libbson-devel >= 1.15.2
-BuildRequires: mongo-c-driver-devel >= 1.15.2
+BuildRequires: libbson-devel >= 1.16.2
+BuildRequires: mongo-c-driver-devel >= 1.16.2
 %endif
 BuildRequires: openssl-devel
 BuildRequires: rpmbuild(macros) >= 1.666
 Requires:  %{php_name}-json
+%if %{without bundled}
 Requires:  mongo-c-driver-libs >= 1.15.2
+%endif
 Requires:  %{php_name}-pcre
 Requires:  %{php_name}-spl
 %{?requires_php_extension}
@@ -95,8 +97,7 @@ fi
 phpize
 
 %configure \
-   --with-libbson=%{?with_bundled:no}%{!?with_bundled:yes} \
-   --with-libmongoc=%{?with_bundled:no}%{!?with_bundled:yes} \
+   --with-mongodb-system-libs=%{?with_bundled:no}%{!?with_bundled:yes} \
--with-mongodb-ssl=%{!?with_ssl:no}%{?with_ssl:openssl} \
--with-mongodb-sasl=%{!?with_sasl:no}%{?with_sasl:yes} \
--enable-mongodb


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-mongodb.git/commitdiff/8808cfb4f39a9b851099f060b532a0f79de46090

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/libmongocrypt] BR pkgconfig

2020-08-03 Thread glen

commit b1f7d1982ff262c2ed4d4d443e7bdd5c5bb3481a
Author: Elan Ruusamäe 
Date:   Mon Aug 3 21:45:27 2020 +0300

BR pkgconfig

AUTO: -- which: no pkg-config in 
(/bin:/usr/bin:/usr/sbin:/sbin:/usr/X11R6/bin)

 libmongocrypt.spec | 1 +
 1 file changed, 1 insertion(+)
---
diff --git a/libmongocrypt.spec b/libmongocrypt.spec
index 86ed093..5382c48 100644
--- a/libmongocrypt.spec
+++ b/libmongocrypt.spec
@@ -19,6 +19,7 @@ BuildRequires:cmake >= 3.5
 BuildRequires: libbson-devel >= 1.11
 BuildRequires: libstdc++-devel
 BuildRequires: openssl-devel
+BuildRequires: pkgconfig
 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmongocrypt.git/commitdiff/b1f7d1982ff262c2ed4d4d443e7bdd5c5bb3481a

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/libmongocrypt] New package, libmongocrypt-1.0.4

2020-08-03 Thread glen

commit 31d4ceef1579e2ce2418220d7dc715863a45
Author: Elan Ruusamäe 
Date:   Mon Aug 3 13:10:32 2020 +0300

New package, libmongocrypt-1.0.4

Based on Fedora package, ad3befa

 README.md  |  3 ++
 libmongocrypt.spec | 89 ++
 2 files changed, 92 insertions(+)
---
diff --git a/libmongocrypt.spec b/libmongocrypt.spec
new file mode 100644
index 000..86ed093
--- /dev/null
+++ b/libmongocrypt.spec
@@ -0,0 +1,89 @@
+#
+# Conditional build:
+%bcond_without apidocs # do not build and package API docs
+
+Summary:   The companion C library for client side encryption in drivers
+Name:  libmongocrypt
+Version:   1.0.4
+Release:   1
+# see kms-message/THIRD_PARTY_NOTICES
+# kms-message/src/kms_b64.c is ISC
+# everything else is ASL 2.0
+License:   ASL 2.0 and ISC
+Group: Libraries
+Source0:   
https://github.com/mongodb/libmongocrypt/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: e8939c3ed5c8b797dd8d4ea1290f7652
+URL:   https://github.com/mongodb/libmongocrypt
+BuildRequires: cmake >= 3.5
+%{?with_apidocs:BuildRequires: doxygen}
+BuildRequires: libbson-devel >= 1.11
+BuildRequires: libstdc++-devel
+BuildRequires: openssl-devel
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+The companion C library for client side encryption in drivers.
+
+%package devel
+Summary:   Header files and development libraries for %{name}
+Group: Development/Libraries
+Requires:  %{name} = %{version}-%{release}
+
+%description devel
+This package contains the header files and development libraries for
+%{name}.
+
+%prep
+%setup -q
+echo "%{version}" > VERSION_CURRENT
+
+%build
+%cmake \
+   -DCMAKE_C_FLAGS="%{optflags} -fPIC" \
+   -DENABLE_SHARED_BSON:BOOL=ON \
+   -DENABLE_STATIC:BOOL=OFF \
+   .
+
+%{__make}
+
+%if %{with tests}
+%{__make} test
+%endif
+
+%if %{with apidocs}
+doxygen doc/Doxygen
+%endif
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%{__make} install \
+   DESTDIR=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post  -p /sbin/ldconfig
+%postun-p /sbin/ldconfig
+
+%files
+%defattr(644,root,root,755)
+%doc LICENSE
+%ghost %{_libdir}/libmongocrypt.so.0
+%attr(755,root,root) %{_libdir}/libmongocrypt.so.*.*.*
+%ghost %{_libdir}/libkms_message.so.0
+%attr(755,root,root) %{_libdir}/libkms_message.so.*.*.*
+
+%files devel
+%defattr(644,root,root,755)
+%doc *.md
+%if %{with apidocs}
+%doc doc/html
+%endif
+%{_libdir}/libkms_message.so
+%{_libdir}/libmongocrypt.so
+%{_includedir}/kms_message
+%{_includedir}/mongocrypt
+%{_libdir}/cmake/kms_message
+%{_libdir}/cmake/mongocrypt
+%{_pkgconfigdir}/libkms_message.pc
+%{_pkgconfigdir}/libmongocrypt.pc
diff --git a/README.md b/README.md
new file mode 100644
index 000..0c864a6
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# libmongocrypt
+
+The libmongocrypt package


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libmongocrypt.git/commitdiff/31d4ceef1579e2ce2418220d7dc715863a45

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/libmongocrypt] Created branch master

2020-08-03 Thread glen

The branch 'master' was created.

Summary of new commits:

  31d4ce3... New package, libmongocrypt-1.0.4
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: libmongocrypt: libmongocrypt-1.0.4.tar.gz

2020-08-03 Thread glen

Request by: glen


Files fetched: 1

STORED: 
https://github.com/mongodb/libmongocrypt/archive/1.0.4/libmongocrypt-1.0.4.tar.gz
e8939c3ed5c8b797dd8d4ea1290f7652  libmongocrypt-1.0.4.tar.gz
Size: 449085 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: php-pecl-mongodb: mongodb-1.6.1.tgz

2020-08-03 Thread glen

Request by: glen


Files fetched: 1

STORED: https://pecl.php.net/get/mongodb-1.6.1.tgz
123e48da2f674de6d567b0bebbe049ac  mongodb-1.6.1.tgz
Size: 1094379 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pecl-mongodb] Up to 1.6.1, requires php 5.6

2020-08-03 Thread glen

commit 5b8b96e829645b3c4ba4d009586aad76a68f07fd
Author: Elan Ruusamäe 
Date:   Mon Aug 3 10:01:32 2020 +0300

Up to 1.6.1, requires php 5.6

 php-pecl-mongodb.spec | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/php-pecl-mongodb.spec b/php-pecl-mongodb.spec
index 30d6758..df4b845 100644
--- a/php-pecl-mongodb.spec
+++ b/php-pecl-mongodb.spec
@@ -13,28 +13,28 @@
 %definemodname mongodb
 Summary:   MongoDB driver for PHP
 Name:  %{php_name}-pecl-%{modname}
-Version:   1.5.5
+Version:   1.6.1
 Release:   1
 License:   Apache v2.0
 Group: Development/Languages/PHP
 Source0:   https://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: 0839657e7fb4f5ea8113ef140835674a
+# Source0-md5: 123e48da2f674de6d567b0bebbe049ac
 Source1:   mongodb.ini
 URL:   https://pecl.php.net/package/mongodb
 BuildRequires: %{php_name}-cli
-BuildRequires: %{php_name}-devel >= 4:5.5.0
+BuildRequires: %{php_name}-devel >= 4:5.6.0
 BuildRequires: %{php_name}-json
 BuildRequires: %{php_name}-pcre
 BuildRequires: %{php_name}-spl
 %{?with_sasl:BuildRequires:cyrus-sasl-devel}
 %if %{without bundled}
-BuildRequires: libbson-devel >= 1.11.0
-BuildRequires: mongo-c-driver-devel >= 1.9
+BuildRequires: libbson-devel >= 1.15.2
+BuildRequires: mongo-c-driver-devel >= 1.15.2
 %endif
 BuildRequires: openssl-devel
 BuildRequires: rpmbuild(macros) >= 1.666
 Requires:  %{php_name}-json
-Requires:  mongo-c-driver-libs >= 1.9.3-2
+Requires:  mongo-c-driver-libs >= 1.15.2
 Requires:  %{php_name}-pcre
 Requires:  %{php_name}-spl
 %{?requires_php_extension}


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-mongodb.git/commitdiff/5b8b96e829645b3c4ba4d009586aad76a68f07fd

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: mongo-c-driver: mongo-c-driver-1.17.0.tar.gz

2020-08-03 Thread glen

Request by: glen


Files fetched: 1

STORED: 
https://github.com/mongodb/mongo-c-driver/releases/download/1.17.0/mongo-c-driver-1.17.0.tar.gz
2201cea8f31c6e7a4215e736dd74627a  mongo-c-driver-1.17.0.tar.gz
Size: 7092911 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/mongo-c-driver] Up to 1.17.0

2020-08-03 Thread glen

commit 0de592e46c4f29a948732e4c9a9fd9d43cc447a1
Author: Elan Ruusamäe 
Date:   Mon Aug 3 08:51:41 2020 +0300

Up to 1.17.0

This release adds support for MongoDB 4.4 servers.

 mongo-c-driver-sphinx.patch | 21 -
 mongo-c-driver.spec | 13 ++---
 2 files changed, 6 insertions(+), 28 deletions(-)
---
diff --git a/mongo-c-driver.spec b/mongo-c-driver.spec
index 392da6f..e52d737 100644
--- a/mongo-c-driver.spec
+++ b/mongo-c-driver.spec
@@ -13,14 +13,13 @@
 Summary:   Client library written in C for MongoDB
 Summary(pl.UTF-8): Biblioteka kliencka do MongoDB napisana w C
 Name:  mongo-c-driver
-Version:   1.16.2
-Release:   2
+Version:   1.17.0
+Release:   1
 License:   Apache v2.0
 Group: Libraries
 #Source0Download: https://github.com/mongodb/mongo-c-driver/releases/
 Source0:   
https://github.com/mongodb/mongo-c-driver/releases/download/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 6561011b25d0e690d0759247bcd390e4
-Patch0:%{name}-sphinx.patch
+# Source0-md5: 2201cea8f31c6e7a4215e736dd74627a
 URL:   https://github.com/mongodb/mongo-c-driver
 BuildRequires: cmake >= 3.1
 %{?with_sasl:BuildRequires:cyrus-sasl-devel}
@@ -130,12 +129,11 @@ Dokumentacja API biblioteki libbson.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 install -d cmake-build
 cd cmake-build
-%cmake .. \
+%cmake \
-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF \
-DENABLE_BSON=ON \
-DENABLE_EXAMPLES=ON \
@@ -146,7 +144,8 @@ cd cmake-build
-DENABLE_SSL=%{!?with_ssl:OFF}%{?with_ssl:OPENSSL 
-DENABLE_CRYPTO_SYSTEM_PROFILE=ON} \
-DENABLE_STATIC=OFF \
-DENABLE_TESTS=%{!?with_tests:OFF}%{?with_tests:ON} \
-   -DENABLE_ZLIB=SYSTEM
+   -DENABLE_ZLIB=SYSTEM \
+   ..
 
 %{__make} -j1
 
diff --git a/mongo-c-driver-sphinx.patch b/mongo-c-driver-sphinx.patch
deleted file mode 100644
index c2f664b..000
--- a/mongo-c-driver-sphinx.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Some extensions don't like parallel sphinx-build
 mongo-c-driver-1.16.2/build/cmake/SphinxBuild.cmake.orig   2020-02-25 
06:38:41.0 +0100
-+++ mongo-c-driver-1.16.2/build/cmake/SphinxBuild.cmake2020-05-03 
16:05:03.406177913 +0200
-@@ -40,7 +40,7 @@
-   ${CMAKE_COMMAND} -E env
-   "PYTHONDONTWRITEBYTECODE=1"
-   ${SPHINX_EXECUTABLE}
-- -j ${NPROCS} -qEW -b html
-+ -qEW -b html
-  -c "${CMAKE_CURRENT_SOURCE_DIR}"
-  "${CMAKE_CURRENT_SOURCE_DIR}"
-  "${SPHINX_HTML_DIR}"
-@@ -133,7 +133,7 @@
-   ${CMAKE_COMMAND} -E env
-   "PYTHONDONTWRITEBYTECODE=1"
-   ${SPHINX_EXECUTABLE}
-- -j ${NPROCS} -qEW -b man
-+ -qEW -b man
-  -c "${CMAKE_CURRENT_SOURCE_DIR}"
-  "${CMAKE_CURRENT_SOURCE_DIR}"
-  "${SPHINX_MAN_DIR}"


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mongo-c-driver.git/commitdiff/0de592e46c4f29a948732e4c9a9fd9d43cc447a1

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: git-filter-repo: git-filter-repo-2.28.0.tar.xz

2020-07-27 Thread glen

Request by: glen


Files fetched: 1

STORED: 
https://github.com/newren/git-filter-repo/releases/download/v2.28.0/git-filter-repo-2.28.0.tar.xz
18c97f053a2dfa4aee62e52bf51b7447  git-filter-repo-2.28.0.tar.xz
Size: 144852 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/git-filter-repo] Up to 2.28.0

2020-07-27 Thread glen

commit 68f60b60ff7f9dc31b8f5a6616a5e8e945e97c25
Author: Elan Ruusamäe 
Date:   Mon Jul 27 21:38:41 2020 +0300

Up to 2.28.0

 git-filter-repo.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/git-filter-repo.spec b/git-filter-repo.spec
index 2e79a2b..1fc3305 100644
--- a/git-filter-repo.spec
+++ b/git-filter-repo.spec
@@ -1,12 +1,12 @@
 Summary:   Distributed version control system focused on speed, 
effectivity and usability
 Summary(pl.UTF-8): Rozproszony system śledzenia treści skupiony na 
szybkości, wydajności i użyteczności
 Name:  git-filter-repo
-Version:   2.27.1
+Version:   2.28.0
 Release:   1
 License:   GPL v2
 Group: Development/Tools
 Source0:   
https://github.com/newren/git-filter-repo/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: d9342bec37c5e0e74f8c2e21f6e9c730
+# Source0-md5: 18c97f053a2dfa4aee62e52bf51b7447
 URL:   https://github.com/newren/git-filter-repo
 Requires:  git-core >= 2.24.0
 Requires:  python3 >= 1:3.5


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/git-filter-repo.git/commitdiff/68f60b60ff7f9dc31b8f5a6616a5e8e945e97c25

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: eventum: eventum-3.9.2.tar.xz updown2.gif

2020-07-27 Thread glen

Request by: glen


Files fetched: 1

STORED: 
https://github.com/eventum/eventum/releases/download/v3.9.2/eventum-3.9.2.tar.xz
d2d2f7826c9cf7aed600f3de57ba143a  eventum-3.9.2.tar.xz
Size: 4482228 bytes
ALREADY GOT: http://www.isocra.com/images/updown2.gif
deb6eeb2552ba757d3a949ed10c4107d  updown2.gif


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/eventum] Up to 3.9.2

2020-07-27 Thread glen

commit 2eafdc0d735da77842f3a0ea1cf2b7d06c18a021
Author: Elan Ruusamäe 
Date:   Mon Jul 27 00:13:48 2020 +0300

Up to 3.9.2

 eventum.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 7d14b4c..a925b8d 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -9,12 +9,12 @@
 Summary:   Eventum Issue / Bug tracking system
 Summary(pl.UTF-8): Eventum - system śledzenia spraw/błędów
 Name:  eventum
-Version:   3.9.1
+Version:   3.9.2
 Release:   %{?subver:1.%{subver}.%{?githash:g%{githash}.}}%{rel}
 License:   GPL v2+
 Group: Applications/WWW
 Source0:   
https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 82bb91a669ffc3ce339fb8fb9c50ac3a
+# Source0-md5: d2d2f7826c9cf7aed600f3de57ba143a
 #Source0:  
https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
 Source1:   %{name}-apache.conf
 Source2:   %{name}-mail-queue.cron


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/2eafdc0d735da77842f3a0ea1cf2b7d06c18a021

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pear-PEAR] pecl: load all extensions

2020-07-16 Thread glen

commit fc22c66479cc1dcc08ed81ce5357cbb7513b151c
Author: Elan Ruusamäe 
Date:   Thu Jul 16 10:53:57 2020 +0300

pecl: load all extensions

 php-pear-PEAR.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index cb694ba..7ab0f10 100644
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -152,7 +152,7 @@ cat > $RPM_BUILD_ROOT%{_bindir}/peardev <<'EOF'
 EOF
 cat > $RPM_BUILD_ROOT%{_bindir}/pecl <<'EOF'
 #!/bin/sh
-%php_exec -dmemory_limit=64M -dsafe_mode=0 -dextension=xml.so 
%{php_pear_dir}/peclcmd.php "$@"
+%php_exec -dmemory_limit=64M -dsafe_mode=0 %{php_pear_dir}/peclcmd.php "$@"
 EOF
 # for rpm to find interpreter
 chmod +x $RPM_BUILD_ROOT%{_bindir}/*


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pear-PEAR.git/commitdiff/caafccd71150550cae9ccbfac98235994ec7351f

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pear-PEAR] Cleanup stale comment about pcre

2020-07-16 Thread glen

commit 0099f6eb7831577b890ff4b9d3cb29ae3f333486
Author: Elan Ruusamäe 
Date:   Thu Jul 16 10:53:18 2020 +0300

Cleanup stale comment about pcre

Outdated after db84a628 commit

 php-pear-PEAR.spec | 1 -
 1 file changed, 1 deletion(-)
---
diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index 8069db2..cb694ba 100644
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -150,7 +150,6 @@ cat > $RPM_BUILD_ROOT%{_bindir}/peardev <<'EOF'
 #!/bin/sh
 %php_exec -dopen_basedir="" -dmemory_limit=-1 %{php_pear_dir}/pearcmd.php "$@"
 EOF
-# This -dextension=pcre.so works with php-5.1, and patched php-cli >= 
4:5.0.5-18.1, php4-cli >= 3:4.4.1-6.1
 cat > $RPM_BUILD_ROOT%{_bindir}/pecl <<'EOF'
 #!/bin/sh
 %php_exec -dmemory_limit=64M -dsafe_mode=0 -dextension=xml.so 
%{php_pear_dir}/peclcmd.php "$@"


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pear-PEAR.git/commitdiff/caafccd71150550cae9ccbfac98235994ec7351f

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pear-PEAR] Release 2

2020-07-16 Thread glen

commit caafccd71150550cae9ccbfac98235994ec7351f
Author: Elan Ruusamäe 
Date:   Thu Jul 16 10:55:25 2020 +0300

Release 2

 php-pear-PEAR.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index 7ab0f10..1734629 100644
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -12,7 +12,7 @@ Summary:  PEAR Base System
 Summary(pl.UTF-8): Podstawowy system PEAR
 Name:  php-pear-%{_pearname}
 Version:   1.10.9
-Release:   1
+Release:   2
 Epoch: 1
 License:   New BSD License
 Group: Development/Languages/PHP


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pear-PEAR.git/commitdiff/caafccd71150550cae9ccbfac98235994ec7351f

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pear-PEAR] pecl: remove -n flag

2020-07-16 Thread glen

commit 91dc6544381e9cd494008640a369cf7c888e8152
Author: Elan Ruusamäe 
Date:   Thu Jul 16 10:52:18 2020 +0300

pecl: remove -n flag

on POSIX no such locking problems appear

 php-pear-PEAR.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/php-pear-PEAR.spec b/php-pear-PEAR.spec
index f6ef416..8069db2 100644
--- a/php-pear-PEAR.spec
+++ b/php-pear-PEAR.spec
@@ -151,10 +151,9 @@ cat > $RPM_BUILD_ROOT%{_bindir}/peardev <<'EOF'
 %php_exec -dopen_basedir="" -dmemory_limit=-1 %{php_pear_dir}/pearcmd.php "$@"
 EOF
 # This -dextension=pcre.so works with php-5.1, and patched php-cli >= 
4:5.0.5-18.1, php4-cli >= 3:4.4.1-6.1
-# -n is there because devs on #pear said this avoids locking problems when 
replacing in use libraries.
 cat > $RPM_BUILD_ROOT%{_bindir}/pecl <<'EOF'
 #!/bin/sh
-%php_exec -dmemory_limit=64M -dsafe_mode=0 -n -dextension=xml.so 
%{php_pear_dir}/peclcmd.php "$@"
+%php_exec -dmemory_limit=64M -dsafe_mode=0 -dextension=xml.so 
%{php_pear_dir}/peclcmd.php "$@"
 EOF
 # for rpm to find interpreter
 chmod +x $RPM_BUILD_ROOT%{_bindir}/*


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pear-PEAR.git/commitdiff/caafccd71150550cae9ccbfac98235994ec7351f

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/msgpack] Without tests for now

2020-07-15 Thread glen

commit 32c4634bb67f2af606823dc957b4db94d9f72681
Author: Elan Ruusamäe 
Date:   Wed Jul 15 21:42:38 2020 +0300

Without tests for now

 msgpack.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/msgpack.spec b/msgpack.spec
index 9af3219..5617c78 100644
--- a/msgpack.spec
+++ b/msgpack.spec
@@ -2,7 +2,7 @@
 # - should c and c++ have separate -devel packages?
 
 # Conditional build:
-%bcond_without tests   # build without tests
+%bcond_withtests   # build without tests
 
 Summary:   Binary-based efficient object serialization library
 Name:  msgpack


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/msgpack.git/commitdiff/32c4634bb67f2af606823dc957b4db94d9f72681

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pecl-igbinary] Up to 3.1.2

2020-07-15 Thread glen

commit 02866f1fe83f9a054f000b98c382cf3fb66f3e8b
Author: Elan Ruusamäe 
Date:   Wed Jul 15 19:10:21 2020 +0300

Up to 3.1.2

 php-pecl-igbinary.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/php-pecl-igbinary.spec b/php-pecl-igbinary.spec
index fb9cbc6..0cc64fe 100644
--- a/php-pecl-igbinary.spec
+++ b/php-pecl-igbinary.spec
@@ -6,12 +6,12 @@
 %definemodname igbinary
 Summary:   Replacement for the standard PHP serializer
 Name:  %{php_name}-pecl-%{modname}
-Version:   3.0.1
+Version:   3.1.2
 Release:   1
 License:   BSD
 Group: Development/Languages/PHP
 Source0:   https://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: fb3b2f7fa306ca582afd9f382c409a24
+# Source0-md5: 34280e1609ef8e23f67fe3e690405787
 Source2:   %{modname}.ini
 URL:   https://pecl.php.net/package/igbinary
 %{?with_tests:BuildRequires:   %{php_name}-cli}


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-igbinary.git/commitdiff/02866f1fe83f9a054f000b98c382cf3fb66f3e8b

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: php-pecl-igbinary: igbinary-3.1.2.tgz

2020-07-15 Thread glen

Request by: glen


Files fetched: 1

STORED: https://pecl.php.net/get/igbinary-3.1.2.tgz
34280e1609ef8e23f67fe3e690405787  igbinary-3.1.2.tgz
Size: 71862 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: php-pecl-msgpack: msgpack-2.1.0.tgz

2020-07-15 Thread glen

Request by: glen


Files fetched: 1

STORED: https://pecl.php.net/get/msgpack-2.1.0.tgz
901960fda542dec313ab4d89bd63d06d  msgpack-2.1.0.tgz
Size: 62201 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pecl-msgpack] Up to 2.1.0

2020-07-15 Thread glen

commit 4387247c395753dba64964a66700eb656c01c7da
Author: Elan Ruusamäe 
Date:   Wed Jul 15 18:57:27 2020 +0300

Up to 2.1.0

 php-pecl-msgpack.spec | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec
index 54182cb..b142eda 100644
--- a/php-pecl-msgpack.spec
+++ b/php-pecl-msgpack.spec
@@ -1,3 +1,5 @@
+# TODO
+#  - bundles msgpack headers to 3.2.0
 #
 # Conditional build:
 %bcond_without tests   # build without tests
@@ -7,13 +9,13 @@
 Summary:   PHP extension for interfacing with MessagePack
 Name:  %{php_name}-pecl-%{modname}
 # For PHP < 7, see 0.5.x branch
-Version:   2.0.2
+Version:   2.1.0
 Release:   1
 License:   PHP 3.01
 Group: Development/Languages/PHP
-Source0:   http://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: 02f7e109d438072c4b642b01cf78533e
-URL:   http://pecl.php.net/package/msgpack/
+Source0:   https://pecl.php.net/get/%{modname}-%{version}.tgz
+# Source0-md5: 901960fda542dec313ab4d89bd63d06d
+URL:   https://pecl.php.net/package/msgpack/
 BuildRequires: %{php_name}-devel >= 4:7.0.0
 BuildRequires: rpmbuild(macros) >= 1.666
 %if %{with tests}


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-msgpack.git/commitdiff/4387247c395753dba64964a66700eb656c01c7da

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: msgpack: msgpack-3.3.0.tar.gz

2020-07-15 Thread glen

Request by: glen


Files fetched: 1

STORED: 
https://github.com/msgpack/msgpack-c/releases/download/cpp-3.3.0/msgpack-3.3.0.tar.gz
e676575d52caae974e579c3d5f0ba6a2  msgpack-3.3.0.tar.gz
Size: 508001 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/msgpack] Up to 3.3.0

2020-07-15 Thread glen

commit 86173d883ad8da89555d9097f7d9b0b45cd86c0a
Author: Elan Ruusamäe 
Date:   Wed Jul 15 18:59:32 2020 +0300

Up to 3.3.0

 msgpack.spec | 27 +++
 1 file changed, 11 insertions(+), 16 deletions(-)
---
diff --git a/msgpack.spec b/msgpack.spec
index 8a6bd4b..9af3219 100644
--- a/msgpack.spec
+++ b/msgpack.spec
@@ -6,16 +6,14 @@
 
 Summary:   Binary-based efficient object serialization library
 Name:  msgpack
-Version:   1.4.1
+Version:   3.3.0
 Release:   1
 License:   Boost
 Group: Libraries
 Source0:   
https://github.com/msgpack/msgpack-c/releases/download/cpp-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: fde8da1388d4f8daf21faee5536a53cf
-URL:   http://msgpack.org/
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+# Source0-md5: e676575d52caae974e579c3d5f0ba6a2
+URL:   https://msgpack.org/
+BuildRequires: cmake >= 2.8.0
 BuildRequires: pkgconfig
 %if %{with tests}
 BuildRequires: gtest-devel
@@ -40,13 +38,11 @@ Libraries and header files for %{name}
 %setup -q
 
 %build
-%{__aclocal}
-%{__libtoolize}
-%{__autoconf}
-%{__autoheader}
-%{__automake} --force-missing
-%configure \
-   --disable-static
+install -d build
+cd build
+%cmake \
+   -DMSGPACK_CXX11=ON \
+   ..
 %{__make}
 
 %if %{with tests}
@@ -55,11 +51,9 @@ Libraries and header files for %{name}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmsgpackc.la
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -79,3 +73,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/msgpack
 %{_libdir}/libmsgpackc.so
 %{_pkgconfigdir}/msgpack.pc
+%{_libdir}/cmake/msgpack/msgpack*.cmake


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/msgpack.git/commitdiff/86173d883ad8da89555d9097f7d9b0b45cd86c0a

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/eventum] Up to 3.9.1

2020-07-13 Thread glen

commit e8746023d34a48ffcf58e2b164db6c364be943ac
Author: Elan Ruusamäe 
Date:   Mon Jul 13 22:22:50 2020 +0300

Up to 3.9.1

 eventum.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index 509730d..7d14b4c 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -9,12 +9,12 @@
 Summary:   Eventum Issue / Bug tracking system
 Summary(pl.UTF-8): Eventum - system śledzenia spraw/błędów
 Name:  eventum
-Version:   3.9.0
+Version:   3.9.1
 Release:   %{?subver:1.%{subver}.%{?githash:g%{githash}.}}%{rel}
 License:   GPL v2+
 Group: Applications/WWW
 Source0:   
https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 37f709400ae2bbbe25404d372e60542d
+# Source0-md5: 82bb91a669ffc3ce339fb8fb9c50ac3a
 #Source0:  
https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz
 Source1:   %{name}-apache.conf
 Source2:   %{name}-mail-queue.cron


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/e8746023d34a48ffcf58e2b164db6c364be943ac

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: eventum: eventum-3.9.1.tar.xz updown2.gif

2020-07-13 Thread glen

Request by: glen


Files fetched: 1

STORED: 
https://github.com/eventum/eventum/releases/download/v3.9.1/eventum-3.9.1.tar.xz
82bb91a669ffc3ce339fb8fb9c50ac3a  eventum-3.9.1.tar.xz
Size: 4469136 bytes
ALREADY GOT: http://www.isocra.com/images/updown2.gif
deb6eeb2552ba757d3a949ed10c4107d  updown2.gif


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pecl-tideways_xhprof] Release 1

2020-07-11 Thread glen

commit e93e417e70accc4b1b1446d96f24abc702fde736
Author: Elan Ruusamäe 
Date:   Sat Jul 11 18:27:22 2020 +0300

Release 1

 php-pecl-tideways_xhprof.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php-pecl-tideways_xhprof.spec b/php-pecl-tideways_xhprof.spec
index a430745..deb22ea 100644
--- a/php-pecl-tideways_xhprof.spec
+++ b/php-pecl-tideways_xhprof.spec
@@ -7,7 +7,7 @@
 Summary:   %{modname} Tideways XHProf Extension
 Name:  %{php_name}-pecl-%{modname}
 Version:   5.0.2
-Release:   0.1
+Release:   1
 License:   Apache v2.0
 Group: Development/Languages/PHP
 Source0:   
https://github.com/tideways/php-xhprof-extension/archive/v%{version}/%{modname}-%{version}.tar.gz


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-tideways_xhprof.git/commitdiff/e93e417e70accc4b1b1446d96f24abc702fde736

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

DISTFILES: php-pecl-xhprof: xhprof-2.2.0.tgz

2020-07-11 Thread glen

Request by: glen


Files fetched: 1

STORED: http://pecl.php.net/get/xhprof-2.2.0.tgz
fc6f5dd8f73b7814d70e86c2184532b4  xhprof-2.2.0.tgz
Size: 840894 bytes


-- 
Virtually Yours: distfiles.
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

[packages/php-pecl-xhprof] Update to 2.2.0

2020-07-11 Thread glen

commit d00e7ed453bd19793cbd63e314bbf3ab48f2fdd0
Author: Elan Ruusamäe 
Date:   Sat Jul 11 18:11:27 2020 +0300

Update to 2.2.0

 php-pecl-xhprof.spec | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/php-pecl-xhprof.spec b/php-pecl-xhprof.spec
index 79a6681..d3c31ff 100644
--- a/php-pecl-xhprof.spec
+++ b/php-pecl-xhprof.spec
@@ -2,8 +2,8 @@
 # Conditional build:
 %bcond_without web # make web package
 
-# don't build for php53
-%if 0%{?_pld_builder:1} && "%{?php_suffix}" != "55"
+# build web package with php 7.4
+%if 0%{?_pld_builder:1} && "%{?php_suffix}" != "74"
 %undefine  with_web
 %endif
 
@@ -11,12 +11,12 @@
 %definemodname xhprof
 Summary:   PHP extension for XHProf, a Hierarchical Profiler
 Name:  %{php_name}-pecl-xhprof
-Version:   0.9.4
-Release:   4
+Version:   2.2.0
+Release:   1
 License:   Apache v2.0
 Group: Development/Languages/PHP
 Source0:   http://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: ab4062a7337e3bdaa2fd7065a7942b8d
+# Source0-md5: fc6f5dd8f73b7814d70e86c2184532b4
 Source1:   %{modname}.ini
 Source2:   apache.conf
 URL:   http://pecl.php.net/package/xhprof
@@ -132,7 +132,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc CHANGELOG CREDITS README LICENSE
+%doc CHANGELOG CREDITS README.md LICENSE
 %config(noreplace) %verify(not md5 mtime size) 
%{php_sysconfdir}/conf.d/%{modname}.ini
 %attr(755,root,root) %{php_extensiondir}/%{modname}.so
 %{_examplesdir}/%{name}-%{version}


 gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-xhprof.git/commitdiff/d00e7ed453bd19793cbd63e314bbf3ab48f2fdd0

___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

< 5 6 7 8 9 10 11 12 13 14 >

901 - 1000 of 78804 matches

Mail list logo