[96350] trunk/dports/security/shibboleth

[scantor at macports.org]

Revision: 96350
          https://trac.macports.org/changeset/96350
Author:   scantor at macports.org
Date:     2012-08-07 12:19:47 -0700 (Tue, 07 Aug 2012)
Log Message:
-----------
Revised patch for Snow Leopard and Lion

Modified Paths:
--------------
    trunk/dports/security/shibboleth/Portfile

Added Paths:
-----------
    trunk/dports/security/shibboleth/files/patch-shibsp-binding-impl-ArtifactResolver.cpp.diff

Removed Paths:
-------------
    trunk/dports/security/shibboleth/files/patch-shibsp-internal.h.diff

Modified: trunk/dports/security/shibboleth/Portfile
===================================================================
--- trunk/dports/security/shibboleth/Portfile	2012-08-07 18:26:01 UTC (rev 96349)
+++ trunk/dports/security/shibboleth/Portfile	2012-08-07 19:19:47 UTC (rev 96350)
@@ -5,6 +5,7 @@
 
 name                shibboleth
 version             2.5.0
+revision            1
 categories          security www shibboleth
 license             Apache
 maintainers         snc scantor
@@ -48,10 +49,10 @@
 worksrcdir          ${name}-sp-${version}
 checksums           rmd160  06811c584cb31bb088545c963c624304284f396a \
                     sha256  67a8b4043a9e994188dc1d77450fd4adb3fa0fcc157bed28ec22ed6d670f7aa1
-patchfiles          patch-shibsp-internal.h.diff
+patchfiles          patch-shibsp-binding-impl-ArtifactResolver.cpp.diff
 
 configure.args      --with-xmltooling=${prefix} \
-                    --with-opensaml=${prefix} \
+                    --with-saml=${prefix} \
                     --with-boost=${prefix} \
                     --with-xerces=${prefix} \
                     --with-xmlsec=${prefix}

Added: trunk/dports/security/shibboleth/files/patch-shibsp-binding-impl-ArtifactResolver.cpp.diff
===================================================================
--- trunk/dports/security/shibboleth/files/patch-shibsp-binding-impl-ArtifactResolver.cpp.diff	                        (rev 0)
+++ trunk/dports/security/shibboleth/files/patch-shibsp-binding-impl-ArtifactResolver.cpp.diff	2012-08-07 19:19:47 UTC (rev 96350)
@@ -0,0 +1,19 @@
+--- shibsp/binding/impl/ArtifactResolver.cpp.orig	2012-08-07 19:52:29.000000000 +0100
++++ shibsp/binding/impl/ArtifactResolver.cpp	2012-08-07 19:53:11.000000000 +0100
+@@ -208,14 +208,10 @@
+                             XercesJanitor<DOMDocument> docjanitor(doc);
+ 
+                             if (log.isDebugEnabled()) {
+-#ifdef XMLTOOLING_LOG4SHIB
+-                                log.debugStream() << "received XML:\n" << *(doc->getDocumentElement()) << logging::eol;
+-#else
+                                 string buf;
+                                 XMLHelper::serialize(doc->getDocumentElement(), buf);
+                                 log.debugStream() << "received XML:\n" << buf << logging::eol;
+-#endif
+-    }
++                            }
+                             xmlObject.reset(XMLObjectBuilder::buildOneFromElement(doc->getDocumentElement(), true));
+                             docjanitor.release();
+                         }
+

Deleted: trunk/dports/security/shibboleth/files/patch-shibsp-internal.h.diff
===================================================================
--- trunk/dports/security/shibboleth/files/patch-shibsp-internal.h.diff	2012-08-07 18:26:01 UTC (rev 96349)
+++ trunk/dports/security/shibboleth/files/patch-shibsp-internal.h.diff	2012-08-07 19:19:47 UTC (rev 96350)
@@ -1,15 +0,0 @@
---- shibsp/internal.h.orig	2012-08-07 00:44:36.000000000 -0400
-+++ shibsp/internal.h	2012-08-07 00:39:13.000000000 -0400
-@@ -45,6 +45,12 @@
- #endif
- 
- #include "base.h"
-+
-+// Need forward decl of stream operator for clang
-+#include <iostream>
-+#include <xercesc/dom/DOM.hpp>
-+extern XMLTOOL_API std::ostream& operator<<(std::ostream& ostr, const xercesc::DOMNode& n);
-+
- #include "SPConfig.h"
- 
- #include <memory>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120807/04fe3f8a/attachment.html>