RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Pinto Elia
  Root:   /v/rpm/cvs                       Email:  [email protected]
  Module: rpm                              Date:   09-May-2011 17:32:01
  Branch: HEAD                             Handle: 2011050915320001

  Added files:
    rpm/tests               arbitrarytag-1.0-2.noarch.rpm
  Modified files:
    rpm                     CHANGES
    rpm/tests               arbitrarytag.spec
  Removed files:
    rpm/tests               arbitrarytag-1.0-1.src.rpm

  Log:
    fix the arbitrarytag toy test spec

  Summary:
    Revision    Changes     Path
    1.3631      +1  -0      rpm/CHANGES
    1.3         +0  -34     rpm/tests/arbitrarytag-1.0-1.src.rpm
    1.1         BLOB        rpm/tests/arbitrarytag-1.0-2.noarch.rpm
    1.3         +16 -31     rpm/tests/arbitrarytag.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.3630 -r1.3631 CHANGES
  --- rpm/CHANGES       9 May 2011 15:14:19 -0000       1.3630
  +++ rpm/CHANGES       9 May 2011 15:32:00 -0000       1.3631
  @@ -1,4 +1,5 @@
   5.4.0 -> 5.4.1:
  +    - devzero2000: fix the arbitrarytag toy test spec 
       - devzero2000: Give the right name to the security arbitrary tags
       - devzero2000: document arbitrary tags in the spec manual
       - devzero2000: added arbitrary tag for security description and 
reference.
  @@ .
  rm -f rpm/tests/arbitrarytag-1.0-1.src.rpm <<'@@ .'
  Index: rpm/tests/arbitrarytag-1.0-1.src.rpm
  ============================================================================
  [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED]
  @@ .
  (cd rpm/tests && \
   uudecode <<'@@ .' && \
   xdelta patch arbitrarytag-1.0-2.noarch.rpm.xdelta /dev/null 
arbitrarytag-1.0-2.noarch.rpm && \
   rm -f arbitrarytag-1.0-2.noarch.rpm.xdelta)
  Index: rpm/tests/arbitrarytag-1.0-2.noarch.rpm
  ============================================================================
  begin 664 arbitrarytag-1.0-2.noarch.rpm.xdelta
  M)5A$6C`P-"4````(`!$`$`````````````````````!S:&EE;&$N.#@W,C(N
  M;G5L;'-H:65L82XX.#<R,BYA;&P?BP@````````#`P```````````!^+"```
  M``````-C8&A@9F!@\[email protected]$3R\L&SAEO?CC5`<48`(Z3P[(<````````
  )52581%HP,#0E
  `
  end
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/arbitrarytag.spec
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 arbitrarytag.spec
  --- rpm/tests/arbitrarytag.spec       3 Dec 2010 17:43:26 -0000       1.2
  +++ rpm/tests/arbitrarytag.spec       9 May 2011 15:32:01 -0000       1.3
  @@ -1,48 +1,33 @@
  -# --- Permit RHSA: CVEID: and RHBZ: arbitrary tags in headers.
  -# XXX This cannot be done in a *.spec, must be configured before building.
  -# XXX Let's pretend that's a featlet, not a bugture.
  -%{expand:%%global _arbitrary_tags %{_arbitrary_tags}:RHSA:CVEID:RHBZ:ATAS}
  -
  -Summary:     Demonstrate how to use arbitrary tags.
  +Summary:     Demostrate how to use arbitrary tags.
   Name:                arbitrarytag
   Version:     1.0
  -Release:     1
  -License:     Public Domain
  +Release:     2
  +License:     LGPL2
   Group:               Development/Examples
   URL:         http://rpm5.org/
   BuildArch:   noarch
   
  -# --- Parse the tags from the *.spec file:
  -CVEID:               CVE-2008-5964 
  -RHSA:                RHSA-2007:1128-6
  -RHSA:                RHSA-2008:1129-6
  -RHBZ:                410031
  -RHBZ:                410032
  -
  -# XXX Hmmm ... the text block ends up in the *.src.rpm, others in binary.
  -# XXX Let's pretend that's a featlet, not a bugture.
  -%atas
  -This is a test of the ATAS Arbitrary Tag Alert System ... 1 ... 2 ... 3 ...
  +Cveid:               CVE-2008-5964 
  +Rhbz:                410031
  +Rhbz:                410032
  +Cvssv2:         7.2 (AV:L/AC:L/Au:N/C:C/I:C/A:C)
  +Susesa:              SUSE-SA:2010:052
   
   %description
   A *.spec file to demonstrate how to use arbitrary tags.
  +In this specific example we are using the new
  +arbitrary security tags.
   
  -Permit CVEID/RHSA/RHBZ arbitrary tags by configuring a macro:
  -  echo "%%_arbitrary_tags CVEID:RHSA:RHBZ:ATAS" >> /etc/rpm/macros
  -
  -Build and install the package from this *.spec:
  -  rpmbuild -ba %{name}.spec
  -  rpm -Uvh %{name}-%{version}-%{release}.noarch.rpm
  -
  -Query the CVEID/RHSA/RHBZ tags:
  -  rpm -q --qf '[CVEID: %%{CVEID}\n][RHSA: %%{RHSA}\n][RHBZ: 
%%{RHBZ}\n]%%{ATAS}\n' %{name}
  -
  -%posttrans
  -rpm -q --qf '[CVEID: %{CVEID}\n][RHSA: %{RHSA}\n][RHBZ: %{RHBZ}\n]%{ATAS}\n' 
%{name}
  +%sanitycheck
  +# execute rpm -Vv %{name} for having the result on stdout 
  +rpm -q --qf '[CVEID: %%{CVEID}\n][RHSA: %%{RHSA}\n][RHBZ: 
%%{RHBZ}\n][CVSSv2: %%{CVSSv2}\n][SUSESA: %%{SUSESA}]\n' %{name} 
   
   %files
   
   %changelog 
  +* Mon May  9 2011 Elia Pinto <[email protected]> - 1.0-2
  +- Changed to new License, use the new arbitrary_tag_security 
  +  arbitrary tag
   * Wed Feb 24 2010 Elia Pinto <[email protected]> - 1.0-1
   - First Built but already fix a bunch of vulnerability.
     Yeap, in fact do nothing.
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                [email protected]

Reply via email to