OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web Date: 17-Oct-2005 08:51:25
Branch: HEAD Handle: 2005101707512500
Modified files:
openpkg-web/security template.cf template.pl
Log:
update template stuff
Summary:
Revision Changes Path
1.2 +5 -5 openpkg-web/security/template.cf
1.6 +9 -9 openpkg-web/security/template.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-web/security/template.cf
============================================================================
$ cvs diff -u -r1.1 -r1.2 template.cf
--- openpkg-web/security/template.cf 29 Oct 2004 14:04:45 -0000 1.1
+++ openpkg-web/security/template.cf 17 Oct 2005 06:51:25 -0000 1.2
@@ -1,10 +1,10 @@
-Package: foo
-Home: http://www.foo.org/
+Name: foo
+URL: http://www.foo.org/
Advisory: http://www.example.com/bugfinder.html
CVE: CAN-XXXX-YYYY
-OpenPKG-CUR: foo-1.2.4-20040123 foo-1.2.4-20049124
-OpenPKG-2.2: foo-1.2.3-2.2.0 foo-1.2.3-2.2.1
-OpenPKG-2.1: foo-1.2.2-2.1.0 foo-1.2.2-2.1.1
+OpenPKG-CUR: foo-1.2.4-20050123 foo-1.2.4-20059124
+OpenPKG-2.4: foo-1.2.3-2.4.0 foo-1.2.3-2.4.1
+OpenPKG-2.3: foo-1.2.2-2.3.0 foo-1.2.2-2.3.1
More textual hints and information gathered
together during security engineering...
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/security/template.pl
============================================================================
$ cvs diff -u -r1.5 -r1.6 template.pl
--- openpkg-web/security/template.pl 5 Apr 2005 14:44:35 -0000 1.5
+++ openpkg-web/security/template.pl 17 Oct 2005 06:51:25 -0000 1.6
@@ -42,20 +42,20 @@
# substitute SA template text
$txt =~ s/#FIXME[^\n]+\n//sg;
-$txt =~ s/OpenPKG-SA-2004.001/OpenPKG-SA-$idnum/s;
+$txt =~ s/OpenPKG-SA-2005.001/OpenPKG-SA-$idnum/s;
my $date = `date '+%d-%b-%Y'`;
$date =~ s/\n$//s;
-$txt =~ s/01-Jan-2004/$date/s;
+$txt =~ s/01-Jan-2005/$date/s;
$txt =~ s|http://www.foo.org/|$cfg->{"URL"}|s;
$txt =~ s|http://www.example.com/bugfinder.html|$cfg->{"Advisory"} ||
"?????"|se;
-$txt =~ s/foo-1\.2\.4-20040123/$cfg->{"OpenPKG-CUR"}->[0]/sg;
-$txt =~ s/foo-1\.2\.4-20049124/$cfg->{"OpenPKG-CUR"}->[1]/sg;
-$txt =~ s/foo-1\.2\.3-2\.2\.0/$cfg->{"OpenPKG-2.2"}->[0]/sg;
-$txt =~ s/foo-1\.2\.3-2\.2\.1/$cfg->{"OpenPKG-2.2"}->[1]/sg;
-$txt =~ s/foo-1\.2\.2-2\.1\.0/$cfg->{"OpenPKG-2.1"}->[0]/sg;
-$txt =~ s/foo-1\.2\.2-2\.1\.1/$cfg->{"OpenPKG-2.1"}->[1]/sg;
+$txt =~ s/foo-1\.2\.4-20050123/$cfg->{"OpenPKG-CUR"}->[0]/sg;
+$txt =~ s/foo-1\.2\.4-20059124/$cfg->{"OpenPKG-CUR"}->[1]/sg;
+$txt =~ s/foo-1\.2\.3-2\.4\.0/$cfg->{"OpenPKG-2.4"}->[0]/sg;
+$txt =~ s/foo-1\.2\.3-2\.4\.1/$cfg->{"OpenPKG-2.4"}->[1]/sg;
+$txt =~ s/foo-1\.2\.2-2\.3\.0/$cfg->{"OpenPKG-2.3"}->[0]/sg;
+$txt =~ s/foo-1\.2\.2-2\.3\.1/$cfg->{"OpenPKG-2.3"}->[1]/sg;
$txt =~ s/foo/$cfg->{"Name"}/sg;
-$txt =~ s/CAN-\.\.\./join(" ", @{$cfg->{"CVE"}})/sge;
+$txt =~ s/CAN-\.\.\./ref($cfg->{"CVE"}) ? join(" ", @{$cfg->{"CVE"}}) :
$cfg->{"CVE"}/sge;
# write fresh SA
$io = new IO::File ">OpenPKG-SA-$idnum-$idtag.txt" or die;
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
