[pl] 5.10.5 bump
Petr Pisar
ppisar at fedoraproject.org
Mon Aug 22 16:31:40 UTC 2011
commit d1202d8615fa4bf1f529055a81f7c7105c5acaad
Author: Petr Písař <ppisar at redhat.com>
Date: Mon Aug 22 17:33:36 2011 +0200
5.10.5 bump
...70-Using-export-dynamic-is-not-a-valid-gc.patch | 67 --------------------
...onfigure.patch => pl-5.10.5-jpl-configure.patch | 2 +-
....2-man-files.patch => pl-5.10.5-man-files.patch | 27 ++++++--
pl-5.10.2-pc.patch => pl-5.10.5-pc.patch | 2 +-
pl.spec | 28 +++------
xpce-gif-CVE-2007-6697-like.patch | 24 -------
xpce-gif-CVE-2011-2896-part_1.patch | 66 -------------------
xpce-gif-CVE-2011-2896-part_2.patch | 48 --------------
8 files changed, 31 insertions(+), 233 deletions(-)
---
diff --git a/pl-5.10.2-jpl-configure.patch b/pl-5.10.5-jpl-configure.patch
similarity index 96%
rename from pl-5.10.2-jpl-configure.patch
rename to pl-5.10.5-jpl-configure.patch
index 06d4e19..e1fe03f 100644
--- a/pl-5.10.2-jpl-configure.patch
+++ b/pl-5.10.5-jpl-configure.patch
@@ -21,7 +21,7 @@
-
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
@@ -5203,15 +5188,25 @@ case "$host_cpu" in
_JNI_LIBDIRS="lib/amd64"
_JNI_LIBSUBDIRS="server"
diff --git a/pl-5.10.2-man-files.patch b/pl-5.10.5-man-files.patch
similarity index 72%
rename from pl-5.10.2-man-files.patch
rename to pl-5.10.5-man-files.patch
index 6cc7ca5..872de2c 100644
--- a/pl-5.10.2-man-files.patch
+++ b/pl-5.10.5-man-files.patch
@@ -1,8 +1,18 @@
+From 026ccc44b46537fb1976446601d1f9c08139dcbe Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar at redhat.com>
+Date: Mon, 22 Aug 2011 17:03:22 +0200
+Subject: [PATCH] Remove files locations from swipl(1) manual
+
+We install the files somewhere else.
+---
+ src/swipl.1.in | 54 ------------------------------------------------------
+ 1 files changed, 0 insertions(+), 54 deletions(-)
+
diff --git a/src/swipl.1.in b/src/swipl.1.in
-index 8754a3d..0ba8a26 100644
+index b3e3076..baa7363 100644
--- a/src/swipl.1.in
+++ b/src/swipl.1.in
-@@ -323,57 +323,6 @@ to
+@@ -337,57 +337,6 @@ to
.BR apropos/1
and
.BR explain/1.
@@ -26,7 +36,7 @@ index 8754a3d..0ba8a26 100644
-.I .plrc
-is used.
-.TP
--.I @prefix@/lib/@PL at -@PLVERSION@/bin/@ARCH@/
+-.I @prefix@/lib/@PL at -@PLVERSION@/bin/@PLARCH@/
-Location for the executables.
-.TP
-.I @prefix@/lib/@PL at -@PLVERSION@/include/
@@ -42,7 +52,7 @@ index 8754a3d..0ba8a26 100644
-the command from the directory @prefix@/lib/@PL at -@PLVERSION@:
-.RS
-.TP
--bin/@ARCH@/@PL@ \-O \-o boot32.prc \-b boot/init.pl
+-bin/@PLARCH@/@PL@ \-O \-o boot32.prc \-b boot/init.pl
-.RE
-.TP
-.I @prefix@/lib/@PL at -@PLVERSION@/doc/packages
@@ -54,14 +64,14 @@ index 8754a3d..0ba8a26 100644
-.BI \-x bootfile
-option may be used to select a different file.
-.TP
--.I @prefix@/lib/@PL at -@PLVERSION@/runtime/@ARCH@/libpl.a
+-.I @prefix@/lib/@PL at -@PLVERSION@/runtime/@PLARCH@/libpl.a
-SWI-Prolog library for embedding. See also
-.I plld(1).
.SH SEE ALSO
.PP
The SWI-Prolog web-home at
-@@ -383,9 +332,6 @@ Jan\ Wielemaker
- .IR "SWI-Prolog Reference Manual" at
+@@ -397,9 +346,6 @@ Jan\ Wielemaker
+ .IR "SWI-Prolog Reference Manual" " at"
.I http://www.swi-prolog.org/pldoc/index.html
.PP
-Documentation on the add-on packages in
@@ -70,3 +80,6 @@ index 8754a3d..0ba8a26 100644
William\ F.\ Clocksin & Christopher\ S.\ Mellish,
.IR "Programming in Prolog" ,
fourth edition, Springer Verlag, Berlin 1994.
+--
+1.7.6
+
diff --git a/pl-5.10.2-pc.patch b/pl-5.10.5-pc.patch
similarity index 93%
rename from pl-5.10.2-pc.patch
rename to pl-5.10.5-pc.patch
index a4881cf..6135062 100644
--- a/pl-5.10.2-pc.patch
+++ b/pl-5.10.5-pc.patch
@@ -8,4 +8,4 @@
+includedir=${libdir}/@PL at -@PLVERSION@/include
PLBASE=${libdir}/@PL at -@PLVERSION@
- PLARCH=@ARCH@
+ PLARCH=@PLARCH@
diff --git a/pl.spec b/pl.spec
index c38041b..113d94d 100644
--- a/pl.spec
+++ b/pl.spec
@@ -5,8 +5,8 @@
%define jdkverlong %{jdkvershort}.0
Name: pl
-Version: 5.10.2
-Release: 4%{?dist}
+Version: 5.10.5
+Release: 1%{?dist}
Summary: SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -23,17 +23,10 @@ URL: http://www.swi-prolog.org
Source: http://www.swi-prolog.org/download/stable/src/%{name}-%{version}.tar.gz
Source1: http://www.swi-prolog.org/download/stable/doc/SWI-Prolog-%{version}.pdf
Source2: http://www.swi-prolog.org/download/xpce/doc/userguide/userguide.html.tgz
-Patch1: %{name}-5.10.2-jpl-configure.patch
-Patch2: %{name}-5.10.2-man-files.patch
+Patch1: %{name}-5.10.5-jpl-configure.patch
+Patch2: %{name}-5.10.5-man-files.patch
Patch3: %{name}-5.10.2-jni.patch
-Patch4: %{name}-5.10.2-pc.patch
-# Upstream bug #470, will be in 5.10.3
-Patch5: %{name}-5.10.2-FIXED-Bug-470-Using-export-dynamic-is-not-a-valid-gc.patch
-# Upstream bug #7, will be in 5.10.5, CVE-2011-2896, rhbz#727800
-Patch6: xpce-gif-CVE-2011-2896-part_1.patch
-Patch7: xpce-gif-CVE-2011-2896-part_2.patch
-# Upstream bug #7, comment 4, will be in 5.10.5
-Patch8: xpce-gif-CVE-2007-6697-like.patch
+Patch4: %{name}-5.10.5-pc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Base
@@ -140,13 +133,6 @@ in Prolog. In both setups it provides a reentrant bidirectional interface.
%patch2 -p1 -b .man-files
%patch3 -p1 -b .jni
%patch4 -p1 -b .pc
-%patch5 -p1 -b .export_dynamic
-(
-cd packages/xpce
-%patch6 -p1 -b .CVE-2011-2896-part_1
-%patch7 -p1 -b .CVE-2011-2896-part_2
-%patch8 -p1 -b .CVE-2007-6697-like
-)
(
cd src
autoconf
@@ -320,6 +306,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Aug 22 2011 Petr Pisar <ppisar at redhat.com> - 5.10.5-1
+- 5.10.5 bump
+- Adjust patches and remove merged ones
+
* Fri Aug 19 2011 Petr Pisar <ppisar at redhat.com> - 5.10.2-4
- Fix CVE-2011-2896 (David Koblas' GIF decoder LZW decoder buffer overflow)
(bug #727800)
More information about the scm-commits
mailing list