rpms/perl/FC-4 perl-5.8.6-bz178343.patch, 1.1, 1.2 perl.spec, 1.70, 1.71
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Mar 13 21:35:27 UTC 2006
Author: jvdias
Update of /cvs/dist/rpms/perl/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv7533
Modified Files:
perl-5.8.6-bz178343.patch perl.spec
Log Message:
fix bug 185242: ioctl 3rd arg length defaults to 256 if not specified; further fix for 178343: backport Configure cppsymbols generation from 5.8.8
perl-5.8.6-bz178343.patch:
Configure | 39 +++++++++++++++++++++++++++++----------
utils/h2ph.PL | 17 ++++++++++++-----
2 files changed, 41 insertions(+), 15 deletions(-)
Index: perl-5.8.6-bz178343.patch
===================================================================
RCS file: /cvs/dist/rpms/perl/FC-4/perl-5.8.6-bz178343.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-5.8.6-bz178343.patch 2 Feb 2006 23:51:48 -0000 1.1
+++ perl-5.8.6-bz178343.patch 13 Mar 2006 21:35:22 -0000 1.2
@@ -1,6 +1,43 @@
---- perl-5.8.6/Configure.bz178343 2005-12-14 13:25:11.000000000 -0500
-+++ perl-5.8.6/Configure 2006-02-02 18:46:23.000000000 -0500
-@@ -19727,6 +19727,17 @@
+--- perl-5.8.6/Configure.bz178343 2006-03-13 15:57:50.000000000 -0500
++++ perl-5.8.6/Configure 2006-03-13 15:58:17.000000000 -0500
+@@ -19703,16 +19703,26 @@
+ $startsh
+ cat <<'EOCP' > try.c
+ #include <stdio.h>
++#if cpp_stuff == 1
++#define STRINGIFY(a) "a"
++#endif
++#if cpp_stuff == 42
++#define StGiFy(a) #a
++#define STRINGIFY(a) StGiFy(a)
++#endif
++#if $cpp_stuff != 1 && $cpp_stuff != 42
++# include "Bletch: How does this C preprocessor stringify macros?"
++#endif
+ int main() {
+ EOCP
+ $awk \\
+ EOSH
+ cat <<'EOSH' >> Cppsym.try
+ 'length($1) > 0 {
+- printf "#ifdef %s\n#if %s+0\nprintf(\"%s=%%ld\\n\", (long)%s);\n#else\nprintf(\"%s\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1
+- printf "#ifdef _%s\n#if _%s+0\nprintf(\"_%s=%%ld\\n\", (long)_%s);\n#else\nprintf(\"_%s\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1
+- printf "#ifdef __%s\n#if __%s+0\nprintf(\"__%s=%%ld\\n\", (long)__%s);\n#else\nprintf(\"__%s\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1
+- printf "#ifdef __%s__\n#if __%s__+0\nprintf(\"__%s__=%%ld\\n\", (long)__%s__);\n#else\nprintf(\"__%s__\\n\");\n#endif\n#endif\n", $1, $1, $1, $1, $1
++ printf "#ifdef %s\nprintf(\"%s=%%s\\n\", STRINGIFY(%s));\n#endif\n", $1, $1, $1
++ printf "#ifdef _%s\nprintf(\"_%s=%%s\\n\", STRINGIFY(_%s));\n#endif\n", $1, $1, $1
++ printf "#ifdef __%s\nprintf(\"__%s=%%s\\n\", STRINGIFY(__%s));\n#endif\n", $1, $1, $1
++ printf "#ifdef __%s__\nprintf(\"__%s__=%%s\\n\", STRINGIFY(__%s__));\n#endif\n", $1, $1, $1
+ }' >> try.c
+ echo 'return 0;}' >> try.c
+ EOSH
+@@ -19722,11 +19732,22 @@
+ irix-) ccflags="\$ccflags -woff 1178" ;;
+ os2-*) ccflags="\$ccflags -Zlinker /PM:VIO" ;;
+ esac
+-$cc -o try $optimize \$ccflags $ldflags try.c $libs && $run ./try
++$cc -o try -Dcpp_stuff=$cpp_stuff $optimize \$ccflags $ldflags try.c $libs && $run ./try | $sed 's/ /\\\\ /g'
+ EOSH
chmod +x Cppsym.try
$eunicefix Cppsym.try
./Cppsym < Cppsym.know > Cppsym.true
@@ -18,8 +55,23 @@
: now check the C compiler for additional symbols
postprocess_cc_v=''
case "$osname" in
---- perl-5.8.6/utils/h2ph.PL.bz178343 2005-12-14 13:25:11.000000000 -0500
-+++ perl-5.8.6/utils/h2ph.PL 2006-02-02 18:46:23.000000000 -0500
+@@ -19758,11 +19779,9 @@
+
+ $awk '/\=/ { print $0; next }
+ { print $0"=1" }' ccsym.raw >ccsym.list
+-$awk '/\=/ { print $0; next }
+- { print $0"=1" }' Cppsym.true >ccsym.true
+-$comm -13 ccsym.true ccsym.list >ccsym.own
+-$comm -12 ccsym.true ccsym.list >ccsym.com
+-$comm -23 ccsym.true ccsym.list >ccsym.cpp
++$comm -13 Cppsym.true ccsym.list >ccsym.own
++$comm -12 Cppsym.true ccsym.list >ccsym.com
++$comm -23 Cppsym.true ccsym.list >ccsym.cpp
+ also=''
+ if $test -z ccsym.raw; then
+ echo "Your C compiler doesn't seem to define any symbols!" >&4
+--- perl-5.8.6/utils/h2ph.PL.bz178343 2006-03-13 15:57:50.000000000 -0500
++++ perl-5.8.6/utils/h2ph.PL 2006-03-13 15:57:53.000000000 -0500
@@ -776,8 +776,16 @@
if ($opt_D) {
print PREAMBLE "# $_=$define{$_}\n";
Index: perl.spec
===================================================================
RCS file: /cvs/dist/rpms/perl/FC-4/perl.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- perl.spec 3 Feb 2006 00:53:24 -0000 1.70
+++ perl.spec 13 Mar 2006 21:35:22 -0000 1.71
@@ -68,7 +68,7 @@
%define __perl_requires %{SOURCE11}
-Conflicts: perl-NDBM_File <= 1:1.75-34.99.6
+# Conflicts: perl-NDBM_File <= 1:1.75-34.99.6
Obsoletes: perl-Digest-MD5
Obsoletes: perl-MIME-Base64
@@ -146,6 +146,8 @@
Patch178343: perl-5.8.6-bz178343.patch
+Patch185242: perl-5.8.6-bz185242.patch
+
# module updatesd
# Patch202: perl-5.8.0-Safe2.09.patch
@@ -291,6 +293,8 @@
%patch178343 -p1
+%patch185242 -p1
+
find . -name \*.orig -exec rm -fv {} \;
%build
@@ -431,12 +435,15 @@
mkdir -p $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perlver}/Net
install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT/%{_libdir}/perl5/%{perlver}/Net/libnet.cfg
-find $RPM_BUILD_ROOT -name '*HiRes*' | xargs rm -rfv
-find $RPM_BUILD_ROOT -name '*Filter*' | xargs rm -rfv
-find $RPM_BUILD_ROOT -name '*NDBM*' | xargs rm -rfv
-
-find $RPM_BUILD_ROOT -type f -name '*.bs' -a -empty -exec rm -f {} ';'
-
+# Remove conflicts with separate perl-Filter package (ONLY!):
+rm -rf $RPM_BUILD_ROOT{%{_libdir}/perl5/%{perlver}/{,%{_arch}-%{_os}%{thread_arch}{,/auto}}/Filter,%{_mandir}/man3/Filter::*} || :;
+# Remove conflicts with separate perl-Time-HiRes package (ONLY!):
+rm -rf $RPM_BUILD_ROOT{%{_libdir}/perl5/%{perlver}/%{_arch}-%{_os}%{thread_arch}{,/auto}/Time,%{_mandir}/man3/Time::HiRes*} || :;
+# Remove obsolete NDBM modules:
+find $RPM_BUILD_ROOT -name '*NDBM*' -delete || :;
+# Remove empty .bs files:
+find $RPM_BUILD_ROOT -type f -name '*.bs' -a -empty -delete || :;
+# Build MANIFEST:
find $RPM_BUILD_ROOT -type f -or -type l > MANIFEST.all
find $RPM_BUILD_ROOT -type d -printf "%%%%dir %p\n" >> MANIFEST.all
@@ -482,6 +489,10 @@
%endif
%changelog
+* Mon Mar 03 2006 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.6-24
+- fix bug 185242: restore default minimum ioctl 3rd arg length of 256
+- fix bug 84671: cleanup NDBM removal; restore DBM_Filter* .
+
* Thu Feb 02 2006 Jason Vas Dias <jvdias at redhat.com> - 3:5.8.6-24
- fix bug 178343: include cpp built-in macros in $Config{cppsymbols}
More information about the fedora-cvs-commits
mailing list