summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json37
l---------makesrc.sh1
-rwxr-xr-xphp-react-socket-get-source.sh74
-rw-r--r--php-react-socket.spec176
4 files changed, 228 insertions, 60 deletions
diff --git a/composer.json b/composer.json
index cad0aef..ae325fc 100644
--- a/composer.json
+++ b/composer.json
@@ -3,18 +3,41 @@
"description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
"keywords": ["async", "socket", "stream", "connection", "ReactPHP"],
"license": "MIT",
+ "authors": [
+ {
+ "name": "Christian Lück",
+ "homepage": "https://clue.engineering/",
+ "email": "christian@clue.engineering"
+ },
+ {
+ "name": "Cees-Jan Kiewiet",
+ "homepage": "https://wyrihaximus.net/",
+ "email": "reactphp@ceesjankiewiet.nl"
+ },
+ {
+ "name": "Jan Sorgalla",
+ "homepage": "https://sorgalla.com/",
+ "email": "jsorgalla@gmail.com"
+ },
+ {
+ "name": "Chris Boden",
+ "homepage": "https://cboden.dev/",
+ "email": "cboden@gmail.com"
+ }
+ ],
"require": {
"php": ">=5.3.0",
"evenement/evenement": "^3.0 || ^2.0 || ^1.0",
- "react/dns": "^0.4.13",
- "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5",
- "react/stream": "^1.0 || ^0.7.1",
- "react/promise": "^2.6.0 || ^1.2.1",
- "react/promise-timer": "^1.4.0"
+ "react/dns": "^1.8",
+ "react/event-loop": "^1.2",
+ "react/promise": "^3 || ^2.6 || ^1.2.1",
+ "react/promise-timer": "^1.9",
+ "react/stream": "^1.2"
},
"require-dev": {
- "clue/block-react": "^1.2",
- "phpunit/phpunit": "^6.4 || ^5.7 || ^4.8.35"
+ "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35",
+ "react/async": "^4 || ^3 || ^2",
+ "react/promise-stream": "^1.4"
},
"autoload": {
"psr-4": {
diff --git a/makesrc.sh b/makesrc.sh
new file mode 120000
index 0000000..b77c61b
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1 @@
+php-react-socket-get-source.sh \ No newline at end of file
diff --git a/php-react-socket-get-source.sh b/php-react-socket-get-source.sh
new file mode 100755
index 0000000..c614ff3
--- /dev/null
+++ b/php-react-socket-get-source.sh
@@ -0,0 +1,74 @@
+#/bin/sh
+
+GIT=`which git`
+RPM=`which rpm`
+
+if [ -z "$GIT" ]
+then
+ echo "ERROR: 'git' command not found" 1>&2
+ exit 1
+elif [ -z "$RPM" ]
+then
+ echo "ERROR: 'rpm' command not found" 1>&2
+ exit 1
+fi
+
+function print {
+ echo -e "\e[0;33m>>>>> ${1}\e[0m"
+}
+
+if [ -n "$1" ]
+then
+ SPEC=$1
+else
+ SPEC=`ls *.spec | head -1`
+fi
+
+SPEC_DIR=`pwd`
+
+print "SPEC_DIR = $SPEC_DIR"
+
+NAME=`echo $SPEC | sed 's#\.spec##'`
+VERSION=`egrep '%global\s*github_version' $SPEC | awk '{print $3}'`
+
+print "SPEC = $SPEC"
+print "NAME = $NAME"
+
+GIT_OWNER=`egrep '%global\s*github_owner' $SPEC | awk '{print $3}'`
+GIT_NAME=`egrep '%global\s*github_name' $SPEC | awk '{print $3}'`
+GIT_COMMIT=`egrep '%global\s*github_commit' $SPEC | awk '{print $3}'`
+GIT_REPO=https://github.com/${GIT_OWNER}/${GIT_NAME}
+GIT_DIR=`echo $GIT_REPO | sed 's#.*/##'`
+
+print "GIT_OWNER = $GIT_OWNER"
+print "GIT_NAME = $GIT_NAME"
+print "GIT_COMMIT = $GIT_COMMIT"
+print "GIT_REPO = $GIT_REPO"
+print "GIT_DIR = $GIT_DIR"
+
+TEMP_DIR=$(mktemp --dir)
+
+pushd $TEMP_DIR
+ print "Cloning git repo..."
+ $GIT clone $GIT_REPO
+
+ pushd $GIT_DIR
+ print "Checking out commit..."
+ $GIT checkout $GIT_COMMIT
+ cp composer.json ${SPEC_DIR}/
+ popd
+
+ TAR_DIR=${GIT_NAME}-${GIT_COMMIT}
+ print "TAR_DIR = $TAR_DIR"
+
+ mv $GIT_DIR $TAR_DIR
+
+ TAR_FILE=${SPEC_DIR}/${NAME}-${VERSION}-${GIT_COMMIT}.tar.gz
+ print "TAR_FILE = $TAR_FILE"
+
+ [ -e $TAR_FILE ] && rm -f $TAR_FILE
+ tar --exclude-vcs -czf $TAR_FILE $TAR_DIR
+ chmod 0644 $TAR_FILE
+popd
+
+rm -rf $TEMP_DIR
diff --git a/php-react-socket.spec b/php-react-socket.spec
index 5cc814b..ada3b67 100644
--- a/php-react-socket.spec
+++ b/php-react-socket.spec
@@ -2,7 +2,7 @@
#
# Fedora spec file for php-react-socket
#
-# Copyright (c) 2017-2018 Shawn Iwinski <shawn@iwin.ski>
+# Copyright (c) 2017-2021 Shawn Iwinski <shawn@iwin.ski>
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -12,69 +12,85 @@
%global github_owner reactphp
%global github_name socket
-%global github_version 0.8.12
-%global github_commit 7f7e6c56ccda7418a1a264892a625f38a5bdee0c
+%global github_version 1.12.0
+%global github_commit 81e1b4d7f5450ebd8d2e9a95bb008bb15ca95a7b
%global composer_vendor react
%global composer_project socket
# "php": ">=5.3.0"
%global php_min_ver 5.3.0
-# "clue/block-react": "^1.2"
-%global clue_block_react_min_ver 1.2
-%global clue_block_react_max_ver 2.0
# "evenement/evenement": "^3.0 || ^2.0 || ^1.0"
-# NOTE: Restricted to one major version
-%global evenement_min_ver 2.0
-%global evenement_max_ver 3.0
-# "react/dns": "^0.4.13"
-%global react_dns_min_ver 0.4.13
-%global react_dns_max_ver 1.0
-# "react/event-loop": "^1.0 || ^0.5 || ^0.4 || ^0.3.5"
-%global react_event_loop_min_ver 0.3.5
+%global evenement_min_ver 1.0
+%global evenement_max_ver 4.0
+# "react/dns": "^1.8"
+%global react_dns_min_ver 1.8
+%global react_dns_max_ver 2.0
+# "react/event-loop": "^1.2"
+%global react_event_loop_min_ver 1.2
%global react_event_loop_max_ver 2.0
-# "react/promise": "^2.6.0 || ^1.2.1"
+# "react/promise": "^3 || ^2.6 || ^1.2.1"
%global react_promise_min_ver 1.2.1
-%global react_promise_max_ver 3.0
-# "react/promise-timer": "^1.4.0"
-%global react_promise_timer_min_ver 1.4.0
+%global react_promise_max_ver 4
+# "react/async": "^4 || ^3 || ^2",
+%global react_async_min_ver 2
+%global react_async_max_ver 5
+# "react/promise-stream": "^1.4"
+%global react_promise_stream_min_ver 1.4
+%global react_promise_stream_max_ver 2.0
+# "react/promise-timer": "^1.9"
+%global react_promise_timer_min_ver 1.9
%global react_promise_timer_max_ver 2.0
-# "react/stream": "^1.0 || ^0.7.1"
-%global react_stream_min_ver 0.7.1
+# "react/stream": "^1.2"
+%global react_stream_min_ver 1.2
%global react_stream_max_ver 2.0
+# "phpunit/phpunit": "^9.3 || ^5.7 || ^4.8.35"
+%global phpunit_require phpunit9
+%global phpunit_min_ver 9.3
+%global phpunit_exec phpunit9
+
# Build using "--without tests" to disable tests
-%global with_tests 0%{!?_without_tests:1}
+%bcond_without tests
+
+# Range dependencies supported?
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+%global with_range_dependencies 1
+%else
+%global with_range_dependencies 0
+%endif
%{!?phpdir: %global phpdir %{_datadir}/php}
Name: php-%{composer_vendor}-%{composer_project}
Version: %{github_version}
-Release: 2%{?github_release}%{?dist}
+Release: 1%{?github_release}%{?dist}
Summary: Async, streaming plaintext TCP/IP and secure TLS socket server
-Group: Development/Libraries
License: MIT
URL: https://reactphp.org/socket/
-Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{name}-%{github_version}-%{github_commit}.tar.gz
+
+# GitHub export does not include tests
+# Run php-react-socket-get-source.sh to create full source
+Source0: %{name}-%{github_version}-%{github_commit}.tar.gz
+Source1: %{name}-get-source.sh
BuildArch: noarch
# Tests
-%if %{with_tests}
+%if %{with tests}
## composer.json
BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-composer(phpunit/phpunit)
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(clue/block-react) >= %{clue_block_react_min_ver} with php-composer(clue/block-react) < %{clue_block_react_max_ver})
+BuildRequires: %{phpunit_require} >= %{phpunit_min_ver}
+%if %{with_range_dependencies}
BuildRequires: (php-composer(evenement/evenement) >= %{evenement_min_ver} with php-composer(evenement/evenement) < %{evenement_max_ver})
BuildRequires: (php-composer(react/dns) >= %{react_dns_min_ver} with php-composer(react/dns) < %{react_dns_max_ver})
BuildRequires: (php-composer(react/event-loop) >= %{react_event_loop_min_ver} with php-composer(react/event-loop) < %{react_event_loop_max_ver})
-BuildRequires: (php-composer(react/promise) >= %{react_promise_min_ver} with php-composer(react/promise) < %{react_promise_max_ver})
+BuildRequires: (php-composer(react/async) >= %{react_async_min_ver} with php-composer(react/async) < %{react_async_max_ver})
+BuildRequires: (php-composer(react/promise-stream) >= %{react_promise_stream_min_ver} with php-composer(react/promise-stream) < %{react_promise_stream_max_ver})
BuildRequires: (php-composer(react/promise-timer) >= %{react_promise_timer_min_ver} with php-composer(react/promise-timer) < %{react_promise_timer_max_ver})
+BuildRequires: (php-composer(react/promise) >= %{react_promise_min_ver} with php-composer(react/promise) < %{react_promise_max_ver})
BuildRequires: (php-composer(react/stream) >= %{react_stream_min_ver} with php-composer(react/stream) < %{react_stream_max_ver})
%else
-BuildRequires: php-composer(clue/block-react) < %{clue_block_react_max_ver}
-BuildRequires: php-composer(clue/block-react) >= %{clue_block_react_min_ver}
BuildRequires: php-composer(evenement/evenement) < %{evenement_max_ver}
BuildRequires: php-composer(evenement/evenement) >= %{evenement_min_ver}
BuildRequires: php-composer(react/dns) >= %{react_dns_min_ver}
@@ -85,21 +101,26 @@ BuildRequires: php-composer(react/promise) < %{react_promise_max_ver}
BuildRequires: php-composer(react/promise) >= %{react_promise_min_ver}
BuildRequires: php-composer(react/promise-timer) >= %{react_promise_timer_min_ver}
BuildRequires: php-composer(react/promise-timer) < %{react_promise_timer_max_ver}
+BuildRequires: php-composer(react/async) < %{react_async_max_ver}
+BuildRequires: php-composer(react/async) >= %{react_async_min_ver}
+BuildRequires: php-composer(react/promise-stream) >= %{react_promise_stream_min_ver}
+BuildRequires: php-composer(react/promise-stream) < %{react_promise_stream_max_ver}
BuildRequires: php-composer(react/stream) < %{react_stream_max_ver}
BuildRequires: php-composer(react/stream) >= %{react_stream_min_ver}
%endif
-## phpcompatinfo (computed from version 0.8.12)
+## phpcompatinfo (computed from version 1.6.0)
BuildRequires: php-filter
-BuildRequires: php-openssl
BuildRequires: php-pcre
+BuildRequires: php-reflection
+BuildRequires: php-sockets
BuildRequires: php-spl
-## Autoloader
-BuildRequires: php-composer(fedora/autoloader)
%endif
+## Autoloader
+BuildRequires: php-fedora-autoloader-devel
# composer.json
Requires: php(language) >= %{php_min_ver}
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+%if %{with_range_dependencies}
Requires: (php-composer(evenement/evenement) >= %{evenement_min_ver} with php-composer(evenement/evenement) < %{evenement_max_ver})
Requires: (php-composer(react/dns) >= %{react_dns_min_ver} with php-composer(react/dns) < %{react_dns_max_ver})
Requires: (php-composer(react/event-loop) >= %{react_event_loop_min_ver} with php-composer(react/event-loop) < %{react_event_loop_max_ver})
@@ -120,12 +141,17 @@ Requires: php-composer(react/promise-timer) < %{react_promise_timer_max_ve
Requires: php-composer(react/stream) < %{react_stream_max_ver}
Requires: php-composer(react/stream) >= %{react_stream_min_ver}
%endif
-# phpcompatinfo (computed from version 0.8.12)
+# phpcompatinfo (computed from version 1.6.0)
Requires: php-filter
+Requires: php-pcre
+Requires: php-sockets
Requires: php-spl
# Autoloader
Requires: php-composer(fedora/autoloader)
+# Packages have been merged (not provided as class names are different)
+Obsoletes: php-react-socket-client < 0.5
+
# Composer
Provides: php-composer(%{composer_vendor}/%{composer_project}) = %{version}
@@ -144,15 +170,11 @@ Autoloader: %{phpdir}/React/Socket/autoload.php
%build
: Create autoloader
-cat <<'AUTOLOAD' | tee src/autoload.php
-<?php
-/**
- * Autoloader for %{name} and its' dependencies
- * (created by %{name}-%{version}-%{release}).
- */
-require_once '%{phpdir}/Fedora/Autoloader/autoload.php';
+phpab --template fedora \
+ --output src/autoload.php \
+ src
-\Fedora\Autoloader\Autoload::addPsr4('React\\Socket\\', __DIR__);
+cat <<'AUTOLOAD' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required(array(
'%{phpdir}/Evenement/autoload.php',
@@ -171,7 +193,7 @@ cp -rp src %{buildroot}%{phpdir}/React/Socket
%check
-%if %{with_tests}
+%if %{with tests}
: Create tests bootstrap
cat <<'BOOTSTRAP' | tee bootstrap.php
<?php
@@ -179,21 +201,29 @@ require '%{buildroot}%{phpdir}/React/Socket/autoload.php';
\Fedora\Autoloader\Autoload::addPsr4('React\\Tests\\Socket\\\\', __DIR__.'/tests');
-\Fedora\Autoloader\Dependencies::required(array(
- '%{phpdir}/Clue/React/Block/autoload.php',
-));
+\Fedora\Autoloader\Dependencies::required([
+ '%{phpdir}/React/Async/autoload.php',
+ '%{phpdir}/React/Promise/Stream/autoload.php',
+]);
BOOTSTRAP
: Skip test requiring network access
rm -f tests/IntegrationTest.php
+%if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
+# https://github.com/reactphp/socket/issues/275 - OpenSSL 3.0
+FILTER="--filter '^((?!(testClientUsesTls10WhenCryptoMethodIsExplicitlyConfiguredByClient)).)*$'"
+%endif
+
: Upstream tests
RETURN_CODE=0
-PHPUNIT=$(which phpunit)
-for PHP_EXEC in "" %{?rhel:php54 php55} php70 php71 php72 php73; do
+PHPUNIT=$(which %{phpunit_exec})
+for PHP_EXEC in "" php80 php81 php82; do
if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
- $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
- || RETURN_CODE=1
+ $PHP_EXEC $PHPUNIT $FILTER \
+ --bootstrap bootstrap.php \
+ --exclude-group internet \
+ --verbose || RETURN_CODE=1
fi
done
exit $RETURN_CODE
@@ -211,6 +241,46 @@ exit $RETURN_CODE
%changelog
+* Fri Sep 23 2022 Remi Collet <remi@remirepo.net> - 1.12.0-1
+- update to 1.12.0
+- drop build dependency on clue/block-react
+- add build dependency on react/async
+- switch to classmap autoloader
+
+* Fri Jan 14 2022 Remi Collet <remi@remirepo.net> - 1.11.0-1
+- update to 1.11.0
+- raise dependency on react/promise-timer 1.8
+- raise dependency on clue/block-react 1.5
+
+* Mon Nov 29 2021 Remi Collet <remi@remirepo.net> - 1.10.0-1
+- update to 1.10.0
+
+* Wed Aug 4 2021 Remi Collet <remi@remirepo.net> - 1.9.0-1
+- update to 1.9.0
+
+* Mon Jul 12 2021 Remi Collet <remi@remirepo.net> - 1.8.0-1
+- update to 1.8.0
+- raise dependency on react/dns 1.8
+- raise dependency on react/event-loop 1.2
+- raise dependency on react/stream 1.2
+
+* Mon Jun 28 2021 Remi Collet <remi@remirepo.net> - 1.7.0-1
+- update to 1.7.0
+- raise dependency on react/dns 1.7
+
+* Sun Sep 06 2020 Shawn Iwinski <shawn@iwin.ski> - 1.6.0-1
+- Update to 1.6.0 (RHBZ #1812925)
+- Remove patch merged upstream
+- Use PHPUnit 9
+- Exclude group "internet" in tests
+
+* Sat Dec 14 2019 Shawn Iwinski <shawn@iwin.ski> - 1.3.0-1
+- Update to 1.3.0 (RHBZ #1600308)
+- Use PHPUnit 6
+
+* Tue Jul 3 2018 Remi Collet <remi@remirepo.net> - 0.8.12-3
+- obsolete php-react-socket-client (merged)
+
* Tue Jul 3 2018 Remi Collet <remi@remirepo.net> - 0.8.12-2
- add missing dependency on react/dns
generated by cgit (git 2.34.1) at 2024-04-18 15:15:15 +0000