summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2021-06-08 07:25:25 +0200
committerRemi Collet <remi@remirepo.net>2021-06-08 07:25:25 +0200
commit9a56cdaa9f9e912596499cd74d4eacffcfd23a53 (patch)
treeae9e560a205f65e945ba75299faeda69abbf3a62
parent4e7937ba0d9d6725d7513cb9c002b9682d606430 (diff)
update to 2.2.2
drop patch merged upstream
-rw-r--r--0001-add-missing-globals-init.patch24
-rw-r--r--PHPINFO2
-rw-r--r--REFLECTION2
-rw-r--r--php-pecl-pam.spec22
4 files changed, 16 insertions, 34 deletions
diff --git a/0001-add-missing-globals-init.patch b/0001-add-missing-globals-init.patch
deleted file mode 100644
index db23c3c..0000000
--- a/0001-add-missing-globals-init.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/PHPINFO b/PHPINFO
index 8db75b2..4a15b33 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
pam
PAM support => enabled
-Extension version => 2.2.1
+Extension version => 2.2.2
Directive => Local Value => Master Value
pam.servicename => php => php
diff --git a/REFLECTION b/REFLECTION
index d2afb73..5c09d18 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #115 pam version 2.2.1 ] {
+Extension [ <persistent> extension #115 pam version 2.2.2 ] {
- INI {
Entry [ pam.servicename <ALL> ]
diff --git a/php-pecl-pam.spec b/php-pecl-pam.spec
index 4a4a6bc..ed19156 100644
--- a/php-pecl-pam.spec
+++ b/php-pecl-pam.spec
@@ -23,7 +23,7 @@
%bcond_without tests
%endif
-%global upstream_version 2.2.1
+%global upstream_version 2.2.2
#global upstream_prever beta1
#global upstream_lower beta1
@@ -36,13 +36,9 @@ 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-devel >= 7.0
BuildRequires: %{?scl_prefix}php-pear
BuildRequires: pam-devel
@@ -57,8 +53,16 @@ Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version}
%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
# Other third party repo stuff
+%if "%{php_version}" > "7.4"
+Obsoletes: php74-pecl-%{pecl_name} <= %{version}
+%endif
+%if "%{php_version}" > "8.0"
Obsoletes: php80-pecl-%{pecl_name} <= %{version}
%endif
+%if "%{php_version}" > "8.1"
+Obsoletes: php81-pecl-%{pecl_name} <= %{version}
+%endif
+%endif
%description
@@ -77,8 +81,6 @@ 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}.
@@ -196,6 +198,10 @@ fi
%endif
%changelog
+* Tue Jun 8 2021 Remi Collet <remi@remirepo.net> - 2.2.2-1
+- update to 2.2.2
+- drop patch merged upstream
+
* Mon Jun 7 2021 Remi Collet <remi@remirepo.net> - 2.2.1-1
- new package
- add patch for ZTS build from