December 2015 - openSUSE Commits - openSUSE Mailing Lists

commit libstatgrab for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package libstatgrab for openSUSE:Factory checked in at 2015-12-01 09:19:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstatgrab (Old) and /work/SRC/openSUSE:Factory/.libstatgrab.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstatgrab" Changes: -------- --- /work/SRC/openSUSE:Factory/libstatgrab/libstatgrab.changes 2012-02-27 18:35:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libstatgrab.new/libstatgrab.changes 2015-12-01 09:19:40.000000000 +0100 @@ -1,0 +2,18 @@ +Fri Nov 27 12:04:48 UTC 2015 - nemysis(a)openSUSE.org + +- Update to 0.91, please see + + /usr/share/doc/packages/libstatgrab/NEWS + +- Change soname to 10 and change baselibs.conf +- Remove obsolete patches libstatgrab-os-linux.diff, + libstatgrab-link-ncurses.diff, libstatgrab-fix-include-ncurses.patch, + changed by Upstream +- Add libstatgrab-rpmlintrc, for not fixable issues +- Modernize spec +- Add BuildRequires for fdupes and use %fdupes macro to reduce size + of the package +- Reorder %configure default options +- Use default %make_install + +------------------------------------------------------------------- Old: ---- libstatgrab-0.17.tar.gz libstatgrab-fix-include-ncurses.patch libstatgrab-link-ncurses.diff libstatgrab-os-linux.diff New: ---- libstatgrab-0.91.tar.gz libstatgrab-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstatgrab.spec ++++++ --- /var/tmp/diff_new_pack.T4lG4g/_old 2015-12-01 09:19:41.000000000 +0100 +++ /var/tmp/diff_new_pack.T4lG4g/_new 2015-12-01 09:19:41.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libstatgrab # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,10 @@ # -%define soname 6 +%define soname 10 Name: libstatgrab -Version: 0.17 +Version: 0.91 Release: 0 Summary: Interface to System Statistics License: LGPL-2.1+ @@ -29,10 +29,7 @@ Source1: statgrab.desktop Source2: saidar.desktop Source3: baselibs.conf -Patch1: libstatgrab-os-linux.diff -Patch2: libstatgrab-link-ncurses.diff -Patch3: libstatgrab-fix-include-ncurses.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source4: %{name}-rpmlintrc BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc @@ -40,8 +37,12 @@ BuildRequires: libtool BuildRequires: make BuildRequires: ncurses-devel -BuildRequires: update-desktop-files BuildRequires: pkgconfig +%if 0%{?suse_version} +BuildRequires: fdupes +BuildRequires: update-desktop-files +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The libstatgrab library provides an easy-to-use interface for accessing system @@ -59,22 +60,22 @@ Group: Development/Libraries/C and C++ %description -n %{name}%{soname} -Library for package %{name}. +Library for package libstatgrab. %package devel Summary: Development Environment for %{name} License: LGPL-2.1+ Group: Development/Libraries/C and C++ -Requires: %{name}%{soname} = %{version}-%{release} +Requires: %{name}%{soname} = %{version} %description devel -Development environment for %{name} (headers, library links, static library). +Development environment for libstatgrab (headers, library links, static library). %package -n statgrab Summary: Portable System Statistics Tools License: GPL-2.0+ Group: System/Monitoring -Requires: %{name}%{soname} = %{version}-%{release} +Requires: %{name}%{soname} = %{version} %description -n statgrab This package includes a couple of useful tools that use the %{name} library. @@ -88,7 +89,7 @@ Summary: Portable System Statistics Tools License: GPL-2.0+ Group: System/Monitoring -Requires: %{name}%{soname} = %{version}-%{release} +Requires: %{name}%{soname} = %{version} %description -n saidar This package includes a couple of useful tools that use the %{name} library. @@ -97,43 +98,43 @@ that can't easily make C function calls. %prep -%setup -q -n "libstatgrab-%{version}" -%patch1 -%patch2 -%patch3 +%setup -q %build -autoreconf -fiv +autoreconf -fi %configure \ - --disable-static \ - --with-ncurses \ - --disable-setuid-binaries \ - --disable-setgid-binaries \ - --disable-examples \ + --docdir=/usr/share/doc/packages/%{name} \ --enable-statgrab \ --enable-saidar \ - --enable-manpages + --disable-examples \ + --disable-setuid-binaries \ + --disable-setgid-binaries \ + --disable-static \ + --with-curses-prefix=/usr/include/ + make %{?_smp_mflags} %install -%makeinstall -%{__rm} %{buildroot}%{_libdir}/libstatgrab.la +%make_install -%__install -d "%{buildroot}%{_datadir}/applications" -%__install -m 0644 "%{SOURCE1}" "%{buildroot}%{_datadir}/applications/" -%__install -m 0644 "%{SOURCE2}" "%{buildroot}%{_datadir}/applications/" -%suse_update_desktop_file -r saidar System Monitor -%suse_update_desktop_file -r statgrab System Monitor - -# prepare doc files -%__install -d "%{buildroot}%{_docdir}/%{name}" -for f in AUTHORS ChangeLog COPYING* README NEWS PLATFORMS; do - %__install -m0644 "$f" "%{buildroot}%{_docdir}/%{name}/" -done +# Remove not needed static libraries +rm -f %{buildroot}%{_libdir}/%{name}.la -%__rm -rf examples/Makefile* examples/.deps -%__mv examples "%{buildroot}%{_docdir}/%{name}/" +# install Desktop file +mkdir -p %{buildroot}%{_datadir}/applications +install -Dm 0644 %{S:1} %{buildroot}%{_datadir}/applications/ +install -Dm 0644 %{S:2} %{buildroot}%{_datadir}/applications/ + +%if 0%{?suse_version} + %suse_update_desktop_file -r saidar System Monitor + %suse_update_desktop_file -r statgrab System Monitor + %fdupes -s %{buildroot}%{_prefix} +%endif + +# install Examples +rm -fr examples/Makefile* +cp -a examples %{buildroot}%{_docdir}/%{name}/examples/ %post -n %{name}%{soname} -p /sbin/ldconfig @@ -141,17 +142,17 @@ %files -n %{name}%{soname} %defattr(-,root,root) -%{_libdir}/libstatgrab.so.* +%{_libdir}/%{name}.so.* %files devel %defattr(-,root,root) %doc %{_docdir}/%{name} %{_includedir}/statgrab.h -%{_includedir}/statgrab_deprecated.h -%{_libdir}/pkgconfig/libstatgrab.pc -%{_libdir}/libstatgrab.so -%doc %{_mandir}/man3/sg_*.3* -%doc %{_mandir}/man3/statgrab.3* +%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/%{name}.so +%{_mandir}/man3/sg_*.3%{ext_man} +%{_mandir}/man3/statgrab.3%{ext_man} +%{_mandir}/man3/%{name}.3%{ext_man} %files -n statgrab %defattr(-,root,root) @@ -159,21 +160,16 @@ %{_bindir}/statgrab %{_bindir}/statgrab-make-mrtg-config %{_bindir}/statgrab-make-mrtg-index -%doc %{_mandir}/man1/statgrab.1* -%doc %{_mandir}/man1/statgrab-make-mrtg-config.1* -%doc %{_mandir}/man1/statgrab-make-mrtg-index.1* +%{_mandir}/man1/statgrab.1%{ext_man} +%{_mandir}/man1/statgrab-make-mrtg-config.1%{ext_man} +%{_mandir}/man1/statgrab-make-mrtg-index.1%{ext_man} %{_datadir}/applications/statgrab.desktop %files -n saidar %defattr(-,root,root) %doc COPYING %{_bindir}/saidar -%doc %{_mandir}/man1/saidar.1* +%{_mandir}/man1/saidar.1%{ext_man} %{_datadir}/applications/saidar.desktop -# Local Variables: -# mode: rpm-spec -# tab-width: 3 -# End: - %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.T4lG4g/_old 2015-12-01 09:19:41.000000000 +0100 +++ /var/tmp/diff_new_pack.T4lG4g/_new 2015-12-01 09:19:41.000000000 +0100 @@ -1,4 +1,4 @@ -libstatgrab6 +libstatgrab10 libstatgrab-devel requires -libstatgrab-<targettype> requires "libstatgrab6-<targettype> = <version>" ++++++ libstatgrab-0.17.tar.gz -> libstatgrab-0.91.tar.gz ++++++ ++++ 165781 lines of diff (skipped) ++++++ libstatgrab-rpmlintrc ++++++ # This is not fixable look yet addFilter("libstatgrab.* *.*") #addFilter("shared-lib-calls-exit") #addFilter("missing-call-to-setgroups-before-setuid") #addFilter("doc-file-dependency") #addFilter("arch-dependent-file-in-usr-share") #addFilter("incoherent-version-dependency-on")

1 0

commit php5-pear-Net_SMTP for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package php5-pear-Net_SMTP for openSUSE:Factory checked in at 2015-12-01 09:19:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5-pear-Net_SMTP (Old) and /work/SRC/openSUSE:Factory/.php5-pear-Net_SMTP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "php5-pear-Net_SMTP" Changes: -------- --- /work/SRC/openSUSE:Factory/php5-pear-Net_SMTP/php5-pear-Net_SMTP.changes 2013-11-24 18:11:39.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5-pear-Net_SMTP.new/php5-pear-Net_SMTP.changes 2015-12-01 09:19:39.000000000 +0100 @@ -1,0 +2,11 @@ +Tue Sep 15 13:21:08 UTC 2015 - aj(a)ajaissle.de + +- New upstream release 1.7.1 + * Fix a syntax error in the quotedata() test. + * Fix an undefined value resulting from a bad merge. (#23) + * Add TLSv1.1 and TLSv1.2 support for STARTTLS connections. (#22) + +- Changes 1.7.0: + * This version drops PHP 4 support in favor of more modern PHP language constructs. + +------------------------------------------------------------------- Old: ---- Net_SMTP-1.6.2.tgz New: ---- Net_SMTP-1.7.1.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5-pear-Net_SMTP.spec ++++++ --- /var/tmp/diff_new_pack.HWvgz7/_old 2015-12-01 09:19:40.000000000 +0100 +++ /var/tmp/diff_new_pack.HWvgz7/_new 2015-12-01 09:19:40.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5-pear-Net_SMTP # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,42 +18,40 @@ Name: php5-pear-Net_SMTP %define pear_name Net_SMTP -%define pear_sname net_smtp Summary: An implementation of the SMTP protocol License: PHP-3.01 Group: Productivity/Networking/Web/Servers -Version: 1.6.2 +Version: 1.7.1 Release: 0 BuildArch: noarch Url: http://pear.php.net/package/%{pear_name} Source: %{pear_name}-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?sles_version} == 11 -BuildRequires: php53 -BuildRequires: php53-devel -%else -BuildRequires: php >= 4.0.5 -%if 0%{?sles_version} == 10 -BuildRequires: php-macros -%else -BuildRequires: php-devel -%endif -%endif +BuildRequires: php >= 5.4.0 +BuildRequires: php-devel >= 5.4.0 BuildRequires: php-pear -Requires: php >= 4.0.5 +Requires: php >= 5.4.0 Requires: php-pear Requires: php-pear-Net_Socket >= 1.0.7 Suggests: php-pear-Auth_SASL -# -Provides: pear-%{pear_name} -Provides: php-pear-%{pear_name} -# Fix for renaming (package convention) + +Provides: php-pear-%{pear_name} = %{version} +Provides: php-pear(%{pear_name}) = %{version} +Obsoletes: php-pear-%{pear_name} < %{version} +Obsoletes: php-pear(%{pear_name}) < %{version} + +## Drop these relics in December 2015 +%define pear_sname net_smtp +Provides: pear-%{pear_name} = %{version} Provides: pear-%{pear_sname} = %{version} Provides: php-pear-%{pear_sname} = %{version} Provides: php5-pear-%{pear_sname} = %{version} + +Obsoletes: pear-%{pear_name} < %{version} Obsoletes: pear-%{pear_sname} < %{version} Obsoletes: php-pear-%{pear_sname} < %{version} Obsoletes: php5-pear-%{pear_sname} < %{version} +## End of "Drop this" section %description Provides an implementation of the SMTP protocol using PEAR's Net_Socket class. ++++++ Net_SMTP-1.6.2.tgz -> Net_SMTP-1.7.1.tgz ++++++ ++++ 3679 lines of diff (skipped)

1 0

commit ghc-streaming-commons for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package ghc-streaming-commons for openSUSE:Factory checked in at 2015-12-01 09:19:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-streaming-commons (Old) and /work/SRC/openSUSE:Factory/.ghc-streaming-commons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-streaming-commons" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-streaming-commons/ghc-streaming-commons.changes 2015-10-06 13:27:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-streaming-commons.new/ghc-streaming-commons.changes 2015-12-01 09:19:36.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 29 17:43:29 UTC 2015 - mimi.vx(a)gmail.com + +- update to 0.1.15 +* Use `NO_DELAY1 for TCP client connections + +------------------------------------------------------------------- Old: ---- streaming-commons-0.1.14.2.tar.gz New: ---- streaming-commons-0.1.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-streaming-commons.spec ++++++ --- /var/tmp/diff_new_pack.D1M9fw/_old 2015-12-01 09:19:36.000000000 +0100 +++ /var/tmp/diff_new_pack.D1M9fw/_new 2015-12-01 09:19:36.000000000 +0100 @@ -21,7 +21,7 @@ %bcond_with tests Name: ghc-streaming-commons -Version: 0.1.14.2 +Version: 0.1.15 Release: 0 Summary: Common lower-level functions needed by various streaming data libraries License: MIT ++++++ streaming-commons-0.1.14.2.tar.gz -> streaming-commons-0.1.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/streaming-commons-0.1.14.2/ChangeLog.md new/streaming-commons-0.1.15/ChangeLog.md --- old/streaming-commons-0.1.14.2/ChangeLog.md 2015-09-27 06:37:17.000000000 +0200 +++ new/streaming-commons-0.1.15/ChangeLog.md 2015-11-24 11:28:14.000000000 +0100 @@ -1,3 +1,7 @@ +## 0.1.15 + +* Use `NO_DELAY1 for TCP client connections [#27](https://github.com/fpco/streaming-commons/issues/27) + ## 0.1.14.2 * Fix bug in process exception display of args with spaces/quotes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/streaming-commons-0.1.14.2/Data/Streaming/Network.hs new/streaming-commons-0.1.15/Data/Streaming/Network.hs --- old/streaming-commons-0.1.14.2/Data/Streaming/Network.hs 2015-09-27 06:37:17.000000000 +0200 +++ new/streaming-commons-0.1.15/Data/Streaming/Network.hs 2015-11-24 11:28:14.000000000 +0100 @@ -409,6 +409,7 @@ getSocketFamilyTCP :: ByteString -> Int -> NS.Family -> IO (NS.Socket, NS.SockAddr) getSocketFamilyTCP host' port' addrFamily = do (sock, addr) <- getSocketFamilyGen NS.Stream (S8.unpack host') port' addrFamily + NS.setSocketOption sock NS.NoDelay 1 ee <- try' $ NS.connect sock (NS.addrAddress addr) case ee of Left e -> NS.sClose sock >> throwIO e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/streaming-commons-0.1.14.2/streaming-commons.cabal new/streaming-commons-0.1.15/streaming-commons.cabal --- old/streaming-commons-0.1.14.2/streaming-commons.cabal 2015-09-27 06:37:17.000000000 +0200 +++ new/streaming-commons-0.1.15/streaming-commons.cabal 2015-11-24 11:28:14.000000000 +0100 @@ -1,5 +1,5 @@ name: streaming-commons -version: 0.1.14.2 +version: 0.1.15 synopsis: Common lower-level functions needed by various streaming data libraries description: Provides low-dependency functionality commonly needed by various streaming data libraries, such as conduit and pipes. homepage: https://github.com/fpco/streaming-commons

1 0

commit ghc-scientific for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package ghc-scientific for openSUSE:Factory checked in at 2015-12-01 09:19:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-scientific (Old) and /work/SRC/openSUSE:Factory/.ghc-scientific.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-scientific" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-scientific/ghc-scientific.changes 2015-10-14 16:45:22.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-scientific.new/ghc-scientific.changes 2015-12-01 09:19:35.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Nov 29 17:39:11 UTC 2015 - mimi.vx(a)gmail.com + +- update to 0.3.4.4 +* Fix build with integer-simple. +* Improved performance of toDecimalDigits by 13%. + +------------------------------------------------------------------- Old: ---- scientific-0.3.4.2.tar.gz New: ---- scientific-0.3.4.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-scientific.spec ++++++ --- /var/tmp/diff_new_pack.yWQhD1/_old 2015-12-01 09:19:36.000000000 +0100 +++ /var/tmp/diff_new_pack.yWQhD1/_new 2015-12-01 09:19:36.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name scientific Name: ghc-scientific -Version: 0.3.4.2 +Version: 0.3.4.4 Release: 0 Summary: Numbers represented using scientific notation License: BSD-3-Clause ++++++ scientific-0.3.4.2.tar.gz -> scientific-0.3.4.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scientific-0.3.4.2/bench/bench.hs new/scientific-0.3.4.4/bench/bench.hs --- old/scientific-0.3.4.2/bench/bench.hs 2015-10-10 10:42:48.000000000 +0200 +++ new/scientific-0.3.4.4/bench/bench.hs 2015-11-24 02:04:05.000000000 +0100 @@ -36,6 +36,10 @@ [ bench "round" (nf (round :: Scientific -> Integer) $! pos) , bench "roundDefault" (nf roundDefault $! pos) ] + + , bgroup "toDecimalDigits" + [ bench "big" (nf toDecimalDigits $! big) + ] ] where pos :: Fractional a => a @@ -50,6 +54,9 @@ negInt :: Fractional a => a negInt = -int + big :: Scientific + big = read $ "0." ++ concat (replicate 20 "0123456789") + realToFracStoD :: Scientific -> Double realToFracStoD = fromRational . toRational {-# INLINE realToFracStoD #-} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scientific-0.3.4.2/changelog new/scientific-0.3.4.4/changelog --- old/scientific-0.3.4.2/changelog 2015-10-10 10:42:48.000000000 +0200 +++ new/scientific-0.3.4.4/changelog 2015-11-24 02:04:05.000000000 +0100 @@ -1,3 +1,9 @@ +0.3.4.4 + * Improved performance of toDecimalDigits by 13%. + +0.3.4.3 + * Fix build with integer-simple. + 0.3.4.2 * Fix build on GHC-7.4. Courtesy of Adam Bergmark.. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scientific-0.3.4.2/scientific.cabal new/scientific-0.3.4.4/scientific.cabal --- old/scientific-0.3.4.2/scientific.cabal 2015-10-10 10:42:48.000000000 +0200 +++ new/scientific-0.3.4.4/scientific.cabal 2015-11-24 02:04:05.000000000 +0100 @@ -1,5 +1,5 @@ name: scientific -version: 0.3.4.2 +version: 0.3.4.4 synopsis: Numbers represented using scientific notation description: @Data.Scientific@ provides the number type 'Scientific'. Scientific numbers are @@ -64,6 +64,7 @@ Data.Text.Lazy.Builder.Scientific other-modules: Math.NumberTheory.Logarithms GHC.Integer.Logarithms.Compat + GHC.Integer.Compat Utils other-extensions: DeriveDataTypeable, BangPatterns ghc-options: -Wall @@ -114,20 +115,10 @@ benchmark bench-scientific type: exitcode-stdio-1.0 - hs-source-dirs: bench src + hs-source-dirs: bench main-is: bench.hs default-language: Haskell2010 ghc-options: -O2 - build-depends: base >= 4.3 && < 4.9 + build-depends: scientific + , base >= 4.3 && < 4.9 , criterion >= 0.5 && < 1.2 - , ghc-prim - , deepseq >= 1.3 && < 1.5 - , text >= 0.8 && < 1.3 - , bytestring >= 0.10 && < 0.11 - , hashable >= 1.1.2 && < 1.3 - , vector >= 0.5 && < 0.12 - - if flag(integer-simple) - build-depends: integer-simple - else - build-depends: integer-gmp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scientific-0.3.4.2/src/Data/Scientific.hs new/scientific-0.3.4.4/src/Data/Scientific.hs --- old/scientific-0.3.4.2/src/Data/Scientific.hs 2015-10-10 10:42:48.000000000 +0200 +++ new/scientific-0.3.4.4/src/Data/Scientific.hs 2015-11-24 02:04:05.000000000 +0100 @@ -92,7 +92,7 @@ import Control.Exception (throw, ArithException(DivideByZero)) import Control.Monad (mplus) import Control.Monad.ST (runST) -import Control.DeepSeq (NFData(rnf)) +import Control.DeepSeq (NFData, rnf) import Data.Binary (Binary, get, put) import Data.Char (intToDigit, ord) import Data.Data (Data) @@ -123,16 +123,10 @@ import Data.Bits (shiftR) #endif -import GHC.Integer (quotRemInteger, quotInteger) +import GHC.Integer (quotRemInteger, quotInteger) +import GHC.Integer.Compat (divInteger) +import Utils (roundTo) -import Utils (roundTo) - -#if MIN_VERSION_integer_gmp(0,5,1) -import GHC.Integer (divInteger) -#else -divInteger :: Integer -> Integer -> Integer -divInteger = div -#endif ---------------------------------------------------------------------- -- Type @@ -953,19 +947,14 @@ toDecimalDigits (Scientific 0 _) = ([0], 1) toDecimalDigits (Scientific c' e') = case normalizePositive c' e' of - (c, e) -> case reverseAndLength $ digits c of - (is, n) -> (is, n + e) - where - digits :: Integer -> [Int] - digits 0 = [] - digits i = case i `quotRemInteger` 10 of - (# q, r #) -> fromIntegral r : digits q - - reverseAndLength :: [a] -> ([a], Int) - reverseAndLength l = rev l [] 0 - where - rev [] a !m = (a, m) - rev (x:xs) a !m = rev xs (x:a) (m+1) + Scientific c e -> go c 0 [] + where + go :: Integer -> Int -> [Int] -> ([Int], Int) + go 0 !n ds = (ds, ne) where !ne = n + e + go i !n ds = case i `quotRemInteger` 10 of + (# q, r #) -> go q (n+1) (d:ds) + where + !d = fromIntegral r ---------------------------------------------------------------------- @@ -979,12 +968,12 @@ -- automatically normalized when pretty-printed and in 'toDecimalDigits'. normalize :: Scientific -> Scientific normalize (Scientific c e) - | c > 0 = case normalizePositive c e of (c', e') -> Scientific c' e' - | c < 0 = case normalizePositive (-c) e of (c', e') -> Scientific (-c') e' + | c > 0 = normalizePositive c e + | c < 0 = -(normalizePositive (-c) e) | otherwise {- c == 0 -} = Scientific 0 0 -normalizePositive :: Integer -> Int -> (Integer, Int) -normalizePositive c !e = case quotRemInteger c 10 of - (# c', r #) - | r == 0 -> normalizePositive c' (e+1) - | otherwise -> (c, e) +normalizePositive :: Integer -> Int -> Scientific +normalizePositive !c !e = case quotRemInteger c 10 of + (# c', r #) + | r == 0 -> normalizePositive c' (e+1) + | otherwise -> Scientific c e diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scientific-0.3.4.2/src/GHC/Integer/Compat.hs new/scientific-0.3.4.4/src/GHC/Integer/Compat.hs --- old/scientific-0.3.4.2/src/GHC/Integer/Compat.hs 1970-01-01 01:00:00.000000000 +0100 +++ new/scientific-0.3.4.4/src/GHC/Integer/Compat.hs 2015-11-24 02:04:05.000000000 +0100 @@ -0,0 +1,23 @@ +{-# LANGUAGE CPP #-} + +module GHC.Integer.Compat (divInteger) where + +#ifdef MIN_VERSION_integer_simple + +#if MIN_VERSION_integer_simple(0,1,1) +import GHC.Integer (divInteger) +#else +divInteger :: Integer -> Integer -> Integer +divInteger = div +#endif + +#else + +#if MIN_VERSION_integer_gmp(0,5,1) +import GHC.Integer (divInteger) +#else +divInteger :: Integer -> Integer -> Integer +divInteger = div +#endif + +#endif

1 0

commit ghc-refact for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package ghc-refact for openSUSE:Factory checked in at 2015-12-01 09:19:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-refact (Old) and /work/SRC/openSUSE:Factory/.ghc-refact.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-refact" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-refact/ghc-refact.changes 2015-11-10 10:02:51.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-refact.new/ghc-refact.changes 2015-12-01 09:19:34.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 29 17:35:24 UTC 2015 - mimi.vx(a)gmail.com + +- update to 0.3.0.2 + +------------------------------------------------------------------- Old: ---- refact-0.3.0.1.tar.gz New: ---- refact-0.3.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-refact.spec ++++++ --- /var/tmp/diff_new_pack.jbFsPQ/_old 2015-12-01 09:19:34.000000000 +0100 +++ /var/tmp/diff_new_pack.jbFsPQ/_new 2015-12-01 09:19:34.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name refact Name: ghc-refact -Version: 0.3.0.1 +Version: 0.3.0.2 Release: 0 Summary: Specify refactorings to perform with apply-refact License: BSD-3-Clause ++++++ refact-0.3.0.1.tar.gz -> refact-0.3.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/refact-0.3.0.1/refact.cabal new/refact-0.3.0.2/refact.cabal --- old/refact-0.3.0.1/refact.cabal 2015-07-26 17:01:55.000000000 +0200 +++ new/refact-0.3.0.2/refact.cabal 2015-11-21 23:52:52.000000000 +0100 @@ -2,7 +2,7 @@ -- documentation, see http://haskell.org/cabal/users-guide/ name: refact -version: 0.3.0.1 +version: 0.3.0.2 synopsis: Specify refactorings to perform with apply-refact description: This library provides a datatype which can be interpreted by apply-refact. It exists as a seperate library so that applications can specify refactorings without depending on GHC. @@ -13,8 +13,8 @@ -- copyright: category: Development build-type: Simple -data-files: README.md - ,CHANGELOG +extra-source-files: README.md + , CHANGELOG cabal-version: >=1.10 library

1 0

commit ghc-path for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package ghc-path for openSUSE:Factory checked in at 2015-12-01 09:19:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-path (Old) and /work/SRC/openSUSE:Factory/.ghc-path.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-path" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-path/ghc-path.changes 2015-11-26 17:02:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ghc-path.new/ghc-path.changes 2015-12-01 09:19:33.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 29 17:31:30 UTC 2015 - mimi.vx(a)gmail.com + +- update to 0.5.3 +* Added conversion functions. + +------------------------------------------------------------------- Old: ---- path-0.5.2.tar.gz New: ---- path-0.5.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-path.spec ++++++ --- /var/tmp/diff_new_pack.xByP9n/_old 2015-12-01 09:19:33.000000000 +0100 +++ /var/tmp/diff_new_pack.xByP9n/_new 2015-12-01 09:19:33.000000000 +0100 @@ -15,17 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global pkg_name path %bcond_with tests Name: ghc-path -Version: 0.5.2 +Version: 0.5.3 Release: 0 Summary: Path +License: BSD-3-Clause Group: System/Libraries -License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -62,37 +63,29 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %check %if %{with tests} %cabal test %endif - %post devel %ghc_pkg_recache - %postun devel %ghc_pkg_recache - %files -f %{name}.files %defattr(-,root,root,-) %doc LICENSE - %files devel -f %{name}-devel.files %defattr(-,root,root,-) %doc README.md - %changelog ++++++ path-0.5.2.tar.gz -> path-0.5.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/path-0.5.2/CHANGELOG new/path-0.5.3/CHANGELOG --- old/path-0.5.2/CHANGELOG 2015-06-21 12:19:30.000000000 +0200 +++ new/path-0.5.3/CHANGELOG 2015-11-21 19:54:50.000000000 +0100 @@ -1,3 +1,6 @@ +0.5.3: + * Added conversion functions. + 0.2.0: * Rename parentAbs to simply parent. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/path-0.5.2/path.cabal new/path-0.5.3/path.cabal --- old/path-0.5.2/path.cabal 2015-06-21 12:19:30.000000000 +0200 +++ new/path-0.5.3/path.cabal 2015-11-21 19:54:19.000000000 +0100 @@ -1,5 +1,5 @@ name: path -version: 0.5.2 +version: 0.5.3 synopsis: Path description: Path license: BSD3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/path-0.5.2/src/Path/Internal.hs new/path-0.5.3/src/Path/Internal.hs --- old/path-0.5.2/src/Path/Internal.hs 2015-06-21 12:19:30.000000000 +0200 +++ new/path-0.5.3/src/Path/Internal.hs 2015-11-21 19:53:42.000000000 +0100 @@ -1,6 +1,4 @@ -{-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE DeriveDataTypeable #-} -{-# LANGUAGE GeneralizedNewtypeDeriving #-} -- | Internal types and functions. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/path-0.5.2/src/Path.hs new/path-0.5.3/src/Path.hs --- old/path-0.5.2/src/Path.hs 2015-06-21 12:19:30.000000000 +0200 +++ new/path-0.5.3/src/Path.hs 2015-11-21 19:53:42.000000000 +0100 @@ -31,6 +31,10 @@ ,dirname -- * Conversion ,toFilePath + ,fromAbsDir + ,fromRelDir + ,fromAbsFile + ,fromRelFile ) where @@ -81,7 +85,7 @@ parseAbsDir filepath = if FilePath.isAbsolute filepath && not (null (normalizeDir filepath)) && - not (isPrefixOf "~/" filepath) && + not ("~/" `isPrefixOf` filepath) && not (hasParentDir filepath) then return (Path (normalizeDir filepath)) else throwM (InvalidAbsDir filepath) @@ -96,7 +100,7 @@ parseRelDir filepath = if not (FilePath.isAbsolute filepath) && not (null filepath) && - not (isPrefixOf "~/" filepath) && + not ("~/" `isPrefixOf` filepath) && not (hasParentDir filepath) && not (null (normalizeDir filepath)) && filepath /= ".." @@ -112,7 +116,7 @@ parseAbsFile filepath = if FilePath.isAbsolute filepath && not (FilePath.hasTrailingPathSeparator filepath) && - not (isPrefixOf "~/" filepath) && + not ("~/" `isPrefixOf` filepath) && not (hasParentDir filepath) && not (null (normalizeFile filepath)) && filepath /= ".." @@ -129,7 +133,7 @@ if not (FilePath.isAbsolute filepath || FilePath.hasTrailingPathSeparator filepath) && not (null filepath) && - not (isPrefixOf "~/" filepath) && + not ("~/" `isPrefixOf` filepath) && not (hasParentDir filepath) && not (null (normalizeFile filepath)) && filepath /= ".." @@ -140,9 +144,9 @@ -- This handles the logic of checking for different path separators on Windows. hasParentDir :: FilePath -> Bool hasParentDir filepath' = - (isSuffixOf "/.." filepath) || - (isInfixOf "/../" filepath) || - (isPrefixOf "../" filepath) + ("/.." `isSuffixOf` filepath) || + ("/../" `isInfixOf` filepath) || + ("../" `isPrefixOf` filepath) where filepath = case FilePath.pathSeparator of @@ -203,6 +207,22 @@ toFilePath :: Path b t -> FilePath toFilePath (Path l) = l +-- | Convert absolute path to directory to 'FilePath' type. +fromAbsDir :: Path Abs Dir -> FilePath +fromAbsDir = toFilePath + +-- | Convert relative path to directory to 'FilePath' type. +fromRelDir :: Path Rel Dir -> FilePath +fromRelDir = toFilePath + +-- | Convert absolute path to file to 'FilePath' type. +fromAbsFile :: Path Abs File -> FilePath +fromAbsFile = toFilePath + +-- | Convert relative path to file to 'FilePath' type. +fromRelFile :: Path Rel File -> FilePath +fromRelFile = toFilePath + -------------------------------------------------------------------------------- -- Operations @@ -236,7 +256,7 @@ -- -- The following properties hold: -- --- @stripDir parent (parent \<\/> child) = child@ +-- @stripDir x (x \<\/> y) = y@ -- -- Cases which are proven not possible: -- @@ -266,7 +286,7 @@ -- -- The following properties hold: -- --- @parent (parent \<\/> child) == parent@ +-- @parent (x \<\/> y) == x@ -- -- On the root, getting the parent is idempotent: -- @@ -280,7 +300,7 @@ -- -- The following properties hold: -- --- @filename (parent \<\/> filename a) == a@ +-- @filename (p \<\/> a) == filename a@ -- filename :: Path b File -> Path Rel File filename (Path l) = @@ -290,7 +310,7 @@ -- -- The following properties hold: -- --- @dirname (parent \<\/> dirname a) == a@ +-- @dirname (p \<\/> a) == dirname a@ -- dirname :: Path b Dir -> Path Rel Dir dirname (Path l) = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/path-0.5.2/test/Main.hs new/path-0.5.3/test/Main.hs --- old/path-0.5.2/test/Main.hs 2015-06-21 12:19:30.000000000 +0200 +++ new/path-0.5.3/test/Main.hs 2015-11-21 19:53:42.000000000 +0100 @@ -46,7 +46,7 @@ (isNothing (void (parseAbsDir x) <|> void (parseRelDir x) <|> void (parseAbsFile x) <|> - void (parseRelDir x))) + void (parseRelFile x))) -- | The 'filename' operation. operationFilename :: Spec

1 0

commit ghc-lifted-async for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package ghc-lifted-async for openSUSE:Factory checked in at 2015-12-01 09:19:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-lifted-async (Old) and /work/SRC/openSUSE:Factory/.ghc-lifted-async.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-lifted-async" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-lifted-async/ghc-lifted-async.changes 2015-09-08 17:48:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-lifted-async.new/ghc-lifted-async.changes 2015-12-01 09:19:32.000000000 +0100 @@ -1,0 +2,6 @@ +Sun Nov 29 17:26:51 UTC 2015 - mimi.vx(a)gmail.com + +- update to 0.7.0.2 +* Relax upper bound for the constraints package + +------------------------------------------------------------------- Old: ---- lifted-async-0.7.0.1.tar.gz New: ---- lifted-async-0.7.0.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-lifted-async.spec ++++++ --- /var/tmp/diff_new_pack.sYuRQi/_old 2015-12-01 09:19:33.000000000 +0100 +++ /var/tmp/diff_new_pack.sYuRQi/_new 2015-12-01 09:19:33.000000000 +0100 @@ -15,17 +15,18 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %global pkg_name lifted-async %bcond_with tests Name: ghc-lifted-async -Version: 0.7.0.1 +Version: 0.7.0.2 Release: 0 Summary: Run lifted IO operations asynchronously and wait for their results +License: BSD-3-Clause Group: System/Libraries -License: BSD-3-Clause Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{ve… BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -69,7 +70,6 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build ++++++ lifted-async-0.7.0.1.tar.gz -> lifted-async-0.7.0.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lifted-async-0.7.0.1/CHANGELOG.md new/lifted-async-0.7.0.2/CHANGELOG.md --- old/lifted-async-0.7.0.1/CHANGELOG.md 2015-05-18 14:58:36.000000000 +0200 +++ new/lifted-async-0.7.0.2/CHANGELOG.md 2015-11-27 02:28:01.000000000 +0100 @@ -1,3 +1,9 @@ +## v0.7.0.2 - 2015-11-26 + +* Relax upper bound for the constraints package + * Upper bound remains < 0.6 for GHC < 7.8 as constraints-0.6 requires the closed type families extension. +* Drop support for GHC 7.4.2 + ## v0.7.0.1 - 2015-05-18 * Fix typecheck error with GHC HEAD (#17) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lifted-async-0.7.0.1/lifted-async.cabal new/lifted-async-0.7.0.2/lifted-async.cabal --- old/lifted-async-0.7.0.1/lifted-async.cabal 2015-05-18 14:58:36.000000000 +0200 +++ new/lifted-async-0.7.0.2/lifted-async.cabal 2015-11-27 02:28:01.000000000 +0100 @@ -1,5 +1,5 @@ name: lifted-async -version: 0.7.0.1 +version: 0.7.0.2 synopsis: Run lifted IO operations asynchronously and wait for their results homepage: https://github.com/maoe/lifted-async bug-reports: https://github.com/maoe/lifted-async/issues @@ -12,10 +12,9 @@ build-type: Simple cabal-version: >= 1.8 tested-with: - GHC == 7.10.1 + GHC == 7.10.2 , GHC == 7.8.4 , GHC == 7.6.3 - , GHC == 7.4.2 extra-source-files: README.md @@ -40,9 +39,11 @@ , lifted-base >= 0.2 && < 0.3 , transformers-base >= 0.4 && < 0.5 if flag(monad-control-1) - build-depends: - constraints >= 0.2 && < 0.5 - , monad-control == 1.0.* + build-depends: monad-control == 1.0.* + if impl(ghc >= 7.8) + build-depends: constraints >= 0.2 && < 0.7 + else + build-depends: constraints >= 0.2 && < 0.6 else build-depends: monad-control == 0.* @@ -113,5 +114,5 @@ source-repository this type: git - tag: v0.7.0.1 + tag: v0.7.0.2 location: https://github.com/maoe/lifted-async.git

1 0

commit ghc-HTTP for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package ghc-HTTP for openSUSE:Factory checked in at 2015-12-01 09:19:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-HTTP (Old) and /work/SRC/openSUSE:Factory/.ghc-HTTP.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc-HTTP" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-HTTP/ghc-HTTP.changes 2015-06-30 10:18:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-HTTP.new/ghc-HTTP.changes 2015-12-01 09:19:31.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 29 17:14:52 UTC 2015 - mimi.vx(a)gmail.com + +- update to 4000.2.21 + +------------------------------------------------------------------- Old: ---- HTTP-4000.2.20.tar.gz New: ---- HTTP-4000.2.21.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-HTTP.spec ++++++ --- /var/tmp/diff_new_pack.Vb9Rb2/_old 2015-12-01 09:19:32.000000000 +0100 +++ /var/tmp/diff_new_pack.Vb9Rb2/_new 2015-12-01 09:19:32.000000000 +0100 @@ -19,7 +19,7 @@ %global pkg_name HTTP Name: ghc-HTTP -Version: 4000.2.20 +Version: 4000.2.21 Release: 0 Summary: A library for client-side HTTP License: BSD-3-Clause ++++++ HTTP-4000.2.20.tar.gz -> HTTP-4000.2.21.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/HTTP.cabal new/HTTP-4000.2.21/HTTP.cabal --- old/HTTP-4000.2.20/HTTP.cabal 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/HTTP.cabal 2015-11-23 19:59:29.000000000 +0100 @@ -1,5 +1,5 @@ Name: HTTP -Version: 4000.2.20 +Version: 4000.2.21 Cabal-Version: >= 1.8 Build-type: Simple License: BSD3 @@ -9,9 +9,9 @@ Homepage: https://github.com/haskell/HTTP Category: Network Synopsis: A library for client-side HTTP -Description: +Description: - The HTTP package supports client-side web programming in Haskell. It lets you set up + The HTTP package supports client-side web programming in Haskell. It lets you set up HTTP connections, transmitting requests and processing the responses coming back, all from within the comforts of Haskell. It's dependent on the network package to operate, but other than that, the implementation is all written in Haskell. @@ -74,12 +74,12 @@ default: True Library - Exposed-modules: + Exposed-modules: Network.BufferType, Network.Stream, Network.StreamDebugger, Network.StreamSocket, - Network.TCP, + Network.TCP, Network.HTTP, Network.HTTP.Headers, Network.HTTP.Base, @@ -112,7 +112,7 @@ if flag(network-uri) Build-depends: network-uri == 2.6.*, network == 2.6.* else - Build-depends: network >= 2.2.1.5 && < 2.6 + Build-depends: network >= 2.2.1.8 && < 2.6 build-tools: ghc >= 7.0 && < 7.12 @@ -137,7 +137,7 @@ -- note: version constraints for dependencies shared with the library -- should be the same build-depends: HTTP, - HUnit >= 1.2.0.1 && < 1.3, + HUnit >= 1.2.0.1 && < 1.4, httpd-shed >= 0.4 && < 0.5, mtl >= 1.1.1.0 && < 2.3, bytestring >= 0.9.1.5 && < 0.11, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/Browser.hs new/HTTP-4000.2.21/Network/Browser.hs --- old/HTTP-4000.2.20/Network/Browser.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/Browser.hs 2015-11-23 19:59:29.000000000 +0100 @@ -711,7 +711,7 @@ -- is returned along with the 'Response' itself. request :: HStream ty => Request ty - -> BrowserAction (HandleStream ty) (URI,Response ty) + -> BrowserAction (HandleStream ty) (URI,Response ty) request req = nextRequest $ do res <- request' nullVal initialState req reportEvent ResponseFinish (show (rqURI req)) @@ -729,9 +729,9 @@ -- counts. request' :: HStream ty => ty - -> RequestState - -> Request ty - -> BrowserAction (HandleStream ty) (Result (URI,Response ty)) + -> RequestState + -> Request ty + -> BrowserAction (HandleStream ty) (Result (URI,Response ty)) request' nullVal rqState rq = do let uri = rqURI rq failHTTPS uri @@ -765,18 +765,18 @@ let rq'' = if not $ null cookies then insertHeaders [cookiesToHeader cookies] rq' else rq' p <- getProxy def_ua <- gets bsUserAgent - let defaultOpts = + let defaultOpts = case p of - NoProxy -> defaultNormalizeRequestOptions{normUserAgent=def_ua} - Proxy _ ath -> - defaultNormalizeRequestOptions - { normForProxy = True - , normUserAgent = def_ua - , normCustoms = - maybe [] - (\ authS -> [\ _ r -> insertHeader HdrProxyAuthorization (withAuthority authS r) r]) - ath - } + NoProxy -> defaultNormalizeRequestOptions{normUserAgent=def_ua} + Proxy _ ath -> + defaultNormalizeRequestOptions + { normForProxy = True + , normUserAgent = def_ua + , normCustoms = + maybe [] + (\ authS -> [\ _ r -> insertHeader HdrProxyAuthorization (withAuthority authS r) r]) + ath + } let final_req = normalizeRequest defaultOpts rq'' out ("Sending:\n" ++ show final_req) e_rsp <- @@ -784,16 +784,16 @@ NoProxy -> dorequest (reqURIAuth rq'') final_req Proxy str _ath -> do let notURI - | null pt || null hst = - URIAuth{ uriUserInfo = "" - , uriRegName = str - , uriPort = "" - } - | otherwise = - URIAuth{ uriUserInfo = "" - , uriRegName = hst - , uriPort = pt - } + | null pt || null hst = + URIAuth{ uriUserInfo = "" + , uriRegName = str + , uriPort = "" + } + | otherwise = + URIAuth{ uriUserInfo = "" + , uriRegName = hst + , uriPort = pt + } -- If the ':' is dropped from port below, dorequest will assume port 80. Leave it! where (hst, pt) = span (':'/=) str -- Proxy can take multiple forms - look for http://host:port first, @@ -804,7 +804,7 @@ (parseURI str) out $ "proxy uri host: " ++ uriRegName proxyURIAuth ++ ", port: " ++ uriPort proxyURIAuth - dorequest proxyURIAuth final_req + dorequest proxyURIAuth final_req mbMx <- getMaxErrorRetries case e_rsp of Left v @@ -827,27 +827,27 @@ (4,0,1) -- Credentials not sent or refused. | reqDenies rqState > fromMaybe defaultMaxAuthAttempts mbMxAuths -> do out "401 - credentials again refused; exceeded retry count (2)" - return (Right (uri,rsp)) - | otherwise -> do + return (Right (uri,rsp)) + | otherwise -> do out "401 - credentials not supplied or refused; retrying.." let hdrs = retrieveHeaders HdrWWWAuthenticate rsp - flg <- getAllowBasicAuth + flg <- getAllowBasicAuth case pickChallenge flg (catMaybes $ map (headerToChallenge uri) hdrs) of Nothing -> do - out "no challenge" - return (Right (uri,rsp)) {- do nothing -} + out "no challenge" + return (Right (uri,rsp)) {- do nothing -} Just x -> do au <- challengeToAuthority uri x case au of Nothing -> do - out "no auth" - return (Right (uri,rsp)) {- do nothing -} + out "no auth" + return (Right (uri,rsp)) {- do nothing -} Just au' -> do out "Retrying request with new credentials" - request' nullVal - rqState{ reqDenies = succ(reqDenies rqState) - , reqStopOnDeny = False - } + request' nullVal + rqState{ reqDenies = succ(reqDenies rqState) + , reqStopOnDeny = False + } (insertHeader HdrAuthorization (withAuthority au' rq) rq) (4,0,7) -- Proxy Authentication required @@ -857,7 +857,7 @@ | otherwise -> do out "407 - proxy authentication required" let hdrs = retrieveHeaders HdrProxyAuthenticate rsp - flg <- getAllowBasicAuth + flg <- getAllowBasicAuth case pickChallenge flg (catMaybes $ map (headerToChallenge uri) hdrs) of Nothing -> return (Right (uri,rsp)) {- do nothing -} Just x -> do @@ -874,32 +874,32 @@ out "Retrying with proxy authentication" setProxy (Proxy px (Just au')) request' nullVal - rqState{ reqDenies = succ(reqDenies rqState) - , reqStopOnDeny = False - } - rq + rqState{ reqDenies = succ(reqDenies rqState) + , reqStopOnDeny = False + } + rq (3,0,x) | x `elem` [2,3,1,7] -> do out ("30" ++ show x ++ " - redirect") - allow_redirs <- allowRedirect rqState - case allow_redirs of - False -> return (Right (uri,rsp)) - _ -> do + allow_redirs <- allowRedirect rqState + case allow_redirs of + False -> return (Right (uri,rsp)) + _ -> do case retrieveHeaders HdrLocation rsp of [] -> do - err "No Location: header in redirect response" + err "No Location: header in redirect response" return (Right (uri,rsp)) (Header _ u:_) -> - case parseURIReference u of + case parseURIReference u of Nothing -> do err ("Parse of Location: header in a redirect response failed: " ++ u) return (Right (uri,rsp)) Just newURI - | {-uriScheme newURI_abs /= uriScheme uri && -}(not (supportedScheme newURI_abs)) -> do - err ("Unable to handle redirect, unsupported scheme: " ++ show newURI_abs) - return (Right (uri, rsp)) - | otherwise -> do - out ("Redirecting to " ++ show newURI_abs ++ " ...") + | {-uriScheme newURI_abs /= uriScheme uri && -}(not (supportedScheme newURI_abs)) -> do + err ("Unable to handle redirect, unsupported scheme: " ++ show newURI_abs) + return (Right (uri, rsp)) + | otherwise -> do + out ("Redirecting to " ++ show newURI_abs ++ " ...") -- Redirect using GET request method, depending on -- response code. @@ -909,10 +909,10 @@ rq2 = if toGet then (replaceHeader HdrContentLength "0") (rq1 {rqBody = nullVal}) else rq1 request' nullVal - rqState{ reqDenies = 0 - , reqRedirects = succ(reqRedirects rqState) - , reqStopOnDeny = True - } + rqState{ reqDenies = 0 + , reqRedirects = succ(reqRedirects rqState) + , reqStopOnDeny = True + } rq2 where newURI_abs = uriDefaultTo newURI uri @@ -920,10 +920,10 @@ (3,0,5) -> case retrieveHeaders HdrLocation rsp of [] -> do - err "No Location header in proxy redirect response." + err "No Location header in proxy redirect response." return (Right (uri,rsp)) (Header _ u:_) -> - case parseURIReference u of + case parseURIReference u of Nothing -> do err ("Parse of Location header in a proxy redirect response failed: " ++ u) return (Right (uri,rsp)) @@ -931,19 +931,19 @@ out ("Retrying with proxy " ++ show newuri ++ "...") setProxy (Proxy (uriToAuthorityString newuri) Nothing) request' nullVal rqState{ reqDenies = 0 - , reqRedirects = 0 - , reqRetries = succ (reqRetries rqState) - , reqStopOnDeny = True - } - rq + , reqRedirects = 0 + , reqRetries = succ (reqRetries rqState) + , reqStopOnDeny = True + } + rq _ -> return (Right (uri,rsp)) -- | The internal request handling state machine. dorequest :: (HStream ty) => URIAuth - -> Request ty - -> BrowserAction (HandleStream ty) - (Result (Response ty)) + -> Request ty + -> BrowserAction (HandleStream ty) + (Result (Response ty)) dorequest hst rqst = do pool <- gets bsConnectionPool let uPort = uriAuthPort Nothing{-ToDo: feed in complete URL-} hst @@ -952,13 +952,13 @@ case conn of [] -> do out ("Creating new connection to " ++ uriAuthToString hst) - reportEvent OpenConnection (show (rqURI rqst)) + reportEvent OpenConnection (show (rqURI rqst)) c <- liftIO $ openStream (uriRegName hst) uPort - updateConnectionPool c - dorequest2 c rqst + updateConnectionPool c + dorequest2 c rqst (c:_) -> do out ("Recovering connection to " ++ uriAuthToString hst) - reportEvent ReuseConnection (show (rqURI rqst)) + reportEvent ReuseConnection (show (rqURI rqst)) dorequest2 c rqst case rsp of Right (Response a b c _) -> @@ -972,20 +972,20 @@ onSendComplete = maybe (return ()) (\evh -> do - x <- buildBrowserEvent RequestSent (show (rqURI r)) (bsRequestID st) - runBA st (evh x) - return ()) + x <- buildBrowserEvent RequestSent (show (rqURI r)) (bsRequestID st) + runBA st (evh x) + return ()) (bsEvent st) liftIO $ maybe (sendHTTP_notify c r onSendComplete) (\ f -> do c' <- debugByteStream (f++'-': uriAuthToString hst) c - sendHTTP_notify c' r onSendComplete) - dbg + sendHTTP_notify c' r onSendComplete) + dbg updateConnectionPool :: HStream hTy => HandleStream hTy - -> BrowserAction (HandleStream hTy) () + -> BrowserAction (HandleStream hTy) () updateConnectionPool c = do pool <- gets bsConnectionPool let len_pool = length pool @@ -993,8 +993,8 @@ when (len_pool > maxPoolSize) (liftIO $ close (last pool)) let pool' - | len_pool > maxPoolSize = init pool - | otherwise = pool + | len_pool > maxPoolSize = init pool + | otherwise = pool when (maxPoolSize > 0) $ modify (\b -> b { bsConnectionPool=c:pool' }) return () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/BufferType.hs new/HTTP-4000.2.21/Network/BufferType.hs --- old/HTTP-4000.2.20/Network/BufferType.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/BufferType.hs 2015-11-23 19:59:29.000000000 +0100 @@ -156,7 +156,7 @@ , buf_splitAt = splitAt , buf_span = \ p a -> case Strict.span p (Strict.pack a) of - (x,y) -> (Strict.unpack x, Strict.unpack y) + (x,y) -> (Strict.unpack x, Strict.unpack y) , buf_empty = [] , buf_isLineTerm = \ b -> b == crlf || b == lf , buf_isEmpty = null diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/HTTP/Auth.hs new/HTTP-4000.2.21/Network/HTTP/Auth.hs --- old/HTTP-4000.2.20/Network/HTTP/Auth.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/HTTP/Auth.hs 2015-11-23 19:59:29.000000000 +0100 @@ -87,16 +87,16 @@ AuthBasic{} -> "Basic " ++ base64encode (auUsername a ++ ':' : auPassword a) AuthDigest{} -> "Digest " ++ - concat [ "username=" ++ quo (auUsername a) - , ",realm=" ++ quo (auRealm a) - , ",nonce=" ++ quo (auNonce a) - , ",uri=" ++ quo digesturi - , ",response=" ++ quo rspdigest + concat [ "username=" ++ quo (auUsername a) + , ",realm=" ++ quo (auRealm a) + , ",nonce=" ++ quo (auNonce a) + , ",uri=" ++ quo digesturi + , ",response=" ++ quo rspdigest -- plus optional stuff: - , fromMaybe "" (fmap (\ alg -> ",algorithm=" ++ quo (show alg)) (auAlgorithm a)) - , fromMaybe "" (fmap (\ o -> ",opaque=" ++ quo o) (auOpaque a)) - , if null (auQop a) then "" else ",qop=auth" - ] + , fromMaybe "" (fmap (\ alg -> ",algorithm=" ++ quo (show alg)) (auAlgorithm a)) + , fromMaybe "" (fmap (\ o -> ",opaque=" ++ quo o) (auOpaque a)) + , if null (auQop a) then "" else ",qop=auth" + ] where quo s = '"':s ++ "\"" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/HTTP/Base.hs new/HTTP-4000.2.21/Network/HTTP/Base.hs --- old/HTTP-4000.2.20/Network/HTTP/Base.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/HTTP/Base.hs 2015-11-23 19:59:29.000000000 +0100 @@ -135,11 +135,11 @@ ------------------ URI Authority parsing ------------------------ ----------------------------------------------------------------- -data URIAuthority = URIAuthority { user :: Maybe String, - password :: Maybe String, - host :: String, - port :: Maybe Int - } deriving (Eq,Show) +data URIAuthority = URIAuthority { user :: Maybe String, + password :: Maybe String, + host :: String, + port :: Maybe Int + } deriving (Eq,Show) -- | Parse the authority part of a URL. -- @@ -154,12 +154,12 @@ pURIAuthority :: ReadP URIAuthority pURIAuthority = do - (u,pw) <- (pUserInfo `before` char '@') - <++ return (Nothing, Nothing) - h <- rfc2732host <++ munch (/=':') - p <- orNothing (char ':' >> readDecP) - look >>= guard . null - return URIAuthority{ user=u, password=pw, host=h, port=p } + (u,pw) <- (pUserInfo `before` char '@') + <++ return (Nothing, Nothing) + h <- rfc2732host <++ munch (/=':') + p <- orNothing (char ':' >> readDecP) + look >>= guard . null + return URIAuthority{ user=u, password=pw, host=h, port=p } -- RFC2732 adds support for '[literal-ipv6-address]' in the host part of a URL rfc2732host :: ReadP String @@ -171,9 +171,9 @@ pUserInfo :: ReadP (Maybe String, Maybe String) pUserInfo = do - u <- orNothing (munch (`notElem` ":@")) - p <- orNothing (char ':' >> munch (/='@')) - return (u,p) + u <- orNothing (munch (`notElem` ":@")) + p <- orNothing (char ':' >> munch (/='@')) + return (u,p) before :: Monad m => m a -> m b -> m a before a b = a >>= \x -> b >> return x @@ -189,8 +189,8 @@ uriAuthToString ua = concat [ uriUserInfo ua , uriRegName ua - , uriPort ua - ] + , uriPort ua + ] uriAuthPort :: Maybe URI -> URIAuth -> Int uriAuthPort mbURI u = @@ -223,12 +223,12 @@ Just ua -> ua _ -> case lookupHeader HdrHost (rqHeaders req) of Nothing -> error ("reqURIAuth: no URI authority for: " ++ show req) - Just h -> - case toHostPort h of - (ht,p) -> URIAuth { uriUserInfo = "" - , uriRegName = ht - , uriPort = p - } + Just h -> + case toHostPort h of + (ht,p) -> URIAuth { uriUserInfo = "" + , uriRegName = ht + , uriPort = p + } where -- Note: just in case you're wondering..the convention is to include the ':' -- in the port part.. @@ -265,13 +265,13 @@ rqMethodMap :: [(String, RequestMethod)] rqMethodMap = [("HEAD", HEAD), - ("PUT", PUT), - ("GET", GET), - ("POST", POST), + ("PUT", PUT), + ("GET", GET), + ("POST", POST), ("DELETE", DELETE), - ("OPTIONS", OPTIONS), - ("TRACE", TRACE), - ("CONNECT", CONNECT)] + ("OPTIONS", OPTIONS), + ("TRACE", TRACE), + ("CONNECT", CONNECT)] -- -- for backwards-ish compatibility; suggest @@ -309,7 +309,7 @@ show m ++ sp ++ alt_uri ++ sp ++ ver ++ crlf ++ foldr (++) [] (map show (dropHttpVersion h)) ++ crlf where - ver = fromMaybe httpVersion (getRequestVersion req) + ver = fromMaybe httpVersion (getRequestVersion req) alt_uri = show $ if null (uriPath u) || head (uriPath u) /= '/' then u { uriPath = '/' : uriPath u } else u @@ -730,7 +730,7 @@ insertHeaderIfMissing HdrHost h $ r { rqURI = (rqURI r){ uriScheme = "" , uriAuthority = Nothing - }} + }} -- | @NormalizeRequestOptions@ brings together the various defaulting\/normalization options -- over 'Request's. Use 'defaultNormalizeRequestOptions' for the standard selection of option @@ -759,7 +759,7 @@ -- via the @NormalizeRequestOptions@ record. normalizeRequest :: NormalizeRequestOptions ty -> Request ty - -> Request ty + -> Request ty normalizeRequest opts req = foldr (\ f -> f opts) req normalizers where --normalizers :: [RequestNormalizer ty] @@ -817,26 +817,26 @@ ("",_uri_abs) | forProxy -> case findHeader HdrHost req of - Nothing -> req -- no host/authority in sight..not much we can do. - Just h -> req{rqURI=uri{ uriAuthority=Just URIAuth{uriUserInfo="", uriRegName=hst, uriPort=pNum} - , uriScheme=if (null (uriScheme uri)) then "http" else uriScheme uri - }} + Nothing -> req -- no host/authority in sight..not much we can do. + Just h -> req{rqURI=uri{ uriAuthority=Just URIAuth{uriUserInfo="", uriRegName=hst, uriPort=pNum} + , uriScheme=if (null (uriScheme uri)) then "http" else uriScheme uri + }} where - hst = case span (/='@') user_hst of - (as,'@':bs) -> - case span (/=':') as of - (_,_:_) -> bs - _ -> user_hst - _ -> user_hst - - (user_hst, pNum) = - case span isDigit (reverse h) of - (ds,':':bs) -> (reverse bs, ':':reverse ds) - _ -> (h,"") + hst = case span (/='@') user_hst of + (as,'@':bs) -> + case span (/=':') as of + (_,_:_) -> bs + _ -> user_hst + _ -> user_hst + + (user_hst, pNum) = + case span isDigit (reverse h) of + (ds,':':bs) -> (reverse bs, ':':reverse ds) + _ -> (h,"") | otherwise -> case findHeader HdrHost req of - Nothing -> req -- no host/authority in sight..not much we can do...complain? - Just{} -> req + Nothing -> req -- no host/authority in sight..not much we can do...complain? + Just{} -> req (h,uri_abs) | forProxy -> insertHeaderIfMissing HdrHost h req | otherwise -> replaceHeader HdrHost h req{rqURI=uri_abs} -- Note: _not_ stubbing out user:pass @@ -869,7 +869,7 @@ normalizeHostHeader rq = insertHeaderIfMissing HdrHost (uriToAuthorityString $ rqURI rq) - rq + rq -- Looks for a "Connection" header with the value "close". -- Returns True when this is found. @@ -877,7 +877,7 @@ findConnClose hdrs = maybe False (\ x -> map toLower (trim x) == "close") - (lookupHeader HdrConnection hdrs) + (lookupHeader HdrConnection hdrs) -- | Used when we know exactly how many bytes to expect. linearTransfer :: (Int -> IO (Result a)) -> Int -> IO (Result ([Header],a)) @@ -889,8 +889,8 @@ -- take data once and give up the rest. hopefulTransfer :: BufferOp a -> IO (Result a) - -> [a] - -> IO (Result ([Header],a)) + -> [a] + -> IO (Result ([Header],a)) hopefulTransfer bufOps readL strs = readL >>= either (\v -> return $ Left v) @@ -902,7 +902,7 @@ -- Also the only transfer variety likely to -- return any footers. chunkedTransfer :: BufferOp a - -> IO (Result a) + -> IO (Result a) -> (Int -> IO (Result a)) -> IO (Result ([Header], a)) chunkedTransfer bufOps readL readBlk = chunkedTransferC bufOps readL readBlk [] 0 @@ -910,9 +910,9 @@ chunkedTransferC :: BufferOp a -> IO (Result a) -> (Int -> IO (Result a)) - -> [a] - -> Int - -> IO (Result ([Header], a)) + -> [a] + -> Int + -> IO (Result ([Header], a)) chunkedTransferC bufOps readL readBlk acc n = do v <- readL case v of @@ -921,25 +921,25 @@ | size == 0 -> -- last chunk read; look for trailing headers.. fmapE (\ strs -> do - ftrs <- parseHeaders (map (buf_toStr bufOps) strs) - -- insert (computed) Content-Length header. - let ftrs' = Header HdrContentLength (show n) : ftrs + ftrs <- parseHeaders (map (buf_toStr bufOps) strs) + -- insert (computed) Content-Length header. + let ftrs' = Header HdrContentLength (show n) : ftrs return (ftrs',buf_concat bufOps (reverse acc))) - (readTillEmpty2 bufOps readL []) + (readTillEmpty2 bufOps readL []) | otherwise -> do some <- readBlk size - case some of - Left e -> return (Left e) - Right cdata -> do - _ <- readL -- CRLF is mandated after the chunk block; ToDo: check that the line is empty.? - chunkedTransferC bufOps readL readBlk (cdata:acc) (n+size) + case some of + Left e -> return (Left e) + Right cdata -> do + _ <- readL -- CRLF is mandated after the chunk block; ToDo: check that the line is empty.? + chunkedTransferC bufOps readL readBlk (cdata:acc) (n+size) where size | buf_isEmpty bufOps line = 0 | otherwise = - case readHex (buf_toStr bufOps line) of + case readHex (buf_toStr bufOps line) of (hx,_):_ -> hx _ -> 0 @@ -951,13 +951,13 @@ -- | Remove leading crlfs then call readTillEmpty2 (not required by RFC) readTillEmpty1 :: BufferOp a - -> IO (Result a) + -> IO (Result a) -> IO (Result [a]) readTillEmpty1 bufOps readL = readL >>= either (return . Left) (\ s -> - if buf_isLineTerm bufOps s + if buf_isLineTerm bufOps s then readTillEmpty1 bufOps readL else readTillEmpty2 bufOps readL [s]) @@ -967,14 +967,14 @@ -- thing to do - so probably indicates an -- error condition. readTillEmpty2 :: BufferOp a - -> IO (Result a) - -> [a] - -> IO (Result [a]) + -> IO (Result a) + -> [a] + -> IO (Result [a]) readTillEmpty2 bufOps readL list = readL >>= either (return . Left) (\ s -> - if buf_isLineTerm bufOps s || buf_isEmpty bufOps s + if buf_isLineTerm bufOps s || buf_isEmpty bufOps s then return (Right $ reverse (s:list)) else readTillEmpty2 bufOps readL (s:list)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/HTTP/Cookie.hs new/HTTP-4000.2.21/Network/HTTP/Cookie.hs --- old/HTTP-4000.2.20/Network/HTTP/Cookie.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/HTTP/Cookie.hs 2015-11-23 19:59:29.000000000 +0100 @@ -119,7 +119,7 @@ mkCookie :: String -> String -> [(String,String)] -> Cookie mkCookie nm cval more = - MkCookie { ckName = nm + MkCookie { ckName = nm , ckValue = cval , ckDomain = map toLower (fromMaybe dom (lookup "domain" more)) , ckPath = lookup "path" more diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/HTTP/HandleStream.hs new/HTTP-4000.2.21/Network/HTTP/HandleStream.hs --- old/HTTP-4000.2.20/Network/HTTP/HandleStream.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/HTTP/HandleStream.hs 2015-11-23 19:59:29.000000000 +0100 @@ -84,9 +84,9 @@ -- request transmission and its performance. sendHTTP_notify :: HStream ty => HandleStream ty - -> Request ty - -> IO () - -> IO (Result (Response ty)) + -> Request ty + -> IO () + -> IO (Result (Response ty)) sendHTTP_notify conn rq onSendComplete = do when providedClose $ (closeOnEnd conn True) onException (sendMain conn rq onSendComplete) @@ -106,9 +106,9 @@ -- Since we would wait forever, I have disabled use of 100-continue for now. sendMain :: HStream ty => HandleStream ty - -> Request ty - -> (IO ()) - -> IO (Result (Response ty)) + -> Request ty + -> (IO ()) + -> IO (Result (Response ty)) sendMain conn rqst onSendComplete = do --let str = if null (rqBody rqst) -- then show rqst @@ -128,7 +128,7 @@ switchResponse :: HStream ty => HandleStream ty - -> Bool {- allow retry? -} + -> Bool {- allow retry? -} -> Bool {- is body sent? -} -> Result ResponseData -> Request ty @@ -143,7 +143,7 @@ Continue | not bdy_sent -> do {- Time to send the body -} writeBlock conn (rqBody rqst) >>= either (return . Left) - (\ _ -> do + (\ _ -> do rsp <- getResponseHead conn switchResponse conn allow_retry True rsp rqst) | otherwise -> do {- keep waiting -} @@ -155,8 +155,8 @@ other than "100-Continue" -} -- TODO review throwing away of result _ <- writeBlock conn ((buf_append bufferOps) - (buf_fromStr bufferOps (show rqst)) - (rqBody rqst)) + (buf_fromStr bufferOps (show rqst)) + (rqBody rqst)) rsp <- getResponseHead conn switchResponse conn False bdy_sent rsp rqst @@ -171,22 +171,22 @@ ExpectEntity -> do r <- fmapE (\ (ftrs,bdy) -> Right (Response cd rn (hdrs++ftrs) bdy)) $ maybe (maybe (hopefulTransfer bo (readLine conn) []) - (\ x -> - readsOne (linearTransfer (readBlock conn)) - (return$responseParseError "unrecognized content-length value" x) - x) - cl) - (ifChunked (chunkedTransfer bo (readLine conn) (readBlock conn)) - (uglyDeathTransfer "sendHTTP")) + (\ x -> + readsOne (linearTransfer (readBlock conn)) + (return$responseParseError "unrecognized content-length value" x) + x) + cl) + (ifChunked (chunkedTransfer bo (readLine conn) (readBlock conn)) + (uglyDeathTransfer "sendHTTP")) tc case r of Left{} -> do - close conn - return r - Right (Response _ _ hs _) -> do - when (findConnClose hs) + close conn + return r + Right (Response _ _ hs _) -> do + when (findConnClose hs) (closeOnEnd conn True) - return r + return r where tc = lookupHeader HdrTransferEncoding hdrs @@ -208,18 +208,18 @@ getRequestHead = do fmapE (\es -> parseRequestHead (map (buf_toStr bufferOps) es)) (readTillEmpty1 bufferOps (readLine conn)) - + processRequest (rm,uri,hdrs) = fmapE (\ (ftrs,bdy) -> Right (Request uri rm (hdrs++ftrs) bdy)) $ - maybe - (maybe (return (Right ([], buf_empty bo))) -- hopefulTransfer "" - (\ x -> readsOne (linearTransfer (readBlock conn)) - (return$responseParseError "unrecognized Content-Length value" x) - x) - - cl) - (ifChunked (chunkedTransfer bo (readLine conn) (readBlock conn)) - (uglyDeathTransfer "receiveHTTP")) + maybe + (maybe (return (Right ([], buf_empty bo))) -- hopefulTransfer "" + (\ x -> readsOne (linearTransfer (readBlock conn)) + (return$responseParseError "unrecognized Content-Length value" x) + x) + + cl) + (ifChunked (chunkedTransfer bo (readLine conn) (readBlock conn)) + (uglyDeathTransfer "receiveHTTP")) tc where -- FIXME : Also handle 100-continue. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/HTTP/Headers.hs new/HTTP-4000.2.21/Network/HTTP/Headers.hs --- old/HTTP-4000.2.20/Network/HTTP/Headers.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/HTTP/Headers.hs 2015-11-23 19:59:29.000000000 +0100 @@ -279,17 +279,17 @@ parseHeaders :: [String] -> Result [Header] parseHeaders = catRslts [] . map (parseHeader . clean) . - joinExtended "" + joinExtended "" where -- Joins consecutive lines where the second line -- begins with ' ' or '\t'. joinExtended old [] = [old] joinExtended old (h : t) - | isLineExtension h = joinExtended (old ++ ' ' : tail h) t + | isLineExtension h = joinExtended (old ++ ' ' : tail h) t | otherwise = old : joinExtended h t - - isLineExtension (x:_) = x == ' ' || x == '\t' - isLineExtension _ = False + + isLineExtension (x:_) = x == ' ' || x == '\t' + isLineExtension _ = False clean [] = [] clean (h:t) | h `elem` "\t\r\n" = ' ' : clean t diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/HTTP/MD5Aux.hs new/HTTP-4000.2.21/Network/HTTP/MD5Aux.hs --- old/HTTP-4000.2.20/Network/HTTP/MD5Aux.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/HTTP/MD5Aux.hs 2015-11-23 19:59:29.000000000 +0100 @@ -91,6 +91,7 @@ instance Num ABCD where ABCD (a1, b1, c1, d1) + ABCD (a2, b2, c2, d2) = ABCD (a1 + a2, b1 + b2, c1 + c2, d1 + d2) + (-) = error "(-){ABCD}: no instance method defined" (*) = error "(*){ABCD}: no instance method defined" signum = error "signum{ABCD}: no instance method defined" fromInteger = error "fromInteger{ABCD}: no instance method defined" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/HTTP/Proxy.hs new/HTTP-4000.2.21/Network/HTTP/Proxy.hs --- old/HTTP-4000.2.20/Network/HTTP/Proxy.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/HTTP/Proxy.hs 2015-11-23 19:59:29.000000000 +0100 @@ -25,7 +25,7 @@ #endif -} -import Control.Monad ( when, mplus, join, liftM, liftM2) +import Control.Monad ( when, mplus, join, liftM2) #if defined(WIN32) import Network.HTTP.Base ( catchIO ) @@ -196,7 +196,7 @@ [] -> Nothing as -> Just (AuthBasic "" (unEscapeString usr) (unEscapeString pwd) uri) where - (usr,pwd) = chopAtDelim ':' as + (usr,pwd) = chopAtDelim ':' as uri2proxy _ = Nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/HTTP/Stream.hs new/HTTP-4000.2.21/Network/HTTP/Stream.hs --- old/HTTP-4000.2.20/Network/HTTP/Stream.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/HTTP/Stream.hs 2015-11-23 19:59:29.000000000 +0100 @@ -127,7 +127,7 @@ -- to the RFC. switchResponse :: Stream s => s - -> Bool {- allow retry? -} + -> Bool {- allow retry? -} -> Bool {- is body sent? -} -> Result ResponseData -> Request_String @@ -163,12 +163,12 @@ } Done -> do - when (findConnClose hdrs) - (closeOnEnd conn True) + when (findConnClose hdrs) + (closeOnEnd conn True) return (Right $ Response cd rn hdrs "") DieHorribly str -> do - close conn + close conn return $ responseParseError "sendHTTP" ("Invalid response: " ++ str) ExpectEntity -> @@ -183,14 +183,14 @@ Just x -> case map toLower (trim x) of "chunked" -> chunkedTransfer stringBufferOp - (readLine conn) (readBlock conn) + (readLine conn) (readBlock conn) _ -> uglyDeathTransfer "sendHTTP" ; case rslt of - Left e -> close conn >> return (Left e) - Right (ftrs,bdy) -> do - when (findConnClose (hdrs++ftrs)) - (closeOnEnd conn True) - return (Right (Response cd rn (hdrs++ftrs) bdy)) + Left e -> close conn >> return (Left e) + Right (ftrs,bdy) -> do + when (findConnClose (hdrs++ftrs)) + (closeOnEnd conn True) + return (Right (Response cd rn (hdrs++ftrs) bdy)) } -- | Receive and parse a HTTP request from the given Stream. Should be used @@ -204,13 +204,13 @@ do { lor <- readTillEmpty1 stringBufferOp (readLine conn) ; return $ lor >>= parseRequestHead } - + processRequest (Left e) = return $ Left e - processRequest (Right (rm,uri,hdrs)) = - do -- FIXME : Also handle 100-continue. + processRequest (Right (rm,uri,hdrs)) = + do -- FIXME : Also handle 100-continue. let tc = lookupHeader HdrTransferEncoding hdrs cl = lookupHeader HdrContentLength hdrs - rslt <- case tc of + rslt <- case tc of Nothing -> case cl of Just x -> linearTransfer (readBlock conn) (read x :: Int) @@ -218,12 +218,12 @@ Just x -> case map toLower (trim x) of "chunked" -> chunkedTransfer stringBufferOp - (readLine conn) (readBlock conn) + (readLine conn) (readBlock conn) _ -> uglyDeathTransfer "receiveHTTP" return $ do - (ftrs,bdy) <- rslt - return (Request uri rm (hdrs++ftrs) bdy) + (ftrs,bdy) <- rslt + return (Request uri rm (hdrs++ftrs) bdy) -- | Very simple function, send a HTTP response over the given stream. This -- could be improved on to use different transfer types. @@ -233,4 +233,4 @@ -- write body immediately, don't wait for 100 CONTINUE -- TODO review throwing away of result _ <- writeBlock conn (rspBody rsp) - return () + return () diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/HTTP.hs new/HTTP-4000.2.21/Network/HTTP.hs --- old/HTTP-4000.2.20/Network/HTTP.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/HTTP.hs 2015-11-23 19:59:29.000000000 +0100 @@ -130,9 +130,9 @@ -- request transmission and its performance. sendHTTP_notify :: HStream ty => HandleStream ty - -> Request ty - -> IO () - -> IO (Result (Response ty)) + -> Request ty + -> IO () + -> IO (Result (Response ty)) sendHTTP_notify conn rq onSendComplete = do let norm_r = normalizeRequest defaultNormalizeRequestOptions rq S.sendHTTP_notify conn norm_r onSendComplete diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/StreamDebugger.hs new/HTTP-4000.2.21/Network/StreamDebugger.hs --- old/HTTP-4000.2.20/Network/StreamDebugger.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/StreamDebugger.hs 2015-11-23 19:59:29.000000000 +0100 @@ -27,7 +27,7 @@ hSetBuffering, BufferMode(NoBuffering) ) import Network.TCP ( HandleStream, HStream, - StreamHooks(..), setStreamHooks, getStreamHooks ) + StreamHooks(..), setStreamHooks, getStreamHooks ) -- | Allows stream logging. Refer to 'debugStream' below. data StreamDebugger x @@ -37,17 +37,17 @@ readBlock (Dbg h x) n = do val <- readBlock x n hPutStrLn h ("--readBlock " ++ show n) - hPutStrLn h (show val) + hPutStrLn h (show val) return val readLine (Dbg h x) = do val <- readLine x hPutStrLn h ("--readLine") - hPutStrLn h (show val) + hPutStrLn h (show val) return val writeBlock (Dbg h x) str = do val <- writeBlock x str hPutStrLn h ("--writeBlock" ++ show str) - hPutStrLn h (show val) + hPutStrLn h (show val) return val close (Dbg h x) = do hPutStrLn h "--closing..." @@ -89,12 +89,12 @@ hPutStrLn h ("--readBlock " ++ show n) hPutStrLn h (either show show eval) , hook_readLine = \ toStr val -> do - let eval = case val of { Left e -> Left e ; Right v -> Right $ toStr v} + let eval = case val of { Left e -> Left e ; Right v -> Right $ toStr v} hPutStrLn h ("--readLine") - hPutStrLn h (either show show eval) + hPutStrLn h (either show show eval) , hook_writeBlock = \ toStr str val -> do hPutStrLn h ("--writeBlock " ++ show val) - hPutStrLn h (toStr str) + hPutStrLn h (toStr str) , hook_close = do hPutStrLn h "--closing..." hFlush h diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/HTTP-4000.2.20/Network/TCP.hs new/HTTP-4000.2.21/Network/TCP.hs --- old/HTTP-4000.2.20/Network/TCP.hs 2015-06-21 19:17:52.000000000 +0200 +++ new/HTTP-4000.2.21/Network/TCP.hs 2015-11-23 19:59:29.000000000 +0100 @@ -88,12 +88,12 @@ data Conn a = MkConn { connSock :: ! Socket - , connHandle :: Handle + , connHandle :: Handle , connBuffer :: BufferOp a - , connInput :: Maybe a + , connInput :: Maybe a , connEndPoint :: EndPoint - , connHooks :: Maybe (StreamHooks a) - , connCloseEOF :: Bool -- True => close socket upon reaching end-of-stream. + , connHooks :: Maybe (StreamHooks a) + , connCloseEOF :: Bool -- True => close socket upon reaching end-of-stream. } | ConnClosed deriving(Eq) @@ -248,8 +248,8 @@ socketConnection :: BufferType ty => String -> Int - -> Socket - -> IO (HandleStream ty) + -> Socket + -> IO (HandleStream ty) socketConnection hst port sock = socketConnection_ hst port sock False -- Internal function used to control the on-demand streaming of input @@ -257,21 +257,21 @@ socketConnection_ :: BufferType ty => String -> Int - -> Socket - -> Bool - -> IO (HandleStream ty) + -> Socket + -> Bool + -> IO (HandleStream ty) socketConnection_ hst port sock stashInput = do h <- socketToHandle sock ReadWriteMode mb <- case stashInput of { True -> liftM Just $ buf_hGetContents bufferOps h; _ -> return Nothing } let conn = MkConn { connSock = sock - , connHandle = h - , connBuffer = bufferOps - , connInput = mb - , connEndPoint = EndPoint hst port - , connHooks = Nothing - , connCloseEOF = False - } + , connHandle = h + , connBuffer = bufferOps + , connInput = mb + , connEndPoint = EndPoint hst port + , connHooks = Nothing + , connCloseEOF = False + } v <- newMVar conn return (HandleStream v) @@ -330,7 +330,7 @@ x <- bufferGetBlock ref n maybe (return ()) (\ h -> hook_readBlock h (buf_toStr $ connBuffer conn) n x) - (connHooks' conn) + (connHooks' conn) return x -- This function uses a buffer, at this time the buffer is just 1000 characters. @@ -340,7 +340,7 @@ x <- bufferReadLine ref maybe (return ()) (\ h -> hook_readLine h (buf_toStr $ connBuffer conn) x) - (connHooks' conn) + (connHooks' conn) return x -- The 'Connection' object allows no outward buffering, @@ -350,7 +350,7 @@ x <- bufferPutBlock (connBuffer conn) (connHandle conn) b maybe (return ()) (\ h -> hook_writeBlock h (buf_toStr $ connBuffer conn) b x) - (connHooks' conn) + (connHooks' conn) return x closeIt :: HStream ty => HandleStream ty -> (ty -> Bool) -> Bool -> IO () @@ -361,7 +361,7 @@ conn <- readMVar (getRef c) maybe (return ()) (hook_close) - (connHooks' conn) + (connHooks' conn) closeEOF :: HandleStream ty -> Bool -> IO () closeEOF c flg = modifyMVar_ (getRef c) (\ co -> return co{connCloseEOF=flg}) @@ -376,11 +376,11 @@ _ -> do catchIO (buf_hGet (connBuffer conn) (connHandle conn) n >>= return.return) (\ e -> - if isEOFError e - then do - when (connCloseEOF conn) $ catchIO (closeQuick ref) (\ _ -> return ()) - return (return (buf_empty (connBuffer conn))) - else return (failMisc (show e))) + if isEOFError e + then do + when (connCloseEOF conn) $ catchIO (closeQuick ref) (\ _ -> return ()) + return (return (buf_empty (connBuffer conn))) + else return (failMisc (show e))) bufferPutBlock :: BufferOp a -> Handle -> a -> IO (Result ()) bufferPutBlock ops h b = @@ -397,12 +397,12 @@ return (return (buf_append (connBuffer conn) a newl)) _ -> catchIO (buf_hGetLine (connBuffer conn) (connHandle conn) >>= - return . return . appendNL (connBuffer conn)) + return . return . appendNL (connBuffer conn)) (\ e -> if isEOFError e then do - when (connCloseEOF conn) $ catchIO (closeQuick ref) (\ _ -> return ()) - return (return (buf_empty (connBuffer conn))) + when (connCloseEOF conn) $ catchIO (closeQuick ref) (\ _ -> return ()) + return (return (buf_empty (connBuffer conn))) else return (failMisc (show e))) where -- yes, this s**ks.. _may_ have to be addressed if perf

1 0

commit gtk2hs-buildtools for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package gtk2hs-buildtools for openSUSE:Factory checked in at 2015-12-01 09:19:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gtk2hs-buildtools (Old) and /work/SRC/openSUSE:Factory/.gtk2hs-buildtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gtk2hs-buildtools" Changes: -------- --- /work/SRC/openSUSE:Factory/gtk2hs-buildtools/gtk2hs-buildtools.changes 2015-09-08 17:57:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gtk2hs-buildtools.new/gtk2hs-buildtools.changes 2015-12-01 09:19:30.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 29 17:10:18 UTC 2015 - mimi.vx(a)gmail.com + +- update to 0.13.0.5 + +------------------------------------------------------------------- Old: ---- gtk2hs-buildtools-0.13.0.4.tar.gz New: ---- gtk2hs-buildtools-0.13.0.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gtk2hs-buildtools.spec ++++++ --- /var/tmp/diff_new_pack.dY0wC9/_old 2015-12-01 09:19:31.000000000 +0100 +++ /var/tmp/diff_new_pack.dY0wC9/_new 2015-12-01 09:19:31.000000000 +0100 @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: gtk2hs-buildtools -Version: 0.13.0.4 +Version: 0.13.0.5 Release: 0 Summary: Tools to build the Gtk2Hs suite of User Interface libraries +License: GPL-2.0+ Group: System/Libraries -License: GPL-2.0+ Url: https://hackage.haskell.org/package/%{name} Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.t… BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -53,15 +54,12 @@ %prep %setup -q - %build %ghc_bin_build - %install %ghc_bin_install - %files %defattr(-,root,root,-) %doc COPYING @@ -70,5 +68,4 @@ %{_bindir}/gtk2hsTypeGen %{_datadir}/%{name}-%{version} - %changelog ++++++ gtk2hs-buildtools-0.13.0.4.tar.gz -> gtk2hs-buildtools-0.13.0.5.tar.gz ++++++ ++++ 10226 lines of diff (skipped)

1 0

commit alex for openSUSE:Factory
by root＠hilbert.suse.de 01 Dec '15

01 Dec '15

Hello community, here is the log from the commit of package alex for openSUSE:Factory checked in at 2015-12-01 09:19:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/alex (Old) and /work/SRC/openSUSE:Factory/.alex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "alex" Changes: -------- --- /work/SRC/openSUSE:Factory/alex/alex.changes 2015-08-25 08:45:44.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.alex.new/alex.changes 2015-12-01 09:19:29.000000000 +0100 @@ -1,0 +2,8 @@ +Sun Nov 29 17:05:31 UTC 2015 - mimi.vx(a)gmail.com + +- update to 3.1.5 +- drop alex-3.1.4-ghc-7.10.patch, merged by upstream +* Generate less warning-laden code, and suppress other warnings. +* Bug fixes. + +------------------------------------------------------------------- Old: ---- alex-3.1.4-ghc-7.10.patch alex-3.1.4.tar.gz New: ---- alex-3.1.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ alex.spec ++++++ --- /var/tmp/diff_new_pack.fYyJjk/_old 2015-12-01 09:19:30.000000000 +0100 +++ /var/tmp/diff_new_pack.fYyJjk/_new 2015-12-01 09:19:30.000000000 +0100 @@ -20,7 +20,7 @@ %bcond_without tests Name: alex -Version: 3.1.4 +Version: 3.1.5 Release: 0 Summary: Tool for generating lexical analysers in Haskell License: BSD-3-Clause @@ -29,8 +29,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://hackage.haskell.org/package/%{name} Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{ve… -# PATCH-FIX-UPSTREAM alex-3.1.4-ghc-7.10.patch -- fix for new prelude in ghc-7.10 -- Sergei Trofimovich -Patch0: alex-3.1.4-ghc-7.10.patch BuildRequires: autoconf BuildRequires: ghc-Cabal-devel @@ -39,6 +37,7 @@ BuildRequires: ghc-containers-devel BuildRequires: ghc-directory-devel BuildRequires: ghc-rpm-macros +BuildRequires: happy %description Alex is a tool for generating lexical analysers in Haskell. It takes a @@ -48,7 +47,6 @@ %prep %setup -q -%patch0 -p1 %build %ghc_bin_build ++++++ alex-3.1.4.tar.gz -> alex-3.1.5.tar.gz ++++++ ++++ 2503 lines of diff (skipped)

1 0