diff options
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | 0001-add-missing-globals-init.patch | 24 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | PHPINFO | 9 | ||||
| -rw-r--r-- | REFLECTION | 35 | ||||
| -rw-r--r-- | php-pecl-pam.spec | 202 |
6 files changed, 283 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..01f0400 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +clog +package-*.xml +*.tgz +*.tar.bz2 +*.tar.gz +*.tar.xz +*.tar.xz.asc +*.src.rpm +*/*rpm diff --git a/0001-add-missing-globals-init.patch b/0001-add-missing-globals-init.patch new file mode 100644 index 0000000..db23c3c --- /dev/null +++ b/0001-add-missing-globals-init.patch @@ -0,0 +1,24 @@ +From 21e362d7a5dc43481dfcf3fe7bf9e340e7cbecbd Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Mon, 7 Jun 2021 15:06:04 +0200 +Subject: [PATCH] add missing globals init + +--- + pam.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pam.c b/pam.c +index 8bf7393..28ec9ed 100644 +--- a/pam.c ++++ b/pam.c +@@ -287,6 +287,7 @@ static void php_pam_init_globals(zend_pam_globals *pam_globals) + */ + PHP_MINIT_FUNCTION(pam) + { ++ ZEND_INIT_MODULE_GLOBALS(pam, php_pam_init_globals, NULL); + REGISTER_INI_ENTRIES(); + return SUCCESS; + } +-- +2.31.1 + diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..13af741 --- /dev/null +++ b/Makefile @@ -0,0 +1,4 @@ +SRCDIR := $(shell pwd) +NAME := $(shell basename $(SRCDIR)) +include ../../../common/Makefile + @@ -0,0 +1,9 @@ + +pam + +PAM support => enabled +Extension version => 2.2.1 + +Directive => Local Value => Master Value +pam.servicename => php => php +pam.force_servicename => Off => Off diff --git a/REFLECTION b/REFLECTION new file mode 100644 index 0000000..d2afb73 --- /dev/null +++ b/REFLECTION @@ -0,0 +1,35 @@ +Extension [ <persistent> extension #115 pam version 2.2.1 ] { + + - INI { + Entry [ pam.servicename <ALL> ] + Current = 'php' + } + Entry [ pam.force_servicename <ALL> ] + Current = '0' + } + } + + - Functions { + Function [ <internal:pam> function pam_auth ] { + + - Parameters [5] { + Parameter #0 [ <required> $username ] + Parameter #1 [ <required> $password ] + Parameter #2 [ <optional> &$status ] + Parameter #3 [ <optional> $checkacctmgmt ] + Parameter #4 [ <optional> $servicename ] + } + } + Function [ <internal:pam> function pam_chpass ] { + + - Parameters [5] { + Parameter #0 [ <required> $username ] + Parameter #1 [ <required> $oldpassword ] + Parameter #2 [ <required> $newpassword ] + Parameter #3 [ <optional> &$status ] + Parameter #4 [ <optional> $servicename ] + } + } + } +} + diff --git a/php-pecl-pam.spec b/php-pecl-pam.spec new file mode 100644 index 0000000..4a4a6bc --- /dev/null +++ b/php-pecl-pam.spec @@ -0,0 +1,202 @@ +# remirepo spec file for php-pecl-pam +# +# Copyright (c) 2021 Remi Collet +# License: CC-BY-SA +# https://creativecommons.org/licenses/by-sa/4.0/ +# +# Please, preserve the changelog entries +# +%if 0%{?scl:1} +%scl_package php-pecl-pam +%else +%global _root_prefix %{_prefix} +%endif + +%global pecl_name pam +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +# after 40-raphf +%global ini_name 50-%{pecl_name}.ini +%ifarch %{arm} +# Test suite disabled because of erratic results on slow ARM (timeout) +%bcond_with tests +%else +%bcond_without tests +%endif + +%global upstream_version 2.2.1 +#global upstream_prever beta1 +#global upstream_lower beta1 + +Name: %{?scl_prefix}php-pecl-%{pecl_name} +Summary: PAM integration +Version: %{upstream_version}%{?upstream_prever:~%{upstream_lower}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +License: PHP +URL: https://pecl.php.net/package/PAM + +Source0: https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz + +# https://github.com/amishmm/php-pam/pull/4 +Patch0: 0001-add-missing-globals-init.patch + +BuildRequires: make +BuildRequires: %{?dtsprefix}gcc +# Ignore min from package.xml and allow all supported versions +BuildRequires: %{?scl_prefix}php-devel >= 7.3 +BuildRequires: %{?scl_prefix}php-pear +BuildRequires: pam-devel + +Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} +Requires: %{?scl_prefix}php(api) = %{php_core_api} +%{?_sclreq:Requires: %{?scl_prefix}runtime%{?_sclreq}%{?_isa}} + +Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} +Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name} = %{version} +Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} + +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +# Other third party repo stuff +Obsoletes: php80-pecl-%{pecl_name} <= %{version} +%endif + + +%description +This extension provides PAM (Pluggable Authentication Modules) integration. +PAM is a system of libraries that handle the authentication tasks of +applications and services. The library provides a stable API for applications +to defer to for authentication tasks. + +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. + + +%prep +%setup -c -q +mv %{pecl_name}-%{upstream_version}%{?upstream_prever} NTS + +%{?_licensedir:sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml} + +cd NTS +%patch0 -p1 -b .pr4 + +extver=$(sed -n '/#define PHP_PAM_VERSION/{s/.* "//;s/".*$//;p}' php_pam.h) +if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}%{?gh_date:dev}"; then + : Error: Upstream version is now ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?gh_date:dev}. + : Update the pdover macro and rebuild. + exit 1 +fi +cd .. + +%if %{with_zts} +# Duplicate source tree for NTS / ZTS build +cp -pr NTS ZTS +%endif + +# Create configuration file +cat << 'EOF' | tee %{ini_name} +; Enable %{pecl_name} extension module +extension=%{pecl_name}.so + +; Configuration +;pam.servicename = 'php' +;pam.force_servicename = Off +EOF + + +%build +%{?dtsenable} +gcc --version + +peclconf() { +%configure \ + --with-pam \ + --with-libdir=%{_lib} \ + --with-php-config=$1 +} +cd NTS +%{_bindir}/phpize +peclconf %{_bindir}/php-config +make %{?_smp_mflags} + +%if %{with_zts} +cd ../ZTS +%{_bindir}/zts-phpize +peclconf %{_bindir}/zts-php-config +make %{?_smp_mflags} +%endif + + +%install +%{?dtsenable} + +make -C NTS install INSTALL_ROOT=%{buildroot} + +# Install XML package description +install -Dpm 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml + +# install config file +install -Dpm644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} + +%if %{with_zts} +make -C ZTS install INSTALL_ROOT=%{buildroot} +install -Dpm644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} +%endif + +# Documentation +cd NTS +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 +: Minimal load test for NTS extension +%{__php} --no-php-ini \ + --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \ + --modules | grep %{pecl_name} + +%if %{with_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 +%endif + + +%files +%{?_licensedir:%license NTS/LICENSE} +%doc %{pecl_docdir}/%{pecl_name} +%config(noreplace) %{php_inidir}/%{ini_name} +%{php_extdir}/%{pecl_name}.so +%{pecl_xmldir}/%{name}.xml + +%if %{with_zts} +%config(noreplace) %{php_ztsinidir}/%{ini_name} +%{php_ztsextdir}/%{pecl_name}.so +%endif + +%changelog +* Mon Jun 7 2021 Remi Collet <remi@remirepo.net> - 2.2.1-1 +- new package +- add patch for ZTS build from + https://github.com/amishmm/php-pam/pull/4 |