Update to new version of vendor software and adjust patch logic.

Wed, 01 Apr 2009 18:16:24 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 01 Apr 2009 18:16:24 +0200
changeset 125
06debe70afb4
parent 124
e6362b30494e
child 126
f345dc239867

Update to new version of vendor software and adjust patch logic.

lsof/lsof.patch file | annotate | diff | comparison | revisions
lsof/lsof.spec file | annotate | diff | comparison | revisions
     1.1 --- a/lsof/lsof.patch	Wed Apr 01 16:32:03 2009 +0200
     1.2 +++ b/lsof/lsof.patch	Wed Apr 01 18:16:24 2009 +0200
     1.3 @@ -1,6 +1,7 @@
     1.4  Index: Configure
     1.5 ---- Configure.orig	2008-04-15 15:24:36 +0200
     1.6 -+++ Configure	2008-04-16 08:19:20 +0200
     1.7 +diff -Nau Configure.orig Configure
     1.8 +--- Configure.orig	2009-03-25 20:24:01.000000000 +0100
     1.9 ++++ Configure	2009-04-01 18:03:19.553379145 +0200
    1.10  @@ -417,7 +417,7 @@
    1.11         fi	# }
    1.12       fi	# }
    1.13 @@ -46,7 +47,7 @@
    1.14       if test $? -eq 0 	# {
    1.15       then
    1.16   
    1.17 -@@ -2134,7 +2134,7 @@
    1.18 +@@ -2193,7 +2193,7 @@
    1.19   	fi	# }
    1.20         fi	# }
    1.21       fi	# }
    1.22 @@ -55,7 +56,7 @@
    1.23       if test $? -eq 0	# {
    1.24       then
    1.25         LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
    1.26 -@@ -2188,7 +2188,7 @@
    1.27 +@@ -2247,7 +2247,7 @@
    1.28         then
    1.29   	LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
    1.30         else
    1.31 @@ -64,7 +65,7 @@
    1.32   	if test $? -ne 0	# {
    1.33   	then
    1.34   	  LSOF_CFGF="$LSOF_CFGF +DD32"
    1.35 -@@ -2272,7 +2272,7 @@
    1.36 +@@ -2331,7 +2331,7 @@
    1.37   	    echo "* NOTICE!  Configuring for 64 bit HP-UX *"
    1.38   	    echo "*                                       *"
    1.39   	    echo "*****************************************"
    1.40 @@ -73,7 +74,7 @@
    1.41   	    if test $? -eq 0	# {
    1.42   	    then
    1.43   
    1.44 -@@ -2341,7 +2341,7 @@
    1.45 +@@ -2400,7 +2400,7 @@
    1.46   	  else
    1.47   	    LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
    1.48   	    LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
    1.49 @@ -82,7 +83,7 @@
    1.50   	    if test $? -ne 0	# {
    1.51   	    then
    1.52   	      LSOF_CFGF="$LSOF_CFGF +DAportable"
    1.53 -@@ -3550,7 +3550,7 @@
    1.54 +@@ -3609,7 +3609,7 @@
    1.55   	LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
    1.56         fi	# }
    1.57       fi	# }
    1.58 @@ -91,7 +92,7 @@
    1.59       if test $? -eq 0	# {
    1.60       then
    1.61         LSOF_CFGL="-w"
    1.62 -@@ -4187,6 +4187,17 @@
    1.63 +@@ -4246,6 +4246,17 @@
    1.64   	LSOF_TSTBIGF=" "
    1.65   	LSOF_TSTLFLG="-lsocket -lnsl"
    1.66   	LSOF_VERS="100000"
    1.67 @@ -109,7 +110,7 @@
    1.68   	;;
    1.69         *)
    1.70   	echo Unknown Solaris version: $LSOF_VSTR
    1.71 -@@ -4264,7 +4275,7 @@
    1.72 +@@ -4323,7 +4334,7 @@
    1.73         ;;
    1.74       20500|20501)
    1.75         ;;
    1.76 @@ -118,7 +119,7 @@
    1.77         if test "X$SOLARIS_26PR_GWINDOWS" = "X"	# {
    1.78         then
    1.79   	rm -f ${LSOF_TMPC}.*
    1.80 -@@ -4273,7 +4284,7 @@
    1.81 +@@ -4332,7 +4343,7 @@
    1.82   	echo "main(){" >> ${LSOF_TMPC}.c
    1.83   	echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
    1.84   	echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
    1.85 @@ -127,7 +128,7 @@
    1.86   	if test $? -eq 0	# {
    1.87   	then
    1.88   	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x  > /dev/null 2>&1
    1.89 -@@ -4298,7 +4309,7 @@
    1.90 +@@ -4357,7 +4368,7 @@
    1.91   	echo "main(){" >> ${LSOF_TMPC}.c
    1.92   	echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
    1.93   	echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
    1.94 @@ -136,7 +137,7 @@
    1.95   	if test $? -eq 0	# {
    1.96   	then
    1.97   	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
    1.98 -@@ -4328,7 +4339,7 @@
    1.99 +@@ -4391,7 +4402,7 @@
   1.100   	echo $SOLARIS_KERNBITS | grep 64 > /dev/null
   1.101   	if test $? -eq 0	# {
   1.102   	then
   1.103 @@ -145,16 +146,16 @@
   1.104   	  if test $? -eq 0	# {
   1.105   	  then
   1.106   
   1.107 -@@ -4532,7 +4543,7 @@
   1.108 +@@ -4597,7 +4608,7 @@
   1.109   
   1.110         # Check for Solaris 10 or higher ZFS.
   1.111   
   1.112  -      if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h	# {
   1.113  +      if false	# {
   1.114         then
   1.115 - 	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"
   1.116 - 	LSOF_TMP2=""
   1.117 -@@ -4615,7 +4626,7 @@
   1.118 + 
   1.119 +       # Check for required ZFS kernel header files.
   1.120 +@@ -4712,7 +4723,7 @@
   1.121         echo "main(){" >> ${LSOF_TMPC}.c
   1.122         echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
   1.123         echo "Testing vnode.h for VSOCK, using $LSOF_CC"
   1.124 @@ -163,7 +164,7 @@
   1.125         if test $? -eq 0	# {
   1.126         then
   1.127   	$LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
   1.128 -@@ -5295,7 +5306,7 @@
   1.129 +@@ -5398,7 +5409,7 @@
   1.130       echo "$i" >> $LSOF_TSTCFLG
   1.131     done	# }
   1.132   fi	# }
   1.133 @@ -172,10 +173,27 @@
   1.134   if test $? -eq 0	# {
   1.135   then
   1.136     echo "-DLT_GCC" >> $LSOF_TSTCFLG
   1.137 +Index: dialects/freebsd/machine.h
   1.138 +diff -Nau dialects/freebsd/machine.h.orig dialects/freebsd/machine.h
   1.139 +--- dialects/freebsd/machine.h.orig	2008-10-21 18:16:15.000000000 +0200
   1.140 ++++ dialects/freebsd/machine.h	2009-04-01 18:07:54.041381807 +0200
   1.141 +@@ -441,6 +441,11 @@
   1.142 +  */
   1.143 + 
   1.144 + /* #define	HASSECURITY	1 */
   1.145 ++#if    FREEBSDV>=6000
   1.146 ++#define        HASSECURITY     1
   1.147 ++#define        HAS_SI_PRIV     1
   1.148 ++#endif /* FREEBSDV>=6000 */
   1.149 ++
   1.150 + 
   1.151 + 
   1.152 + /*
   1.153  Index: dialects/sun/dnode.c
   1.154 ---- dialects/sun/dnode.c.orig	2008-10-21 18:16:45.000000000 +0200
   1.155 -+++ dialects/sun/dnode.c	2009-01-08 01:59:20.609120000 +0100
   1.156 -@@ -85,6 +85,8 @@
   1.157 +diff -Nau dialects/sun/dnode.c.orig dialects/sun/dnode.c
   1.158 +--- dialects/sun/dnode.c.orig	2009-03-25 20:22:21.000000000 +0100
   1.159 ++++ dialects/sun/dnode.c	2009-04-01 18:07:54.041381807 +0200
   1.160 +@@ -92,6 +92,8 @@
   1.161   #define	LOOKDEV_ALL	(LOOKDEV_TAB | LOOKDEV_CLONE | LOOKDEV_PSEUDO)
   1.162   					/* look all places */
   1.163   
   1.164 @@ -184,7 +202,7 @@
   1.165   
   1.166   /*
   1.167    * SAM-FS definitions
   1.168 -@@ -2065,7 +2067,9 @@
   1.169 +@@ -2078,7 +2080,9 @@
   1.170   	    if (kvs && kv.vfs_data
   1.171   	    && !kread((KA_T)kv.vfs_data, (char *)&pcfs, sizeof(pcfs))) {
   1.172   
   1.173 @@ -195,7 +213,7 @@
   1.174   		Lf->inode = (INODETYPE)pc_makenodeid(pc.pc_eblkno,
   1.175   			    pc.pc_eoffset,
   1.176   			    pc.pc_entry.pcd_attr,
   1.177 -@@ -2079,7 +2083,7 @@
   1.178 +@@ -2092,7 +2096,7 @@
   1.179   			    pc.pc_eoffset,
   1.180   			    &pc.pc_entry,
   1.181   			    pcfs.pcfs_entps);
   1.182 @@ -204,41 +222,3 @@
   1.183   
   1.184   		Lf->inp_ty = 1;
   1.185   	    }
   1.186 -Index: dialects/freebsd/machine.h
   1.187 ---- dialects/freebsd/machine.h.orig	2006-03-28 01:29:14 +0200
   1.188 -+++ dialects/freebsd/machine.h	2008-04-16 08:17:46 +0200
   1.189 -@@ -441,6 +441,11 @@
   1.190 -  */
   1.191 - 
   1.192 - /* #define	HASSECURITY	1 */
   1.193 -+#if    FREEBSDV>=6000
   1.194 -+#define        HASSECURITY     1
   1.195 -+#define        HAS_SI_PRIV     1
   1.196 -+#endif /* FREEBSDV>=6000 */
   1.197 -+
   1.198 - 
   1.199 - 
   1.200 - /*
   1.201 -Index: dialects/sun/machine.h
   1.202 ---- dialects/sun/machine.h.orig	2007-04-24 18:23:25 +0200
   1.203 -+++ dialects/sun/machine.h	2008-04-16 08:17:46 +0200
   1.204 -@@ -75,6 +75,7 @@
   1.205 - #include <sys/poll.h>
   1.206 - 
   1.207 - # if	solaris>=80000
   1.208 -+#include <sys/types32.h>
   1.209 - #include <sys/wait.h>
   1.210 - #include <sys/types32.h>
   1.211 - #define	_KERNEL	1
   1.212 -Index: proc.c
   1.213 ---- proc.c.orig	2008-10-21 18:22:05.000000000 +0200
   1.214 -+++ proc.c	2009-01-08 01:13:31.388963909 +0100
   1.215 -@@ -841,8 +841,6 @@
   1.216 - {
   1.217 - 	if (Lf->sf & SELEXCLF)
   1.218 - 	    return;
   1.219 --	if (((Selflags & SELNET) == SELNET) && !(Lf->sf & SELNET))
   1.220 --	    return;
   1.221 - 	Lp->pss |= PS_SEC;
   1.222 - 	if (Plf)
   1.223 - 	    Plf->next = Lf;
     2.1 --- a/lsof/lsof.spec	Wed Apr 01 16:32:03 2009 +0200
     2.2 +++ b/lsof/lsof.spec	Wed Apr 01 18:16:24 2009 +0200
     2.3 @@ -31,8 +31,8 @@
     2.4  Class:        BASE
     2.5  Group:        Debugging
     2.6  License:      BSD
     2.7 -Version:      4.81
     2.8 -Release:      20090106
     2.9 +Version:      4.82
    2.10 +Release:      20090401
    2.11  
    2.12  #   list of sources
    2.13  Source0:      ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz

mercurial