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: 12-Jul-2007 09:03:18
Branch: HEAD Handle: 2007071208031800
Modified files:
openpkg-src/lsof lsof.patch lsof.spec
Log:
ZFS kernel structure header are part of OpenSolaris only, so don't run
into trouble under regular Solaris 10 GA
Summary:
Revision Changes Path
1.14 +12 -3 openpkg-src/lsof/lsof.patch
1.68 +1 -1 openpkg-src/lsof/lsof.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lsof/lsof.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 lsof.patch
--- openpkg-src/lsof/lsof.patch 25 Apr 2007 06:36:07 -0000 1.13
+++ openpkg-src/lsof/lsof.patch 12 Jul 2007 07:03:18 -0000 1.14
@@ -1,6 +1,6 @@
Index: Configure
--- Configure.orig 2007-04-24 21:00:22 +0200
-+++ Configure 2007-04-25 08:33:40 +0200
++++ Configure 2007-07-12 09:01:14 +0200
@@ -395,7 +395,7 @@
fi # }
fi # }
@@ -128,6 +128,15 @@
if test $? -eq 0 # {
then
+@@ -4242,7 +4245,7 @@
+
+ # Check for Solaris 10 or higher ZFS.
+
+- if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # {
++ if false # {
+ then
+ LSOF_TMP1="dmu.h zfs_acl.h zfs_debug.h zfs_rlock.h zil.h spa.h
zfs_context.h zfs_dir.h zfs_vfsops.h zio.h txg.h zfs_ctldir.h zfs_ioctl.h
zfs_znode.h zio_impl.h"
+ LSOF_TMP2=""
@@ -4325,7 +4328,7 @@
echo "main(){" >> ${LSOF_TMPC}.c
echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
@@ -148,7 +157,7 @@
echo "-DLT_GCC" >> $LSOF_TSTCFLG
Index: dialects/freebsd/machine.h
--- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14 +0200
-+++ dialects/freebsd/machine.h 2007-04-25 08:22:25 +0200
++++ dialects/freebsd/machine.h 2007-07-12 09:00:54 +0200
@@ -436,6 +436,11 @@
*/
@@ -163,7 +172,7 @@
/*
Index: dialects/sun/machine.h
--- dialects/sun/machine.h.orig 2007-04-24 18:23:25 +0200
-+++ dialects/sun/machine.h 2007-04-25 08:22:25 +0200
++++ dialects/sun/machine.h 2007-07-12 09:00:54 +0200
@@ -75,6 +75,7 @@
#include <sys/poll.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lsof/lsof.spec
============================================================================
$ cvs diff -u -r1.67 -r1.68 lsof.spec
--- openpkg-src/lsof/lsof.spec 25 Apr 2007 06:36:07 -0000 1.67
+++ openpkg-src/lsof/lsof.spec 12 Jul 2007 07:03:18 -0000 1.68
@@ -33,7 +33,7 @@
Group: Debugging
License: BSD
Version: 4.78
-Release: 20070425
+Release: 20070712
# list of sources
Source0:
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
