From 5d3841971fa7553f2b6739a77eb493c4db1b711d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Tue, 23 Aug 2011 17:58:39 +0000
Subject: [PATCH 1/1] - up to 5.3.8

Changed files:
    php-crypt-bugfix-55439.patch -> 1.2
    php.spec -> 1.948
---
 php-crypt-bugfix-55439.patch | 11 -----------
 php.spec                     |  8 +++-----
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 php-crypt-bugfix-55439.patch

diff --git a/php-crypt-bugfix-55439.patch b/php-crypt-bugfix-55439.patch
deleted file mode 100644
index 83e5fa4..0000000
--- a/php-crypt-bugfix-55439.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- PHP_5_3/ext/standard/php_crypt_r.c	2011/08/19 22:45:43	315217
-+++ PHP_5_3/ext/standard/php_crypt_r.c	2011/08/19 22:49:18	315218
-@@ -382,7 +382,7 @@
- 	/* Now make the output string */
- 	memcpy(passwd, MD5_MAGIC, MD5_MAGIC_LEN);
- 	strlcpy(passwd + MD5_MAGIC_LEN, sp, sl + 1);
--	strlcat(passwd, "$", 1);
-+	strcat(passwd, "$");
- 
- 	PHP_MD5Final(final, &ctx);
- 
diff --git a/php.spec b/php.spec
index cace703..5be991e 100644
--- a/php.spec
+++ b/php.spec
@@ -105,7 +105,7 @@ ERROR: You need to select at least one Apache SAPI to build shared modules.
 %undefine	with_filter
 %endif
 
-%define		rel	2
+%define		rel	1
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -113,13 +113,13 @@ 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:		php
-Version:	5.3.7
+Version:	5.3.8
 Release:	%{rel}%{?with_type_hints:.th}%{?with_oci8:.oci}
 Epoch:		4
 License:	PHP
 Group:		Libraries
 Source0:	http://www.php.net/distributions/%{name}-%{version}.tar.bz2
-# Source0-md5:	2d47d003c96de4e88863ff38da61af33
+# Source0-md5:	704cd414a0565d905e1074ffdc1fadfb
 Source2:	%{name}-mod_%{name}.conf
 Source3:	%{name}-cgi-fcgi.ini
 Source4:	%{name}-apache.ini
@@ -189,7 +189,6 @@ Patch61:	%{name}-krb5-ac.patch
 Patch62:	mcrypt-libs.patch
 Patch63:	%{name}-mysql-nowarning.patch
 Patch64:	%{name}-m4.patch
-Patch65:	%{name}-crypt-bugfix-55439.patch
 URL:		http://www.php.net/
 %{?with_interbase:%{!?with_interbase_inst:BuildRequires:	Firebird-devel >= 1.0.2.908-2}}
 %{?with_pspell:BuildRequires:	aspell-devel >= 2:0.50.0}
@@ -1872,7 +1871,6 @@ cp php.ini-production php.ini
 %patch62 -p1
 %patch63 -p1
 %patch64 -p1
-%patch65 -p1
 %{__rm} -r sapi/litespeed
 gzip -dc %{SOURCE15} | tar xf - -C sapi/
 
-- 
2.44.0