| 1 |
mpagano 08/12/29 20:37:14 |
| 2 |
|
| 3 |
Added: lsat-0.9.7.1-segfault-fix.patch |
| 4 |
lsat-0.9.7.1-gentoo.patch |
| 5 |
Log: |
| 6 |
Version bump and patch for bug #184488 |
| 7 |
(Portage version: 2.2_rc20/cvs/Linux 2.6.28-gentoo i686) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/lsat/files/lsat-0.9.7.1-segfault-fix.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: lsat-0.9.7.1-segfault-fix.patch |
| 16 |
=================================================================== |
| 17 |
--- lsat-0.9.7.1/lsatmain.c.orig 2008-12-29 11:09:04.000000000 -0500 |
| 18 |
+++ lsat-0.9.7.1/lsatmain.c 2008-12-29 13:31:00.000000000 -0500 |
| 19 |
@@ -232,7 +232,7 @@ int versions(char release[], char kernel |
| 20 |
} /* end while (fgets...) */ |
| 21 |
close(fileval); |
| 22 |
/* clean up even though we will rm it */ |
| 23 |
- close(infile); |
| 24 |
+ close((int)infile); |
| 25 |
|
| 26 |
if ( (system("rm -f /tmp/lsat1.lsat")) < 0) |
| 27 |
{ |
| 28 |
@@ -308,9 +308,9 @@ int main(int argc, char *argv[]) |
| 29 |
*/ |
| 30 |
char release[50]; /* array for release level */ |
| 31 |
char kernel[50]; /* what kernel user is running */ |
| 32 |
- static char *man_distro; /* if the user specifies a distribution */ |
| 33 |
+ static char man_distro[10]; /* if the user specifies a distribution */ |
| 34 |
const char * header =NULL; /* to print out the header */ |
| 35 |
- static char *out_file = "lsat.out"; /* output filename var */ |
| 36 |
+ static char out_file[255] = "lsat.out"; /* output filename var */ |
| 37 |
char xlist[100]; /* modules to exclude */ |
| 38 |
int xarray[33] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; |
| 39 |
int somethinginxlist = 0; |
| 40 |
@@ -350,10 +350,10 @@ int main(int argc, char *argv[]) |
| 41 |
diff = 1; |
| 42 |
break; |
| 43 |
case 'm': |
| 44 |
- strcpy(man_distro, argv[i]+3); |
| 45 |
+ strncpy(man_distro, argv[i]+3,sizeof(man_distro)); |
| 46 |
break; |
| 47 |
case 'o': |
| 48 |
- strcpy(out_file, argv[i]+3); |
| 49 |
+ strncpy(out_file, argv[i]+3,sizeof(out_file)); |
| 50 |
break; |
| 51 |
case 'r': |
| 52 |
rpmmodule = 1; |
| 53 |
@@ -366,7 +366,7 @@ int main(int argc, char *argv[]) |
| 54 |
break; |
| 55 |
case 'w': |
| 56 |
html = 1; |
| 57 |
- out_file="lsat.html"; |
| 58 |
+ strcpy(out_file,"lsat.html"); |
| 59 |
break; |
| 60 |
case 'x': strcpy(xlist,argv[i]+3); |
| 61 |
somethinginxlist = 1; |
| 62 |
|
| 63 |
|
| 64 |
|
| 65 |
1.1 app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch |
| 66 |
|
| 67 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch?rev=1.1&view=markup |
| 68 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-admin/lsat/files/lsat-0.9.7.1-gentoo.patch?rev=1.1&content-type=text/plain |
| 69 |
|
| 70 |
Index: lsat-0.9.7.1-gentoo.patch |
| 71 |
=================================================================== |
| 72 |
diff -Naur lsat-0.9.6.orig/Makefile.in lsat-0.9.6/Makefile.in |
| 73 |
--- lsat-0.9.6.orig/Makefile.in 2007-05-22 11:38:28.000000000 +0900 |
| 74 |
+++ lsat-0.9.6/Makefile.in 2007-05-25 18:55:25.000000000 +0900 |
| 75 |
@@ -12,6 +12,7 @@ |
| 76 |
PROGRAM= lsat |
| 77 |
INSTALL = /usr/bin/install -c |
| 78 |
prefix = @prefix@ |
| 79 |
+exec_prefix = @exec_prefix@ |
| 80 |
BINDIR = @bindir@ |
| 81 |
DATADIR = @datadir@ |
| 82 |
MANDIR = @mandir@ |
| 83 |
@@ -38,9 +39,7 @@ |
| 84 |
rm -f $(PROGRAM) $(OBJECTS) Makefile config.* lsat.old lsatmd5.out lsatmd5.old |
| 85 |
|
| 86 |
manpage: |
| 87 |
- pod2man $(PROGRAM).pod > $(PROGRAM).tmp |
| 88 |
- sed 's/perl v5.6.1/LSAT/g' $(PROGRAM).tmp| \ |
| 89 |
-sed 's/Perl/LSAT/g'\ |
| 90 |
+ pod2man $(PROGRAM).pod -r LSAT -c 'User Contributed LSAT Documentation' \ |
| 91 |
> $(PROGRAM).1 |
| 92 |
rm -f $(PROGRAM).tmp |
| 93 |
# cp -vf $(PROGRAM).1 debian/manpage.1.ex |
| 94 |
diff -Naur lsat-0.9.6.orig/checkpkgs.c lsat-0.9.6/checkpkgs.c |
| 95 |
--- lsat-0.9.6.orig/checkpkgs.c 2007-04-27 00:48:31.000000000 +0900 |
| 96 |
+++ lsat-0.9.6/checkpkgs.c 2007-05-25 18:46:00.000000000 +0900 |
| 97 |
@@ -113,14 +113,14 @@ |
| 98 |
} |
| 99 |
|
| 100 |
|
| 101 |
- /* if distro = gentoo, use pkglist */ |
| 102 |
+ /* if distro = gentoo, use qpkg */ |
| 103 |
if (distribution == 4) |
| 104 |
{ |
| 105 |
if (verbose > 0) |
| 106 |
{ |
| 107 |
printf(" Generating list of pkgs on system.\n"); |
| 108 |
} |
| 109 |
- shellcode = "/usr/lib/portage/bin/pkglist 2>/dev/null >>/tmp/lsat1.lsat"; |
| 110 |
+ shellcode = "/usr/bin/qpkg -I -nc 2>/dev/null >>/tmp/lsat1.lsat"; |
| 111 |
if ((dostuff(tempfile, 0, shellcode, 0, html)) < 0) |
| 112 |
{ |
| 113 |
/* rhut-rho...something bad happened */ |
Archives