OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 20-Aug-2006 16:05:17
Branch: HEAD Handle: 2006082015051600
Modified files:
openpkg-src/wml wml.patch wml.spec
Log:
upgrading package: wml 2.0.9 -> 2.0.11
Summary:
Revision Changes Path
1.5 +21 -35 openpkg-src/wml/wml.patch
1.47 +3 -3 openpkg-src/wml/wml.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/wml/wml.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 wml.patch
--- openpkg-src/wml/wml.patch 23 Sep 2005 14:00:43 -0000 1.4
+++ openpkg-src/wml/wml.patch 20 Aug 2006 14:05:16 -0000 1.5
@@ -1,6 +1,6 @@
Index: wml_aux/iselect/Makefile.in
---- wml_aux/iselect/Makefile.in.orig 2002-10-18 22:06:44 +0200
-+++ wml_aux/iselect/Makefile.in 2005-06-13 13:22:23 +0200
+--- wml_aux/iselect/Makefile.in.orig 2005-12-01 18:50:13 +0100
++++ wml_aux/iselect/Makefile.in 2006-08-20 15:48:19 +0200
@@ -12,7 +12,7 @@
# compiler tools
@@ -10,28 +10,11 @@
LDFLAGS = @LDFLAGS@
LIBS = @LIBS@
debug = @debug@
-Index: wml_common/gd/Makefile.PL.in
---- wml_common/gd/Makefile.PL.in.orig 2000-03-12 17:22:30 +0100
-+++ wml_common/gd/Makefile.PL.in 2005-06-13 11:51:23 +0200
-@@ -12,8 +12,8 @@
-
- # Uncomment the line below if you're getting link errors
- # having to do with missing math functions (like floor)
-- 'LIBS' => ["-lm @LIBPNG@"],
-- 'DEFINE' => '@DEFS@'
-+ 'LIBS' => ["-lm @LIBPNG@ -L/openpkg-dev/lib -lz"],
-+ 'DEFINE' => '@DEFS@ @CPPFLAGS@'
- # Uncomment the line below if you're using a perl compiled
- # for fastCGI (http://www.fastcgi.com/).
- # 'DEFINE' => '-DFCGI'
-
------------------------------------------------------------------------------
-
-Security Fix (CAN-2005-2491, partially)
-
+Index: wml_aux/tidy/Makefile
+sed: -e expression #1, char 23: unknown option to `s'
Index: wml_backend/p2_mp4h/pcre/pcre.c
---- wml_backend/p2_mp4h/pcre/pcre.c.orig 2002-06-15 23:24:09 +0200
-+++ wml_backend/p2_mp4h/pcre/pcre.c 2005-09-05 16:53:43 +0200
+--- wml_backend/p2_mp4h/pcre/pcre.c.orig 2005-12-01 18:50:13 +0100
++++ wml_backend/p2_mp4h/pcre/pcre.c 2006-08-20 15:48:19 +0200
@@ -716,12 +716,23 @@
while ((cd->ctypes[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
@@ -57,8 +40,8 @@
{
*errorptr = ERR4;
Index: wml_backend/p3_eperl/eperl_main.c
---- wml_backend/p3_eperl/eperl_main.c.orig 2002-08-08 23:56:26 +0200
-+++ wml_backend/p3_eperl/eperl_main.c 2005-09-23 14:55:19 +0200
+--- wml_backend/p3_eperl/eperl_main.c.orig 2005-12-01 18:50:13 +0100
++++ wml_backend/p3_eperl/eperl_main.c 2006-08-20 15:48:19 +0200
@@ -265,7 +265,7 @@
exit(rc);
}
@@ -68,14 +51,17 @@
{ "define", 1, NULL, 'd' },
{ "setenv", 1, NULL, 'D' },
{ "includedir", 1, NULL, 'I' },
-Index: wml_backend/p3_eperl/eperl_proto.h
---- wml_backend/p3_eperl/eperl_proto.h.orig 2002-10-18 23:48:38 +0200
-+++ wml_backend/p3_eperl/eperl_proto.h 2005-09-23 14:55:10 +0200
-@@ -53,7 +53,6 @@
- extern void mysighandler(int rc);
- extern void myinit(void);
- extern void myexit(int rc);
--extern struct option options[];
- extern int main(int argc, char **argv, char **env);
+Index: wml_common/gd/Makefile.PL.in
+--- wml_common/gd/Makefile.PL.in.orig 2005-12-01 18:50:13 +0100
++++ wml_common/gd/Makefile.PL.in 2006-08-20 15:48:19 +0200
+@@ -12,8 +12,8 @@
- /* eperl_parse.c */
+ # Uncomment the line below if you're getting link errors
+ # having to do with missing math functions (like floor)
+- 'LIBS' => ["-lm @LIBPNG@"],
+- 'DEFINE' => '@DEFS@'
++ 'LIBS' => ["-lm @LIBPNG@ -L/openpkg-dev/lib -lz"],
++ 'DEFINE' => '@DEFS@ @CPPFLAGS@'
+ # Uncomment the line below if you're using a perl compiled
+ # for fastCGI (http://www.fastcgi.com/).
+ # 'DEFINE' => '-DFCGI'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wml/wml.spec
============================================================================
$ cvs diff -u -r1.46 -r1.47 wml.spec
--- openpkg-src/wml/wml.spec 1 Jan 2006 13:24:02 -0000 1.46
+++ openpkg-src/wml/wml.spec 20 Aug 2006 14:05:16 -0000 1.47
@@ -32,8 +32,8 @@
Class: BASE
Group: Language
License: GPL
-Version: 2.0.9
-Release: 20050923
+Version: 2.0.11
+Release: 20060820
# list of sources
Source0: ftp://thewml.org/distrib/wml-%{version}.tar.gz
@@ -46,7 +46,7 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20050615, perl, gcc
+BuildPreReq: OpenPKG, openpkg >= 20050615, perl, gcc, lynx
PreReq: OpenPKG, openpkg >= 20050615, perl
BuildPreReq: png, zlib, ncurses
PreReq: png, zlib, ncurses
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
