Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ghc-wai-logger for openSUSE:Factory
checked in at 2024-08-01 22:04:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-wai-logger (Old)
and /work/SRC/openSUSE:Factory/.ghc-wai-logger.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-wai-logger"
Thu Aug 1 22:04:57 2024 rev:6 rq:1190827 version:2.4.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-wai-logger/ghc-wai-logger.changes
2023-04-04 21:25:02.810768891 +0200
+++ /work/SRC/openSUSE:Factory/.ghc-wai-logger.new.7232/ghc-wai-logger.changes
2024-08-01 22:05:32.051200577 +0200
@@ -1,0 +2,6 @@
+Wed Jul 24 21:57:36 UTC 2024 - Peter Simons <psim...@suse.com>
+
+- Update wai-logger to version 2.4.1.
+ Upstream does not provide a change log file.
+
+-------------------------------------------------------------------
Old:
----
wai-logger-2.4.0.tar.gz
New:
----
wai-logger-2.4.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-wai-logger.spec ++++++
--- /var/tmp/diff_new_pack.azIRnb/_old 2024-08-01 22:05:32.675226314 +0200
+++ /var/tmp/diff_new_pack.azIRnb/_new 2024-08-01 22:05:32.675226314 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ghc-wai-logger
#
-# 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
@@ -18,24 +18,20 @@
%global pkg_name wai-logger
%global pkgver %{pkg_name}-%{version}
-%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 2.4.0
+Version: 2.4.1
Release: 0
Summary: A logging system for WAI
License: MIT
URL: https://hackage.haskell.org/package/%{pkg_name}
Source0:
https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
-BuildRequires: ghc-Cabal-prof
BuildRequires: ghc-base-devel
BuildRequires: ghc-base-prof
BuildRequires: ghc-byteorder-devel
BuildRequires: ghc-byteorder-prof
BuildRequires: ghc-bytestring-devel
BuildRequires: ghc-bytestring-prof
-BuildRequires: ghc-cabal-doctest-devel
-BuildRequires: ghc-cabal-doctest-prof
BuildRequires: ghc-fast-logger-devel
BuildRequires: ghc-fast-logger-prof
BuildRequires: ghc-http-types-devel
@@ -46,13 +42,9 @@
BuildRequires: ghc-wai-devel
BuildRequires: ghc-wai-prof
ExcludeArch: %{ix86}
-%if %{with tests}
-BuildRequires: ghc-doctest-devel
-BuildRequires: ghc-doctest-prof
-%endif
%description
-A logging system for WAI.
+A logging system for WAI(Web Application Interface).
%package devel
Summary: Haskell %{pkg_name} library development files
@@ -89,9 +81,6 @@
%install
%ghc_lib_install
-%check
-%cabal_test
-
%post devel
%ghc_pkg_recache
++++++ wai-logger-2.4.0.tar.gz -> wai-logger-2.4.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wai-logger-2.4.0/Network/Wai/Logger/Apache.hs
new/wai-logger-2.4.1/Network/Wai/Logger/Apache.hs
--- old/wai-logger-2.4.0/Network/Wai/Logger/Apache.hs 2001-09-09
03:46:40.000000000 +0200
+++ new/wai-logger-2.4.1/Network/Wai/Logger/Apache.hs 2001-09-09
03:46:40.000000000 +0200
@@ -23,6 +23,7 @@
import Data.Monoid (mappend)
#endif
import Network.HTTP.Types (Status, statusCode)
+import Network.HTTP.Types.Header (HeaderName)
import Network.Wai (Request(..))
import Network.Wai.Logger.IP
import System.Log.FastLogger
@@ -37,6 +38,8 @@
FromSocket
-- | From X-Real-IP: or X-Forwarded-For: in the HTTP header.
| FromHeader
+ -- | From a custom HTTP header, useful in proxied environment.
+ | FromHeaderCustom [HeaderName]
-- | From the peer address if header is not found.
| FromFallback
@@ -107,9 +110,10 @@
-- getSourceIP = getSourceIP fromString fromByteString
getSourceIP :: IPAddrSource -> Request -> ByteString
-getSourceIP FromSocket = getSourceFromSocket
-getSourceIP FromHeader = getSourceFromHeader
+getSourceIP FromSocket = getSourceFromSocket
+getSourceIP FromHeader = getSourceFromHeader
getSourceIP FromFallback = getSourceFromFallback
+getSourceIP (FromHeaderCustom hs) = fromMaybe "-" . getSourceFromHeaderCustom
hs
-- |
-- >>> getSourceFromSocket defaultRequest
@@ -151,8 +155,14 @@
-- >>> getSource defaultRequest
-- Nothing
getSource :: Request -> Maybe ByteString
-getSource req = addr
+getSource = getSourceFromHeaders ["x-real-ip", "x-forwarded-for"]
+
+getSourceFromHeaders :: [HeaderName] -> Request -> Maybe ByteString
+getSourceFromHeaders headerNames req = addr
where
- maddr = find (\x -> fst x `elem` ["x-real-ip", "x-forwarded-for"]) hdrs
+ maddr = find (\(name,_) -> name `elem` headerNames) hdrs
addr = fmap snd maddr
hdrs = requestHeaders req
+
+getSourceFromHeaderCustom :: [HeaderName] -> Request -> Maybe ByteString
+getSourceFromHeaderCustom hs = getSourceFromHeaders hs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wai-logger-2.4.0/test/doctests.hs
new/wai-logger-2.4.1/test/doctests.hs
--- old/wai-logger-2.4.0/test/doctests.hs 2001-09-09 03:46:40.000000000
+0200
+++ new/wai-logger-2.4.1/test/doctests.hs 1970-01-01 01:00:00.000000000
+0100
@@ -1,12 +0,0 @@
-module Main where
-
-import Build_doctests (flags, pkgs, module_sources)
-import Data.Foldable (traverse_)
-import Test.DocTest (doctest)
-
-main :: IO ()
-main = do
- traverse_ putStrLn args
- doctest args
- where
- args = flags ++ pkgs ++ module_sources
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/wai-logger-2.4.0/wai-logger.cabal
new/wai-logger-2.4.1/wai-logger.cabal
--- old/wai-logger-2.4.0/wai-logger.cabal 2001-09-09 03:46:40.000000000
+0200
+++ new/wai-logger-2.4.1/wai-logger.cabal 2001-09-09 03:46:40.000000000
+0200
@@ -1,48 +1,39 @@
-Name: wai-logger
-Version: 2.4.0
-Author: Kazu Yamamoto <k...@iij.ad.jp>
-Maintainer: Kazu Yamamoto <k...@iij.ad.jp>
-License: BSD3
-License-File: LICENSE
-Synopsis: A logging system for WAI
-Description: A logging system for WAI
-Category: Web, Yesod
-Cabal-Version: >= 1.10
-Build-Type: Custom
-Tested-With: GHC ==7.8.4 || ==7.10.3 || ==8.0.2 || ==8.2.2 ||
==8.4.4 || ==8.6.3
+cabal-version: >=1.10
+name: wai-logger
+version: 2.4.1
+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 || ==7.10.3 || ==8.0.2 || ==8.2.2 || ==8.4.4 || ==8.6.3
-Custom-Setup
- Setup-Depends: base, Cabal, cabal-doctest >=1.0.6 && <1.1
+synopsis: A logging system for WAI
+description: A logging system for WAI(Web Application Interface)
+category: Web, Yesod
+build-type: Simple
-Library
- Default-Language: Haskell2010
- GHC-Options: -Wall
- Exposed-Modules: Network.Wai.Logger
- Other-Modules: Network.Wai.Logger.Apache
- Network.Wai.Logger.IP
- Network.Wai.Logger.IORef
- Build-Depends: base >= 4 && < 5
- , byteorder
- , bytestring
- , fast-logger >= 3
- , http-types
- , network
- , wai >= 2.0.0
- if impl(ghc >= 8)
- Default-Extensions: Strict StrictData
+source-repository head
+ type: git
+ location: https://github.com/kazu-yamamoto/logger.git
-Test-Suite doctests
- Type: exitcode-stdio-1.0
- Default-Language: Haskell2010
- HS-Source-Dirs: test
- Ghc-Options: -Wall
- Main-Is: doctests.hs
- Build-Depends: base
- , wai-logger
- , doctest >= 0.10.1
- if impl(ghc >= 8)
- Default-Extensions: Strict StrictData
+library
+ exposed-modules: Network.Wai.Logger
+ other-modules:
+ Network.Wai.Logger.Apache
+ Network.Wai.Logger.IP
+ Network.Wai.Logger.IORef
-Source-Repository head
- Type: git
- Location: git://github.com/kazu-yamamoto/logger.git
+ default-language: Haskell2010
+ ghc-options: -Wall
+ build-depends:
+ base >=4 && <5,
+ byteorder,
+ bytestring,
+ fast-logger >=3,
+ http-types,
+ network,
+ wai >=2.0.0
+
+ if impl(ghc >=8)
+ default-extensions: Strict StrictData
