rpms/mingw32-jasper/F-10 import.log, NONE, 1.1 jasper-1.900.1-mingw32.patch, NONE, 1.1 jasper-1.900.1-sleep.patch, NONE, 1.1 mingw32-jasper.spec, NONE, 1.1 patch-libjasper-stepsizes-overflow.diff, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Richard W.M. Jones]

Author: rjones

Update of /cvs/pkgs/rpms/mingw32-jasper/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28599/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log jasper-1.900.1-mingw32.patch 
	jasper-1.900.1-sleep.patch mingw32-jasper.spec 
	patch-libjasper-stepsizes-overflow.diff 
Log Message:
Initial import.



--- NEW FILE import.log ---
mingw32-jasper-1_900_1-8_fc11:F-10:mingw32-jasper-1.900.1-8.fc11.src.rpm:1236973791

jasper-1.900.1-mingw32.patch:

--- NEW FILE jasper-1.900.1-mingw32.patch ---
diff -rup jasper-1.900.1.orig/src/libjasper/Makefile.in jasper-1.900.1.new/src/libjasper/Makefile.in
--- jasper-1.900.1.orig/src/libjasper/Makefile.in	2007-01-19 16:54:45.000000000 -0500
+++ jasper-1.900.1.new/src/libjasper/Makefile.in	2008-09-09 10:08:43.000000000 -0400
@@ -290,7 +290,7 @@ libjasper_la_LIBADD = \
 
 # -release $(LT_RELEASE)
 libjasper_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+	-no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 all: all-recursive
 

jasper-1.900.1-sleep.patch:

--- NEW FILE jasper-1.900.1-sleep.patch ---
diff -rup jasper-1.900.1/src/appl/tmrdemo.c jasper-1.900.1.new/src/appl/tmrdemo.c
--- jasper-1.900.1/src/appl/tmrdemo.c	2007-01-19 16:43:08.000000000 -0500
+++ jasper-1.900.1.new/src/appl/tmrdemo.c	2008-09-09 09:14:21.000000000 -0400
@@ -1,4 +1,5 @@
 #include <jasper/jasper.h>
+#include <windows.h>
 
 int main(int argc, char **argv)
 {
@@ -43,7 +44,7 @@ int main(int argc, char **argv)
 	printf("zero time %.3f us\n", t * 1e6);
 
 	jas_tmr_start(&tmr);
-	sleep(1);
+	Sleep(1);
 	jas_tmr_stop(&tmr);
 	t = jas_tmr_get(&tmr);
 	printf("time delay %.8f s\n", t);


--- NEW FILE mingw32-jasper.spec ---
%define __strip %{_mingw32_strip}
%define __objdump %{_mingw32_objdump}
%define _use_internal_dependency_generator 0
%define __find_requires %{_mingw32_findrequires}
%define __find_provides %{_mingw32_findprovides}

Name:           mingw32-jasper
Version:        1.900.1
Release:        8%{?dist}
Summary:        MinGW Windows Jasper library

License:        JasPer
Group:          Development/Libraries

URL:            http://www.ece.uvic.ca/~mdadams/jasper/
Source0:        http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-%{version}.zip

# Patches from Fedora native package.
# OpenGL is disabled in this build, so we don't need this patch:
#Patch1:         jasper-1.701.0-GL.patch
# Note patch2 appears in native package, but is not applied:
#Patch2:         jasper-1.701.0-GL-ac.patch
Patch3:         patch-libjasper-stepsizes-overflow.diff

# MinGW-specific patches.
# This patch adds '-no-undefined' flag to libtool line:
Patch1000:      jasper-1.900.1-mingw32.patch
# This patch is a bit of a hack, but it's just there to fix a demo program:
Patch1001:      jasper-1.900.1-sleep.patch

BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch

BuildRequires:  mingw32-filesystem >= 23
BuildRequires:  mingw32-gcc
BuildRequires:  mingw32-binutils
BuildRequires:  mingw32-libjpeg
BuildRequires:  mingw32-dlfcn


%description
MinGW Windows Jasper library.


%prep
%setup -q -n jasper-%{version}
%patch3 -p1 -b .CVE-2007-2721

%patch1000 -p1 -b .mingw32
%patch1001 -p1 -b .sleep


%build
%{_mingw32_configure} \
  --disable-opengl --enable-libjpeg --disable-static --enable-shared
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make DESTDIR=$RPM_BUILD_ROOT install mandir=%{_mingw32_mandir}

# Remove the manual pages - don't duplicate documentation which
# is in the native Fedora package.
rm $RPM_BUILD_ROOT%{_mingw32_mandir}/man1/*


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYRIGHT LICENSE NEWS README
%{_mingw32_bindir}/i686-pc-mingw32-imgcmp.exe
%{_mingw32_bindir}/i686-pc-mingw32-imginfo.exe
%{_mingw32_bindir}/i686-pc-mingw32-jasper.exe
%{_mingw32_bindir}/i686-pc-mingw32-tmrdemo.exe
%{_mingw32_bindir}/libjasper-1.dll
%{_mingw32_libdir}/libjasper.dll.a
%{_mingw32_libdir}/libjasper.la
%{_mingw32_includedir}/jasper/


%changelog
* Mon Mar  9 2009 Richard W.M. Jones <rjones at redhat.com> - 1.900.1-8
- Fix defattr line.
- Remove the enable-shared patch, and just use --enable-shared on
  the configure line.
- Disable the GL patch since OpenGL is disabled.
- Document what the patches are for in the spec file.
- Only patch Makefile.in so we don't have to rerun autotools, and
  remove autotools dependency.

* Fri Feb 20 2009 Richard W.M. Jones <rjones at redhat.com> - 1.900.1-7
- Rebuild for mingw32-gcc 4.4

* Fri Jan 23 2009 Richard W.M. Jones <rjones at redhat.com> - 1.900.1-6
- Use _smp_mflags.
- Disable static libraries.
- Include documentation.
- Use the same patches as Fedora native package.
- Just run autoconf instead of autoreconf so we don't upgrade libtool.
- +BR mingw32-dlfcn.
- Don't need the manual pages.

* Wed Sep 24 2008 Richard W.M. Jones <rjones at redhat.com> - 1.900.1-5
- Rename mingw -> mingw32.

* Mon Sep 22 2008 Daniel P. Berrange <berrange at redhat.com> - 1.900.1-4
- Add overflow patch from rawhide

* Thu Sep 11 2008 Daniel P. Berrange <berrange at redhat.com> - 1.900.1-3
- Run autoreconf after changing configure.ac script and add BRs for autotools

* Wed Sep 10 2008 Richard W.M. Jones <rjones at redhat.com> - 1.900.1-2
- Enable DLLs.
- Remove static libraries.

* Tue Sep  9 2008 Daniel P. Berrange <berrange at redhat.com> - 1.900.1-1
- Initial RPM release

patch-libjasper-stepsizes-overflow.diff:

--- NEW FILE patch-libjasper-stepsizes-overflow.diff ---
--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_cs.c	2007-01-19 22:43:07.000000000 +0100
+++ jasper-1.900.1/src/libjasper/jpc/jpc_cs.c	2007-04-06 01:29:02.000000000 +0200
@@ -982,7 +982,10 @@ static int jpc_qcx_getcompparms(jpc_qcxc
 		compparms->numstepsizes = (len - n) / 2;
 		break;
 	}
-	if (compparms->numstepsizes > 0) {
+	if (compparms->numstepsizes > 3 * JPC_MAXRLVLS + 1) {
+		jpc_qcx_destroycompparms(compparms);
+                return -1;
+        } else if (compparms->numstepsizes > 0) {
 		compparms->stepsizes = jas_malloc(compparms->numstepsizes *
 		  sizeof(uint_fast16_t));
 		assert(compparms->stepsizes);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-jasper/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Mar 2009 02:34:23 -0000	1.1
+++ .cvsignore	13 Mar 2009 19:50:21 -0000	1.2
@@ -0,0 +1 @@
+jasper-1.900.1.zip


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-jasper/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Mar 2009 02:34:23 -0000	1.1
+++ sources	13 Mar 2009 19:50:21 -0000	1.2
@@ -0,0 +1 @@
+a342b2b4495b3e1394e161eb5d85d754  jasper-1.900.1.zip