Changes of Revision 2
php-seld-phar-utils.spec
Changed
x
1
2
-# spec file for php-seld-phar-utils3
+# remirepo/fedora spec file for php-seld-phar-utils4
#5
-# Copyright (c) 2015 Remi Collet6
+# Copyright (c) 2015-2016 Remi Collet7
# License: CC-BY-SA8
# http://creativecommons.org/licenses/by-sa/4.0/9
#10
# Please, preserve the changelog entries11
#12
-%global gh_commit 336bb5ee20de511f3c1a164222fcfd194afcab3a13
+%global gh_commit 7009b5139491975ef6486545a39f3e6dad5ac30a14
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})15
%global gh_owner Seldaek16
%global gh_project phar-utils17
18
Name: php-seld-phar-utils19
-Version: 1.0.020
-Release: 1%{?dist}21
+Version: 1.0.122
+Release: 5%{?dist}23
Summary: PHAR file format utilities24
25
Group: Development/Libraries26
27
URL: https://github.com/%{gh_owner}/%{gh_project}28
Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz29
30
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)31
+# Autoloader32
+Source1: %{gh_project}-autoload.php33
+34
BuildArch: noarch35
BuildRequires: php(language) >= 5.336
+# For test37
+BuildRequires: php-cli38
+# Autoloader39
+BuildRequires: php-composer(fedora/autoloader)40
41
# From composer.json42
# "php": ">=5.3.0",43
Requires: php(language) >= 5.3.044
-# From phpcompatifo report for 1.0.045
+# From phpcompatifo report for 1.0.146
Requires: php-date47
Requires: php-hash48
Requires: php-pcre49
Requires: php-spl50
+# Autoloader51
+Requires: php-composer(fedora/autoloader)52
53
Provides: php-composer(seld/phar-utils) = %{version}54
55
56
%description57
PHAR file format utilities, for when PHP phars you up.58
59
+To use this library, you just have to add, in your project:60
+ require_once '%{_datadir}/php/Seld/PharUtils/autoload.php';61
+62
63
%prep64
%setup -q -n %{gh_project}-%{gh_commit}65
66
+cp %{SOURCE1} src/autoload.php67
+68
69
%build70
# Nothing71
72
73
%install74
-rm -rf %{buildroot}75
# Restore PSR-0 tree76
mkdir -p %{buildroot}%{_datadir}/php/Seld/PharUtils/77
cp -pr src/* %{buildroot}%{_datadir}/php/Seld/PharUtils/78
79
80
-%clean81
-rm -rf %{buildroot}82
+%check83
+: Check if our autoloader works84
+php -r '85
+require "%{buildroot}%{_datadir}/php/Seld/PharUtils/autoload.php";86
+$a = new \Seld\PharUtils\Timestamps("%{SOURCE1}");87
+echo "Ok\n";88
+exit(0);89
+'90
91
92
%files93
-%defattr(-,root,root,-)94
%{!?_licensedir:%global license %%doc}95
%license LICENSE96
-%doc README.md composer.json97
+%doc README.md98
+%doc composer.json99
%{_datadir}/php/Seld100
101
102
%changelog103
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-5104
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild105
+106
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-4107
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild108
+109
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-3110
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild111
+112
+* Fri Oct 21 2016 Remi Collet <remi@fedoraproject.org> - 1.0.1-2113
+- switch from symfony/class-loader to fedora/autoloader114
+115
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.1-2116
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild117
+118
+* Wed Oct 14 2015 Remi Collet <remi@fedoraproject.org> - 1.0.1-1119
+- update to 1.0.1120
+- add autoloader121
+122
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.0-2123
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild124
+125
* Mon May 4 2015 Remi Collet <remi@fedoraproject.org> - 1.0.0-1126
- initial package127
\ No newline at end of file128
phar-utils-1.0.0-336bb5e.tar.gz/src/Timestamps.php -> phar-utils-1.0.1-7009b51.tar.gz/src/Timestamps.php
Changed
84
1
2
*/3
public function save($path, $signatureAlgo)4
{5
- // detect signature position6
- $pos = strrpos($this->contents, "\n") + 1;7
+ $pos = $this->determineSignatureBegin();8
9
$algos = array(10
\Phar::MD5 => 'md5',11
12
. pack('L', $signatureAlgo)13
// ohai Greg & Marcus14
. 'GBMB';15
- $this->contents = substr_replace($this->contents, $signature, $pos, strlen($this->contents) - $pos);16
+17
+ $this->contents = substr($this->contents, 0, $pos) . $signature;18
19
return file_put_contents($path, $this->contents);20
}21
22
23
return $res1;24
}25
+26
+ /**27
+ * Determine the beginning of the signature.28
+ *29
+ * @return int30
+ */31
+ private function determineSignatureBegin()32
+ {33
+ // detect signature position34
+ if (!preg_match('{__HALT_COMPILER\(\);(?: +\?>)?\r?\n}', $this->contents, $match, PREG_OFFSET_CAPTURE)) {35
+ throw new \RuntimeException('Could not detect the stub\'s end in the phar');36
+ }37
+38
+ // set starting position and skip past manifest length39
+ $pos = $match01 + strlen($match00);40
+ $stubEnd = $pos + $this->readUint($pos, 4);41
+42
+ $pos += 4;43
+ $numFiles = $this->readUint($pos, 4);44
+45
+ $pos += 4;46
+47
+ // skip API version (YOLO)48
+ $pos += 2;49
+50
+ // skip PHAR flags51
+ $pos += 4;52
+53
+ $aliasLength = $this->readUint($pos, 4);54
+ $pos += 4 + $aliasLength;55
+56
+ $metadataLength = $this->readUint($pos, 4);57
+ $pos += 4 + $metadataLength;58
+59
+ $compressedSizes = 0;60
+ while ($pos < $stubEnd) {61
+ $filenameLength = $this->readUint($pos, 4);62
+ $pos += 4 + $filenameLength;63
+64
+ // skip filesize and timestamp65
+ $pos += 2*4;66
+67
+ $compressedSizes += $this->readUint($pos, 4);68
+ // skip compressed file size, crc32 checksum and file flags69
+ $pos += 3*4;70
+71
+ $metadataLength = $this->readUint($pos, 4);72
+ $pos += 4 + $metadataLength;73
+74
+ $numFiles--;75
+ }76
+77
+ if ($numFiles !== 0) {78
+ throw new \LogicException('All files were not processed, something must have gone wrong');79
+ }80
+81
+ return $pos + $compressedSizes;82
+ }83
}84
phar-utils-autoload.php
Added
11
1
2
+<?php3
+/* Autoloader for seld/phar-utils and its dependencies */4
+5
+if (!class_exists('Fedora\\Autoloader\\Autoload', false)) {6
+ require_once '/usr/share/php/Fedora/Autoloader/autoload.php';7
+}8
+9
+\Fedora\Autoloader\Autoload::addPsr4('Seld\\PharUtils\\', __DIR__);10
+11