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-Sep-2006 21:29:39
Branch: OPENPKG_2_STABLE Handle: 2006092020293900
Added files: (Branch: OPENPKG_2_STABLE)
openpkg-src/file file.patch
Modified files: (Branch: OPENPKG_2_STABLE)
openpkg-src/file file.spec
Log:
MFC: recent update and segfault fix
Summary:
Revision Changes Path
1.3.10.1 +11 -0 openpkg-src/file/file.patch
1.59.2.2 +4 -2 openpkg-src/file/file.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/file/file.patch
============================================================================
$ cvs diff -u -r0 -r1.3.10.1 file.patch
--- /dev/null 2006-09-20 21:29:33 +0200
+++ file.patch 2006-09-20 21:29:39 +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.59.2.1 -r1.59.2.2 file.spec
--- openpkg-src/file/file.spec 20 Jun 2006 15:16:45 -0000 1.59.2.1
+++ openpkg-src/file/file.spec 20 Sep 2006 19:29:39 -0000 1.59.2.2
@@ -24,7 +24,7 @@
# package version
%define V_api_c 4.17
-%define V_api_pl 0.83
+%define V_api_pl 0.84
# package information
Name: file
@@ -37,7 +37,7 @@
Group: Filesystem
License: BSD
Version: %{V_api_c}
-Release: 2.20060622
+Release: 2.20060920
# 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]
