cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- sync with ext2fs dinode changes in -current so this builds/functions

Browse Source 
- do not complain about unknown openbsd version..
This commit is contained in:
pvalchev 2005-12-20 08:13:46 +00:00
parent e4bf6c70b6
commit a858e1a728
3 changed files with 88 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysutils/lsof/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.56 2005/06/05 19:40:54 pvalchev Exp $
# $OpenBSD: Makefile,v 1.57 2005/12/20 08:13:46 pvalchev Exp $
COMMENT= "list information about open files"
VERSION= 4.75
DISTNAME= lsof_${VERSION}
PKGNAME= ${DISTNAME:S/_/-/}
PKGNAME= ${DISTNAME:S/_/-/}p0
CATEGORIES= sysutils
MASTER_SITES= ftp://vic.cc.purdue.edu/pub/tools/unix/lsof/ \
ftp://ftp.ayamura.org/pub/lsof/ \

37
sysutils/lsof/patches/patch-Configure Normal file
View File

@ -0,0 +1,37 @@
$OpenBSD: patch-Configure,v 1.19 2005/12/20 08:13:46 pvalchev Exp $
--- Configure.orig Mon May 16 19:06:05 2005
+++ Configure Mon Dec 19 23:57:01 2005
@@ -3357,16 +3357,20 @@ return(0); }
LSOF_TSTBIGF=" "
LSOF_VERS=3070
;;
+ 3.8*)
+ LSOF_TSTBIGF=" "
+ LSOF_VERS=3080
+ ;;
3*)
LSOF_TSTBIGF=" "
- LSOF_VERS=3070
+ LSOF_VERS=3080
echo "!!!WARNING!!! Unsupported OpenBSD 3.x version: $LSOF_VSTR"
- echo "!!!WARNING!!! Configuring for OpenBSD 3.7"
+ echo "!!!WARNING!!! Configuring for OpenBSD 3.8"
;;
*)
echo "Unknown OpenBSD release: $LSOF_VSTR"
- echo Assuming OpenBSD 3.7
- LSOF_VERS=3070
+ echo Assuming OpenBSD 3.8
+ LSOF_VERS=3080
;;
esac # }
fi # }
@@ -3374,7 +3378,7 @@ return(0); }
# Test for legal OpenBSD version.
case $LSOF_VERS in # {
- 1020|2050|2060|2070|2080|2090|3000|3010|3020|3030|3040|3050|3060|3070)
+ 1020|2050|2060|2070|2080|2090|3000|3010|3020|3030|3040|3050|3060|3070|3080)
;;
*)
echo "Unknown OpenBSD version: $LSOF_VERS"

49
sysutils/lsof/patches/patch-dialects_n+obsd_dnode_c Normal file
View File

@ -0,0 +1,49 @@
$OpenBSD: patch-dialects_n+obsd_dnode_c,v 1.7 2005/12/20 08:13:46 pvalchev Exp $
--- dialects/n+obsd/dnode.c.orig Thu Dec 30 11:42:30 2004
+++ dialects/n+obsd/dnode.c Mon Dec 19 23:56:13 2005
@@ -563,12 +563,12 @@ process_overlaid_node:
nty = EXT2NODE;
# if defined(HASI_E2FS_PTR)
- if (i.i_din.e2fs_din
- && !kread((KA_T)i.i_din.e2fs_din, (char *)&ed, sizeof(ed)))
+ if (i.dinode_u.e2fs_din
+ && !kread((KA_T)i.dinode_u.e2fs_din, (char *)&ed, sizeof(ed)))
edp = &ed;
# else /* !defined(HASI_E2FS_PTR) */
# if HASEXT2FS<2
- edp = &i.i_din.e2fs_din;
+ edp = &i.dinode_u.e2fs_din;
# else /* HASEXT2FS>=2 */
edp = &i.i_e2din;
# endif /* HASEXT2FS>=2 */
@@ -588,16 +588,16 @@ process_overlaid_node:
&& !kread((KA_T)i.i_ump, (char *)&um, sizeof(um))) {
if (um.um_fstype == UFS1) {
ffs = 1;
- if (i.i_din.ffs1_din
- && !kread((KA_T)i.i_din.ffs1_din, (char *)&u1,
+ if (i.dinode_u.ffs1_din
+ && !kread((KA_T)i.dinode_u.ffs1_din, (char *)&u1,
sizeof(u1)))
{
u1s = 1;
}
} else if (um.um_fstype == UFS2) {
ffs = 2;
- if (i.i_din.ffs2_din
- && !kread((KA_T)i.i_din.ffs2_din, (char *)&u2,
+ if (i.dinode_u.ffs2_din
+ && !kread((KA_T)i.dinode_u.ffs2_din, (char *)&u2,
sizeof(u2)))
{
u2s = 1;
@@ -719,7 +719,7 @@ process_overlaid_node:
}
# else /* !defined(HASI_E2FS_PTR) */
# if HASEXT2FS<2
- rdev = i.i_din.e2fs_din.e2di_rdev;
+ rdev = i.dinode_u.e2fs_din.e2di_rdev;
# else /* HASEXT2FS>=2 */
rdev = i.i_e2din.e2di_rdev;
# endif /* HASEXT2FS>=2 */