openSUSE Commits
Threads by month
- ----- 2024 -----
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
April 2016
- 1 participants
- 1255 discussions
Hello community,
here is the log from the commit of package ghc-persistent-template for openSUSE:Factory checked in at 2016-04-28 16:57:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-persistent-template (Old)
and /work/SRC/openSUSE:Factory/.ghc-persistent-template.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-persistent-template"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-persistent-template/ghc-persistent-template.changes 2016-03-18 21:41:14.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-persistent-template.new/ghc-persistent-template.changes 2016-04-28 17:02:12.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Apr 26 08:36:30 UTC 2016 - mimi.vx(a)gmail.com
+
+-update to 2.1.8
+* Support for GHC 8
+* aeson 0.11
+* transformers 0.5
+
+-------------------------------------------------------------------
Old:
----
persistent-template-2.1.6.tar.gz
New:
----
persistent-template-2.1.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-persistent-template.spec ++++++
--- /var/tmp/diff_new_pack.mBLjqf/_old 2016-04-28 17:02:14.000000000 +0200
+++ /var/tmp/diff_new_pack.mBLjqf/_new 2016-04-28 17:02:14.000000000 +0200
@@ -20,7 +20,7 @@
%bcond_with tests
Name: ghc-persistent-template
-Version: 2.1.6
+Version: 2.1.8
Release: 0
Summary: Type-safe, non-relational, multi-backend persistence
Group: System/Libraries
++++++ persistent-template-2.1.6.tar.gz -> persistent-template-2.1.8.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-template-2.1.6/ChangeLog.md new/persistent-template-2.1.8/ChangeLog.md
--- old/persistent-template-2.1.6/ChangeLog.md 2016-03-08 09:17:27.000000000 +0100
+++ new/persistent-template-2.1.8/ChangeLog.md 2016-04-23 09:41:14.000000000 +0200
@@ -1,3 +1,7 @@
+## 2.1.7
+
+* Support for GHC 8 [#556](https://github.com/yesodweb/persistent/issues/556)
+
## 2.1.6
* aeson 0.11
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-template-2.1.6/Database/Persist/TH.hs new/persistent-template-2.1.8/Database/Persist/TH.hs
--- old/persistent-template-2.1.6/Database/Persist/TH.hs 2016-03-08 09:17:27.000000000 +0100
+++ new/persistent-template-2.1.8/Database/Persist/TH.hs 2016-04-23 09:42:28.000000000 +0200
@@ -47,7 +47,11 @@
import Database.Persist
import Database.Persist.Sql (Migration, migrate, SqlBackend, PersistFieldSql)
import Database.Persist.Quasi
-import Language.Haskell.TH.Lib (varE)
+import Language.Haskell.TH.Lib (
+#if MIN_VERSION_template_haskell(2,11,0)
+ conT,
+#endif
+ varE)
import Language.Haskell.TH.Quote
import Language.Haskell.TH.Syntax
import Data.Char (toLower, toUpper)
@@ -396,14 +400,21 @@
Just (a, b) -> cons (toUpper a) b
Nothing -> t
-dataTypeDec :: MkPersistSettings -> EntityDef -> Dec
-dataTypeDec mps t =
- DataD [] nameFinal paramsFinal constrs
- $ map (mkName . unpack) $ entityDerives t
+dataTypeDec :: MkPersistSettings -> EntityDef -> Q Dec
+dataTypeDec mps t = do
+ let names = map (mkName . unpack) $ entityDerives t
+#if MIN_VERSION_template_haskell(2,11,0)
+ DataD [] nameFinal paramsFinal
+ Nothing
+ constrs
+ <$> mapM conT names
+#else
+ return $ DataD [] nameFinal paramsFinal constrs names
+#endif
where
mkCol x fd@FieldDef {..} =
(mkName $ unpack $ recName mps x fieldHaskell,
- if fieldStrict then IsStrict else NotStrict,
+ if fieldStrict then isStrict else notStrict,
maybeIdType mps fd Nothing Nothing
)
(nameFinal, paramsFinal)
@@ -420,7 +431,7 @@
sumCon fd = NormalC
(sumConstrName mps t fd)
- [(NotStrict, maybeIdType mps fd Nothing Nothing)]
+ [(notStrict, maybeIdType mps fd Nothing Nothing)]
sumConstrName :: MkPersistSettings -> EntityDef -> FieldDef -> Name
sumConstrName mps t FieldDef {..} = mkName $ unpack $ concat
@@ -435,6 +446,9 @@
uniqueTypeDec mps t =
DataInstD [] ''Unique
[genericDataType mps (entityHaskell t) backendT]
+#if MIN_VERSION_template_haskell(2,11,0)
+ Nothing
+#endif
(map (mkUnique mps t) $ entityUniques t)
[]
@@ -449,7 +463,7 @@
go :: (FieldDef, IsNullable) -> (Strict, Type)
go (_, Nullable _) | not force = error nullErrMsg
- go (fd, y) = (NotStrict, maybeIdType mps fd Nothing (Just y))
+ go (fd, y) = (notStrict, maybeIdType mps fd Nothing (Just y))
lookup3 :: Text -> [FieldDef] -> (FieldDef, IsNullable)
lookup3 s [] =
@@ -691,9 +705,16 @@
bi <- backendKeyI
return (bi, allInstances)
+#if MIN_VERSION_template_haskell(2,11,0)
+ cxti <- mapM conT i
+ let kd = if useNewtype
+ then NewtypeInstD [] k [recordType] Nothing dec cxti
+ else DataInstD [] k [recordType] Nothing [dec] cxti
+#else
let kd = if useNewtype
then NewtypeInstD [] k [recordType] dec i
else DataInstD [] k [recordType] [dec] i
+#endif
return (kd, instDecs)
where
keyConE = keyConExp t
@@ -827,9 +848,9 @@
backendKeyType
| mpsGeneric mps = ConT ''BackendKey `AppT` backendT
| otherwise = ConT ''BackendKey `AppT` mpsBackend mps
- idKeyVar ft = (unKeyName t, NotStrict, ft)
+ idKeyVar ft = (unKeyName t, notStrict, ft)
primaryKeyVar fd = ( keyFieldName mps t fd
- , NotStrict
+ , notStrict
, ftToType $ fieldType fd
)
@@ -939,11 +960,12 @@
let instanceConstraint = if not (mpsGeneric mps) then [] else
[mkClassP ''PersistStore [backendT]]
+ dtd <- dataTypeDec mps t
return $ addSyn $
- dataTypeDec mps t : mconcat fkc `mappend`
+ dtd : mconcat fkc `mappend`
([ TySynD (keyIdName t) [] $
ConT ''Key `AppT` ConT (mkName nameS)
- , InstanceD instanceConstraint clazz $
+ , instanceD instanceConstraint clazz $
[ uniqueTypeDec mps t
, keyTypeDec
, keyToValues'
@@ -960,6 +982,9 @@
[ genDataType
, VarT $ mkName "typ"
]
+#if MIN_VERSION_template_haskell(2,11,0)
+ Nothing
+#endif
(map fst fields)
[]
, FunD 'persistFieldDef (map snd fields)
@@ -1182,7 +1207,7 @@
let entityT = genericDataType mps name backendT
return $
- InstanceD
+ instanceD
[ mkClassP ''PersistQuery [backendT]
, mkEqualP (ConT ''PersistEntityBackend `AppT` entityT) backendT
]
@@ -1226,7 +1251,7 @@
-> Bool -- ^ include PersistStore backend constraint
-> Type -> [Dec] -> Dec
typeInstanceD clazz hasBackend typ =
- InstanceD ctx (ConT clazz `AppT` typ)
+ instanceD ctx (ConT clazz `AppT` typ)
where
ctx
| hasBackend = [mkClassP ''PersistStore [backendT]]
@@ -1560,6 +1585,27 @@
mkEqualP = EqualP
#endif
+#if MIN_VERSION_template_haskell(2,11,0)
+notStrict :: Bang
+notStrict = Bang NoSourceUnpackedness NoSourceStrictness
+
+isStrict :: Bang
+isStrict = Bang NoSourceUnpackedness SourceStrict
+#else
+notStrict :: Strict
+notStrict = NotStrict
+
+isStrict :: Strict
+isStrict = IsStrict
+#endif
+
+instanceD :: Cxt -> Type -> [Dec] -> Dec
+#if MIN_VERSION_template_haskell(2,11,0)
+instanceD = InstanceD Nothing
+#else
+instanceD = InstanceD
+#endif
+
-- entityUpdates :: EntityDef -> [(HaskellName, FieldType, IsNullable, PersistUpdate)]
-- entityUpdates =
-- concatMap go . entityFields
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/persistent-template-2.1.6/persistent-template.cabal new/persistent-template-2.1.8/persistent-template.cabal
--- old/persistent-template-2.1.6/persistent-template.cabal 2016-03-08 09:17:27.000000000 +0100
+++ new/persistent-template-2.1.8/persistent-template.cabal 2016-04-23 09:42:38.000000000 +0200
@@ -1,5 +1,5 @@
name: persistent-template
-version: 2.1.6
+version: 2.1.8
license: MIT
license-file: LICENSE
author: Michael Snoyman <michael(a)snoyman.com>
1
0
Hello community,
here is the log from the commit of package ghc-cryptonite for openSUSE:Factory checked in at 2016-04-28 16:57:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-cryptonite (Old)
and /work/SRC/openSUSE:Factory/.ghc-cryptonite.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-cryptonite"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-cryptonite/ghc-cryptonite.changes 2016-01-07 00:25:24.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-cryptonite.new/ghc-cryptonite.changes 2016-04-28 17:02:09.000000000 +0200
@@ -1,0 +2,36 @@
+Sun Apr 10 18:56:31 UTC 2016 - mimi.vx(a)gmail.com
+
+- update to 0.14
+* Fix serialization of DH and ECDH
+* Reduce size of SHA3 context instead of allocating all-size fit memory. save up to
+ 72 bytes of memory per context for SHA3-512.
+* Add a Seed capability to the main DRG, to be able to debug/reproduce randomized
+ program where you would want to disable the randomness.
+* Add support for Cipher-based Message Authentication Code (CMAC) (Kei Hibino)
+* CHANGE Change the SharedKey for Crypto.PubKey.DH and Crypto.PubKey.ECC.DH, from
+ an Integer newtype to a ScrubbedBytes newtype. Prevent mistake where the bytes
+ representation is generated without the right padding (when needed).
+* CHANGE Keep The field size in bits, in the Params in Crypto.PubKey.DH, moving
+ from 2 elements to 3 elements in the structure.
+
+-------------------------------------------------------------------
+Mon Feb 22 07:35:21 UTC 2016 - mimi.vx(a)gmail.com
+
+- update to 0.13
+* SECURITY Fix buffer overflow issue in SHA384, copying 16 extra bytes from
+ the SHA512 context to the destination memory pointer leading to memory
+ corruption, segfault
+* Fix compilation issue with Ed448 on 32 bits machine.
+
+-------------------------------------------------------------------
+Sun Feb 14 07:17:14 UTC 2016 - mimi.vx(a)gmail.com
+
+- update to 0.11
+* Truncate hashing correctly for DSA
+* Add support for HKDF (RFC 5869)
+* Add support for Ed448
+* Extends support for Blake2s to 224 bits version.
+* Compilation fix with AESNI and ghci compiling C source in a weird order.
+* Fix example compilation, typo, and warning
+
+-------------------------------------------------------------------
Old:
----
cryptonite-0.10.tar.gz
New:
----
cryptonite-0.15.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-cryptonite.spec ++++++
--- /var/tmp/diff_new_pack.cA33P0/_old 2016-04-28 17:02:12.000000000 +0200
+++ /var/tmp/diff_new_pack.cA33P0/_new 2016-04-28 17:02:12.000000000 +0200
@@ -20,7 +20,7 @@
%bcond_with tests
Name: ghc-cryptonite
-Version: 0.10
+Version: 0.15
Release: 0
Summary: Cryptography Primitives sink
Group: System/Libraries
++++++ cryptonite-0.10.tar.gz -> cryptonite-0.15.tar.gz ++++++
++++ 1796 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package youtube-dl for openSUSE:Factory checked in at 2016-04-28 16:57:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/youtube-dl (Old)
and /work/SRC/openSUSE:Factory/.youtube-dl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "youtube-dl"
Changes:
--------
--- /work/SRC/openSUSE:Factory/youtube-dl/youtube-dl.changes 2016-04-12 19:39:42.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.youtube-dl.new/youtube-dl.changes 2016-04-28 17:02:06.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 18 23:23:08 UTC 2016 - jengelh(a)inai.de
+
+- Update to new upstream release 2016.04.13
+* Add extractors for cliprs, presstv, auroravid, zdnet videos, cbs
+
+-------------------------------------------------------------------
Old:
----
youtube-dl-2016.04.01.tar.gz
youtube-dl-2016.04.01.tar.gz.sig
New:
----
youtube-dl-2016.04.13.tar.gz
youtube-dl-2016.04.13.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ youtube-dl.spec ++++++
--- /var/tmp/diff_new_pack.srsFPu/_old 2016-04-28 17:02:08.000000000 +0200
+++ /var/tmp/diff_new_pack.srsFPu/_new 2016-04-28 17:02:08.000000000 +0200
@@ -17,7 +17,7 @@
Name: youtube-dl
-Version: 2016.04.01
+Version: 2016.04.13
Release: 0
Summary: A tool for downloading from Youtube
License: SUSE-Public-Domain and CC-BY-SA-3.0
++++++ youtube-dl-2016.04.01.tar.gz -> youtube-dl-2016.04.13.tar.gz ++++++
++++ 5671 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package pam_yubico for openSUSE:Factory checked in at 2016-04-28 16:56:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pam_yubico (Old)
and /work/SRC/openSUSE:Factory/.pam_yubico.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pam_yubico"
Changes:
--------
--- /work/SRC/openSUSE:Factory/pam_yubico/pam_yubico.changes 2015-10-14 16:44:30.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.pam_yubico.new/pam_yubico.changes 2016-04-28 17:02:03.000000000 +0200
@@ -1,0 +2,8 @@
+Mon Apr 25 20:18:57 UTC 2016 - t.gruner(a)katodev.de
+
+- Version 2.21 (released 2016-02-19)
+ - Add proxy support for yubico-c-client.
+ - Check that conv is set before trying to use it fixes a crash bug with the osx loginwindow.
+ - Add building of a mac installer.
+
+-------------------------------------------------------------------
Old:
----
pam_yubico-2.20.tar.gz
pam_yubico-2.20.tar.gz.sig
New:
----
pam_yubico-2.21.tar.gz
pam_yubico-2.21.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pam_yubico.spec ++++++
--- /var/tmp/diff_new_pack.YVmOPM/_old 2016-04-28 17:02:05.000000000 +0200
+++ /var/tmp/diff_new_pack.YVmOPM/_new 2016-04-28 17:02:05.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package pam_yubico
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -17,7 +17,7 @@
Name: pam_yubico
-Version: 2.20
+Version: 2.21
Release: 0
Summary: Yubico Pluggable Authentication Module (PAM)
License: BSD-2-Clause
++++++ pam_yubico-2.20.tar.gz -> pam_yubico-2.21.tar.gz ++++++
++++ 2185 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/ChangeLog new/pam_yubico-2.21/ChangeLog
--- old/pam_yubico-2.20/ChangeLog 2015-09-22 08:14:23.000000000 +0200
+++ new/pam_yubico-2.21/ChangeLog 2016-02-19 12:18:10.000000000 +0100
@@ -1,3 +1,75 @@
+2016-02-19 Klas Lindfors <klas(a)yubico.com>
+
+ * NEWS: NEWS for 2.21
+
+2016-02-17 Klas Lindfors <klas(a)yubico.com>
+
+ * mac.mk: add first stab at makefile for mac installer fixes #76
+
+2016-02-17 Klas Lindfors <klas(a)yubico.com>
+
+ * pam_yubico.c, util.c: pass cfg->debug to check_firmware_version()
+ and let it use D macro
+
+2016-02-16 Klas Lindfors <klali(a)avm.se>
+
+ * : Merge pull request #88 from
+ shankerwangmiao/bug-fix-for-null-conv add check for NULL conv
+
+2015-11-16 Klas Lindfors <klas(a)yubico.com>
+
+ * : commit e231b8217cdfc25bffc7181a1270dfd840a3aebf Author: mikemn
+ <mikemn(a)users.noreply.github.com> Date: Thu Nov 12 15:02:49 2015
+ -0600
+
+2015-11-11 mikemn <mikemn(a)users.noreply.github.com>
+
+ * pam_yubico.8.txt, pam_yubico.c: Add proxy support via Curl
+
+2015-11-13 Klas Lindfors <klas(a)yubico.com>
+
+ * tests/aux/build-and-test.sh: set -e later for travis and hope for
+ the best
+
+2015-11-13 Klas Lindfors <klas(a)yubico.com>
+
+ * tests/aux/build-and-test.sh: add brew update for travis
+
+2015-10-08 Klas Lindfors <klas(a)yubico.com>
+
+ * configure.ac, m4/valgrind-tests.m4: with more thought: remove
+ valgrind for tests since curl+gnutls seems to leave gnutls inited data around
+
+2015-10-08 Klas Lindfors <klas(a)yubico.com>
+
+ * configure.ac, m4/valgrind-tests.m4: add valgrind-tests
+
+2015-10-08 Klas Lindfors <klas(a)yubico.com>
+
+ * pam_yubico.c: use correct modifier for size_t print
+
+2015-10-08 Klas Lindfors <klas(a)yubico.com>
+
+ * .travis.yml, tests/aux/build-and-test.sh, tests/pam_test.c: setup
+ travis to do multi-os builds
+
+2015-10-08 Klas Lindfors <klas(a)yubico.com>
+
+ * tests/Makefile.am, tests/test.c: drop the non-portable test test it linked with the module and didn't really do anything, making the
+ test suite more fragile than necessary
+
+2015-10-05 Klas Lindfors <klas(a)yubico.com>
+
+ * README, doc/YubiKey_and_FreeRADIUS_1FA_via_PAM.adoc,
+ doc/YubiKey_and_FreeRADIUS_via_PAM.adoc: remove forgotten references
+ to wiki There is no wiki for this project, that information is either in the
+ doc folder or in the project manpages. Both of which accessible from
+ https://developers.yubico.com/yubico-pam/ fixes #81
+
+2015-09-22 Klas Lindfors <klas(a)yubico.com>
+
+ * NEWS, configure.ac: bump versions
+
2015-09-22 Klas Lindfors <klas(a)yubico.com>
* NEWS: NEWS for 2.20
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/NEWS new/pam_yubico-2.21/NEWS
--- old/pam_yubico-2.20/NEWS 2015-09-22 08:14:05.000000000 +0200
+++ new/pam_yubico-2.21/NEWS 2016-02-19 12:17:55.000000000 +0100
@@ -1,5 +1,14 @@
pam_yubico NEWS -- History of user-visible changes. -*- outline -*-
+* Version 2.21 (released 2016-02-19)
+
+** Add proxy support for yubico-c-client.
+
+** Check that conv is set before trying to use it
+fixes a crash bug with the osx loginwindow.
+
+** Add building of a mac installer.
+
* Version 2.20 (released 2015-09-22)
** Add cainfo option to allow usage of a cabundle instead of path.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/README new/pam_yubico-2.21/README
--- old/pam_yubico-2.20/README 2015-03-17 09:32:47.000000000 +0100
+++ new/pam_yubico-2.21/README 2015-11-16 09:09:04.000000000 +0100
@@ -129,7 +129,7 @@
mv /usr/local/lib/security/pam_yubico.so /lib/security/
----
-For more information, see the project Wiki page.
+For more information, see the project documentation.
Supported PAM module parameters are:
@@ -188,6 +188,12 @@
required if 'https' or 'ldaps' are used in 'url' and 'ldap_uri'
respectively.
+proxy::
+specify a proxy to connect to the validation server. Valid schemes are
+socks4://, socks4a://, socks5:// or socks5h://. Socks5h asks the proxy
+to do the dns resolving. If no scheme or port is specified HTTP proxy
+port 1080 will be used.
+
verbose_otp::
This argument is used to show the OTP (One-Time Password) when it
is entered, i.e. to enable terminal echo of entered characters.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/build-aux/ar-lib new/pam_yubico-2.21/build-aux/ar-lib
--- old/pam_yubico-2.20/build-aux/ar-lib 2015-08-11 08:53:25.000000000 +0200
+++ new/pam_yubico-2.21/build-aux/ar-lib 2015-11-11 12:48:14.000000000 +0100
@@ -4,7 +4,7 @@
me=ar-lib
scriptversion=2012-03-01.08; # UTC
-# Copyright (C) 2010-2013 Free Software Foundation, Inc.
+# Copyright (C) 2010-2014 Free Software Foundation, Inc.
# Written by Peter Rosin <peda(a)lysator.liu.se>.
#
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/build-aux/compile new/pam_yubico-2.21/build-aux/compile
--- old/pam_yubico-2.20/build-aux/compile 2015-08-11 08:53:25.000000000 +0200
+++ new/pam_yubico-2.21/build-aux/compile 2015-11-11 12:48:14.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
-# Copyright (C) 1999-2013 Free Software Foundation, Inc.
+# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey(a)cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/build-aux/missing new/pam_yubico-2.21/build-aux/missing
--- old/pam_yubico-2.20/build-aux/missing 2015-08-11 08:53:25.000000000 +0200
+++ new/pam_yubico-2.21/build-aux/missing 2015-11-11 12:48:14.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2013-10-28.13; # UTC
-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/build-aux/test-driver new/pam_yubico-2.21/build-aux/test-driver
--- old/pam_yubico-2.20/build-aux/test-driver 2015-08-11 08:53:25.000000000 +0200
+++ new/pam_yubico-2.21/build-aux/test-driver 2015-11-11 12:48:15.000000000 +0100
@@ -3,7 +3,7 @@
scriptversion=2013-07-13.22; # UTC
-# Copyright (C) 2011-2013 Free Software Foundation, Inc.
+# Copyright (C) 2011-2014 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -106,11 +106,14 @@
# Test script is run here.
"$@" >$log_file 2>&1
estatus=$?
+
if test $enable_hard_errors = no && test $estatus -eq 99; then
- estatus=1
+ tweaked_estatus=1
+else
+ tweaked_estatus=$estatus
fi
-case $estatus:$expect_failure in
+case $tweaked_estatus:$expect_failure in
0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
0:*) col=$grn res=PASS recheck=no gcopy=no;;
77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
@@ -119,6 +122,12 @@
*:*) col=$red res=FAIL recheck=yes gcopy=yes;;
esac
+# Report the test outcome and exit status in the logs, so that one can
+# know whether the test passed or failed simply by looking at the '.log'
+# file, without the need of also peaking into the corresponding '.trs'
+# file (automake bug#11814).
+echo "$res $test_name (exit status: $estatus)" >>$log_file
+
# Report outcome to console.
echo "${col}${res}${std}: $test_name"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/configure.ac new/pam_yubico-2.21/configure.ac
--- old/pam_yubico-2.20/configure.ac 2015-09-11 13:55:29.000000000 +0200
+++ new/pam_yubico-2.21/configure.ac 2015-10-08 12:04:18.000000000 +0200
@@ -26,7 +26,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-AC_INIT([pam_yubico], [2.20], [yubico-devel(a)googlegroups.com])
+AC_INIT([pam_yubico], [2.21], [yubico-devel(a)googlegroups.com])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.11 foreign -Wall -Werror])
@@ -160,7 +160,6 @@
gl_WARN_ADD([-fdiagnostics-show-option])
fi
-
AC_CONFIG_FILES(Makefile)
AC_CONFIG_FILES(tests/Makefile)
AC_OUTPUT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/doc/YubiKey_and_FreeRADIUS_1FA_via_PAM.adoc new/pam_yubico-2.21/doc/YubiKey_and_FreeRADIUS_1FA_via_PAM.adoc
--- old/pam_yubico-2.20/doc/YubiKey_and_FreeRADIUS_1FA_via_PAM.adoc 2014-10-30 08:10:39.000000000 +0100
+++ new/pam_yubico-2.21/doc/YubiKey_and_FreeRADIUS_1FA_via_PAM.adoc 2015-10-05 10:06:52.000000000 +0200
@@ -62,12 +62,12 @@
Installation of pam_yubico module :
-----------------------------------
Build instructions for pam_yubico are available in the README.
-(https://github.com/Yubico/yubico-pam/wiki/ReadMe)
+(https://developers.yubico.com/yubico-pam/)
Configuration of pam_yubico module :
------------------------------------
Configuration instructions for pam_yubico are also available in the README.
-(https://github.com/Yubico/yubico-pam/wiki/ReadMe)
+(https://developers.yubico.com/yubico-pam/)
_Make sure you set your system up for either central authorization mapping,
or user level mapping, as this will control which users can connect to the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/doc/YubiKey_and_FreeRADIUS_via_PAM.adoc new/pam_yubico-2.21/doc/YubiKey_and_FreeRADIUS_via_PAM.adoc
--- old/pam_yubico-2.20/doc/YubiKey_and_FreeRADIUS_via_PAM.adoc 2014-11-03 11:23:32.000000000 +0100
+++ new/pam_yubico-2.21/doc/YubiKey_and_FreeRADIUS_via_PAM.adoc 2015-10-05 10:06:32.000000000 +0200
@@ -60,13 +60,13 @@
=== Installation of pam_yubico module ===
Build instructions for pam_yubico are available in the README.
-(https://github.com/Yubico/yubico-pam/wiki/ReadMe)
+(https://developers.yubico.com/yubico-pam/)
=== Configuration of pam_yubico module ===
Configuration instructions for pam_yubico are also available in the README.
-(https://github.com/Yubico/yubico-pam/wiki/ReadMe)
+(https://developers.yubico.com/yubico-pam/)
NOTE: Make sure you set your system up for either central authorization mapping,
or user level mapping, as this will control which users can connect to the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/pam_yubico.8 new/pam_yubico-2.21/pam_yubico.8
--- old/pam_yubico-2.20/pam_yubico.8 2015-09-15 15:00:08.000000000 +0200
+++ new/pam_yubico-2.21/pam_yubico.8 2016-02-18 13:12:48.000000000 +0100
@@ -2,12 +2,12 @@
.\" Title: pam_yubico
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: Version 2.20
+.\" Date: Version 2.21
.\" Manual: Yubico PAM Module Manual
.\" Source: yubico-pam
.\" Language: English
.\"
-.TH "PAM_YUBICO" "8" "Version 2\&.20" "yubico\-pam" "Yubico PAM Module Manual"
+.TH "PAM_YUBICO" "8" "Version 2\&.21" "yubico\-pam" "Yubico PAM Module Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -103,6 +103,11 @@
respectively\&.
.RE
.PP
+\fBproxy\fR=\fIproxy\fR
+.RS 4
+Specify a proxy to connect to the validation server\&. Valid schemes are socks4://, socks4a://, socks5:// or socks5h://\&. Socks5h asks the proxy to do the dns resolving\&. If no scheme or port is specified HTTP proxy port 1080 will be used\&. E\&.g\&. socks5h://user:pass@10\&.10\&.0\&.1:1080
+.RE
+.PP
\fBverbose_otp\fR
.RS 4
This argument is used to show the OTP (One Time Password) when it is entered, i\&.e\&. to enable terminal echo of entered characters\&. You are advised to not use this, if you are using two factor authentication because that will display your password on the screen\&. This requires the service using the PAM module to display custom fields\&. For example, OpenSSH requires you to configure "ChallengeResponseAuthentication no"\&.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/pam_yubico.8.txt new/pam_yubico-2.21/pam_yubico.8.txt
--- old/pam_yubico-2.20/pam_yubico.8.txt 2015-09-15 15:00:07.000000000 +0200
+++ new/pam_yubico-2.21/pam_yubico.8.txt 2016-02-18 13:11:05.000000000 +0100
@@ -50,6 +50,9 @@
*capath*=_path_::
Specify the path where X509 certificates are stored. This is required if 'https' or 'ldaps' are used in 'url' and 'ldap_uri' respectively.
+*proxy*=_proxy_::
+Specify a proxy to connect to the validation server. Valid schemes are socks4://, socks4a://, socks5:// or socks5h://. Socks5h asks the proxy to do the dns resolving. If no scheme or port is specified HTTP proxy port 1080 will be used. E.g. socks5h://user:pass@10.10.0.1:1080
+
*verbose_otp*::
This argument is used to show the OTP (One Time Password) when it is entered, i.e. to enable terminal echo of entered characters. You are advised to not use this, if you are using two factor authentication because that will display your password on the screen. This requires the service using the PAM module to display custom fields. For example, OpenSSH requires you to configure "ChallengeResponseAuthentication no".
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/pam_yubico.c new/pam_yubico-2.21/pam_yubico.c
--- old/pam_yubico-2.20/pam_yubico.c 2015-09-14 13:29:30.000000000 +0200
+++ new/pam_yubico-2.21/pam_yubico.c 2016-02-19 11:03:52.000000000 +0100
@@ -111,6 +111,7 @@
const char *auth_file;
const char *capath;
const char *cainfo;
+ const char *proxy;
const char *url;
const char *urllist;
const char *ldapserver;
@@ -300,7 +301,7 @@
if (cfg->user_attr && cfg->yubi_attr && cfg->ldapdn) {
i = (strlen(cfg->user_attr) + strlen(cfg->ldapdn) + strlen(user) + 3) * sizeof(char);
if ((find = malloc(i)) == NULL) {
- DBG (("Failed allocating %i bytes", i));
+ DBG (("Failed allocating %zu bytes", i));
retval = 0;
goto done;
}
@@ -406,11 +407,15 @@
return retval;
}
+ if(!conv || !conv->conv){
+ D(("conv() function invalid"));
+ return PAM_CONV_ERR;
+ }
pmsg[0] = &msg[0];
msg[0].msg = (char *) message; /* on some systems, pam_message.msg isn't const */
msg[0].msg_style = PAM_ERROR_MSG;
retval = conv->conv(1, pmsg, &resp, conv->appdata_ptr);
-
+
if (retval != PAM_SUCCESS) {
D(("conv returned error: %s", pam_strerror (pamh, retval)));
return retval;
@@ -456,7 +461,7 @@
goto out;
}
- if (! check_firmware_version(yk, false, true)) {
+ if (! check_firmware_version(yk, cfg->debug, true)) {
DBG(("YubiKey does not support Challenge-Response (version 2.2 required)"));
goto out;
}
@@ -710,6 +715,8 @@
cfg->capath = argv[i] + 7;
if (strncmp (argv[i], "cainfo=", 7) == 0)
cfg->cainfo = argv[i] + 7;
+ if (strncmp (argv[i], "proxy=", 6) == 0)
+ cfg->proxy = argv[i] + 6;
if (strncmp (argv[i], "url=", 4) == 0)
cfg->url = argv[i] + 4;
if (strncmp (argv[i], "urllist=", 8) == 0)
@@ -772,6 +779,7 @@
D (("urllist=%s", cfg->urllist ? cfg->urllist : "(null)"));
D (("capath=%s", cfg->capath ? cfg->capath : "(null)"));
D (("cainfo=%s", cfg->cainfo ? cfg->cainfo : "(null)"));
+ D (("proxy=%s", cfg->proxy ? cfg->proxy : "(null)"));
D (("token_id_length=%d", cfg->token_id_length));
D (("mode=%s", cfg->mode == CLIENT ? "client" : "chresp" ));
D (("chalresp_path=%s", cfg->chalresp_path ? cfg->chalresp_path : "(null)"));
@@ -883,6 +891,9 @@
if (cfg->cainfo)
ykclient_set_ca_info (ykc, cfg->cainfo);
+ if (cfg->proxy)
+ ykclient_set_proxy (ykc, cfg->proxy);
+
if (cfg->url)
{
rc = ykclient_set_url_template (ykc, cfg->url);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/tests/Makefile.am new/pam_yubico-2.21/tests/Makefile.am
--- old/pam_yubico-2.20/tests/Makefile.am 2015-04-07 16:33:41.000000000 +0200
+++ new/pam_yubico-2.21/tests/Makefile.am 2015-10-08 12:04:04.000000000 +0200
@@ -30,14 +30,13 @@
AM_LDFLAGS = -no-install
AM_CFLAGS=-I$(srcdir)/.. $(WARN_CFLAGS)
AM_CPPFLAGS = @YKPERS_CFLAGS@
-test_LDADD = ../pam_yubico.la
util_test_LDADD = ../libpam_util.la
pam_test_LDADD = ../libpam_real.la ../libpam_util.la @LTLIBYUBIKEY@ @LTLIBYKCLIENT@ @LIBLDAP@
pam_test_CPPFLAGS = -DSRCDIR=\"$(srcdir)\"
TESTS_ENVIRONMENT = export LDAPNOINIT=1;
-check_PROGRAMS = test util_test pam_test
+check_PROGRAMS = util_test pam_test
TESTS = $(check_PROGRAMS)
if ENABLE_COV
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/tests/pam_test.c new/pam_yubico-2.21/tests/pam_test.c
--- old/pam_yubico-2.20/tests/pam_test.c 2015-03-04 14:40:31.000000000 +0100
+++ new/pam_yubico-2.21/tests/pam_test.c 2016-02-18 10:44:39.000000000 +0100
@@ -38,7 +38,14 @@
#include <assert.h>
#include <security/pam_appl.h>
+#ifdef HAVE_PAM_MODUTIL_DROP_PRIV
#include <security/pam_modutil.h>
+#else
+#include <pwd.h>
+struct pam_modutil_privs {
+ int noop;
+};
+#endif
#define YKVAL_PORT1 "17502"
#define YKVAL_PORT2 "30559"
@@ -83,7 +90,11 @@
return &_data[(long)id];
}
+#ifdef OPENPAM
+const char * pam_strerror(const pam_handle_t *pamh, int errnum) {
+#else
const char * pam_strerror(pam_handle_t *pamh, int errnum) {
+#endif
fprintf(stderr, "in pam_strerror()\n");
return "error";
}
@@ -94,7 +105,16 @@
return PAM_SUCCESS;
}
+int pam_get_data(const pam_handle_t *pamh, const char *module_data_name, const void **data) {
+ fprintf(stderr, "in pam_get_data() %s\n", module_data_name);
+ return PAM_SUCCESS;
+}
+
+#ifdef OPENPAM
+int pam_get_user(pam_handle_t *pamh, const char **user, const char *prompt) {
+#else
int pam_get_user(const pam_handle_t *pamh, const char **user, const char *prompt) {
+#endif
fprintf(stderr, "in pam_get_user()\n");
*user = test_get_data((void*)pamh)->user;
return PAM_SUCCESS;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/tests/test.c new/pam_yubico-2.21/tests/test.c
--- old/pam_yubico-2.20/tests/test.c 2015-03-04 07:58:20.000000000 +0100
+++ new/pam_yubico-2.21/tests/test.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-/* Written by Simon Josefsson <simon(a)yubico.com>.
- * Copyright (c) 2007-2014 Yubico AB
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-
-/* These #defines must be present according to PAM documentation. */
-#define PAM_SM_AUTH
-
-#ifdef HAVE_SECURITY_PAM_APPL_H
-#include <security/pam_appl.h>
-#endif
-#ifdef HAVE_SECURITY_PAM_MODULES_H
-#include <security/pam_modules.h>
-#endif
-
-
-int
-main (int argc, const char **argv)
-{
- pam_handle_t *pamh = NULL;
- int rc;
-
- rc = pam_sm_authenticate (pamh, 0, 1, argv);
-
- printf ("rc %d\n", rc);
-
- return 0;
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/util.c new/pam_yubico-2.21/util.c
--- old/pam_yubico-2.20/util.c 2015-09-14 10:36:36.000000000 +0200
+++ new/pam_yubico-2.21/util.c 2016-02-19 11:03:52.000000000 +0100
@@ -206,10 +206,10 @@
}
if (verbose) {
- printf("Firmware version %d.%d.%d\n",
+ D(("YubiKey Firmware version: %d.%d.%d\n",
ykds_version_major(st),
ykds_version_minor(st),
- ykds_version_build(st));
+ ykds_version_build(st)));
fflush(stdout);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/pam_yubico-2.20/ykpamcfg.1 new/pam_yubico-2.21/ykpamcfg.1
--- old/pam_yubico-2.20/ykpamcfg.1 2015-08-18 14:11:50.000000000 +0200
+++ new/pam_yubico-2.21/ykpamcfg.1 2016-02-18 13:12:48.000000000 +0100
@@ -2,12 +2,12 @@
.\" Title: ykpamcfg
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: Version 2.20
+.\" Date: Version 2.21
.\" Manual: Yubico PAM Module Manual
.\" Source: yubico-pam
.\" Language: English
.\"
-.TH "YKPAMCFG" "1" "Version 2\&.20" "yubico\-pam" "Yubico PAM Module Manual"
+.TH "YKPAMCFG" "1" "Version 2\&.21" "yubico\-pam" "Yubico PAM Module Manual"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
1
0
Hello community,
here is the log from the commit of package yubico-piv-tool for openSUSE:Factory checked in at 2016-04-28 16:56:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yubico-piv-tool (Old)
and /work/SRC/openSUSE:Factory/.yubico-piv-tool.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yubico-piv-tool"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yubico-piv-tool/yubico-piv-tool.changes 2015-11-26 17:04:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yubico-piv-tool.new/yubico-piv-tool.changes 2016-04-28 17:02:01.000000000 +0200
@@ -1,0 +2,35 @@
+Mon Apr 25 20:04:14 UTC 2016 - t.gruner(a)katodev.de
+
+- Version 1.3.1 (released 2016-04-19)
+ - Fix a bug where unblock pin would instead change puk, introduced in 1.3.0.
+ - Clarifications with help texts.
+
+- Version 1.3.0 (released 2016-02-19)
+ - Fixed extraction of RSA modulus and exponent for pkcs11.
+ - Implemented C_SetPIN for pkcs11.
+ - Add generic write and read object actions for the tool. Supports hex/binary/base64 formats
+ - Add ykpiv_change_pin(), ykpiv_change_puk() and ykpiv_unblock_pin()
+ - Print CCC with status action.
+ - Address bugs with pkcs11 on windows.
+ - Add --valid-days and --serial to tool for selfsign-certificate action.
+ - Ask for password for pkcs12 if none is given.
+
+-------------------------------------------------------------------
+Fri Dec 11 08:12:48 UTC 2015 - t.gruner(a)katodev.de
+
+- Version 1.2.2 (released 2015-12-08)
+ - Fix old buffer overflow in change-pin functionality.
+
+- Version 1.2.1 (released 2015-12-08)
+ -Fix issue with big certificates and status.
+
+- Version 1.2.0 (released 2015-12-07)
+ - On OSX use @loader_path instead of @executable_path for ykcs11.
+ - Add ykpiv_import_private_key to libykpiv.
+ - Raise buffer sizes to support bigger objects.
+ - Change behavior of action status, only list populated slots.
+ - Add retired keys to ykcs11.
+ - In ykcs11 support login with non null terminated pin.
+ - Add a new action set-ccc to yubico-piv-tool to set the CCC.
+
+-------------------------------------------------------------------
Old:
----
yubico-piv-tool-1.1.2.tar.gz
yubico-piv-tool-1.1.2.tar.gz.sig
New:
----
yubico-piv-tool-1.3.1.tar.gz
yubico-piv-tool-1.3.1.tar.gz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yubico-piv-tool.spec ++++++
--- /var/tmp/diff_new_pack.CgRmgQ/_old 2016-04-28 17:02:03.000000000 +0200
+++ /var/tmp/diff_new_pack.CgRmgQ/_new 2016-04-28 17:02:03.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yubico-piv-tool
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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,7 +18,7 @@
%define soname 1
Name: yubico-piv-tool
-Version: 1.1.2
+Version: 1.3.1
Release: 0
Summary: Yubico YubiKey NEO CCID Manager
License: BSD-2-Clause
@@ -29,6 +29,7 @@
BuildRequires: libtool
BuildRequires: pcsc-lite-devel
BuildRequires: pkg-config
+BuildRequires: valgrind
BuildRequires: pkgconfig(openssl)
Requires: libykcs11-%{soname} = %{version}
Requires: libykpiv%{soname} = %{version}
@@ -101,12 +102,12 @@
%files -n libykpiv%{soname}
%defattr(-,root,root)
%{_libdir}/libykpiv.so.%{soname}
-%{_libdir}/libykpiv.so.%{soname}.1.0
+%{_libdir}/libykpiv.so.%{soname}.3.1
%files -n libykcs11-%{soname}
%defattr(-,root,root)
%{_libdir}/libykcs11.so.%{soname}
-%{_libdir}/libykcs11.so.%{soname}.1.0
+%{_libdir}/libykcs11.so.%{soname}.3.1
%files -n libykpiv-devel
%defattr(-,root,root)
++++++ yubico-piv-tool-1.1.2.tar.gz -> yubico-piv-tool-1.3.1.tar.gz ++++++
++++ 6118 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package utf8proc for openSUSE:Factory checked in at 2016-04-28 16:56:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/utf8proc (Old)
and /work/SRC/openSUSE:Factory/.utf8proc.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "utf8proc"
Changes:
--------
--- /work/SRC/openSUSE:Factory/utf8proc/utf8proc.changes 2015-09-24 06:14:01.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.utf8proc.new/utf8proc.changes 2016-04-28 17:01:57.000000000 +0200
@@ -1,0 +2,9 @@
+Sun Apr 24 11:32:39 UTC 2016 - astieger(a)suse.com
+
+- utf8proc 1.3.1:
+ * Do not export symbol for internal function unsafe_encode_char()
+ * Install relative symbolic links for shared libraries
+ * Enable and fix compiler warnings
+- remove cmake dependency
+
+-------------------------------------------------------------------
Old:
----
utf8proc-1.3.tar.gz
New:
----
utf8proc-1.3.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ utf8proc.spec ++++++
--- /var/tmp/diff_new_pack.YYbU8R/_old 2016-04-28 17:02:00.000000000 +0200
+++ /var/tmp/diff_new_pack.YYbU8R/_new 2016-04-28 17:02:00.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package utf8proc
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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,16 +16,15 @@
#
+%define lib_ver 1
Name: utf8proc
-Version: 1.3
+Version: 1.3.1
Release: 0
-%define lib_ver 1
Summary: Library for processing UTF-8 encoded Unicode strings
License: MIT
Group: System/Libraries
Url: http://julialang.org/utf8proc/
Source: https://github.com/JuliaLang/utf8proc/archive/v%{version}.tar.gz#/%{name}-%…
-BuildRequires: cmake
%description
utf8proc is a library for processing UTF-8 encoded Unicode strings.
@@ -70,13 +69,16 @@
%setup -q
%build
-%cmake
+export CFLAGS="%{optflags}"
make %{?_smp_mflags}
%install
-install -d %{buildroot}%{_libdir} %{buildroot}%{_includedir}
-cp -d build/libutf8proc.so* %{buildroot}%{_libdir}
-install -Dm 644 utf8proc.h %{buildroot}%{_includedir}/utf8proc.h
+make %{?_smp_mflags} \
+ DESTDIR=%{buildroot} \
+ prefix=%{_prefix} \
+ libdir=%{_libdir} \
+ install
+find %{buildroot}/%{_libdir} -type f -name "*.a" -print -delete
%post -n lib%{name}%{lib_ver} -p /sbin/ldconfig
%postun -n lib%{name}%{lib_ver} -p /sbin/ldconfig
++++++ utf8proc-1.3.tar.gz -> utf8proc-1.3.1.tar.gz ++++++
++++ 6380 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package QMPlay2 for openSUSE:Factory checked in at 2016-04-28 16:56:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/QMPlay2 (Old)
and /work/SRC/openSUSE:Factory/.QMPlay2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "QMPlay2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/QMPlay2/QMPlay2.changes 2016-03-31 13:02:25.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.QMPlay2.new/QMPlay2.changes 2016-04-28 17:01:53.000000000 +0200
@@ -1,0 +2,14 @@
+Sun Apr 24 10:29:33 UTC 2016 - dap.darkness(a)gmail.com
+
+- Update to 16.04.23:
+ * VDPAU decoder without VDPAU writer is now available,
+ * added spherical view for video playback (Ctrl+3; OpenGL only),
+ * added Simplified Chinese translation (king Lee),
+ * move video filtering to separate thread,
+ * added Yadif deinterlacing filter,
+ * better frame skipping,
+ * replay gain fixes,
+ * bugfix.
+- Updated QMPlay2-no-prostopleer.diff.
+
+-------------------------------------------------------------------
Old:
----
QMPlay2-src-16.03.24.tar.xz
New:
----
QMPlay2-src-16.04.23.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ QMPlay2.spec ++++++
--- /var/tmp/diff_new_pack.iBeWsD/_old 2016-04-28 17:01:56.000000000 +0200
+++ /var/tmp/diff_new_pack.iBeWsD/_new 2016-04-28 17:01:56.000000000 +0200
@@ -17,7 +17,7 @@
Name: QMPlay2
-Version: 16.03.24
+Version: 16.04.23
Release: 0
Summary: A Qt based media player, streamer and downloader
License: LGPL-3.0+
++++++ QMPlay2-no-prostopleer.diff ++++++
--- /var/tmp/diff_new_pack.iBeWsD/_old 2016-04-28 17:01:56.000000000 +0200
+++ /var/tmp/diff_new_pack.iBeWsD/_new 2016-04-28 17:01:56.000000000 +0200
@@ -31,14 +31,14 @@
modulesInfo += Info(MPRIS2Name, QMPLAY2EXTENSION);
#endif
@@ -61,8 +58,6 @@
- return static_cast< QMPlay2Extensions * >(new LastFM(*this));
+ return static_cast<QMPlay2Extensions *>(new LastFM(*this));
else if (name == RadioName)
- return static_cast< QMPlay2Extensions * >(new Radio(*this));
+ return static_cast<QMPlay2Extensions *>(new Radio(*this));
- else if (name == ProstoPleerName)
-- return static_cast< QMPlay2Extensions * >(new ProstoPleer(*this));
+- return static_cast<QMPlay2Extensions *>(new ProstoPleer(*this));
#ifdef USE_MPRIS2
else if (name == MPRIS2Name)
- return static_cast< QMPlay2Extensions * >(new MPRIS2(*this));
+ return static_cast<QMPlay2Extensions *>(new MPRIS2(*this));
--- src/modules/Extensions/Extensions.hpp.orig 2016-02-29 21:17:29.000000000 +0300
+++ src/modules/Extensions/Extensions.hpp 2016-03-12 13:04:23.706846080 +0300
@@ -10,7 +10,7 @@
++++++ QMPlay2-src-16.03.24.tar.xz -> QMPlay2-src-16.04.23.tar.xz ++++++
++++ 10622 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package libocrdma-rdmav2 for openSUSE:Factory checked in at 2016-04-28 16:56:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libocrdma-rdmav2 (Old)
and /work/SRC/openSUSE:Factory/.libocrdma-rdmav2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libocrdma-rdmav2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libocrdma-rdmav2/libocrdma-rdmav2.changes 2015-02-14 13:57:07.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libocrdma-rdmav2.new/libocrdma-rdmav2.changes 2016-04-28 17:01:50.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 25 08:49:22 UTC 2016 - p.drouand(a)gmail.com
+
+- Update to version 1.0.8
+ * No changelog available
+
+-------------------------------------------------------------------
Old:
----
libocrdma-1.0.5.tar.gz
New:
----
libocrdma-1.0.8.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libocrdma-rdmav2.spec ++++++
--- /var/tmp/diff_new_pack.4qbOq4/_old 2016-04-28 17:01:53.000000000 +0200
+++ /var/tmp/diff_new_pack.4qbOq4/_new 2016-04-28 17:01:53.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libocrdma
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products 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,7 +18,7 @@
Name: libocrdma-rdmav2
Summary: Userspace Library for Emulex ROCEE Device
-Version: 1.0.5
+Version: 1.0.8
Release: 1
License: GPL-2.0 or BSD-2-Clause
Group: System/Libraries
++++++ libocrdma-1.0.5.tar.gz -> libocrdma-1.0.8.tar.gz ++++++
++++ 30151 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/AUTHORS new/libocrdma-1.0.8/AUTHORS
--- old/libocrdma-1.0.5/AUTHORS 2015-01-17 10:24:06.000000000 +0100
+++ new/libocrdma-1.0.8/AUTHORS 2016-04-14 08:33:45.000000000 +0200
@@ -1 +1 @@
-Emulex Corporation.
+Broadcom Ltd
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/COPYING new/libocrdma-1.0.8/COPYING
--- old/libocrdma-1.0.5/COPYING 2015-01-17 10:24:06.000000000 +0100
+++ new/libocrdma-1.0.8/COPYING 2016-04-14 08:33:45.000000000 +0200
@@ -1,4 +1,39 @@
+This software is available to you under a choice of one of two
+licenses. You may choose to be licensed under the terms of the the
+OpenIB.org BSD license or the GNU General Public License (GPL) Version
+2, both included below.
+Copyright (c) 2016 Broadcom Ltd. All rights reserved.
+
+=======================================================================
+ BSD license
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+ - Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
+ - Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+========================================================================
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/config/missing new/libocrdma-1.0.8/config/missing
--- old/libocrdma-1.0.5/config/missing 2015-01-17 11:11:26.000000000 +0100
+++ new/libocrdma-1.0.8/config/missing 2016-04-14 08:33:45.000000000 +0200
@@ -1,11 +1,10 @@
#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
+# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-06-26.16; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
+# Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,69 +25,40 @@
# the same distribution terms that you use for the rest of that program.
if test $# -eq 0; then
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
fi
-run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
- configure_ac=configure.ac
-else
- configure_ac=configure.in
-fi
+case $1 in
-msg="missing on your system"
+ --is-lightweight)
+ # Used by our autoconf macros to check whether the available missing
+ # script is modern enough.
+ exit 0
+ ;;
-case $1 in
---run)
- # Try to run requested program, and just exit if it succeeds.
- run=
- shift
- "$@" && exit 0
- # Exit code 63 means version mismatch. This often happens
- # when the user try to use an ancient version of a tool on
- # a file that requires a minimum version. In this case we
- # we should proceed has if the program had been absent, or
- # if --run hadn't been passed.
- if test $? = 63; then
- run=:
- msg="probably too old"
- fi
- ;;
+ --run)
+ # Back-compat with the calling convention used by older automake.
+ shift
+ ;;
-h|--h|--he|--hel|--help)
echo "\
$0 [OPTION]... PROGRAM [ARGUMENT]...
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
+Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due
+to PROGRAM being missing or too old.
Options:
-h, --help display this help and exit
-v, --version output version information and exit
- --run try to run the given command, and emulate it if it fails
Supported PROGRAM values:
- aclocal touch file \`aclocal.m4'
- autoconf touch file \`configure'
- autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
- automake touch all \`Makefile.in' files
- bison create \`y.tab.[ch]', if possible, from existing .[ch]
- flex create \`lex.yy.c', if possible, from existing .c
- help2man touch the output file
- lex create \`lex.yy.c', if possible, from existing .c
- makeinfo touch the output file
- tar try tar, gnutar, gtar, then tar without non-portable flags
- yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+ aclocal autoconf autoheader autom4te automake makeinfo
+ bison yacc flex lex help2man
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
+Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
+'g' are ignored when checking the name.
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
@@ -100,272 +70,141 @@
;;
-*)
- echo 1>&2 "$0: Unknown \`$1' option"
- echo 1>&2 "Try \`$0 --help' for more information"
+ echo 1>&2 "$0: unknown '$1' option"
+ echo 1>&2 "Try '$0 --help' for more information"
exit 1
;;
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
-# Now exit if we have it, but it failed. Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
-case $1 in
- lex*|yacc*)
- # Not GNU programs, they don't have --version.
- ;;
-
- tar*)
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- exit 1
- fi
- ;;
+# Run the given program, remember its exit status.
+"$@"; st=$?
- *)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
- # Could not run --version or --help. This is probably someone
- # running `$TOOL --version' or `$TOOL --help' to check whether
- # $TOOL exists and not knowing $TOOL uses missing.
- exit 1
- fi
- ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case $program in
- aclocal*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acinclude.m4' or \`${configure_ac}'. You might want
- to install the \`Automake' and \`Perl' packages. Grab them from
- any GNU archive site."
- touch aclocal.m4
- ;;
-
- autoconf*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`${configure_ac}'. You might want to install the
- \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
- archive site."
- touch configure
- ;;
-
- autoheader*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`acconfig.h' or \`${configure_ac}'. You might want
- to install the \`Autoconf' and \`GNU m4' packages. Grab them
- from any GNU archive site."
- files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
- test -z "$files" && files="config.h"
- touch_files=
- for f in $files; do
- case $f in
- *:*) touch_files="$touch_files "`echo "$f" |
- sed -e 's/^[^:]*://' -e 's/:.*//'`;;
- *) touch_files="$touch_files $f.in";;
- esac
- done
- touch $touch_files
- ;;
-
- automake*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
- You might want to install the \`Automake' and \`Perl' packages.
- Grab them from any GNU archive site."
- find . -type f -name Makefile.am -print |
- sed 's/\.am$/.in/' |
- while read f; do touch "$f"; done
- ;;
+# If it succeeded, we are done.
+test $st -eq 0 && exit 0
- autom4te*)
- echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
- You might have modified some files without having the
- proper tools for further handling them.
- You can get \`$1' as part of \`Autoconf' from any GNU
- archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo "#! /bin/sh"
- echo "# Created by GNU Automake missing as a replacement of"
- echo "# $ $@"
- echo "exit 0"
- chmod +x $file
- exit 1
- fi
- ;;
-
- bison*|yacc*)
- echo 1>&2 "\
-WARNING: \`$1' $msg. You should only need it if
- you modified a \`.y' file. You may need the \`Bison' package
- in order for those modifications to take effect. You can get
- \`Bison' from any GNU archive site."
- rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.y)
- SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.c
- fi
- SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" y.tab.h
- fi
- ;;
- esac
- fi
- if test ! -f y.tab.h; then
- echo >y.tab.h
- fi
- if test ! -f y.tab.c; then
- echo 'main() { return 0; }' >y.tab.c
- fi
- ;;
-
- lex*|flex*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.l' file. You may need the \`Flex' package
- in order for those modifications to take effect. You can get
- \`Flex' from any GNU archive site."
- rm -f lex.yy.c
- if test $# -ne 1; then
- eval LASTARG="\${$#}"
- case $LASTARG in
- *.l)
- SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
- cp "$SRCFILE" lex.yy.c
- fi
- ;;
- esac
- fi
- if test ! -f lex.yy.c; then
- echo 'main() { return 0; }' >lex.yy.c
- fi
- ;;
-
- help2man*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a dependency of a manual page. You may need the
- \`Help2man' package in order for those modifications to take
- effect. You can get \`Help2man' from any GNU archive site."
-
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
- touch $file
- else
- test -z "$file" || exec >$file
- echo ".ab help2man is required to generate this page"
- exit $?
- fi
- ;;
-
- makeinfo*)
- echo 1>&2 "\
-WARNING: \`$1' is $msg. You should only need it if
- you modified a \`.texi' or \`.texinfo' file, or any other file
- indirectly affecting the aspect of the manual. The spurious
- call might also be the consequence of using a buggy \`make' (AIX,
- DU, IRIX). You might want to install the \`Texinfo' package or
- the \`GNU make' package. Grab either from any GNU archive site."
- # The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -z "$file"; then
- # ... or it is the one specified with @setfilename ...
- infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
- # ... or it is derived from the source name (dir/f.texi becomes f.info)
- test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
- fi
- # If the file does not exist, the user really needs makeinfo;
- # let's fail without touching anything.
- test -f $file || exit 1
- touch $file
- ;;
-
- tar*)
- shift
-
- # We have already tried tar in the generic part.
- # Look for gnutar/gtar before invocation to avoid ugly error
- # messages.
- if (gnutar --version > /dev/null 2>&1); then
- gnutar "$@" && exit 0
- fi
- if (gtar --version > /dev/null 2>&1); then
- gtar "$@" && exit 0
- fi
- firstarg="$1"
- if shift; then
- case $firstarg in
- *o*)
- firstarg=`echo "$firstarg" | sed s/o//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- case $firstarg in
- *h*)
- firstarg=`echo "$firstarg" | sed s/h//`
- tar "$firstarg" "$@" && exit 0
- ;;
- esac
- fi
-
- echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
- You may want to install GNU tar or Free paxutils, or check the
- command line arguments."
- exit 1
- ;;
-
- *)
- echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
- You might have modified some files without having the
- proper tools for further handling them. Check the \`README' file,
- it often tells you about the needed prerequisites for installing
- this package. You may also peek at any GNU archive site, in case
- some other package would contain this missing \`$1' program."
- exit 1
- ;;
-esac
+# Also exit now if we it failed (or wasn't found), and '--version' was
+# passed; such an option is passed most likely to detect whether the
+# program is present and works.
+case $2 in --version|--help) exit $st;; esac
+
+# Exit code 63 means version mismatch. This often happens when the user
+# tries to use an ancient version of a tool on a file that requires a
+# minimum version.
+if test $st -eq 63; then
+ msg="probably too old"
+elif test $st -eq 127; then
+ # Program was missing.
+ msg="missing on your system"
+else
+ # Program was found and executed, but failed. Give up.
+ exit $st
+fi
-exit 0
+perl_URL=http://www.perl.org/
+flex_URL=http://flex.sourceforge.net/
+gnu_software_URL=http://www.gnu.org/software
+
+program_details ()
+{
+ case $1 in
+ aclocal|automake)
+ echo "The '$1' program is part of the GNU Automake package:"
+ echo "<$gnu_software_URL/automake>"
+ echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/autoconf>"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ autoconf|autom4te|autoheader)
+ echo "The '$1' program is part of the GNU Autoconf package:"
+ echo "<$gnu_software_URL/autoconf/>"
+ echo "It also requires GNU m4 and Perl in order to run:"
+ echo "<$gnu_software_URL/m4/>"
+ echo "<$perl_URL>"
+ ;;
+ esac
+}
+
+give_advice ()
+{
+ # Normalize program name to check for.
+ normalized_program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+ printf '%s\n' "'$1' is $msg."
+
+ configure_deps="'configure.ac' or m4 files included by 'configure.ac'"
+ case $normalized_program in
+ autoconf*)
+ echo "You should only need it if you modified 'configure.ac',"
+ echo "or m4 files included by it."
+ program_details 'autoconf'
+ ;;
+ autoheader*)
+ echo "You should only need it if you modified 'acconfig.h' or"
+ echo "$configure_deps."
+ program_details 'autoheader'
+ ;;
+ automake*)
+ echo "You should only need it if you modified 'Makefile.am' or"
+ echo "$configure_deps."
+ program_details 'automake'
+ ;;
+ aclocal*)
+ echo "You should only need it if you modified 'acinclude.m4' or"
+ echo "$configure_deps."
+ program_details 'aclocal'
+ ;;
+ autom4te*)
+ echo "You might have modified some maintainer files that require"
+ echo "the 'automa4te' program to be rebuilt."
+ program_details 'autom4te'
+ ;;
+ bison*|yacc*)
+ echo "You should only need it if you modified a '.y' file."
+ echo "You may want to install the GNU Bison package:"
+ echo "<$gnu_software_URL/bison/>"
+ ;;
+ lex*|flex*)
+ echo "You should only need it if you modified a '.l' file."
+ echo "You may want to install the Fast Lexical Analyzer package:"
+ echo "<$flex_URL>"
+ ;;
+ help2man*)
+ echo "You should only need it if you modified a dependency" \
+ "of a man page."
+ echo "You may want to install the GNU Help2man package:"
+ echo "<$gnu_software_URL/help2man/>"
+ ;;
+ makeinfo*)
+ echo "You should only need it if you modified a '.texi' file, or"
+ echo "any other file indirectly affecting the aspect of the manual."
+ echo "You might want to install the Texinfo package:"
+ echo "<$gnu_software_URL/texinfo/>"
+ echo "The spurious makeinfo call might also be the consequence of"
+ echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might"
+ echo "want to install GNU make:"
+ echo "<$gnu_software_URL/make/>"
+ ;;
+ *)
+ echo "You might have modified some files without having the proper"
+ echo "tools for further handling them. Check the 'README' file, it"
+ echo "often tells you about the needed prerequisites for installing"
+ echo "this package. You may also peek at any GNU archive site, in"
+ echo "case some other package contains this missing '$1' program."
+ ;;
+ esac
+}
+
+give_advice "$1" | sed -e '1s/^/WARNING: /' \
+ -e '2,$s/^/ /' >&2
+
+# Propagate the correct exit status (expected to be 127 for a program
+# not found, 63 for a program that failed due to version mismatch).
+exit $st
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/config.h.in new/libocrdma-1.0.8/config.h.in
--- old/libocrdma-1.0.5/config.h.in 2015-01-17 11:11:25.000000000 +0100
+++ new/libocrdma-1.0.8/config.h.in 2016-04-14 08:33:45.000000000 +0200
@@ -61,6 +61,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/configure.in new/libocrdma-1.0.8/configure.in
--- old/libocrdma-1.0.5/configure.in 2015-01-17 10:24:06.000000000 +0100
+++ new/libocrdma-1.0.8/configure.in 2016-04-14 08:33:45.000000000 +0200
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(libocrdma, 1.0.5, linux-rdma(a)vger.kernel.org)
+AC_INIT(libocrdma, 1.0.8, linux-rdma(a)vger.kernel.org)
AC_CONFIG_SRCDIR([src/ocrdma_main.h])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libocrdma, 1.0.5)
+AM_INIT_AUTOMAKE(libocrdma, 1.0.8)
AM_PROG_LIBTOOL
AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for the presence of ib libraries],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/libocrdma.spec new/libocrdma-1.0.8/libocrdma.spec
--- old/libocrdma-1.0.5/libocrdma.spec 2015-01-17 11:12:36.000000000 +0100
+++ new/libocrdma-1.0.8/libocrdma.spec 2016-04-14 08:33:45.000000000 +0200
@@ -1,18 +1,18 @@
Name: libocrdma
-Version: 1.0.5
+Version: 1.0.8
Release: 1%{?dist}
-Summary: Userspace Library for Emulex ROCEE Device.
+Summary: User-space Library for Emulex ROCE Device
Group: System Environment/Libraries
-License: GPL/BSD
-Url: http://www.openfabrics.org/
-Source: http://www.openfabrics.org/downloads/ocrdma/%{name}-%{version}.tar.gz
+License: GPLv2 or BSD
+Url: https://www.openfabrics.org/
+Source: http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libibverbs-devel
%description
-libocrdma provides a device-specific userspace driver for Emulex One Command RoCE Adapters
-for use with the libibverbs library.
+libocrdma provides a device-specific user-space driver for Emulex
+One Command RoCE Adapters for use with the libibverbs library.
%package devel
Summary: Development files for the libocrdma driver
@@ -31,17 +31,18 @@
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=%{buildroot} install
# remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/libocrdma.so
%post
/sbin/ldconfig
if [ -e %{_sysconfdir}/dat.conf ]; then
- sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl
- mv /tmp/$$ofadapl %{_sysconfdir}/dat.conf
- dapl_ver=`rpm -q dapl|cut -c6-8`
+ sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' -i %{_sysconfdir}/dat.conf
+ dapl_ver=`find %{_libdir} \! -type l|grep libdat2.so|awk -F'libdat2.so.' '{print $2}'|cut -c1-3|head -1`
+ if [ "${dapl_ver}" = "" ]; then
+ dapl_ver="2.0"
+ fi
echo ofa-v2-scm-roe-ocrdma0-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma0 1" ""' >> %{_sysconfdir}/dat.conf
echo ofa-v2-scm-roe-ocrdma1-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma1 1" ""' >> %{_sysconfdir}/dat.conf
echo ofa-v2-scm-roe-ocrdma2-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma2 1" ""' >> %{_sysconfdir}/dat.conf
@@ -51,8 +52,7 @@
%postun
/sbin/ldconfig
if [ -e %{_sysconfdir}/dat.conf ]; then
- sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl
- mv /tmp/$$ofadapl %{_sysconfdir}/dat.conf
+ sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' -i %{_sysconfdir}/dat.conf
fi
%clean
@@ -60,9 +60,9 @@
%files
%defattr(-,root,root,-)
-%{_libdir}/libocrdma*.so
-# %doc AUTHORS COPYING ChangeLog README
-%config %{_sysconfdir}/libibverbs.d/ocrdma.driver
+%{_libdir}/libocrdma-rdmav2.so
+%doc AUTHORS README COPYING
+%{_sysconfdir}/libibverbs.d/ocrdma.driver
%files devel
%defattr(-,root,root,-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/libocrdma.spec.in new/libocrdma-1.0.8/libocrdma.spec.in
--- old/libocrdma-1.0.5/libocrdma.spec.in 2015-01-17 10:24:06.000000000 +0100
+++ new/libocrdma-1.0.8/libocrdma.spec.in 2016-04-14 08:33:45.000000000 +0200
@@ -1,18 +1,18 @@
Name: libocrdma
Version: @VERSION@
Release: 1%{?dist}
-Summary: Userspace Library for Emulex ROCEE Device.
+Summary: User-space Library for Emulex ROCE Device
Group: System Environment/Libraries
-License: GPL/BSD
-Url: http://www.openfabrics.org/
-Source: http://www.openfabrics.org/downloads/ocrdma/%{name}-%{version}.tar.gz
+License: GPLv2 or BSD
+Url: https://www.openfabrics.org/
+Source: http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libibverbs-devel
%description
-libocrdma provides a device-specific userspace driver for Emulex One Command RoCE Adapters
-for use with the libibverbs library.
+libocrdma provides a device-specific user-space driver for Emulex
+One Command RoCE Adapters for use with the libibverbs library.
%package devel
Summary: Development files for the libocrdma driver
@@ -31,17 +31,18 @@
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
+make DESTDIR=%{buildroot} install
# remove unpackaged files from the buildroot
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la $RPM_BUILD_ROOT%{_libdir}/libocrdma.so
%post
/sbin/ldconfig
if [ -e %{_sysconfdir}/dat.conf ]; then
- sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl
- mv /tmp/$$ofadapl %{_sysconfdir}/dat.conf
- dapl_ver=`rpm -q dapl|cut -c6-8`
+ sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' -i %{_sysconfdir}/dat.conf
+ dapl_ver=`find %{_libdir} \! -type l|grep libdat2.so|awk -F'libdat2.so.' '{print $2}'|cut -c1-3|head -1`
+ if [ "${dapl_ver}" = "" ]; then
+ dapl_ver="2.0"
+ fi
echo ofa-v2-scm-roe-ocrdma0-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma0 1" ""' >> %{_sysconfdir}/dat.conf
echo ofa-v2-scm-roe-ocrdma1-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma1 1" ""' >> %{_sysconfdir}/dat.conf
echo ofa-v2-scm-roe-ocrdma2-1 u${dapl_ver} nonthreadsafe default libdaploscm.so.2 dapl.${dapl_ver} '"ocrdma2 1" ""' >> %{_sysconfdir}/dat.conf
@@ -51,8 +52,7 @@
%postun
/sbin/ldconfig
if [ -e %{_sysconfdir}/dat.conf ]; then
- sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' < %{_sysconfdir}/dat.conf > /tmp/$$ofadapl
- mv /tmp/$$ofadapl %{_sysconfdir}/dat.conf
+ sed -e '/ofa-v2-scm-roe-ocrdma.* u2/d' -i %{_sysconfdir}/dat.conf
fi
%clean
@@ -60,9 +60,9 @@
%files
%defattr(-,root,root,-)
-%{_libdir}/libocrdma*.so
-# %doc AUTHORS COPYING ChangeLog README
-%config %{_sysconfdir}/libibverbs.d/ocrdma.driver
+%{_libdir}/libocrdma-rdmav2.so
+%doc AUTHORS README COPYING
+%{_sysconfdir}/libibverbs.d/ocrdma.driver
%files devel
%defattr(-,root,root,-)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/src/ocrdma_abi.h new/libocrdma-1.0.8/src/ocrdma_abi.h
--- old/libocrdma-1.0.5/src/ocrdma_abi.h 2015-01-17 10:24:06.000000000 +0100
+++ new/libocrdma-1.0.8/src/ocrdma_abi.h 2016-04-14 08:33:45.000000000 +0200
@@ -51,14 +51,14 @@
};
#define OCRDMA_DB_CQ_RING_ID_MASK 0x3FF /* bits 0 - 9 */
-#define OCRDMA_DB_CQ_RING_ID_EXT_MASK 0x0C00 /* bits 10-11 of qid placing at 12-11 */
-#define OCRDMA_DB_CQ_RING_ID_EXT_MASK_SHIFT 0x1 /* qid #2 msbits placing at 12-11 */
+#define OCRDMA_DB_CQ_RING_ID_EXT_MASK 0x0C00 /* bits 10-11 of qid placing at 12-11 */
+#define OCRDMA_DB_CQ_RING_ID_EXT_MASK_SHIFT 0x1 /* qid #2 msbits placing at 12-11 */
#define OCRDMA_DB_CQ_NUM_POPPED_SHIFT (16) /* bits 16 - 28 */
/* Rearm bit */
#define OCRDMA_DB_CQ_REARM_SHIFT (29) /* bit 29 */
/* solicited bit */
-#define OCRDMA_DB_CQ_SOLICIT_SHIFT (31) /* bit 31 */
+#define OCRDMA_DB_CQ_SOLICIT_SHIFT (31) /* bit 31 */
struct ocrdma_get_context {
struct ibv_get_context cmd;
@@ -291,6 +291,7 @@
OCRDMA_FLAG_FENCE_R = 0x8,
OCRDMA_FLAG_SOLICIT = 0x10,
OCRDMA_FLAG_IMM = 0x20,
+ OCRDMA_FLAG_AH_VLAN_PR = 0x40,
/* Stag flags */
OCRDMA_LKEY_FLAG_LOCAL_WR = 0x1,
@@ -349,7 +350,7 @@
uint32_t rsvd_dest_qpn;
uint32_t qkey;
uint32_t rsvd_ahid;
- uint32_t rsvd;
+ uint32_t hdr_type;
} __attribute__ ((packed));
#endif /* __OCRDMA_ABI_H__ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/src/ocrdma_main.c new/libocrdma-1.0.8/src/ocrdma_main.c
--- old/libocrdma-1.0.5/src/ocrdma_main.c 2015-01-17 10:24:06.000000000 +0100
+++ new/libocrdma-1.0.8/src/ocrdma_main.c 2016-04-14 08:33:45.000000000 +0200
@@ -94,7 +94,6 @@
.post_recv = ocrdma_post_recv,
.create_ah = ocrdma_create_ah,
.destroy_ah = ocrdma_destroy_ah,
- .async_event = ocrdma_async_event,
.create_srq = ocrdma_create_srq,
.modify_srq = ocrdma_modify_srq,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/src/ocrdma_main.h new/libocrdma-1.0.8/src/ocrdma_main.h
--- old/libocrdma-1.0.5/src/ocrdma_main.h 2015-01-17 10:24:06.000000000 +0100
+++ new/libocrdma-1.0.8/src/ocrdma_main.h 2016-04-14 08:33:45.000000000 +0200
@@ -211,10 +211,20 @@
int signaled; /* signaled QP */
};
+enum {
+ OCRDMA_AH_ID_MASK = 0x3FF,
+ OCRDMA_AH_VLAN_VALID_MASK = 0x01,
+ OCRDMA_AH_VLAN_VALID_SHIFT = 0x1F,
+ OCRDMA_AH_L3_TYPE_MASK = 0x03,
+ OCRDMA_AH_L3_TYPE_SHIFT = 0x1D
+};
+
struct ocrdma_ah {
struct ibv_ah ibv_ah;
struct ocrdma_pd *pd;
uint16_t id;
+ uint8_t isvlan;
+ uint8_t hdr_type;
};
#define get_ocrdma_xxx(xxx, type) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libocrdma-1.0.5/src/ocrdma_verbs.c new/libocrdma-1.0.8/src/ocrdma_verbs.c
--- old/libocrdma-1.0.5/src/ocrdma_verbs.c 2015-01-17 10:24:06.000000000 +0100
+++ new/libocrdma-1.0.8/src/ocrdma_verbs.c 2016-04-14 08:33:45.000000000 +0200
@@ -453,41 +453,24 @@
int ocrdma_modify_srq(struct ibv_srq *ibsrq,
struct ibv_srq_attr *attr, int attr_mask)
{
- int status;
- struct ocrdma_device *dev;
- struct ocrdma_srq *srq;
struct ibv_modify_srq cmd;
- srq = get_ocrdma_srq(ibsrq);
- dev = srq->dev;
-
- status = ibv_cmd_modify_srq(ibsrq, attr, attr_mask, &cmd, sizeof cmd);
- return status;
+ return ibv_cmd_modify_srq(ibsrq, attr, attr_mask, &cmd, sizeof cmd);
}
int ocrdma_query_srq(struct ibv_srq *ibsrq, struct ibv_srq_attr *attr)
{
- int status;
struct ibv_query_srq cmd;
- struct ocrdma_device *dev;
- struct ocrdma_srq *srq;
- srq = get_ocrdma_srq(ibsrq);
- dev = srq->dev;
- status = ibv_cmd_query_srq(ibsrq, attr, &cmd, sizeof cmd);
- return status;
+ return ibv_cmd_query_srq(ibsrq, attr, &cmd, sizeof cmd);
}
int ocrdma_destroy_srq(struct ibv_srq *ibsrq)
{
int status;
- int id;
struct ocrdma_srq *srq;
- struct ocrdma_device *dev;
srq = get_ocrdma_srq(ibsrq);
- dev = srq->dev;
- id = dev->id;
status = ibv_cmd_destroy_srq(ibsrq);
if (status)
return status;
@@ -651,20 +634,6 @@
return NULL;
}
-/*
- * ocrdma_query_qp
- */
-int ocrdma_query_qp(struct ibv_qp *qp, struct ibv_qp_attr *attr,
- int attr_mask, struct ibv_qp_init_attr *init_attr)
-{
- struct ibv_query_qp cmd;
- int status;
-
- status =
- ibv_cmd_query_qp(qp, attr, attr_mask, init_attr, &cmd, sizeof(cmd));
- return status;
-}
-
enum ocrdma_qp_state get_ocrdma_qp_state(enum ibv_qp_state qps)
{
switch (qps) {
@@ -682,6 +651,10 @@
return OCRDMA_QPS_SQE;
case IBV_QPS_ERR:
return OCRDMA_QPS_ERR;
+ case IBV_QPS_UNKNOWN:
+ break;
+ default:
+ break;
};
return OCRDMA_QPS_ERR;
}
@@ -896,6 +869,25 @@
return status;
}
+/*
+ * ocrdma_query_qp
+ */
+int ocrdma_query_qp(struct ibv_qp *ibqp, struct ibv_qp_attr *attr,
+ int attr_mask, struct ibv_qp_init_attr *init_attr)
+{
+ struct ibv_query_qp cmd;
+ struct ocrdma_qp *qp = get_ocrdma_qp(ibqp);
+ int status;
+
+ status = ibv_cmd_query_qp(ibqp, attr, attr_mask,
+ init_attr, &cmd, sizeof(cmd));
+
+ if (!status)
+ ocrdma_qp_state_machine(qp, attr->qp_state);
+
+ return status;
+}
+
static void ocrdma_srq_toggle_bit(struct ocrdma_srq *srq, int idx)
{
int i = idx / 32;
@@ -1091,10 +1083,9 @@
int status = 0;
struct ocrdma_qp *qp;
struct ocrdma_device *dev;
- int id;
+
qp = get_ocrdma_qp(ibqp);
dev = qp->dev;
- id = dev->id;
/*
* acquire CQ lock while destroy is in progress, in order to
* protect against proessing in-flight CQEs for this QP.
@@ -1191,6 +1182,10 @@
ud_hdr->rsvd_dest_qpn = wr->wr.ud.remote_qpn;
ud_hdr->qkey = wr->wr.ud.remote_qkey;
ud_hdr->rsvd_ahid = ah->id;
+ if (ah->isvlan)
+ hdr->cw |= (OCRDMA_FLAG_AH_VLAN_PR <<
+ OCRDMA_WQE_FLAGS_SHIFT);
+ ud_hdr->hdr_type = ah->hdr_type;
}
static void ocrdma_build_sges(struct ocrdma_hdr_wqe *hdr,
@@ -1995,14 +1990,11 @@
}
stop_cqe:
cq->getp = cur_getp;
- if (cq->deferred_arm) {
- ocrdma_ring_cq_db(cq, 1, cq->deferred_sol, polled_hw_cqes);
+ if (cq->deferred_arm || polled_hw_cqes) {
+ ocrdma_ring_cq_db(cq, cq->deferred_arm,
+ cq->deferred_sol, polled_hw_cqes);
cq->deferred_arm = 0;
cq->deferred_sol = 0;
- } else {
- /* We need to pop the CQE. No need to arm */
- ocrdma_ring_cq_db(cq, 0, cq->deferred_sol, polled_hw_cqes);
- cq->deferred_sol = 0;
}
return i;
@@ -2151,9 +2143,13 @@
if (status)
goto cmd_err;
- ah->id = pd->uctx->ah_tbl[ahtbl_idx];
- return &ah->ibv_ah;
+ ah->id = pd->uctx->ah_tbl[ahtbl_idx] & OCRDMA_AH_ID_MASK;
+ ah->isvlan = (pd->uctx->ah_tbl[ahtbl_idx] >>
+ OCRDMA_AH_VLAN_VALID_SHIFT);
+ ah->hdr_type = ((pd->uctx->ah_tbl[ahtbl_idx] >> OCRDMA_AH_L3_TYPE_SHIFT)
+ & OCRDMA_AH_L3_TYPE_MASK);
+ return &ah->ibv_ah;
cmd_err:
ocrdma_free_ah_tbl_id(pd->uctx, ahtbl_idx);
tbl_err:
@@ -2168,9 +2164,9 @@
{
int status;
struct ocrdma_ah *ah;
- struct ocrdma_device *dev;
+
ah = get_ocrdma_ah(ibah);
- dev = ah->pd->dev;
+
status = ibv_cmd_destroy_ah(ibah);
ocrdma_free_ah_tbl_id(ah->pd->uctx, ah->id);
free(ah);
@@ -2183,11 +2179,7 @@
int ocrdma_attach_mcast(struct ibv_qp *ibqp, const union ibv_gid *gid,
uint16_t lid)
{
- int status;
- struct ocrdma_qp *qp;
- qp = get_ocrdma_qp(ibqp);
- status = ibv_cmd_attach_mcast(ibqp, gid, lid);
- return status;
+ return ibv_cmd_attach_mcast(ibqp, gid, lid);
}
/*
@@ -2196,37 +2188,5 @@
int ocrdma_detach_mcast(struct ibv_qp *ibqp, const union ibv_gid *gid,
uint16_t lid)
{
- int status;
- struct ocrdma_qp *qp;
- qp = get_ocrdma_qp(ibqp);
- status = ibv_cmd_detach_mcast(ibqp, gid, lid);
- return status;
-}
-
-void ocrdma_async_event(struct ibv_async_event *event)
-{
- struct ocrdma_cq *cq = NULL;
- struct ocrdma_qp *qp = NULL;
- switch (event->event_type) {
- case IBV_EVENT_CQ_ERR:
- cq = get_ocrdma_cq(event->element.cq);
- break;
- case IBV_EVENT_QP_FATAL:
- case IBV_EVENT_QP_REQ_ERR:
- case IBV_EVENT_QP_ACCESS_ERR:
- case IBV_EVENT_PATH_MIG_ERR:{
- qp = get_ocrdma_qp(event->element.qp);
- break;
- }
- case IBV_EVENT_SQ_DRAINED:
- case IBV_EVENT_PATH_MIG:
- case IBV_EVENT_COMM_EST:
- case IBV_EVENT_QP_LAST_WQE_REACHED:
- break;
- case IBV_EVENT_PORT_ACTIVE:
- case IBV_EVENT_PORT_ERR:
- break;
- default:
- break;
- }
+ return ibv_cmd_detach_mcast(ibqp, gid, lid);
}
1
0
Hello community,
here is the log from the commit of package libcxgb4-rdmav2 for openSUSE:Factory checked in at 2016-04-28 16:56:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcxgb4-rdmav2 (Old)
and /work/SRC/openSUSE:Factory/.libcxgb4-rdmav2.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcxgb4-rdmav2"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcxgb4-rdmav2/libcxgb4-rdmav2.changes 2015-02-16 21:14:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.libcxgb4-rdmav2.new/libcxgb4-rdmav2.changes 2016-04-28 17:01:47.000000000 +0200
@@ -1,0 +2,23 @@
+Mon Apr 25 07:47:01 UTC 2016 - p.drouand(a)gmail.com
+
+- Update to version 1.3.6
+ * libcxgb4: skip TERMINATE CQEs before testing for errors
+ * libcxgb4:Eliminate warnings seen with buildall.sh on a 32 bit system.
+ + fixes warnings due to improper typecasting.
+ + suppresses warnings due to unused variables.
+ + typecasted u64 value to long long to avoid warnings on x64bit systems.
+ * libcxgb4: add NULL check for wr->sg_list
+ 0B reads with a NULL sg cause a seg fault. So if there is no sg_list, then
+ set the WQE read length to 0.
+ * libcxgb4: update config.sub and config.guess
+ libcxgb4 had old versions of these files that caused
+ configure to fail on ppc64le platforms.
+ * libcxgb4: remove config/missing
+ This file gets installed via autoconf and shouldnt be in the repo.
+ * Gracefully handle unknown CQE status errors
+ c4iw_poll_cq_on() shouldn't fail the poll operation just because the
+ CQE status is unknown. Rather, it should map this to the "fatal error"
+ status and log the anomaly.
+- Update libcxgb4-rdmav2-ah_message.patch
+
+-------------------------------------------------------------------
Old:
----
libcxgb4-1.3.5.tar.gz
New:
----
libcxgb4-1.3.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcxgb4-rdmav2.spec ++++++
--- /var/tmp/diff_new_pack.6mZkv8/_old 2016-04-28 17:01:50.000000000 +0200
+++ /var/tmp/diff_new_pack.6mZkv8/_new 2016-04-28 17:01:50.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libcxgb4-rdmav2
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: libcxgb4-rdmav2
Summary: Chelsio T4 iWARP RNIC OpenIB Userspace Library
-Version: 1.3.5
+Version: 1.3.6
Release: 0
License: GPL-2.0 or BSD-2-Clause
Group: System/Libraries
++++++ libcxgb4-1.3.5.tar.gz -> libcxgb4-1.3.6.tar.gz ++++++
++++ 3541 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcxgb4-1.3.5/ChangeLog new/libcxgb4-1.3.6/ChangeLog
--- old/libcxgb4-1.3.5/ChangeLog 2014-07-31 18:28:31.000000000 +0200
+++ new/libcxgb4-1.3.6/ChangeLog 2015-12-07 17:42:33.000000000 +0100
@@ -1,14 +1,93 @@
-commit 6a417d903b9add7c8ab2b71ac11c85c46671e020
+commit 204dcd6e76070f6b8b1d8e4f04d9e752eb3d9809
+Author: root <root(a)r9.asicdesigners.com>
+Date: Mon Dec 7 08:38:24 2015 -0800
+
+ Spin release 1.3.6.
+
+ Signed-off-by: Steve Wise <swise(a)opengridcomputing.com>
+
+commit 2a4fbf58f2ea1fc47adcc7b2b4efd78227c65b97
+Author: Steve Wise <swise(a)opengridcomput.ing.com>
+Date: Mon Dec 7 08:30:55 2015 -0800
+
+ libcxgb4: skip TERMINATE CQEs before testing for errors
+
+ In poll_cq() if the wq happens to have just transitioned into error state,
+ and a TERMINATE CQE is the next CQE in the hwcq, then the TERMINATE
+ is incorrectly returned as a successful RECV CQE. This causes a false
+ RECV completion. The fix is to skip TERMINATE CQEs first.
+
+ Signed-off-by: Steve Wise <swise(a)opengridcomputing.com>
+
+commit 793333ea0cc00c977a0134d91b820e51557f4b7c
+Author: Steve Wise <swise(a)opengridcomputing.com>
+Date: Mon Dec 7 08:30:55 2015 -0800
+
+ libcxgb4:Eliminate warnings seen with buildall.sh on a 32 bit system.
+
+ ->fixes warnings due to improper typecasting.
+ ->suppresses warnings due to unused variables.
+ ->typecasted u64 value to long long to avoid warnings on x64bit systems.
+
+ Signed-off-by: Bharat Potnuri <bharat(a)chelsio.com>
+ Signed-off-by: Steve Wise <swise(a)opengridcomputing.com>
+
+commit 4b2df073b106e830f2fa2446d1990447bb8c4e10
+Author: Steve Wise <swise(a)opengridcomputing.com>
+Date: Mon Dec 7 08:30:55 2015 -0800
+
+ libcxgb4: add NULL check for wr->sg_list
+
+ 0B reads with a NULL sg cause a seg fault. So if there is no sg_list, then
+ set the WQE read length to 0.
+
+ Signed-off-by: Steve Wise <swise(a)opengridcomputing.com>
+ Signed-off-by: Bharat Potnuri <bharat(a)chelsio.com>
+
+commit 0550101d95805a2c53fb6934ed1c02da4e28bde2
+Author: Steve Wise <swise(a)opengridcomputing.com>
+Date: Mon Dec 7 08:30:55 2015 -0800
+
+ libcxgb4: update config.sub and config.guess
+
+ libcxgb4 had old versions of these files that caused
+ configure to fail on ppc64le platforms.
+
+ Signed-off-by: Steve Wise <swise(a)opengridcomputing.com>
+
+commit 204b6fab0b0aa62a96aedb54704d9babd336c13c
+Author: Steve Wise <swise(a)opengridcomputing.com>
+Date: Mon Dec 7 08:30:55 2015 -0800
+
+ libcxgb4: remove config/missing
+
+ This file gets installed via autoconf and shouldnt be in the repo.
+
+ Signed-off-by: Steve Wise <swise(a)opengridcomputing.com>
+
+commit 43f2862ccfcf19d8aec78c65482956ae41efc486
+Author: Hariprasad Shenai <hariprasad(a)chelsio.com>
+Date: Mon Dec 7 08:30:55 2015 -0800
+
+ Gracefully handle unknown CQE status errors
+
+ c4iw_poll_cq_on() shouldn't fail the poll operation just because the
+ CQE status is unknown. Rather, it should map this to the "fatal error"
+ status and log the anomaly.
+
+ Signed-off-by: Hariprasad Shenai <hariprasad(a)chelsio.com>
+
+commit 2517487f45688ed93b93a1ebf6ece4f33c3f778f
Author: Steve Wise <swise(a)opengridcomputing.com>
-Date: Thu Jul 31 11:25:22 2014 -0500
+Date: Thu Jul 31 12:10:30 2014 -0500
Spin release 1.3.5.
Signed-off-by: Steve Wise <swise(a)opengridcomputing.com>
-commit 52ecbea1b908d3b449022e2d75ebe0ca3885bcf2
+commit 9d996e396d4574a72583e4049d487ab5909cf8ac
Author: Steve Wise <swise(a)opengridcomputing.com>
-Date: Thu Jul 31 11:14:05 2014 -0500
+Date: Thu Jul 31 12:10:30 2014 -0500
libcxb4: use wc_wmb() instead of wmb().
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcxgb4-1.3.5/config/missing new/libcxgb4-1.3.6/config/missing
--- old/libcxgb4-1.3.5/config/missing 2014-06-18 17:14:22.000000000 +0200
+++ new/libcxgb4-1.3.6/config/missing 2015-12-07 19:44:54.000000000 +0100
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2009-04-28.21; # UTC
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,6 +31,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +44,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +77,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -86,6 +87,9 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
Send bug reports to <bug-automake(a)gnu.org>."
exit $?
;;
@@ -103,15 +107,22 @@
esac
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
- lex|yacc)
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
# Not GNU programs, they don't have --version.
;;
- tar)
+ tar*)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -135,7 +146,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $program in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -145,7 +156,7 @@
touch aclocal.m4
;;
- autoconf)
+ autoconf*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -154,7 +165,7 @@
touch configure
;;
- autoheader)
+ autoheader*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -164,7 +175,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -184,7 +195,7 @@
while read f; do touch "$f"; done
;;
- autom4te)
+ autom4te*)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -192,8 +203,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -207,80 +218,78 @@
fi
;;
- bison|yacc)
+ bison*|yacc*)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
- lex|flex)
+ lex*|flex*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
- help2man)
+ help2man*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit 1
+ exit $?
fi
;;
- makeinfo)
+ makeinfo*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -289,11 +298,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -303,7 +318,7 @@
touch $file
;;
- tar)
+ tar*)
shift
# We have already tried tar in the generic part.
@@ -317,13 +332,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
@@ -356,5 +371,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcxgb4-1.3.5/configure.in new/libcxgb4-1.3.6/configure.in
--- old/libcxgb4-1.3.5/configure.in 2014-07-31 18:28:31.000000000 +0200
+++ new/libcxgb4-1.3.6/configure.in 2015-12-07 17:42:33.000000000 +0100
@@ -1,11 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(libcxgb4, 1.3.5, linux-rdma(a)vger.kernel.org)
+AC_INIT(libcxgb4, 1.3.6, linux-rdma(a)vger.kernel.org)
AC_CONFIG_SRCDIR([src/libcxgb4.h])
AC_CONFIG_AUX_DIR(config)
AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE(libcxgb4, 1.3.5)
+AM_INIT_AUTOMAKE(libcxgb4, 1.3.6)
AM_PROG_LIBTOOL
AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presence of ib libraries],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcxgb4-1.3.5/libcxgb4.spec new/libcxgb4-1.3.6/libcxgb4.spec
--- old/libcxgb4-1.3.5/libcxgb4.spec 2014-07-31 18:29:05.000000000 +0200
+++ new/libcxgb4-1.3.6/libcxgb4.spec 2015-12-07 19:45:10.000000000 +0100
@@ -1,7 +1,7 @@
-%define ver 1.3.5
+%define ver 1.3.6
Name: libcxgb4
-Version: 1.3.5
+Version: 1.3.6
Release: 1%{?dist}
Summary: Chelsio T4/T5 RNIC Open Fabrics Userspace Library
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcxgb4-1.3.5/libcxgb4.spec.in new/libcxgb4-1.3.6/libcxgb4.spec.in
--- old/libcxgb4-1.3.5/libcxgb4.spec.in 2014-07-31 18:28:31.000000000 +0200
+++ new/libcxgb4-1.3.6/libcxgb4.spec.in 2015-12-07 17:42:33.000000000 +0100
@@ -1,7 +1,7 @@
%define ver @VERSION@
Name: libcxgb4
-Version: 1.3.5
+Version: 1.3.6
Release: 1%{?dist}
Summary: Chelsio T4/T5 RNIC Open Fabrics Userspace Library
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcxgb4-1.3.5/src/cq.c new/libcxgb4-1.3.6/src/cq.c
--- old/libcxgb4-1.3.5/src/cq.c 2014-06-18 17:14:22.000000000 +0200
+++ new/libcxgb4-1.3.6/src/cq.c 2015-12-07 17:42:29.000000000 +0100
@@ -322,11 +322,11 @@
static void dump_cqe(void *arg)
{
u64 *p = arg;
- syslog(LOG_NOTICE, "cxgb4 err cqe %016lx %016lx %016lx %016lx\n",
- be64_to_cpu(p[0]),
- be64_to_cpu(p[1]),
- be64_to_cpu(p[2]),
- be64_to_cpu(p[3]));
+ syslog(LOG_NOTICE, "cxgb4 err cqe %016llx %016llx %016llx %016llx\n",
+ (long long)be64_to_cpu(p[0]),
+ (long long)be64_to_cpu(p[1]),
+ (long long)be64_to_cpu(p[2]),
+ (long long)be64_to_cpu(p[3]));
}
/*
@@ -428,6 +428,11 @@
advance_oldest_read(wq);
}
+ if (CQE_OPCODE(hw_cqe) == FW_RI_TERMINATE) {
+ ret = -EAGAIN;
+ goto skip_cqe;
+ }
+
if (CQE_STATUS(hw_cqe) || t4_wq_in_error(wq)) {
*cqe_flushed = (CQE_STATUS(hw_cqe) == T4_ERR_SWFLUSH);
wq->error = 1;
@@ -439,11 +444,6 @@
goto proc_cqe;
}
- if (CQE_OPCODE(hw_cqe) == FW_RI_TERMINATE) {
- ret = -EAGAIN;
- goto skip_cqe;
- }
-
/*
* RECV completion.
*/
@@ -697,7 +697,7 @@
default:
PDBG("Unexpected cqe_status 0x%x for QPID=0x%0x\n",
CQE_STATUS(&cqe), CQE_QPID(&cqe));
- ret = -EINVAL;
+ wc->status = IBV_WC_FATAL_ERR;
}
}
if (wc->status && wc->status != IBV_WC_WR_FLUSH_ERR)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libcxgb4-1.3.5/src/qp.c new/libcxgb4-1.3.6/src/qp.c
--- old/libcxgb4-1.3.5/src/qp.c 2014-07-31 18:28:31.000000000 +0200
+++ new/libcxgb4-1.3.6/src/qp.c 2015-12-07 17:42:29.000000000 +0100
@@ -275,9 +275,9 @@
len16 = be64_to_cpu(*p) & 0xff;
while (len16--) {
- printf("%02x: %016lx ", (u8)(unsigned long)p, be64_to_cpu(*p));
+ printf("%02x: %016llx ", (u8)(unsigned long)p, (long long)be64_to_cpu(*p));
p++;
- printf("%016lx\n", be64_to_cpu(*p));
+ printf("%016llx\n", (long long)be64_to_cpu(*p));
p++;
}
}
@@ -287,7 +287,7 @@
struct ibv_modify_qp cmd;
struct ibv_qp_attr attr;
int mask;
- int ret;
+ int __attribute__((unused)) ret;
wc_wmb();
if (qid == qhp->wq.sq.qid) {
@@ -362,7 +362,8 @@
err = build_rdma_read(wqe, wr, &len16);
if (err)
break;
- swsqe->read_len = wr->sg_list[0].length;
+ swsqe->read_len = wr->sg_list ? wr->sg_list[0].length :
+ 0;
if (!qhp->wq.sq.oldest_read)
qhp->wq.sq.oldest_read = swsqe;
break;
++++++ libcxgb4-rdmav2-ah_message.patch ++++++
--- /var/tmp/diff_new_pack.6mZkv8/_old 2016-04-28 17:01:50.000000000 +0200
+++ /var/tmp/diff_new_pack.6mZkv8/_new 2016-04-28 17:01:50.000000000 +0200
@@ -7,7 +7,7 @@
--- configure.in.orig 2014-04-03 12:02:58.809101866 +0200
+++ configure.in 2014-04-03 12:04:28.451029934 +0200
@@ -8,7 +8,7 @@
- AM_INIT_AUTOMAKE(libcxgb4, 1.3.5)
+ AM_INIT_AUTOMAKE(libcxgb4, 1.3.6)
AM_PROG_LIBTOOL
-AC_ARG_ENABLE(libcheck, [ --disable-libcheck do not test for presence of ib libraries],
1
0
Hello community,
here is the log from the commit of package cinnamon-session for openSUSE:Factory checked in at 2016-04-28 16:56:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cinnamon-session (Old)
and /work/SRC/openSUSE:Factory/.cinnamon-session.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cinnamon-session"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cinnamon-session/cinnamon-session.changes 2016-03-16 10:35:10.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.cinnamon-session.new/cinnamon-session.changes 2016-04-28 17:01:45.000000000 +0200
@@ -1,0 +2,11 @@
+Mon Apr 25 05:00:35 UTC 2016 - sor.alexei(a)meowr.ru
+
+- Update to version 3.0.0:
+ * main.c: Remove CLUTTER_BACKEND=x11 (moved to cinnamon main.c).
+ * mdm: Fix logic error.
+ * Fix a typo in a warning message.
+ * Add a provides for x-session-manager.
+ * Support new libsystemd (which replaces libsystemd-login).
+ * Fix GTK+ regression in csm-inhibit-dialog.
+
+-------------------------------------------------------------------
Old:
----
cinnamon-session-2.8.3.tar.gz
New:
----
cinnamon-session-3.0.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cinnamon-session.spec ++++++
--- /var/tmp/diff_new_pack.PlUiek/_old 2016-04-28 17:01:47.000000000 +0200
+++ /var/tmp/diff_new_pack.PlUiek/_new 2016-04-28 17:01:47.000000000 +0200
@@ -17,7 +17,7 @@
Name: cinnamon-session
-Version: 2.8.3
+Version: 3.0.0
Release: 0
Summary: The session manager for the Cinnamon Desktop
License: GPL-2.0+ and LGPL-2.1+
@@ -29,6 +29,7 @@
BuildRequires: gnome-common
BuildRequires: hicolor-icon-theme
BuildRequires: libtool
+BuildRequires: pkg-config
BuildRequires: tcpd-devel
BuildRequires: update-desktop-files
BuildRequires: xmlto
@@ -39,7 +40,7 @@
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libcanberra)
-BuildRequires: pkgconfig(libsystemd-login)
+BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(pangox)
BuildRequires: pkgconfig(sm)
BuildRequires: pkgconfig(upower-glib)
++++++ cinnamon-session-2.8.3.tar.gz -> cinnamon-session-3.0.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-2.8.3/cinnamon-session/main.c new/cinnamon-session-3.0.0/cinnamon-session/main.c
--- old/cinnamon-session-2.8.3/cinnamon-session/main.c 2016-03-07 18:09:17.000000000 +0100
+++ new/cinnamon-session-3.0.0/cinnamon-session/main.c 2016-04-23 17:16:58.000000000 +0200
@@ -380,7 +380,6 @@
* detect if GNOME is running. We keep this for compatibility reasons.
*/
csm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
- csm_util_setenv ("CLUTTER_BACKEND", "x11");
/* Make QT5 apps follow the GTK style */
csm_util_setenv ("QT_STYLE_OVERRIDE", "gtk");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-2.8.3/configure.ac new/cinnamon-session-3.0.0/configure.ac
--- old/cinnamon-session-2.8.3/configure.ac 2016-03-07 18:09:17.000000000 +0100
+++ new/cinnamon-session-3.0.0/configure.ac 2016-04-23 17:16:58.000000000 +0200
@@ -1,5 +1,5 @@
AC_INIT([cinnamon-session],
- [2.8.3],
+ [3.0.0],
[https://github.com/linuxmint/cinnamon-session/issues])
AC_CONFIG_SRCDIR([cinnamon-session])
@@ -96,7 +96,9 @@
dnl Check for logind
dnl ====================================================================
-PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login >= 183], [have_logind=yes], [have_logind=no])
+PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd-login], [have_logind=yes], [
+ PKG_CHECK_MODULES(LOGIND, [gio-unix-2.0 libsystemd], [have_logind=yes], [have_logind=no])
+])
if test x$have_logind = xyes; then
AC_DEFINE(HAVE_LOGIND, 1, [Define if logind is supported])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-2.8.3/data/csm-inhibit-dialog.glade new/cinnamon-session-3.0.0/data/csm-inhibit-dialog.glade
--- old/cinnamon-session-2.8.3/data/csm-inhibit-dialog.glade 2016-03-07 18:09:17.000000000 +0100
+++ new/cinnamon-session-3.0.0/data/csm-inhibit-dialog.glade 2016-04-23 17:16:58.000000000 +0200
@@ -1,18 +1,19 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.16"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkVBox" id="main-box">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="header-label">
<property name="visible">True</property>
- <property name="xalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Some programs are still running:</property>
<property name="wrap">True</property>
+ <property name="xalign">0</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -27,16 +28,19 @@
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
+ <property name="min_content_height">200</property>
<child>
<object class="GtkTreeView" id="inhibitors-treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="border_width">3</property>
<property name="headers_visible">False</property>
<property name="enable_search">False</property>
<property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
</object>
</child>
</object>
@@ -49,12 +53,15 @@
<child>
<object class="GtkLabel" id="description-label">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Waiting for the program to finish. Interrupting the program may cause you to lose work.</property>
<property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-2.8.3/debian/changelog new/cinnamon-session-3.0.0/debian/changelog
--- old/cinnamon-session-2.8.3/debian/changelog 2016-03-07 18:09:17.000000000 +0100
+++ new/cinnamon-session-3.0.0/debian/changelog 2016-04-23 17:16:58.000000000 +0200
@@ -1,10 +1,18 @@
-cinnamon-session (2.8.3) rosa; urgency=medium
+cinnamon-session (3.0.0) sarah; urgency=medium
+
+ [ Michael Webster ]
+ * main.c: remove CLUTTER_BACKEND=x11 (moved to cinnamon main.c)
[ monsta ]
* mdm: fix logic error
* fix a typo in a warning message
- -- Clement Lefebvre <root(a)linuxmint.com> Mon, 07 Mar 2016 17:08:43 +0000
+ [ Clement Lefebvre ]
+ * [Fantu & Ralf Jung] Add a provides for x-session-manager
+ * Support new libsystemd (which replaces libsystemd-login)
+ * Fixed GTK regression in csm-inhibit-dialog https://github.com/linuxmint/cinnamon-session/issues/63
+
+ -- Clement Lefebvre <root(a)linuxmint.com> Sat, 23 Apr 2016 16:16:12 +0100
cinnamon-session (2.8.2) rosa; urgency=medium
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/cinnamon-session-2.8.3/debian/control new/cinnamon-session-3.0.0/debian/control
--- old/cinnamon-session-2.8.3/debian/control 2016-03-07 18:09:17.000000000 +0100
+++ new/cinnamon-session-3.0.0/debian/control 2016-04-23 17:16:58.000000000 +0200
@@ -15,8 +15,8 @@
libice-dev,
libjson-glib-dev (>= 0.10),
libsm-dev,
- libsystemd-daemon-dev [linux-any],
- libsystemd-login-dev [linux-any],
+ libsystemd-daemon-dev [linux-any] | libsystemd-dev [linux-any],
+ libsystemd-login-dev [linux-any] | libsystemd-dev [linux-any],
libupower-glib-dev (>= 0.9.0),
libx11-dev,
libxau-dev,
@@ -41,6 +41,7 @@
${shlibs:Depends}
Breaks: cinnamon-session-common (<< 2.2.2-5~)
Replaces: cinnamon-session-common (<< 2.2.2-5~)
+Provides: x-session-manager
Description: Cinnamon Session Manager - Minimal runtime
The Cinnamon Session Manager is in charge of starting the core components
of the Cinnamon desktop, and applications that should be launched at
1
0