- set default sig_keydir to /etc/pearkeys

- remove ext_dir setting from /etc/pear.conf (#175673)
This commit is contained in:
jorton 2005-12-14 09:06:39 +00:00
parent d58f42dff7
commit 9178c0f0bc
2 changed files with 52 additions and 9 deletions

View File

@ -6,17 +6,18 @@
Summary: PHP Extension and Application Repository framework
Name: php-pear
Version: 1.4.5
Release: 4.1
Release: 5
Epoch: 1
License: PHP
Group: System
URL: http://pear.php.net/package/PEAR
Source0: install-pear-nozlib-%{version}.phar
Source2: relocate.php
Source3: XML_RPC-%{xmlrpcver}.tgz
Source3: strip.php
Source10: pear.sh
Source11: pecl.sh
Source12: peardev.sh
Source20: XML_RPC-%{xmlrpcver}.tgz
BuildArchitectures: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: php >= 5.1.0-1
@ -36,15 +37,15 @@ components. This package contains the basic PEAR components.
rm -rf $RPM_BUILD_ROOT
export PHP_PEAR_SYSCONF_DIR=`pwd`
export PEAR_CONFIG_DEFAULT_DOC_DIR=$RPM_BUILD_ROOT%{_docdir}/php-pear-%{version}
export PHP_PEAR_SIG_KEYDIR=/etc/pearkeys
%{_bindir}/php -n -dshort_open_tag=0 -dsafe_mode=0 \
-derror_reporting=E_ALL -ddetect_unicode=0 \
%{SOURCE0} -d $RPM_BUILD_ROOT%{peardir}\
-b $RPM_BUILD_ROOT%{_bindir} \
%{SOURCE3}
%{SOURCE0} -d $RPM_BUILD_ROOT%{peardir} \
-b $RPM_BUILD_ROOT%{_bindir} \
%{SOURCE20}
# Replace /usr/bin/pear with something simple:
# Replace /usr/bin/* with simple scripts:
for f in pecl pear peardev; do
install -m 755 $RPM_SOURCE_DIR/${f}.sh $RPM_BUILD_ROOT%{_bindir}/${f}
done
@ -57,7 +58,9 @@ sed -si "s,$RPM_BUILD_ROOT,,g" \
$RPM_BUILD_ROOT%{peardir}/*/*.php \
$RPM_BUILD_ROOT%{peardir}/*/*/*.php
%{_bindir}/php -n %{SOURCE2} pear.conf $RPM_BUILD_ROOT > $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf
# Sanitize the pear.conf
%{_bindir}/php -n %{SOURCE2} pear.conf $RPM_BUILD_ROOT > new-pear.conf
%{_bindir}/php -n %{SOURCE3} new-pear.conf ext_dir > $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf
for f in $RPM_BUILD_ROOT%{peardir}/.registry/*.reg; do
%{_bindir}/php -n %{SOURCE2} ${f} $RPM_BUILD_ROOT > ${f}.new
@ -65,8 +68,9 @@ for f in $RPM_BUILD_ROOT%{peardir}/.registry/*.reg; do
done
%check
# Check that no buildroot-relative paths are left in the pear.conf
# Check that no buildroot-relative or arch-specific paths are left in the pear.conf
grep $RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
grep %{_libdir} $RPM_BUILD_ROOT%{_sysconfdir}/pear.conf && exit 1
%clean
rm -rf $RPM_BUILD_ROOT
@ -79,6 +83,10 @@ rm pear.conf
%config %{_sysconfdir}/pear.conf
%changelog
* Wed Dec 14 2005 Joe Orton <jorton@redhat.com> 1:1.4.5-5
- set default sig_keydir to /etc/pearkeys
- remove ext_dir setting from /etc/pear.conf (#175673)
* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
- rebuilt

35
strip.php Normal file
View File

@ -0,0 +1,35 @@
<?php
#
# strip.php /path/to/file key_name
#
# Takes a file as input and a string prefix; reads
# the file as a serialized data blob and removes a
# key with name key_name from the hash.
# Serializes again and writes output to stdout.
#
$file = $_SERVER['argv'][1];
$key = $_SERVER['argv'][2];
function remove_key($array, $name) {
if (array_key_exists($name, $array)) {
unset($array[$name]);
}
return $array;
}
$input = file_get_contents($file);
# Special case for /etc/pear.conf.
if (strncmp($input, "#PEAR_Config 0.9\n", 17) == 0) {
echo substr($input, 0, 17);
$s = substr($input, 17);
} else {
$s = $input;
}
echo serialize(remove_key(unserialize($s), $key));
?>