From 2ed08625f7f56ab5c086498d47242299cff10e98 Mon Sep 17 00:00:00 2001
From: Stephen Paul Weber <singpolyma@singpolyma.net>
Date: Fri, 27 Apr 2012 12:41:12 -0500
Subject: patch cleaner than ed

---
 Arbitrary.patch | 24 ++++++++++++++++++++++++
 Makefile        |  8 +++-----
 2 files changed, 27 insertions(+), 5 deletions(-)
 create mode 100644 Arbitrary.patch

diff --git a/Arbitrary.patch b/Arbitrary.patch
new file mode 100644
index 0000000..11b6b51
--- /dev/null
+++ b/Arbitrary.patch
@@ -0,0 +1,24 @@
+--- Data/OpenPGP/Arbitrary.hs	2012-04-27 12:38:11.492411339 -0500
++++ arb.s	2012-04-27 12:37:57.176469214 -0500
+@@ -19,8 +19,7 @@
+                            x6 <- arbitrary
+                            x7 <- arbitrary
+                            x8 <- arbitrary
+-                           x9 <- arbitrary
+-                           return (SignaturePacket x1 x2 x3 x4 x5 x6 x7 x8 x9)
++                           return (signaturePacket x1 x2 x3 x4 x5 x6 x7 x8)
+                    1 -> do x1 <- arbitrary
+                            x2 <- arbitrary
+                            x3 <- arbitrary
+@@ -133,9 +132,8 @@
+                    3 -> do x1 <- arbitrary
+                            x2 <- arbitrary
+                            return (TrustSignaturePacket x1 x2)
+-                   4 -> do x1 <- arbitrary
++                   4 -> do x1 <- fmap (map toUpper . (`showHex` "")) (arbitrary :: Gen Word64)
+                            return (IssuerPacket x1)
+                    5 -> do x1 <- arbitrary
+-                           x2 <- arbitrary
+-                           return (UnsupportedSignatureSubpacket x1 x2)
++                           return (UnsupportedSignatureSubpacket 105 x1)
+                    _ -> error "FATAL ERROR: Arbitrary instance, logic bug"
diff --git a/Makefile b/Makefile
index 105780e..2d79bed 100644
--- a/Makefile
+++ b/Makefile
@@ -22,11 +22,9 @@ test: tests/suite
 tests/suite: tests/suite.hs Data/OpenPGP.hs Data/OpenPGP/Internal.hs Data/OpenPGP/Arbitrary.hs
 	ghc --make $(GHCFLAGS) -o $@ $^
 
-Data/OpenPGP/Arbitrary.hs: Data/OpenPGP.hs
-	derive -d Arbitrary -m Data.OpenPGP.Arbitrary -iData.OpenPGP -iTest.QuickCheck -iTest.QuickCheck.Instances -iNumeric -iData.Char -iData.Word -o $@ $^
-	-printf ',s/SignaturePacket x1 x2 x3 x4 x5 x6 x7 x8 x9)$$/signaturePacket x1 x2 x3 x4 x5 x6 x7 x8)/g\n/signaturePacket/\n-d\nw\nq\n' | ed $@
-	-printf '/return (IssuerPacket/\n-d\ni\n                   4 -> do x1 <- fmap (map toUpper . (`showHex` "")) (arbitrary :: Gen Word64)\n.\nw\nq\n' | ed $@
-	-printf '/return (UnsupportedSignatureSubpacket/\n-d\n.s/x1/105/g\n.s/x2/x1/g\nw\nq\n' | ed $@
+Data/OpenPGP/Arbitrary.hs: Data/OpenPGP.hs Arbitrary.patch
+	derive -d Arbitrary -m Data.OpenPGP.Arbitrary -iData.OpenPGP -iTest.QuickCheck -iTest.QuickCheck.Instances -iNumeric -iData.Char -iData.Word -o $@ Data/OpenPGP.hs
+	patch $@ Arbitrary.patch
 
 report.html: tests/suite.hs Data/OpenPGP.hs Data/OpenPGP/Internal.hs
 	-hlint $(HLINTFLAGS) --report $^
-- 
cgit v1.2.3