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: 10-Apr-2006 19:58:02
Branch: HEAD Handle: 2006041018580200
Modified files:
openpkg-src/lsof lsof.patch lsof.spec
Log:
upgrading package: lsof 4.76 -> 4.77
Summary:
Revision Changes Path
1.10 +32 -93 openpkg-src/lsof/lsof.patch
1.60 +2 -2 openpkg-src/lsof/lsof.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lsof/lsof.patch
============================================================================
$ cvs diff -u -r1.9 -r1.10 lsof.patch
--- openpkg-src/lsof/lsof.patch 22 Feb 2006 17:45:23 -0000 1.9
+++ openpkg-src/lsof/lsof.patch 10 Apr 2006 17:58:02 -0000 1.10
@@ -1,83 +1,7 @@
-Index: lsof_4.76_src/dialects/freebsd/dlsof.h
---- lsof_4.76_src/dialects/freebsd/dlsof.h.orig 2005-08-08 21:49:26
+0200
-+++ lsof_4.76_src/dialects/freebsd/dlsof.h 2006-02-10 19:24:29 +0100
-@@ -297,6 +297,10 @@
- #define MALLOC_DECLARE(type) extern struct malloc_type type[1]
- /* to pacify <sys/lockf.h> */
- #define _KERNEL
-+#if FREEBSDV>=6000
-+#include <sys/sx.h>
-+#include <fs/devfs/devfs_int.h>
-+#endif /* FREEBSDV>=6000 */
- #include <fs/devfs/devfs.h>
- #undef _KERNEL
- # endif /* FREEBSDV>=5000 */
-Index: lsof_4.76_src/dialects/freebsd/dmnt.c
---- lsof_4.76_src/dialects/freebsd/dmnt.c.orig 2005-08-08 21:49:27
+0200
-+++ lsof_4.76_src/dialects/freebsd/dmnt.c 2006-02-10 19:25:57 +0100
-@@ -78,8 +78,24 @@
- struct stat sb;
- static ss = 0;
-
-- if (ss)
-- return(c->si_inode ^ s);
-+# if defined(HAS_SI_PRIV)
-+/*
-+ * If the cdev structure has a private sub-structure, read it.
-+ */
-+ struct cdev_priv sp;
-+
-+ if (!c->si_priv || kread((KA_T)c->si_priv, (char *)&sp, sizeof(sp)))
-+ return(0);
-+#endif /* defined(HAS_SI_PRIV) */
-+
-+ if (ss) {
-+# if defined(HAS_SI_PRIV)
-+ return(sp.cdp_inode ^ s);
-+# else /* !defined(HAS_SI_PRIV) */
-+ return(c->si_inode ^ s);
-+#endif /* defined(HAS_SI_PRIV) */
-+ }
-+
- /*
- * Determine the random udev seed from stat(2) operations on "/" and
- * its device.
-@@ -160,8 +176,14 @@
- * If the device seed is known, return its application to the cdev
structure's
- * inode.
- */
-- if (ss)
-- return(c->si_inode ^ s);
-+ if (ss) {
-+# if defined(HAS_SI_PRIV)
-+ return(sp.cdp_inode ^ s);
-+# else /* !defined(HAS_SI_PRIV) */
-+ return(c->si_inode ^ s);
-+#endif /* defined(HAS_SI_PRIV) */
-+ }
-+
- (void) fprintf(stderr, "%s: can't determine user device random
seed.\n", Pn);
- Exit(1);
- }
-Index: lsof_4.76_src/dialects/freebsd/machine.h
---- lsof_4.76_src/dialects/freebsd/machine.h.orig 2005-08-29 12:21:48
+0200
-+++ lsof_4.76_src/dialects/freebsd/machine.h 2006-02-10 19:24:29 +0100
-@@ -427,6 +427,11 @@
- */
-
- /* #define HASSECURITY 1 */
-+#if FREEBSDV>=6000
-+#define HASSECURITY 1
-+#define HAS_SI_PRIV 1
-+#endif /* FREEBSDV>=6000 */
-+
-
-
- /*
-Index: lsof_4.76_src/Configure
---- lsof_4.76_src/Configure.orig 2005-08-29 12:17:38.000000000 +0200
-+++ lsof_4.76_src/Configure 2005-12-30 18:38:58.000000000 +0100
-@@ -396,7 +396,7 @@
+Index: lsof_4.77_src/Configure
+--- lsof_4.77_src/Configure.orig 2006-04-10 14:44:22 +0200
++++ lsof_4.77_src/Configure 2006-04-10 19:51:46 +0200
+@@ -395,7 +395,7 @@
fi # }
fi # }
LSOF_TGT="aix"
@@ -86,7 +10,7 @@
if test $? -eq 0 # {
then
-@@ -540,7 +540,7 @@
+@@ -539,7 +539,7 @@
LSOF_CFGF="$LSOF_CFGF -I`pwd`/dialects/aix/aix5"
if test $LSOF_VERS -ge 5200 # {
then
@@ -95,7 +19,7 @@
if test $? -eq 0 # {
then
-@@ -578,7 +578,7 @@
+@@ -577,7 +577,7 @@
# This is AIX >= 5 on ia64.
LSOF_TSTK64=1
@@ -104,7 +28,7 @@
if test $? -eq 0 # {
then
-@@ -655,7 +655,7 @@
+@@ -654,7 +654,7 @@
fi # }
LSOF_TSTK64=1
LSOF_TMP1=1
@@ -113,7 +37,7 @@
if test $? -eq 0 # {
then
LSOF_CFGF="$LSOF_CFGF -maix64"
-@@ -702,7 +702,7 @@
+@@ -701,7 +701,7 @@
fi #}
LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS"
LSOF_DIALECT_DIR=aix
@@ -122,7 +46,7 @@
if test $? -eq 0 # {
then
-@@ -1921,7 +1921,7 @@
+@@ -1865,7 +1865,7 @@
fi # }
fi # }
fi # }
@@ -131,7 +55,7 @@
if test $? -eq 0 # {
then
LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
-@@ -2045,7 +2045,7 @@
+@@ -1989,7 +1989,7 @@
echo "* NOTICE! Configuring for 64 bit HP-UX *"
echo "* *"
echo "*****************************************"
@@ -140,7 +64,7 @@
if test $? -eq 0 # {
then
-@@ -2114,7 +2114,7 @@
+@@ -2058,7 +2058,7 @@
else
LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
@@ -149,7 +73,7 @@
if test $? -ne 0 # {
then
LSOF_CFGF="$LSOF_CFGF +DAportable"
-@@ -3293,7 +3293,7 @@
+@@ -3244,7 +3244,7 @@
LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
fi # }
fi # }
@@ -158,7 +82,7 @@
if test $? -eq 0 # {
then
LSOF_CFGL="-w"
-@@ -3975,7 +3975,7 @@
+@@ -3959,7 +3959,7 @@
echo "main(){" >> ${LSOF_TMPC}.c
echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
@@ -167,7 +91,7 @@
if test $? -eq 0 # {
then
$LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
-@@ -4000,7 +4000,7 @@
+@@ -3984,7 +3984,7 @@
echo "main(){" >> ${LSOF_TMPC}.c
echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
@@ -176,7 +100,7 @@
if test $? -eq 0 # {
then
$LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
-@@ -4030,7 +4030,7 @@
+@@ -4014,7 +4014,7 @@
echo $SOLARIS_KERNBITS | grep 64 > /dev/null
if test $? -eq 0 # {
then
@@ -185,7 +109,7 @@
if test $? -eq 0 # {
then
-@@ -4256,7 +4256,7 @@
+@@ -4240,7 +4240,7 @@
echo "main(){" >> ${LSOF_TMPC}.c
echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
echo "Testing vnode.h for VSOCK, using $LSOF_CC"
@@ -194,7 +118,7 @@
if test $? -eq 0 # {
then
$LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
-@@ -4854,7 +4854,7 @@
+@@ -4838,7 +4838,7 @@
echo "$i" >> $LSOF_TSTCFLG
done # }
fi # }
@@ -203,3 +127,18 @@
if test $? -eq 0 # {
then
echo "-DLT_GCC" >> $LSOF_TSTCFLG
+Index: lsof_4.77_src/dialects/freebsd/machine.h
+--- lsof_4.77_src/dialects/freebsd/machine.h.orig 2006-03-28 01:29:14
+0200
++++ lsof_4.77_src/dialects/freebsd/machine.h 2006-04-10 19:51:46 +0200
+@@ -436,6 +436,11 @@
+ */
+
+ /* #define HASSECURITY 1 */
++#if FREEBSDV>=6000
++#define HASSECURITY 1
++#define HAS_SI_PRIV 1
++#endif /* FREEBSDV>=6000 */
++
+
+
+ /*
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lsof/lsof.spec
============================================================================
$ cvs diff -u -r1.59 -r1.60 lsof.spec
--- openpkg-src/lsof/lsof.spec 22 Feb 2006 17:45:23 -0000 1.59
+++ openpkg-src/lsof/lsof.spec 10 Apr 2006 17:58:02 -0000 1.60
@@ -32,8 +32,8 @@
Class: BASE
Group: Filesystem
License: BSD
-Version: 4.76
-Release: 20060222
+Version: 4.77
+Release: 20060410
# list of sources
Source0:
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
