OpenPKG Specs / annotate

lsof/lsof.patch@3e2a08d916c6 (annotated)

lsof/lsof.patch

Fri, 03 Aug 2012 16:49:08 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Fri, 03 Aug 2012 16:49:08 +0200
changeset 464
3e2a08d916c6
parent 125
06debe70afb4
child 465
6a12068a8ac8
permissions
-rw-r--r--

Resynchronize with upstream package maintainer version.

michael@34 1 Index: Configure
michael@464 2 --- Configure.orig 2010-01-18 20:01:14 +0100
michael@464 3 +++ Configure 2010-01-19 20:14:11 +0100
michael@464 4 @@ -443,7 +443,7 @@
michael@34 5 fi # }
michael@34 6 fi # }
michael@34 7 LSOF_TGT="aix"
michael@34 8 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 9 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 10 if test $? -eq 0 # {
michael@34 11 then
michael@34 12
michael@464 13 @@ -597,7 +597,7 @@
michael@34 14
michael@34 15 rm -f dialects/aix/aix5/j2/j2_snapshot.h
michael@34 16 fi # }
michael@34 17 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 18 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 19 if test $? -eq 0 # {
michael@34 20 then
michael@34 21
michael@464 22 @@ -635,7 +635,7 @@
michael@34 23 # This is AIX >= 5 on ia64.
michael@34 24
michael@34 25 LSOF_TSTK64=1
michael@34 26 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 27 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 28 if test $? -eq 0 # {
michael@34 29 then
michael@34 30
michael@464 31 @@ -712,7 +712,7 @@
michael@34 32 fi # }
michael@34 33 LSOF_TSTK64=1
michael@34 34 LSOF_TMP1=1
michael@34 35 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 36 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 37 if test $? -eq 0 # {
michael@34 38 then
michael@34 39 LSOF_CFGF="$LSOF_CFGF -maix64"
michael@464 40 @@ -759,7 +759,7 @@
michael@34 41 fi #}
michael@34 42 LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS"
michael@34 43 LSOF_DIALECT_DIR=aix
michael@34 44 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 45 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 46 if test $? -eq 0 # {
michael@34 47 then
michael@34 48
michael@464 49 @@ -2239,7 +2239,7 @@
michael@34 50 fi # }
michael@34 51 fi # }
michael@34 52 fi # }
michael@34 53 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 54 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 55 if test $? -eq 0 # {
michael@34 56 then
michael@34 57 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
michael@464 58 @@ -2293,7 +2293,7 @@
michael@34 59 then
michael@34 60 LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
michael@34 61 else
michael@34 62 - echo $LSOF_CC | grep -q gcc
michael@34 63 + $LSOF_CC --version | grep -q GCC
michael@34 64 if test $? -ne 0 # {
michael@34 65 then
michael@34 66 LSOF_CFGF="$LSOF_CFGF +DD32"
michael@464 67 @@ -2377,7 +2377,7 @@
michael@34 68 echo "* NOTICE! Configuring for 64 bit HP-UX *"
michael@34 69 echo "* *"
michael@34 70 echo "*****************************************"
michael@34 71 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 72 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 73 if test $? -eq 0 # {
michael@34 74 then
michael@34 75
michael@464 76 @@ -2446,7 +2446,7 @@
michael@34 77 else
michael@34 78 LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
michael@34 79 LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
michael@34 80 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 81 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 82 if test $? -ne 0 # {
michael@34 83 then
michael@34 84 LSOF_CFGF="$LSOF_CFGF +DAportable"
michael@464 85 @@ -3655,7 +3655,7 @@
michael@34 86 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
michael@34 87 fi # }
michael@34 88 fi # }
michael@34 89 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 90 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 91 if test $? -eq 0 # {
michael@34 92 then
michael@464 93 LSOF_CFGL="$LSOF_CFGL -w"
michael@464 94 @@ -4300,6 +4300,9 @@
michael@34 95 LSOF_TSTBIGF=" "
michael@34 96 LSOF_TSTLFLG="-lsocket -lnsl"
michael@34 97 LSOF_VERS="100000"
michael@34 98 + if [ ".`isainfo -k`" = .amd64 ]; then
michael@34 99 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
michael@34 100 + fi
michael@34 101 ;;
michael@464 102 5.11*)
michael@464 103 LSOF_TSTBIGF=" "
michael@464 104 @@ -4391,7 +4394,7 @@
michael@34 105 echo "main(){" >> ${LSOF_TMPC}.c
michael@34 106 echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
michael@34 107 echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
michael@34 108 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 109 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 110 if test $? -eq 0 # {
michael@34 111 then
michael@34 112 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
michael@464 113 @@ -4416,7 +4419,7 @@
michael@34 114 echo "main(){" >> ${LSOF_TMPC}.c
michael@34 115 echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
michael@34 116 echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
michael@34 117 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 118 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 119 if test $? -eq 0 # {
michael@34 120 then
michael@34 121 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
michael@464 122 @@ -4450,7 +4453,7 @@
michael@34 123 echo $SOLARIS_KERNBITS | grep 64 > /dev/null
michael@34 124 if test $? -eq 0 # {
michael@34 125 then
michael@34 126 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 127 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 128 if test $? -eq 0 # {
michael@34 129 then
michael@34 130
michael@464 131 @@ -4669,7 +4672,7 @@
michael@464 132 then
michael@464 133 LSOF_CTFH=1
michael@464 134 fi # }
michael@34 135 - if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # {
michael@34 136 + if false # {
michael@34 137 then
michael@464 138 if test $LSOF_CTFH -eq 1 # {
michael@464 139 then
michael@464 140 @@ -4729,7 +4732,7 @@
michael@34 141 echo "main(){" >> ${LSOF_TMPC}.c
michael@34 142 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
michael@34 143 echo "Testing vnode.h for VSOCK, using $LSOF_CC"
michael@34 144 - echo $LSOF_CC | grep gcc > /dev/null
michael@34 145 + $LSOF_CC --version | grep GCC > /dev/null
michael@34 146 if test $? -eq 0 # {
michael@34 147 then
michael@34 148 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
michael@464 149 @@ -5418,7 +5421,7 @@
michael@34 150 echo "$i" >> $LSOF_TSTCFLG
michael@34 151 done # }
michael@34 152 fi # }
michael@34 153 -echo $LSOF_CC | grep gcc > /dev/null 2>&1
michael@34 154 +$LSOF_CC --version | grep GCC > /dev/null 2>&1
michael@34 155 if test $? -eq 0 # {
michael@34 156 then
michael@34 157 echo "-DLT_GCC" >> $LSOF_TSTCFLG
michael@125 158 Index: dialects/freebsd/machine.h
michael@464 159 --- dialects/freebsd/machine.h.orig 2008-10-21 18:16:15 +0200
michael@464 160 +++ dialects/freebsd/machine.h 2010-01-19 19:16:39 +0100
michael@125 161 @@ -441,6 +441,11 @@
michael@125 162 */
michael@125 163
michael@125 164 /* #define HASSECURITY 1 */
michael@125 165 +#if FREEBSDV>=6000
michael@125 166 +#define HASSECURITY 1
michael@125 167 +#define HAS_SI_PRIV 1
michael@125 168 +#endif /* FREEBSDV>=6000 */
michael@125 169 +
michael@125 170
michael@125 171
michael@125 172 /*
michael@464 173 Index: dialects/sun/machine.h
michael@464 174 --- dialects/sun/machine.h.orig 2009-03-25 20:22:23 +0100
michael@464 175 +++ dialects/sun/machine.h 2010-01-19 19:16:39 +0100
michael@464 176 @@ -84,6 +84,7 @@
michael@464 177 #include <sys/poll.h>
michael@36 178
michael@464 179 # if solaris>=80000
michael@464 180 +#include <sys/types32.h>
michael@464 181 #include <sys/wait.h>
michael@464 182 #include <sys/types32.h>
michael@464 183 #define _KERNEL 1

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial