[arch-commits] Commit in tamarin-prover/trunk (PKGBUILD maude-3.1.patch)

[Felix Yan]

    Date: Monday, August 23, 2021 @ 20:53:59
  Author: felixonmars
Revision: 1004471

upgpkg: tamarin-prover 1.6.1-1: rebuild with tamarin-prover 1.6.1, tamarin-prover-sapic 1.6.1, tamarin-prover-term 1.6.1, tamarin-prover-theory 1.6.1, tamarin-prover-utils 1.6.1

Modified:
  tamarin-prover/trunk/PKGBUILD
Deleted:
  tamarin-prover/trunk/maude-3.1.patch

-----------------+
 PKGBUILD        |   17 ++++-------------
 maude-3.1.patch |   35 -----------------------------------
 2 files changed, 4 insertions(+), 48 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-08-23 20:51:43 UTC (rev 1004470)
+++ PKGBUILD	2021-08-23 20:53:59 UTC (rev 1004471)
@@ -2,8 +2,8 @@
 # Contributor: Arch Haskell Team <arch-haskell at haskell.org>
 
 pkgname=tamarin-prover
-pkgver=1.6.0
-pkgrel=258
+pkgver=1.6.1
+pkgrel=1
 pkgdesc="The Tamarin prover for security protocol analysis"
 url="https://tamarin-prover.github.io"
 license=("GPL")
@@ -17,21 +17,12 @@
          'haskell-tamarin-prover-theory' 'haskell-tamarin-prover-sapic')
 optdepends=('ocaml: for sapic support')
 makedepends=('ghc' 'ocaml>=4.11.0')
-source=("tamarin-prover-$pkgver.tar.gz::https://github.com/tamarin-prover/tamarin-prover/archive/$pkgver.tar.gz"
-        maude-3.1.patch
-        remove-monad-unlift.patch::https://github.com/tamarin-prover/tamarin-prover/pull/421.patch)
-sha512sums=('7f3569f740d63d715b92a8f073eaecb8b32efe59b910b246977d36bb9e873765440e72feb6e76c7cbafab0495b88cfc666bb1dd12f685627c60d5cbd97b2973e'
-            '1ef5e4c370a0c5f5541d50600604ba7adc566c2f5cf415cdb844842bb10b343edd00aa5aa654f8e55355c80f48a34382c87c3fba4adca0c77e726f407f3815c3'
-            '45121081ea373df5d5c1be5abc52850100343b2874e07b7fa68addb411477ee43fdbc5e9147b8bb2be118d0765a3fb9c5a7f53a902a44140cc13976cc2257e30')
+source=("https://github.com/tamarin-prover/tamarin-prover/archive/$pkgver/tamarin-prover-$pkgver.tar.gz")
+sha512sums=('dc6b91b1669055913a0aefc9a969812bf252185480fbf67588e7458289b1e1b64bf0729e9bee043513ecd5a57cd0c9477512e80861c6956c08b5e29d90211f62')
 
 prepare() {
     cd $pkgname-$pkgver
-    patch -p1 -i ../maude-3.1.patch
-    patch -p1 -i ../remove-monad-unlift.patch
     sed -i '/cp sapic/d' plugins/sapic/Makefile
-    # ocaml 4.12
-    sed -i 's/compare a/Stdlib.compare a/g' plugins/sapic/position.ml
-    sed -i 's/compare (rank a)/Stdlib.compare (rank a)/' plugins/sapic/var.ml
 }
 
 build() {

Deleted: maude-3.1.patch
===================================================================
--- maude-3.1.patch	2021-08-23 20:51:43 UTC (rev 1004470)
+++ maude-3.1.patch	2021-08-23 20:53:59 UTC (rev 1004471)
@@ -1,35 +0,0 @@
-diff --git a/lib/term/src/Term/Maude/Parser.hs b/lib/term/src/Term/Maude/Parser.hs
-index 187c35dc..0a1d3c35 100644
---- a/lib/term/src/Term/Maude/Parser.hs
-+++ b/lib/term/src/Term/Maude/Parser.hs
-@@ -224,7 +224,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
-     <* endOfLine <* string "rewrites: "
-     <* takeWhile1 isDigit <* endOfLine <* endOfInput
-   where
--    parseVariant = string "Variant #" *> takeWhile1 isDigit *> endOfLine *>
-+    parseVariant = string "Variant " *> optional (char '#') *> takeWhile1 isDigit *> endOfLine *>
-                    string "rewrites: " *> takeWhile1 isDigit *> endOfLine *>
-                    parseReprintedTerm *> manyTill parseEntry endOfLine
-     parseReprintedTerm = choice [ string "TOP" *> pure LSortMsg, parseSort ]
-@@ -235,7 +235,7 @@ parseVariantsReply msig reply = flip parseOnly reply $ do
- -- | @parseSubstitution l@ parses a single substitution returned by Maude.
- parseSubstitution :: MaudeSig -> Parser MSubst
- parseSubstitution msig = do
--    endOfLine *> string "Solution " *> takeWhile1 isDigit *> endOfLine
-+    endOfLine *> choice [string "Solution ", string "Unifier ", string "Matcher "] *> takeWhile1 isDigit *> endOfLine
-     choice [ string "empty substitution" *> endOfLine *> pure []
-            , many1 parseEntry]
-   where 
-diff --git a/src/Main/Environment.hs b/src/Main/Environment.hs
-index ecb15d2f..1b55c2e7 100644
---- a/src/Main/Environment.hs
-+++ b/src/Main/Environment.hs
-@@ -175,7 +175,7 @@ ensureMaude as = do
- 
- --  Maude versions prior to 2.7.1 are no longer supported,
- --  because the 'get variants' command is incompatible.
--    supportedVersions = ["2.7.1", "3.0"]
-+    supportedVersions = ["2.7.1", "3.0", "3.1"]
- 
-     errMsg' = errMsg $ "'" ++ maude ++ "' executable not found / does not work"
-