Hello community,

here is the log from the commit of package pam_ccreds for openSUSE:Factory 
checked in at 2013-06-19 14:53:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pam_ccreds (Old)
 and      /work/SRC/openSUSE:Factory/.pam_ccreds.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "pam_ccreds"

Changes:
--------
--- /work/SRC/openSUSE:Factory/pam_ccreds/pam_ccreds.changes    2013-01-14 
11:13:48.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.pam_ccreds.new/pam_ccreds.changes       
2013-06-19 14:53:31.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Jun 14 01:13:12 UTC 2013 - [email protected]
+
+- Add pam_ccreds-db6.diff to fix compile abort with db >= 5
+
+-------------------------------------------------------------------

New:
----
  pam_ccreds-db6.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ pam_ccreds.spec ++++++
--- /var/tmp/diff_new_pack.XD6XmN/_old  2013-06-19 14:53:31.000000000 +0200
+++ /var/tmp/diff_new_pack.XD6XmN/_new  2013-06-19 14:53:31.000000000 +0200
@@ -17,20 +17,22 @@
 
 
 Name:           pam_ccreds
-BuildRequires:  automake
-BuildRequires:  db-devel
-BuildRequires:  openssl-devel
-BuildRequires:  pam-devel
 Version:        10
 Release:        0
 Summary:        Pam module to cache login credentials
 License:        GPL-2.0+
 Group:          Productivity/Security
 Url:            http://www.padl.com/OSS/pam_ccreds.html
+
 Source:         pam_ccreds-%{version}.tar.bz2
 Source2:        baselibs.conf
 Patch1:         pam_ccreds-readme-fix.dif
+Patch2:         pam_ccreds-db6.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  automake
+BuildRequires:  db-devel
+BuildRequires:  openssl-devel
+BuildRequires:  pam-devel
 Requires:       db
 Requires:       pam
 
@@ -42,7 +44,8 @@
 
 %prep
 %setup -q
-%patch1
+%patch -P 1 -p0
+%patch -P 2 -p1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.

++++++ pam_ccreds-db6.diff ++++++
From: Jan Engelhardt <[email protected]>
Date: pam_ccreds-db6.diff

src: fix sloppy DB version >= 5 check

db-6.0 is on the scene.

---
 cc_db.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: pam_ccreds-10/cc_db.c
===================================================================
--- pam_ccreds-10.orig/cc_db.c
+++ pam_ccreds-10/cc_db.c
@@ -66,7 +66,7 @@ int pam_cc_db_open(const char *filename,
                return PAM_SERVICE_ERR;
        }
 
-#if (DB_VERSION_MAJOR > 3) && (DB_VERSION_MINOR > 0)
+#if DB_VERSION_MAJOR > 4 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1)
        rc = db->open(db, NULL, filename, NULL,
                      DB_BTREE, db_flags, mode);
 #else
-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to