OpenPKG Specs / changeset

     1.1 --- a/lsof/lsof.patch	Fri Aug 03 16:45:20 2012 +0200
     1.2 +++ b/lsof/lsof.patch	Fri Aug 03 16:49:08 2012 +0200
     1.3 @@ -1,8 +1,7 @@
     1.4  Index: Configure
     1.5 -diff -Nau Configure.orig Configure
     1.6 ---- Configure.orig	2009-03-25 20:24:01.000000000 +0100
     1.7 -+++ Configure	2009-04-01 18:03:19.553379145 +0200
     1.8 -@@ -417,7 +417,7 @@
     1.9 +--- Configure.orig	2010-01-18 20:01:14 +0100
    1.10 ++++ Configure	2010-01-19 20:14:11 +0100
    1.11 +@@ -443,7 +443,7 @@
    1.12         fi	# }
    1.13       fi	# }
    1.14       LSOF_TGT="aix"
    1.15 @@ -11,7 +10,7 @@
    1.16       if test $? -eq 0	# {
    1.17       then
    1.18   
    1.19 -@@ -571,7 +571,7 @@
    1.20 +@@ -597,7 +597,7 @@
    1.21   
    1.22   	    rm -f dialects/aix/aix5/j2/j2_snapshot.h
    1.23   	  fi	# }
    1.24 @@ -20,7 +19,7 @@
    1.25   	  if test $? -eq 0	# {
    1.26   	  then
    1.27   
    1.28 -@@ -609,7 +609,7 @@
    1.29 +@@ -635,7 +635,7 @@
    1.30         # This is AIX >= 5 on ia64.
    1.31   
    1.32   	LSOF_TSTK64=1
    1.33 @@ -29,7 +28,7 @@
    1.34   	if test $? -eq 0	# {
    1.35   	then
    1.36   
    1.37 -@@ -686,7 +686,7 @@
    1.38 +@@ -712,7 +712,7 @@
    1.39   	  fi	# }
    1.40   	  LSOF_TSTK64=1
    1.41   	  LSOF_TMP1=1
    1.42 @@ -38,7 +37,7 @@
    1.43   	  if test $? -eq 0	# {
    1.44   	  then
    1.45   	    LSOF_CFGF="$LSOF_CFGF -maix64"
    1.46 -@@ -733,7 +733,7 @@
    1.47 +@@ -759,7 +759,7 @@
    1.48       fi	#}
    1.49       LSOF_CFGF="$LSOF_CFGF -DAIXV=$LSOF_VERS"
    1.50       LSOF_DIALECT_DIR=aix
    1.51 @@ -47,7 +46,7 @@
    1.52       if test $? -eq 0 	# {
    1.53       then
    1.54   
    1.55 -@@ -2193,7 +2193,7 @@
    1.56 +@@ -2239,7 +2239,7 @@
    1.57   	fi	# }
    1.58         fi	# }
    1.59       fi	# }
    1.60 @@ -56,7 +55,7 @@
    1.61       if test $? -eq 0	# {
    1.62       then
    1.63         LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
    1.64 -@@ -2247,7 +2247,7 @@
    1.65 +@@ -2293,7 +2293,7 @@
    1.66         then
    1.67   	LSOF_CFGF="$LSOF_CFGF -Ae +DD32"
    1.68         else
    1.69 @@ -65,7 +64,7 @@
    1.70   	if test $? -ne 0	# {
    1.71   	then
    1.72   	  LSOF_CFGF="$LSOF_CFGF +DD32"
    1.73 -@@ -2331,7 +2331,7 @@
    1.74 +@@ -2377,7 +2377,7 @@
    1.75   	    echo "* NOTICE!  Configuring for 64 bit HP-UX *"
    1.76   	    echo "*                                       *"
    1.77   	    echo "*****************************************"
    1.78 @@ -74,7 +73,7 @@
    1.79   	    if test $? -eq 0	# {
    1.80   	    then
    1.81   
    1.82 -@@ -2400,7 +2400,7 @@
    1.83 +@@ -2446,7 +2446,7 @@
    1.84   	  else
    1.85   	    LSOF_CFGF="$LSOF_CFGF -D_FILE_OFFSET_BITS=64"
    1.86   	    LSOF_CINFO="${LSOF_CINFO}, 32 bit HP-UX"
    1.87 @@ -83,7 +82,7 @@
    1.88   	    if test $? -ne 0	# {
    1.89   	    then
    1.90   	      LSOF_CFGF="$LSOF_CFGF +DAportable"
    1.91 -@@ -3609,7 +3609,7 @@
    1.92 +@@ -3655,7 +3655,7 @@
    1.93   	LSOF_CCV=`$LSOF_CC -v 2>&1 | sed -n 's/.*version \(.*\)/\1/p'`
    1.94         fi	# }
    1.95       fi	# }
    1.96 @@ -91,35 +90,18 @@
    1.97  +    $LSOF_CC --version | grep GCC > /dev/null
    1.98       if test $? -eq 0	# {
    1.99       then
   1.100 -       LSOF_CFGL="-w"
   1.101 -@@ -4246,6 +4246,17 @@
   1.102 +       LSOF_CFGL="$LSOF_CFGL -w"
   1.103 +@@ -4300,6 +4300,9 @@
   1.104   	LSOF_TSTBIGF=" "
   1.105   	LSOF_TSTLFLG="-lsocket -lnsl"
   1.106   	LSOF_VERS="100000"
   1.107  + 	if [ ".`isainfo -k`" = .amd64 ]; then
   1.108  + 	    LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
   1.109  + 	fi
   1.110 -+	;;
   1.111 -+      5.11*)
   1.112 -+	LSOF_TSTBIGF=" "
   1.113 -+	LSOF_TSTLFLG="-lsocket -lnsl"
   1.114 -+	LSOF_VERS="110000"
   1.115 -+ 	if [ ".`isainfo -k`" = .amd64 ]; then
   1.116 -+ 	    LSOF_CFGL="$LSOF_CFGL -lmp -lmd5 -lscf -ldoor -luutil"
   1.117 -+ 	fi
   1.118   	;;
   1.119 -       *)
   1.120 - 	echo Unknown Solaris version: $LSOF_VSTR
   1.121 -@@ -4323,7 +4334,7 @@
   1.122 -       ;;
   1.123 -     20500|20501)
   1.124 -       ;;
   1.125 --    20600|70000|80000|90000|100000)
   1.126 -+    20600|70000|80000|90000|100000|110000)
   1.127 -       if test "X$SOLARIS_26PR_GWINDOWS" = "X"	# {
   1.128 -       then
   1.129 - 	rm -f ${LSOF_TMPC}.*
   1.130 -@@ -4332,7 +4343,7 @@
   1.131 +       5.11*)
   1.132 + 	LSOF_TSTBIGF=" "
   1.133 +@@ -4391,7 +4394,7 @@
   1.134   	echo "main(){" >> ${LSOF_TMPC}.c
   1.135   	echo "enum prnodetype p=PR_GWINDOWS;}" >> ${LSOF_TMPC}.c
   1.136   	echo "Testing prdata.h for PR_GWINDOWS, using $LSOF_CC"
   1.137 @@ -128,7 +110,7 @@
   1.138   	if test $? -eq 0	# {
   1.139   	then
   1.140   	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x  > /dev/null 2>&1
   1.141 -@@ -4357,7 +4368,7 @@
   1.142 +@@ -4416,7 +4419,7 @@
   1.143   	echo "main(){" >> ${LSOF_TMPC}.c
   1.144   	echo "enum prnodetype p=PR_LDT;}" >> ${LSOF_TMPC}.c
   1.145   	echo "Testing prdata.h for PR_LDT, using $LSOF_CC"
   1.146 @@ -137,7 +119,7 @@
   1.147   	if test $? -eq 0	# {
   1.148   	then
   1.149   	  $LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
   1.150 -@@ -4391,7 +4402,7 @@
   1.151 +@@ -4450,7 +4453,7 @@
   1.152   	echo $SOLARIS_KERNBITS | grep 64 > /dev/null
   1.153   	if test $? -eq 0	# {
   1.154   	then
   1.155 @@ -146,16 +128,16 @@
   1.156   	  if test $? -eq 0	# {
   1.157   	  then
   1.158   
   1.159 -@@ -4597,7 +4608,7 @@
   1.160 - 
   1.161 -       # Check for Solaris 10 or higher ZFS.
   1.162 - 
   1.163 +@@ -4669,7 +4672,7 @@
   1.164 +       then
   1.165 + 	LSOF_CTFH=1
   1.166 +       fi	# }
   1.167  -      if test -r ${LSOF_INCLUDE}/sys/fs/zfs.h	# {
   1.168  +      if false	# {
   1.169         then
   1.170 - 
   1.171 -       # Check for required ZFS kernel header files.
   1.172 -@@ -4712,7 +4723,7 @@
   1.173 + 	if test $LSOF_CTFH -eq 1	# {
   1.174 + 	then
   1.175 +@@ -4729,7 +4732,7 @@
   1.176         echo "main(){" >> ${LSOF_TMPC}.c
   1.177         echo "enum vtype p=VSOCK;}" >> ${LSOF_TMPC}.c
   1.178         echo "Testing vnode.h for VSOCK, using $LSOF_CC"
   1.179 @@ -164,7 +146,7 @@
   1.180         if test $? -eq 0	# {
   1.181         then
   1.182   	$LSOF_CC ${LSOF_TMPC}.c -o ${LSOF_TMPC}.x > /dev/null 2>&1
   1.183 -@@ -5398,7 +5409,7 @@
   1.184 +@@ -5418,7 +5421,7 @@
   1.185       echo "$i" >> $LSOF_TSTCFLG
   1.186     done	# }
   1.187   fi	# }
   1.188 @@ -174,9 +156,8 @@
   1.189   then
   1.190     echo "-DLT_GCC" >> $LSOF_TSTCFLG
   1.191  Index: dialects/freebsd/machine.h
   1.192 -diff -Nau dialects/freebsd/machine.h.orig dialects/freebsd/machine.h
   1.193 ---- dialects/freebsd/machine.h.orig	2008-10-21 18:16:15.000000000 +0200
   1.194 -+++ dialects/freebsd/machine.h	2009-04-01 18:07:54.041381807 +0200
   1.195 +--- dialects/freebsd/machine.h.orig	2008-10-21 18:16:15 +0200
   1.196 ++++ dialects/freebsd/machine.h	2010-01-19 19:16:39 +0100
   1.197  @@ -441,6 +441,11 @@
   1.198    */
   1.199   
   1.200 @@ -189,36 +170,14 @@
   1.201   
   1.202   
   1.203   /*
   1.204 -Index: dialects/sun/dnode.c
   1.205 -diff -Nau dialects/sun/dnode.c.orig dialects/sun/dnode.c
   1.206 ---- dialects/sun/dnode.c.orig	2009-03-25 20:22:21.000000000 +0100
   1.207 -+++ dialects/sun/dnode.c	2009-04-01 18:07:54.041381807 +0200
   1.208 -@@ -92,6 +92,8 @@
   1.209 - #define	LOOKDEV_ALL	(LOOKDEV_TAB | LOOKDEV_CLONE | LOOKDEV_PSEUDO)
   1.210 - 					/* look all places */
   1.211 +Index: dialects/sun/machine.h
   1.212 +--- dialects/sun/machine.h.orig	2009-03-25 20:22:23 +0100
   1.213 ++++ dialects/sun/machine.h	2010-01-19 19:16:39 +0100
   1.214 +@@ -84,6 +84,7 @@
   1.215 + #include <sys/poll.h>
   1.216   
   1.217 -+#define NOOP ((void)0)
   1.218 -+
   1.219 - 
   1.220 - /*
   1.221 -  * SAM-FS definitions
   1.222 -@@ -2078,7 +2080,9 @@
   1.223 - 	    if (kvs && kv.vfs_data
   1.224 - 	    && !kread((KA_T)kv.vfs_data, (char *)&pcfs, sizeof(pcfs))) {
   1.225 - 
   1.226 --#if	solaris>=70000
   1.227 -+#if	solaris>=110000  /* pcfs_entps doesn't exist any more */
   1.228 -+		NOOP;
   1.229 -+#elif	solaris>=70000
   1.230 - 		Lf->inode = (INODETYPE)pc_makenodeid(pc.pc_eblkno,
   1.231 - 			    pc.pc_eoffset,
   1.232 - 			    pc.pc_entry.pcd_attr,
   1.233 -@@ -2092,7 +2096,7 @@
   1.234 - 			    pc.pc_eoffset,
   1.235 - 			    &pc.pc_entry,
   1.236 - 			    pcfs.pcfs_entps);
   1.237 --#endif	/* solaris>=70000 */
   1.238 -+#endif	/* solaris>=110000 */
   1.239 - 
   1.240 - 		Lf->inp_ty = 1;
   1.241 - 	    }
   1.242 + # if	solaris>=80000
   1.243 ++#include <sys/types32.h>
   1.244 + #include <sys/wait.h>
   1.245 + #include <sys/types32.h>
   1.246 + #define	_KERNEL	1

     2.1 --- a/lsof/lsof.spec	Fri Aug 03 16:45:20 2012 +0200
     2.2 +++ b/lsof/lsof.spec	Fri Aug 03 16:49:08 2012 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  ##
     2.5  ##  lsof.spec -- OpenPKG RPM Package Specification
     2.6 -##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.7 +##  Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/>
     2.8  ##
     2.9  ##  Permission to use, copy, modify, and distribute this software for
    2.10  ##  any purpose with or without fee is hereby granted, provided that
    2.11 @@ -31,20 +31,16 @@
    2.12  Class:        BASE
    2.13  Group:        Debugging
    2.14  License:      BSD
    2.15 -Version:      4.82
    2.16 -Release:      20090401
    2.17 +Version:      4.86
    2.18 +Release:      20120603
    2.19  
    2.20  #   list of sources
    2.21  Source0:      ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz
    2.22  Patch0:       lsof.patch
    2.23  
    2.24  #   build information
    2.25 -Prefix:       %{l_prefix}
    2.26 -BuildRoot:    %{l_buildroot}
    2.27 -BuildPreReq:  OpenPKG, openpkg >= 20040130, make, gcc
    2.28 -PreReq:       OpenPKG, openpkg >= 20040130
    2.29 -AutoReq:      no
    2.30 -AutoReqProv:  no
    2.31 +BuildPreReq:  OpenPKG, openpkg >= 20100101, gcc
    2.32 +PreReq:       OpenPKG, openpkg >= 20100101
    2.33  
    2.34  %description
    2.35      List Open Files (lsof) shows all currently open file descriptors of
    2.36 @@ -67,7 +63,7 @@
    2.37      cd lsof_%{version}_src
    2.38      export PATH="/bin:/usr/bin:$PATH"
    2.39      export LSOF_CC="%{l_cc}"
    2.40 -    export LSOF_MAKE="%{l_make} %{l_mflags -O}"
    2.41 +    export LSOF_MAKE="%{l_make} %{l_mflags}"
    2.42      case "%{l_platform -t}" in
    2.43          *-freebsd* ) platform="freebsd"; LSOF_CC="/usr/bin/cc"; LSOF_MAKE="/usr/bin/make" ;;
    2.44          *-linux*   ) platform="linux"   ;;
    2.45 @@ -81,7 +77,6 @@
    2.46      eval $LSOF_MAKE
    2.47  
    2.48  %install
    2.49 -    rm -rf $RPM_BUILD_ROOT
    2.50      %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/bin
    2.51      %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/man/man8
    2.52      ( cd lsof_%{version}_src
    2.53 @@ -105,5 +100,4 @@
    2.54  %files -f files
    2.55  
    2.56  %clean
    2.57 -    rm -rf $RPM_BUILD_ROOT
    2.58