Author: glen Date: Thu Aug 19 11:35:37 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.0.0b1
---- Files affected:
packages/php-pear-HTTP_Upload:
php-pear-HTTP_Upload-bug-4318.patch (1.5 -> 1.6) , php-pear-HTTP_Upload.spec
(1.29 -> 1.30) , php-pear-HTTP_Upload-cvs.patch (1.2 -> NONE) (REMOVED),
php-pear-HTTP_Upload-et.patch (1.2 -> NONE) (REMOVED),
php-pear-HTTP_Upload-ru.patch (1.2 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload-bug-4318.patch
diff -u packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload-bug-4318.patch:1.5
packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload-bug-4318.patch:1.6
--- packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload-bug-4318.patch:1.5
Wed Feb 22 13:11:50 2006
+++ packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload-bug-4318.patch Thu Aug
19 13:35:31 2010
@@ -1,58 +1,11 @@
-diff -u ./Upload.php 2006-02-22 13:55:56.000000000 +0200 ./Upload.php
---- ./Upload.php 2006-02-22 13:55:56.000000000 +0200
-+++ ./Upload.php 2006-02-22 14:07:58.000000000 +0200
-@@ -590,6 +590,13 @@
- var $_extensionsMode = 'deny';
-
- /**
-+ * @see HTTP_Upload_File::setValidExtensions()
-+ * @var bool
-+ * @access private
-+ */
-+ var $_extensionsCaseSensitive = true;
-+
-+ /**
- * Contains the desired chmod for uploaded files
- * @var int
- * @access private
-@@ -934,12 +941,16 @@
- * 1) 'deny' Will deny only the supplied
extensions
- * 2) 'accept' Will accept only the supplied
extensions
- * as valid
-+ * @param bool $case_sensitive Is extension check is case sensitive.
- * @access public
- */
-- function setValidExtensions($exts, $mode = 'deny')
-+ function setValidExtensions($exts, $mode = 'deny', $case_sensitive = null)
+--- HTTP_Upload-1.0.0b1/usr/share/pear/HTTP/Upload.php~ 2010-08-19
14:04:02.000000000 +0300
++++ HTTP_Upload-1.0.0b1/usr/share/pear/HTTP/Upload.php 2010-08-19
14:22:57.872355680 +0300
+@@ -981,7 +981,7 @@
{
$this->_extensionsCheck = $exts;
$this->_extensionsMode = $mode;
-+ if (!is_null($case_sensitive)) {
-+ $this->_extensionsCaseSensitive = $case_sensitive;
-+ }
- }
-
- /**
-@@ -955,14 +966,18 @@
-+ $ext = $this->getProp('ext');
-+ if (!$this->_extensionsCaseSensitive) {
-+ $ext = strtolower($ext);
-+ }
- if ($this->_extensionsMode == 'deny') {
-- if (in_array($this->getProp('ext'), $exts)) {
-+ if (in_array($ext, $exts)) {
- return false;
- }
- // mode == 'accept'
- } else {
-- if (!in_array($this->getProp('ext'), $exts)) {
-+ if (!in_array($ext, $exts)) {
- return false;
- }
+- if ($case_sensitive != null) {
++ if ($case_sensitive !== null) {
+ $this->_extensionsCaseSensitive = $case_sensitive;
}
- return true;
}
- }
--?>
-\ No newline at end of file
-+?>
================================================================
Index: packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload.spec
diff -u packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload.spec:1.29
packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload.spec:1.30
--- packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload.spec:1.29 Thu Jan
31 13:17:32 2008
+++ packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload.spec Thu Aug 19
13:35:31 2010
@@ -2,26 +2,26 @@
%include /usr/lib/rpm/macros.php
%define _class HTTP
%define _subclass Upload
-%define _status stable
+%define _status beta
%define _pearname %{_class}_%{_subclass}
+%define subver b1
+%define rel 1
Summary: %{_pearname} - Easy and secure managment of files submitted via
HTML Forms
Summary(pl.UTF-8): %{_pearname} - Proste i łatwe zarządzanie plikami
przesyłanymi przez formularze HTML
Name: php-pear-%{_pearname}
-Version: 0.9.1
-Release: 6
+Version: 1.0.0
+Release: 0.%{subver}.%{rel}
License: PHP 2.02
Group: Development/Languages/PHP
-Source0: http://pear.php.net/get/%{_pearname}-%{version}.tgz
-# Source0-md5: fd1161202786fcba5272d2715bcda787
-Patch0: %{name}-cvs.patch
-Patch1: %{name}-et.patch
-Patch2: %{name}-bug-4318.patch
-Patch3: %{name}-ru.patch
+Source0: http://pear.php.net/get/%{_pearname}-%{version}%{subver}.tgz
+# Source0-md5: 9671de649564af650d3c07ff0d43495f
+Patch0: %{name}-bug-4318.patch
URL: http://pear.php.net/package/HTTP_Upload/
BuildRequires: php-pear-PEAR
BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.300
Requires: php-pear
+Requires: php-pear-PEAR-core >= 1:1.4.0
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -59,11 +59,7 @@
%prep
%pear_package_setup
-cd ./%{php_pear_dir}/%{_class}
-%patch0 -p0
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+%patch0 -p1
%install
rm -rf $RPM_BUILD_ROOT
@@ -86,6 +82,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2010/08/19 11:35:31 glen
+- up to 1.0.0b1
+
Revision 1.29 2008/01/31 12:17:32 glen
- rel 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload-bug-4318.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pear-HTTP_Upload/php-pear-HTTP_Upload.spec?r1=1.29&r2=1.30&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
