OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 29-Oct-2007 15:01:30
Branch: HEAD Handle: 2007102914012900
Modified files:
openpkg-src/lsof lsof.patch lsof.spec
Log:
adjustments from upstream vendor to support FreeBSD 7/8
Summary:
Revision Changes Path
1.15 +69 -0 openpkg-src/lsof/lsof.patch
1.69 +1 -1 openpkg-src/lsof/lsof.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/lsof/lsof.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 lsof.patch
--- openpkg-src/lsof/lsof.patch 12 Jul 2007 07:03:18 -0000 1.14
+++ openpkg-src/lsof/lsof.patch 29 Oct 2007 14:01:29 -0000 1.15
@@ -46,6 +46,37 @@
if test $? -eq 0 # {
then
+@@ -1420,6 +1420,10 @@
+ LSOF_TSTBIGF=" "
+ LSOF_VERS=6010
+ ;;
++ 6.2*)
++ LSOF_TSTBIGF=" "
++ LSOF_VERS=6020
++ ;;
+ 6*)
+ LSOF_VERS=6000
+ echo "!!!WARNING!!! Unsupported FreeBSD version: $LSOF_VSTR"
+@@ -1434,6 +1438,10 @@
+ echo "!!!WARNING!!! Unsupported FreeBSD version: $LSOF_VSTR"
+ echo "!!!WARNING!!! Configuring for FreeBSD 7.0"
+ ;;
++ 8*)
++ LSOF_TSTBIGF=" "
++ LSOF_VERS=8000
++ ;;
+ *)
+ echo Unknown FreeBSD release: `uname -r`
+ echo Assuming FreeBSD 2.x
+@@ -1525,7 +1533,7 @@
+ LSOF_CFGF="$LSOF_CFGF -DHASVMLOCKH"
+ fi # }
+ ;;
+-
4000|4010|4020|4030|4040|4050|4060|4070|4080|4090|4100|4110|5000|5010|5020|5030|5040|5050|6000|6010|7000)
++
4000|4010|4020|4030|4040|4050|4060|4070|4080|4090|4100|4110|5000|5010|5020|5030|5040|5050|6000|6010|6020|7000|8000)
+ if test -r ${LSOF_INCLUDE}/sys/namei.h # {
+ then
+ grep -q "^struct[ ]*namecache[ ]*{" ${LSOF_INCLUDE}/sys/namei.h
@@ -1881,7 +1881,7 @@
fi # }
fi # }
@@ -181,3 +212,41 @@
#include <sys/wait.h>
#include <sys/types32.h>
#define _KERNEL 1
+--- dialects/freebsd/dlsof.h 2006-03-28 01:29:11 +0200
++++ dialects/freebsd/dlsof.h 2007-10-26 13:22:46 +0200
+@@ -43,15 +43,15 @@
+ #include <nlist.h>
+ #include <setjmp.h>
+ #include <signal.h>
+-#include <string.h>
+ #include <unistd.h>
+
+ # if FREEBSDV>=4000
+ # if FREEBSDV>=5000
++# if FREEBSDV<6020
+ # if defined(__alpha__)
+ /*
+- * For Alpha, #include <machine/pcpu.h> before #define'ing _KERNEL. Then
+- * #define PCPU_MD_FIELDS independently. This hack avoids a compiler
++ * For Alpha below 6.2, #include <machine/pcpu.h> before #define'ing
_KERNEL.
++ * Then #define PCPU_MD_FIELDS independently. This hack avoids a compiler
+ * complaint about register use.
+ */
+
+@@ -63,6 +63,7 @@
+ u_int32_t pc_next_asn; /* next ASN to alloc */ \
+ u_int32_t pc_current_asngen /* ASN rollover check */
+ # endif /* defined(__alpha__) */
++# endif /* FREEBSDV<6020 */
+ #define _KERNEL 1
+ # endif /* FREEBSDV>=5000 */
+ #include <sys/conf.h>
+@@ -361,6 +362,8 @@
+ # endif /* FREEBSDV<5000 */
+ # endif /* FREEBSDV>=2020 */
+
++#include <string.h>
++
+
+ #define COMP_P const void
+ #define DEVINCR 1024 /* device table malloc() increment */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/lsof/lsof.spec
============================================================================
$ cvs diff -u -r1.68 -r1.69 lsof.spec
--- openpkg-src/lsof/lsof.spec 12 Jul 2007 07:03:18 -0000 1.68
+++ openpkg-src/lsof/lsof.spec 29 Oct 2007 14:01:29 -0000 1.69
@@ -33,7 +33,7 @@
Group: Debugging
License: BSD
Version: 4.78
-Release: 20070712
+Release: 20071029
# list of sources
Source0:
ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_%{version}.tar.gz
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
