OpenPKG Specs / file comparison

comparison: lsof/lsof.patch

lsof/lsof.patch

changeset 464
3e2a08d916c6
parent 125
06debe70afb4
child 465
6a12068a8ac8
equal deleted inserted replaced
2:d6b25c6ae69b 3:d85305ebd42c
1 Index: Configure 1 Index: Configure
2 diff -Nau Configure.orig Configure 2 --- Configure.orig 2010-01-18 20:01:14 +0100
3 --- Configure.orig 2009-03-25 20:24:01.000000000 +0100 3 +++ Configure 2010-01-19 20:14:11 +0100
4 +++ Configure 2009-04-01 18:03:19.553379145 +0200 4 @@ -443,7 +443,7 @@
5 @@ -417,7 +417,7 @@
6 fi # } 5 fi # }
7 fi # } 6 fi # }
8 LSOF_TGT="aix" 7 LSOF_TGT="aix"
9 - echo $LSOF_CC | grep gcc > /dev/null 8 - echo $LSOF_CC | grep gcc > /dev/null
10 + $LSOF_CC --version | grep GCC > /dev/null 9 + $LSOF_CC --version | grep GCC > /dev/null
11 if test $? -eq 0 # { 10 if test $? -eq 0 # {
12 then 11 then
13 12
14 @@ -571,7 +571,7 @@ 13 @@ -597,7 +597,7 @@
15 14
16 rm -f dialects/aix/aix5/j2/j2_snapshot.h 15 rm -f dialects/aix/aix5/j2/j2_snapshot.h
17 fi # } 16 fi # }
18 - echo $LSOF_CC | grep gcc > /dev/null 17 - echo $LSOF_CC | grep gcc > /dev/null
19 + $LSOF_CC --version | grep GCC > /dev/null 18 + $LSOF_CC --version | grep GCC > /dev/null
20 if test $? -eq 0 # { 19 if test $? -eq 0 # {
21 then 20 then
22 21
23 @@ -609,7 +609,7 @@ 22 @@ -635,7 +635,7 @@
24 # This is AIX >= 5 on ia64. 23 # This is AIX >= 5 on ia64.
25 24
26 LSOF_TSTK64=1 25 LSOF_TSTK64=1
27 - echo $LSOF_CC | grep gcc > /dev/null 26 - echo $LSOF_CC | grep gcc > /dev/null
28 + $LSOF_CC --version | grep GCC > /dev/null 27 + $LSOF_CC --version | grep GCC > /dev/null
29 if test $? -eq 0 # { 28 if test $? -eq 0 # {
30 then 29 then
31 30
32 @@ -686,7 +686,7 @@ 31 @@ -712,7 +712,7 @@
33 fi # } 32 fi # }
34 LSOF_TSTK64=1 33 LSOF_TSTK64=1
35 LSOF_TMP1=1 34 LSOF_TMP1=1
36 - echo $LSOF_CC | grep gcc > /dev/null 35 - echo $LSOF_CC | grep gcc > /dev/null
37 + $LSOF_CC --version | grep GCC > /dev/null 36 + $LSOF_CC --version | grep GCC > /dev/null
38 if test $? -eq 0 # { 37 if test $? -eq 0 # {
39 then 38 then
40 LSOF_CFGF="$LSOF_CFGF -maix64" 39 LSOF_CFGF="$LSOF_CFGF -maix64"
41 @@ -733,7 +733,7 @@ 40 @@ -759,7 +759,7 @@
42 fi #} 41 fi #}
43 LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS" 42 LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS"
44 LSOF_DIALECT_DIR=aix 43 LSOF_DIALECT_DIR=aix
45 - echo $LSOF_CC | grep gcc > /dev/null 44 - echo $LSOF_CC | grep gcc > /dev/null
46 + $LSOF_CC --version | grep GCC > /dev/null 45 + $LSOF_CC --version | grep GCC > /dev/null
47 if test $? -eq 0 # { 46 if test $? -eq 0 # {
48 then 47 then
49 48
50 @@ -2193,7 +2193,7 @@ 49 @@ -2239,7 +2239,7 @@
51 fi # } 50 fi # }
52 fi # } 51 fi # }
53 fi # } 52 fi # }
54 - echo $LSOF_CC | grep gcc > /dev/null 53 - echo $LSOF_CC | grep gcc > /dev/null
55 + $LSOF_CC --version | grep GCC > /dev/null 54 + $LSOF_CC --version | grep GCC > /dev/null
56 if test $? -eq 0 # { 55 if test $? -eq 0 # {
57 then 56 then
58 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` 57 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
59 @@ -2247,7 +2247,7 @@ 58 @@ -2293,7 +2293,7 @@
60 then 59 then
61 LSOF_CFGF="$LSOF_CFGF -Ae +DD32" 60 LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
62 else 61 else
63 - echo $LSOF_CC | grep -q gcc 62 - echo $LSOF_CC | grep -q gcc
64 + $LSOF_CC --version | grep -q GCC 63 + $LSOF_CC --version | grep -q GCC
65 if test $? -ne 0 # { 64 if test $? -ne 0 # {
66 then 65 then
67 LSOF_CFGF="$LSOF_CFGF +DD32" 66 LSOF_CFGF="$LSOF_CFGF +DD32"
68 @@ -2331,7 +2331,7 @@ 67 @@ -2377,7 +2377,7 @@
69 echo "* NOTICE! Configuring for 64 bit HP-UX *" 68 echo "* NOTICE! Configuring for 64 bit HP-UX *"
70 echo "* *" 69 echo "* *"
71 echo "*****************************************" 70 echo "*****************************************"
72 - echo $LSOF_CC | grep gcc > /dev/null 71 - echo $LSOF_CC | grep gcc > /dev/null
73 + $LSOF_CC --version | grep GCC > /dev/null 72 + $LSOF_CC --version | grep GCC > /dev/null
74 if test $? -eq 0 # { 73 if test $? -eq 0 # {
75 then 74 then
76 75
77 @@ -2400,7 +2400,7 @@ 76 @@ -2446,7 +2446,7 @@
78 else 77 else
79 LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64" 78 LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
80 LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX" 79 LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
81 - echo $LSOF_CC | grep gcc > /dev/null 80 - echo $LSOF_CC | grep gcc > /dev/null
82 + $LSOF_CC --version | grep GCC > /dev/null 81 + $LSOF_CC --version | grep GCC > /dev/null
83 if test $? -ne 0 # { 82 if test $? -ne 0 # {
84 then 83 then
85 LSOF_CFGF="$LSOF_CFGF +DAportable" 84 LSOF_CFGF="$LSOF_CFGF +DAportable"
86 @@ -3609,7 +3609,7 @@ 85 @@ -3655,7 +3655,7 @@
87 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` 86 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
88 fi # } 87 fi # }
89 fi # } 88 fi # }
90 - echo $LSOF_CC | grep gcc > /dev/null 89 - echo $LSOF_CC | grep gcc > /dev/null
91 + $LSOF_CC --version | grep GCC > /dev/null 90 + $LSOF_CC --version | grep GCC > /dev/null
92 if test $? -eq 0 # { 91 if test $? -eq 0 # {
93 then 92 then
94 LSOF_CFGL="-w" 93 LSOF_CFGL="$LSOF_CFGL -w"
95 @@ -4246,6 +4246,17 @@ 94 @@ -4300,6 +4300,9 @@
96 LSOF_TSTBIGF=" " 95 LSOF_TSTBIGF=" "
97 LSOF_TSTLFLG="-lsocket -lnsl" 96 LSOF_TSTLFLG="-lsocket -lnsl"
98 LSOF_VERS="100000" 97 LSOF_VERS="100000"
99 + if [ ".`isainfo -k`" = .amd64 ]; then 98 + if [ ".`isainfo -k`" = .amd64 ]; then
100 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil" 99 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
101 + fi 100 + fi
102 + ;;
103 + 5.11*)
104 + LSOF_TSTBIGF=" "
105 + LSOF_TSTLFLG="-lsocket -lnsl"
106 + LSOF_VERS="110000"
107 + if [ ".`isainfo -k`" = .amd64 ]; then
108 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
109 + fi
110 ;; 101 ;;
111 *) 102 5.11*)
112 echo Unknown Solaris version: $LSOF_VSTR 103 LSOF_TSTBIGF=" "
113 @@ -4323,7 +4334,7 @@ 104 @@ -4391,7 +4394,7 @@
114 ;;
115 20500|20501)
116 ;;
117 - 20600|70000|80000|90000|100000)
118 + 20600|70000|80000|90000|100000|110000)
119 if test "X$SOLARIS_26PR_GWINDOWS" = "X" # {
120 then
121 rm -f ${LSOF_TMPC}.*
122 @@ -4332,7 +4343,7 @@
123 echo "main(){" >> ${LSOF_TMPC}.c 105 echo "main(){" >> ${LSOF_TMPC}.c
124 echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c 106 echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
125 echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC" 107 echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
126 - echo $LSOF_CC | grep gcc > /dev/null 108 - echo $LSOF_CC | grep gcc > /dev/null
127 + $LSOF_CC --version | grep GCC > /dev/null 109 + $LSOF_CC --version | grep GCC > /dev/null
128 if test $? -eq 0 # { 110 if test $? -eq 0 # {
129 then 111 then
130 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 112 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
131 @@ -4357,7 +4368,7 @@ 113 @@ -4416,7 +4419,7 @@
132 echo "main(){" >> ${LSOF_TMPC}.c 114 echo "main(){" >> ${LSOF_TMPC}.c
133 echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c 115 echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
134 echo "Testing prdata.h for PR_LDT, using $LSOF_CC" 116 echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
135 - echo $LSOF_CC | grep gcc > /dev/null 117 - echo $LSOF_CC | grep gcc > /dev/null
136 + $LSOF_CC --version | grep GCC > /dev/null 118 + $LSOF_CC --version | grep GCC > /dev/null
137 if test $? -eq 0 # { 119 if test $? -eq 0 # {
138 then 120 then
139 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 121 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
140 @@ -4391,7 +4402,7 @@ 122 @@ -4450,7 +4453,7 @@
141 echo $SOLARIS_KERNBITS | grep 64 > /dev/null 123 echo $SOLARIS_KERNBITS | grep 64 > /dev/null
142 if test $? -eq 0 # { 124 if test $? -eq 0 # {
143 then 125 then
144 - echo $LSOF_CC | grep gcc > /dev/null 126 - echo $LSOF_CC | grep gcc > /dev/null
145 + $LSOF_CC --version | grep GCC > /dev/null 127 + $LSOF_CC --version | grep GCC > /dev/null
146 if test $? -eq 0 # { 128 if test $? -eq 0 # {
147 then 129 then
148 130
149 @@ -4597,7 +4608,7 @@ 131 @@ -4669,7 +4672,7 @@
150 132 then
151 # Check for Solaris 10 or higher ZFS. 133 LSOF_CTFH=1
152 134 fi # }
153 - if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # { 135 - if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # {
154 + if false # { 136 + if false # {
155 then 137 then
156 138 if test $LSOF_CTFH -eq 1 # {
157 # Check for required ZFS kernel header files. 139 then
158 @@ -4712,7 +4723,7 @@ 140 @@ -4729,7 +4732,7 @@
159 echo "main(){" >> ${LSOF_TMPC}.c 141 echo "main(){" >> ${LSOF_TMPC}.c
160 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c 142 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
161 echo "Testing vnode.h for VSOCK, using $LSOF_CC" 143 echo "Testing vnode.h for VSOCK, using $LSOF_CC"
162 - echo $LSOF_CC | grep gcc > /dev/null 144 - echo $LSOF_CC | grep gcc > /dev/null
163 + $LSOF_CC --version | grep GCC > /dev/null 145 + $LSOF_CC --version | grep GCC > /dev/null
164 if test $? -eq 0 # { 146 if test $? -eq 0 # {
165 then 147 then
166 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 148 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
167 @@ -5398,7 +5409,7 @@ 149 @@ -5418,7 +5421,7 @@
168 echo "$i" >> $LSOF_TSTCFLG 150 echo "$i" >> $LSOF_TSTCFLG
169 done # } 151 done # }
170 fi # } 152 fi # }
171 -echo $LSOF_CC | grep gcc > /dev/null 2>&1 153 -echo $LSOF_CC | grep gcc > /dev/null 2>&1
172 +$LSOF_CC --version | grep GCC > /dev/null 2>&1 154 +$LSOF_CC --version | grep GCC > /dev/null 2>&1
173 if test $? -eq 0 # { 155 if test $? -eq 0 # {
174 then 156 then
175 echo "-DLT_GCC" >> $LSOF_TSTCFLG 157 echo "-DLT_GCC" >> $LSOF_TSTCFLG
176 Index: dialects/freebsd/machine.h 158 Index: dialects/freebsd/machine.h
177 diff -Nau dialects/freebsd/machine.h.orig dialects/freebsd/machine.h 159 --- dialects/freebsd/machine.h.orig 2008-10-21 18:16:15 +0200
178 --- dialects/freebsd/machine.h.orig 2008-10-21 18:16:15.000000000 +0200 160 +++ dialects/freebsd/machine.h 2010-01-19 19:16:39 +0100
179 +++ dialects/freebsd/machine.h 2009-04-01 18:07:54.041381807 +0200
180 @@ -441,6 +441,11 @@ 161 @@ -441,6 +441,11 @@
181 */ 162 */
182 163
183 /* #define HASSECURITY 1 */ 164 /* #define HASSECURITY 1 */
184 +#if FREEBSDV>=6000 165 +#if FREEBSDV>=6000
187 +#endif /* FREEBSDV>=6000 */ 168 +#endif /* FREEBSDV>=6000 */
188 + 169 +
189 170
190 171
191 /* 172 /*
192 Index: dialects/sun/dnode.c 173 Index: dialects/sun/machine.h
193 diff -Nau dialects/sun/dnode.c.orig dialects/sun/dnode.c 174 --- dialects/sun/machine.h.orig 2009-03-25 20:22:23 +0100
194 --- dialects/sun/dnode.c.orig 2009-03-25 20:22:21.000000000 +0100 175 +++ dialects/sun/machine.h 2010-01-19 19:16:39 +0100
195 +++ dialects/sun/dnode.c 2009-04-01 18:07:54.041381807 +0200 176 @@ -84,6 +84,7 @@
196 @@ -92,6 +92,8 @@ 177 #include <sys/poll.h>
197 #define LOOKDEV_ALL (LOOKDEV_TAB | LOOKDEV_CLONE | LOOKDEV_PSEUDO)
198 /* look all places */
199 178
200 +#define NOOP ((void)0) 179 # if solaris>=80000
201 + 180 +#include <sys/types32.h>
202 181 #include <sys/wait.h>
203 /* 182 #include <sys/types32.h>
204 * SAM-FS definitions 183 #define _KERNEL 1
205 @@ -2078,7 +2080,9 @@
206 if (kvs && kv.vfs_data
207 && !kread((KA_T)kv.vfs_data, (char *)&pcfs, sizeof(pcfs))) {
208
209 -#if solaris>=70000
210 +#if solaris>=110000 /* pcfs_entps doesn't exist any more */
211 + NOOP;
212 +#elif solaris>=70000
213 Lf->inode = (INODETYPE)pc_makenodeid(pc.pc_eblkno,
214 pc.pc_eoffset,
215 pc.pc_entry.pcd_attr,
216 @@ -2092,7 +2096,7 @@
217 pc.pc_eoffset,
218 &pc.pc_entry,
219 pcfs.pcfs_entps);
220 -#endif /* solaris>=70000 */
221 +#endif /* solaris>=110000 */
222
223 Lf->inp_ty = 1;
224 }

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial