# HG changeset patch # User Michael Schloh von Bennewitz # Date 1238602584 -7200 # Node ID 06debe70afb44728fabfa84e613ef0d5188131e1 # Parent e6362b30494e4f5f79544ea1c0a745c51469bfd2 Update to new version of vendor software and adjust patch logic. diff -r e6362b30494e -r 06debe70afb4 lsof/lsof.patch --- a/lsof/lsof.patch Wed Apr 01 16:32:03 2009 +0200 +++ b/lsof/lsof.patch Wed Apr 01 18:16:24 2009 +0200 @@ -1,6 +1,7 @@ Index: Configure ---- Configure.orig 2008-04-15 15:24:36 +0200 -+++ Configure 2008-04-16 08:19:20 +0200 +diff -Nau Configure.orig Configure +--- Configure.orig 2009-03-25 20:24:01.000000000 +0100 ++++ Configure 2009-04-01 18:03:19.553379145 +0200 @@ -417,7 +417,7 @@ fi # } fi # } @@ -46,7 +47,7 @@ if test $? -eq 0 # { then -@@ -2134,7 +2134,7 @@ +@@ -2193,7 +2193,7 @@ fi # } fi # } fi # } @@ -55,7 +56,7 @@ if test $? -eq 0 # { then LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` -@@ -2188,7 +2188,7 @@ +@@ -2247,7 +2247,7 @@ then LSOF_CFGF="$LSOF_CFGF -Ae +DD32" else @@ -64,7 +65,7 @@ if test $? -ne 0 # { then LSOF_CFGF="$LSOF_CFGF +DD32" -@@ -2272,7 +2272,7 @@ +@@ -2331,7 +2331,7 @@ echo "* NOTICE! Configuring for 64 bit HP-UX *" echo "* *" echo "*****************************************" @@ -73,7 +74,7 @@ if test $? -eq 0 # { then -@@ -2341,7 +2341,7 @@ +@@ -2400,7 +2400,7 @@ else LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64" LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX" @@ -82,7 +83,7 @@ if test $? -ne 0 # { then LSOF_CFGF="$LSOF_CFGF +DAportable" -@@ -3550,7 +3550,7 @@ +@@ -3609,7 +3609,7 @@ LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` fi # } fi # } @@ -91,7 +92,7 @@ if test $? -eq 0 # { then LSOF_CFGL="-w" -@@ -4187,6 +4187,17 @@ +@@ -4246,6 +4246,17 @@ LSOF_TSTBIGF=" " LSOF_TSTLFLG="-lsocket -lnsl" LSOF_VERS="100000" @@ -109,7 +110,7 @@ ;; *) echo Unknown Solaris version: $LSOF_VSTR -@@ -4264,7 +4275,7 @@ +@@ -4323,7 +4334,7 @@ ;; 20500|20501) ;; @@ -118,7 +119,7 @@ if test "X$SOLARIS_26PR_GWINDOWS" = "X" # { then rm -f ${LSOF_TMPC}.* -@@ -4273,7 +4284,7 @@ +@@ -4332,7 +4343,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" @@ -127,7 +128,7 @@ if test $? -eq 0 # { then $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 -@@ -4298,7 +4309,7 @@ +@@ -4357,7 +4368,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" @@ -136,7 +137,7 @@ if test $? -eq 0 # { then $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 -@@ -4328,7 +4339,7 @@ +@@ -4391,7 +4402,7 @@ echo $SOLARIS_KERNBITS | grep 64 > /dev/null if test $? -eq 0 # { then @@ -145,16 +146,16 @@ if test $? -eq 0 # { then -@@ -4532,7 +4543,7 @@ +@@ -4597,7 +4608,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="" -@@ -4615,7 +4626,7 @@ + + # Check for required ZFS kernel header files. +@@ -4712,7 +4723,7 @@ echo "main(){" >> ${LSOF_TMPC}.c echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c echo "Testing vnode.h for VSOCK, using $LSOF_CC" @@ -163,7 +164,7 @@ if test $? -eq 0 # { then $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 -@@ -5295,7 +5306,7 @@ +@@ -5398,7 +5409,7 @@ echo "$i" >> $LSOF_TSTCFLG done # } fi # } @@ -172,10 +173,27 @@ if test $? -eq 0 # { then echo "-DLT_GCC" >> $LSOF_TSTCFLG +Index: dialects/freebsd/machine.h +diff -Nau dialects/freebsd/machine.h.orig dialects/freebsd/machine.h +--- dialects/freebsd/machine.h.orig 2008-10-21 18:16:15.000000000 +0200 ++++ dialects/freebsd/machine.h 2009-04-01 18:07:54.041381807 +0200 +@@ -441,6 +441,11 @@ + */ + + /* #define HASSECURITY 1 */ ++#if FREEBSDV>=6000 ++#define HASSECURITY 1 ++#define HAS_SI_PRIV 1 ++#endif /* FREEBSDV>=6000 */ ++ + + + /* Index: dialects/sun/dnode.c ---- dialects/sun/dnode.c.orig 2008-10-21 18:16:45.000000000 +0200 -+++ dialects/sun/dnode.c 2009-01-08 01:59:20.609120000 +0100 -@@ -85,6 +85,8 @@ +diff -Nau dialects/sun/dnode.c.orig dialects/sun/dnode.c +--- dialects/sun/dnode.c.orig 2009-03-25 20:22:21.000000000 +0100 ++++ dialects/sun/dnode.c 2009-04-01 18:07:54.041381807 +0200 +@@ -92,6 +92,8 @@ #define LOOKDEV_ALL (LOOKDEV_TAB | LOOKDEV_CLONE | LOOKDEV_PSEUDO) /* look all places */ @@ -184,7 +202,7 @@ /* * SAM-FS definitions -@@ -2065,7 +2067,9 @@ +@@ -2078,7 +2080,9 @@ if (kvs && kv.vfs_data && !kread((KA_T)kv.vfs_data, (char *)&pcfs, sizeof(pcfs))) { @@ -195,7 +213,7 @@ Lf->inode = (INODETYPE)pc_makenodeid(pc.pc_eblkno, pc.pc_eoffset, pc.pc_entry.pcd_attr, -@@ -2079,7 +2083,7 @@ +@@ -2092,7 +2096,7 @@ pc.pc_eoffset, &pc.pc_entry, pcfs.pcfs_entps); @@ -204,41 +222,3 @@ Lf->inp_ty = 1; } -Index: dialects/freebsd/machine.h ---- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14 +0200 -+++ dialects/freebsd/machine.h 2008-04-16 08:17:46 +0200 -@@ -441,6 +441,11 @@ - */ - - /* #define HASSECURITY 1 */ -+#if FREEBSDV>=6000 -+#define HASSECURITY 1 -+#define HAS_SI_PRIV 1 -+#endif /* FREEBSDV>=6000 */ -+ - - - /* -Index: dialects/sun/machine.h ---- dialects/sun/machine.h.orig 2007-04-24 18:23:25 +0200 -+++ dialects/sun/machine.h 2008-04-16 08:17:46 +0200 -@@ -75,6 +75,7 @@ - #include - - # if solaris>=80000 -+#include - #include - #include - #define _KERNEL 1 -Index: proc.c ---- proc.c.orig 2008-10-21 18:22:05.000000000 +0200 -+++ proc.c 2009-01-08 01:13:31.388963909 +0100 -@@ -841,8 +841,6 @@ - { - if (Lf->sf & SELEXCLF) - return; -- if (((Selflags & SELNET) == SELNET) && !(Lf->sf & SELNET)) -- return; - Lp->pss |= PS_SEC; - if (Plf) - Plf->next = Lf; diff -r e6362b30494e -r 06debe70afb4 lsof/lsof.spec --- a/lsof/lsof.spec Wed Apr 01 16:32:03 2009 +0200 +++ b/lsof/lsof.spec Wed Apr 01 18:16:24 2009 +0200 @@ -31,8 +31,8 @@ Class: BASE Group: Debugging License: BSD -Version: 4.81 -Release: 20090106 +Version: 4.82 +Release: 20090401 # list of sources Source0: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz