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

  Server: rpm5.org                         Name:   Ralf S. Engelschall
  Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
  Module: rpm lua                          Date:   12-Jan-2008 23:30:54
  Branch: HEAD                             Handle: 2008011222305400

  Modified files:
    lua/local               llocal.lua
    rpm/scripts             integrity.cfg integrity.fp integrity.lua
                            integrity.pgp integrity.sh

  Log:
    now that RFC2440 'dash-escaping' is correctly handled internally, use
    this in the example and also unescape correctly in the Lua glue code

  Summary:
    Revision    Changes     Path
    1.15        +3  -1      lua/local/llocal.lua
    1.3         +3  -3      rpm/scripts/integrity.cfg
    1.3         +1  -1      rpm/scripts/integrity.fp
    1.3         +5  -3      rpm/scripts/integrity.lua
    1.3         +12 -12     rpm/scripts/integrity.pgp
    1.2         +2  -0      rpm/scripts/integrity.sh
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: lua/local/llocal.lua
  ============================================================================
  $ cvs diff -u -r1.14 -r1.15 llocal.lua
  --- lua/local/llocal.lua	12 Jan 2008 13:25:52 -0000	1.14
  +++ lua/local/llocal.lua	12 Jan 2008 22:30:54 -0000	1.15
  @@ -236,7 +236,9 @@
       if s == nil then
           return nil
       else
  -        return m[1]
  +        local plaintext = m[1]
  +        plaintext = util.rsubst(plaintext, "(?m)^- ", "")
  +        return plaintext
       end
   end
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/scripts/integrity.cfg
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 integrity.cfg
  --- rpm/scripts/integrity.cfg	12 Jan 2008 13:13:33 -0000	1.2
  +++ rpm/scripts/integrity.cfg	12 Jan 2008 22:30:54 -0000	1.3
  @@ -19,7 +19,7 @@
   -----BEGIN PGP SIGNATURE-----
   Version: GnuPG v2.0.8 (OpenPKG-CURRENT)
   
  -iEYEARECAAYFAkeIus4ACgkQ4NtEALXQTmsJDACfW4WxxXIZy0OmIZF+3A/AkGnV
  -s18AnRmkOZmULuvRnhTkrs/h+BYrT7Tq
  -=Scxl
  +iEYEARECAAYFAkeJPowACgkQT2TZ2Fa+K6bzaQCZAQfboFtqjtu5ZPdIcxI2pdW9
  +gnkAmwc5+dCXvtjbTdORv5QdF7HxwWdx
  +=2zrA
   -----END PGP SIGNATURE-----
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/scripts/integrity.fp
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 integrity.fp
  --- rpm/scripts/integrity.fp	12 Jan 2008 13:13:33 -0000	1.2
  +++ rpm/scripts/integrity.fp	12 Jan 2008 22:30:54 -0000	1.3
  @@ -1 +1 @@
  -8D79F253B6D3B089AB1B2919E0DB4400B5D04E6B
  +7971E0F1F694CABDF8EAEF534F64D9D856BE2BA6
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/scripts/integrity.lua
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 integrity.lua
  --- rpm/scripts/integrity.lua	12 Jan 2008 13:13:33 -0000	1.2
  +++ rpm/scripts/integrity.lua	12 Jan 2008 22:30:54 -0000	1.3
  @@ -1,8 +1,10 @@
   -----BEGIN PGP SIGNED MESSAGE-----
   Hash: SHA1
   
  +- --  integrity processor version
   integrity.version = "0.9.0"
   
  +- --  integrity processor validation callback function
   function integrity.validate(ctx, cfg)
       --  display configuration specification information
       if rpm.verbose() then
  @@ -59,7 +61,7 @@
   -----BEGIN PGP SIGNATURE-----
   Version: GnuPG v2.0.8 (OpenPKG-CURRENT)
   
  -iEYEARECAAYFAkeIus4ACgkQ4NtEALXQTms37ACdGutltMufb5o7ow9a+i9BWlWQ
  -ABUAoIzBInaquk+Rl5dZ6UPsNF8L9sxl
  -=6qWp
  +iEYEARECAAYFAkeJPowACgkQT2TZ2Fa+K6bGbQCZATh+P9f6N4547Ju50SHilAmZ
  +8vgAn3Llp6DjUb1q5Xp6xFVCbUm/iI7L
  +=IN0a
   -----END PGP SIGNATURE-----
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/scripts/integrity.pgp
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 integrity.pgp
  --- rpm/scripts/integrity.pgp	12 Jan 2008 13:13:33 -0000	1.2
  +++ rpm/scripts/integrity.pgp	12 Jan 2008 22:30:54 -0000	1.3
  @@ -1,17 +1,17 @@
   -----BEGIN PGP PUBLIC KEY BLOCK-----
   Version: GnuPG v2.0.8 (OpenPKG-CURRENT)
   
  -mQGiBEeIus4RBADHaYAqFfzKwwiUhiXQY4fvTMGYVde/U4umrDO68QBf1/9iwQEu
  -qwc+eWTmCxEs3t58aa69MmMiUVrpspNKxMFEhuA0HsRIxzUi4hJCZ6de8aN6M1oL
  -M9mwCdI1I72Xg+tCO6vXTEAQssZNaTkKGYSa8XFPBPbXG8WHYXYnlZuDYwCgzx2T
  -0JbsymPZdGeOJ56iPVwQiH8EAJ51POgMKaxiIIKaECQ6CL9rXLW6szFsoivbZIjP
  -moI4bf/jQFOWS/6xeK4BYNgJ+3IvDedUTjsC6arfOkZKw1olGq/y4JafUie7LnjL
  -l8Fp3ElGKiVsa1HWvruyOt/yl689iHs1cVf9oxRv1V8vNEgGI/a3pd/hVfBusceB
  -pf+EA/4zSRce6GHqER8p6NfATCAnTDXEnriTGo5MSlT6iKZ52ygw6PvnR95RqsAp
  -xMGLu9bXFUP4Eqbwm/XyFVHtbxz/YpZ5gdcp3WZU63ZvkqEfAPBBTeLH6+o2W8Zw
  -yy1kpg1nwrKNy/fNmOM5ubY+NhWY2JN+FL4ckYPypMCW34w8FrQ1SW50ZWdyaXR5
  +mQGiBEeJPosRBAD0MLm6sKAZYLnRL2Ys/P3Up0LdhjKzmu9TzYSZ9RxqEGZBXHcF
  +eENmMch9wF8OjSBOMLkLeF6AJR2s4UMUdyoXmXy65Z/o0Syg6NKWmkPEPQbT0BW5
  +jQie4FAiWWLZlv92fXyuNJ7G/zRNq+0twsigPYxsEeM3WkfoyIqi5YBEXwCgj+CA
  +P+inMSH1cPnlGrec+0/i6ZEEAJJTJlUhnzjHH8ZfSUc6SBAtqfmVzMoLC4sjYDOq
  +HKZ38LWoGd2ewTPpYEPXXnNICyLWGd02M65H8GOlR17QrUn5uQG9qvgPpt+oCsEV
  +hGn6ssx17qUZ62J1Uk9wQBrN0vSYh5FHXKXHbVojODO3WmeX4C5gP21ZEoDWICDo
  +IW+AA/0Vo9LdJhJip7WsZQDQwQxcjDBvZTLrONCYfQId+9/2/jt1QCWjiST5f5MI
  +wAsVqlTJuVnTnN2zSHjaNNMfFVynATs1Fqctgol3iOIyrCAetXN1i43PZp8rQ/yX
  +jt8mJDcN8pqmityW4TUkHop4eK9nEzYTySWx0qqXJZidWIpw+7Q1SW50ZWdyaXR5
   LUF1dGhvcml0eSA8aW50ZWdyaXR5LWF1dGhvcml0eUBleGFtcGxlLmNvbT6IYAQT
  -EQIAIAUCR4i6zgIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEODbRAC10E5r
  -TBUAnjVa3SbInBEV57rjS5HHwL/p0PiwAJwOBk76GGcShD7eLwDwPmgUipVHSw==
  -=9ltP
  +EQIAIAUCR4k+iwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEE9k2dhWvium
  +QrcAoIZzXFCwpkPufBXG/xcF/8hT8gb+AJ94ZIVw8603uTsLsBQOGtM3ElHY/Q==
  +=kfZ/
   -----END PGP PUBLIC KEY BLOCK-----
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/scripts/integrity.sh
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 integrity.sh
  --- rpm/scripts/integrity.sh	2 Jan 2008 16:57:37 -0000	1.1
  +++ rpm/scripts/integrity.sh	12 Jan 2008 22:30:54 -0000	1.2
  @@ -38,10 +38,12 @@
               .*
               $
           /$1/xs;
  +        $txt =~ s/^- //mg;
           print $txt;
       ' <$1 >$1.tmp && \
       gpg --quiet --batch --clearsign --output - $1.tmp >$1
       rm -f $1.tmp
  +    gpg --quiet --batch --verify $1 || exit $?
   }
   clearsign integrity.cfg
   clearsign integrity.lua
  @@ .