pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/42172
The following reply was made to PR pkg/42172; it has been noted by GNATS.
From: Taylor Stearns <tstearns%pobox.com@localhost>
To: gnats-bugs%netbsd.org@localhost
Cc: wiz%NetBSD.org@localhost
Subject: Re: pkg/42172
Date: Wed, 9 Mar 2016 13:23:49 +0000
--uZ3hkaAS1mZxFaxD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
> I don't think anyone should use lintpkgsrc -V. Please send the suggested patches.
Patch attached. I'm not a perl expert, so would appreciate another pair
of eyes. But existing commands (other than -V) do still work for me
after the patch is applied. Changes are:
* remove -V option from lintpkgsrc.pl
* remove -V documentation from lintpkgsrc.{0,1}
* don't special-case the vulnerabilities file in distfiles (.pl line
1630) since it's not stored there anymore.
Regards,
Taylor
--uZ3hkaAS1mZxFaxD
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="lintpkgsrc.diff"
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/pkgtools/lintpkgsrc/Makefile,v
retrieving revision 1.23
diff -r1.23 Makefile
3c3
< PKGNAME=3D lintpkgsrc-4.91
---
> PKGNAME=3D lintpkgsrc-4.92
Index: files/lintpkgsrc.0
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.0,v
retrieving revision 1.3
diff -r1.3 lintpkgsrc.0
7c7
< l=08li=08in=08nt=08tp=08pk=08kg=08gs=08sr=08rc=08c [-=08-B=08BD=08Dd=
=08dL=08Ll=08lm=08mO=08Oo=08op=08pR=08Rr=08rS=08Su=08uV=08Vy=08yz=08z] [-=
=08-E=08E _=08f_=08i_=08l_=08e] [-=08-g=08g _=08p_=08k_=08g_=08s_=08r_=08c_=
=08m_=08a_=08p] [-=08-I=08I _=08f_=08i_=08l_=08e]
---
> l=08li=08in=08nt=08tp=08pk=08kg=08gs=08sr=08rc=08c [-=08-B=08BD=08Dd=
=08dL=08Ll=08lm=08mO=08Oo=08op=08pR=08Rr=08rS=08Su=08uy=08yz=08z] [-=08-E=
=08E _=08f_=08i_=08l_=08e] [-=08-g=08g _=08p_=08k_=08g_=08s_=08r_=08c_=08m_=
=08a_=08p] [-=08-I=08I _=08f_=08i_=08l_=08e]
44c44
< -=08-V=08V, -=08-d=08d, -=08-g=08g, -=08-i=08i, -=08-p=
=08p, or -=08-u=08u.
---
> -=08-d=08d, -=08-g=08g, -=08-i=08i, -=08-p=08p, or -=
=08-u=08u.
53c53
< the pkgsrc build system. -=08-p=08p, -=08-R=08R, and =
-=08-V=08V check for binary
---
> the pkgsrc build system. -=08-p=08p and -=08-R=08R ch=
eck for binary
110,113d109
< -=08-V=08V List any prebuilt packages in any subdirs of _=
=08P_=08A_=08C_=08K_=08A_=08G_=08E_=08S with
< known vulnerabilities, based on the data in
< _=08$_=08{_=08P_=08K_=08G_=08S_=08R_=08C_=08D_=08I_=08=
R_=08}_=08/_=08d_=08i_=08s_=08t_=08f_=08i_=08l_=08e_=08s_=08/_=08p_=08k_=08=
g_=08-_=08v_=08u_=08l_=08n_=08e_=08r_=08a_=08b_=08i_=08l_=08i_=08t_=08i_=08=
e_=08s.
<=20
123,125c119,121
< The -=08-R=08R, -=08-V=08V, and -=08-p=08p options default to using =
_=08P_=08A_=08C_=08K_=08A_=08G_=08E_=08S as the base
< directory from which to search for binary packages. If this include=
s OS
< or architecture information then packages for other OS/architecture
---
> The -=08-R=08R and -=08-p=08p options default to using _=08P_=08A_=
=08C_=08K_=08A_=08G_=08E_=08S as the base directory
> from which to search for binary packages. If this includes OS or
> architecture information then packages for other OS/architecture
Index: files/lintpkgsrc.1
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.1,v
retrieving revision 1.4
diff -r1.4 lintpkgsrc.1
13c13
< .Op Fl BDdLlmOopRrSuVyz
---
> .Op Fl BDdLlmOopRrSuyz
65d64
< .Fl V ,
84,85c83
< .Fl p ,
< .Fl R ,
---
> .Fl p
87c85
< .Fl V
---
> .Fl R
160,164d157
< .It Fl V
< List any prebuilt packages in any subdirs of
< .Em PACKAGES
< with known vulnerabilities, based on the data in
< .Pa ${PKGSRCDIR}/distfiles/pkg-vulnerabilities .
175,176c168
< .Fl R ,
< .Fl V ,
---
> .Fl R
Index: files/lintpkgsrc.pl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /cvsroot/pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl,v
retrieving revision 1.9
diff -r1.9 lintpkgsrc.pl
35d34
< %vuln, # vulnerability data
61d59
< || defined $opt{V}
256,273c254,255
< if ( $opt{p} || $opt{O} || $opt{R} || $opt{V} ) {
< if ( $opt{V} ) {
< my ($vuln) =3D "$pkgdistdir/pkg-vulnerabilities";
<=20
< if ( !open( VULN, $vuln ) ) {
< fail("Unable to open '$vuln': $!");
< }
< while (<VULN>) {
< s/#.*//;
< if (/([^*?[]+)(<|>|<=3D|>=3D)(\d\S+)/) {
< my ( $pkg, $cmp, $ver ) =3D ( $1, $2, $3 );
< push( @{ $vuln{$pkg} }, "$cmp $ver" );
< }
< }
< close(VULN);
< }
<=20
< if ( $opt{p} || $opt{O} || $opt{R} || $opt{V} ) {
---
> if ( $opt{p} || $opt{O} || $opt{R} ) {
> if ( $opt{p} || $opt{O} || $opt{R} ) {
430,441d411
< if ( $opt{V} && $vuln{$pkg} ) {
< foreach my $chk ( @{ $vuln{$pkg} } ) {
< my ( $test, $matchver ) =3D split( ' ', $chk );
<=20
< if ( deweycmp( $ver, $test, $matchver ) ) {
< print "$File::Find::dir/$_\n";
< push( @matched_prebuiltpackages, "$File::Find::dir/$_=
" );
< last;
< }
< }
< }
<=20
1629,1634d1598
< # Do not mark the vulnerabilities file as unknown
< $distfiles{'pkg-vulnerabilities'} =3D {
< path =3D> 'pkg-vulnerabilities',
< sum =3D> 'IGNORE'
< };
<=20
1742d1705
< -V : List known vulnerabilities
--uZ3hkaAS1mZxFaxD--
Home |
Main Index |
Thread Index |
Old Index