rpms/lsof/devel lsof_4.78C-inode.patch, NONE, 1.1 lsof_4.78C-selinux-strerr.patch, NONE, 1.1 upstream2downstream.sh, NONE, 1.1 lsof.spec, 1.37, 1.38 README.maintainer, 1.1, NONE

[Karel Zak (kzak)]

Author: kzak

Update of /cvs/pkgs/rpms/lsof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14592

Modified Files:
	lsof.spec 
Added Files:
	lsof_4.78C-inode.patch lsof_4.78C-selinux-strerr.patch 
	upstream2downstream.sh 
Removed Files:
	README.maintainer 
Log Message:
* Tue Oct  2 2007 Karel Zak <kzak at redhat.com> 4.78-6
- fix #280651 - lsof prints entries in multiple lines when SElinux is disabled
- fix #243976 - mmap'd files with large inode numbers confuse lsof


lsof_4.78C-inode.patch:

--- NEW FILE lsof_4.78C-inode.patch ---
diff -up lsof_4.78C-rh/dialects/linux/dproc.c.kzak lsof_4.78C-rh/dialects/linux/dproc.c
--- lsof_4.78C-rh/dialects/linux/dproc.c.kzak	2007-10-02 14:30:25.000000000 +0200
+++ lsof_4.78C-rh/dialects/linux/dproc.c	2007-10-02 14:31:46.000000000 +0200
@@ -790,7 +790,7 @@ process_proc_map(p, s, ss)
 	    dev = (dev_t)makedev((int)maj, (int)min);
 	    if (!fp[5] || !*fp[5])
 		continue;
-	    inode = (INODETYPE)atoi(fp[5]);
+	    inode = (INODETYPE)atoll(fp[5]);
 	    if (!dev && !inode)
 		continue;
 	/*

lsof_4.78C-selinux-strerr.patch:

--- NEW FILE lsof_4.78C-selinux-strerr.patch ---
diff -up lsof_4.78C-rh/dialects/linux/dproc.c.kzak lsof_4.78C-rh/dialects/linux/dproc.c
--- lsof_4.78C-rh/dialects/linux/dproc.c.kzak	2007-10-02 15:34:19.000000000 +0200
+++ lsof_4.78C-rh/dialects/linux/dproc.c	2007-10-02 15:36:21.000000000 +0200
@@ -467,8 +467,8 @@ gather_proc_info()
 		if (getpidcon(pid, &Lp->cntx) == -1) {
 		    Lp->cntx = (char *)NULL;
 		    if (!Fwarn) {
-			(void) snpf(nmabuf, sizeof(nmabuf),
-			    "(getpidcon: %s)\n", strerror(errno));
+			(void) snpf(nmabuf, sizeof(nmabuf), "(getpidcon: %s)",
+			    strerror(errno));
 			if (!(Lp->cntx = strdup(nmabuf))) {
 			    (void) fprintf(stderr,
 				"%s: no context error space: PID %ld",


--- NEW FILE upstream2downstream.sh ---
#!/bin/bash
#
# This script removes non-linux dialects from upstream source package before release.
# There is a problem with copyrights for some UN*Xes ... also .. this script merges all
# to the one normal tarball and rename all to lsof_X.XX-rh.
#
# Usage:  ./upstream2downstream  <usptream-tarball>
#
# Copyright (C) 2007 Karel Zak <kzak at redhat.com>
#

UPSTREAM="$1"
NAME=$(basename $UPSTREAM .tar.gz)
MYPWD=$(pwd)
TMP=$(mktemp -d)

echo
echo -n "Extracting upstream code..."
tar -zxf $UPSTREAM  -C $TMP
cd $TMP/$NAME
tar xf "$NAME"_src.tar
echo " done."

echo -n "Moving files to downstream directory..."
mv "$NAME"_src/ "$NAME"-rh
mv README* 00* "$NAME"-rh
echo " done."

echo -n "Removing non-Linux dialects..."
rm -rf "$NAME"-rh/dialects/{aix,darwin,du,freebsd,hpux,n+obsd,n+os,osr,sun,uw}
echo " done."

echo -n "Creating final downstream tarball..."
tar jcf $MYPWD/"$NAME"-rh.tar.bz2 "$NAME"-rh
echo " done."

rm -rf $TMP
cd $MYPWD

echo
echo "Linux-only tarball: $MYPWD/"$NAME"-rh.tar.bz2"
echo



Index: lsof.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lsof/devel/lsof.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- lsof.spec	1 Mar 2007 16:37:24 -0000	1.37
+++ lsof.spec	2 Oct 2007 22:52:57 -0000	1.38
@@ -1,17 +1,27 @@
 Summary: A utility which lists open files on a Linux/UNIX system
 Name: lsof
 Version: 4.78
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: Distributable
 Group: Development/Debuggers
+
+# lsof contains licensed code that we cannot ship.  Therefore we use
+# upstream2downstream.sh script to remove the code before shipping it.
+#
+# The script you can found in CVS or download from:
+# http://cvs.fedoraproject.org/viewcvs/rpms/lsof/devel/upstream2downstream.sh
+#
 %define lsofrh lsof_4.78C-rh
 Source0: %{lsofrh}.tar.bz2
 URL: ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libselinux-devel
 
 Patch1: lsof_4.78C-threads.patch
+Patch2: lsof_4.78C-inode.patch
+Patch3: lsof_4.78C-selinux-strerr.patch
 
 %description
 Lsof stands for LiSt Open Files, and it does just that: it lists
@@ -20,7 +30,12 @@
 
 %prep
 %setup -q -n %{lsofrh}
+# 184338 - allow lsof access nptl threads
 %patch1 -p1
+# 243976 - mmap'd files with large inode numbers confuse lsof
+%patch2 -p1
+# 280651 - lsof prints entries in multiple lines when SElinux is disabled
+%patch3 -p1
 
 %build
 LSOF_VSTR=2.6.16 LINUX_BASE=/proc ./Configure -n linux
@@ -44,6 +59,10 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Oct  2 2007 Karel Zak <kzak at redhat.com> 4.78-6
+- fix #280651 - lsof prints entries in multiple lines when SElinux is disabled
+- fix #243976 - mmap'd files with large inode numbers confuse lsof
+
 * Thu Mar  1 2007 Karel Zak <kzak at redhat.com> 4.78-5
 - fix License
 


--- README.maintainer DELETED ---