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: 28-Dec-2007 10:31:58
Branch: HEAD Handle: 2007122809315402
Modified files:
openpkg-src/file file.patch file.spec
Log:
upgrading package: file 4.21 -> 4.22
Summary:
Revision Changes Path
1.8 +17 -17 openpkg-src/file/file.patch
1.72 +3 -2 openpkg-src/file/file.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/file/file.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 file.patch
--- openpkg-src/file/file.patch 19 Jun 2007 14:24:55 -0000 1.7
+++ openpkg-src/file/file.patch 28 Dec 2007 09:31:54 -0000 1.8
@@ -1,7 +1,7 @@
Index: src/apprentice.c
---- src/apprentice.c.orig 2007-05-16 22:51:40 +0200
-+++ src/apprentice.c 2007-06-19 16:00:43 +0200
-@@ -534,6 +534,7 @@
+--- src/apprentice.c.orig 2007-12-27 21:16:32 +0100
++++ src/apprentice.c 2007-12-28 10:28:59 +0100
+@@ -549,6 +549,7 @@
file_oomem(ms, maxmagic * sizeof(*marray));
return -1;
}
@@ -10,9 +10,9 @@
/* print silly verbose header for USG compat. */
Index: src/compress.c
---- src/compress.c.orig 2007-03-05 03:41:29 +0100
-+++ src/compress.c 2007-06-19 16:00:43 +0200
-@@ -158,7 +158,7 @@
+--- src/compress.c.orig 2007-12-02 18:32:23 +0100
++++ src/compress.c 2007-12-28 10:28:59 +0100
+@@ -167,7 +167,7 @@
* `safe' read for sockets and pipes.
*/
protected ssize_t
@@ -21,7 +21,7 @@
{
int rv, cnt;
#ifdef FIONREAD
-@@ -252,7 +252,7 @@
+@@ -261,7 +261,7 @@
if (swrite(tfd, startbuf, nbytes) != (ssize_t)nbytes)
r = 1;
else {
@@ -30,7 +30,7 @@
if (swrite(tfd, buf, (size_t)r) != r)
break;
}
-@@ -453,7 +453,7 @@
+@@ -462,7 +462,7 @@
n = 0;
goto err;
}
@@ -40,9 +40,9 @@
(void)fprintf(stderr, "Read failed (%s)\n",
strerror(errno));
Index: src/file.h
---- src/file.h.orig 2007-03-25 05:13:47 +0200
-+++ src/file.h 2007-06-19 16:00:57 +0200
-@@ -323,7 +323,7 @@
+--- src/file.h.orig 2007-11-08 01:31:37 +0100
++++ src/file.h 2007-12-28 10:28:59 +0100
+@@ -333,7 +333,7 @@
protected void file_showstr(FILE *, const char *, size_t);
protected size_t file_mbswidth(const char *);
protected const char *file_getbuffer(struct magic_set *);
@@ -52,9 +52,9 @@
#ifndef COMPILE_ONLY
Index: src/magic.c
---- src/magic.c.orig 2007-03-26 19:59:50 +0200
-+++ src/magic.c 2007-06-19 16:00:43 +0200
-@@ -305,7 +305,7 @@
+--- src/magic.c.orig 2007-12-27 17:35:59 +0100
++++ src/magic.c 2007-12-28 10:28:59 +0100
+@@ -322,7 +322,7 @@
if (ispipe) {
ssize_t r = 0;
@@ -64,9 +64,9 @@
nbytes += r;
if (r < PIPE_BUF) break;
Index: src/softmagic.c
---- src/softmagic.c.orig 2007-05-08 16:44:18 +0200
-+++ src/softmagic.c 2007-06-19 16:00:43 +0200
-@@ -287,10 +287,9 @@
+--- src/softmagic.c.orig 2007-12-27 17:35:59 +0100
++++ src/softmagic.c 2007-12-28 10:28:59 +0100
+@@ -288,10 +288,9 @@
}
#ifndef HAVE_STRNDUP
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/file/file.spec
============================================================================
$ cvs diff -u -r1.71 -r1.72 file.spec
--- openpkg-src/file/file.spec 29 Aug 2007 07:28:10 -0000 1.71
+++ openpkg-src/file/file.spec 28 Dec 2007 09:31:56 -0000 1.72
@@ -23,7 +23,7 @@
##
# package version
-%define V_api_c 4.21
+%define V_api_c 4.22
%define V_api_pl 0.85
# package information
@@ -37,7 +37,7 @@
Group: Filesystem
License: BSD
Version: %{V_api_c}
-Release: 20070829
+Release: 20071228
# package options
%option with_perl no
@@ -93,6 +93,7 @@
LDFLAGS="%{l_ldflags}" \
./configure \
--prefix=%{l_prefix} \
+ --mandir=%{l_prefix}/man \
--disable-shared \
--disable-nls
%{l_make} %{l_mflags}
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
