OpenPKG Specs / file comparison

comparison: lsof/lsof.patch

lsof/lsof.patch

changeset 310
73d852a30c9a
parent 36
88242dc55a66
child 464
3e2a08d916c6
equal deleted inserted replaced
1:bc5966971c0f 2:d6b25c6ae69b
1 Index: Configure 1 Index: Configure
2 --- Configure.orig 2008-04-15 15:24:36 +0200 2 diff -Nau Configure.orig Configure
3 +++ Configure 2008-04-16 08:19:20 +0200 3 --- Configure.orig 2009-03-25 20:24:01.000000000 +0100
4 +++ Configure 2009-04-01 18:03:19.553379145 +0200
4 @@ -417,7 +417,7 @@ 5 @@ -417,7 +417,7 @@
5 fi # } 6 fi # }
6 fi # } 7 fi # }
7 LSOF_TGT="aix" 8 LSOF_TGT="aix"
8 - echo $LSOF_CC | grep gcc > /dev/null 9 - echo $LSOF_CC | grep gcc > /dev/null
44 - echo $LSOF_CC | grep gcc > /dev/null 45 - echo $LSOF_CC | grep gcc > /dev/null
45 + $LSOF_CC --version | grep GCC > /dev/null 46 + $LSOF_CC --version | grep GCC > /dev/null
46 if test $? -eq 0 # { 47 if test $? -eq 0 # {
47 then 48 then
48 49
49 @@ -2134,7 +2134,7 @@ 50 @@ -2193,7 +2193,7 @@
50 fi # } 51 fi # }
51 fi # } 52 fi # }
52 fi # } 53 fi # }
53 - echo $LSOF_CC | grep gcc > /dev/null 54 - echo $LSOF_CC | grep gcc > /dev/null
54 + $LSOF_CC --version | grep GCC > /dev/null 55 + $LSOF_CC --version | grep GCC > /dev/null
55 if test $? -eq 0 # { 56 if test $? -eq 0 # {
56 then 57 then
57 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` 58 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
58 @@ -2188,7 +2188,7 @@ 59 @@ -2247,7 +2247,7 @@
59 then 60 then
60 LSOF_CFGF="$LSOF_CFGF -Ae +DD32" 61 LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
61 else 62 else
62 - echo $LSOF_CC | grep -q gcc 63 - echo $LSOF_CC | grep -q gcc
63 + $LSOF_CC --version | grep -q GCC 64 + $LSOF_CC --version | grep -q GCC
64 if test $? -ne 0 # { 65 if test $? -ne 0 # {
65 then 66 then
66 LSOF_CFGF="$LSOF_CFGF +DD32" 67 LSOF_CFGF="$LSOF_CFGF +DD32"
67 @@ -2272,7 +2272,7 @@ 68 @@ -2331,7 +2331,7 @@
68 echo "* NOTICE! Configuring for 64 bit HP-UX *" 69 echo "* NOTICE! Configuring for 64 bit HP-UX *"
69 echo "* *" 70 echo "* *"
70 echo "*****************************************" 71 echo "*****************************************"
71 - echo $LSOF_CC | grep gcc > /dev/null 72 - echo $LSOF_CC | grep gcc > /dev/null
72 + $LSOF_CC --version | grep GCC > /dev/null 73 + $LSOF_CC --version | grep GCC > /dev/null
73 if test $? -eq 0 # { 74 if test $? -eq 0 # {
74 then 75 then
75 76
76 @@ -2341,7 +2341,7 @@ 77 @@ -2400,7 +2400,7 @@
77 else 78 else
78 LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64" 79 LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
79 LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX" 80 LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
80 - echo $LSOF_CC | grep gcc > /dev/null 81 - echo $LSOF_CC | grep gcc > /dev/null
81 + $LSOF_CC --version | grep GCC > /dev/null 82 + $LSOF_CC --version | grep GCC > /dev/null
82 if test $? -ne 0 # { 83 if test $? -ne 0 # {
83 then 84 then
84 LSOF_CFGF="$LSOF_CFGF +DAportable" 85 LSOF_CFGF="$LSOF_CFGF +DAportable"
85 @@ -3550,7 +3550,7 @@ 86 @@ -3609,7 +3609,7 @@
86 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` 87 LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
87 fi # } 88 fi # }
88 fi # } 89 fi # }
89 - echo $LSOF_CC | grep gcc > /dev/null 90 - echo $LSOF_CC | grep gcc > /dev/null
90 + $LSOF_CC --version | grep GCC > /dev/null 91 + $LSOF_CC --version | grep GCC > /dev/null
91 if test $? -eq 0 # { 92 if test $? -eq 0 # {
92 then 93 then
93 LSOF_CFGL="-w" 94 LSOF_CFGL="-w"
94 @@ -4187,6 +4187,17 @@ 95 @@ -4246,6 +4246,17 @@
95 LSOF_TSTBIGF=" " 96 LSOF_TSTBIGF=" "
96 LSOF_TSTLFLG="-lsocket -lnsl" 97 LSOF_TSTLFLG="-lsocket -lnsl"
97 LSOF_VERS="100000" 98 LSOF_VERS="100000"
98 + if [ ".`isainfo -k`" = .amd64 ]; then 99 + if [ ".`isainfo -k`" = .amd64 ]; then
99 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil" 100 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
107 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil" 108 + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
108 + fi 109 + fi
109 ;; 110 ;;
110 *) 111 *)
111 echo Unknown Solaris version: $LSOF_VSTR 112 echo Unknown Solaris version: $LSOF_VSTR
112 @@ -4264,7 +4275,7 @@ 113 @@ -4323,7 +4334,7 @@
113 ;; 114 ;;
114 20500|20501) 115 20500|20501)
115 ;; 116 ;;
116 - 20600|70000|80000|90000|100000) 117 - 20600|70000|80000|90000|100000)
117 + 20600|70000|80000|90000|100000|110000) 118 + 20600|70000|80000|90000|100000|110000)
118 if test "X$SOLARIS_26PR_GWINDOWS" = "X" # { 119 if test "X$SOLARIS_26PR_GWINDOWS" = "X" # {
119 then 120 then
120 rm -f ${LSOF_TMPC}.* 121 rm -f ${LSOF_TMPC}.*
121 @@ -4273,7 +4284,7 @@ 122 @@ -4332,7 +4343,7 @@
122 echo "main(){" >> ${LSOF_TMPC}.c 123 echo "main(){" >> ${LSOF_TMPC}.c
123 echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c 124 echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
124 echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC" 125 echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
125 - echo $LSOF_CC | grep gcc > /dev/null 126 - echo $LSOF_CC | grep gcc > /dev/null
126 + $LSOF_CC --version | grep GCC > /dev/null 127 + $LSOF_CC --version | grep GCC > /dev/null
127 if test $? -eq 0 # { 128 if test $? -eq 0 # {
128 then 129 then
129 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 130 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
130 @@ -4298,7 +4309,7 @@ 131 @@ -4357,7 +4368,7 @@
131 echo "main(){" >> ${LSOF_TMPC}.c 132 echo "main(){" >> ${LSOF_TMPC}.c
132 echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c 133 echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
133 echo "Testing prdata.h for PR_LDT, using $LSOF_CC" 134 echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
134 - echo $LSOF_CC | grep gcc > /dev/null 135 - echo $LSOF_CC | grep gcc > /dev/null
135 + $LSOF_CC --version | grep GCC > /dev/null 136 + $LSOF_CC --version | grep GCC > /dev/null
136 if test $? -eq 0 # { 137 if test $? -eq 0 # {
137 then 138 then
138 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 139 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
139 @@ -4328,7 +4339,7 @@ 140 @@ -4391,7 +4402,7 @@
140 echo $SOLARIS_KERNBITS | grep 64 > /dev/null 141 echo $SOLARIS_KERNBITS | grep 64 > /dev/null
141 if test $? -eq 0 # { 142 if test $? -eq 0 # {
142 then 143 then
143 - echo $LSOF_CC | grep gcc > /dev/null 144 - echo $LSOF_CC | grep gcc > /dev/null
144 + $LSOF_CC --version | grep GCC > /dev/null 145 + $LSOF_CC --version | grep GCC > /dev/null
145 if test $? -eq 0 # { 146 if test $? -eq 0 # {
146 then 147 then
147 148
148 @@ -4532,7 +4543,7 @@ 149 @@ -4597,7 +4608,7 @@
149 150
150 # Check for Solaris 10 or higher ZFS. 151 # Check for Solaris 10 or higher ZFS.
151 152
152 - if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # { 153 - if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # {
153 + if false # { 154 + if false # {
154 then 155 then
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" 156
156 LSOF_TMP2="" 157 # Check for required ZFS kernel header files.
157 @@ -4615,7 +4626,7 @@ 158 @@ -4712,7 +4723,7 @@
158 echo "main(){" >> ${LSOF_TMPC}.c 159 echo "main(){" >> ${LSOF_TMPC}.c
159 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c 160 echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
160 echo "Testing vnode.h for VSOCK, using $LSOF_CC" 161 echo "Testing vnode.h for VSOCK, using $LSOF_CC"
161 - echo $LSOF_CC | grep gcc > /dev/null 162 - echo $LSOF_CC | grep gcc > /dev/null
162 + $LSOF_CC --version | grep GCC > /dev/null 163 + $LSOF_CC --version | grep GCC > /dev/null
163 if test $? -eq 0 # { 164 if test $? -eq 0 # {
164 then 165 then
165 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 166 $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
166 @@ -5295,7 +5306,7 @@ 167 @@ -5398,7 +5409,7 @@
167 echo "$i" >> $LSOF_TSTCFLG 168 echo "$i" >> $LSOF_TSTCFLG
168 done # } 169 done # }
169 fi # } 170 fi # }
170 -echo $LSOF_CC | grep gcc > /dev/null 2>&1 171 -echo $LSOF_CC | grep gcc > /dev/null 2>&1
171 +$LSOF_CC --version | grep GCC > /dev/null 2>&1 172 +$LSOF_CC --version | grep GCC > /dev/null 2>&1
172 if test $? -eq 0 # { 173 if test $? -eq 0 # {
173 then 174 then
174 echo "-DLT_GCC" >> $LSOF_TSTCFLG 175 echo "-DLT_GCC" >> $LSOF_TSTCFLG
176 Index: dialects/freebsd/machine.h
177 diff -Nau dialects/freebsd/machine.h.orig dialects/freebsd/machine.h
178 --- dialects/freebsd/machine.h.orig 2008-10-21 18:16:15.000000000 +0200
179 +++ dialects/freebsd/machine.h 2009-04-01 18:07:54.041381807 +0200
180 @@ -441,6 +441,11 @@
181 */
182
183 /* #define HASSECURITY 1 */
184 +#if FREEBSDV>=6000
185 +#define HASSECURITY 1
186 +#define HAS_SI_PRIV 1
187 +#endif /* FREEBSDV>=6000 */
188 +
189
190
191 /*
175 Index: dialects/sun/dnode.c 192 Index: dialects/sun/dnode.c
176 --- dialects/sun/dnode.c.orig 2008-10-21 18:16:45.000000000 +0200 193 diff -Nau dialects/sun/dnode.c.orig dialects/sun/dnode.c
177 +++ dialects/sun/dnode.c 2009-01-08 01:59:20.609120000 +0100 194 --- dialects/sun/dnode.c.orig 2009-03-25 20:22:21.000000000 +0100
178 @@ -85,6 +85,8 @@ 195 +++ dialects/sun/dnode.c 2009-04-01 18:07:54.041381807 +0200
196 @@ -92,6 +92,8 @@
179 #define LOOKDEV_ALL (LOOKDEV_TAB | LOOKDEV_CLONE | LOOKDEV_PSEUDO) 197 #define LOOKDEV_ALL (LOOKDEV_TAB | LOOKDEV_CLONE | LOOKDEV_PSEUDO)
180 /* look all places */ 198 /* look all places */
181 199
182 +#define NOOP ((void)0) 200 +#define NOOP ((void)0)
183 + 201 +
184 202
185 /* 203 /*
186 * SAM-FS definitions 204 * SAM-FS definitions
187 @@ -2065,7 +2067,9 @@ 205 @@ -2078,7 +2080,9 @@
188 if (kvs && kv.vfs_data 206 if (kvs && kv.vfs_data
189 && !kread((KA_T)kv.vfs_data, (char *)&pcfs, sizeof(pcfs))) { 207 && !kread((KA_T)kv.vfs_data, (char *)&pcfs, sizeof(pcfs))) {
190 208
191 -#if solaris>=70000 209 -#if solaris>=70000
192 +#if solaris>=110000 /* pcfs_entps doesn't exist any more */ 210 +#if solaris>=110000 /* pcfs_entps doesn't exist any more */
193 + NOOP; 211 + NOOP;
194 +#elif solaris>=70000 212 +#elif solaris>=70000
195 Lf->inode = (INODETYPE)pc_makenodeid(pc.pc_eblkno, 213 Lf->inode = (INODETYPE)pc_makenodeid(pc.pc_eblkno,
196 pc.pc_eoffset, 214 pc.pc_eoffset,
197 pc.pc_entry.pcd_attr, 215 pc.pc_entry.pcd_attr,
198 @@ -2079,7 +2083,7 @@ 216 @@ -2092,7 +2096,7 @@
199 pc.pc_eoffset, 217 pc.pc_eoffset,
200 &pc.pc_entry, 218 &pc.pc_entry,
201 pcfs.pcfs_entps); 219 pcfs.pcfs_entps);
202 -#endif /* solaris>=70000 */ 220 -#endif /* solaris>=70000 */
203 +#endif /* solaris>=110000 */ 221 +#endif /* solaris>=110000 */
204 222
205 Lf->inp_ty = 1; 223 Lf->inp_ty = 1;
206 } 224 }
207 Index: dialects/freebsd/machine.h
208 --- dialects/freebsd/machine.h.orig 2006-03-28 01:29:14 +0200
209 +++ dialects/freebsd/machine.h 2008-04-16 08:17:46 +0200
210 @@ -441,6 +441,11 @@
211 */
212
213 /* #define HASSECURITY 1 */
214 +#if FREEBSDV>=6000
215 +#define HASSECURITY 1
216 +#define HAS_SI_PRIV 1
217 +#endif /* FREEBSDV>=6000 */
218 +
219
220
221 /*
222 Index: dialects/sun/machine.h
223 --- dialects/sun/machine.h.orig 2007-04-24 18:23:25 +0200
224 +++ dialects/sun/machine.h 2008-04-16 08:17:46 +0200
225 @@ -75,6 +75,7 @@
226 #include <sys/poll.h>
227
228 # if solaris>=80000
229 +#include <sys/types32.h>
230 #include <sys/wait.h>
231 #include <sys/types32.h>
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