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