summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.gitignore2
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION151
-rw-r--r--php-pecl-selinux.spec151
4 files changed, 166 insertions, 140 deletions
diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
package-*.xml
*.tgz
+*.tar.bz2
*.tar.gz
*.tar.xz
*.tar.xz.asc
diff --git a/PHPINFO b/PHPINFO
index 7f6e1b5..f11c6b5 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,4 +1,4 @@
selinux
-Version => 0.5.0
+Version => 0.6.1
diff --git a/REFLECTION b/REFLECTION
index a901467..9b25a7f 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,294 +1,341 @@
-Extension [ <persistent> extension #95 selinux version 0.5.0 ] {
+Extension [ <persistent> extension #96 selinux version 0.6.1 ] {
- Functions {
Function [ <internal:selinux> function selinux_is_enabled ] {
- Parameters [0] {
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_mls_is_enabled ] {
- Parameters [0] {
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_getenforce ] {
- Parameters [0] {
}
+ - Return [ int ]
}
Function [ <internal:selinux> function selinux_setenforce ] {
- Parameters [1] {
- Parameter #0 [ <required> $mode ]
+ Parameter #0 [ <required> int $mode ]
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_policyvers ] {
- Parameters [0] {
}
+ - Return [ int|false ]
}
Function [ <internal:selinux> function selinux_deny_unknown ] {
- Parameters [0] {
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_getcon ] {
- Parameters [0] {
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_setcon ] {
- Parameters [1] {
- Parameter #0 [ <required> $context ]
+ Parameter #0 [ <required> string $context ]
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_getpidcon ] {
- Parameters [1] {
- Parameter #0 [ <required> $pid ]
+ Parameter #0 [ <required> int $pid ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_getprevcon ] {
- Parameters [0] {
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_getexeccon ] {
- Parameters [0] {
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_setexeccon ] {
- Parameters [1] {
- Parameter #0 [ <required> $context ]
+ Parameter #0 [ <required> string $context ]
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_getfscreatecon ] {
- Parameters [0] {
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_setfscreatecon ] {
- Parameters [1] {
- Parameter #0 [ <required> $context ]
+ Parameter #0 [ <required> string $context ]
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_getkeycreatecon ] {
- Parameters [0] {
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_setkeycreatecon ] {
- Parameters [1] {
- Parameter #0 [ <required> $context ]
+ Parameter #0 [ <required> string $context ]
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_getsockcreatecon ] {
- Parameters [0] {
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_setsockcreatecon ] {
- Parameters [1] {
- Parameter #0 [ <required> $context ]
+ Parameter #0 [ <required> string $context ]
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_getfilecon ] {
- Parameters [1] {
- Parameter #0 [ <required> $filename ]
+ Parameter #0 [ <required> string $filename ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_lgetfilecon ] {
- Parameters [1] {
- Parameter #0 [ <required> $filename ]
+ Parameter #0 [ <required> string $filename ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_fgetfilecon ] {
- Parameters [1] {
Parameter #0 [ <required> $stream ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_setfilecon ] {
- Parameters [2] {
- Parameter #0 [ <required> $filename ]
- Parameter #1 [ <required> $context ]
+ Parameter #0 [ <required> string $filename ]
+ Parameter #1 [ <required> string $context ]
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_lsetfilecon ] {
- Parameters [2] {
- Parameter #0 [ <required> $filename ]
- Parameter #1 [ <required> $context ]
+ Parameter #0 [ <required> string $filename ]
+ Parameter #1 [ <required> string $context ]
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_fsetfilecon ] {
- Parameters [2] {
Parameter #0 [ <required> $stream ]
- Parameter #1 [ <required> $context ]
+ Parameter #1 [ <required> string $context ]
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_getpeercon ] {
- Parameters [1] {
Parameter #0 [ <required> $stream ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_compute_av ] {
- Parameters [3] {
- Parameter #0 [ <required> $scontext ]
- Parameter #1 [ <required> $tcontext ]
- Parameter #2 [ <required> $tclass ]
+ Parameter #0 [ <required> string $scontext ]
+ Parameter #1 [ <required> string $tcontext ]
+ Parameter #2 [ <required> string $tclass ]
}
+ - Return [ array|false ]
}
Function [ <internal:selinux> function selinux_compute_create ] {
- Parameters [4] {
- Parameter #0 [ <required> $scontext ]
- Parameter #1 [ <required> $tcontext ]
- Parameter #2 [ <required> $tclass ]
- Parameter #3 [ <optional> $name ]
+ Parameter #0 [ <required> string $scontext ]
+ Parameter #1 [ <required> string $tcontext ]
+ Parameter #2 [ <required> string $tclass ]
+ Parameter #3 [ <optional> ?string $name = null ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_compute_relabel ] {
- Parameters [3] {
- Parameter #0 [ <required> $scontext ]
- Parameter #1 [ <required> $tcontext ]
- Parameter #2 [ <required> $tclass ]
+ Parameter #0 [ <required> string $scontext ]
+ Parameter #1 [ <required> string $tcontext ]
+ Parameter #2 [ <required> string $tclass ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_compute_member ] {
- Parameters [3] {
- Parameter #0 [ <required> $scontext ]
- Parameter #1 [ <required> $tcontext ]
- Parameter #2 [ <required> $tclass ]
+ Parameter #0 [ <required> string $scontext ]
+ Parameter #1 [ <required> string $tcontext ]
+ Parameter #2 [ <required> string $tclass ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_compute_user ] {
- Parameters [2] {
- Parameter #0 [ <required> $scontext ]
- Parameter #1 [ <required> $username ]
+ Parameter #0 [ <required> string $scontext ]
+ Parameter #1 [ <required> string $username ]
}
+ - Return [ array|false ]
}
Function [ <internal:selinux> function selinux_get_initial_context ] {
- Parameters [1] {
- Parameter #0 [ <required> $name ]
+ Parameter #0 [ <required> string $name ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_check_context ] {
- Parameters [1] {
- Parameter #0 [ <required> $context ]
+ Parameter #0 [ <required> string $context ]
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_canonicalize_context ] {
- Parameters [1] {
- Parameter #0 [ <required> $context ]
+ Parameter #0 [ <required> string $context ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_get_boolean_names ] {
- Parameters [0] {
}
+ - Return [ array|false ]
}
Function [ <internal:selinux> function selinux_get_boolean_pending ] {
- Parameters [1] {
- Parameter #0 [ <required> $bool_name ]
+ Parameter #0 [ <required> string $bool_name ]
}
+ - Return [ int ]
}
Function [ <internal:selinux> function selinux_get_boolean_active ] {
- Parameters [1] {
- Parameter #0 [ <required> $bool_name ]
+ Parameter #0 [ <required> string $bool_name ]
}
+ - Return [ int ]
}
Function [ <internal:selinux> function selinux_set_boolean ] {
- Parameters [2] {
- Parameter #0 [ <required> $bool_name ]
- Parameter #1 [ <required> $bool_value ]
+ Parameter #0 [ <required> string $bool_name ]
+ Parameter #1 [ <required> int $bool_value ]
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_commit_booleans ] {
- Parameters [0] {
}
+ - Return [ bool ]
}
Function [ <internal:selinux> function selinux_trans_to_raw_context ] {
- Parameters [1] {
- Parameter #0 [ <required> $context ]
+ Parameter #0 [ <required> string $context ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_raw_to_trans_context ] {
- Parameters [1] {
- Parameter #0 [ <required> $context ]
+ Parameter #0 [ <required> string $context ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_file_label_lookup ] {
- Parameters [6] {
- Parameter #0 [ <required> $pathname ]
- Parameter #1 [ <required> $mode ]
- Parameter #2 [ <optional> $validate ]
- Parameter #3 [ <optional> $baseonly ]
- Parameter #4 [ <optional> $subset ]
- Parameter #5 [ <optional> $specfile ]
+ Parameter #0 [ <required> string $pathname ]
+ Parameter #1 [ <required> int $mode ]
+ Parameter #2 [ <optional> bool $validate = false ]
+ Parameter #3 [ <optional> bool $baseonly = false ]
+ Parameter #4 [ <optional> ?string $subset = null ]
+ Parameter #5 [ <optional> ?string $specfile = null ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_media_label_lookup ] {
- Parameters [3] {
- Parameter #0 [ <required> $device_name ]
- Parameter #1 [ <optional> $validate ]
- Parameter #2 [ <optional> $specfile ]
+ Parameter #0 [ <required> string $device_name ]
+ Parameter #1 [ <optional> bool $validate = false ]
+ Parameter #2 [ <optional> ?string $specfile = null ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_x_label_lookup ] {
- Parameters [2] {
- Parameter #0 [ <required> $x_key ]
- Parameter #1 [ <required> $x_type ]
+ Parameter #0 [ <required> string $x_key ]
+ Parameter #1 [ <required> string $x_type ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_db_label_lookup ] {
- Parameters [2] {
- Parameter #0 [ <required> $db_key ]
- Parameter #1 [ <required> $db_type ]
+ Parameter #0 [ <required> string $db_key ]
+ Parameter #1 [ <required> string $db_type ]
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_getenforcemode ] {
- Parameters [0] {
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_getpolicytype ] {
- Parameters [0] {
}
+ - Return [ string|false ]
}
Function [ <internal:selinux> function selinux_policy_root ] {
- Parameters [0] {
}
+ - Return [ string|false ]
}
}
}
diff --git a/php-pecl-selinux.spec b/php-pecl-selinux.spec
index b393ac8..0c67c27 100644
--- a/php-pecl-selinux.spec
+++ b/php-pecl-selinux.spec
@@ -1,7 +1,7 @@
# remirepo spec file for php-pecl-selinux
# adapted for SCL
#
-# Copyright (c) 2011-2020 Remi Collet
+# Copyright (c) 2011-2024 Remi Collet
#
# Fedora spec file for php-pecl-selinux
#
@@ -13,69 +13,38 @@
# Please, preserve the changelog entries
#
-# we don't want -z defs linker flag
-%undefine _strict_symbol_defs_build
+%{?scl:%scl_package php-pecl-selinux}
-%if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
-%scl_package php-pecl-selinux
-%endif
+%bcond_without tests
%global pecl_name selinux
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
-%global with_tests %{?_without_tests:0}%{!?_without_tests:1}
-%if "%{php_version}" < "5.6"
-%global ini_name %{pecl_name}.ini
-%else
%global ini_name 40-%{pecl_name}.ini
-%endif
+%global sources %{pecl_name}-%{version}
+%global _configure ../%{sources}/configure
Summary: SELinux binding for PHP scripting language
-Name: %{?sub_prefix}php-pecl-selinux
-Version: 0.5.0
+Name: %{?scl_prefix}php-pecl-selinux
+Version: 0.6.1
Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
-License: PHP
+License: PHP-3.01
URL: https://pecl.php.net/package/%{pecl_name}
-Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+Source0: https://pecl.php.net/get/%{sources}.tgz
+BuildRequires: make
BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel > 7
+BuildRequires: %{?scl_prefix}php-devel >= 7.0
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: libselinux-devel >= 2.0.80
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
Requires: libselinux >= 2.0.80
-%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}}
Provides: %{?scl_prefix}php-%{pecl_name} = %{version}
Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release}
-Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
-
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
-# Other third party repo stuff
-%if "%{php_version}" > "7.2"
-Obsoletes: php72u-pecl-%{pecl_name} <= %{version}
-Obsoletes: php72w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.3"
-Obsoletes: php73-pecl-%{pecl_name} <= %{version}
-Obsoletes: php73w-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "7.4"
-Obsoletes: php74-pecl-%{pecl_name} <= %{version}
-Obsoletes: php74w-pecl-%{pecl_name} <= %{version}
-%endif
-%endif
-
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter private shared object
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
%description
@@ -91,14 +60,13 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
%prep
%setup -c -q
-mv %{pecl_name}-%{version} NTS
# Don't install/register tests
sed -e 's/role="test"/role="src"/' \
- %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+ -e '/LICENSE/s/role="doc"/role="src"/' \
-i package.xml
-pushd NTS
+pushd %{sources}
extver=$(sed -n '/#define PHP_SELINUX_VERSION/{s/.* "//;s/".*$//;p}' php_selinux.h)
if test "x${extver}" != "x%{version}"; then
: Error: Upstream extension version is ${extver}, expecting %{version}.
@@ -112,27 +80,32 @@ cat > %{ini_name} << 'EOF'
extension=%{pecl_name}.so
EOF
+mkdir NTS
%if %{with_zts}
-# duplicate for ZTS build
-cp -pr NTS ZTS
+mkdir ZTS
%endif
%build
%{?dtsenable}
-cd NTS
-%{_bindir}/phpize
+cd %{sources}
+%{__phpize}
+[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global
+sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL
+
+cd ../NTS
%configure \
- --with-php-config=%{_bindir}/php-config
-make %{?_smp_mflags}
+ --with-php-config=%{__phpconfig} \
+ --enable-selinux
+%make_build
%if %{with_zts}
cd ../ZTS
-%{_bindir}/zts-phpize
%configure \
- --with-php-config=%{_bindir}/zts-php-config
-make %{?_smp_mflags}
+ --with-php-config=%{__ztsphpconfig} \
+ --enable-selinux
+%make_build
%endif
@@ -140,7 +113,7 @@ make %{?_smp_mflags}
%{?dtsenable}
# Install the NTS stuff
-make -C NTS install INSTALL_ROOT=%{buildroot}
+%make_install -C NTS
# Drop in the bit of configuration
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
@@ -150,66 +123,43 @@ install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
%if %{with_zts}
# Install the ZTS stuff
-make -C ZTS install INSTALL_ROOT=%{buildroot}
+%make_install -C ZTS
install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
# Documentation
-cd NTS
+cd %{sources}
for i in $(grep 'role="doc"' ../package.xml | sed -e 's/^.*name="//;s/".*$//')
do install -Dpm 644 $i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
%check
-cd NTS
: Minimal load test for NTS extension
%{__php} --no-php-ini \
--define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
- --modules | grep %{pecl_name}
+ --modules | grep '^%{pecl_name}$'
-%if %{with_tests}
+%if %{with tests}
+cd %{sources}
: Upstream test suite for NTS extension
TEST_PHP_EXECUTABLE=%{__php} \
-TEST_PHP_ARGS="-n -d extension=$PWD/modules/%{pecl_name}.so" \
-NO_INTERACTION=1 \
+TEST_PHP_ARGS="-n -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so" \
REPORT_EXIT_STATUS=0 \
-%{__php} -n run-tests.php --show-diff
+%{__php} -n run-tests.php -q --show-diff
: Ignore result as unreliable in mock
%endif
%if %{with_zts}
-cd ../ZTS
: Minimal load test for ZTS extension
%{__ztsphp} --no-php-ini \
--define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
- --modules | grep %{pecl_name}
-%endif
-
-
-
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
- %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
+ --modules | grep '^%{pecl_name}$'
%endif
%files
-%{?_licensedir:%license NTS/LICENSE}
+%license %{sources}/LICENSE
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -223,6 +173,33 @@ fi
%changelog
+* Tue Oct 8 2024 Remi Collet <remi@remirepo.net> - 0.6.1-1
+- update to 0.6.1
+
+* Wed Aug 30 2023 Remi Collet <remi@remirepo.net> - 0.6.0-3
+- rebuild for PHP 8.3.0RC1
+
+* Thu Sep 1 2022 Remi Collet <remi@remirepo.net> - 0.6.0-2
+- rebuild for PHP 8.2.0RC1
+
+* Thu Dec 23 2021 Remi Collet <remi@remirepo.net> - 0.6.0-1
+- update to 0.6.0
+
+* Wed Dec 22 2021 Remi Collet <remi@remirepo.net> - 0.5.0-7
+- cleanup spec file
+
+* Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 0.5.0-5
+- rebuild for 8.1.0RC1
+
+* Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 0.5.0-4
+- rebuild for PHP 8.0.0RC1
+
+* Wed Sep 2 2020 Remi Collet <remi@remirepo.net> - 0.5.0-3
+- rebuild for PHP 8.0.0beta3
+
+* Wed Aug 5 2020 Remi Collet <remi@remirepo.net> - 0.5.0-2
+- rebuild for 8.0.0beta1
+
* Wed Apr 22 2020 Remi Collet <remi@remirepo.net> - 0.5.0-1
- update to 0.5.0 (stable)
- raise dependency on PHP 7
generated by cgit (git 2.34.1) at 2025-07-01 05:48:53 +0000