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: 19-Sep-2006 13:23:02
Branch: HEAD Handle: 2006091912230200
Added files:
openpkg-src/file file.patch
Modified files:
openpkg-src/file file.spec
Log:
fix a long-standing segfault (which occurred only under Solaris for
obscure reasons) by correctly initializing an array
Summary:
Revision Changes Path
1.4 +11 -0 openpkg-src/file/file.patch
1.61 +3 -1 openpkg-src/file/file.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/file/file.patch
============================================================================
$ cvs diff -u -r0 -r1.4 file.patch
--- /dev/null 2006-09-19 13:22:44 +0200
+++ file.patch 2006-09-19 13:23:02 +0200
@@ -0,0 +1,11 @@
+Index: src/apprentice.c
+--- src/apprentice.c.orig 2006-03-02 23:08:57.000000000 +0100
++++ src/apprentice.c 2006-09-19 13:19:42.234166634 +0200
+@@ -386,6 +386,7 @@
+ file_oomem(ms);
+ return -1;
+ }
++ memset(marray, 0, maxmagic * sizeof(*marray));
+ marraycount = 0;
+
+ /* print silly verbose header for USG compat. */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/file/file.spec
============================================================================
$ cvs diff -u -r1.60 -r1.61 file.spec
--- openpkg-src/file/file.spec 29 Jun 2006 15:28:36 -0000 1.60
+++ openpkg-src/file/file.spec 19 Sep 2006 11:23:02 -0000 1.61
@@ -37,7 +37,7 @@
Group: Filesystem
License: BSD
Version: %{V_api_c}
-Release: 20060629
+Release: 20060919
# package options
%option with_perl no
@@ -45,6 +45,7 @@
# list of sources
Source0: ftp://ftp.astron.com/pub/file/file-%{V_api_c}.tar.gz
Source1:
http://www.cpan.org/modules/by-module/File/File-LibMagic-%{V_api_pl}.tgz
+Patch0: file.patch
# build information
Prefix: %{l_prefix}
@@ -79,6 +80,7 @@
%prep
%setup -q
%setup -q -D -T -a 1
+ %patch -p0
%build
ACLOCAL=true \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
