OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 03-Nov-2003 18:39:27
Branch: HEAD Handle: 2003110317392501
Modified files:
openpkg-src/lsof lsof.patch lsof.spec
openpkg-web news.txt
Log:
Fixes for a HSFS inode bug, and to correct building on Solaris 10
SPARC
Summary:
Revision Changes Path
1.2 +81 -1 openpkg-src/lsof/lsof.patch
1.36 +1 -1 openpkg-src/lsof/lsof.spec
1.7280 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lsof/lsof.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 lsof.patch
--- openpkg-src/lsof/lsof.patch 31 Oct 2003 10:50:21 -0000 1.1
+++ openpkg-src/lsof/lsof.patch 3 Nov 2003 17:39:26 -0000 1.2
@@ -1,6 +1,6 @@
diff -Naur lsof_4.69.orig/lsof_4.69_src/dialects/sun/dlsof.h
lsof_4.69/lsof_4.69_src/dialects/sun/dlsof.h
--- lsof_4.69.orig/lsof_4.69_src/dialects/sun/dlsof.h Mon Oct 13 15:30:14
2003
-+++ lsof_4.69/lsof_4.69_src/dialects/sun/dlsof.h Fri Oct 31 11:44:28 2003
++++ lsof_4.69/lsof_4.69_src/dialects/sun/dlsof.h Mon Nov 3 18:33:13 2003
@@ -96,7 +96,7 @@
#define inet_pton __inet_pton
#include <inet/ipclassifier.h>
@@ -35,3 +35,83 @@
# endif /* solaris>=100000 */
#include <sys/door.h>
+diff -Naur lsof_4.69.orig/lsof_4.69_src/dialects/sun/dnode.c
lsof_4.69/lsof_4.69_src/dialects/sun/dnode.c
+--- lsof_4.69.orig/lsof_4.69_src/dialects/sun/dnode.c Mon Oct 13 15:30:21
2003
++++ lsof_4.69/lsof_4.69_src/dialects/sun/dnode.c Mon Nov 3 18:33:13 2003
+@@ -762,20 +762,12 @@
+ Lf->is_stream = 1;
+ }
+ if (Ntype < 0) {
+-
+-#if solaris<100000
+ (void) snpf(Namech, Namechl,
+ "unknown file system type%s%s%s, v_op: %s",
+ fxs ? " (" : "",
+ fxs ? Fsinfo[fx] : "",
+ fxs ? ")" : "",
+ print_kptr((KA_T)v->v_op, (char *)NULL, 0));
+-#else /* solaris>=100000 */
+- (void) snpf(Namech, Namechl,
+- "unknown file system type: %s",
+- fxs ? Fsinfo[fx] : "(unknown)");
+-#endif /* solaris<100000 */
+-
+ enter_nm(Namech);
+ return;
+ }
+@@ -1748,13 +1740,7 @@
+ Lf->inp_ty = 1;
+ break;
+ case N_HSFS:
+-
+-#if defined(HAS_HS_NODEID)
+ Lf->inode = (unsigned long)h.hs_nodeid;
+-#else /* defined(HAS_HS_NODEID) */
+- Lf->inode = (unsigned long)h.hs_dirent.ext_lbn;
+-#endif /* defined(HAS_HS_NODEID) */
+-
+ Lf->inp_ty = 1;
+ break;
+
+@@ -2182,11 +2168,22 @@
+ if (vfs) {
+ Lf->fsdir = vfs->dir;
+ Lf->fsdev = vfs->fsname;
+- if (!Lf->fsdir && !Lf->fsdev && kvs && fxs)
++ if (!Lf->fsdir && !Lf->fsdev && kvs && fxs) {
++
++ /*
++ * The file system names are unknown.
++ *
++ * Set the file system device to the file system type and clear
++ * the doubtful device numbers.
++ */
+ Lf->fsdev = Fsinfo[fx];
++ devs = 0;
++ rdevs = 0;
++ }
+
+ #if defined(HASFSINO)
+- Lf->fs_ino = vfs->fs_ino;
++ else
++ Lf->fs_ino = vfs->fs_ino;
+ #endif /* defined(HASFSINO) */
+
+ }
+diff -Naur lsof_4.69.orig/lsof_4.69_src/dialects/sun/machine.h
lsof_4.69/lsof_4.69_src/dialects/sun/machine.h
+--- lsof_4.69.orig/lsof_4.69_src/dialects/sun/machine.h Mon Oct 13 15:30:30
2003
++++ lsof_4.69/lsof_4.69_src/dialects/sun/machine.h Mon Nov 3 18:33:13 2003
+@@ -42,6 +42,13 @@
+ */
+
+ #include <sys/lgrp.h>
++
++/*
++ * Define a dummy aio_req structure for Solaris 10, because #include'ing
++ * <sys/aio_req.h> with _KERNEL defined creates too many problems.
++ */
++
++typedef struct aio_req { int dummy; } aio_req_t;
+ # endif /* solaris>=10000 */
+
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lsof/lsof.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 lsof.spec
--- openpkg-src/lsof/lsof.spec 31 Oct 2003 10:50:21 -0000 1.35
+++ openpkg-src/lsof/lsof.spec 3 Nov 2003 17:39:26 -0000 1.36
@@ -33,7 +33,7 @@
Group: Filesystem
License: BSD
Version: 4.69
-Release: 20031031
+Release: 20031103
# list of sources
Source0: ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7279 -r1.7280 news.txt
--- openpkg-web/news.txt 3 Nov 2003 14:48:45 -0000 1.7279
+++ openpkg-web/news.txt 3 Nov 2003 17:39:25 -0000 1.7280
@@ -1,3 +1,4 @@
+03-Nov-2003: Upgraded package: P<lsof-4.69-20031103>
03-Nov-2003: Upgraded package: P<scribus-1.1.2-20031103>
03-Nov-2003: Upgraded package: P<postgresql-7.3.4-20031103>
03-Nov-2003: Upgraded package: P<spegla-1.1p4-20031103>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
