# HG changeset patch # User Michael Schloh von Bennewitz # Date 1344005348 -7200 # Node ID 3e2a08d916c69f293784c7bfc60957af5414bea0 # Parent 4006c74cc96cfb9b06d795e425343c3a82da6d32 Resynchronize with upstream package maintainer version. diff -r 4006c74cc96c -r 3e2a08d916c6 lsof/lsof.patch --- a/lsof/lsof.patch Fri Aug 03 16:45:20 2012 +0200 +++ b/lsof/lsof.patch Fri Aug 03 16:49:08 2012 +0200 @@ -1,8 +1,7 @@ Index: Configure -diff -Nau Configure.orig Configure ---- Configure.orig 2009-03-25 20:24:01.000000000 +0100 -+++ Configure 2009-04-01 18:03:19.553379145 +0200 -@@ -417,7 +417,7 @@ +--- Configure.orig 2010-01-18 20:01:14 +0100 ++++ Configure 2010-01-19 20:14:11 +0100 +@@ -443,7 +443,7 @@ fi # } fi # } LSOF_TGT="aix" @@ -11,7 +10,7 @@ if test $? -eq 0 # { then -@@ -571,7 +571,7 @@ +@@ -597,7 +597,7 @@ rm -f dialects/aix/aix5/j2/j2_snapshot.h fi # } @@ -20,7 +19,7 @@ if test $? -eq 0 # { then -@@ -609,7 +609,7 @@ +@@ -635,7 +635,7 @@ # This is AIX >= 5 on ia64. LSOF_TSTK64=1 @@ -29,7 +28,7 @@ if test $? -eq 0 # { then -@@ -686,7 +686,7 @@ +@@ -712,7 +712,7 @@ fi # } LSOF_TSTK64=1 LSOF_TMP1=1 @@ -38,7 +37,7 @@ if test $? -eq 0 # { then LSOF_CFGF="$LSOF_CFGF -maix64" -@@ -733,7 +733,7 @@ +@@ -759,7 +759,7 @@ fi #} LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS" LSOF_DIALECT_DIR=aix @@ -47,7 +46,7 @@ if test $? -eq 0 # { then -@@ -2193,7 +2193,7 @@ +@@ -2239,7 +2239,7 @@ fi # } fi # } fi # } @@ -56,7 +55,7 @@ if test $? -eq 0 # { then LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` -@@ -2247,7 +2247,7 @@ +@@ -2293,7 +2293,7 @@ then LSOF_CFGF="$LSOF_CFGF -Ae +DD32" else @@ -65,7 +64,7 @@ if test $? -ne 0 # { then LSOF_CFGF="$LSOF_CFGF +DD32" -@@ -2331,7 +2331,7 @@ +@@ -2377,7 +2377,7 @@ echo "* NOTICE! Configuring for 64 bit HP-UX *" echo "* *" echo "*****************************************" @@ -74,7 +73,7 @@ if test $? -eq 0 # { then -@@ -2400,7 +2400,7 @@ +@@ -2446,7 +2446,7 @@ else LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64" LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX" @@ -83,7 +82,7 @@ if test $? -ne 0 # { then LSOF_CFGF="$LSOF_CFGF +DAportable" -@@ -3609,7 +3609,7 @@ +@@ -3655,7 +3655,7 @@ LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'` fi # } fi # } @@ -91,35 +90,18 @@ + $LSOF_CC --version | grep GCC > /dev/null if test $? -eq 0 # { then - LSOF_CFGL="-w" -@@ -4246,6 +4246,17 @@ + LSOF_CFGL="$LSOF_CFGL -w" +@@ -4300,6 +4300,9 @@ LSOF_TSTBIGF=" " LSOF_TSTLFLG="-lsocket -lnsl" LSOF_VERS="100000" + if [ ".`isainfo -k`" = .amd64 ]; then + LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil" + fi -+ ;; -+ 5.11*) -+ LSOF_TSTBIGF=" " -+ LSOF_TSTLFLG="-lsocket -lnsl" -+ LSOF_VERS="110000" -+ if [ ".`isainfo -k`" = .amd64 ]; then -+ LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil" -+ fi ;; - *) - echo Unknown Solaris version: $LSOF_VSTR -@@ -4323,7 +4334,7 @@ - ;; - 20500|20501) - ;; -- 20600|70000|80000|90000|100000) -+ 20600|70000|80000|90000|100000|110000) - if test "X$SOLARIS_26PR_GWINDOWS" = "X" # { - then - rm -f ${LSOF_TMPC}.* -@@ -4332,7 +4343,7 @@ + 5.11*) + LSOF_TSTBIGF=" " +@@ -4391,7 +4394,7 @@ echo "main(){" >> ${LSOF_TMPC}.c echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC" @@ -128,7 +110,7 @@ if test $? -eq 0 # { then $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 -@@ -4357,7 +4368,7 @@ +@@ -4416,7 +4419,7 @@ echo "main(){" >> ${LSOF_TMPC}.c echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c echo "Testing prdata.h for PR_LDT, using $LSOF_CC" @@ -137,7 +119,7 @@ if test $? -eq 0 # { then $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 -@@ -4391,7 +4402,7 @@ +@@ -4450,7 +4453,7 @@ echo $SOLARIS_KERNBITS | grep 64 > /dev/null if test $? -eq 0 # { then @@ -146,16 +128,16 @@ if test $? -eq 0 # { then -@@ -4597,7 +4608,7 @@ - - # Check for Solaris 10 or higher ZFS. - +@@ -4669,7 +4672,7 @@ + then + LSOF_CTFH=1 + fi # } - if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h # { + if false # { then - - # Check for required ZFS kernel header files. -@@ -4712,7 +4723,7 @@ + if test $LSOF_CTFH -eq 1 # { + then +@@ -4729,7 +4732,7 @@ echo "main(){" >> ${LSOF_TMPC}.c echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c echo "Testing vnode.h for VSOCK, using $LSOF_CC" @@ -164,7 +146,7 @@ if test $? -eq 0 # { then $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1 -@@ -5398,7 +5409,7 @@ +@@ -5418,7 +5421,7 @@ echo "$i" >> $LSOF_TSTCFLG done # } fi # } @@ -174,9 +156,8 @@ then echo "-DLT_GCC" >> $LSOF_TSTCFLG Index: dialects/freebsd/machine.h -diff -Nau dialects/freebsd/machine.h.orig dialects/freebsd/machine.h ---- dialects/freebsd/machine.h.orig 2008-10-21 18:16:15.000000000 +0200 -+++ dialects/freebsd/machine.h 2009-04-01 18:07:54.041381807 +0200 +--- dialects/freebsd/machine.h.orig 2008-10-21 18:16:15 +0200 ++++ dialects/freebsd/machine.h 2010-01-19 19:16:39 +0100 @@ -441,6 +441,11 @@ */ @@ -189,36 +170,14 @@ /* -Index: dialects/sun/dnode.c -diff -Nau dialects/sun/dnode.c.orig dialects/sun/dnode.c ---- dialects/sun/dnode.c.orig 2009-03-25 20:22:21.000000000 +0100 -+++ dialects/sun/dnode.c 2009-04-01 18:07:54.041381807 +0200 -@@ -92,6 +92,8 @@ - #define LOOKDEV_ALL (LOOKDEV_TAB | LOOKDEV_CLONE | LOOKDEV_PSEUDO) - /* look all places */ +Index: dialects/sun/machine.h +--- dialects/sun/machine.h.orig 2009-03-25 20:22:23 +0100 ++++ dialects/sun/machine.h 2010-01-19 19:16:39 +0100 +@@ -84,6 +84,7 @@ + #include -+#define NOOP ((void)0) -+ - - /* - * SAM-FS definitions -@@ -2078,7 +2080,9 @@ - if (kvs && kv.vfs_data - && !kread((KA_T)kv.vfs_data, (char *)&pcfs, sizeof(pcfs))) { - --#if solaris>=70000 -+#if solaris>=110000 /* pcfs_entps doesn't exist any more */ -+ NOOP; -+#elif solaris>=70000 - Lf->inode = (INODETYPE)pc_makenodeid(pc.pc_eblkno, - pc.pc_eoffset, - pc.pc_entry.pcd_attr, -@@ -2092,7 +2096,7 @@ - pc.pc_eoffset, - &pc.pc_entry, - pcfs.pcfs_entps); --#endif /* solaris>=70000 */ -+#endif /* solaris>=110000 */ - - Lf->inp_ty = 1; - } + # if solaris>=80000 ++#include + #include + #include + #define _KERNEL 1 diff -r 4006c74cc96c -r 3e2a08d916c6 lsof/lsof.spec --- a/lsof/lsof.spec Fri Aug 03 16:45:20 2012 +0200 +++ b/lsof/lsof.spec Fri Aug 03 16:49:08 2012 +0200 @@ -1,6 +1,6 @@ ## ## lsof.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -31,20 +31,16 @@ Class: BASE Group: Debugging License: BSD -Version: 4.82 -Release: 20090401 +Version: 4.86 +Release: 20120603 # list of sources Source0: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz Patch0: lsof.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, make, gcc -PreReq: OpenPKG, openpkg >= 20040130 -AutoReq: no -AutoReqProv: no +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc +PreReq: OpenPKG, openpkg >= 20100101 %description List Open Files (lsof) shows all currently open file descriptors of @@ -67,7 +63,7 @@ cd lsof_%{version}_src export PATH="/bin:/usr/bin:$PATH" export LSOF_CC="%{l_cc}" - export LSOF_MAKE="%{l_make} %{l_mflags -O}" + export LSOF_MAKE="%{l_make} %{l_mflags}" case "%{l_platform -t}" in *-freebsd* ) platform="freebsd"; LSOF_CC="/usr/bin/cc"; LSOF_MAKE="/usr/bin/make" ;; *-linux* ) platform="linux" ;; @@ -81,7 +77,6 @@ eval $LSOF_MAKE %install - rm -rf $RPM_BUILD_ROOT %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/man/man8 ( cd lsof_%{version}_src @@ -105,5 +100,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT