Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-pandoc-server for
openSUSE:Factory checked in at 2023-12-21 23:38:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-pandoc-server (Old)
and /work/SRC/openSUSE:Factory/.ghc-pandoc-server.new.1840 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-pandoc-server"
Thu Dec 21 23:38:17 2023 rev:5 rq:1134297 version:0.1.0.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-pandoc-server/ghc-pandoc-server.changes
2023-09-04 22:54:37.437976944 +0200
+++
/work/SRC/openSUSE:Factory/.ghc-pandoc-server.new.1840/ghc-pandoc-server.changes
2023-12-21 23:38:28.254225840 +0100
@@ -1,0 +2,6 @@
+Tue Dec 12 18:51:58 UTC 2023 - Peter Simons <[email protected]>
+
+- Update pandoc-server to version 0.1.0.4.
+ Upstream does not provide a change log file.
+
+-------------------------------------------------------------------
Old:
----
pandoc-server-0.1.0.3.tar.gz
New:
----
pandoc-server-0.1.0.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-pandoc-server.spec ++++++
--- /var/tmp/diff_new_pack.8w09Jv/_old 2023-12-21 23:38:29.286263476 +0100
+++ /var/tmp/diff_new_pack.8w09Jv/_new 2023-12-21 23:38:29.286263476 +0100
@@ -19,7 +19,7 @@
%global pkg_name pandoc-server
%global pkgver %{pkg_name}-%{version}
Name: ghc-%{pkg_name}
-Version: 0.1.0.3
+Version: 0.1.0.4
Release: 0
Summary: Pandoc document conversion as an HTTP servant-server
License: GPL-2.0-or-later
@@ -30,8 +30,8 @@
BuildRequires: ghc-aeson-prof
BuildRequires: ghc-base-devel
BuildRequires: ghc-base-prof
-BuildRequires: ghc-base64-devel
-BuildRequires: ghc-base64-prof
+BuildRequires: ghc-base64-bytestring-devel
+BuildRequires: ghc-base64-bytestring-prof
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-bytestring-prof
BuildRequires: ghc-containers-devel
++++++ pandoc-server-0.1.0.3.tar.gz -> pandoc-server-0.1.0.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pandoc-server-0.1.0.3/pandoc-server.cabal
new/pandoc-server-0.1.0.4/pandoc-server.cabal
--- old/pandoc-server-0.1.0.3/pandoc-server.cabal 2001-09-09
03:46:40.000000000 +0200
+++ new/pandoc-server-0.1.0.4/pandoc-server.cabal 2001-09-09
03:46:40.000000000 +0200
@@ -1,6 +1,6 @@
cabal-version: 2.4
name: pandoc-server
-version: 0.1.0.3
+version: 0.1.0.4
build-type: Simple
license: GPL-2.0-or-later
license-file: COPYING.md
@@ -54,7 +54,7 @@
containers >= 0.6.0.1 && < 0.7,
aeson >= 2.0 && < 2.3,
bytestring >= 0.9 && < 0.13,
- base64 >= 0.4 && < 0.5,
+ base64-bytestring >= 0.1 && < 1.3,
doctemplates >= 0.11 && < 0.12,
data-default >= 0.4 && < 0.8,
text >= 1.1.1.0 && < 2.2,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/pandoc-server-0.1.0.3/src/Text/Pandoc/Server.hs
new/pandoc-server-0.1.0.4/src/Text/Pandoc/Server.hs
--- old/pandoc-server-0.1.0.3/src/Text/Pandoc/Server.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/pandoc-server-0.1.0.4/src/Text/Pandoc/Server.hs 2001-09-09
03:46:40.000000000 +0200
@@ -29,7 +29,7 @@
import Data.Maybe (fromMaybe)
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as BL
-import Data.ByteString.Base64 (decodeBase64, encodeBase64)
+import qualified Data.ByteString.Base64 as Base64 (decodeLenient, encode)
import Data.Default
import Control.Monad (when, unless, foldM)
import qualified Data.Set as Set
@@ -111,15 +111,11 @@
deriving (Show, Eq)
instance ToJSON Blob where
- toJSON (Blob bs) = toJSON (encodeBase64 $ BL.toStrict bs)
+ toJSON (Blob bs) = toJSON (UTF8.toText . Base64.encode $ BL.toStrict bs)
instance FromJSON Blob where
- parseJSON = withText "Blob" $ \t -> do
- let inp = UTF8.fromText t
- case decodeBase64 inp of
- Right bs -> return $ Blob $ BL.fromStrict bs
- Left _ -> -- treat as regular text
- return $ Blob $ BL.fromStrict inp
+ parseJSON = withText "Blob" $
+ pure . Blob . BL.fromStrict . Base64.decodeLenient . UTF8.fromText
-- This is the data to be supplied by the JSON payload
-- of requests. Maybe values may be omitted and will be
@@ -236,7 +232,8 @@
-- handleErr =<< liftIO (runIO (convert' params))
-- will allow the IO operations.
convertText params = handleErr $
- runPure (convert' return (return . encodeBase64 . BL.toStrict) params)
+ runPure (convert' return (return . UTF8.toText .
+ Base64.encode . BL.toStrict) params)
convertBytes params = handleErr $
runPure (convert' (return . UTF8.fromText) (return . BL.toStrict) params)
@@ -245,7 +242,7 @@
runPure
(convert'
(\t -> Succeeded t False . map toMessage <$> getLog)
- (\bs -> Succeeded (encodeBase64 (BL.toStrict bs)) True
+ (\bs -> Succeeded (UTF8.toText $ Base64.encode (BL.toStrict bs)) True
. map toMessage <$> getLog)
params)
@@ -341,11 +338,9 @@
let reader = case readerSpec of
TextReader r -> r readeropts
- ByteStringReader r -> \t -> do
- let eitherbs = decodeBase64 $ UTF8.fromText t
- case eitherbs of
- Left errt -> throwError $ PandocSomeError errt
- Right bs -> r readeropts $ BL.fromStrict bs
+ ByteStringReader r ->
+ r readeropts . BL.fromStrict . Base64.decodeLenient
+ . UTF8.fromText
let writer d@(Pandoc meta _) = do
case lookupMetaString "lang" meta of
