rpms/pinfo/FC-5 pinfo-0.6.9-infosuff.patch, NONE, 1.1 pinfo-0.6.9-nogroup.patch, NONE, 1.1 pinfo.spec, 1.27, 1.28

[fedora-cvs-commits at redhat.com]

Author: mlichvar

Update of /cvs/dist/rpms/pinfo/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv3416

Modified Files:
	pinfo.spec 
Added Files:
	pinfo-0.6.9-infosuff.patch pinfo-0.6.9-nogroup.patch 
Log Message:
- use correct group when dropping group privileges (#221107)
- open also files without .info suffix
- make scriptlets safer
- make sure readline support isn't compiled in
Resolves: #221107


pinfo-0.6.9-infosuff.patch:
 filehandling_functions.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE pinfo-0.6.9-infosuff.patch ---
--- pinfo-0.6.9/src/filehandling_functions.c.infosuff	2006-03-16 16:15:02.000000000 +0100
+++ pinfo-0.6.9/src/filehandling_functions.c	2006-09-18 14:32:32.000000000 +0200
@@ -94,6 +94,7 @@
 	/* iterate over all files in the directory */
 	while ((dp = readdir(dir)) != NULL)
 	{
+		int info_suffix;
 		/* use strcat rather than strdup, because xmalloc handles all 
 		 * malloc errors */
 		char *thisfile = xmalloc(strlen(dp->d_name)+1);
@@ -101,7 +102,9 @@
 
 		/* strip suffixes (so "gcc.info.gz" -> "gcc") */
 		strip_compression_suffix(thisfile);
+		info_suffix = strlen(thisfile);
 		strip_info_suffix(thisfile);
+		info_suffix -= strlen(thisfile);
 
 		/* compare this file with the file we're looking for */
 		if (strcmp(thisfile,bname) == 0)
@@ -110,7 +113,8 @@
 			matched++;
 			/* put it in the buffer */
 			strncat(Buf, thisfile, 1023-strlen(Buf));
-			strncat(Buf, ".info", 1023-strlen(Buf));
+			if (info_suffix)
+				strncat(Buf, ".info", 1023-strlen(Buf));
 
 			/* clean up, and exit the loop */
 			xfree(thisfile);

pinfo-0.6.9-nogroup.patch:
 pinforc.in |    2 +-
 utils.c    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE pinfo-0.6.9-nogroup.patch ---
--- pinfo-0.6.9/src/utils.c.nogroup	2006-03-16 15:14:30.000000000 +0100
+++ pinfo-0.6.9/src/utils.c	2007-01-19 13:45:53.000000000 +0100
@@ -32,7 +32,7 @@
 #endif
 
 char *safe_user = "nobody";
-char *safe_group = "nogroup";
+char *safe_group = "nobody";
 
 #ifndef HAVE_CURS_SET
 void
--- pinfo-0.6.9/src/pinforc.in.nogroup	2007-01-19 13:42:14.000000000 +0100
+++ pinfo-0.6.9/src/pinforc.in	2007-01-19 13:45:35.000000000 +0100
@@ -91,7 +91,7 @@
 PRINTUTILITY=lpr
 MANLINKS=1:8:2:3:4:5:6:7:9:n:p:o:3X11:3Xt:3x:3X
 SAFE-USER=nobody
-SAFE-GROUP=nogroup
+SAFE-GROUP=nobody
 #
 # Remember, HIGHLIGHTREGEXP may be slow (thus it's commented by default)
 #


Index: pinfo.spec
===================================================================
RCS file: /cvs/dist/rpms/pinfo/FC-5/pinfo.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- pinfo.spec	12 Sep 2006 15:44:38 -0000	1.27
+++ pinfo.spec	19 Jan 2007 13:23:05 -0000	1.28
@@ -1,12 +1,14 @@
 Summary: An info file viewer.
 Name: pinfo
 Version: 0.6.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Base
 License: GPL
 URL: http://pinfo.alioth.debian.org
 Source: pinfo-%{version}.tar.bz2
 Patch1: pinfo-0.6.8-htmlview.patch
+Patch2: pinfo-0.6.9-infosuff.patch
+Patch3: pinfo-0.6.9-nogroup.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: ncurses-devel
@@ -22,9 +24,11 @@
 %prep
 %setup -q
 %patch1 -p1 -b .links
+%patch2 -p1 -b .infosuff
+%patch3 -p1 -b .nogroup
 
 %build
-%configure
+%configure --without-readline
 make
 
 %install
@@ -52,16 +56,24 @@
 
 %post
 /sbin/install-info %{_infodir}/pinfo.info.gz %{_infodir}/dir
+:
  
 %preun
 if [ $1 = 0 ]; then
     /sbin/install-info --delete %{_infodir}/pinfo.info.gz %{_infodir}/dir
 fi
+:
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Fri Jan 19 2007 Miroslav Lichvar <mlichvar at redhat.com> 0.6.9-2
+- use correct group when dropping group privileges (#221107)
+- open also files without .info suffix
+- make scriptlets safer
+- make sure readline support isn't compiled in
+
 * Tue Sep 12 2006 Miroslav Lichvar <mlichvar at redhat.com> 0.6.9-1.fc5
 - update to 0.6.9
 - package locale files