cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- use expat instead of libxml and adjust WANTLIB accordingly

Browse Source 
- add license marker
- set CONFIGURE_STYLE to gnu
- regen patch while here

from brad@
This commit is contained in:
jasper 2008-05-20 07:23:29 +00:00
parent 205241277a
commit 50726147ce
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
graphics/libwmf/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.15 2007/09/15 20:09:42 simon Exp $
# $OpenBSD: Makefile,v 1.16 2008/05/20 07:23:29 jasper Exp $
COMMENT= WMF handling and conversion library
DISTNAME= libwmf-0.2.8.3
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
SHARED_LIBS= wmf 8.0 \
wmf-0.2 8.0 \
wmflite 7.1 \
@ -15,34 +15,29 @@ HOMEPAGE= http://wvware.sf.net/
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xau Xdmcp c freetype m z
WANTLIB= ICE SM X11 Xau Xdmcp c expat freetype m z
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wvware/}
MODULES= converters/libiconv
LIB_DEPENDS= xml2::textproc/libxml \
jpeg.>=62::graphics/jpeg \
LIB_DEPENDS= jpeg.>=62::graphics/jpeg \
png.>=2::graphics/png
CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.54
USE_X11= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--enable-static \
--with-png=${LOCALBASE} \
--with-freetype=${X11BASE} \
--with-jpeg=${LOCALBASE} \
--with-zlib=/usr \
--without-expat \
--with-gsfontdir=${LOCALBASE}/share/ghostscript/fonts/ \
--disable-gd
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng" \
PKG_CONFIG="/usr/bin/false"
USE_X11= Yes
USE_LIBTOOL= Yes
.include <bsd.port.mk>

18
graphics/libwmf/patches/patch-src_player_c
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-src_player_c,v 1.1 2006/08/12 15:58:44 bernd Exp $
$OpenBSD: patch-src_player_c,v 1.2 2008/05/20 07:23:29 jasper Exp $
Security fix for CVE-2006-3376. Diff from Ubuntu. (fixed by naddy@)
--- src/player.c.orig Tue Dec 10 20:30:26 2002
+++ src/player.c Thu Aug 10 19:14:09 2006
@@ -130,6 +131,13 @@ wmf_error_t wmf_scan (wmfAPI* API,unsign
{ WMF_DEBUG (API,"bailing...");
return (API->err);
+++ src/player.c Tue May 20 09:19:22 2008
@@ -132,6 +132,13 @@ wmf_error_t wmf_scan (wmfAPI* API,unsigned long flags,
}
+ }
+
}
+ if (MAX_REC_SIZE(API) > SIZE_MAX / 2)
+ {
+ API->err = wmf_E_InsMem;
+ WMF_DEBUG (API,"bailing...");
+ return (API->err);
}
+ }
+
/* P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
*/ P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API) ) * 2 * sizeof (unsigned char));