OpenPKG Specs / file comparison

comparison: lsof/lsof.patch

lsof/lsof.patch

changeset 36
88242dc55a66
parent 34
673ed164f8e5
child 125
06debe70afb4
equal deleted inserted replaced
0:40b3b568d68a 1:bc5966971c0f
1 Index: Configure 1 Index: Configure
2 --- Configure.orig 2008-04-15 15:24:36 +0200 2 --- Configure.orig 2008-04-15 15:24:36 +0200
3 +++ Configure 2008-04-16 08:19:20 +0200 3 +++ Configure 2008-04-16 08:19:20 +0200
4 @@ -413,7 +413,7 @@ 4 @@ -417,7 +417,7 @@
5 fi # } 5 fi # }
6 fi # } 6 fi # }
7 LSOF_TGT="aix" 7 LSOF_TGT="aix"
8 - echo $LSOF_CC | grep gcc > /dev/null 8 - echo $LSOF_CC | grep gcc > /dev/null
9 + $LSOF_CC --version | grep GCC > /dev/null 9 + $LSOF_CC --version | grep GCC > /dev/null
10 if test $? -eq 0 # { 10 if test $? -eq 0 # {
11 then 11 then
12 12
13 @@ -567,7 +567,7 @@ 13 @@ -571,7 +571,7 @@
14 14
15 rm -f dialects/aix/aix5/j2/j2_snapshot.h 15 rm -f dialects/aix/aix5/j2/j2_snapshot.h
16 fi # } 16 fi # }
17 - echo $LSOF_CC | grep gcc > /dev/null 17 - echo $LSOF_CC | grep gcc > /dev/null
18 + $LSOF_CC --version | grep GCC > /dev/null 18 + $LSOF_CC --version | grep GCC > /dev/null
19 if test $? -eq 0 # { 19 if test $? -eq 0 # {
20 then 20 then
21 21
22 @@ -605,7 +605,7 @@ 22 @@ -609,7 +609,7 @@
23 # This is AIX >= 5 on ia64. 23 # This is AIX >= 5 on ia64.
24 24
25 LSOF_TSTK64=1 25 LSOF_TSTK64=1
26 - echo $LSOF_CC | grep gcc > /dev/null 26 - echo $LSOF_CC | grep gcc > /dev/null
27 + $LSOF_CC --version | grep GCC > /dev/null 27 + $LSOF_CC --version | grep GCC > /dev/null
28 if test $? -eq 0 # { 28 if test $? -eq 0 # {
29 then 29 then
30 30
31 @@ -682,7 +682,7 @@ 31 @@ -686,7 +686,7 @@
32 fi # } 32 fi # }
33 LSOF_TSTK64=1 33 LSOF_TSTK64=1
34 LSOF_TMP1=1 34 LSOF_TMP1=1
35 - echo $LSOF_CC | grep gcc > /dev/null 35 - echo $LSOF_CC | grep gcc > /dev/null
36 + $LSOF_CC --version | grep GCC > /dev/null 36 + $LSOF_CC --version | grep GCC > /dev/null
37 if test $? -eq 0 # { 37 if test $? -eq 0 # {
38 then 38 then
39 LSOF_CFGF="$LSOF_CFGF -maix64" 39 LSOF_CFGF="$LSOF_CFGF -maix64"
40 @@ -729,7 +729,7 @@ 40 @@ -733,7 +733,7 @@
41 fi #} 41 fi #}
42 LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS" 42 LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS"
43 LSOF_DIALECT_DIR=aix 43 LSOF_DIALECT_DIR=aix
44 - echo $LSOF_CC | grep gcc > /dev/null 44 - echo $LSOF_CC | grep gcc > /dev/null
45 + $LSOF_CC --version | grep GCC > /dev/null 45 + $LSOF_CC --version | grep GCC > /dev/null
46 if test $? -eq 0 # { 46 if test $? -eq 0 # {
47 then 47 then
48 48
49 @@ -1995,7 +1995,7 @@ 49 @@ -2134,7 +2134,7 @@
50 fi # } 50 fi # }
51 fi # } 51 fi # }
52 fi # } 52 fi # }
53 - echo $LSOF_CC | grep gcc > /dev/null 53 - echo $LSOF_CC | grep gcc > /dev/null
54 + $LSOF_CC --version | grep GCC > /dev/null 54 + $LSOF_CC --version | grep GCC > /dev/null
55 if test $? -eq 0 # { 55 if test $? -eq 0 # {
56 then 56 then
57 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'`
58 @@ -2047,7 +2047,7 @@ 58 @@ -2188,7 +2188,7 @@
59 then 59 then
60 LSOF_CFGF="$LSOF_CFGF -Ae +DD32" 60 LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
61 else 61 else
62 - echo $LSOF_CC | grep -q gcc 62 - echo $LSOF_CC | grep -q gcc
63 + $LSOF_CC --version | grep -q GCC 63 + $LSOF_CC --version | grep -q GCC
64 if test $? -ne 0 # { 64 if test $? -ne 0 # {
65 then 65 then
66 LSOF_CFGF="$LSOF_CFGF +DD32" 66 LSOF_CFGF="$LSOF_CFGF +DD32"
67 @@ -2127,7 +2127,7 @@ 67 @@ -2272,7 +2272,7 @@
68 echo "* NOTICE! Configuring for 64 bit HP-UX *" 68 echo "* NOTICE! Configuring for 64 bit HP-UX *"
69 echo "* *" 69 echo "* *"
70 echo "*****************************************" 70 echo "*****************************************"
71 - echo $LSOF_CC | grep gcc > /dev/null 71 - echo $LSOF_CC | grep gcc > /dev/null
72 + $LSOF_CC --version | grep GCC > /dev/null 72 + $LSOF_CC --version | grep GCC > /dev/null
73 if test $? -eq 0 # { 73 if test $? -eq 0 # {
74 then 74 then
75 75
76 @@ -2196,7 +2196,7 @@ 76 @@ -2341,7 +2341,7 @@
77 else 77 else
78 LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64" 78 LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
79 LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX" 79 LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
80 - echo $LSOF_CC | grep gcc > /dev/null 80 - echo $LSOF_CC | grep gcc > /dev/null
81 + $LSOF_CC --version | grep GCC > /dev/null 81 + $LSOF_CC --version | grep GCC > /dev/null
82 if test $? -ne 0 # { 82 if test $? -ne 0 # {
83 then 83 then
84 LSOF_CFGF="$LSOF_CFGF +DAportable" 84 LSOF_CFGF="$LSOF_CFGF +DAportable"
85 @@ -3403,7 +3403,7 @@ 85 @@ -3550,7 +3550,7 @@
86 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'`
87 fi # } 87 fi # }
88 fi # } 88 fi # }
89 - echo $LSOF_CC | grep gcc > /dev/null 89 - echo $LSOF_CC | grep gcc > /dev/null
90 + $LSOF_CC --version | grep GCC > /dev/null 90 + $LSOF_CC --version | grep GCC > /dev/null
91 if test $? -eq 0 # { 91 if test $? -eq 0 # {
92 then 92 then
93 LSOF_CFGL="-w" 93 LSOF_CFGL="-w"
94 @@ -4040,6 +4040,9 @@ 94 @@ -4187,6 +4187,17 @@
95 LSOF_TSTBIGF=" " 95 LSOF_TSTBIGF=" "
96 LSOF_TSTLFLG="-lsocket -lnsl" 96 LSOF_TSTLFLG="-lsocket -lnsl"
97 LSOF_VERS="100000" 97 LSOF_VERS="100000"
98 + if [ ".`isainfo -k`" = .amd64 ]; then 98 + if [ ".`isainfo -k`" = .amd64 ]; then
99 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil" 99 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
100 + fi 100 + fi
101 + ;;
102 + 5.11*)
103 + LSOF_TSTBIGF=" "
104 + LSOF_TSTLFLG="-lsocket -lnsl"
105 + LSOF_VERS="110000"
106 + if [ ".`isainfo -k`" = .amd64 ]; then
107 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
108 + fi
101 ;; 109 ;;
102 *) 110 *)
103 echo Unknown Solaris version: $LSOF_VSTR 111 echo Unknown Solaris version: $LSOF_VSTR
104 @@ -4118,7 +4121,7 @@ 112 @@ -4264,7 +4275,7 @@
113 ;;
114 20500|20501)
115 ;;
116 - 20600|70000|80000|90000|100000)
117 + 20600|70000|80000|90000|100000|110000)
118 if test "X$SOLARIS_26PR_GWINDOWS" = "X" # {
119 then
120 rm -f ${LSOF_TMPC}.*
121 @@ -4273,7 +4284,7 @@
105 echo "main(){" >> ${LSOF_TMPC}.c 122 echo "main(){" >> ${LSOF_TMPC}.c
106 echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c 123 echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
107 echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC" 124 echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
108 - echo $LSOF_CC | grep gcc > /dev/null 125 - echo $LSOF_CC | grep gcc > /dev/null
109 + $LSOF_CC --version | grep GCC > /dev/null 126 + $LSOF_CC --version | grep GCC > /dev/null
110 if test $? -eq 0 # { 127 if test $? -eq 0 # {
111 then 128 then
112 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 129 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
113 @@ -4143,7 +4146,7 @@ 130 @@ -4298,7 +4309,7 @@
114 echo "main(){" >> ${LSOF_TMPC}.c 131 echo "main(){" >> ${LSOF_TMPC}.c
115 echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c 132 echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
116 echo "Testing prdata.h for PR_LDT, using $LSOF_CC" 133 echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
117 - echo $LSOF_CC | grep gcc > /dev/null 134 - echo $LSOF_CC | grep gcc > /dev/null
118 + $LSOF_CC --version | grep GCC > /dev/null 135 + $LSOF_CC --version | grep GCC > /dev/null
119 if test $? -eq 0 # { 136 if test $? -eq 0 # {
120 then 137 then
121 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 138 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
122 @@ -4173,7 +4176,7 @@ 139 @@ -4328,7 +4339,7 @@
123 echo $SOLARIS_KERNBITS | grep 64 > /dev/null 140 echo $SOLARIS_KERNBITS | grep 64 > /dev/null
124 if test $? -eq 0 # { 141 if test $? -eq 0 # {
125 then 142 then
126 - echo $LSOF_CC | grep gcc > /dev/null 143 - echo $LSOF_CC | grep gcc > /dev/null
127 + $LSOF_CC --version | grep GCC > /dev/null 144 + $LSOF_CC --version | grep GCC > /dev/null
128 if test $? -eq 0 # { 145 if test $? -eq 0 # {
129 then 146 then
130 147
131 @@ -4377,7 +4380,7 @@ 148 @@ -4532,7 +4543,7 @@
132 149
133 # Check for Solaris 10 or higher ZFS. 150 # Check for Solaris 10 or higher ZFS.
134 151
135 - if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # { 152 - if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # {
136 + if false # { 153 + if false # {
137 then 154 then
138 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" 155 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"
139 LSOF_TMP2="" 156 LSOF_TMP2=""
140 @@ -4460,7 +4463,7 @@ 157 @@ -4615,7 +4626,7 @@
141 echo "main(){" >> ${LSOF_TMPC}.c 158 echo "main(){" >> ${LSOF_TMPC}.c
142 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c 159 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
143 echo "Testing vnode.h for VSOCK, using $LSOF_CC" 160 echo "Testing vnode.h for VSOCK, using $LSOF_CC"
144 - echo $LSOF_CC | grep gcc > /dev/null 161 - echo $LSOF_CC | grep gcc > /dev/null
145 + $LSOF_CC --version | grep GCC > /dev/null 162 + $LSOF_CC --version | grep GCC > /dev/null
146 if test $? -eq 0 # { 163 if test $? -eq 0 # {
147 then 164 then
148 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 165 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
149 @@ -5139,7 +5142,7 @@ 166 @@ -5295,7 +5306,7 @@
150 echo "$i" >> $LSOF_TSTCFLG 167 echo "$i" >> $LSOF_TSTCFLG
151 done # } 168 done # }
152 fi # } 169 fi # }
153 -echo $LSOF_CC | grep gcc > /dev/null 2>&1 170 -echo $LSOF_CC | grep gcc > /dev/null 2>&1
154 +$LSOF_CC --version | grep GCC > /dev/null 2>&1 171 +$LSOF_CC --version | grep GCC > /dev/null 2>&1
155 if test $? -eq 0 # { 172 if test $? -eq 0 # {
156 then 173 then
157 echo "-DLT_GCC" >> $LSOF_TSTCFLG 174 echo "-DLT_GCC" >> $LSOF_TSTCFLG
175 Index: dialects/sun/dnode.c
176 --- dialects/sun/dnode.c.orig 2008-10-21 18:16:45.000000000 +0200
177 +++ dialects/sun/dnode.c 2009-01-08 01:59:20.609120000 +0100
178 @@ -85,6 +85,8 @@
179 #define LOOKDEV_ALL (LOOKDEV_TAB | LOOKDEV_CLONE | LOOKDEV_PSEUDO)
180 /* look all places */
181
182 +#define NOOP ((void)0)
183 +
184
185 /*
186 * SAM-FS definitions
187 @@ -2065,7 +2067,9 @@
188 if (kvs && kv.vfs_data
189 && !kread((KA_T)kv.vfs_data, (char *)&pcfs, sizeof(pcfs))) {
190
191 -#if solaris>=70000
192 +#if solaris>=110000 /* pcfs_entps doesn't exist any more */
193 + NOOP;
194 +#elif solaris>=70000
195 Lf->inode = (INODETYPE)pc_makenodeid(pc.pc_eblkno,
196 pc.pc_eoffset,
197 pc.pc_entry.pcd_attr,
198 @@ -2079,7 +2083,7 @@
199 pc.pc_eoffset,
200 &pc.pc_entry,
201 pcfs.pcfs_entps);
202 -#endif /* solaris>=70000 */
203 +#endif /* solaris>=110000 */
204
205 Lf->inp_ty = 1;
206 }
158 Index: dialects/freebsd/machine.h 207 Index: dialects/freebsd/machine.h
159 --- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14 +0200 208 --- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14 +0200
160 +++ dialects/freebsd/machine.h 2008-04-16 08:17:46 +0200 209 +++ dialects/freebsd/machine.h 2008-04-16 08:17:46 +0200
161 @@ -436,6 +436,11 @@ 210 @@ -441,6 +441,11 @@
162 */ 211 */
163 212
164 /* #define HASSECURITY 1 */ 213 /* #define HASSECURITY 1 */
165 +#if FREEBSDV>=6000 214 +#if FREEBSDV>=6000
166 +#define HASSECURITY 1 215 +#define HASSECURITY 1
179 # if solaris>=80000 228 # if solaris>=80000
180 +#include <sys/types32.h> 229 +#include <sys/types32.h>
181 #include <sys/wait.h> 230 #include <sys/wait.h>
182 #include <sys/types32.h> 231 #include <sys/types32.h>
183 #define _KERNEL 1 232 #define _KERNEL 1
233 Index: proc.c
234 --- proc.c.orig 2008-10-21 18:22:05.000000000 +0200
235 +++ proc.c 2009-01-08 01:13:31.388963909 +0100
236 @@ -841,8 +841,6 @@
237 {
238 if (Lf->sf & SELEXCLF)
239 return;
240 - if (((Selflags & SELNET) == SELNET) && !(Lf->sf & SELNET))
241 - return;
242 Lp->pss |= PS_SEC;
243 if (Plf)
244 Plf->next = Lf;

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial