[packages/VirtualBox] - rel 2
commit 20f86720ff2be6b133d68aa3cbcf055af8e451e9 Author: Jan Rękorajski Date: Wed Nov 23 08:55:34 2016 +0100 - rel 2 VirtualBox.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/VirtualBox.spec b/VirtualBox.spec index b13de5f..b43f0d5 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -42,7 +42,7 @@ exit 1 %defineqtver 5.3.2 -%definerel 1 +%definerel 2 %definepname VirtualBox Summary: VirtualBox - x86 hardware virtualizer Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86 gitweb: http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/20f86720ff2be6b133d68aa3cbcf055af8e451e9 ___ 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-memcache] failed test ini_set('session.save_handler') [tests/036.phpt]
commit d41cf5cea261ab3427a6e26966c2f64bf1c22330
Author: Elan Ruusamäe
Date: Wed Nov 23 05:06:12 2016 +0200
failed test ini_set('session.save_handler') [tests/036.phpt]
everywhere on builders
php-pecl-memcache.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 584b556..8eff65d 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -132,6 +132,7 @@ ini_set('memcache.session_redundancy') [tests/044.phpt]
hash strategies and functions [tests/046.phpt]
ini_set('session.save_handler') with unix domain socket [tests/053.phpt]
FLAKY: memcache->addServer() with microsecond timeout [tests/056.phpt]
+ini_set('session.save_handler') [tests/036.phpt]
EOF
%build
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/d41cf5cea261ab3427a6e26966c2f64bf1c22330
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_5_4] backport fix-test-run.patch from php 5.5 branch
commit cf8fc50e9ad6cf00657a57b3ee7b44b4c0396925
Author: Elan Ruusamäe
Date: Wed Nov 23 04:55:32 2016 +0200
backport fix-test-run.patch from php 5.5 branch
fix-test-run.patch | 20 +++-
php.spec | 2 +-
2 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/php.spec b/php.spec
index 98dcfee..53ae6f7 100644
--- a/php.spec
+++ b/php.spec
@@ -124,7 +124,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%undefine with_filter
%endif
-%definerel 11
+%definerel 12
%defineorgname php
%definever_suffix 54
%definephp_suffix %{!?with_default_php:%{ver_suffix}}
diff --git a/fix-test-run.patch b/fix-test-run.patch
index 86a172c..8bddab2 100644
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -12,9 +12,9 @@
PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
PHP_SUBST(PHP_EXECUTABLE)
php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
-+++ php-5.4.35/Makefile.global 2015-01-21 15:07:46.782561411 +0200
-@@ -77,7 +77,8 @@
+--- php-5.4.35/Makefile.global 2015-01-21 15:07:46.782561411 +0200
php-5.5.38/Makefile.global 2016-11-23 04:52:33.981224263 +0200
+@@ -81,8 +81,15 @@
done; \
fi
@@ -22,21 +22,15 @@
+PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d
'memory_limit=-1' -d 'safe_mode=0'
+PHP_TEST_SHARED_SYSTEM_EXTENSIONS =
PHP_TEST_SHARED_EXTENSIONS = ` \
- if test "x$(PHP_MODULES)" != "x"; then \
- for i in $(PHP_MODULES)""; do \
-@@ -88,6 +89,12 @@
- for i in $(PHP_ZEND_EX)""; do \
- . $$i; $(top_srcdir)/build/shtool echo -n -- " -d
$(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
- done; \
-+ fi; \
+ if test "x$(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)" != "x"; then \
+ for i in $(PHP_TEST_SHARED_SYSTEM_EXTENSIONS)""; do \
+ dlname=$$i.$(SHLIB_DL_SUFFIX_NAME); \
+ $(top_srcdir)/build/shtool echo -n -- " -d
extension=$(EXTENSION_DIR)/$$dlname"; \
+ done; \
- fi`
- PHP_DEPRECATED_DIRECTIVES_REGEX =
'^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
]*='
-
++ fi; \
+ if test "x$(PHP_MODULES)" != "x"; then \
+ for i in $(PHP_MODULES)""; do \
+ . $$i; $(top_srcdir)/build/shtool echo -n -- " -d
extension=$$dlname"; \
@@ -96,7 +103,7 @@
PHP_DEPRECATED_DIRECTIVES_REGEX =
'^(magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\ ]*='
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/cf8fc50e9ad6cf00657a57b3ee7b44b4c0396925
___
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-memcache] skip flaky/failed tests
commit 85fa36cec049a220a92eaedb8f9fe5daee740a55
Author: Elan Ruusamäe
Date: Wed Nov 23 04:51:01 2016 +0200
skip flaky/failed tests
those tests are just mostly poorly written or have wrong assumptions
php-pecl-memcache.spec | 38 ++
1 file changed, 38 insertions(+)
---
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 1401601..584b556 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -95,6 +95,44 @@ mv pecl-%{modname}-*/{.??*,*} .
# locks up on carme, likely due udp very long timeout
rm tests/039.phpt
+rm tests/041.phpt
+rm tests/042.phpt
+
+# skip failed tests
+xfail() {
+ set +x
+ while read s; do
+ t=$(echo "$s" | sed -rne 's/.+\[(.+)\]/\1/p')
+
+ test -f "$t"
+ echo >&2 "XFAIL: $s"
+ cat >> $t <<-EOF
+
+ --XFAIL--
+ Skip
+ EOF
+ done
+}
+
+xfail <<'EOF'
+memcache->addServer() [tests/019.phpt]
+memcache->set()/memcache->get() with multiple keys and load balancing
[tests/020.phpt]
+memcache->getExtendedStats() [tests/022.phpt]
+memcache_get_extended_stats() [tests/022a.phpt]
+memcache->delete() with load balancing [tests/023.phpt]
+memcache->increment() with load balancing [tests/025.phpt]
+memcache->delete() with load balancing [tests/026.phpt]
+memcache->addServer() adding server in failed mode [tests/031.phpt]
+memcache->getServerStatus(), memcache->setServerParams() [tests/032.phpt]
+memcache::connect() with unix domain socket [tests/035.phpt]
+memcache->get() over UDP [tests/038.phpt]
+memcache->increment()/decrement() with multiple keys [tests/040.phpt]
+ini_set('memcache.redundancy') [tests/043.phpt]
+ini_set('memcache.session_redundancy') [tests/044.phpt]
+hash strategies and functions [tests/046.phpt]
+ini_set('session.save_handler') with unix domain socket [tests/053.phpt]
+FLAKY: memcache->addServer() with microsecond timeout [tests/056.phpt]
+EOF
%build
packagexml2cl package.xml > ChangeLog
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/85fa36cec049a220a92eaedb8f9fe5daee740a55
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_5_4] use alternatives for php-fpm binary
commit d64dcff251b37ab19e892aff5a15d6a9ac968586
Author: Elan Ruusamäe
Date: Mon Nov 21 19:11:00 2016 +0200
use alternatives for php-fpm binary
php.spec | 15 +++
1 file changed, 15 insertions(+)
---
diff --git a/php.spec b/php.spec
index 93105ea..98dcfee 100644
--- a/php.spec
+++ b/php.spec
@@ -505,6 +505,7 @@ Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
Requires(pre): /usr/sbin/useradd
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%{?with_alternatives:Requires: alternatives}
Requires: php-dirs >= 1.4-2
Requires: rc-scripts
Provides: php(fpm)
@@ -2475,6 +2476,11 @@ cp -p %{SOURCE11}
$RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
%{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
%endif
+%if %{with alternatives}
+# touch for ghost
+touch $RPM_BUILD_ROOT%{_sbindir}/php-fpm
+%endif
+
%{__sed} -i -e '
s#/usr/lib/php#%{php_extensiondir}#
s#/etc/php#%{_sysconfdir}#
@@ -2591,11 +2597,17 @@ fi
%post fpm
/sbin/chkconfig --add %{name}-fpm
%service %{name}-fpm restart
+%if %{with alternatives}
+update-alternatives --install %{_sbindir}/php-fpm php-fpm
%{_sbindir}/php%{ver_suffix}-fpm %{ver_suffix} || :
+%endif
%preun fpm
if [ "$1" = 0 ]; then
%service %{name}-fpm stop
/sbin/chkconfig --del %{name}-fpm
+%if %{with alternatives}
+ update-alternatives --remove php-fpm %{_sbindir}/php-fpm || :
+%endif
fi
%postun fpm
@@ -2805,6 +2817,9 @@ fi
%dir %{_sysconfdir}/fpm.d
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-fpm.conf
%attr(755,root,root) %{_sbindir}/%{name}-fpm
+%if %{with alternatives}
+%ghost %{_sbindir}/php-fpm
+%endif
%{_mandir}/man8/%{name}-fpm.8*
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/logrotate.d/%{name}-fpm
%attr(754,root,root) /etc/rc.d/init.d/%{name}-fpm
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/d64dcff251b37ab19e892aff5a15d6a9ac968586
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_5_2] ensure make test fails like other php branches
commit fc06ef33c6411d831d60e6edbde78cf2a10b3d9d
Author: Elan Ruusamäe
Date: Wed Nov 23 04:47:06 2016 +0200
ensure make test fails like other php branches
fix-test-run.patch | 11 ---
php.spec | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/php.spec b/php.spec
index 6e99b5d..0f23297 100644
--- a/php.spec
+++ b/php.spec
@@ -112,7 +112,7 @@ ERROR: You need to select at least one Apache SAPI to build
shared modules.
%definemagic_mime /usr/share/misc/magic.mime
%endif
-%definerel 21
+%definerel 22
%defineorgname php
%definever_suffix 52
%definephp_suffix %{!?with_default_php:%{ver_suffix}}
diff --git a/fix-test-run.patch b/fix-test-run.patch
index 2231d77..7cd0ee9 100644
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -13,7 +13,7 @@
PHP_SUBST(PHP_ZEND_EX)
--- php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
-+++ php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
php-5.2.17/Makefile.global 2016-11-23 04:44:22.853127691 +0200
@@ -77,7 +77,8 @@
done; \
fi
@@ -24,7 +24,7 @@
PHP_TEST_SHARED_EXTENSIONS = ` \
if test "x$(PHP_MODULES)" != "x"; then \
for i in $(PHP_MODULES)""; do \
-@@ -88,6 +89,12 @@
+@@ -88,10 +89,16 @@
for i in $(PHP_ZEND_EX)""; do \
. $$i; $(top_srcdir)/build/shtool echo -n -- " -d
$(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
done; \
@@ -35,8 +35,13 @@
+ $(top_srcdir)/build/shtool echo -n -- " -d
extension=$(EXTENSION_DIR)/$$dlname"; \
+ done; \
fi`
- PHP_DEPRECATED_DIRECTIVES_REGEX =
'^(define_syslog_variables|register_(globals|long_arrays)?|safe_mode|magic_quotes_(gpc|runtime|sybase)?|(zend_)?extension(_debug)?(_ts)?)[\t\
]*='
+ test: all
+- -@if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then
\
++ @if test ! -z "$(PHP_EXECUTABLE)" && test -x "$(PHP_EXECUTABLE)"; then \
+ INI_FILE=`$(PHP_EXECUTABLE) -d 'display_errors=stderr' -r 'echo
php_ini_loaded_file();' 2> /dev/null`; \
+ if test "$$INI_FILE"; then \
+ $(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*='
"$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
@@ -320,7 +327,10 @@
TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
TEST_PHP_SRCDIR=$(top_srcdir) \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/fc06ef33c6411d831d60e6edbde78cf2a10b3d9d
___
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-memcache] run tests with memcached
commit b1a4ab93cfd0bc50b7e22daa2b16322804cd54d2
Author: Elan Ruusamäe
Date: Wed Nov 23 04:29:03 2016 +0200
run tests with memcached
php-pecl-memcache.spec | 8
1 file changed, 8 insertions(+)
---
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 3447069..1401601 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -33,6 +33,7 @@ BuildRequires:%{php_name}-cli
BuildRequires: %{php_name}-pcre
BuildRequires: %{php_name}-session
BuildRequires: %{php_name}-spl
+BuildRequires: memcached
%endif
%{?requires_php_extension}
Requires: %{php_name}-session
@@ -92,6 +93,9 @@ mv pecl-%{modname}-*/{.??*,*} .
%patch0 -p1
%patch1 -p1
+# locks up on carme, likely due udp very long timeout
+rm tests/039.phpt
+
%build
packagexml2cl package.xml > ChangeLog
phpize
@@ -120,6 +124,10 @@ exec %{__make} test \
EOF
chmod +x run-tests.sh
+# Launch the Memcached service and stop it on exit
+%{_sbindir}/memcached -p 11211 -U 11211 -d -P $PWD/memcached.pid
+trap 'kill $(cat memcached.pid)' EXIT INT
+
./run-tests.sh
%endif
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/b1a4ab93cfd0bc50b7e22daa2b16322804cd54d2
___
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-memcache] update patch
commit a95512b07d6d6ac36421d2058a59d8cfa29ccb25 Author: Elan Ruusamäe Date: Wed Nov 23 04:11:18 2016 +0200 update patch should keep the original connect line tests.patch | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) --- diff --git a/tests.patch b/tests.patch index 3976663..6485505 100644 --- a/tests.patch +++ b/tests.patch @@ -1,11 +1,18 @@ +https://github.com/websupport-sk/pecl-memcache/pull/16 -move connect to proper section to make SKIP work +commit efad82d9517a13ec0073525759ac900a55c27c99 +Author: Elan Ruusamäe +Date: Wed Nov 23 03:59:51 2016 +0200 -https://github.com/websupport-sk/pecl-memcache/pull/16 +move connect to proper section to make SKIP work + +otherwise this test will FAIL instead of SKIP if memcache server is not available php70-pecl-memcache-3.0.9/tests/pecl16442.phpt~2016-11-23 03:56:10.0 +0200 -+++ php70-pecl-memcache-3.0.9/tests/pecl16442.phpt 2016-11-23 03:57:20.017464335 +0200 -@@ -1,10 +1,10 @@ +diff --git a/tests/pecl16442.phpt b/tests/pecl16442.phpt +index b1a7edf..499c645 100644 +--- a/tests/pecl16442.phpt b/tests/pecl16442.phpt +@@ -1,5 +1,7 @@ --TEST-- PECL bug #16442 (memcache_set fail with integer value) +--SKIPIF-- @@ -13,8 +20,3 @@ https://github.com/websupport-sk/pecl-memcache/pull/16 --FILE-- http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/a95512b07d6d6ac36421d2058a59d8cfa29ccb25 ___ 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-memcache] pcre for i686
commit af5be609aeb78f7702c58d09e1abd98c8673c0b3
Author: Elan Ruusamäe
Date: Wed Nov 23 04:06:53 2016 +0200
pcre for i686
php-pecl-memcache.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 9d8dcf4..3447069 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -30,6 +30,7 @@ BuildRequires:rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.650
%if %{with tests}
BuildRequires: %{php_name}-cli
+BuildRequires: %{php_name}-pcre
BuildRequires: %{php_name}-session
BuildRequires: %{php_name}-spl
%endif
@@ -102,6 +103,7 @@ phpize
# simple module load test
%{__php} -n -q \
-d extension_dir=modules \
+ -d extension=%{php_extensiondir}/pcre.so \
-d extension=%{php_extensiondir}/spl.so \
-d extension=%{php_extensiondir}/session.so \
-d extension=%{modname}.so \
@@ -113,7 +115,7 @@ cat <<'EOF' > run-tests.sh
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
exec %{__make} test \
PHP_EXECUTABLE=%{__php} \
- PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl session" \
+ PHP_TEST_SHARED_SYSTEM_EXTENSIONS="pcre spl session" \
RUN_TESTS_SETTINGS="-q $*"
EOF
chmod +x run-tests.sh
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/af5be609aeb78f7702c58d09e1abd98c8673c0b3
___
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-memcache] mark tests properly skipped
commit 8d125064d199615c594681be3d0bed7b7edaf308
Author: Elan Ruusamäe
Date: Wed Nov 23 04:02:12 2016 +0200
mark tests properly skipped
https://github.com/websupport-sk/pecl-memcache/pull/16
php-pecl-memcache.spec | 2 ++
tests.patch| 20
2 files changed, 22 insertions(+)
---
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index e2f6502..9d8dcf4 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -21,6 +21,7 @@ Source2: %{modname}-apache.conf
Source3: %{modname}-lighttpd.conf
Source4: config.php
Patch0:%{modname}-webapp.patch
+Patch1:tests.patch
URL: http://pecl.php.net/package/memcache/
BuildRequires: %{php_name}-devel >= 3:5.0.0
BuildRequires: %{php_name}-xml
@@ -88,6 +89,7 @@ memcache.
%setup -qc
mv pecl-%{modname}-*/{.??*,*} .
%patch0 -p1
+%patch1 -p1
%build
packagexml2cl package.xml > ChangeLog
diff --git a/tests.patch b/tests.patch
new file mode 100644
index 000..3976663
--- /dev/null
+++ b/tests.patch
@@ -0,0 +1,20 @@
+
+move connect to proper section to make SKIP work
+
+https://github.com/websupport-sk/pecl-memcache/pull/16
+
+--- php70-pecl-memcache-3.0.9/tests/pecl16442.phpt~2016-11-23
03:56:10.0 +0200
php70-pecl-memcache-3.0.9/tests/pecl16442.phpt 2016-11-23
03:57:20.017464335 +0200
+@@ -1,10 +1,10 @@
+ --TEST--
+ PECL bug #16442 (memcache_set fail with integer value)
++--SKIPIF--
++
+ --FILE--
+ http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/8d125064d199615c594681be3d0bed7b7edaf308
___
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-memcache] session requires spl (sometimes)
commit ef0230c695c94052c65033c0aa3411069fd7c0e0
Author: Elan Ruusamäe
Date: Wed Nov 23 03:54:58 2016 +0200
session requires spl (sometimes)
php-pecl-memcache.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 58a3a48..e2f6502 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -30,6 +30,7 @@ BuildRequires:rpmbuild(macros) >= 1.650
%if %{with tests}
BuildRequires: %{php_name}-cli
BuildRequires: %{php_name}-session
+BuildRequires: %{php_name}-spl
%endif
%{?requires_php_extension}
Requires: %{php_name}-session
@@ -99,6 +100,7 @@ phpize
# simple module load test
%{__php} -n -q \
-d extension_dir=modules \
+ -d extension=%{php_extensiondir}/spl.so \
-d extension=%{php_extensiondir}/session.so \
-d extension=%{modname}.so \
-m > modules.log
@@ -109,7 +111,7 @@ cat <<'EOF' > run-tests.sh
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
exec %{__make} test \
PHP_EXECUTABLE=%{__php} \
- PHP_TEST_SHARED_SYSTEM_EXTENSIONS="session" \
+ PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl session" \
RUN_TESTS_SETTINGS="-q $*"
EOF
chmod +x run-tests.sh
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/ef0230c695c94052c65033c0aa3411069fd7c0e0
___
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-memcache] run tests
commit e7368be26fccf40aadac166e07b3cdd63f297426
Author: Elan Ruusamäe
Date: Wed Nov 23 03:49:57 2016 +0200
run tests
php-pecl-memcache.spec | 12
1 file changed, 12 insertions(+)
---
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 06f542c..58a3a48 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -103,6 +103,18 @@ phpize
-d extension=%{modname}.so \
-m > modules.log
grep %{modname} modules.log
+
+cat <<'EOF' > run-tests.sh
+#!/bin/sh
+export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
+exec %{__make} test \
+ PHP_EXECUTABLE=%{__php} \
+ PHP_TEST_SHARED_SYSTEM_EXTENSIONS="session" \
+ RUN_TESTS_SETTINGS="-q $*"
+EOF
+chmod +x run-tests.sh
+
+./run-tests.sh
%endif
%install
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/e7368be26fccf40aadac166e07b3cdd63f297426
___
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-memcache] simple module load test
commit 8dfd8797a4a6e5598f5a51bfa875ea63f5e6a40e
Author: Elan Ruusamäe
Date: Wed Nov 23 03:47:05 2016 +0200
simple module load test
php-pecl-memcache.spec | 18 ++
1 file changed, 18 insertions(+)
---
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 3df2f04..06f542c 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -1,3 +1,7 @@
+#
+# Conditional build:
+%bcond_without tests # build without tests
+
%definephp_namephp%{?php_suffix}
%definemodname memcache
%definephp_min_version 5.0.0
@@ -23,6 +27,10 @@ BuildRequires: %{php_name}-xml
BuildRequires: php-packagexml2cl
BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.650
+%if %{with tests}
+BuildRequires: %{php_name}-cli
+BuildRequires: %{php_name}-session
+%endif
%{?requires_php_extension}
Requires: %{php_name}-session
Requires: %{php_name}-zlib
@@ -87,6 +95,16 @@ phpize
--with-zlib-dir=/usr
%{__make}
+%if %{with tests}
+# simple module load test
+%{__php} -n -q \
+ -d extension_dir=modules \
+ -d extension=%{php_extensiondir}/session.so \
+ -d extension=%{modname}.so \
+ -m > modules.log
+grep %{modname} modules.log
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir},%{_examplesdir}/%{name}-%{version}}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcache.git/commitdiff/8dfd8797a4a6e5598f5a51bfa875ea63f5e6a40e
___
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-memcache: NON_BLOCKING_IO_php7.tar.gz
Request by: glen Files fetched: 1 STORED: https://github.com/websupport-sk/pecl-memcache/archive/NON_BLOCKING_IO_php7.tar.gz 7751d8191302a726449d7c6506b8783d NON_BLOCKING_IO_php7.tar.gz Size: 110316 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-memcache] up to 3.0.9 snap from NON_BLOCKING_IO_php7 branch (73623c3)
commit 10d2ed2a6519798b905ce0da2a765babcfecdd4b
Author: Elan Ruusamäe
Date: Wed Nov 23 03:36:20 2016 +0200
up to 3.0.9 snap from NON_BLOCKING_IO_php7 branch (73623c3)
this adds php7 support
memcache-faulty-inline.diff | 76 -
php-pecl-memcache.spec | 29 +
2 files changed, 14 insertions(+), 91 deletions(-)
---
diff --git a/php-pecl-memcache.spec b/php-pecl-memcache.spec
index 89c1b52..3df2f04 100644
--- a/php-pecl-memcache.spec
+++ b/php-pecl-memcache.spec
@@ -5,18 +5,18 @@
Summary: %{modname} - a memcached extension
Summary(pl.UTF-8): %{modname} - rozszerzenie memcached
Name: %{php_name}-pecl-%{modname}
-Version: 3.0.8
-Release: 8
+Version: 3.0.9
+Release: 1
License: PHP 3.01
Group: Development/Languages/PHP
-Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: 24505e9b263d2c77f8ae5e9b4725e7d1
+#Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
+Source0:
https://github.com/websupport-sk/pecl-memcache/archive/NON_BLOCKING_IO_php7.tar.gz
+# Source0-md5: 7751d8191302a726449d7c6506b8783d
Source1: %{modname}.ini
Source2: %{modname}-apache.conf
Source3: %{modname}-lighttpd.conf
Source4: config.php
Patch0:%{modname}-webapp.patch
-Patch1:memcache-faulty-inline.diff
URL: http://pecl.php.net/package/memcache/
BuildRequires: %{php_name}-devel >= 3:5.0.0
BuildRequires: %{php_name}-xml
@@ -76,10 +76,9 @@ Via this web interface script you can manage and view
statistics of
memcache.
%prep
-%setup -q -c
-mv %{modname}-%{version}/* .
+%setup -qc
+mv pecl-%{modname}-*/{.??*,*} .
%patch0 -p1
-%patch1 -p1
%build
packagexml2cl package.xml > ChangeLog
@@ -93,15 +92,15 @@ rm -rf $RPM_BUILD_ROOT
install -d
$RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir},%{_examplesdir}/%{name}-%{version}}
install -p modules/%{modname}.so $RPM_BUILD_ROOT%{php_extensiondir}
# we use "session_" prefix in inifile to get loader *after* session extension
-cp -a %{SOURCE1} $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/session_%{modname}.ini
-cp -a example.php $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/session_%{modname}.ini
+cp -p example.php $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_appdir}}
-cp -a memcache.php $RPM_BUILD_ROOT%{_appdir}
-cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/config.php
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
-cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p memcache.php $RPM_BUILD_ROOT%{_appdir}
+cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/config.php
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -p $RPM_BUILD_ROOT%{_sysconfdir}/{apache,httpd}.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
%clean
rm -rf $RPM_BUILD_ROOT
diff --git a/memcache-faulty-inline.diff b/memcache-faulty-inline.diff
deleted file mode 100644
index 8e72510..000
--- a/memcache-faulty-inline.diff
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -urN memcache-3.0.8.org/memcache_pool.c memcache-3.0.8/memcache_pool.c
memcache-3.0.8.org/memcache_pool.c 2013-04-08 04:12:54.0 +0200
-+++ memcache-3.0.8/memcache_pool.c 2015-09-26 22:22:07.977632801 +0200
-@@ -40,7 +40,7 @@
-
- ZEND_DECLARE_MODULE_GLOBALS(memcache)
-
--inline void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size) /*
-+void mmc_buffer_alloc(mmc_buffer_t *buffer, unsigned int size) /*
- ensures space for an additional size bytes {{{ */
- {
- register size_t newlen;
-@@ -48,7 +48,7 @@
- }
- /* }}} */
-
--inline void mmc_buffer_free(mmc_buffer_t *buffer) /* {{{ */
-+void mmc_buffer_free(mmc_buffer_t *buffer) /* {{{ */
- {
- if (buffer->value.c != NULL) {
- smart_str_free(&(buffer->value));
-@@ -1676,7 +1676,7 @@
- }
- /* }}} */
-
--inline int mmc_prepare_key_ex(const char *key, unsigned int key_len, char
*result, unsigned int *result_len) /* {{{ */
-+int mmc_prepare_key_ex(const char *key, unsigned int key_len, char *result,
unsigned int *result_len) /* {{{ */
- {
- unsigned int i;
- if (key_len == 0) {
-@@ -1694,7 +1694,7 @@
- }
- /* }}} */
-
--inline int mmc_prepare_key(zval *key, char *result, unsigned int *result_len)
/* {{{ */
-+int mmc_prepare_key(zval *key, char *result, unsigned int *result_len) /*
{{{ */
- {
- if (Z_TYPE_P(key) == IS_STRING) {
- return mmc_prepare_key_ex(Z_STRVAL_P(key), Z_STRLEN_P(key),
result, result_len);
-diff -urN memcache-3.0.8.org/memcache_pool.h memcache-3.0.8/memcache_pool.h
memcache-3.0.8.org/memcache_pool.h 2013-04-08 04:12:54.0 +0200
-+++ memcache-3.0.8/memcache_pool.h 2015-09-26 22:22:28.461473438 +0200
-@@ -13
DISTFILES: eventum: eventum-3.1.5.tar.gz updown2.gif
Request by: glen Files fetched: 1 STORED: https://github.com/eventum/eventum/releases/download/v3.1.5/eventum-3.1.5.tar.gz 078f52887859f10c7ca00f5f5aed900f eventum-3.1.5.tar.gz Size: 5397310 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.1.5
commit cb60690ef8247fa38e157874ec43c0ddf7e43009
Author: Elan Ruusamäe
Date: Wed Nov 23 03:05:05 2016 +0200
up to 3.1.5
eventum-paths.patch | 6 +++---
eventum.spec| 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/eventum.spec b/eventum.spec
index ac3a45b..65e5c74 100644
--- a/eventum.spec
+++ b/eventum.spec
@@ -10,12 +10,12 @@
Summary: Eventum Issue / Bug tracking system
Summary(pl.UTF-8): Eventum - system śledzenia spraw/błędów
Name: eventum
-Version: 3.1.4
+Version: 3.1.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.gz
-# Source0-md5: 3dd1a7d3a6a496bbd57f3e11d2fcb6f1
+# Source0-md5: 078f52887859f10c7ca00f5f5aed900f
#Source0: %{name}-%{version}-%{subver}-g%{githash}.tar.gz
Source1: %{name}-apache.conf
Source2: %{name}-mail-queue.cron
diff --git a/eventum-paths.patch b/eventum-paths.patch
index bf3d6fe..05fa573 100644
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -64,13 +64,13 @@
'check_permission' => true,
'permission' => 660,
'check_filesize' => true,
eventum-3.0.3-314-gedea8e4/config/sphinx.conf.php~ 2015-10-27
18:02:36.0 +0200
-+++ eventum-3.0.3-314-gedea8e4/config/sphinx.conf.php 2015-10-29
11:53:26.068169385 +0200
+--- eventum-3.1.5/config/sphinx.conf.php~ 2016-11-13 12:05:37.0
+0200
eventum-3.1.5/config/sphinx.conf.php 2016-11-23 03:10:05.855040510
+0200
@@ -1,7 +1,7 @@
#!/usr/bin/php
http://git.pld-linux.org/gitweb.cgi/packages/eventum.git/commitdiff/cb60690ef8247fa38e157874ec43c0ddf7e43009
___
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-memcached/rst] combined
commit 9573aac71dc74efccbc596cc98074c89d7f27476
Author: Elan Ruusamäe
Date: Wed Nov 23 03:09:26 2016 +0200
combined
php-pecl-memcached.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 1f038ea..da36954 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -77,7 +77,7 @@ xfail() {
EOF
}
-%ifarch %{x8664}
+%ifarch %{x8664} x32
xfail Memcached::getByKey with CAS [tests/experimental/get_bykey_cas.phpt]
xfail Memcached::getDelayedByKey with CAS
[tests/experimental/getdelayed_bykey_cas.phpt]
xfail Memcached::getDelayedByKey with callback exception
[tests/experimental/getdelayed_cbthrows.phpt]
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/9573aac71dc74efccbc596cc98074c89d7f27476
___
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-memcached/rst] enable again
commit 7aa759adb48cf52031d4f7a7154c4130026ace5d
Author: Elan Ruusamäe
Date: Wed Nov 23 01:15:48 2016 +0200
enable again
php-pecl-memcached.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index d3731ca..1f038ea 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -77,7 +77,7 @@ xfail() {
EOF
}
-%if 0
+%ifarch %{x8664}
xfail Memcached::getByKey with CAS [tests/experimental/get_bykey_cas.phpt]
xfail Memcached::getDelayedByKey with CAS
[tests/experimental/getdelayed_bykey_cas.phpt]
xfail Memcached::getDelayedByKey with callback exception
[tests/experimental/getdelayed_cbthrows.phpt]
@@ -87,6 +87,7 @@ xfail Memcached::getStats [tests/experimental/stats.phpt]
xfail Memcached::getStats with bad server
[tests/experimental/stats_badserver.phpt]
xfail Memcached store and fetch type and value correctness using JSON
serializer [tests/types_json.phpt]
xfail Memcached multi store and multi fetch type and value correctness using
JSON serializer [tests/types_json_multi.phpt]
+%endif
%ifarch x32
xfail Memcached::addServer unix doamin socket
[tests/experimental/addserver_unixdomain.phpt]
xfail Memcached::set/delete UDP [tests/experimental/get_udp.phpt]
@@ -95,7 +96,6 @@ xfail Memcached::getServerByKey [tests/getserverbykey.phpt]
xfail Memcached result codes. [tests/rescode.phpt]
xfail Memcached::setMulti [tests/setmulti.phpt]
%endif
-%endif
%build
phpize
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/7aa759adb48cf52031d4f7a7154c4130026ace5d
___
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-memcached/rst] disable xfail
commit 7833e6b4d6e8cfeda278e60d08b918a61454958f
Author: Elan Ruusamäe
Date: Wed Nov 23 01:12:07 2016 +0200
disable xfail
trying to see which ones fail on builders
php-pecl-memcached.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index aef3eb9..d3731ca 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -77,6 +77,7 @@ xfail() {
EOF
}
+%if 0
xfail Memcached::getByKey with CAS [tests/experimental/get_bykey_cas.phpt]
xfail Memcached::getDelayedByKey with CAS
[tests/experimental/getdelayed_bykey_cas.phpt]
xfail Memcached::getDelayedByKey with callback exception
[tests/experimental/getdelayed_cbthrows.phpt]
@@ -94,6 +95,7 @@ xfail Memcached::getServerByKey [tests/getserverbykey.phpt]
xfail Memcached result codes. [tests/rescode.phpt]
xfail Memcached::setMulti [tests/setmulti.phpt]
%endif
+%endif
%build
phpize
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/7833e6b4d6e8cfeda278e60d08b918a61454958f
___
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-memcached] Created branch rst
The branch 'rst' was created. Summary of new commits: 7833e6b... disable xfail ___ 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-memcached] x32 xfail update
commit c896e46f01482b9e5002bed9b27e2d746ec63df7 Author: Elan Ruusamäe Date: Wed Nov 23 01:11:29 2016 +0200 x32 xfail update php-pecl-memcached.spec | 8 1 file changed, 8 insertions(+) --- diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec index eb1f216..aef3eb9 100644 --- a/php-pecl-memcached.spec +++ b/php-pecl-memcached.spec @@ -86,6 +86,14 @@ xfail Memcached::getStats [tests/experimental/stats.phpt] xfail Memcached::getStats with bad server [tests/experimental/stats_badserver.phpt] xfail Memcached store and fetch type and value correctness using JSON serializer [tests/types_json.phpt] xfail Memcached multi store and multi fetch type and value correctness using JSON serializer [tests/types_json_multi.phpt] +%ifarch x32 +xfail Memcached::addServer unix doamin socket [tests/experimental/addserver_unixdomain.phpt] +xfail Memcached::set/delete UDP [tests/experimental/get_udp.phpt] +xfail Memcached::getDelayedByKey with bad server [tests/experimental/getdelayed_badserver.phpt] +xfail Memcached::getServerByKey [tests/getserverbykey.phpt] +xfail Memcached result codes. [tests/rescode.phpt] +xfail Memcached::setMulti [tests/setmulti.phpt] +%endif %build phpize gitweb: http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/c896e46f01482b9e5002bed9b27e2d746ec63df7 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/memcached] use make install; add -devel package
commit 947a497d4362f61009112b6d8b9c1016fdf02fef
Author: Elan Ruusamäe
Date: Wed Nov 23 01:09:11 2016 +0200
use make install; add -devel package
memcached.spec | 24 +++-
1 file changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/memcached.spec b/memcached.spec
index 802d315..508a5ad 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -42,12 +42,23 @@ Provides: group(memcached)
Provides: user(memcached)
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+%define_bindir %{_sbindir}
+
%description
A high-performance, distributed memory object caching system.
%description -l pl.UTF-8
Rozproszony, wysokiej wydajności system cache'owania obiektów.
+%package devel
+Summary: Files needed for development using memcached protocol
+Group: Development/Libraries
+# does not require base
+
+%description devel
+Install memcached-devel if you are developing C/C++ applications that
+require access to the memcached binary include files.
+
%prep
%setup -q
%{?with_repcached:%patch0 -p1}
@@ -71,16 +82,15 @@ sed -nie '1,/^$/p' ChangeLog
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},/var/run/memcached} \
- $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man1} \
$RPM_BUILD_ROOT%{systemdtmpfilesdir}
-install -p memcached $RPM_BUILD_ROOT%{_sbindir}
-cp -p doc/memcached.1 $RPM_BUILD_ROOT%{_mandir}/man1
+%{__make} install \
+ INSTALL="%{__install} -p" \
+ DESTDIR=$RPM_BUILD_ROOT
install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
cp -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/%{name}
-
-install %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf
%pre
%groupadd -g 209 %{name}
@@ -114,3 +124,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/memcached.1*
%dir %attr(770,root,memcached) /var/run/memcached
%{systemdtmpfilesdir}/%{name}.conf
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/%{name}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/memcached.git/commitdiff/947a497d4362f61009112b6d8b9c1016fdf02fef
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: memcached: memcached-1.4.33.tar.gz
Request by: glen Files fetched: 1 STORED: http://www.memcached.org/files/memcached-1.4.33.tar.gz 2d7f6476283cd36e21e521d901d37a8f memcached-1.4.33.tar.gz Size: 389813 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/memcached] up to 1.4.33
commit e63ff5d7a2e43ac35188a85fd592919e5d306265
Author: Elan Ruusamäe
Date: Wed Nov 23 00:56:53 2016 +0200
up to 1.4.33
memcached.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/memcached.spec b/memcached.spec
index d40f56b..052a83c 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -1,5 +1,5 @@
# NOTE
-# - release notes: https://code.google.com/p/memcached/wiki/ReleaseNotes
+# - release notes: https://github.com/memcached/memcached/wiki/ReleaseNotes
# TODO
# - fix x32 build failure:
#items.c: In function 'item_cachedump':
@@ -14,12 +14,12 @@
Summary: A high-performance, distributed memory object caching system
Summary(pl.UTF-8): Rozproszony, wysokiej wydajności system cache'owania
obiektów
Name: memcached
-Version: 1.4.24
+Version: 1.4.33
Release: 0.1
License: BSD
Group: Networking/Daemons
Source0: http://www.memcached.org/files/%{name}-%{version}.tar.gz
-# Source0-md5: 4d6e8c90e2068580526c7579dd7f37f6
+# Source0-md5: 2d7f6476283cd36e21e521d901d37a8f
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.tmpfiles
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/memcached.git/commitdiff/70b0f7eece863bb5b54e2018d171adc6c2fc1622
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/memcached] workaround x32 -Werror
commit 70b0f7eece863bb5b54e2018d171adc6c2fc1622
Author: Elan Ruusamäe
Date: Wed Nov 23 01:04:45 2016 +0200
workaround x32 -Werror
memcached.spec | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/memcached.spec b/memcached.spec
index 052a83c..802d315 100644
--- a/memcached.spec
+++ b/memcached.spec
@@ -2,11 +2,11 @@
# - release notes: https://github.com/memcached/memcached/wiki/ReleaseNotes
# TODO
# - fix x32 build failure:
-#items.c: In function 'item_cachedump':
-#items.c:464:24: error: format '%lu' expects argument of type 'long unsigned
int', but argument 6 has type 'time_t' [-Werror=format=]
-#(unsigned long)it->exptime + process_started);
-#^
-#items.c:464:24: error: format '%lu' expects argument of type 'long unsigned
int', but argument 6 has type 'time_t' [-Werror=format=]
+#crawler.c: In function 'crawler_metadump_eval':
+#crawler.c:229:13: warning: format '%ld' expects argument of type 'long int',
but argument 5 has type 'time_t {aka long long int}' [-Wformat=]
+# "key=%s exp=%ld la=%llu cas=%llu fetch=%s\n",
+# ^
+#crawler.c:229:13: warning: format '%ld' expects argument of type 'long int',
but argument 5 has type 'time_t {aka long long int}' [-Wformat=]
# Conditional build:
%bcond_withrepcached # repcached support,
http://repcached.lab.klab.org/
@@ -15,7 +15,7 @@ Summary: A high-performance, distributed memory object
caching system
Summary(pl.UTF-8): Rozproszony, wysokiej wydajności system cache'owania
obiektów
Name: memcached
Version: 1.4.33
-Release: 0.1
+Release: 1
License: BSD
Group: Networking/Daemons
Source0: http://www.memcached.org/files/%{name}-%{version}.tar.gz
@@ -54,6 +54,10 @@ Rozproszony, wysokiej wydajności system cache'owania
obiektów.
sed -nie '1,/^$/p' ChangeLog
+%ifarch x32
+%{__sed} -i -e 's/-Werror//' configure.ac
+%endif
+
%build
%{__aclocal}
%{__autoconf}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/memcached.git/commitdiff/70b0f7eece863bb5b54e2018d171adc6c2fc1622
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/intellij-idea-ultimate] up to 2016.3
commit bdc3065ef5c56c83a76a3fa31dc8122b461c621c
Author: Jan Palus
Date: Wed Nov 23 00:00:34 2016 +0100
up to 2016.3
intellij-idea-ultimate.spec | 8 +---
xdg-paths.patch | 10 +-
2 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/intellij-idea-ultimate.spec b/intellij-idea-ultimate.spec
index b5df19f..4074f8b 100644
--- a/intellij-idea-ultimate.spec
+++ b/intellij-idea-ultimate.spec
@@ -3,12 +3,12 @@
%include /usr/lib/rpm/macros.java
Summary: IntelliJ IDEA - The Most Intelligent Java IDE
Name: intellij-idea-ultimate
-Version: 2016.2.5
+Version: 2016.3
Release: 1
License: IntelliJ IDEA Commercial
Group: Development/Tools
Source0: http://download.jetbrains.com/idea/ideaIU-%{version}.tar.gz
-# NoSource0-md5: 4f63ea80c9fd0129406c65cd1a02a491
+# NoSource0-md5: f8fc03cc32a7c6be36ba720d4cf1291b
NoSource: 0
Source1: %{product}.desktop
Patch0:xdg-paths.patch
@@ -127,10 +127,13 @@ rm -rf $RPM_BUILD_ROOT
%{_appdir}/bin/appletviewer.policy
%{_appdir}/bin/log.xml
%attr(755,root,root) %{_appdir}/bin/%{product}.sh
+%attr(755,root,root) %{_appdir}/bin/format.sh
%attr(755,root,root) %{_appdir}/bin/inspect.sh
%attr(755,root,root) %{_appdir}/bin/fsnotifier*
%attr(755,root,root) %{_appdir}/bin/libbreakgen*.so
%attr(755,root,root) %{_appdir}/bin/libyjpagent*.so
+%attr(755,root,root) %{_appdir}/bin/printenv.py
+%attr(755,root,root) %{_appdir}/bin/restart.py
%{_desktopdir}/%{product}.desktop
%{_pixmapsdir}/%{product}.png
@@ -160,7 +163,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_appdir}/jre/jre/bin/tnameserv
%attr(755,root,root) %{_appdir}/jre/jre/bin/unpack200
%{_appdir}/jre/jre/lib
-%{_appdir}/jre/jre/man
%{_appdir}/jre/jre/ASSEMBLY_EXCEPTION
%{_appdir}/jre/jre/LICENSE
%{_appdir}/jre/jre/release
diff --git a/xdg-paths.patch b/xdg-paths.patch
index 456d2b0..1e6efc6 100644
--- a/xdg-paths.patch
+++ b/xdg-paths.patch
@@ -11,13 +11,13 @@
# Run the IDE.
# -
@@ -187,6 +190,7 @@
- "-Xbootclasspath/a:$IDE_HOME/lib/boot.jar" \
- -classpath "$CLASSPATH" \
- $VM_OPTIONS \
+ "-XX:ErrorFile=$HOME/java_error_in_IDEA_%p.log" \
+ "-XX:HeapDumpPath=$HOME/java_error_in_IDEA.hprof" \
+ -Didea.paths.selector=IntelliJIdea2016.3 \
+ -Dwebide.config.dir=$WEBIDE_CONFIG_DIR -Dwebide.cache.dir=$WEBIDE_CACHE_DIR
\
"-Djb.vmOptionsFile=$VM_OPTIONS_FILE" \
- "-XX:ErrorFile=$HOME/java_error_in_WEBIDE_%p.log" \
- "-XX:HeapDumpPath=$HOME/java_error_in_WEBIDE.hprof" \
+ ${IDE_PROPERTIES_PROPERTY} \
+ -Didea.jre.check=true \
--- IntelliJIdea-145.258.2/bin/idea.properties~2016-03-16
17:02:05.0 +0200
+++ IntelliJIdea-145.258.2/bin/idea.properties 2016-03-21 11:07:02.191952728
+0200
@@ -6,21 +6,25 @@
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/intellij-idea-ultimate.git/commitdiff/bdc3065ef5c56c83a76a3fa31dc8122b461c621c
___
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-memcached] run tests with memcached
commit 6eed873b519fe77ceb01f1f5527db8eceffd0ba7
Author: Elan Ruusamäe
Date: Wed Nov 23 00:54:29 2016 +0200
run tests with memcached
php-pecl-memcached.spec | 27 +++
1 file changed, 27 insertions(+)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index f3b3ed2..eb1f216 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -37,6 +37,7 @@ BuildRequires:%{php_name}-pcre
%{?with_msgpack:BuildRequires: %{php_name}-pecl-msgpack}
%{?with_session:BuildRequires: %{php_name}-session}
BuildRequires: %{php_name}-spl
+BuildRequires: memcached
%endif
%{?requires_php_extension}
Suggests: %{php_name}-pecl-igbinary
@@ -64,6 +65,28 @@ rm fastlz/fastlz.c
rm tests/experimental/serializer_igbinary.phpt
rm tests/experimental/serializer_json.phpt
+# skip failed tests
+xfail() {
+ t=$(echo "$*" | sed -rne 's/.+\[(.+)\]/\1/p')
+
+ test -f "$t"
+ cat >> $t <<-EOF
+
+ --XFAIL--
+ Skip
+ EOF
+}
+
+xfail Memcached::getByKey with CAS [tests/experimental/get_bykey_cas.phpt]
+xfail Memcached::getDelayedByKey with CAS
[tests/experimental/getdelayed_bykey_cas.phpt]
+xfail Memcached::getDelayedByKey with callback exception
[tests/experimental/getdelayed_cbthrows.phpt]
+xfail Memcached::getMulti bad server
[tests/experimental/getmulti_badserver.phpt]
+xfail Memcached::phpinfo [tests/experimental/moduleinfo.phpt]
+xfail Memcached::getStats [tests/experimental/stats.phpt]
+xfail Memcached::getStats with bad server
[tests/experimental/stats_badserver.phpt]
+xfail Memcached store and fetch type and value correctness using JSON
serializer [tests/types_json.phpt]
+xfail Memcached multi store and multi fetch type and value correctness using
JSON serializer [tests/types_json_multi.phpt]
+
%build
phpize
%configure \
@@ -104,6 +127,10 @@ exec %{__make} test \
EOF
chmod +x run-tests.sh
+# Launch the Memcached service and stop it on exit
+%{_sbindir}/memcached -p 11211 -U 11211 -d -P $PWD/memcached.pid
+trap 'kill $(cat memcached.pid)' EXIT
+
./run-tests.sh
%endif
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/6eed873b519fe77ceb01f1f5527db8eceffd0ba7
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/trousers] correct no_inline patch to make sure symbols are not exported; rel 4
commit 1d4f96d304808155320457ba8c4ca779fdd8c822
Author: Jan Palus
Date: Tue Nov 22 23:16:03 2016 +0100
correct no_inline patch to make sure symbols are not exported; rel 4
read_data/write_data clash with symbols from samba causing aborts in
applications linking to both of them (directly or indirectly)
no_inline.patch | 4 ++--
trousers.spec | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/trousers.spec b/trousers.spec
index 05f4ad7..9befb3e 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -7,7 +7,7 @@ Summary:TrouSerS - The open-source TCG Software Stack
Summary(pl.UTF-8): TrouSerS - programowy stos TCG o otwartych źródłach
Name: trousers
Version: 0.3.13
-Release: 3
+Release: 4
License: BSD
Group: Applications/System
Source0:
http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz
diff --git a/no_inline.patch b/no_inline.patch
index cb4c1a9..4caeb51 100644
--- a/no_inline.patch
+++ b/no_inline.patch
@@ -24,8 +24,8 @@ diff -dur trousers-0.3.13.orig/src/include/tspps.h
trousers-0.3.13/src/include/t
int put_file(int);
-inline TSS_RESULT read_data(int, void *, UINT32);
-inline TSS_RESULT write_data(int, void *, UINT32);
-+TSS_RESULT read_data(int, void *, UINT32);
-+TSS_RESULT write_data(int, void *, UINT32);
++TSS_RESULT __attribute__ ((visibility ("hidden"))) read_data(int, void *,
UINT32);
++TSS_RESULT __attribute__ ((visibility ("hidden"))) write_data(int, void *,
UINT32);
UINT32 psfile_get_num_keys(int);
TSS_RESULT psfile_get_parent_uuid_by_uuid(int, TSS_UUID *, TSS_UUID *);
TSS_RESULT psfile_remove_key_by_uuid(int, TSS_UUID *);
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/trousers.git/commitdiff/1d4f96d304808155320457ba8c4ca779fdd8c822
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: gnome-desktop: gnome-desktop-3.22.2.tar.xz
Request by: megabajt Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.22/gnome-desktop-3.22.2.tar.xz 3d7222d5305f3db022eca31d8108e02d gnome-desktop-3.22.2.tar.xz Size: 1064496 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/gnome-desktop] Update to 3.22.2
commit 58d22bc3b00ce7b578beac9902b0d08ff733e74d
Author: Marcin Banasiak
Date: Tue Nov 22 23:11:52 2016 +0100
Update to 3.22.2
gnome-desktop.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/gnome-desktop.spec b/gnome-desktop.spec
index 22f067a..c321af1 100644
--- a/gnome-desktop.spec
+++ b/gnome-desktop.spec
@@ -1,12 +1,12 @@
Summary: gnome-desktop library
Summary(pl.UTF-8): Biblioteka gnome-desktop
Name: gnome-desktop
-Version: 3.22.1
+Version: 3.22.2
Release: 1
License: LGPL v2+
Group: X11/Applications
Source0:
http://ftp.gnome.org/pub/GNOME/sources/gnome-desktop/3.22/%{name}-%{version}.tar.xz
-# Source0-md5: bc09d58d7870d6464f20803850cdb90f
+# Source0-md5: 3d7222d5305f3db022eca31d8108e02d
URL: http://www.gnome.org/
BuildRequires: autoconf >= 2.50
BuildRequires: automake >= 1:1.11.2
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gnome-desktop.git/commitdiff/58d22bc3b00ce7b578beac9902b0d08ff733e74d
___
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-memcached] ah, that i686 spl requires pcre issue again
commit ecf7e00829b6d10ec73234742051325c75e51dcf
Author: Elan Ruusamäe
Date: Tue Nov 22 23:51:51 2016 +0200
ah, that i686 spl requires pcre issue again
php-pecl-memcached.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index a353ca8..f3b3ed2 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -14,7 +14,7 @@ Summary(pl.UTF-8):Interfejs do memcached z użyciem
biblioteki libmemcached
Name: %{php_name}-pecl-%{modname}
# for PHP < 7 support see 2.2.x branch
Version: 3.0.0
-Release: 0.4
+Release: 1
License: PHP 3.01
Group: Development/Languages/PHP
Source0:
https://github.com/php-memcached-dev/php-memcached/archive/php7/%{modname}-%{version}.tar.gz
@@ -32,6 +32,7 @@ BuildRequires:rpmbuild(macros) >= 1.650
BuildRequires: zlib-devel
%if %{with tests}
BuildRequires: %{php_name}-cli
+BuildRequires: %{php_name}-pcre
%{?with_igbinary:BuildRequires:%{php_name}-pecl-igbinary}
%{?with_msgpack:BuildRequires: %{php_name}-pecl-msgpack}
%{?with_session:BuildRequires: %{php_name}-session}
@@ -78,6 +79,7 @@ phpize
# simple module load test
%{__php} -n -q \
-d extension_dir=modules \
+ -d extension=%{php_extensiondir}/pcre.so \
-d extension=%{php_extensiondir}/spl.so \
%if %{with session}
-d extension=%{php_extensiondir}/session.so \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/ecf7e00829b6d10ec73234742051325c75e51dcf
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[PLDWWW] page changed: packages:php
add memcached for php7 --- https://www.pld-linux.org/packages/php?rev=1479851038 +++ https://www.pld-linux.org/packages/php?rev=1479851415 @@ -44,9 +44,9 @@ | [[package>php-pecl-mailparse]] | ✗| ✔| | ✔| ✔ | ✗| | [[package>php-pecl-markdown]]| ✗| ✔| | ✔| ✔ | ✗| | [[package>php-pecl-mdbtools]]| ✗| ✔| | ✗| ✗ | ✗| | [[package>php-pecl-memcache]]| ✔| ✔| ✔| ✔| ✔ | ✗| - | [[package>php-pecl-memcached]] | ✗| ✔| | ✔| ✔ | ✗| + | [[package>php-pecl-memcached]] | ✗| ✔| | ✔| ✔ | ✔| | [[package>php-pecl-memtrack]]| ✗| ✔| | ✗| ✗ | ✗| | [[package>php-pecl-mnogosearch]] | ✗| ✔| | ✗| ✗ | ✗| | [[package>php-pecl-mongo]] | ✗| ✔| | ✔| ✔ | ✗| | [[package>php-pecl-msgpack]] | ✔| ✔| ✔| ✔| ✔ | ✔| Diff URL: https://www.pld-linux.org/packages/php?do=diff&r1=1479851038&r2=1479851415 -- This mail was generated by DokuWiki at https://www.pld-linux.org/ ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[PLDWWW] page changed: packages:php
msgpack built for all versions --- https://www.pld-linux.org/packages/php?rev=1479850006 +++ https://www.pld-linux.org/packages/php?rev=1479851038 @@ -48,9 +48,9 @@ | [[package>php-pecl-memcached]] | ✗| ✔| | ✔| ✔ | ✗| | [[package>php-pecl-memtrack]]| ✗| ✔| | ✗| ✗ | ✗| | [[package>php-pecl-mnogosearch]] | ✗| ✔| | ✗| ✗ | ✗| | [[package>php-pecl-mongo]] | ✗| ✔| | ✔| ✔ | ✗| - | [[package>php-pecl-msgpack]] | | | | ✔| | | + | [[package>php-pecl-msgpack]] | ✔| ✔| ✔| ✔| ✔ | ✔| | [[package>php-pecl-mysql]] | ✗| ✗| ✗| ✗| ✗ | ✔| | [[package>php-pecl-ncurses]] | ✗| ✔| | ✔| ✔ | ✗| | [[package>php-pecl-oauth]] | ✗| ✔| | ✔| ✔ | ✗| | [[package>php-pecl-pam]] | ✗| ✔| | ✔| ✔ | ✗| Diff URL: https://www.pld-linux.org/packages/php?do=diff&r1=1479850006&r2=1479851038 -- This mail was generated by DokuWiki at https://www.pld-linux.org/ ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dokuwiki-plugin-sqlite] rel 1
commit 4f01da4bf2e8c8042167aa07a2e8f14b26694023
Author: Elan Ruusamäe
Date: Tue Nov 22 23:40:03 2016 +0200
rel 1
dokuwiki-plugin-sqlite.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/dokuwiki-plugin-sqlite.spec b/dokuwiki-plugin-sqlite.spec
index 5af9751..1c2c123 100644
--- a/dokuwiki-plugin-sqlite.spec
+++ b/dokuwiki-plugin-sqlite.spec
@@ -6,7 +6,7 @@
Summary: DokuWiki helper plugin to easily access a SQLite database
Name: dokuwiki-plugin-%{plugin}
Version: %{ver}
-Release: 0.1
+Release: 1
License: GPL v2
Group: Applications/WWW
Source0:
https://github.com/cosmocode/sqlite/archive/da9a21e/%{plugin}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-sqlite.git/commitdiff/4f01da4bf2e8c8042167aa07a2e8f14b26694023
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dokuwiki-plugin-sqlite] fix install
commit c05abb48ec71d3921d024fabb42bfbae0841ce5b
Author: Elan Ruusamäe
Date: Thu Nov 3 22:00:36 2016 +0200
fix install
dokuwiki-plugin-sqlite.spec | 8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/dokuwiki-plugin-sqlite.spec b/dokuwiki-plugin-sqlite.spec
index f6c6157..5af9751 100644
--- a/dokuwiki-plugin-sqlite.spec
+++ b/dokuwiki-plugin-sqlite.spec
@@ -40,7 +40,9 @@ own SQL queries against any of the available databases.
%prep
%setup -qc
-mv %{plugin}-*/* .
+mv %{plugin}-*/{.??*,*} .
+
+rm .travis.yml
%build
version=$(awk '/date/{print $2}' plugin.info.txt)
@@ -53,7 +55,8 @@ fi
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT%{plugindir}
cp -a . $RPM_BUILD_ROOT%{plugindir}
-rm $RPM_BUILD_ROOT%{plugindir}/README
+%{__rm} -r $RPM_BUILD_ROOT%{plugindir}/_test
+%{__rm} $RPM_BUILD_ROOT%{plugindir}/README
# find locales
%find_lang %{name}.lang
@@ -75,3 +78,4 @@ fi
%{plugindir}/*.css
%{plugindir}/*.php
%{plugindir}/db.sql
+%{plugindir}/classes
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-sqlite.git/commitdiff/c05abb48ec71d3921d024fabb42bfbae0841ce5b
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dokuwiki-plugin-data] require newer sqlite plugin
commit 49046ef8b41bc1ad4f82f0b5b8fe88ef179a64f9
Author: Elan Ruusamäe
Date: Tue Nov 22 23:37:10 2016 +0200
require newer sqlite plugin
PHP Fatal error: Call to undefined method
helper_plugin_sqlite::res_close() in lib/plugins/data/syntax/entry.php on line
236
added by this commit
https://github.com/cosmocode/sqlite/commit/b122d121ac9604bc3e513ddbbd2c62082e8f752e
as no versioning in upstream repo, use commit date
dokuwiki-plugin-data.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/dokuwiki-plugin-data.spec b/dokuwiki-plugin-data.spec
index d96a1c3..2885e79 100644
--- a/dokuwiki-plugin-data.spec
+++ b/dokuwiki-plugin-data.spec
@@ -23,7 +23,7 @@ Requires: php(core) >= %{php_min_version}
Requires(triggerun): sqlite
Requires(triggerun): sqlite3
Requires: dokuwiki >= 20090214b-5
-Requires: dokuwiki-plugin-sqlite >= 20120619
+Requires: dokuwiki-plugin-sqlite >= 20130508
Requires: php(pcre)
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-data.git/commitdiff/49046ef8b41bc1ad4f82f0b5b8fe88ef179a64f9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: vala: vala-0.34.3.tar.xz
Request by: megabajt Files fetched: 1 STORED: http://ftp.gnome.org/pub/GNOME/sources/vala/0.34/vala-0.34.3.tar.xz 71181dd25d06b0bedd378dc8fa7d6310 vala-0.34.3.tar.xz Size: 2724224 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/vala] Update to 0.34.3
commit 4e76a593271ea4b279e3bfbdcc9a92ddbc36844e
Author: Marcin Banasiak
Date: Tue Nov 22 22:35:37 2016 +0100
Update to 0.34.3
vala.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/vala.spec b/vala.spec
index deda969..d6530d6 100644
--- a/vala.spec
+++ b/vala.spec
@@ -2,13 +2,13 @@
Summary: GObject-based language compiler
Summary(pl.UTF-8): Kompilator języka opartego na bibliotece GObject
Name: vala
-Version: 0.34.2
+Version: 0.34.3
Release: 1
Epoch: 2
License: LGPL v2+
Group: Development/Languages
Source0:
http://ftp.gnome.org/pub/GNOME/sources/vala/0.34/%{name}-%{version}.tar.xz
-# Source0-md5: f9b4a0a10b76b56b0b6e914c506a6828
+# Source0-md5: 71181dd25d06b0bedd378dc8fa7d6310
URL: http://live.gnome.org/Vala
BuildRequires: autoconf >= 2.65
BuildRequires: automake >= 1:1.11
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vala.git/commitdiff/4e76a593271ea4b279e3bfbdcc9a92ddbc36844e
___
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] tests/040c.phpt fails on x86_64 builder as well
commit 9cd71d6442cbfff31bca37d81c9637c98c2db2d0
Author: Elan Ruusamäe
Date: Tue Nov 22 23:31:28 2016 +0200
tests/040c.phpt fails on x86_64 builder as well
php-pecl-msgpack.spec | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec
index 5402a31..bdffe3b 100644
--- a/php-pecl-msgpack.spec
+++ b/php-pecl-msgpack.spec
@@ -8,7 +8,7 @@ Summary:PHP extension for interfacing with MessagePack
Name: %{php_name}-pecl-%{modname}
# For PHP < 7, see 0.5.x branch
Version: 2.0.1
-Release: 1
+Release: 2
License: PHP 3.01
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
@@ -51,9 +51,7 @@ mv %{modname}-%{version}/* .
%patch0 -p1
# https://github.com/msgpack/msgpack-php/issues/110
-%ifarch %{ix86}
rm tests/040*.phpt
-%endif
%build
phpize
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-msgpack.git/commitdiff/9cd71d6442cbfff31bca37d81c9637c98c2db2d0
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[PLDWWW] page changed: packages:php
igbinary 2.0.0 built for all versions --- https://www.pld-linux.org/packages/php?rev=1454153200 +++ https://www.pld-linux.org/packages/php?rev=1479850006 @@ -34,9 +34,9 @@ | [[package>php-pecl-haru]]| ✗| ✔| | ✔| ✔ | ✗| | [[package>php-pecl-hidef]] | ✗| ✔| | ✔| ✗ | ✗| | [[package>php-pecl-htscanner]] | ✗| ✔| | ✔| ✔ | ✗| | [[package>php-pecl-http]]| ✗| ✔| | ✔| | ✗| - | [[package>php-pecl-igbinary]]| | ✔| | ✔| | | + | [[package>php-pecl-igbinary]]| ✔| ✔| ✔| ✔| ✔ | ✔| | [[package>php-pecl-imagick]] | ✗| ✔| | ✔| ✔ | ✗| | [[package>php-pecl-inotify]] | ✗| ✔| | ✔| ✔ | ✗| | [[package>php-pecl-ktaglib]] | ✗| ✔| | ✔| ✔ | ✗| | [[package>php-pecl-libsodium]] | ✗| ✔| ✔| ✔| ✔ | ✔| Diff URL: https://www.pld-linux.org/packages/php?do=diff&r1=1454153200&r2=1479850006 -- This mail was generated by DokuWiki at https://www.pld-linux.org/ ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: dokuwiki-plugin-data: data-2016-03-11.tar.gz
Request by: glen Files fetched: 1 STORED: https://github.com/splitbrain/dokuwiki-plugin-data/archive/master/data-2016-03-11.tar.gz eea5c5398f01db4f2b4f22c71d601aea data-2016-03-11.tar.gz Size: 46931 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/dokuwiki-plugin-data] update patches
commit a4d4cd548e68d1b0bf17c462b2c968626e84cb1b
Author: Elan Ruusamäe
Date: Tue Nov 22 23:09:40 2016 +0200
update patches
cache-enable.patch| 17 -
dokuwiki-plugin-data.spec | 15 ---
separate-rpmdb.patch | 43 +++
separator-style.patch | 8
4 files changed, 39 insertions(+), 44 deletions(-)
---
diff --git a/dokuwiki-plugin-data.spec b/dokuwiki-plugin-data.spec
index f554879..c6e9a75 100644
--- a/dokuwiki-plugin-data.spec
+++ b/dokuwiki-plugin-data.spec
@@ -55,13 +55,7 @@ different to the repository plugin.
mv *-%{plugin}-*/* .
%patch2 -p1
%patch3 -p1
-%patch4 -p0
-
-version=$(awk '/date/{print $2}' plugin.info.txt)
-if [ $(echo "$version" | tr -d -) != %{version} ]; then
- : %%{version} mismatch
-# exit 1
-fi
+%patch4 -p1
# nothing to do with tests
rm -rf _test
@@ -69,6 +63,13 @@ rm -rf _test
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+%build
+version=$(awk '/date/{print $2}' plugin.info.txt)
+if [ $(echo "$version" | tr -d -) != %{version} ]; then
+ : %%{version} mismatch
+ exit 1
+fi
+
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{plugindir},%{metadir}}
diff --git a/cache-enable.patch b/cache-enable.patch
index 6133ac1..0c3c191 100644
--- a/cache-enable.patch
+++ b/cache-enable.patch
@@ -1,15 +1,14 @@
syntax/table.php~ 2012-08-07 18:56:10.0 +0300
-+++ syntax/table.php 2012-08-17 01:26:46.814865996 +0300
-@@ -204,7 +204,11 @@
- function render($format, &$R, $data) {
- if($format != 'xhtml') return false;
- if(is_null($data)) return false;
+--- dokuwiki-plugin-data-20160311/syntax/table.php~2016-11-22
23:08:27.0 +0200
dokuwiki-plugin-data-20160311/syntax/table.php 2016-11-22
23:08:54.437219264 +0200
+@@ -245,7 +245,10 @@
+ $sqlite = $this->dthlp->_getDB();
+ if(!$sqlite) return false;
+
-$R->info['cache'] = false;
-+
+// disable cache only if sorting having some filters
+if ($data['dynfilters'] || !empty($_REQUEST['datasrt']) ||
!empty($_GET['dataflt']) || !empty($_REQUEST['dataofs'])) {
+$R->info['cache'] = false;
+}
- $sqlite = $this->dthlp->_getDB();
- if(!$sqlite) return false;
+ //reset counters
+ $this->sums = array();
diff --git a/separate-rpmdb.patch b/separate-rpmdb.patch
index 893c03b..d16d484 100644
--- a/separate-rpmdb.patch
+++ b/separate-rpmdb.patch
@@ -10,21 +10,16 @@ CREATE TABLE rpmdb (eid INTEGER PRIMARY KEY, pid INTEGER,
value);
Handling it automatically would mean have to renumber upstream patches each
time...
-#--- dokuwiki-plugin-data-20120227/db/latest.version~ 2012-02-27
16:32:51.0 +0200
-#+++ dokuwiki-plugin-data-20120227/db/latest.version 2012-03-13
13:10:57.241251292 +0200
-#@@ -1 +1 @@
-#-5
-#+6
dokuwiki-plugin-data-20120227/helper.php~ 2012-03-13 13:10:04.0
+0200
-+++ dokuwiki-plugin-data-20120227/helper.php 2012-03-13 13:11:33.742793083
+0200
-@@ -184,6 +184,7 @@
- static $specials = array('%title%' => array('page', 'title'),
- '%pageid%' => array('title', 'page'),
- '%class%' => array('class'),
-+ '%rpm%' => array('rpm'),
- '%lastmod%' => array('lastmod','timestamp'));
- if (isset($specials[$column['title']])) {
- $s = $specials[$column['title']];
+--- dokuwiki-plugin-data-20160311/helper.php~ 2016-11-22 23:06:06.0
+0200
dokuwiki-plugin-data-20160311/helper.php 2016-11-22 23:06:44.267324645
+0200
+@@ -385,6 +385,7 @@
+ '%title%' => array('page', 'title'),
+ '%pageid%' => array('title', 'page'),
+ '%class%' => array('class'),
++'%rpm%' => array('rpm'),
+ '%lastmod%' => array('lastmod', 'timestamp')
+ );
+ if(isset($specials[$column['title']])) {
--- dokuwiki-plugin-data-20120227/lang/en/lang.php~2012-02-27
16:32:51.0 +0200
+++ dokuwiki-plugin-data-20120227/lang/en/lang.php 2012-03-13
13:12:04.190745746 +0200
@@ -16,6 +16,7 @@
@@ -35,19 +30,19 @@ time...
$lang['lastmod'] = 'Last Modified';
$lang['name'] = 'Type Alias';
dokuwiki-plugin-data-20100608/syntax/table.php 2010-11-03
15:20:30.0 +0200
-+++ dokuwiki-plugin-data-20100608/syntax/table.php 2010-12-01
19:50:59.217678000 +0200
-@@ -328,6 +328,13 @@
- $select[] = '" " || pages.class';
- }elseif($key == '%title%'){
+--- dokuwiki-plugin-data-20160311/syntax/table.php~2016-07-01
14:27:21.0 +0300
dokuwiki-plugin-data-20160311/syntax/table.php 2016-11-22
23:08:01.967907897 +0200
+@@ -584,6 +584,13 @@
+ $select[] = 'pages.lastmod';
[packages/dokuwiki-plugin-data] updated files
commit 90ea78decbd54a7da362149167a98ff10d4a6c82
Author: Elan Ruusamäe
Date: Tue Nov 22 23:11:23 2016 +0200
updated files
dokuwiki-plugin-data.spec | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/dokuwiki-plugin-data.spec b/dokuwiki-plugin-data.spec
index c6e9a75..d96a1c3 100644
--- a/dokuwiki-plugin-data.spec
+++ b/dokuwiki-plugin-data.spec
@@ -52,13 +52,14 @@ different to the repository plugin.
%prep
%setup -qc
-mv *-%{plugin}-*/* .
+mv *-%{plugin}-*/{.??*,*} .
%patch2 -p1
%patch3 -p1
%patch4 -p1
# nothing to do with tests
rm -rf _test
+rm .travis.yml
# cleanup backups after patching
find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
@@ -126,13 +127,14 @@ chmod 660 %{metadir}/data.sqlite3
%defattr(644,root,root,755)
%doc README
%dir %{plugindir}
-%{plugindir}/admin
-%{plugindir}/syntax
-%{plugindir}/conf
-%{plugindir}/db
%{plugindir}/*.js
%{plugindir}/*.php
%{plugindir}/*.txt
%{plugindir}/*.css
+%{plugindir}/admin
+%{plugindir}/conf
+%{plugindir}/db
+%{plugindir}/helper
+%{plugindir}/syntax
%attr(660,http,http) %ghost %{metadir}/data.sqlite
%attr(660,http,http) %ghost %{metadir}/data.sqlite3
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-data.git/commitdiff/90ea78decbd54a7da362149167a98ff10d4a6c82
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dokuwiki-plugin-data] up to 2016-03-11
commit 3c32c275f080bd382d2cabe6ded9f6cbe104ab1e
Author: Elan Ruusamäe
Date: Tue Nov 22 23:04:31 2016 +0200
up to 2016-03-11
using master snapshot, upstream doesn't tag their code
https://github.com/splitbrain/dokuwiki-plugin-data/issues/206
dokuwiki-plugin-data.spec | 17 ++---
1 file changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/dokuwiki-plugin-data.spec b/dokuwiki-plugin-data.spec
index 40fe829..f554879 100644
--- a/dokuwiki-plugin-data.spec
+++ b/dokuwiki-plugin-data.spec
@@ -1,16 +1,19 @@
+%definesubver 2016-03-11
+%definever %(echo %{subver} | tr -d -)
%defineplugin data
-%definephp_min_version 5.0.0
+%definephp_min_version 5.3.0
%include /usr/lib/rpm/macros.php
Summary: DokuWiki Structured Data Plugin
Name: dokuwiki-plugin-%{plugin}
-Version: 20120716
-Release: 4
+Version: %{ver}
+Release: 0.1
License: GPL v2
Group: Applications/WWW
-#Source0:
http://github.com/splitbrain/dokuwiki-plugin-%{plugin}/tarball/master#/%{plugin}-%{version}.tgz
-Source0:
https://github.com/Klap-in/dokuwiki-plugin-data/tarball/pdo/%{plugin}-pdo-%{version}.tgz
-# Source0-md5: 49cfa6206cdf138593905d3622cb1a4a
-URL: http://wiki.splitbrain.org/plugin:data
+# using master snapshot, upstream doesn't tag their code
+# https://github.com/splitbrain/dokuwiki-plugin-data/issues/206
+Source0:
https://github.com/splitbrain/dokuwiki-plugin-%{plugin}/archive/master/%{plugin}-%{subver}.tar.gz
+# Source0-md5: eea5c5398f01db4f2b4f22c71d601aea
+URL: https://www.dokuwiki.org/plugin:data
Patch2:separator-style.patch
Patch3:separate-rpmdb.patch
Patch4:cache-enable.patch
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-data.git/commitdiff/90ea78decbd54a7da362149167a98ff10d4a6c82
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dokuwiki-plugin-edittable] up to 2016-10-07 (2016-10-06)
commit 2b52a0a4be0f82c4c2a6708a7fe78a7cada20e7a
Author: Elan Ruusamäe
Date: Tue Nov 22 22:53:30 2016 +0200
up to 2016-10-07 (2016-10-06)
https://github.com/cosmocode/edittable/issues/118
dokuwiki-plugin-edittable.spec | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/dokuwiki-plugin-edittable.spec b/dokuwiki-plugin-edittable.spec
index f3803b1..7b1f0c4 100644
--- a/dokuwiki-plugin-edittable.spec
+++ b/dokuwiki-plugin-edittable.spec
@@ -1,4 +1,4 @@
-%definesubver 2015-06-17
+%definesubver 2016-10-07
%definever %(echo %{subver} | tr -d -)
%defineplugin edittable
%definephp_min_version 5.3.0
@@ -11,7 +11,7 @@ Release: 1
License: GPL v2
Group: Applications/WWW
Source0:
https://github.com/cosmocode/%{plugin}/archive/%{subver}/%{plugin}-%{version}.tar.gz
-# Source0-md5: 557d632e82389b8a94d88602387f5e92
+# Source0-md5: 909c60e3520d05dc2e8527837c3dde08
URL: https://www.dokuwiki.org/plugin:edittable
BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.520
@@ -33,8 +33,20 @@ Plugin that provides a visual table editing and inserting
interfac
%setup -qc
mv %{plugin}-*/{*,.??*} .
+# no ui testing here
+rm -r _jstest
+# not needed with rpm packaging
+rm deleted.files
+# npm
+rm package.json
+
%build
version=$(awk '/^date/{print $2}' plugin.info.txt)
+
+# XXX: temp hack, upstream tagged it wrong
+# https://github.com/cosmocode/edittable/issues/118
+[ "$version" = "2016-10-06" ] && version=2016-10-07
+
if [ "$(echo "$version" | tr -d -)" != %{version} ]; then
: version mismatch
exit 1
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-edittable.git/commitdiff/2b52a0a4be0f82c4c2a6708a7fe78a7cada20e7a
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dokuwiki-plugin-data] rpm5 fix
commit fa3ee068618036a38ca5d9d53b124cb92779e1cb
Author: Elan Ruusamäe
Date: Tue Nov 22 22:57:47 2016 +0200
rpm5 fix
dokuwiki-plugin-data.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/dokuwiki-plugin-data.spec b/dokuwiki-plugin-data.spec
index 088e1f7..40fe829 100644
--- a/dokuwiki-plugin-data.spec
+++ b/dokuwiki-plugin-data.spec
@@ -8,7 +8,7 @@ Release:4
License: GPL v2
Group: Applications/WWW
#Source0:
http://github.com/splitbrain/dokuwiki-plugin-%{plugin}/tarball/master#/%{plugin}-%{version}.tgz
-Source0:
https://github.com/Klap-in/dokuwiki-plugin-data/tarball/pdo#/%{plugin}-pdo-%{version}.tgz
+Source0:
https://github.com/Klap-in/dokuwiki-plugin-data/tarball/pdo/%{plugin}-pdo-%{version}.tgz
# Source0-md5: 49cfa6206cdf138593905d3622cb1a4a
URL: http://wiki.splitbrain.org/plugin:data
Patch2:separator-style.patch
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dokuwiki-plugin-data.git/commitdiff/fa3ee068618036a38ca5d9d53b124cb92779e1cb
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: dokuwiki-plugin-edittable: edittable-20161007.tar.gz
Request by: glen Files fetched: 1 STORED: https://github.com/cosmocode/edittable/archive/2016-10-07/edittable-20161007.tar.gz 909c60e3520d05dc2e8527837c3dde08 edittable-20161007.tar.gz Size: 222636 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] add -devel package
commit c6b639ac668245e5fc3e03e8453342a5741e454c
Author: Elan Ruusamäe
Date: Tue Nov 22 22:36:51 2016 +0200
add -devel package
php-pecl-msgpack.spec | 16 +---
1 file changed, 13 insertions(+), 3 deletions(-)
---
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec
index 78668fe..5402a31 100644
--- a/php-pecl-msgpack.spec
+++ b/php-pecl-msgpack.spec
@@ -36,6 +36,15 @@ MessagePack is a binary-based efficient object serialization
library.
It enables to exchange structured objects between many languages like
JSON. But unlike JSON, it is very fast and small.
+%package devel
+Summary: MessagePack developer files (header)
+Group: Development/Libraries
+Requires: %{php_name}-devel
+# does not require base
+
+%description devel
+These are the files needed to compile programs using MessagePack.
+
%prep
%setup -qc
mv %{modname}-%{version}/* .
@@ -87,9 +96,6 @@ cat <<'EOF' >
$RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{modname}.ini
extension=%{modname}.so
EOF
-# no -devel package yet
-%{__rm} $RPM_BUILD_ROOT%{_includedir}/php/ext/msgpack/php_msgpack.h
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -106,3 +112,7 @@ fi
%doc CREDITS EXPERIMENTAL
%config(noreplace) %verify(not md5 mtime size)
%{php_sysconfdir}/conf.d/%{modname}.ini
%attr(755,root,root) %{php_extensiondir}/%{modname}.so
+
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/php/ext/%{modname}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-msgpack.git/commitdiff/c6b639ac668245e5fc3e03e8453342a5741e454c
___
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-memcached] msgpack support; enable it
commit bc194a7687d3cf19fea704347c50366d49b74e35
Author: Elan Ruusamäe
Date: Tue Nov 22 22:40:12 2016 +0200
msgpack support; enable it
php-pecl-memcached.spec | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 616cf02..a353ca8 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -2,7 +2,7 @@
# Conditional build:
%bcond_without igbinary# memcached igbinary serializer support
%bcond_without json# memcached json serializer support
-%bcond_withmsgpack # memcached msgpack serializer support
+%bcond_without msgpack # memcached msgpack serializer support
%bcond_without sasl# memcached sasl support
%bcond_without session # memcached session handler support
%bcond_without tests # build without tests
@@ -12,9 +12,9 @@
Summary: Interface to memcached via libmemcached library
Summary(pl.UTF-8): Interfejs do memcached z użyciem biblioteki libmemcached
Name: %{php_name}-pecl-%{modname}
-# PHP >= 7 only, for older PHP see 2.2.x branch
+# for PHP < 7 support see 2.2.x branch
Version: 3.0.0
-Release: 0.3
+Release: 0.4
License: PHP 3.01
Group: Development/Languages/PHP
Source0:
https://github.com/php-memcached-dev/php-memcached/archive/php7/%{modname}-%{version}.tar.gz
@@ -22,6 +22,7 @@ Source0:
https://github.com/php-memcached-dev/php-memcached/archive/php7/%{modna
URL: http://pecl.php.net/package/memcached/
BuildRequires: %{php_name}-devel >= 4:7.0.0
%{?with_igbinary:BuildRequires:%{php_name}-pecl-igbinary-devel}
+%{?with_msgpack:BuildRequires: %{php_name}-pecl-msgpack-devel}
%{?with_sasl:BuildRequires:cyrus-sasl-devel}
BuildRequires: fastlz-devel
BuildRequires: libmemcached-devel >= 1.0.18
@@ -32,11 +33,13 @@ BuildRequires: zlib-devel
%if %{with tests}
BuildRequires: %{php_name}-cli
%{?with_igbinary:BuildRequires:%{php_name}-pecl-igbinary}
+%{?with_msgpack:BuildRequires: %{php_name}-pecl-msgpack}
%{?with_session:BuildRequires: %{php_name}-session}
BuildRequires: %{php_name}-spl
%endif
%{?requires_php_extension}
Suggests: %{php_name}-pecl-igbinary
+Suggests: %{php_name}-pecl-msgpack
Suggests: %{php_name}-session
Provides: php(%{modname}) = %{version}
Obsoletes: php-pecl-memcached < 2.2.0-1
@@ -82,6 +85,9 @@ phpize
%if %{with igbinary}
-d extension=%{php_extensiondir}/igbinary.so \
%endif
+%if %{with msgpack}
+ -d extension=%{php_extensiondir}/msgpack.so \
+%endif
-d extension=%{modname}.so \
-m > modules.log
grep %{modname} modules.log
@@ -91,7 +97,7 @@ cat <<'EOF' > run-tests.sh
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
exec %{__make} test \
PHP_EXECUTABLE=%{__php} \
- PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl%{?with_session:
session}%{?with_igbinary: igbinary}" \
+ PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl%{?with_session:
session}%{?with_igbinary: igbinary}%{?with_msgpack: msgpack}" \
RUN_TESTS_SETTINGS="-q $*"
EOF
chmod +x run-tests.sh
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/bc194a7687d3cf19fea704347c50366d49b74e35
___
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] drop tests/040*.phpt
commit 69958554897d70f745ab9fc6f971bac4c640935b
Author: Elan Ruusamäe
Date: Tue Nov 22 22:31:14 2016 +0200
drop tests/040*.phpt
tries to allocate 4GiB+ memory which fails on 32bit platforms
https://github.com/msgpack/msgpack-php/issues/110
php-pecl-msgpack.spec | 5 +
1 file changed, 5 insertions(+)
---
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec
index 0799366..78668fe 100644
--- a/php-pecl-msgpack.spec
+++ b/php-pecl-msgpack.spec
@@ -41,6 +41,11 @@ JSON. But unlike JSON, it is very fast and small.
mv %{modname}-%{version}/* .
%patch0 -p1
+# https://github.com/msgpack/msgpack-php/issues/110
+%ifarch %{ix86}
+rm tests/040*.phpt
+%endif
+
%build
phpize
%configure
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-msgpack.git/commitdiff/69958554897d70f745ab9fc6f971bac4c640935b
___
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-0.5.6.tgz
Request by: glen Files fetched: 1 STORED: http://pecl.php.net/get/msgpack-0.5.6.tgz 895b90dc4bfdf2c7575b166ca68cbfc5 msgpack-0.5.6.tgz Size: 56455 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: php-7.1.0RC6.tar.xz
Request by: glen Files fetched: 1 STORED: https://downloads.php.net/~krakjoe/php-7.1.0RC6.tar.xz 26bb2d5dc690b3463a0fea3d71fcf935 php-7.1.0RC6.tar.xz Size: 12703060 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/0.5.x] up to 0.5.6
commit 27ede28f339bb9d7eb3374ac31d99fe119a7c532
Author: Elan Ruusamäe
Date: Tue Nov 22 22:18:43 2016 +0200
up to 0.5.6
- support str8 type (wudikua)
- Fix a warning and a possible crash (Mike)
- Fix crash with memcached (Mike)
php-pecl-msgpack.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec
index 9d123d4..b595fcb 100644
--- a/php-pecl-msgpack.spec
+++ b/php-pecl-msgpack.spec
@@ -6,12 +6,12 @@
%definemodname msgpack
Summary: PHP extension for interfacing with MessagePack
Name: %{php_name}-pecl-%{modname}
-Version: 0.5.5
+Version: 0.5.6
Release: 1
License: PHP 3.01
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: adc8d9ea5088bdb83e7cc7c2f535d858
+# Source0-md5: 895b90dc4bfdf2c7575b166ca68cbfc5
URL: http://pecl.php.net/package/msgpack/
BuildRequires: %{php_name}-devel
BuildRequires: rpmbuild(macros) >= 1.666
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-msgpack.git/commitdiff/27ede28f339bb9d7eb3374ac31d99fe119a7c532
___
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-7.1] up to 7.1.0RC6
commit 802ac030ddf9afe9901167cfb5dde87e4a51dd83
Author: Elan Ruusamäe
Date: Tue Nov 22 22:11:22 2016 +0200
up to 7.1.0RC6
php.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/php.spec b/php.spec
index b4b3c1b..a618d2f 100644
--- a/php.spec
+++ b/php.spec
@@ -134,7 +134,7 @@
%endif
%definerel 0.5
-%definesubver RC5
+%definesubver RC6
%defineorgname php
%definever_suffix 71
%definephp_suffix %{!?with_default_php:%{ver_suffix}}
@@ -155,7 +155,7 @@ License:PHP 3.01 and Zend and BSD
Group: Libraries
#Source0: http://php.net/distributions/%{orgname}-%{version}.tar.xz
Source0:
https://downloads.php.net/~krakjoe/%{orgname}-%{version}%{subver}.tar.xz
-# Source0-md5: 1d195b0aeb63914a308fb215671445a5
+# Source0-md5: 26bb2d5dc690b3463a0fea3d71fcf935
Source2: %{orgname}-mod_php.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/802ac030ddf9afe9901167cfb5dde87e4a51dd83
___
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] this is php >= 7.0 version only
commit 901929e24b53cfe3e14392258182d72af6a6521c
Author: Elan Ruusamäe
Date: Tue Nov 22 22:18:09 2016 +0200
this is php >= 7.0 version only
php-pecl-msgpack.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec
index 6e5010c..0799366 100644
--- a/php-pecl-msgpack.spec
+++ b/php-pecl-msgpack.spec
@@ -6,6 +6,7 @@
%definemodname msgpack
Summary: PHP extension for interfacing with MessagePack
Name: %{php_name}-pecl-%{modname}
+# For PHP < 7, see 0.5.x branch
Version: 2.0.1
Release: 1
License: PHP 3.01
@@ -14,7 +15,7 @@ Source0:
http://pecl.php.net/get/%{modname}-%{version}.tgz
# Source0-md5: 4d1db4592ffa4101601aefc794191de5
Patch0:test041.patch
URL: http://pecl.php.net/package/msgpack/
-BuildRequires: %{php_name}-devel
+BuildRequires: %{php_name}-devel >= 4:7.0.0
BuildRequires: rpmbuild(macros) >= 1.666
%if %{with tests}
BuildRequires: %{php_name}-cli
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-msgpack.git/commitdiff/901929e24b53cfe3e14392258182d72af6a6521c
___
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] Created branch 0.5.x
The branch '0.5.x' was created pointing to: 658f850... pcre for tests on i486/i686 ___ 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] disable tests/041
commit 8ba04bf54304c8013874028971a1e911f0977664
Author: Elan Ruusamäe
Date: Tue Nov 22 22:02:46 2016 +0200
disable tests/041
https://github.com/msgpack/msgpack-php/issues/108
https://github.com/msgpack/msgpack-php/pull/109
php-pecl-msgpack.spec | 2 ++
test041.patch | 50 ++
2 files changed, 52 insertions(+)
---
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec
index ce346cc..6e5010c 100644
--- a/php-pecl-msgpack.spec
+++ b/php-pecl-msgpack.spec
@@ -12,6 +12,7 @@ License: PHP 3.01
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
# Source0-md5: 4d1db4592ffa4101601aefc794191de5
+Patch0:test041.patch
URL: http://pecl.php.net/package/msgpack/
BuildRequires: %{php_name}-devel
BuildRequires: rpmbuild(macros) >= 1.666
@@ -37,6 +38,7 @@ JSON. But unlike JSON, it is very fast and small.
%prep
%setup -qc
mv %{modname}-%{version}/* .
+%patch0 -p1
%build
phpize
diff --git a/test041.patch b/test041.patch
new file mode 100644
index 000..ad13984
--- /dev/null
+++ b/test041.patch
@@ -0,0 +1,50 @@
+From d8bcd355bb16d4ad8c86f06d79741f573eea4f44 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Elan=20Ruusam=C3=A4e?=
+Date: Tue, 22 Nov 2016 21:57:46 +0200
+Subject: [PATCH] update tests/041; fixes #108
+
+- disable bin2hex - it's dumping internal memory?
+- -0.0 is -0.0 in my platform
+---
+ tests/041.phpt | 10 ++
+ 1 file changed, 2 insertions(+), 8 deletions(-)
+
+diff --git a/tests/041.phpt b/tests/041.phpt
+index 6400fd9..0dcf5b0 100644
+--- a/tests/041.phpt
b/tests/041.phpt
+@@ -10,7 +10,6 @@ function test($type, $variable) {
+ var_dump($variable);
+ var_dump($unserialized);
+
+-echo bin2hex($serialized), PHP_EOL;
+ echo PHP_EOL;
+ }
+
+@@ -24,24 +23,19 @@ test('double -0.0:', -0.0);
+ double NaN:
+ float(NAN)
+ float(NAN)
+-cb7ff8
+
+ double Inf:
+ float(INF)
+ float(INF)
+-cb7ff0
+
+ double -Inf:
+ float(-INF)
+ float(-INF)
+-cbfff0
+
+ double 0.0:
+ float(0)
+ float(0)
+-cb
+
+ double -0.0:
+-float(0)
+-float(0)
+-cb
++float(-0)
++float(-0)
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-msgpack.git/commitdiff/8ba04bf54304c8013874028971a1e911f0977664
___
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] add run-test wrapper
commit 0a9c573e333b807df846621e339e4c660d45d5da
Author: Elan Ruusamäe
Date: Tue Nov 22 21:41:47 2016 +0200
add run-test wrapper
to be able to re-run failed tests with proper env
php-pecl-msgpack.spec | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec
index 6ab4d22..ce346cc 100644
--- a/php-pecl-msgpack.spec
+++ b/php-pecl-msgpack.spec
@@ -54,10 +54,17 @@ phpize
-m > modules.log
grep %{modname} modules.log
+cat <<'EOF' > run-tests.sh
+#!/bin/sh
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
-%{__make} test \
+exec %{__make} test \
PHP_EXECUTABLE=%{__php} \
- PHP_TEST_SHARED_SYSTEM_EXTENSIONS="pcre spl session"
+ PHP_TEST_SHARED_SYSTEM_EXTENSIONS="pcre spl session" \
+ RUN_TESTS_SETTINGS="-q $*"
+EOF
+chmod +x run-tests.sh
+
+./run-tests.sh
%endif
%install
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-msgpack.git/commitdiff/0a9c573e333b807df846621e339e4c660d45d5da
___
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.0.1.tgz
Request by: glen Files fetched: 1 STORED: http://pecl.php.net/get/msgpack-2.0.1.tgz 4d1db4592ffa4101601aefc794191de5 msgpack-2.0.1.tgz Size: 45506 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] 2.0.1; php7 support
commit 89bb337c11364ce78dae8ef6ee277e339bb3e965
Author: Elan Ruusamäe
Date: Tue Nov 22 21:40:30 2016 +0200
2.0.1; php7 support
php-pecl-msgpack.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/php-pecl-msgpack.spec b/php-pecl-msgpack.spec
index 9d123d4..6ab4d22 100644
--- a/php-pecl-msgpack.spec
+++ b/php-pecl-msgpack.spec
@@ -6,12 +6,12 @@
%definemodname msgpack
Summary: PHP extension for interfacing with MessagePack
Name: %{php_name}-pecl-%{modname}
-Version: 0.5.5
+Version: 2.0.1
Release: 1
License: PHP 3.01
Group: Development/Languages/PHP
Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: adc8d9ea5088bdb83e7cc7c2f535d858
+# Source0-md5: 4d1db4592ffa4101601aefc794191de5
URL: http://pecl.php.net/package/msgpack/
BuildRequires: %{php_name}-devel
BuildRequires: rpmbuild(macros) >= 1.666
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-msgpack.git/commitdiff/89bb337c11364ce78dae8ef6ee277e339bb3e965
___
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-memcached] disable redirect tests; enable igbinary
commit 01be7f546099e60d8bff3bcb46a0273e83a47d8b
Author: Elan Ruusamäe
Date: Tue Nov 22 21:35:54 2016 +0200
disable redirect tests; enable igbinary
php-pecl-memcached.spec | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index a559887..616cf02 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_withigbinary# memcached igbinary serializer support
+%bcond_without igbinary# memcached igbinary serializer support
%bcond_without json# memcached json serializer support
%bcond_withmsgpack # memcached msgpack serializer support
%bcond_without sasl# memcached sasl support
@@ -56,6 +56,10 @@ mv php-memcached-*/{.??*,*} .
rm fastlz/fastlz.c
+# redirect tests fail (the actual tests they redirect work)
+rm tests/experimental/serializer_igbinary.phpt
+rm tests/experimental/serializer_json.phpt
+
%build
phpize
%configure \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/01be7f546099e60d8bff3bcb46a0273e83a47d8b
___
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-memcached] create run tests wrapper
commit 2a973f5a71ad460481f7f57adcddeb42adfaab64
Author: Elan Ruusamäe
Date: Tue Nov 22 21:34:39 2016 +0200
create run tests wrapper
so can easily re-run single test in terminal
php-pecl-memcached.spec | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 58abaa9..a559887 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -82,10 +82,17 @@ phpize
-m > modules.log
grep %{modname} modules.log
+cat <<'EOF' > run-tests.sh
+#!/bin/sh
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
-%{__make} test \
+exec %{__make} test \
PHP_EXECUTABLE=%{__php} \
- PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl%{?with_session:
session}%{?with_igbinary: igbinary}"
+ PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl%{?with_session:
session}%{?with_igbinary: igbinary}" \
+ RUN_TESTS_SETTINGS="-q $*"
+EOF
+chmod +x run-tests.sh
+
+./run-tests.sh
%endif
%install
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/01be7f546099e60d8bff3bcb46a0273e83a47d8b
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[projects/template-specs] pecl: use exec in script to propagate make failure
commit 67c043774a2a7e57337440b91528eae61f7a30ee
Author: Elan Ruusamäe
Date: Tue Nov 22 21:29:08 2016 +0200
pecl: use exec in script to propagate make failure
so no need for redirect and grep hacks
php-pecl.spec | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/php-pecl.spec b/php-pecl.spec
index 9cc894e..0e6a2c4 100644
--- a/php-pecl.spec
+++ b/php-pecl.spec
@@ -56,15 +56,14 @@ export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
cat <<'EOF' > run-tests.sh
#!/bin/sh
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
-%{__make} test \
+exec %{__make} test \
PHP_EXECUTABLE=%{__php} \
PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl pdo session" \
RUN_TESTS_SETTINGS="-q $*"
EOF
-
chmod +x run-tests.sh
-./run-tests.sh -w failed.log
-test -f failed.log -a ! -s failed.log
+
+./run-tests.sh
%endif
%install
gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/template-specs.git/commitdiff/67c043774a2a7e57337440b91528eae61f7a30ee
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[projects/template-specs] nagios-plug: nrpe example
commit c0cbefe81d4dc23a7d4c1439d49e25281eac4bb4
Author: Elan Ruusamäe
Date: Mon Oct 17 12:59:44 2016 +0300
nagios-plug: nrpe example
monitoring-plugin.spec | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/monitoring-plugin.spec b/monitoring-plugin.spec
index c9debe1..8919746 100644
--- a/monitoring-plugin.spec
+++ b/monitoring-plugin.spec
@@ -16,7 +16,7 @@ URL: -
# enable for Perl based plugins
#BuildRequires:perl-devel >= 1:5.8.0
#BuildRequires:rpm-perlprov >= 4.1-13
-#BuildRequires:rpmbuild(macros) >= 1.654
+BuildRequires: rpmbuild(macros) >= 1.685
Requires: nagios-common
# Requires:nagios-plugins-libs for utils.{sh,pm,php}, for Perl set
noautoreq for perl(utils)
#Requires: nagios-plugins-libs
@@ -76,11 +76,19 @@ install -p %{SOURCE0} $RPM_BUILD_ROOT%{plugindir}/%{plugin}
cp -p %{plugin}.cfg $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
sed -e 's,@plugindir@,%{plugindir},' %{SOURCE1} >
$RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/%{plugin}.cfg
+touch $RPM_BUILD_ROOT%{nrpeddir}/%{plugin}.cfg
%clean
rm -rf $RPM_BUILD_ROOT
+%triggerin -- nagios-nrpe
+%nagios_nrpe -a %{plugin} -f %{_sysconfdir}/%{plugin}.cfg
+
+%triggerun -- nagios-nrpe
+%nagios_nrpe -d %{plugin} -f %{_sysconfdir}/%{plugin}.cfg
+
%files
%defattr(644,root,root,755)
%attr(640,root,nagios) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/%{plugin}.cfg
%attr(755,root,root) %{plugindir}/%{plugin}
+%ghost %{nrpeddir}/%{plugin}.cfg
gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/template-specs.git/commitdiff/67c043774a2a7e57337440b91528eae61f7a30ee
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[projects/template-specs] golang: alternative install
commit 45e36d7d6fa7cd45216a44946f69a7ce851133d7
Author: Elan Ruusamäe
Date: Fri Nov 11 11:10:37 2016 +0200
golang: alternative install
golang-package.spec | 4
1 file changed, 4 insertions(+)
---
diff --git a/golang-package.spec b/golang-package.spec
index a57337b..146a14a 100644
--- a/golang-package.spec
+++ b/golang-package.spec
@@ -47,6 +47,10 @@ packages which use import path with %{import_path} prefix.
install -d src/$(dirname %{import_path})
ln -s ../../.. src/%{import_path}
+# alternative
+install -d src/$(dirname %{import_path})
+mv %{name}-%{version} src/%{import_path}
+
%build
export GOPATH=$(pwd)
gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/template-specs.git/commitdiff/67c043774a2a7e57337440b91528eae61f7a30ee
___
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-5.6.28.tar.xz
Request by: glen Files fetched: 1 STORED: http://www.php.net/distributions/php-5.6.28.tar.xz 1e01c66b2e67ab3b56a6180ee560fe4c php-5.6.28.tar.xz Size: 12441072 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/PHP_5_6] up to 5.6.28 - http://php.net/releases/5_6_28.php
commit ace288a1b13051170fdb2a4e3d47c8b042befa15
Author: Elan Ruusamäe
Date: Tue Nov 22 21:17:03 2016 +0200
up to 5.6.28 - http://php.net/releases/5_6_28.php
php.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/php.spec b/php.spec
index 2cc6529..0a693c4 100644
--- a/php.spec
+++ b/php.spec
@@ -160,7 +160,7 @@ Summary(pt_BR.UTF-8): A linguagem de script PHP
Summary(ru.UTF-8): PHP Версии 5 - язык препроцессирования HTML-файлов,
выполняемый на сервере
Summary(uk.UTF-8): PHP Версії 5 - мова препроцесування HTML-файлів,
виконувана на сервері
Name: %{orgname}%{php_suffix}
-Version: 5.6.27
+Version: 5.6.28
Release: %{rel}
Epoch: 4
# All files licensed under PHP version 3.01, except
@@ -169,7 +169,7 @@ Epoch: 4
License: PHP 3.01 and Zend and BSD
Group: Libraries
Source0: http://www.php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: 9ce6efc96d5ab81ef808f8ed6b1f242d
+# Source0-md5: 1e01c66b2e67ab3b56a6180ee560fe4c
Source2: %{orgname}-mod_%{orgname}.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/ace288a1b13051170fdb2a4e3d47c8b042befa15
___
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-memcached] igbinary support
commit cba71c6f920ef8371670646a8343a425a55e35d7
Author: Elan Ruusamäe
Date: Tue Nov 22 21:24:12 2016 +0200
igbinary support
tests fail, so not enabled yet
php-pecl-memcached.spec | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 09ec196..58abaa9 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -21,6 +21,7 @@ Source0:
https://github.com/php-memcached-dev/php-memcached/archive/php7/%{modna
# Source0-md5: df81b124ac101bd21922deb0ef2ad9b9
URL: http://pecl.php.net/package/memcached/
BuildRequires: %{php_name}-devel >= 4:7.0.0
+%{?with_igbinary:BuildRequires:%{php_name}-pecl-igbinary-devel}
%{?with_sasl:BuildRequires:cyrus-sasl-devel}
BuildRequires: fastlz-devel
BuildRequires: libmemcached-devel >= 1.0.18
@@ -30,11 +31,13 @@ BuildRequires: rpmbuild(macros) >= 1.650
BuildRequires: zlib-devel
%if %{with tests}
BuildRequires: %{php_name}-cli
-BuildRequires: %{php_name}-spl
+%{?with_igbinary:BuildRequires:%{php_name}-pecl-igbinary}
%{?with_session:BuildRequires: %{php_name}-session}
+BuildRequires: %{php_name}-spl
%endif
%{?requires_php_extension}
Suggests: %{php_name}-pecl-igbinary
+Suggests: %{php_name}-session
Provides: php(%{modname}) = %{version}
Obsoletes: php-pecl-memcached < 2.2.0-1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -72,6 +75,9 @@ phpize
%if %{with session}
-d extension=%{php_extensiondir}/session.so \
%endif
+%if %{with igbinary}
+ -d extension=%{php_extensiondir}/igbinary.so \
+%endif
-d extension=%{modname}.so \
-m > modules.log
grep %{modname} modules.log
@@ -79,8 +85,7 @@ grep %{modname} modules.log
export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
%{__make} test \
PHP_EXECUTABLE=%{__php} \
- PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl%{?with_session: session}"
-
+ PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl%{?with_session:
session}%{?with_igbinary: igbinary}"
%endif
%install
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/cba71c6f920ef8371670646a8343a425a55e35d7
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php] up to 7.0.13 - http://php.net/releases/7_0_13.php
commit 4dc11d45a49f3bc430598de2ab62e592d63d5bf6
Author: Elan Ruusamäe
Date: Tue Nov 22 20:40:20 2016 +0200
up to 7.0.13 - http://php.net/releases/7_0_13.php
php.spec | 8
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/php.spec b/php.spec
index 44d992c..878d74b 100644
--- a/php.spec
+++ b/php.spec
@@ -143,8 +143,8 @@ 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.0.12
-Release: 2
+Version: 7.0.13
+Release: 1
Epoch: 4
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
@@ -152,7 +152,7 @@ Epoch: 4
License: PHP 3.01 and Zend and BSD
Group: Libraries
Source0: http://php.net/distributions/%{orgname}-%{version}.tar.xz
-# Source0-md5: bdcc4dbdac90c2a39422786653059f70
+# Source0-md5: eb117bf1d1efc99c522f132b265a3402
Source2: %{orgname}-mod_php.conf
Source3: %{orgname}-cgi-fcgi.ini
Source4: %{orgname}-apache.ini
@@ -312,7 +312,7 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%definejsonver 1.4.0
%definepharver 2.0.2
%definesqlite3ver 0.7-dev
-%definezipver 1.13.4
+%definezipver 1.13.5
%definephpdbgver 0.5.0
%define_zend_zts %{!?with_zts:0}%{?with_zts:1}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/4dc11d45a49f3bc430598de2ab62e592d63d5bf6
___
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-7.0.13.tar.xz
Request by: glen Files fetched: 1 STORED: http://php.net/distributions/php-7.0.13.tar.xz eb117bf1d1efc99c522f132b265a3402 php-7.0.13.tar.xz Size: 12528816 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-igbinary: igbinary-2.0.0.tgz
Request by: glen Files fetched: 1 STORED: http://pecl.php.net/get/igbinary-2.0.0.tgz 89e1250807864d13df7b07710a187edf igbinary-2.0.0.tgz Size: 66049 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-igbinary] up to 2.0.0; php 5.2 - 7.0 support
commit 365972abce40348f97057e8b02736a02a72ad907
Author: Elan Ruusamäe
Date: Tue Nov 22 21:10:23 2016 +0200
up to 2.0.0; php 5.2 - 7.0 support
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 500b15a..1d03035 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: 1.2.0
+Version: 2.0.0
Release: 1
License: BSD
Group: Libraries
Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: 3755f17c73e7ef1fa022efd3b49d0573
+# Source0-md5: 89e1250807864d13df7b07710a187edf
Source2: %{modname}.ini
URL: http://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/365972abce40348f97057e8b02736a02a72ad907
___
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-memcached] run tests
commit f320a8b8923c273121e3b9ad3be493f03bbb5bce
Author: Elan Ruusamäe
Date: Tue Nov 22 21:07:15 2016 +0200
run tests
php-pecl-memcached.spec | 27 ++-
1 file changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 2b7c1ad..09ec196 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -5,6 +5,7 @@
%bcond_withmsgpack # memcached msgpack serializer support
%bcond_without sasl# memcached sasl support
%bcond_without session # memcached session handler support
+%bcond_without tests # build without tests
%definephp_namephp%{?php_suffix}
%definemodname memcached
@@ -13,7 +14,7 @@ Summary(pl.UTF-8):Interfejs do memcached z użyciem
biblioteki libmemcached
Name: %{php_name}-pecl-%{modname}
# PHP >= 7 only, for older PHP see 2.2.x branch
Version: 3.0.0
-Release: 0.2
+Release: 0.3
License: PHP 3.01
Group: Development/Languages/PHP
Source0:
https://github.com/php-memcached-dev/php-memcached/archive/php7/%{modname}-%{version}.tar.gz
@@ -27,6 +28,11 @@ BuildRequires: pkgconfig
BuildRequires: re2c
BuildRequires: rpmbuild(macros) >= 1.650
BuildRequires: zlib-devel
+%if %{with tests}
+BuildRequires: %{php_name}-cli
+BuildRequires: %{php_name}-spl
+%{?with_session:BuildRequires: %{php_name}-session}
+%endif
%{?requires_php_extension}
Suggests: %{php_name}-pecl-igbinary
Provides: php(%{modname}) = %{version}
@@ -58,6 +64,25 @@ phpize
--with-system-fastlz
%{__make}
+%if %{with tests}
+# simple module load test
+%{__php} -n -q \
+ -d extension_dir=modules \
+ -d extension=%{php_extensiondir}/spl.so \
+%if %{with session}
+ -d extension=%{php_extensiondir}/session.so \
+%endif
+ -d extension=%{modname}.so \
+ -m > modules.log
+grep %{modname} modules.log
+
+export NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2
+%{__make} test \
+ PHP_EXECUTABLE=%{__php} \
+ PHP_TEST_SHARED_SYSTEM_EXTENSIONS="spl%{?with_session: session}"
+
+%endif
+
%install
rm -rf $RPM_BUILD_ROOT
%{__make} install \
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/f320a8b8923c273121e3b9ad3be493f03bbb5bce
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/i8kutils] - tools need to be in bindir
commit 4ab196c23b9a021980c6890bbd3df6b77d7ca85e
Author: Arkadiusz Miśkiewicz
Date: Tue Nov 22 20:03:33 2016 +0100
- tools need to be in bindir
i8kutils.spec | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/i8kutils.spec b/i8kutils.spec
index acea5bb..a971042 100644
--- a/i8kutils.spec
+++ b/i8kutils.spec
@@ -42,7 +42,7 @@ chłodzących i przycisków głośności.
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}
+install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
install -d $RPM_BUILD_ROOT%{_mandir}/man1
@@ -53,7 +53,7 @@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
cp -p i8kctl.1 i8kmon.1 $RPM_BUILD_ROOT%{_mandir}/man1
cp -p i8kctl i8kfan i8kmon probe_i8k_calls_time \
- $RPM_BUILD_ROOT%{_sbindir}
+ $RPM_BUILD_ROOT%{_bindir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -72,10 +72,10 @@ echo
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/i8kmon.conf
%attr(754,root,root) /etc/rc.d/init.d/i8kutils
%attr(755,root,root) %{_bindir}/i8kbuttons.aumix
-%attr(755,root,root) %{_sbindir}/i8kctl
-%attr(755,root,root) %{_sbindir}/i8kfan
-%attr(755,root,root) %{_sbindir}/i8kmon
-%attr(755,root,root) %{_sbindir}/probe_i8k_calls_time
+%attr(755,root,root) %{_bindir}/i8kctl
+%attr(755,root,root) %{_bindir}/i8kfan
+%attr(755,root,root) %{_bindir}/i8kmon
+%attr(755,root,root) %{_bindir}/probe_i8k_calls_time
%{_mandir}/man1/i8kctl.1*
%{_mandir}/man1/i8kmon.1*
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/i8kutils.git/commitdiff/4ab196c23b9a021980c6890bbd3df6b77d7ca85e
___
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-memcached] add bconds for all features
commit 8a94fd63c2dd3a0f6cd3f38af5564c93f6bb2e73
Author: Elan Ruusamäe
Date: Tue Nov 22 21:02:06 2016 +0200
add bconds for all features
php-pecl-memcached.spec | 21 +
1 file changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 9638049..2b7c1ad 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -1,17 +1,26 @@
+#
+# Conditional build:
+%bcond_withigbinary# memcached igbinary serializer support
+%bcond_without json# memcached json serializer support
+%bcond_withmsgpack # memcached msgpack serializer support
+%bcond_without sasl# memcached sasl support
+%bcond_without session # memcached session handler support
+
%definephp_namephp%{?php_suffix}
%definemodname memcached
Summary: Interface to memcached via libmemcached library
Summary(pl.UTF-8): Interfejs do memcached z użyciem biblioteki libmemcached
Name: %{php_name}-pecl-%{modname}
+# PHP >= 7 only, for older PHP see 2.2.x branch
Version: 3.0.0
-Release: 0.1
+Release: 0.2
License: PHP 3.01
Group: Development/Languages/PHP
Source0:
https://github.com/php-memcached-dev/php-memcached/archive/php7/%{modname}-%{version}.tar.gz
# Source0-md5: df81b124ac101bd21922deb0ef2ad9b9
URL: http://pecl.php.net/package/memcached/
BuildRequires: %{php_name}-devel >= 4:7.0.0
-BuildRequires: cyrus-sasl-devel
+%{?with_sasl:BuildRequires:cyrus-sasl-devel}
BuildRequires: fastlz-devel
BuildRequires: libmemcached-devel >= 1.0.18
BuildRequires: pkgconfig
@@ -41,8 +50,12 @@ rm fastlz/fastlz.c
%build
phpize
%configure \
- --with-system-fastlz \
- --enable-memcached-json
+ %{__enable_disable igbinary memcached-igbinary} \
+ %{__enable_disable json memcached-json} \
+ %{__enable_disable msgpack memcached-msgpack} \
+ %{__enable_disable sasl memcached-sasl} \
+ %{__enable_disable session memcached-session} \
+ --with-system-fastlz
%{__make}
%install
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/8a94fd63c2dd3a0f6cd3f38af5564c93f6bb2e73
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/i8kutils] - up to 1.42
commit cc13fba727a493d266a958f5d0de020392f8a71a
Author: Arkadiusz Miśkiewicz
Date: Tue Nov 22 20:01:28 2016 +0100
- up to 1.42
i8kutils-build.patch | 11 +++
i8kutils.spec| 51 ++-
2 files changed, 41 insertions(+), 21 deletions(-)
---
diff --git a/i8kutils.spec b/i8kutils.spec
index dfe2a87..acea5bb 100644
--- a/i8kutils.spec
+++ b/i8kutils.spec
@@ -1,20 +1,21 @@
Summary: User-space programs for Dell Inspiron and Latitude laptops
Summary(pl.UTF-8): Programy przestrzeni użytkownika dla laptopów Dell
Inspiron i Latitude
Name: i8kutils
-Version: 1.25
+Version: 1.42
Release: 1
License: GPL
Group: Applications/System
-Source0: http://people.debian.org/~dz/i8k/%{name}_%{version}.tar.gz
-# Source0-md5: 50c03dde689c5709406118a7c6c120db
+Source0:
https://launchpad.net/i8kutils/trunk/%{version}/+download/%{name}_%{version}.tar.xz
+# Source0-md5: 7470b2908b39a41e3f26b8b3398e189d
+Patch0:%{name}-build.patch
Source1: %{name}.init
Source2: i8kbuttons.aumix
Source3: i8kbuttons.conf
-URL: http://people.debian.org/~dz/i8k/
+URL: https://launchpad.net/i8kutils
Requires: aumix
-Requires: tcl
-Requires: tk
-ExclusiveArch: %{ix86}
+Requires: tcl
+Requires: tk
+ExclusiveArch: %{ix86} %{x8664}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -31,27 +32,28 @@ APM i dostępu do specyficznego sprzętu, na przykład
wiatraczków
chłodzących i przycisków głośności.
%prep
-%setup -q
+%setup -q -n %{name}
+%patch0 -p1
%build
%{__make} \
CC="%{__cc}" \
- CFLAGS="%{rpmcflags} -Wall"
+ CFLAGS="%{rpmcppflags} %{rpmcflags} -Wall"
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}
install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install i8kmon.conf $RPM_BUILD_ROOT%{_sysconfdir}
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
-install i8kbuttons.1 i8kctl.1 i8kmon.1 $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p i8kmon.conf $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}
+cp -p i8kctl.1 i8kmon.1 $RPM_BUILD_ROOT%{_mandir}/man1
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
+cp -p i8kctl i8kfan i8kmon probe_i8k_calls_time \
+ $RPM_BUILD_ROOT%{_sbindir}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -65,8 +67,15 @@ echo
%files
%defattr(644,root,root,755)
-%doc README.i8kutils examples
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
+%doc README.i8kutils TODO
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/i8kbuttons.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/i8kmon.conf
%attr(754,root,root) /etc/rc.d/init.d/i8kutils
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man*/*
+%attr(755,root,root) %{_bindir}/i8kbuttons.aumix
+%attr(755,root,root) %{_sbindir}/i8kctl
+%attr(755,root,root) %{_sbindir}/i8kfan
+%attr(755,root,root) %{_sbindir}/i8kmon
+%attr(755,root,root) %{_sbindir}/probe_i8k_calls_time
+%{_mandir}/man1/i8kctl.1*
+%{_mandir}/man1/i8kmon.1*
+
diff --git a/i8kutils-build.patch b/i8kutils-build.patch
new file mode 100644
index 000..e22ed5e
--- /dev/null
+++ b/i8kutils-build.patch
@@ -0,0 +1,11 @@
+--- a/probe_i8k_calls_time.c~ 2014-12-03 23:58:02.0 +0100
b/probe_i8k_calls_time.c 2016-11-22 19:54:03.570717551 +0100
+@@ -13,7 +13,7 @@
+
+ struct timespec tmst;
+
+-inline double timestamp()
++double timestamp()
+ {
+ clock_gettime(CLOCK_REALTIME, &tmst);
+ t = tmst.tv_nsec;
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/i8kutils.git/commitdiff/cc13fba727a493d266a958f5d0de020392f8a71a
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: i8kutils: i8kutils_1.42.tar.xz
Request by: arekm Files fetched: 1 STORED: https://launchpad.net/i8kutils/trunk/1.42/+download/i8kutils_1.42.tar.xz 7470b2908b39a41e3f26b8b3398e189d i8kutils_1.42.tar.xz Size: 37544 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-memcached] min php version is 7.0.0
commit c3fa9f03087bdd545280a456e194bf72c9275b2c
Author: Elan Ruusamäe
Date: Tue Nov 22 20:45:27 2016 +0200
min php version is 7.0.0
php-pecl-memcached.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 0a14f27..8b73cb4 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -10,7 +10,7 @@ Group:Development/Languages/PHP
Source0:
https://github.com/php-memcached-dev/php-memcached/archive/php7/%{modname}-%{version}.tar.gz
# Source0-md5: df81b124ac101bd21922deb0ef2ad9b9
URL: http://pecl.php.net/package/memcached/
-BuildRequires: %{php_name}-devel >= 4:5.2.0
+BuildRequires: %{php_name}-devel >= 4:7.0.0
BuildRequires: cyrus-sasl-devel
BuildRequires: fastlz-devel
BuildRequires: libmemcached-devel >= 1.0.18
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/c3fa9f03087bdd545280a456e194bf72c9275b2c
___
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-memcached] update BR
commit b39e72bc4d9eb903ca5625f34e178f1a268512ba
Author: Elan Ruusamäe
Date: Tue Nov 22 20:53:20 2016 +0200
update BR
- pkgconfig -- checking for pkg-config... no
- re2c -- configure:3824: checking for re2c
php-pecl-memcached.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 8b73cb4..9638049 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -14,6 +14,8 @@ BuildRequires:%{php_name}-devel >= 4:7.0.0
BuildRequires: cyrus-sasl-devel
BuildRequires: fastlz-devel
BuildRequires: libmemcached-devel >= 1.0.18
+BuildRequires: pkgconfig
+BuildRequires: re2c
BuildRequires: rpmbuild(macros) >= 1.650
BuildRequires: zlib-devel
%{?requires_php_extension}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/b39e72bc4d9eb903ca5625f34e178f1a268512ba
___
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-memcached] Created branch 2.2.x
The branch '2.2.x' was created pointing to: d30795a... - obsolete old php name - release 2 (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-pecl-memcached] libmemcached-devel dep from package.xml
commit 6668157e91d290e5183ab11b42b849e9c0962ad4
Author: Elan Ruusamäe
Date: Tue Nov 22 20:44:32 2016 +0200
libmemcached-devel dep from package.xml
php-pecl-memcached.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index ab95391..86f7e60 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -13,7 +13,7 @@ URL: http://pecl.php.net/package/memcached/
BuildRequires: %{php_name}-devel >= 4:5.2.0
BuildRequires: cyrus-sasl-devel
BuildRequires: fastlz-devel
-BuildRequires: libmemcached-devel >= 1.0
+BuildRequires: libmemcached-devel >= 1.0.2
BuildRequires: rpmbuild(macros) >= 1.650
BuildRequires: zlib-devel
%{?requires_php_extension}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/b791cdba7ad889b19618127b78c5651b9d9c944a
___
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-memcached: memcached-3.0.0.tar.gz
Request by: glen Files fetched: 1 STORED: https://github.com/php-memcached-dev/php-memcached/archive/php7/memcached-3.0.0.tar.gz df81b124ac101bd21922deb0ef2ad9b9 memcached-3.0.0.tar.gz Size: 81988 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-memcached] use recommended version
commit b791cdba7ad889b19618127b78c5651b9d9c944a
Author: Elan Ruusamäe
Date: Tue Nov 22 20:44:57 2016 +0200
use recommended version
php-pecl-memcached.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 86f7e60..0a14f27 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -13,7 +13,7 @@ URL: http://pecl.php.net/package/memcached/
BuildRequires: %{php_name}-devel >= 4:5.2.0
BuildRequires: cyrus-sasl-devel
BuildRequires: fastlz-devel
-BuildRequires: libmemcached-devel >= 1.0.2
+BuildRequires: libmemcached-devel >= 1.0.18
BuildRequires: rpmbuild(macros) >= 1.650
BuildRequires: zlib-devel
%{?requires_php_extension}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/b791cdba7ad889b19618127b78c5651b9d9c944a
___
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-memcached] up to 3.0.0b1 git snapshot from php7 branch; php7 support
commit 32929cc670b8e8668eaa2f7dcf31082f1bdf6575
Author: Elan Ruusamäe
Date: Tue Nov 22 20:42:05 2016 +0200
up to 3.0.0b1 git snapshot from php7 branch; php7 support
php-pecl-memcached.spec | 17 ++---
1 file changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index b710534..50d2dff 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -1,15 +1,14 @@
%definephp_namephp%{?php_suffix}
%definemodname memcached
-%definestatus stable
Summary: Interface to memcached via libmemcached library
Summary(pl.UTF-8): Interfejs do memcached z użyciem biblioteki libmemcached
Name: %{php_name}-pecl-%{modname}
-Version: 2.2.0
-Release: 2
+Version: 3.0.0
+Release: 0.1
License: PHP 3.01
Group: Development/Languages/PHP
-Source0: http://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: 28937c6144f734e000c6300242f44ce6
+Source0:
https://github.com/php-memcached-dev/php-memcached/archive/php7/%{modname}-%{version}.tar.gz
+# Source0-md5: df81b124ac101bd21922deb0ef2ad9b9
URL: http://pecl.php.net/package/memcached/
BuildRequires: %{php_name}-devel >= 4:5.2.0
BuildRequires: cyrus-sasl-devel
@@ -26,17 +25,13 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
This extension uses libmemcached library to provide API for
communicating with memcached servers.
-In PECL status of this extension is: %{status}.
-
%description -l pl.UTF-8
Rozszerzenie to wykorzystuje bibliotekę memcached w celu udostępnienia
API do komunikacji z serwerami memcached.
-To rozszerzenie ma w PECL status: %{status}.
-
%prep
-%setup -q -c
-mv %{modname}-%{version}/* .
+%setup -qc
+mv php-memcached-*/{.??*,*} .
%build
phpize
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/b791cdba7ad889b19618127b78c5651b9d9c944a
___
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-memcached] use system fastlz
commit 2ef5d149f59c9083bb952232ee5209b43a325a0c
Author: Elan Ruusamäe
Date: Tue Nov 22 20:43:53 2016 +0200
use system fastlz
php-pecl-memcached.spec | 4
1 file changed, 4 insertions(+)
---
diff --git a/php-pecl-memcached.spec b/php-pecl-memcached.spec
index 50d2dff..ab95391 100644
--- a/php-pecl-memcached.spec
+++ b/php-pecl-memcached.spec
@@ -12,6 +12,7 @@ Source0:
https://github.com/php-memcached-dev/php-memcached/archive/php7/%{modna
URL: http://pecl.php.net/package/memcached/
BuildRequires: %{php_name}-devel >= 4:5.2.0
BuildRequires: cyrus-sasl-devel
+BuildRequires: fastlz-devel
BuildRequires: libmemcached-devel >= 1.0
BuildRequires: rpmbuild(macros) >= 1.650
BuildRequires: zlib-devel
@@ -33,9 +34,12 @@ API do komunikacji z serwerami memcached.
%setup -qc
mv php-memcached-*/{.??*,*} .
+rm fastlz/fastlz.c
+
%build
phpize
%configure \
+ --with-system-fastlz \
--enable-memcached-json
%{__make}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php-pecl-memcached.git/commitdiff/b791cdba7ad889b19618127b78c5651b9d9c944a
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dehydrated] add nginx config and webapp config
commit aebe760fc1feb670b4bf2dd1584bdcfac238fe00
Author: Elan Ruusamäe
Date: Tue Nov 22 20:13:33 2016 +0200
add nginx config and webapp config
dehydrated.spec | 11 ++-
hook.sh | 10 +-
2 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/dehydrated.spec b/dehydrated.spec
index 56089e5..8402a19 100644
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,13 +1,14 @@
Summary: letsencrypt/acme client implemented as a shell-script
Name: dehydrated
Version: 0.3.1
-Release: 0.5
+Release: 0.6
License: MIT
Group: Applications/Networking
Source0:
https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
# Source0-md5: 7a3b92b963da6469c4a53f051d6efa24
Source1: apache.conf
Source2: lighttpd.conf
+Source3: nginx.conf
Source4: domains.txt
Source5: hook.sh
Source6: crontab
@@ -57,6 +58,7 @@ install -d
$RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/certs,/etc/cron.d} \
install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/nginx.conf
cp -p docs/examples/config $RPM_BUILD_ROOT%{_sysconfdir}
cp -p %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}
cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/cron.d/%{name}
@@ -84,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT
%triggerun -- lighttpd
%webapp_unregister lighttpd %{_webapp}
+%triggerin -- nginx
+%webapp_register nginx %{_webapp}
+
+%triggerun -- nginx
+%webapp_unregister nginx %{_webapp}
+
%files
%defattr(644,root,root,755)
%doc README.md CHANGELOG LICENSE
@@ -92,6 +100,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/httpd.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/lighttpd.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/nginx.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/config
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/domains.txt
%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/hook.sh
diff --git a/hook.sh b/hook.sh
index 7440c12..cc44c4e 100755
--- a/hook.sh
+++ b/hook.sh
@@ -14,11 +14,11 @@ deploy_cert)
cat "$FULLCHAINCERT" "$PRIVKEY" > /etc/lighttpd/server.pem
/sbin/service lighttpd reload
fi
- if [ -f /etc/nginx/server.pem -a -f /etc/nginx/server.key ]; then
- echo " + Hook: Overwritting /etc/nginx/server.{pem,key} and
reloading nginx..."
- cp -a /etc/nginx/server.pem /etc/nginx/server.pem.letsencrypt~
- cp -a /etc/nginx/server.key /etc/nginx/server.key.letsencrypt~
- cat "$FULLCHAINCERT" > /etc/nginx/server.pem
+ if [ -f /etc/nginx/server.crt -a -f /etc/nginx/server.key ]; then
+ echo " + Hook: Overwritting /etc/nginx/server.{crt,key} and
reloading nginx..."
+ cp -a /etc/nginx/server.crt /etc/nginx/server.crt.letsencrypt~
+ cp -a /etc/nginx/server.crt /etc/nginx/server.key.letsencrypt~
+ cat "$FULLCHAINCERT" > /etc/nginx/server.crt
cat "$PRIVKEY" > /etc/nginx/server.key
/sbin/service nginx reload
fi
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dehydrated.git/commitdiff/657cacc73854a26bfe7eda50a917aad096393546
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dehydrated] scan /etc/webapps/dehydrated for config
commit 657cacc73854a26bfe7eda50a917aad096393546
Author: Elan Ruusamäe
Date: Tue Nov 22 20:20:23 2016 +0200
scan /etc/webapps/dehydrated for config
or should we move app config to /etc/dehydrated?
dehydrated.spec | 2 +-
pld.patch | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/dehydrated.spec b/dehydrated.spec
index 8402a19..db23dea 100644
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,7 +1,7 @@
Summary: letsencrypt/acme client implemented as a shell-script
Name: dehydrated
Version: 0.3.1
-Release: 0.6
+Release: 0.10
License: MIT
Group: Applications/Networking
Source0:
https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
diff --git a/pld.patch b/pld.patch
index f852bea..d9a90f1 100644
--- a/pld.patch
+++ b/pld.patch
@@ -11,7 +11,7 @@
# Check for config in various locations
if [[ -z "${CONFIG:-}" ]]; then
-for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated"
"${PWD}" "${SCRIPTDIR}"; do
-+for check_config in "/etc/dehydrated" "/usr/local/etc/dehydrated"
"/etc/webapps/letsencrypt.sh" "${PWD}" "${SCRIPTDIR}"; do
++for check_config in "/etc/dehydrated" "/etc/webapps/dehydrated"
"/usr/local/etc/dehydrated" "/etc/webapps/letsencrypt.sh" "${PWD}"
"${SCRIPTDIR}"; do
if [[ -f "${check_config}/config" ]]; then
BASEDIR="${check_config}"
CONFIG="${check_config}/config"
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dehydrated.git/commitdiff/657cacc73854a26bfe7eda50a917aad096393546
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dehydrated] add certs dir, also in /var
commit e354c9b638fd6760cf4e57f61b0396888522a057
Author: Elan Ruusamäe
Date: Tue Nov 22 20:03:32 2016 +0200
add certs dir, also in /var
dehydrated.spec | 6 +++---
pld.patch | 24 +---
2 files changed, 20 insertions(+), 10 deletions(-)
---
diff --git a/dehydrated.spec b/dehydrated.spec
index ac2b9ae..56089e5 100644
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,7 +1,7 @@
Summary: letsencrypt/acme client implemented as a shell-script
Name: dehydrated
Version: 0.3.1
-Release: 0.4
+Release: 0.5
License: MIT
Group: Applications/Networking
Source0:
https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -52,7 +52,7 @@ Current features:
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/certs,/etc/cron.d} \
- $RPM_BUILD_ROOT/var/lib/%{name}/{accounts,acme-challenge}
+ $RPM_BUILD_ROOT/var/lib/%{name}/{accounts,acme-challenge,certs}
install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -89,7 +89,6 @@ rm -rf $RPM_BUILD_ROOT
%doc README.md CHANGELOG LICENSE
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/cron.d/%{name}
%dir %attr(750,root,http) %{_sysconfdir}
-%dir %attr(700,root,root) %{_sysconfdir}/certs
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/apache.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/httpd.conf
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/lighttpd.conf
@@ -99,5 +98,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_sbindir}/%{name}
%dir %attr(751,root,root) /var/lib/%{name}
%dir %attr(700,root,root) /var/lib/%{name}/accounts
+%dir %attr(700,root,root) /var/lib/%{name}/certs
# challenges written here, need to be readable by webserver
%dir %attr(751,root,root) /var/lib/%{name}/acme-challenge
diff --git a/pld.patch b/pld.patch
index 1244848..f852bea 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
dehydrated-0.3.1/dehydrated2016-10-17 22:03:54.184281322 +0300
-+++ dehydrated-0.3.1/dehydrated2016-11-22 19:57:26.978516490 +0200
+--- dehydrated-0.3.1/dehydrated2016-11-22 19:57:26.978516490 +0200
dehydrated-0.3.1/dehydrated2016-11-22 20:01:59.118747292 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
@@ -24,18 +24,28 @@
mkdir -p "${ACCOUNTDIR}/${CAHASH}"
[[ -f "${ACCOUNTDIR}/${CAHASH}/config" ]] && .
"${ACCOUNTDIR}/${CAHASH}/config"
ACCOUNT_KEY="${ACCOUNTDIR}/${CAHASH}/account_key.pem"
-@@ -181,7 +181,7 @@
+@@ -179,9 +179,9 @@
+ mv "${BASEDIR}/private_key.json" "${ACCOUNT_KEY_JSON}"
+ fi
- [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
+- [[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
++ [[ -z "${CERTDIR}" ]] && CERTDIR="/var/lib/dehydrated/certs"
[[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt"
- [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated"
+ [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated/acme-challenge"
[[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
[[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE=""
dehydrated-0.3.1/docs/examples/config~ 2016-09-13 21:00:43.0
+0300
-+++ dehydrated-0.3.1/docs/examples/config 2016-10-17 22:32:37.370663315
+0300
-@@ -43,7 +43,7 @@
+--- dehydrated-0.3.1/docs/examples/config 2016-10-17 22:32:37.370663315
+0300
dehydrated-0.3.1/docs/examples/config 2016-11-22 20:02:34.173827857
+0200
+@@ -37,13 +37,13 @@
+ #DOMAINS_TXT="${BASEDIR}/domains.txt"
+
+ # Output directory for generated certificates
+-#CERTDIR="${BASEDIR}/certs"
++#CERTDIR="/var/lib/dehydrated/certs"
+
+ # Directory for account keys and registration information
#ACCOUNTDIR="${BASEDIR}/accounts"
# Output directory for challenge-tokens to be served by webserver or deployed
in HOOK (default: /var/www/dehydrated)
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dehydrated.git/commitdiff/e354c9b638fd6760cf4e57f61b0396888522a057
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/dehydrated] move acme-challenge and accounts to /var/lib
commit f19ccd973862fc9a910698aba90763026205bff0
Author: Elan Ruusamäe
Date: Tue Nov 22 20:00:52 2016 +0200
move acme-challenge and accounts to /var/lib
/etc is not the real place for this kind of files
apache.conf | 4 ++--
dehydrated.spec | 10 ++
lighttpd.conf | 2 +-
nginx.conf | 2 +-
pld.patch | 17 +
5 files changed, 23 insertions(+), 12 deletions(-)
---
diff --git a/dehydrated.spec b/dehydrated.spec
index 5d653dc..ac2b9ae 100644
--- a/dehydrated.spec
+++ b/dehydrated.spec
@@ -1,7 +1,7 @@
Summary: letsencrypt/acme client implemented as a shell-script
Name: dehydrated
Version: 0.3.1
-Release: 0.1
+Release: 0.4
License: MIT
Group: Applications/Networking
Source0:
https://github.com/lukas2511/dehydrated/archive/v%{version}/%{name}-%{version}.tar.gz
@@ -32,7 +32,6 @@ BuildRoot:%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define_webapp %{name}
%define_sysconfdir %{_webapps}/%{_webapp}
%define_appdir %{_datadir}/%{_webapp}
-%definechallengedir/var/lib/%{name}
%description
This is a client for signing certificates with an ACME-server
@@ -52,7 +51,8 @@ Current features:
%install
rm -rf $RPM_BUILD_ROOT
-install -d
$RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/certs,/etc/cron.d,%{challengedir}}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}/certs,/etc/cron.d} \
+ $RPM_BUILD_ROOT/var/lib/%{name}/{accounts,acme-challenge}
install -p %{name} $RPM_BUILD_ROOT%{_sbindir}
cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
@@ -97,5 +97,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/domains.txt
%attr(750,root,root) %config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/hook.sh
%attr(755,root,root) %{_sbindir}/%{name}
+%dir %attr(751,root,root) /var/lib/%{name}
+%dir %attr(700,root,root) /var/lib/%{name}/accounts
# challenges written here, need to be readable by webserver
-%dir %attr(751,root,root) %{challengedir}
+%dir %attr(751,root,root) /var/lib/%{name}/acme-challenge
diff --git a/apache.conf b/apache.conf
index 1aa893e..259f9e8 100644
--- a/apache.conf
+++ b/apache.conf
@@ -1,5 +1,5 @@
-Alias /.well-known/acme-challenge /var/lib/dehydrated
-
+Alias /.well-known/acme-challenge /var/lib/dehydrated/acme-challenge
+
# Apache 2.x
Order allow,deny
diff --git a/lighttpd.conf b/lighttpd.conf
index ce965aa..498336b 100644
--- a/lighttpd.conf
+++ b/lighttpd.conf
@@ -1,3 +1,3 @@
alias.url += (
- "/.well-known/acme-challenge" => "/var/lib/dehydrated",
+ "/.well-known/acme-challenge" => "/var/lib/dehydrated/acme-challenge",
)
diff --git a/nginx.conf b/nginx.conf
index cecb2ba..b8060db 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,3 +1,3 @@
location /.well-known/acme-challenge {
- alias /etc/webapps/letsencrypt.sh/acme-challenges;
+ alias /var/lib/dehydrated/acme-challenge;
}
diff --git a/pld.patch b/pld.patch
index cb9d7da..1244848 100644
--- a/pld.patch
+++ b/pld.patch
@@ -1,5 +1,5 @@
dehydrated-0.3.1/dehydrated2016-05-14 15:51:55.0 +0300
-+++ dehydrated-0.3.1/dehydrated2016-10-17 22:03:54.184281322 +0300
+--- dehydrated-0.3.1/dehydrated2016-10-17 22:03:54.184281322 +0300
dehydrated-0.3.1/dehydrated2016-11-22 19:57:26.978516490 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
@@ -15,12 +15,21 @@
if [[ -f "${check_config}/config" ]]; then
BASEDIR="${check_config}"
CONFIG="${check_config}/config"
+@@ -164,7 +164,7 @@
+ [[ -d "${BASEDIR}" ]] || _exiterr "BASEDIR does not exist: ${BASEDIR}"
+
+ CAHASH="$(echo "${CA}" | urlbase64)"
+- [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="${BASEDIR}/accounts"
++ [[ -z "${ACCOUNTDIR}" ]] && ACCOUNTDIR="/var/lib/dehydrated/accounts"
+ mkdir -p "${ACCOUNTDIR}/${CAHASH}"
+ [[ -f "${ACCOUNTDIR}/${CAHASH}/config" ]] && .
"${ACCOUNTDIR}/${CAHASH}/config"
+ ACCOUNT_KEY="${ACCOUNTDIR}/${CAHASH}/account_key.pem"
@@ -181,7 +181,7 @@
[[ -z "${CERTDIR}" ]] && CERTDIR="${BASEDIR}/certs"
[[ -z "${DOMAINS_TXT}" ]] && DOMAINS_TXT="${BASEDIR}/domains.txt"
- [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/www/dehydrated"
-+ [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated"
++ [[ -z "${WELLKNOWN}" ]] && WELLKNOWN="/var/lib/dehydrated/acme-challenge"
[[ -z "${LOCKFILE}" ]] && LOCKFILE="${BASEDIR}/lock"
[[ -n "${PARAM_NO_LOCK:-}" ]] && LOCKFILE=""
@@ -31,7 +40,7 @@
# Output directory for challenge-tokens to be served by webserver or deployed
in HOOK (default: /var/www/dehydrated)
-#WELLKNOWN="/var/www/dehydrated"
-+#WELLKNOWN="/var/lib/dehydrated"
++#WELLKNOWN="/var/lib/dehydrated/acme-challenge"
# Default keysize for private keys (default: 4096)
#KEYSIZE="4096"
[packages/dehydrated] nginx package and binary names were sanitized
commit 00916b47529e16f21c14303bfbb82f18ef2b33ec
Author: Elan Ruusamäe
Date: Tue Nov 22 19:52:41 2016 +0200
nginx package and binary names were sanitized
hook.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/hook.sh b/hook.sh
index 6210d40..7440c12 100755
--- a/hook.sh
+++ b/hook.sh
@@ -15,14 +15,12 @@ deploy_cert)
/sbin/service lighttpd reload
fi
if [ -f /etc/nginx/server.pem -a -f /etc/nginx/server.key ]; then
- nginx="nginx-standard"
- [ -x /etc/rc.d/init.d/nginx-light ] && nginx="nginx-light"
echo " + Hook: Overwritting /etc/nginx/server.{pem,key} and
reloading nginx..."
cp -a /etc/nginx/server.pem /etc/nginx/server.pem.letsencrypt~
cp -a /etc/nginx/server.key /etc/nginx/server.key.letsencrypt~
cat "$FULLCHAINCERT" > /etc/nginx/server.pem
cat "$PRIVKEY" > /etc/nginx/server.key
- /sbin/service "$nginx" reload
+ /sbin/service nginx reload
fi
if [ -x /etc/rc.d/init.d/httpd ]; then
echo " + Hook: Reloading Apache..."
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/dehydrated.git/commitdiff/00916b47529e16f21c14303bfbb82f18ef2b33ec
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: nginx: nginx-1.11.6.tar.gz favicon.ico modsecurity-2.9.1.tar.gz nginx-rtmp-module-1.1.7.tar.gz
Request by: glen Files fetched: 1 STORED: http://nginx.org/download/nginx-1.11.6.tar.gz 4e29a07a7c74376fa032e5af0d1c5369 nginx-1.11.6.tar.gz Size: 960331 bytes ALREADY GOT: http://nginx.net/favicon.ico 2aaf2115c752cbdbfb8a2f0b3c3189ab favicon.ico ALREADY GOT: http://www.modsecurity.org/tarball/2.9.1/modsecurity-2.9.1.tar.gz 0fa92b852abc857a20b9e24f83f814cf modsecurity-2.9.1.tar.gz ALREADY GOT: https://github.com/arut/nginx-rtmp-module/archive/v1.1.7/nginx-rtmp-module-1.1.7.tar.gz 8006de2560db3e55bb15d110220076ac nginx-rtmp-module-1.1.7.tar.gz -- 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/nginx] up to 1.11.6
commit 8043f2ed985d906f2aec978036cc9327e12ec5c9
Author: Elan Ruusamäe
Date: Tue Nov 22 17:52:43 2016 +0200
up to 1.11.6
nginx.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/nginx.spec b/nginx.spec
index 78af7ef..efaddbb 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -41,12 +41,12 @@ Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej
wydajności
# - stable: production quality with stable API
# - mainline: production quality but API can change
Name: nginx
-Version: 1.11.5
-Release: 3
+Version: 1.11.6
+Release: 1
License: BSD-like
Group: Networking/Daemons/HTTP
Source0: http://nginx.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: db43f2b19746f6f47401c3afc3924dc6
+# Source0-md5: 4e29a07a7c74376fa032e5af0d1c5369
Source1: http://nginx.net/favicon.ico
# Source1-md5: 2aaf2115c752cbdbfb8a2f0b3c3189ab
Source2: proxy.conf
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nginx.git/commitdiff/8043f2ed985d906f2aec978036cc9327e12ec5c9
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/lizardfs] Disable judy on x32. Seems be broken.
commit 211e462ddd34d749340391dd28ff327ddd25bbfe
Author: Mateusz Korniak
Date: Tue Nov 22 12:52:23 2016 +0100
Disable judy on x32. Seems be broken.
lizardfs.spec | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
---
diff --git a/lizardfs.spec b/lizardfs.spec
index d266a8f..509ea5b 100644
--- a/lizardfs.spec
+++ b/lizardfs.spec
@@ -1,12 +1,13 @@
# TODO:
# - systemd service files to metalogger, cgiserver packages
# - Fix cgiserver
+# - fix judy lib usage on x32 arch
Summary: Open Source Distributed File System
Summary(pl.UTF-8): Rozporoszony system plików Open Source
Name: lizardfs
Version: 3.10.4
-Release: 0.1
+Release: 0.2
License: GPL v3
Group: Applications
Source0: https://github.com/lizardfs/lizardfs/archive/v%{version}.tar.gz
@@ -20,11 +21,19 @@ BuildRequires: asciidoc
BuildRequires: boost-devel
BuildRequires: cmake >= 3.4.0
BuildRequires: crcutil-devel >= 1.0
+BuildRequires: db5.3-devel
BuildRequires: docbook-dtd45-xml
+%ifarch x32
+BuildConflicts:judy-devel
+%else
+BuildRequires: judy-devel
+%endif
BuildRequires: libfuse-devel
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.647
BuildRequires: zlib-devel
+
+
Requires(post,preun,postun): systemd-units >= 38
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lizardfs.git/commitdiff/211e462ddd34d749340391dd28ff327ddd25bbfe
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php] use alternatives for php-fpm binary
commit 745b64970382adb197da8fe8aea3f9460335dd56
Author: Elan Ruusamäe
Date: Mon Nov 21 19:11:00 2016 +0200
use alternatives for php-fpm binary
php.spec | 7 +++
1 file changed, 7 insertions(+)
---
diff --git a/php.spec b/php.spec
index af3fb91..44d992c 100644
--- a/php.spec
+++ b/php.spec
@@ -482,6 +482,7 @@ Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
Requires(pre): /usr/sbin/useradd
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: alternatives
Requires: php-dirs >= 1.4-2
Requires: rc-scripts
Provides: php(fcgi)
@@ -2595,6 +2596,9 @@ cp -p %{SOURCE11}
$RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
%{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
%endif
+# touch for ghost for alternatives
+touch $RPM_BUILD_ROOT%{_sbindir}/php-fpm
+
%{__sed} -i -e '
s#/usr/lib/php#%{php_extensiondir}#
s#/etc/php/#%{_sysconfdir}/#
@@ -2692,11 +2696,13 @@ fi
%post fpm
/sbin/chkconfig --add %{name}-fpm
%service %{name}-fpm restart
+update-alternatives --install %{_sbindir}/php-fpm php-fpm
%{_sbindir}/php%{ver_suffix}-fpm %{ver_suffix} || :
%preun fpm
if [ "$1" = "0" ]; then
%service %{name}-fpm stop
/sbin/chkconfig --del %{name}-fpm
+ update-alternatives --remove php-fpm %{_sbindir}/php-fpm || :
fi
%postun fpm
@@ -2913,6 +2919,7 @@ fi
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-fpm.conf
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/php-fpm.d/www.conf
%attr(755,root,root) %{_sbindir}/%{name}-fpm
+%ghost %{_sbindir}/php-fpm
%{_mandir}/man8/%{name}-fpm.8*
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/logrotate.d/%{name}-fpm
%attr(754,root,root) /etc/rc.d/init.d/%{name}-fpm
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/745b64970382adb197da8fe8aea3f9460335dd56
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[PLDWWW] page changed: packages:kernel
[LTS] use unicode check marks --- https://www.pld-linux.org/packages/kernel?rev=1479811632 +++ https://www.pld-linux.org/packages/kernel?rev=1479811774 @@ -6,10 +6,10 @@ PLD Linux (Th) [[https://www.kernel.org/category/releases.html|LTS kernels]]: ^ Kernel ^ Vserver ^ Projected EOL ^ Retired in PLD ^ - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_4|kernel-3.4]] | VServer enabled | Sep, 2016 |[[:#september_2015kernel_34_removal|25 September 2015]] | - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_10|kernel-3.10]] | VServer enabled | Oct, 2017 | [[:#april_2016kernel_packages_update|24 April 2016]] | - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_14|kernel-3.14]] | VServer enabled | ? | [[:#april_2016kernel_packages_update|24 April 2016]] | - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_18|kernel-3.18]] | VServer enabled | Jan, 2017 | | - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_1|kernel-4.1]] | VServer enabled [[http://git.pld-linux.org/?p=packages/kernel.git;a=commitdiff;h=80de81a09de9fba783ffce8fd76b2e75cb344373|since 4.1.12-2]] | Sep, 2017 | | - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_4|kernel-4.4]] | | Feb, 2018 | | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_4|kernel-3.4]] | ✔ | Sep, 2016 |[[:#september_2015kernel_34_removal|25 September 2015]] | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_10|kernel-3.10]] | ✔ | Oct, 2017 | [[:#april_2016kernel_packages_update|24 April 2016]] | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_14|kernel-3.14]] | ✔ | ? | [[:#april_2016kernel_packages_update|24 April 2016]] | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_18|kernel-3.18]] | ✔ | Jan, 2017 | | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_1|kernel-4.1]] | ✔ (([[http://git.pld-linux.org/?p=packages/kernel.git;a=commitdiff;h=80de81a09de9fba783ffce8fd76b2e75cb344373|since 4.1.12-2]])) | Sep, 2017 | | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_4|kernel-4.4]] | ✗ | Feb, 2018 | | Diff URL: https://www.pld-linux.org/packages/kernel?do=diff&r1=1479811632&r2=1479811774 -- This mail was generated by DokuWiki at https://www.pld-linux.org/ ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[PLDWWW] page changed: packages:kernel
[LTS] add EOL dates --- https://www.pld-linux.org/packages/kernel?rev=1479808487 +++ https://www.pld-linux.org/packages/kernel?rev=1479811632 @@ -6,10 +6,10 @@ PLD Linux (Th) [[https://www.kernel.org/category/releases.html|LTS kernels]]: ^ Kernel ^ Vserver ^ Projected EOL ^ Retired in PLD ^ - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_4|kernel-3.4]] | VServer enabled | | [[:#september_2015kernel_34_removal|25 September 2015]] | - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_10|kernel-3.10]] | VServer enabled | | [[:#april_2016kernel_packages_update|24 April 2016]] | - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_14|kernel-3.14]] | VServer enabled | | [[:#april_2016kernel_packages_update|24 April 2016]] | - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_18|kernel-3.18]] | VServer enabled | | | - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_1|kernel-4.1]] | VServer enabled [[http://git.pld-linux.org/?p=packages/kernel.git;a=commitdiff;h=80de81a09de9fba783ffce8fd76b2e75cb344373|since 4.1.12-2]] | | | - | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_4|kernel-4.4]] | | | | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_4|kernel-3.4]] | VServer enabled | Sep, 2016 |[[:#september_2015kernel_34_removal|25 September 2015]] | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_10|kernel-3.10]] | VServer enabled | Oct, 2017 | [[:#april_2016kernel_packages_update|24 April 2016]] | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_14|kernel-3.14]] | VServer enabled | ? | [[:#april_2016kernel_packages_update|24 April 2016]] | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_18|kernel-3.18]] | VServer enabled | Jan, 2017 | | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_1|kernel-4.1]] | VServer enabled [[http://git.pld-linux.org/?p=packages/kernel.git;a=commitdiff;h=80de81a09de9fba783ffce8fd76b2e75cb344373|since 4.1.12-2]] | Sep, 2017 | | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_4|kernel-4.4]] | | Feb, 2018 | | Diff URL: https://www.pld-linux.org/packages/kernel?do=diff&r1=1479808487&r2=1479811632 -- This mail was generated by DokuWiki at https://www.pld-linux.org/ ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/php/PHP_5_6] use alternatives for php-fpm binary
commit 7da71bbe193c01fbdc494911f8f9b93bea491cbb
Author: Elan Ruusamäe
Date: Mon Nov 21 19:11:00 2016 +0200
use alternatives for php-fpm binary
php.spec | 7 +++
1 file changed, 7 insertions(+)
---
diff --git a/php.spec b/php.spec
index c1a7b58..2cc6529 100644
--- a/php.spec
+++ b/php.spec
@@ -521,6 +521,7 @@ Requires(postun): /usr/sbin/userdel
Requires(pre): /bin/id
Requires(pre): /usr/sbin/useradd
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: alternatives
Requires: php-dirs >= 1.4-2
Requires: rc-scripts
Provides: php(fcgi)
@@ -2683,6 +2684,9 @@ cp -p %{SOURCE11}
$RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
%{__sed} -i -e '/su/d' $RPM_BUILD_ROOT/etc/logrotate.d/%{name}-fpm
%endif
+# touch for ghost for alternatives
+touch $RPM_BUILD_ROOT%{_sbindir}/php-fpm
+
%{__sed} -i -e '
s#/usr/lib/php#%{php_extensiondir}#
s#/etc/php#%{_sysconfdir}#
@@ -2803,11 +2807,13 @@ fi
%post fpm
/sbin/chkconfig --add %{name}-fpm
%service %{name}-fpm restart
+update-alternatives --install %{_sbindir}/php-fpm php-fpm
%{_sbindir}/php%{ver_suffix}-fpm %{ver_suffix} || :
%preun fpm
if [ "$1" = "0" ]; then
%service %{name}-fpm stop
/sbin/chkconfig --del %{name}-fpm
+ update-alternatives --remove php-fpm %{_sbindir}/php-fpm || :
fi
%postun fpm
@@ -3040,6 +3046,7 @@ fi
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php-fpm.conf
%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/fpm.d/www.conf
%attr(755,root,root) %{_sbindir}/%{name}-fpm
+%ghost %{_sbindir}/php-fpm
%{_mandir}/man8/%{name}-fpm.8*
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size)
/etc/logrotate.d/%{name}-fpm
%attr(754,root,root) /etc/rc.d/init.d/%{name}-fpm
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/php.git/commitdiff/7da71bbe193c01fbdc494911f8f9b93bea491cbb
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[PLDWWW] page changed: packages:kernel
use table --- https://www.pld-linux.org/packages/kernel?rev=1477392190 +++ https://www.pld-linux.org/packages/kernel?rev=1479808487 @@ -5,10 +5,11 @@ = LTS = PLD Linux (Th) [[https://www.kernel.org/category/releases.html|LTS kernels]]: -* [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_4|kernel-3.4]], VServer enabled, [[:#september_2015kernel_34_removal|retired as of 25 September 2015]] -* [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_10|kernel-3.10]], VServer enabled, [[:#april_2016kernel_packages_update|retired as of 24 April 2016]] -* [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_14|kernel-3.14]], VServer enabled, [[:#april_2016kernel_packages_update|retired as of 24 April 2016]] -* [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_18|kernel-3.18]], VServer enabled -* [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_1|kernel-4.1]], VServer enabled [[http://git.pld-linux.org/?p=packages/kernel.git;a=commitdiff;h=80de81a09de9fba783ffce8fd76b2e75cb344373|since 4.1.12-2]] -* [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_4|kernel-4.4]] + ^ Kernel ^ Vserver ^ Projected EOL ^ Retired in PLD ^ + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_4|kernel-3.4]] | VServer enabled | | [[:#september_2015kernel_34_removal|25 September 2015]] | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_10|kernel-3.10]] | VServer enabled | | [[:#april_2016kernel_packages_update|24 April 2016]] | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_14|kernel-3.14]] | VServer enabled | | [[:#april_2016kernel_packages_update|24 April 2016]] | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_3_18|kernel-3.18]] | VServer enabled | | | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_1|kernel-4.1]] | VServer enabled [[http://git.pld-linux.org/?p=packages/kernel.git;a=commitdiff;h=80de81a09de9fba783ffce8fd76b2e75cb344373|since 4.1.12-2]] | | | + | [[http://git.pld-linux.org/?p=packages/kernel.git;a=shortlog;h=refs/heads/LINUX_4_4|kernel-4.4]] | | | | Diff URL: https://www.pld-linux.org/packages/kernel?do=diff&r1=1477392190&r2=1479808487 -- This mail was generated by DokuWiki at https://www.pld-linux.org/ ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: kernel: linux-4.4.tar.xz patch-4.4.34.xz
Request by: baggins Files fetched: 1 ALREADY GOT: http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.4.tar.xz 9a78fa2eb6c68ca5a40ed5af08142599 linux-4.4.tar.xz STORED: http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.4.34.xz 9281bd337dc322a056c92dd2d9055dec patch-4.4.34.xz Size: 836968 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
