OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 08-Mar-2003 09:54:46
Branch: HEAD Handle: 2003030808544203
Modified files:
openpkg-re/vcheck vc.ethereal
openpkg-src/ethereal ethereal.patch ethereal.spec
openpkg-web news.txt
Log:
upgrading package: ethereal 0.9.9 -> 0.9.10
Summary:
Revision Changes Path
1.5 +1 -1 openpkg-re/vcheck/vc.ethereal
1.3 +0 -17 openpkg-src/ethereal/ethereal.patch
1.15 +2 -4 openpkg-src/ethereal/ethereal.spec
1.3610 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.ethereal
============================================================================
$ cvs diff -u -r1.4 -r1.5 vc.ethereal
--- openpkg-re/vcheck/vc.ethereal 24 Jan 2003 10:56:29 -0000 1.4
+++ openpkg-re/vcheck/vc.ethereal 8 Mar 2003 08:54:42 -0000 1.5
@@ -2,7 +2,7 @@
}
prog ethereal = {
- version = 0.9.9
+ version = 0.9.10
url = http://www.ethereal.com/distribution/
regex = ethereal-(__VER__)\.tar\.bz2
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.patch
============================================================================
$ cvs diff -u -r1.2 -r1.3 ethereal.patch
--- openpkg-src/ethereal/ethereal.patch 5 Mar 2003 11:29:02 -0000 1.2
+++ openpkg-src/ethereal/ethereal.patch 8 Mar 2003 08:54:45 -0000 1.3
@@ -8,20 +8,3 @@
#ifdef HAVE_IO_H
#include <io.h> /* open/close on win32 */
-# This is a security patch for ethereal vendor release-0-9-9
-# It will be included in future vendor releases and must be removed from here
accordingly
-# http://www.ethereal.com/cgi-bin/viewcvs.cgi/ethereal/packet-socks.c
-#
http://www.ethereal.com/cgi-bin/viewcvs.cgi/ethereal/packet-socks.c.diff?r1=text&tr1=1.43&r2=text&tr2=1.44&diff_format=u
-# http://cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2003-0081
-#
---- packet-socks.c.orig Wed Mar 5 11:41:01 2003
-+++ packet-socks.c Wed Mar 5 11:46:52 2003
-@@ -908,7 +908,7 @@
- linelen = lineend - data;
-
- proto_tree_add_text( tree, tvb, offset,
linelen,
-- format_text(data, linelen));
-+ "%s", format_text(data, linelen));
- offset += linelen;
- data = lineend;
- }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/ethereal/ethereal.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 ethereal.spec
--- openpkg-src/ethereal/ethereal.spec 5 Mar 2003 11:29:02 -0000 1.14
+++ openpkg-src/ethereal/ethereal.spec 8 Mar 2003 08:54:45 -0000 1.15
@@ -32,8 +32,8 @@
Distribution: OpenPKG [PLUS]
Group: Misc
License: GPL
-Version: 0.9.9
-Release: 20030305
+Version: 0.9.10
+Release: 20030308
# package options
%option with_zlib no
@@ -42,7 +42,6 @@
# list of sources
Source0: http://www.ethereal.com/distribution/ethereal-%{version}.tar.bz2
-Patch0: ethereal.patch
# build information
Prefix: %{l_prefix}
@@ -74,7 +73,6 @@
%prep
%setup -q
- %patch -p0
%build
CC="%{l_cc}" \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.3609 -r1.3610 news.txt
--- openpkg-web/news.txt 7 Mar 2003 20:54:35 -0000 1.3609
+++ openpkg-web/news.txt 8 Mar 2003 08:54:44 -0000 1.3610
@@ -1,3 +1,4 @@
+08-Mar-2003: Upgraded package: P<ethereal-0.9.10-20030308>
07-Mar-2003: Upgraded package: P<perl-net-20030307-20030307>
07-Mar-2003: Upgraded package: P<poweradmin-1.2.4-20030307>
07-Mar-2003: Upgraded package: P<openpkg-tool-20030307-20030307>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]