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: 04-Jul-2008 09:25:00
Branch: HEAD Handle: 2008070408245900
Modified files:
openpkg-src/file file.patch file.spec
Log:
upgrading package: file 4.24 -> 4.25
Summary:
Revision Changes Path
1.12 +21 -21 openpkg-src/file/file.patch
1.80 +2 -2 openpkg-src/file/file.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/file/file.patch
============================================================================
$ cvs diff -u -r1.11 -r1.12 file.patch
--- openpkg-src/file/file.patch 23 May 2008 11:40:28 -0000 1.11
+++ openpkg-src/file/file.patch 4 Jul 2008 07:24:59 -0000 1.12
@@ -1,7 +1,7 @@
Index: src/apprentice.c
---- src/apprentice.c.orig 2008-03-28 19:19:30 +0100
-+++ src/apprentice.c 2008-05-23 13:35:47 +0200
-@@ -633,6 +633,7 @@
+--- src/apprentice.c.orig 2008-07-02 17:22:47 +0200
++++ src/apprentice.c 2008-07-04 09:19:18 +0200
+@@ -688,6 +688,7 @@
file_oomem(ms, maxmagic * sizeof(*marray));
return -1;
}
@@ -10,8 +10,8 @@
/* print silly verbose header for USG compat. */
Index: src/compress.c
---- src/compress.c.orig 2008-02-07 01:58:52 +0100
-+++ src/compress.c 2008-05-23 13:35:47 +0200
+--- src/compress.c.orig 2008-05-16 16:17:59 +0200
++++ src/compress.c 2008-07-04 09:19:18 +0200
@@ -167,7 +167,7 @@
* `safe' read for sockets and pipes.
*/
@@ -40,8 +40,8 @@
(void)fprintf(stderr, "Read failed (%s)\n",
strerror(errno));
Index: src/file.c
---- src/file.c.orig 2008-02-07 01:58:52 +0100
-+++ src/file.c 2008-05-23 13:36:38 +0200
+--- src/file.c.orig 2008-05-19 01:21:17 +0200
++++ src/file.c 2008-07-04 09:19:18 +0200
@@ -60,9 +60,20 @@
#include <wchar.h>
#endif
@@ -65,9 +65,9 @@
#include <netinet/in.h> /* for byte swapping */
Index: src/file.h
---- src/file.h.orig 2008-03-07 16:00:07 +0100
-+++ src/file.h 2008-05-23 13:35:47 +0200
-@@ -346,7 +346,7 @@
+--- src/file.h.orig 2008-07-02 17:22:47 +0200
++++ src/file.h 2008-07-04 09:19:45 +0200
+@@ -356,7 +356,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 *);
@@ -76,12 +76,12 @@
protected int file_check_mem(struct magic_set *, unsigned int);
protected int file_looks_utf8(const unsigned char *, size_t, unichar *,
size_t *);
-@@ -367,9 +367,11 @@
+@@ -377,9 +377,11 @@
#endif
#ifndef HAVE_VASPRINTF
+#define vasprintf file_vasprintf
- int vasprintf(char **ptr, const char *format_string, va_list vargs);
+ int vasprintf(char **, const char *, va_list);
#endif
#ifndef HAVE_ASPRINTF
+#define asprintf file_asprintf
@@ -89,8 +89,8 @@
#endif
Index: src/funcs.c
---- src/funcs.c.orig 2008-03-07 16:00:07 +0100
-+++ src/funcs.c 2008-05-23 13:35:47 +0200
+--- src/funcs.c.orig 2008-05-16 16:25:01 +0200
++++ src/funcs.c 2008-07-04 09:19:18 +0200
@@ -29,6 +29,7 @@
#include <stdarg.h>
#include <stdlib.h>
@@ -99,7 +99,7 @@
#include <ctype.h>
#if defined(HAVE_WCHAR_H)
#include <wchar.h>
-@@ -329,3 +330,108 @@
+@@ -337,3 +338,108 @@
#endif /* ENABLE_CONDITIONALS */
return 0;
}
@@ -210,7 +210,7 @@
+
Index: src/getopt_long.c
--- src/getopt_long.c.orig 2008-02-07 01:50:10 +0100
-+++ src/getopt_long.c 2008-05-23 13:35:47 +0200
++++ src/getopt_long.c 2008-07-04 09:19:18 +0200
@@ -30,9 +30,7 @@
*/
@@ -239,9 +239,9 @@
static int gcd __P((int, int));
static void permute_args __P((int, int, int, char **));
Index: src/magic.c
---- src/magic.c.orig 2008-02-19 16:16:38 +0100
-+++ src/magic.c 2008-05-23 13:35:47 +0200
-@@ -325,7 +325,7 @@
+--- src/magic.c.orig 2008-05-16 16:25:01 +0200
++++ src/magic.c 2008-07-04 09:19:18 +0200
+@@ -324,7 +324,7 @@
if (ispipe) {
ssize_t r = 0;
@@ -251,8 +251,8 @@
nbytes += r;
if (r < PIPE_BUF) break;
Index: src/softmagic.c
---- src/softmagic.c.orig 2008-03-07 16:00:07 +0100
-+++ src/softmagic.c 2008-05-23 13:35:47 +0200
+--- src/softmagic.c.orig 2008-04-29 03:10:49 +0200
++++ src/softmagic.c 2008-07-04 09:19:18 +0200
@@ -302,10 +302,9 @@
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/file/file.spec
============================================================================
$ cvs diff -u -r1.79 -r1.80 file.spec
--- openpkg-src/file/file.spec 23 May 2008 11:40:28 -0000 1.79
+++ openpkg-src/file/file.spec 4 Jul 2008 07:24:59 -0000 1.80
@@ -22,7 +22,7 @@
##
# package version
-%define V_api_c 4.24
+%define V_api_c 4.25
%define V_api_pl 0.88
# package information
@@ -36,7 +36,7 @@
Group: Filesystem
License: BSD
Version: %{V_api_c}
-Release: 20080523
+Release: 20080704
# package options
%option with_perl no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
