rpms/cinepaint/devel cinepaint-0.22-1-dso.patch, NONE, 1.1 icc_examin-0.46-overflow.patch, NONE, 1.1 cinepaint.spec, 1.23, 1.24
Dan Horák
sharkcz at fedoraproject.org
Wed Jun 23 10:49:30 UTC 2010
Author: sharkcz
Update of /cvs/pkgs/rpms/cinepaint/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv30781
Modified Files:
cinepaint.spec
Added Files:
cinepaint-0.22-1-dso.patch icc_examin-0.46-overflow.patch
Log Message:
* Wed Jun 23 2010 Dan Horák <dan[at]danny.cz> - 0.22.1-15
- fix FTBFS #565039
- fix string overflow in icc_examin.cpp (#523700 ??)
cinepaint-0.22-1-dso.patch:
app/Makefile.am | 6 ++++--
app/Makefile.in | 6 ++++--
plug-ins/cineon/Makefile.am | 2 +-
plug-ins/cineon/Makefile.in | 2 +-
plug-ins/gauss_rle/Makefile.am | 2 +-
plug-ins/gauss_rle/Makefile.in | 2 +-
plug-ins/mblur/Makefile.am | 2 +-
plug-ins/mblur/Makefile.in | 2 +-
plug-ins/psd/Makefile.am | 2 +-
plug-ins/psd/Makefile.in | 2 +-
plug-ins/retinex/Makefile.am | 2 +-
plug-ins/retinex/Makefile.in | 2 +-
plug-ins/script-fu/Makefile.am | 2 +-
plug-ins/script-fu/Makefile.in | 2 +-
plug-ins/snoise/Makefile.am | 2 +-
plug-ins/snoise/Makefile.in | 2 +-
plug-ins/sobel/Makefile.am | 2 +-
plug-ins/sobel/Makefile.in | 2 +-
plug-ins/spread/Makefile.am | 2 +-
plug-ins/spread/Makefile.in | 2 +-
plug-ins/tiff/Makefile.am | 2 +-
plug-ins/tiff/Makefile.in | 2 +-
plug-ins/unsharp/Makefile.am | 2 +-
plug-ins/unsharp/Makefile.in | 2 +-
24 files changed, 30 insertions(+), 26 deletions(-)
--- NEW FILE cinepaint-0.22-1-dso.patch ---
diff -up cinepaint-0.22-1/app/Makefile.am.dso cinepaint-0.22-1/app/Makefile.am
--- cinepaint-0.22-1/app/Makefile.am.dso 2010-06-23 11:58:30.000000000 +0200
+++ cinepaint-0.22-1/app/Makefile.am 2010-06-23 12:00:54.000000000 +0200
@@ -418,12 +418,14 @@ cinepaint_LDADD = \
$(GTK_LIBS) \
$(X_LIBS) \
$(OYRANOS_LIBS) \
- $(LCMS_LIB)
+ $(LCMS_LIB) \
+ -lX11 -lm
cinepaint_remote_LDADD = \
$(GTK_LIBS) \
$(X_LIBS) \
- $(XMU_LIB)
+ $(XMU_LIB) \
+ -lX11
## DEPS = $(top_builddir)/lib/libcinepainti.a
diff -up cinepaint-0.22-1/app/Makefile.in.dso cinepaint-0.22-1/app/Makefile.in
--- cinepaint-0.22-1/app/Makefile.in.dso 2010-06-23 11:58:31.000000000 +0200
+++ cinepaint-0.22-1/app/Makefile.in 2010-06-23 12:00:47.000000000 +0200
@@ -742,12 +742,14 @@ cinepaint_LDADD = \
$(GTK_LIBS) \
$(X_LIBS) \
$(OYRANOS_LIBS) \
- $(LCMS_LIB)
+ $(LCMS_LIB) \
+ -lX11 -lm
cinepaint_remote_LDADD = \
$(GTK_LIBS) \
$(X_LIBS) \
- $(XMU_LIB)
+ $(XMU_LIB) \
+ -lX11
all: all-recursive
diff -up cinepaint-0.22-1/plug-ins/cineon/Makefile.am.dso cinepaint-0.22-1/plug-ins/cineon/Makefile.am
--- cinepaint-0.22-1/plug-ins/cineon/Makefile.am.dso 2010-06-23 11:47:47.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/cineon/Makefile.am 2010-06-23 11:47:52.000000000 +0200
@@ -27,7 +27,7 @@ INCLUDES = \
LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/cineon/Makefile.in.dso cinepaint-0.22-1/plug-ins/cineon/Makefile.in
--- cinepaint-0.22-1/plug-ins/cineon/Makefile.in.dso 2007-06-12 07:04:36.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/cineon/Makefile.in 2010-06-23 11:48:24.000000000 +0200
@@ -292,7 +292,7 @@ INCLUDES = \
LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
cineon_DEPENDENCIES = $(DEPS)
diff -up cinepaint-0.22-1/plug-ins/gauss_rle/Makefile.am.dso cinepaint-0.22-1/plug-ins/gauss_rle/Makefile.am
--- cinepaint-0.22-1/plug-ins/gauss_rle/Makefile.am.dso 2010-06-23 11:49:30.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/gauss_rle/Makefile.am 2010-06-23 11:49:39.000000000 +0200
@@ -16,7 +16,7 @@ LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
\
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/gauss_rle/Makefile.in.dso cinepaint-0.22-1/plug-ins/gauss_rle/Makefile.in
--- cinepaint-0.22-1/plug-ins/gauss_rle/Makefile.in.dso 2010-06-23 11:49:34.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/gauss_rle/Makefile.in 2010-06-23 11:49:47.000000000 +0200
@@ -281,7 +281,7 @@ LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
\
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
gauss_rle_DEPENDENCIES = $(DEPS)
diff -up cinepaint-0.22-1/plug-ins/mblur/Makefile.am.dso cinepaint-0.22-1/plug-ins/mblur/Makefile.am
--- cinepaint-0.22-1/plug-ins/mblur/Makefile.am.dso 2010-06-23 11:51:06.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/mblur/Makefile.am 2010-06-23 11:51:16.000000000 +0200
@@ -16,7 +16,7 @@ LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
\
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/mblur/Makefile.in.dso cinepaint-0.22-1/plug-ins/mblur/Makefile.in
--- cinepaint-0.22-1/plug-ins/mblur/Makefile.in.dso 2010-06-23 11:51:11.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/mblur/Makefile.in 2010-06-23 11:51:24.000000000 +0200
@@ -281,7 +281,7 @@ LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
\
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
mblur_DEPENDENCIES = $(DEPS)
diff -up cinepaint-0.22-1/plug-ins/psd/Makefile.am.dso cinepaint-0.22-1/plug-ins/psd/Makefile.am
--- cinepaint-0.22-1/plug-ins/psd/Makefile.am.dso 2010-06-23 11:52:05.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/psd/Makefile.am 2010-06-23 11:52:16.000000000 +0200
@@ -15,7 +15,7 @@ INCLUDES = \
LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
- -lc
+ -lc -lm
DEPS = \
$(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/psd/Makefile.in.dso cinepaint-0.22-1/plug-ins/psd/Makefile.in
--- cinepaint-0.22-1/plug-ins/psd/Makefile.in.dso 2010-06-23 11:52:11.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/psd/Makefile.in 2010-06-23 11:52:21.000000000 +0200
@@ -280,7 +280,7 @@ INCLUDES = \
LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
- -lc
+ -lc -lm
DEPS = \
$(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/retinex/Makefile.am.dso cinepaint-0.22-1/plug-ins/retinex/Makefile.am
--- cinepaint-0.22-1/plug-ins/retinex/Makefile.am.dso 2010-06-23 11:53:45.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/retinex/Makefile.am 2010-06-23 11:53:54.000000000 +0200
@@ -18,7 +18,7 @@ INCLUDES = \
LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/retinex/Makefile.in.dso cinepaint-0.22-1/plug-ins/retinex/Makefile.in
--- cinepaint-0.22-1/plug-ins/retinex/Makefile.in.dso 2010-06-23 11:53:49.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/retinex/Makefile.in 2010-06-23 11:53:59.000000000 +0200
@@ -283,7 +283,7 @@ INCLUDES = \
LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
retinex_DEPENDENCIES = $(DEPS)
diff -up cinepaint-0.22-1/plug-ins/script-fu/Makefile.am.dso cinepaint-0.22-1/plug-ins/script-fu/Makefile.am
--- cinepaint-0.22-1/plug-ins/script-fu/Makefile.am.dso 2010-06-23 11:53:05.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/script-fu/Makefile.am 2010-06-23 11:53:16.000000000 +0200
@@ -61,7 +61,7 @@ LDADD = \
$(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
- -lc
+ -lc -lm
DEPS = \
$(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \
diff -up cinepaint-0.22-1/plug-ins/script-fu/Makefile.in.dso cinepaint-0.22-1/plug-ins/script-fu/Makefile.in
--- cinepaint-0.22-1/plug-ins/script-fu/Makefile.in.dso 2010-06-23 11:53:09.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/script-fu/Makefile.in 2010-06-23 11:53:22.000000000 +0200
@@ -337,7 +337,7 @@ LDADD = \
$(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
- -lc
+ -lc -lm
DEPS = \
$(top_builddir)/plug-ins/dbbrowser/dbbrowser_utils.o \
diff -up cinepaint-0.22-1/plug-ins/snoise/Makefile.am.dso cinepaint-0.22-1/plug-ins/snoise/Makefile.am
--- cinepaint-0.22-1/plug-ins/snoise/Makefile.am.dso 2010-06-23 11:54:18.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/snoise/Makefile.am 2010-06-23 11:54:26.000000000 +0200
@@ -15,7 +15,7 @@ INCLUDES = \
LDADD = $(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
\
- -lc
+ -lc -lm
DEPS = \
$(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/snoise/Makefile.in.dso cinepaint-0.22-1/plug-ins/snoise/Makefile.in
--- cinepaint-0.22-1/plug-ins/snoise/Makefile.in.dso 2010-06-23 11:54:21.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/snoise/Makefile.in 2010-06-23 11:54:32.000000000 +0200
@@ -280,7 +280,7 @@ INCLUDES = \
LDADD = $(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
\
- -lc
+ -lc -lm
DEPS = \
$(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/sobel/Makefile.am.dso cinepaint-0.22-1/plug-ins/sobel/Makefile.am
--- cinepaint-0.22-1/plug-ins/sobel/Makefile.am.dso 2010-06-23 11:54:47.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/sobel/Makefile.am 2010-06-23 11:54:57.000000000 +0200
@@ -16,7 +16,7 @@ LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
\
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/sobel/Makefile.in.dso cinepaint-0.22-1/plug-ins/sobel/Makefile.in
--- cinepaint-0.22-1/plug-ins/sobel/Makefile.in.dso 2010-06-23 11:54:51.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/sobel/Makefile.in 2010-06-23 11:55:02.000000000 +0200
@@ -281,7 +281,7 @@ LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
\
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
sobel_DEPENDENCIES = $(DEPS)
diff -up cinepaint-0.22-1/plug-ins/spread/Makefile.am.dso cinepaint-0.22-1/plug-ins/spread/Makefile.am
--- cinepaint-0.22-1/plug-ins/spread/Makefile.am.dso 2010-06-23 11:55:17.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/spread/Makefile.am 2010-06-23 11:55:30.000000000 +0200
@@ -16,7 +16,7 @@ LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
\
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/spread/Makefile.in.dso cinepaint-0.22-1/plug-ins/spread/Makefile.in
--- cinepaint-0.22-1/plug-ins/spread/Makefile.in.dso 2010-06-23 11:55:24.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/spread/Makefile.in 2010-06-23 11:55:36.000000000 +0200
@@ -281,7 +281,7 @@ LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
\
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
spread_DEPENDENCIES = $(DEPS)
diff -up cinepaint-0.22-1/plug-ins/tiff/Makefile.am.dso cinepaint-0.22-1/plug-ins/tiff/Makefile.am
--- cinepaint-0.22-1/plug-ins/tiff/Makefile.am.dso 2010-06-23 11:55:50.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/tiff/Makefile.am 2010-06-23 11:55:57.000000000 +0200
@@ -26,7 +26,7 @@ LDADD = \
$(OYRANOS_LIBS) \
@LCMS_LIB@ \
@LIBTIFF_LIB@ \
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/tiff/Makefile.in.dso cinepaint-0.22-1/plug-ins/tiff/Makefile.in
--- cinepaint-0.22-1/plug-ins/tiff/Makefile.in.dso 2010-06-23 11:55:51.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/tiff/Makefile.in 2010-06-23 11:56:03.000000000 +0200
@@ -292,7 +292,7 @@ LDADD = \
$(OYRANOS_LIBS) \
@LCMS_LIB@ \
@LIBTIFF_LIB@ \
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
tiff_DEPENDENCIES = $(DEPS)
diff -up cinepaint-0.22-1/plug-ins/unsharp/Makefile.am.dso cinepaint-0.22-1/plug-ins/unsharp/Makefile.am
--- cinepaint-0.22-1/plug-ins/unsharp/Makefile.am.dso 2010-06-23 11:56:14.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/unsharp/Makefile.am 2010-06-23 11:56:19.000000000 +0200
@@ -15,7 +15,7 @@ INCLUDES = \
LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
diff -up cinepaint-0.22-1/plug-ins/unsharp/Makefile.in.dso cinepaint-0.22-1/plug-ins/unsharp/Makefile.in
--- cinepaint-0.22-1/plug-ins/unsharp/Makefile.in.dso 2010-06-23 11:56:15.000000000 +0200
+++ cinepaint-0.22-1/plug-ins/unsharp/Makefile.in 2010-06-23 11:56:25.000000000 +0200
@@ -280,7 +280,7 @@ INCLUDES = \
LDADD = \
$(top_builddir)/lib/libcinepaint.la \
$(X_LIBS) \
- -lc
+ -lc -lm
DEPS = $(top_builddir)/lib/libcinepaint.la
unsharp_DEPENDENCIES = $(DEPS)
icc_examin-0.46-overflow.patch:
icc_examin.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE icc_examin-0.46-overflow.patch ---
diff -up icc_examin-0.46/icc_examin.cpp.overflow icc_examin-0.46/icc_examin.cpp
--- icc_examin-0.46/icc_examin.cpp.overflow 2010-06-23 12:37:26.000000000 +0200
+++ icc_examin-0.46/icc_examin.cpp 2010-06-23 12:36:58.000000000 +0200
@@ -802,7 +802,7 @@ void
ICCexamin::setzeFensterTitel()
{
DBG_PROG_START
- char* t = (char*) malloc(256);
+ char* t = (char*) malloc(256 + 4); // 256 chars + "..."
const char* title = NULL;
unsigned int t_len = 256;
Index: cinepaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- cinepaint.spec 24 Jul 2009 18:58:40 -0000 1.23
+++ cinepaint.spec 23 Jun 2010 10:49:29 -0000 1.24
@@ -6,7 +6,7 @@
Name: cinepaint
Version: %(echo %{cinever} |sed 's|-|.|')
-Release: 14%{?dist}
+Release: 15%{?dist}
Summary: CinePaint is a tool for manipulating images
Group: Applications/Multimedia
@@ -26,6 +26,8 @@ Patch9: cinepaint-0.22-1-underqu
Patch10: cinepaint-0.22-gcc44.patch
Patch11: icc_examin-0.46-default.patch
Patch12: cinepaint-0.22-oyranos19.patch
+Patch13: cinepaint-0.22-1-dso.patch
+Patch14: icc_examin-0.46-overflow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#ifnarch %{ix86} ppc
@@ -108,9 +110,11 @@ touch -r cinepaint.m4.underquoted cinepa
%setup -q -D -T -a 1 -n cinepaint-%{cinever}
pushd icc_examin-0.46
%patch11 -p1 -b .icc_def
+%patch14 -p1 -b .overflow
popd
%patch12 -p1 -b .oy19
+%patch13 -p1 -b .dso
# Update bundled version of icc_examin
rm -rf plug-ins/icc_examin/icc_examin
@@ -219,6 +223,10 @@ update-desktop-database %{_datadir}/appl
%changelog
+* Wed Jun 23 2010 Dan Horák <dan[at]danny.cz> - 0.22.1-15
+- fix FTBFS #565039
+- fix string overflow in icc_examin.cpp (#523700 ??)
+
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22.1-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
More information about the scm-commits
mailing list