rpms/perl
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix assert.

Browse Source
This commit is contained in:
Marcela Mašláňová 2008-05-26 15:09:24 +00:00
parent ce3b874043
commit 0b9fc6649b
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
perl-5.10.0-bz448392.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up perl-5.10.0/mg.c.crr perl-5.10.0/mg.c
--- perl-5.10.0/mg.c.crr 2007-12-18 11:47:08.000000000 +0100
+++ perl-5.10.0/mg.c 2008-05-26 15:28:17.000000000 +0200
@@ -1543,7 +1543,7 @@ Perl_magic_setisa(pTHX_ SV *sv, MAGIC *m
stash = GvSTASH(
SvTYPE(mg->mg_obj) == SVt_PVGV
? (GV*)mg->mg_obj
- : (GV*)SvMAGIC(mg->mg_obj)->mg_obj
+ : (GV*)mg_find(mg->mg_obj, PERL_MAGIC_isa)->mg_obj
);
mro_isa_changed_in(stash);

10
perl.spec
View File

@ -16,7 +16,7 @@
Name: perl
Version: %{perl_version}
Release: 23%{?dist}
Release: 24%{?dist}
Epoch: %{perl_epoch}
Summary: The Perl programming language
Group: Development/Languages
@ -74,6 +74,9 @@ Patch13: perl-5.10.0-Module-CoreList2.14.patch
# Upgrade CGI to 3.37 for bugzilla package
Patch14: perl-5.10.0-CGI-3.37.patch
# Problem with assertion - add upstream patch
Patch15: perl-5.10.0-bz448392.patch
BuildRoot: %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: tcsh, dos2unix, man, groff
BuildRequires: gdbm-devel, db4-devel, zlib-devel
@ -795,6 +798,7 @@ upstream tarball from perl.org.
%patch12 -p1
%patch13 -p1
%patch14 -p1
%patch15 -p1
#
# Candidates for doc recoding (need case by case review):
@ -1016,6 +1020,7 @@ perl -x patchlevel.h '32891 fix big slowdown in 5.10 @_ parameter passing'
perl -x patchlevel.h 'Fedora Patch12: Update Module::Load::Conditional to 0.24'
perl -x patchlevel.h 'Fedora Patch13: Upgrade Module::CoreList to 2.14'
perl -x patchlevel.h 'Fedora Patch14: Upgrade CGI to 3.37'
perl -x patchlevel.h 'Fedora Patch15: Adopt upstream commit for assertion'
%clean
rm -rf $RPM_BUILD_ROOT
@ -1621,6 +1626,9 @@ make test
# Old changelog entries are preserved in CVS.
%changelog
* Mon May 26 2008 Marcela Maslanova <mmaslano@redhat.com> 4:5.10.0-24
- 448392 upstream fix for assertion
* Thu May 22 2008 Tom "spot" Callaway <tcallawa@redhat.com> 4:5.10.0-23
- sparc64 breaks with the rpath hack patch applied