[Pkg-sks-commit] r173 - in sks/trunk/sks/debian: . patches

[chrism at alioth.debian.org]

Author: chrism
Date: 2008-06-19 15:16:20 +0000 (Thu, 19 Jun 2008)
New Revision: 173

Removed:
   sks/trunk/sks/debian/patches/212_do_not_export_zerolen_packets
Modified:
   sks/trunk/sks/debian/changelog
Log:
[project @ 175]
Remove 212_do_not_export_zerolen_packets, it's included upstream

Original author: weasel
Date: 2005-08-24 16:09:07.953218+00:00

Modified: sks/trunk/sks/debian/changelog
===================================================================
--- sks/trunk/sks/debian/changelog	2008-06-19 15:16:14 UTC (rev 172)
+++ sks/trunk/sks/debian/changelog	2008-06-19 15:16:20 UTC (rev 173)
@@ -3,8 +3,10 @@
   * New upstream release.
   * Several changes courtesy of Marco Nenciarini <mnencia at debian.org>.
   * Add some comments to etc/sks/{membership,mailsyn,sksconf}.
+  * New upstream patch incorporates the following patches:
+    - 212_do_not_export_zerolen_packets
 
- -- Peter Palfrader <weasel at debian.org>  Wed, 24 Aug 2005 18:07:51 +0200
+ -- Peter Palfrader <weasel at debian.org>  Wed, 24 Aug 2005 18:08:42 +0200
 
 sks (1.0.9-0.6) UNRELEASED; urgency=low
 

Deleted: sks/trunk/sks/debian/patches/212_do_not_export_zerolen_packets
===================================================================
--- sks/trunk/sks/debian/patches/212_do_not_export_zerolen_packets	2008-06-19 15:16:14 UTC (rev 172)
+++ sks/trunk/sks/debian/patches/212_do_not_export_zerolen_packets	2008-06-19 15:16:20 UTC (rev 173)
@@ -1,19 +0,0 @@
-diff -Nur sks-1.0.9/parsePGP.ml sks-1.0.9.new/parsePGP.ml
---- sks-1.0.9/parsePGP.ml	2004-10-21 04:56:03.000000000 +0200
-+++ sks-1.0.9.new/parsePGP.ml	2005-08-18 03:00:11.993107131 +0200
-@@ -23,6 +23,7 @@
- open Printf
- 
- exception Overlong_mpi
-+exception Zerolen_mpi
- exception Partial_body_length of int
- 
- (********************************************************)
-@@ -109,6 +110,7 @@
-   try
-     let byte2 = cin#read_byte in
-     let length = (byte1 lsl 8) + byte2 in
-+    if length <= 0 then raise Zerolen_mpi;
-     let data = cin#read_string 
- 		 ((length + 7)/8)
-     in