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: 08-Jul-2008 22:52:05
Branch: HEAD Handle: 2008070821520500
Modified files:
openpkg-src/file file.patch file.spec
Log:
fix building under Solaris
Summary:
Revision Changes Path
1.13 +36 -22 openpkg-src/file/file.patch
1.81 +1 -1 openpkg-src/file/file.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/file/file.patch
============================================================================
$ cvs diff -u -r1.12 -r1.13 file.patch
--- openpkg-src/file/file.patch 4 Jul 2008 07:24:59 -0000 1.12
+++ openpkg-src/file/file.patch 8 Jul 2008 20:52:05 -0000 1.13
@@ -1,6 +1,6 @@
Index: src/apprentice.c
--- src/apprentice.c.orig 2008-07-02 17:22:47 +0200
-+++ src/apprentice.c 2008-07-04 09:19:18 +0200
++++ src/apprentice.c 2008-07-08 22:49:01 +0200
@@ -688,6 +688,7 @@
file_oomem(ms, maxmagic * sizeof(*marray));
return -1;
@@ -11,7 +11,7 @@
/* print silly verbose header for USG compat. */
Index: src/compress.c
--- src/compress.c.orig 2008-05-16 16:17:59 +0200
-+++ src/compress.c 2008-07-04 09:19:18 +0200
++++ src/compress.c 2008-07-08 22:49:01 +0200
@@ -167,7 +167,7 @@
* `safe' read for sockets and pipes.
*/
@@ -41,24 +41,15 @@
strerror(errno));
Index: src/file.c
--- 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 @@
++++ src/file.c 2008-07-08 22:49:01 +0200
+@@ -60,9 +60,10 @@
#include <wchar.h>
#endif
-#include <getopt.h>
#ifndef HAVE_GETOPT_LONG
-+struct option {
-+ const char *name;
-+ int has_arg;
-+ int *flag;
-+ int val;
-+};
-+#define no_argument 0
-+#define required_argument 1
-+#define optional_argument 2
- int getopt_long(int argc, char * const *argv, const char *optstring, const
struct option *longopts, int *longindex);
-+#include "src/getopt_long.c"
+-int getopt_long(int argc, char * const *argv, const char *optstring, const
struct option *longopts, int *longindex);
++#include "getopt_long.h"
+#else
+#include <getopt.h>
#endif
@@ -66,7 +57,7 @@
#include <netinet/in.h> /* for byte swapping */
Index: src/file.h
--- src/file.h.orig 2008-07-02 17:22:47 +0200
-+++ src/file.h 2008-07-04 09:19:45 +0200
++++ src/file.h 2008-07-08 22:49:01 +0200
@@ -356,7 +356,7 @@
protected void file_showstr(FILE *, const char *, size_t);
protected size_t file_mbswidth(const char *);
@@ -90,7 +81,7 @@
Index: src/funcs.c
--- src/funcs.c.orig 2008-05-16 16:25:01 +0200
-+++ src/funcs.c 2008-07-04 09:19:18 +0200
++++ src/funcs.c 2008-07-08 22:49:01 +0200
@@ -29,6 +29,7 @@
#include <stdarg.h>
#include <stdlib.h>
@@ -210,18 +201,23 @@
+
Index: src/getopt_long.c
--- src/getopt_long.c.orig 2008-02-07 01:50:10 +0100
-+++ src/getopt_long.c 2008-07-04 09:19:18 +0200
-@@ -30,9 +30,7 @@
++++ src/getopt_long.c 2008-07-08 22:49:01 +0200
+@@ -30,11 +30,12 @@
*/
#include <assert.h>
-#include <err.h>
++#include <stdarg.h>
#include <errno.h>
-#include <getopt.h>
++#include <stdio.h>
#include <stdlib.h>
#include <string.h>
++#include "getopt_long.h"
+
+ #define REPLACE_GETOPT
-@@ -73,6 +71,16 @@
+@@ -73,6 +74,16 @@
#define EMSG ""
@@ -238,9 +234,27 @@
static int getopt_internal __P((int, char **, const char *));
static int gcd __P((int, int));
static void permute_args __P((int, int, int, char **));
+Index: src/getopt_long.h
+--- /dev/null 2008-07-08 22:49:04 +0200
++++ src/getopt_long.h 2008-07-08 22:49:01 +0200
+@@ -0,0 +1,14 @@
++#ifndef __GETOPT_LONG_H
++#define __GETOPT_LONG_H 1
++struct option {
++ const char *name;
++ int has_arg;
++ int *flag;
++ int val;
++};
++#define no_argument 0
++#define required_argument 1
++#define optional_argument 2
++int getopt_long(int argc, char * const *argv, const char *optstring, const
struct option *longopts, int *longindex);
++
++#endif
Index: src/magic.c
--- src/magic.c.orig 2008-05-16 16:25:01 +0200
-+++ src/magic.c 2008-07-04 09:19:18 +0200
++++ src/magic.c 2008-07-08 22:49:01 +0200
@@ -324,7 +324,7 @@
if (ispipe) {
ssize_t r = 0;
@@ -252,7 +266,7 @@
if (r < PIPE_BUF) break;
Index: src/softmagic.c
--- src/softmagic.c.orig 2008-04-29 03:10:49 +0200
-+++ src/softmagic.c 2008-07-04 09:19:18 +0200
++++ src/softmagic.c 2008-07-08 22:49:01 +0200
@@ -302,10 +302,9 @@
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/file/file.spec
============================================================================
$ cvs diff -u -r1.80 -r1.81 file.spec
--- openpkg-src/file/file.spec 4 Jul 2008 07:24:59 -0000 1.80
+++ openpkg-src/file/file.spec 8 Jul 2008 20:52:05 -0000 1.81
@@ -36,7 +36,7 @@
Group: Filesystem
License: BSD
Version: %{V_api_c}
-Release: 20080704
+Release: 20080708
# package options
%option with_perl no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
