Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-iproute for openSUSE:Factory
checked in at 2024-07-22 17:16:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-iproute (Old)
and /work/SRC/openSUSE:Factory/.ghc-iproute.new.17339 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-iproute"
Mon Jul 22 17:16:29 2024 rev:10 rq:1188646 version:1.7.14
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-iproute/ghc-iproute.changes 2023-04-04
21:21:10.073450968 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-iproute.new.17339/ghc-iproute.changes
2024-07-22 17:17:21.763744896 +0200
@@ -1,0 +2,6 @@
+Fri Jul 12 07:23:15 UTC 2024 - Peter Simons <psim...@suse.com>
+
+- Update iproute to version 1.7.14.
+ Upstream does not provide a change log file.
+
+-------------------------------------------------------------------
Old:
----
iproute-1.7.12.tar.gz
New:
----
iproute-1.7.14.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-iproute.spec ++++++
--- /var/tmp/diff_new_pack.ZDNtLs/_old 2024-07-22 17:17:23.479813119 +0200
+++ /var/tmp/diff_new_pack.ZDNtLs/_new 2024-07-22 17:17:23.479813119 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-iproute
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%global pkgver %{pkg_name}-%{version}
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 1.7.12
+Version: 1.7.14
Release: 0
Summary: IP Routing Table
License: BSD-3-Clause
@@ -44,8 +44,6 @@
%if %{with tests}
BuildRequires: ghc-QuickCheck-devel
BuildRequires: ghc-QuickCheck-prof
-BuildRequires: ghc-doctest-devel
-BuildRequires: ghc-doctest-prof
BuildRequires: ghc-hspec-devel
BuildRequires: ghc-hspec-prof
BuildRequires: ghc-safe-devel
++++++ iproute-1.7.12.tar.gz -> iproute-1.7.14.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iproute-1.7.12/Data/IP/Addr.hs
new/iproute-1.7.14/Data/IP/Addr.hs
--- old/iproute-1.7.12/Data/IP/Addr.hs 2001-09-09 03:46:40.000000000 +0200
+++ new/iproute-1.7.14/Data/IP/Addr.hs 2001-09-09 03:46:40.000000000 +0200
@@ -500,17 +500,30 @@
in if n' <= 255 then f n' else Nothing
ip4 :: Parser IPv4
-ip4 = skipSpaces >> toIPv4 <$> ip4'
+ip4 = skipSpaces >> toIPv4 <$> ip4' True
-ip4' :: Parser [Int]
-ip4' = do
- as <- octet `sepBy1` char '.'
- when (length as /= 4) (fail "IPv4 address")
+ip4' :: Bool -> Parser [Int]
+ip4' checkTermination = do
+ a0 <- octet
+ _ <- char '.'
+ a1 <- octet
+ _ <- char '.'
+ a2 <- octet
+ _ <- char '.'
+ a3 <- octet
+ let as = [a0, a1, a2, a3]
+ when checkTermination $
+ skipSpaces >> termination
return as
skipSpaces :: Parser ()
skipSpaces = void $ many (char ' ')
+termination :: Parser ()
+termination = P $ \str -> case str of
+ [] -> (Just (), "")
+ _ -> (Nothing, str)
+
----------------------------------------------------------------
--
-- IPv6 Parser (RFC 4291)
@@ -562,16 +575,16 @@
ip4Embedded :: Parser [Int]
ip4Embedded = try (do colon2
bs <- beforeEmbedded
- embedded <- ip4'
+ embedded <- ip4' True
format [] (bs ++ ip4ToIp6 embedded))
-- matches 2001:db8::192.0.2.1
<|> try (do bs1 <- manyTill (try $ hex <* char ':') (char ':')
bs2 <- option [] beforeEmbedded
- embedded <- ip4'
+ embedded <- ip4' True
format bs1 (bs2 ++ ip4ToIp6 embedded))
-- matches 2001:db8:11e:c00:aa:bb:192.0.2.1
<|> try (do bs <- beforeEmbedded
- embedded <- ip4'
+ embedded <- ip4' True
let rs = bs ++ ip4ToIp6 embedded
check rs
return rs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iproute-1.7.12/Data/IP/Range.hs
new/iproute-1.7.14/Data/IP/Range.hs
--- old/iproute-1.7.12/Data/IP/Range.hs 2001-09-09 03:46:40.000000000 +0200
+++ new/iproute-1.7.14/Data/IP/Range.hs 2001-09-09 03:46:40.000000000 +0200
@@ -118,7 +118,8 @@
ip4range :: Parser (AddrRange IPv4)
ip4range = do
- ip <- ip4
+ skipSpaces
+ ip <- toIPv4 <$> ip4' False
len <- maskLen 32
let msk = maskIPv4 len
adr = ip `maskedIPv4` msk
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iproute-1.7.12/Data/IP/RouteTable/Internal.hs
new/iproute-1.7.14/Data/IP/RouteTable/Internal.hs
--- old/iproute-1.7.12/Data/IP/RouteTable/Internal.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/iproute-1.7.14/Data/IP/RouteTable/Internal.hs 2001-09-09
03:46:40.000000000 +0200
@@ -27,6 +27,9 @@
import GHC.Generics (Generic, Generic1)
import Prelude hiding (lookup)
+-- $setup
+-- >>> :set -XOverloadedStrings
+
----------------------------------------------------------------
{-|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iproute-1.7.12/iproute.cabal
new/iproute-1.7.14/iproute.cabal
--- old/iproute-1.7.12/iproute.cabal 2001-09-09 03:46:40.000000000 +0200
+++ new/iproute-1.7.14/iproute.cabal 2001-09-09 03:46:40.000000000 +0200
@@ -1,85 +1,83 @@
-Name: iproute
-Version: 1.7.12
-Author: Kazu Yamamoto <k...@iij.ad.jp>
-Maintainer: Kazu Yamamoto <k...@iij.ad.jp>
-License: BSD3
-License-File: LICENSE
-Homepage: http://www.mew.org/~kazu/proj/iproute/
-Synopsis: IP Routing Table
-Description: IP Routing Table is a tree of IP ranges
- to search one of them on the longest
- match base. It is a kind of TRIE with one
- way branching removed. Both IPv4 and IPv6
- are supported.
-Category: Algorithms, Network
-Cabal-Version: >= 1.10
-Build-Type: Simple
-Tested-With: GHC == 7.8.4
- , GHC == 7.10.3
- , GHC == 8.0.2
- , GHC == 8.2.2
- , GHC == 8.4.4
- , GHC == 8.6.5
- , GHC == 8.8.2
-
-Library
- Default-Language: Haskell2010
- GHC-Options: -Wall
- Exposed-Modules: Data.IP
- Data.IP.Builder
- Data.IP.Internal
- Data.IP.RouteTable
- Data.IP.RouteTable.Internal
- Other-Modules: Data.IP.Addr
- Data.IP.Mask
- Data.IP.Op
- Data.IP.Range
- Build-Depends: base >= 4.9 && < 5
- , appar
- , byteorder
- , bytestring
- , containers
- , network
- if impl(ghc < 8.0)
- Build-Depends: semigroups >= 0.17
- if impl(ghc >= 8)
- Default-Extensions: Strict StrictData
-
-Test-Suite doctest
- Type: exitcode-stdio-1.0
- Default-Language: Haskell2010
- HS-Source-Dirs: test
- Ghc-Options: -threaded -Wall
- Main-Is: doctests.hs
- Build-Depends: base >= 4.6 && < 5
- , doctest >= 0.9.3
- , appar
- , byteorder
- , bytestring
- , network
-
-Test-Suite spec
- Type: exitcode-stdio-1.0
- Default-Language: Haskell2010
- Hs-Source-Dirs: test
- Ghc-Options: -Wall
- Main-Is: Spec.hs
- Other-Modules: RouteTableSpec
- , BuilderSpec
- , IPSpec
- Build-Depends: base >= 4.6 && < 5
- , hspec
- , QuickCheck
- , appar
- , byteorder
- , bytestring
- , containers
- , network
- , safe
- , iproute
- if impl(ghc < 8.0)
- Build-Depends: semigroups >= 0.17
-
-Source-Repository head
- Type: git
- Location: git://github.com/kazu-yamamoto/iproute.git
+cabal-version: >=1.10
+name: iproute
+version: 1.7.14
+license: BSD3
+license-file: LICENSE
+maintainer: Kazu Yamamoto <k...@iij.ad.jp>
+author: Kazu Yamamoto <k...@iij.ad.jp>
+tested-with:
+ ghc ==7.8.4 ghc ==7.10.3 ghc ==8.0.2 ghc ==8.2.2 ghc ==8.4.4
+ ghc ==8.6.5 ghc ==8.8.2
+
+homepage: http://www.mew.org/~kazu/proj/iproute/
+synopsis: IP Routing Table
+description:
+ IP Routing Table is a tree of IP ranges
+ to search one of them on the longest
+ match base. It is a kind of TRIE with one
+ way branching removed. Both IPv4 and IPv6
+ are supported.
+
+category: Algorithms, Network
+build-type: Simple
+
+source-repository head
+ type: git
+ location: git://github.com/kazu-yamamoto/iproute.git
+
+library
+ exposed-modules:
+ Data.IP
+ Data.IP.Builder
+ Data.IP.Internal
+ Data.IP.RouteTable
+ Data.IP.RouteTable.Internal
+
+ other-modules:
+ Data.IP.Addr
+ Data.IP.Mask
+ Data.IP.Op
+ Data.IP.Range
+
+ default-language: Haskell2010
+ ghc-options: -Wall
+ build-depends:
+ base >=4.9 && <5,
+ appar,
+ byteorder,
+ bytestring,
+ containers,
+ network
+
+ if impl(ghc <8.0)
+ build-depends: semigroups >=0.17
+
+ if impl(ghc >=8)
+ default-extensions: Strict StrictData
+
+test-suite spec
+ type: exitcode-stdio-1.0
+ main-is: Spec.hs
+ build-tool-depends: hspec-discover:hspec-discover
+ hs-source-dirs: test
+ other-modules:
+ RouteTableSpec
+ BuilderSpec
+ IPSpec
+
+ default-language: Haskell2010
+ ghc-options: -Wall
+ build-depends:
+ base >=4.6 && <5,
+ hspec,
+ QuickCheck,
+ appar,
+ byteorder,
+ bytestring,
+ containers,
+ network,
+ safe,
+ iproute
+
+ if impl(ghc <8.0)
+ build-depends: semigroups >=0.17
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iproute-1.7.12/test/IPSpec.hs
new/iproute-1.7.14/test/IPSpec.hs
--- old/iproute-1.7.12/test/IPSpec.hs 2001-09-09 03:46:40.000000000 +0200
+++ new/iproute-1.7.14/test/IPSpec.hs 2001-09-09 03:46:40.000000000 +0200
@@ -23,7 +23,16 @@
data InvalidIPv4Str = Iv4 String deriving (Show)
instance Arbitrary InvalidIPv4Str where
- arbitrary = arbitraryIIPv4Str arbitrary 32
+ arbitrary =
+ frequency [(8, arbitraryIIPv4Str arbitrary 32)
+ -- an IPv4 address should not end with a trailing `.`
+ ,(1, Iv4 . (++ ".") . show <$> genIPv4)
+ -- an IPv4 address with mask should not include a white
space
+ ,(1, (\ip (NonNegative len) -> Iv4 (show ip ++ " /" ++ show
(len :: Integer))) <$> genIPv4 <*> arbitrary)
+ ]
+ where
+ genIPv4 :: Gen IPv4
+ genIPv4 = arbitrary
arbitraryIIPv4Str :: Gen IPv4 -> Int -> Gen InvalidIPv4Str
arbitraryIIPv4Str adrGen msklen = toIv4 <$> adrGen <*> lenGen
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iproute-1.7.12/test/doctests.hs
new/iproute-1.7.14/test/doctests.hs
--- old/iproute-1.7.12/test/doctests.hs 2001-09-09 03:46:40.000000000 +0200
+++ new/iproute-1.7.14/test/doctests.hs 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-module Main where
-
-import Test.DocTest
-
-main :: IO ()
-main = doctest [ "-XOverloadedStrings"
- , "-package=appar"
- , "-package=byteorder"
- , "-package=network"
- , "Data/IP.hs"
- , "Data/IP/RouteTable.hs"]
