--- a/cvm.patch	Wed Feb 15 14:49:52 2012 +0100
+++ b/cvm.patch	Wed Feb 15 14:50:25 2012 +0100
@@ -1,20 +1,16 @@
-From e24e28e510a1fcc561b7d21d270b56b64dc3932b Mon Sep 17 00:00:00 2001
 From: Tomas Zeman <tzeman@volny.cz>
 Date: Sun, 28 Oct 2007 23:30:41 +0100
-Subject: [PATCH] cvm-0.82-1
- * added
+cvm
 
-diff --git a/source/custom/cvm/FrugalBuild b/source/custom/cvm/FrugalBuild
-new file mode 100644
-index 0000000..a9dee8b
---- /dev/null
-+++ b/source/custom/cvm/FrugalBuild
+diff -r 64aa58fae388 source/custom/cvm/FrugalBuild
+--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
++++ b/source/custom/cvm/FrugalBuild	Wed Feb 15 14:50:14 2012 +0100
 @@ -0,0 +1,26 @@
 +# Maintainer: Tomas Zeman <tzeman@volny.cz>
 +
 +pkgname=cvm
 +pkgver=0.90
-+pkgrel=1
++pkgrel=2
 +pkgdesc="Credential Validation Modules"
 +depends=('bglibs>=1.100')
 +url="http://untroubled.org/cvm/"

--- a/series	Wed Feb 15 14:49:52 2012 +0100
+++ b/series	Wed Feb 15 14:50:25 2012 +0100
@@ -7,7 +7,6 @@
 diet-daemontools.patch
 bglibs.patch
 cvm.patch
-upgrade-0.9-cvm.patch
 diet-ucspi-tcp.patch
 upgrade-0.9-diet-ucspi-tcp.patch
 diet-djbdns.patch

--- a/upgrade-0.9-cvm.patch	Wed Feb 15 14:49:52 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-cvm: Upgrade for Frugalware 0.9
-
-diff --git a/source/custom/cvm/FrugalBuild b/source/custom/cvm/FrugalBuild
-index a9dee8b..a642c78 100644
---- a/source/custom/cvm/FrugalBuild
-+++ b/source/custom/cvm/FrugalBuild
-@@ -2,7 +2,7 @@
- 
- pkgname=cvm
- pkgver=0.90
--pkgrel=1
-+pkgrel=2
- pkgdesc="Credential Validation Modules"
- depends=('bglibs>=1.100')
- url="http://untroubled.org/cvm/"