[CVS] OpenPKG: openpkg-src/wml/ wml.patch wml.spec
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:
RevisionChanges 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 - 1.4
+++ openpkg-src/wml/wml.patch 20 Aug 2006 14:05:16 - 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.orig2000-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.c2005-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.c2006-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.orig2005-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 - 1.46
+++ openpkg-src/wml/wml.spec 20 Aug 2006 14:05:16 - 1.47
@@ -32,8 +32,8 @@
Class:BASE
Group:Language
License: GPL
-Version: 2.0.9
-Rele
[CVS] OpenPKG: openpkg-src/wml/ wml.patch wml.spec
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: 23-Sep-2005 16:00:43
Branch: HEAD Handle: 2005092315004300
Modified files:
openpkg-src/wml wml.patch wml.spec
Log:
fix building under new GCC 4.0 world order
Summary:
RevisionChanges Path
1.4 +23 -0 openpkg-src/wml/wml.patch
1.45+1 -1 openpkg-src/wml/wml.spec
patch -p0 <<'@@ .'
Index: openpkg-src/wml/wml.patch
$ cvs diff -u -r1.3 -r1.4 wml.patch
--- openpkg-src/wml/wml.patch 5 Sep 2005 14:59:24 - 1.3
+++ openpkg-src/wml/wml.patch 23 Sep 2005 14:00:43 - 1.4
@@ -56,3 +56,26 @@
if (max < min)
{
*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.c2005-09-23 14:55:19 +0200
+@@ -265,7 +265,7 @@
+ exit(rc);
+ }
+
+-struct option options[] = {
++static struct option options[] = {
+ { "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);
+
+ /* eperl_parse.c */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wml/wml.spec
$ cvs diff -u -r1.44 -r1.45 wml.spec
--- openpkg-src/wml/wml.spec 5 Sep 2005 14:56:42 - 1.44
+++ openpkg-src/wml/wml.spec 23 Sep 2005 14:00:43 - 1.45
@@ -33,7 +33,7 @@
Group:Language
License: GPL
Version: 2.0.9
-Release: 20050905
+Release: 20050923
# list of sources
Source0: ftp://thewml.org/distrib/wml-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/wml/ wml.patch wml.spec
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: 05-Sep-2005 16:56:42
Branch: HEAD Handle: 2005090515564200
Modified files:
openpkg-src/wml wml.patch wml.spec
Log:
apply Security Fix (CAN-2005-2491, partially)
Summary:
RevisionChanges Path
1.2 +32 -0 openpkg-src/wml/wml.patch
1.44+1 -1 openpkg-src/wml/wml.spec
patch -p0 <<'@@ .'
Index: openpkg-src/wml/wml.patch
$ cvs diff -u -r1.1 -r1.2 wml.patch
--- openpkg-src/wml/wml.patch 13 Jun 2005 11:46:48 - 1.1
+++ openpkg-src/wml/wml.patch 5 Sep 2005 14:56:42 - 1.2
@@ -26,3 +26,35 @@
# 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_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
+@@ -716,12 +716,23 @@
+
+ while ((cd->ctypes[*p] & ctype_digit) != 0) min = min * 10 + *p++ - '0';
+
++if (min < 0 || min > 65535)
++ {
++ *errorptr = ERR5;
++ return p;
++ }
++
+ if (*p == '}') max = min; else
+ {
+ if (*(++p) != '}')
+ {
+ max = 0;
+ while((cd->ctypes[*p] & ctype_digit) != 0) max = max * 10 + *p++ - '0';
++if (max < 0 || max > 65535)
++ {
++ *errorptr = ERR5;
++ return p;
++ }
+ if (max < min)
+ {
+ *errorptr = ERR4;
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wml/wml.spec
$ cvs diff -u -r1.43 -r1.44 wml.spec
--- openpkg-src/wml/wml.spec 17 Jun 2005 08:30:46 - 1.43
+++ openpkg-src/wml/wml.spec 5 Sep 2005 14:56:42 - 1.44
@@ -33,7 +33,7 @@
Group:Language
License: GPL
Version: 2.0.9
-Release: 20050617
+Release: 20050905
# list of sources
Source0: ftp://thewml.org/distrib/wml-%{version}.tar.gz
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
[CVS] OpenPKG: openpkg-src/wml/ wml.patch wml.spec
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: 13-Jun-2005 13:46:49
Branch: HEAD Handle: 2005061312464800
Added files:
openpkg-src/wml wml.patch
Modified files:
openpkg-src/wml wml.spec
Log:
try to fix building under Fedora and NetBSD
Summary:
RevisionChanges Path
1.1 +28 -0 openpkg-src/wml/wml.patch
1.41+6 -7 openpkg-src/wml/wml.spec
patch -p0 <<'@@ .'
Index: openpkg-src/wml/wml.patch
$ cvs diff -u -r0 -r1.1 wml.patch
--- /dev/null 2005-06-13 13:46:48 +0200
+++ wml.patch 2005-06-13 13:46:48 +0200
@@ -0,0 +1,28 @@
+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
+@@ -12,7 +12,7 @@
+
+ # compiler tools
+ CC = @CC@
+-CFLAGS = @CFLAGS@ -I.
++CFLAGS = @CFLAGS@ -I. @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS= @LIBS@
+ debug = @debug@
+Index: wml_aux/tidy/Makefile
+sed: -e expression #1, char 23: unknown option to `s'
+Index: wml_common/gd/Makefile.PL.in
+--- wml_common/gd/Makefile.PL.in.orig2000-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'
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/wml/wml.spec
$ cvs diff -u -r1.40 -r1.41 wml.spec
--- openpkg-src/wml/wml.spec 24 Mar 2005 11:20:42 - 1.40
+++ openpkg-src/wml/wml.spec 13 Jun 2005 11:46:48 - 1.41
@@ -33,7 +33,7 @@
Group:Language
License: GPL
Version: 2.0.9
-Release: 20040609
+Release: 20050613
# list of sources
Source0: ftp://thewml.org/distrib/wml-%{version}.tar.gz
@@ -41,14 +41,15 @@
Source2: configure.gm4
Source3: configure.iselect
Source4: configure.gd
+Patch0: wml.patch
# build information
Prefix: %{l_prefix}
BuildRoot:%{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, perl, gcc
PreReq: OpenPKG, openpkg >= 20040130, perl
-BuildPreReq: png, zlib
-PreReq: png, zlib
+BuildPreReq: png, zlib, ncurses
+PreReq: png, zlib, ncurses
AutoReq: no
AutoReqProv: no
@@ -75,18 +76,16 @@
%prep
%setup -q
+%patch -p0
cp %{SOURCE configure.eperl} wml_backend/p3_eperl/configure
cp %{SOURCE configure.gm4} wml_backend/p4_gm4/configure
cp %{SOURCE configure.iselect} wml_aux/iselect/configure
cp %{SOURCE configure.gd} wml_common/gd/configure
-%{l_shtool} subst \
--e 's;^\([]\{1,\}.LIBS.[ ]\{1,\}=>\).*$;\1 [\"-lm @LIBPNG@
%{l_ldflags} -lz\"],;' \
-wml_common/gd/Makefile.PL.in
%build
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
-CPPFLAGS="%{l_cppflags}" \
+CPPFLAGS="%{l_cppflags ncurses}" \
LDFLAGS="%{l_ldflags}" \
LIBS="%{l_ldflags} -lpng -lz -lm" \
./configure \
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
