Merge lp:~juan457/zorba/email-module-bugfixes into lp:zorba/email-module

Proposed by Juan Zacarias
Status: Merged
Approved by: Juan Zacarias
Approved revision: 41
Merged at revision: 41
Proposed branch: lp:~juan457/zorba/email-module-bugfixes
Merge into: lp:zorba/email-module
Diff against target: 93 lines (+84/-0)
2 files modified
cmake_modules/FindKerberos.cmake (+47/-0)
cmake_modules/FindPAM.cmake (+37/-0)
To merge this branch: bzr merge lp:~juan457/zorba/email-module-bugfixes
Reviewer Review Type Date Requested Status
Juan Zacarias Approve
Chris Hillery Approve
Review via email: mp+79984@code.launchpad.net

Commit message

Added FindKerberos.cmake and FindPAM.cmake files (BUG: #862091)

Description of the change

Added missing dependency files.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) wrote :

Juan - you'll need to vote "Approve" also to kick off the remote queue.

review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

The attempt to merge lp:~juan457/zorba/email-module-bugfixes into lp:zorba/email-module failed. Below is the output from the failed tests.

CMake Error at /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake:272 (message):
  Validation queue job email-module-bugfixes-2011-10-25T20-23-36.67Z is
  finished. The final status was:

  1 tests did not succeed - changes not commited.

Error in read script: /home/ceej/zo/testing/zorbatest/tester/TarmacLander.cmake

Revision history for this message
Juan Zacarias (juan457) wrote :

uh? the failing test has no relation with adding files to the email module

zorba_excel_module/excel/engineering/bin2hex/excel_bin2hex2.xq

this is the test failing.

any idea?

Revision history for this message
Chris Hillery (ceejatec) wrote :

I ran the test manually in your build on the remote queue machine, and it succeeded. So I guess the remote queue machine is acting up again. I'm re-approving this proposal, hopefully it will work this time.

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job email-module-bugfixes-2011-10-26T00-11-03.37Z is finished. The final status was:

All tests succeeded!

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1. Got: 1 Approve.

Revision history for this message
Juan Zacarias (juan457) wrote :

Ok, I am just getting confused in this. Do I need to change to Approved again?

Revision history for this message
Chris Hillery (ceejatec) wrote :

You need two Approve votes to actually merge changes, so you should vote Approve yourself and then mark the proposal Approved.

Revision history for this message
Juan Zacarias (juan457) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue job email-module-bugfixes-2011-10-26T00-52-38.123Z is finished. The final status was:

All tests succeeded!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'cmake_modules/FindKerberos.cmake'
2--- cmake_modules/FindKerberos.cmake 1970-01-01 00:00:00 +0000
3+++ cmake_modules/FindKerberos.cmake 2011-10-20 17:32:26 +0000
4@@ -0,0 +1,47 @@
5+# Copyright 2006-2008 The FLWOR Foundation.
6+#
7+# Licensed under the Apache License, Version 2.0 (the "License");
8+# you may not use this file except in compliance with the License.
9+# You may obtain a copy of the License at
10+#
11+# http://www.apache.org/licenses/LICENSE-2.0
12+#
13+# Unless required by applicable law or agreed to in writing, software
14+# distributed under the License is distributed on an "AS IS" BASIS,
15+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+# See the License for the specific language governing permissions and
17+# limitations under the License.
18+#
19+# Finds the KERBEROS library
20+#
21+# KERBEROS_FOUND - True if SASL library found.
22+# KERBEROS_LIBRARY - Libraries to link against for the SASL library
23+#
24+
25+if (KERBEROS_LIBRARIES)
26+ # Already in cache, be silent
27+ set(KERBEROS_FIND_QUIETLY TRUE)
28+endif (KERBEROS_LIBRARIES)
29+
30+# Look for the library.
31+find_library(
32+ KERBEROS_LIBRARY
33+ NAMES gssapi_krb5
34+ PATHS ${KERBEROS_LIBRARY_DIRS} /opt/local/lib /usr/lib /usr/local/lib
35+ DOC "Library to link against for kerberos support (gssapi_krb5)")
36+mark_as_advanced(KERBEROS_LIBRARY)
37+
38+if (KERBEROS_LIBRARY)
39+ MESSAGE(STATUS "Found Kerberos library -- " ${KERBEROS_LIBRARY})
40+else (KERBEROS_LIBRARY)
41+ MESSAGE(STATUS "Could not find Kerberos library")
42+endif (KERBEROS_LIBRARY)
43+
44+# Copy the results to the output variables.
45+if(KERBEROS_LIBRARY)
46+ set(KERBEROS_FOUND 1)
47+else(KERBEROS_LIBRARY)
48+ set(KERBEROS_FOUND 0)
49+ set(KERBEROS_LIBRARY)
50+ set(KERBEROS_INCLUDE)
51+endif(KERBEROS_LIBRARY)
52
53=== added file 'cmake_modules/FindPAM.cmake'
54--- cmake_modules/FindPAM.cmake 1970-01-01 00:00:00 +0000
55+++ cmake_modules/FindPAM.cmake 2011-10-20 17:32:26 +0000
56@@ -0,0 +1,37 @@
57+# Copyright 2006-2008 The FLWOR Foundation.
58+#
59+# Licensed under the Apache License, Version 2.0 (the "License");
60+# you may not use this file except in compliance with the License.
61+# You may obtain a copy of the License at
62+#
63+# http://www.apache.org/licenses/LICENSE-2.0
64+#
65+# Unless required by applicable law or agreed to in writing, software
66+# distributed under the License is distributed on an "AS IS" BASIS,
67+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
68+# See the License for the specific language governing permissions and
69+# limitations under the License.
70+#
71+# Try to find the PAM libraries
72+#
73+# PAM_FOUND - True if PAM library found
74+# PAM_INCLUDE_DIR - Directory to include to get PAM headers
75+# PAM_LIBRARIES - Libraries to link against for the PAM library
76+
77+if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
78+ # Already in cache, be silent
79+ set(PAM_FIND_QUIETLY TRUE)
80+endif (PAM_INCLUDE_DIR AND PAM_LIBRARY)
81+
82+find_path(PAM_INCLUDE_DIR NAMES security/pam_appl.h pam/pam_appl.h)
83+find_library(PAM_LIBRARY pam)
84+find_library(DL_LIBRARY dl)
85+
86+if (PAM_INCLUDE_DIR AND PAM_LIBRARY)
87+ set(PAM_FOUND TRUE)
88+ if (DL_LIBRARY)
89+ set(PAM_LIBRARIES ${PAM_LIBRARY} ${DL_LIBRARY})
90+ else (DL_LIBRARY)
91+ set(PAM_LIBRARIES ${PAM_LIBRARY})
92+ endif (DL_LIBRARY)
93+endif (PAM_INCLUDE_DIR AND PAM_LIBRARY)

Subscribers

People subscribed via source and target branches

to all changes: