pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/50354: Please upgrade Shibboleth SP to version 2.5.5



The following reply was made to PR pkg/50354; it has been noted by GNATS.

From: Konrad Schroder <perseant%uw.edu@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: Thomas Klausner <wiz%NetBSD.org@localhost>, pettai%NetBSD.org@localhost, 
 gnats-admin%netbsd.org@localhost, pkgsrc-bugs%netbsd.org@localhost
Subject: Re: pkg/50354: Please upgrade Shibboleth SP to version 2.5.5
Date: Wed, 21 Oct 2015 15:41:41 -0700

 This is a multi-part message in MIME format.
 --------------070602040809060905030308
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Yes, thanks, that is cleaner.  I've attached a new complete patch using 
 :S/apache//, much earlier in the file, to this email.
 
 Take care,
 
 -----------------------------------------------------------------------
 Konrad Schroder              Box 352143 -or- 215 Fluke Hall, Mason Road
 Software Developer and Sys Admin               University of Washington
 College of Engineering                          Seattle, WA, 98195, USA
 
 On 10/21/2015 02:35 PM, Thomas Klausner wrote:
 > The following reply was made to PR pkg/50354; it has been noted by GNATS.
 >
 > From: Thomas Klausner <wiz%NetBSD.org@localhost>
 > To: NetBSD bugtracking <gnats-bugs%NetBSD.org@localhost>
 > Cc:
 > Subject: Re: pkg/50354: Please upgrade Shibboleth SP to version 2.5.5
 > Date: Wed, 21 Oct 2015 23:31:44 +0200
 >
 >   On Wed, Oct 21, 2015 at 07:10:03PM +0000, Konrad Schroder wrote:
 >   >  @@ -109,3 +109,6 @@
 >   >   .include "../../www/curl/buildlink3.mk"
 >   >   .include "../../mk/apache.mk"
 >   >   .include "../../mk/bsd.pkg.mk"
 >   >  +
 >   >  +PECHO=`echo ${PKG_APACHE} | tr -dc '0-9'`
 >   >  +PLIST_SUBST+=	PKG_APACHE_NUM="${PECHO}"
 >
 >   Please avoid code after the bsd.pkg.mk inclusion.
 >   You can do this after including apache.mk, and probably even before if you use something like
 >
 >   PLIST_SUBST+=	PKG_APACHE_NUM=${PKG_APACHE:S/ap//}
 >
 >   (untested).
 >    Thomas
 >
 >
 
 --------------070602040809060905030308
 Content-Type: text/x-patch;
  name="shibboleth-2.5.5p2.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="shibboleth-2.5.5p2.diff"
 
 ? shibboleth-2.5.5p2.diff
 ? work
 Index: Makefile
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/shibboleth-sp/Makefile,v
 retrieving revision 1.17
 diff -u -r1.17 Makefile
 --- Makefile	17 Apr 2015 15:53:16 -0000	1.17
 +++ Makefile	21 Oct 2015 22:40:08 -0000
 @@ -1,8 +1,8 @@
  # $NetBSD: Makefile,v 1.17 2015/04/17 15:53:16 adam Exp $
  #
  
 -DISTNAME=	shibboleth-sp-2.5.2
 -PKGREVISION=	6
 +DISTNAME=	shibboleth-sp-2.5.5
 +PKGREVISION=	1
  CATEGORIES=	www
  MASTER_SITES=	http://www.shibboleth.net/downloads/service-provider/${PKGVERSION_NOREV}/
  
 @@ -27,6 +27,8 @@
  
  APACHE_MODULE=	YES
  
 +PLIST_SUBST+=	PKG_APACHE_NUM=${PKG_APACHE:S/apache//}
 +
  SUBST_CLASSES+=		paths
  SUBST_FILES.paths=	${WRKSRC}/configs/Makefile.in
  SUBST_FILES.paths+=	${WRKSRC}/configs/keygen.sh
 Index: PLIST
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/shibboleth-sp/PLIST,v
 retrieving revision 1.4
 diff -u -r1.4 PLIST
 --- PLIST	11 Mar 2014 14:05:18 -0000	1.4
 +++ PLIST	21 Oct 2015 22:40:08 -0000
 @@ -63,17 +63,17 @@
  lib/libshibsp-lite.a
  lib/libshibsp-lite.so
  lib/libshibsp-lite.so.6
 -lib/libshibsp-lite.so.6.0.2
 +lib/libshibsp-lite.so.6.0.5
  lib/libshibsp.a
  lib/libshibsp.so
  lib/libshibsp.so.6
 -lib/libshibsp.so.6.0.2
 +lib/libshibsp.so.6.0.5
  lib/shibboleth/adfs-lite.a
  lib/shibboleth/adfs-lite.so
  lib/shibboleth/adfs.a
  lib/shibboleth/adfs.so
 -lib/shibboleth/mod_shib_22.a
 -lib/shibboleth/mod_shib_22.so
 +lib/shibboleth/mod_shib_${PKG_APACHE_NUM}.a
 +lib/shibboleth/mod_shib_${PKG_APACHE_NUM}.so
  lib/shibboleth/plugins-lite.a
  lib/shibboleth/plugins-lite.so
  lib/shibboleth/plugins.a
 Index: distinfo
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/shibboleth-sp/distinfo,v
 retrieving revision 1.5
 diff -u -r1.5 distinfo
 --- distinfo	29 Sep 2013 10:19:47 -0000	1.5
 +++ distinfo	21 Oct 2015 22:40:08 -0000
 @@ -1,13 +1,13 @@
  $NetBSD: distinfo,v 1.5 2013/09/29 10:19:47 joerg Exp $
  
 -SHA1 (shibboleth-sp-2.5.2.tar.gz) = a9b42cc7c1d401bb217c94c11aef06ce7d21265c
 -RMD160 (shibboleth-sp-2.5.2.tar.gz) = 8b37921bf16488dc4f3890abf09e7cb44c16367f
 -Size (shibboleth-sp-2.5.2.tar.gz) = 949163 bytes
 +SHA1 (shibboleth-sp-2.5.5.tar.gz) = e69f4dae585771292e6ad51d5872f14edd683f7a
 +RMD160 (shibboleth-sp-2.5.5.tar.gz) = f0176c78e8a85b582266bdc9845f833cf35a83a6
 +Size (shibboleth-sp-2.5.5.tar.gz) = 1003433 bytes
  SHA1 (patch-ab) = f667e876e1ebd84e706433156eed2cd60e905372
 -SHA1 (patch-configs_Makefile.in) = 9601da9a6aadc2bbc8abef7b1008782d4dcda2e8
 -SHA1 (patch-shibsp_SPConfig.cpp) = 3befe1fba7f8f02d53a41c09fc50f7cf39bd447d
 +SHA1 (patch-configs_Makefile.in) = 00235f36dc529da21cdc55fd833d561ace153d22
 +SHA1 (patch-shibsp_SPConfig.cpp) = 2fd64032705f56de3c1a9c32a9916ce5e91b2964
  SHA1 (patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp) = 1ec2c98134d1bfc50e7571a26b5992c8ac47ef46
 -SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp) = 058d65ab9481a3894a8156386a6f7416e524be82
 -SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp) = 4bf251804def14395b11dc178f699e4c21b712be
 +SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp) = 6ca0844486031880919bb52a9b72829e2f48fe79
 +SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp) = 37a7d6d7d03c27489db2b6e198a4b85233f57e34
  SHA1 (patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp) = 8ce5f3dbdb0b77864401c03335637cc2b2d4f400
  SHA1 (patch-shibsp_base.h) = c1b6d2598afdff067990224d1202c5e10ae0259a
 Index: files/shibd.sh
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/shibboleth-sp/files/shibd.sh,v
 retrieving revision 1.1.1.1
 diff -u -r1.1.1.1 shibd.sh
 --- files/shibd.sh	15 Mar 2011 13:15:37 -0000	1.1.1.1
 +++ files/shibd.sh	21 Oct 2015 22:40:08 -0000
 @@ -13,7 +13,18 @@
  rcvar=$name
  command="@PREFIX@/sbin/shibd"
  pidfile="/var/run/shibboleth/shibd.pid"
 -command_args=""
 +start_precmd="shibd_precmd"
 +command_args="-p $pidfile"
 +
 +shibd_precmd()
 +{
 +    if [ ! -d /var/run/shibboleth ]; then
 +        mkdir -p -m 755 /var/run/shibboleth
 +    fi
 +    if [ -f /var/run/shibboleth/shibd.sock ]; then
 +        rm -f /var/run/shibboleth/shibd.sock
 +    fi
 +}
  
  if [ -f /etc/rc.subr ]; then
          load_rc_config $name
 Index: patches/patch-configs_Makefile.in
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in,v
 retrieving revision 1.1
 diff -u -r1.1 patch-configs_Makefile.in
 --- patches/patch-configs_Makefile.in	21 Sep 2013 22:16:41 -0000	1.1
 +++ patches/patch-configs_Makefile.in	21 Oct 2015 22:40:08 -0000
 @@ -2,13 +2,15 @@
  
  Install config and example pkgsrc-ish
  
 ---- configs/Makefile.in.orig	2013-06-16 22:06:20.000000000 +0000
 -+++ configs/Makefile.in
 -@@ -296,18 +296,13 @@ pkgrundir = $(localstatedir)/run/@PACKAG
 +--- configs/Makefile.in.orig	2015-07-09 09:16:39.000000000 -0700
 ++++ configs/Makefile.in	2015-10-20 15:27:28.000000000 -0700
 +@@ -354,20 +354,13 @@
   pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
   pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
   pkgsysconf_DATA = \
 +-	shibd-systemd \
  -	shibd-redhat \
 +-	shibd-amazon \
  -	shibd-suse \
  -	shibd-debian \
  -	shibd-osx.plist \
 @@ -24,7 +26,7 @@
   
   # The config files are installed "special".  Unlike the entries in
   # pkgsysconf_DATA, these files are installed as "foo.dist" and only
 -@@ -417,16 +412,16 @@ install-pkgsysconfDATA: $(pkgsysconf_DAT
 +@@ -480,16 +475,16 @@
   	@$(NORMAL_INSTALL)
   	@list='$(pkgsysconf_DATA)'; test -n "$(pkgsysconfdir)" || list=; \
   	if test -n "$$list"; then \
 @@ -45,7 +47,7 @@
   	done
   
   uninstall-pkgsysconfDATA:
 -@@ -477,7 +472,7 @@ check-am: all-am
 +@@ -538,7 +533,7 @@
   check: check-am
   all-am: Makefile $(DATA)
   installdirs:
 @@ -54,7 +56,7 @@
   	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
   	done
   install: install-am
 -@@ -533,7 +528,6 @@ info-am:
 +@@ -594,7 +589,6 @@
   
   install-data-am: install-data-local install-pkgsysconfDATA
   	@$(NORMAL_INSTALL)
 @@ -62,7 +64,7 @@
   install-dvi: install-dvi-am
   
   install-dvi-am:
 -@@ -649,18 +643,18 @@ install-data-local:	all-data-local
 +@@ -720,18 +714,18 @@
   	$(mkinstalldirs) $(DESTDIR)$(pkgrundir)
   	$(mkinstalldirs) $(DESTDIR)$(pkgcachedir)
   	$(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
 Index: patches/patch-shibsp_SPConfig.cpp
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/shibboleth-sp/patches/patch-shibsp_SPConfig.cpp,v
 retrieving revision 1.1
 diff -u -r1.1 patch-shibsp_SPConfig.cpp
 --- patches/patch-shibsp_SPConfig.cpp	29 Sep 2013 10:19:47 -0000	1.1
 +++ patches/patch-shibsp_SPConfig.cpp	21 Oct 2015 22:40:08 -0000
 @@ -1,8 +1,8 @@
 -$NetBSD: patch-shibsp_SPConfig.cpp,v 1.1 2013/09/29 10:19:47 joerg Exp $
 +$NetBSD$
  
 ---- shibsp/SPConfig.cpp.orig	2013-09-29 08:49:36.000000000 +0000
 -+++ shibsp/SPConfig.cpp
 -@@ -446,7 +446,7 @@ bool SPConfig::instantiate(const char* c
 +--- shibsp/SPConfig.cpp.orig	2015-10-19 17:25:56.000000000 -0700
 ++++ shibsp/SPConfig.cpp	2015-10-19 17:26:43.000000000 -0700
 +@@ -447,7 +447,7 @@
           getServiceProvider()->init();
           return true;
       }
 @@ -10,4 +10,4 @@
  +    catch (std::exception& ex) {
           if (rethrow)
               throw;
 -         Category::getInstance(SHIBSP_LOGCAT".Config").fatal("caught exception while loading configuration: %s", ex.what());
 +         Category::getInstance(SHIBSP_LOGCAT ".Config").fatal("caught exception while loading configuration: %s", ex.what());
 Index: patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp,v
 retrieving revision 1.1
 diff -u -r1.1 patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp
 --- patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp	29 Sep 2013 10:19:47 -0000	1.1
 +++ patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp	21 Oct 2015 22:40:08 -0000
 @@ -1,13 +1,13 @@
 -$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp,v 1.1 2013/09/29 10:19:47 joerg Exp $
 +$NetBSD$
  
 ---- shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp.orig	2013-09-29 09:10:24.000000000 +0000
 -+++ shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp
 -@@ -170,7 +170,7 @@ ChainingAttributeExtractor::ChainingAttr
 +--- shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp.orig	2015-10-19 17:27:55.000000000 -0700
 ++++ shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp	2015-10-19 17:28:27.000000000 -0700
 +@@ -170,7 +170,7 @@
                   m_extractors.push_back(np.get());
                   np.release();
               }
  -            catch (exception& ex) {
  +            catch (std::exception& ex) {
 -                 Category::getInstance(SHIBSP_LOGCAT".AttributeExtractor.Chaining").error(
 +                 Category::getInstance(SHIBSP_LOGCAT ".AttributeExtractor.Chaining").error(
                       "caught exception processing embedded AttributeExtractor element: %s", ex.what()
                       );
 Index: patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp
 ===================================================================
 RCS file: /cvsroot/pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp,v
 retrieving revision 1.1
 diff -u -r1.1 patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp
 --- patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp	29 Sep 2013 10:19:47 -0000	1.1
 +++ patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp	21 Oct 2015 22:40:08 -0000
 @@ -1,22 +1,22 @@
 -$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp,v 1.1 2013/09/29 10:19:47 joerg Exp $
 +$NetBSD$
  
 ---- shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp.orig	2013-09-29 08:55:53.000000000 +0000
 -+++ shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp
 -@@ -240,7 +240,7 @@ ChainingAttributeResolver::ChainingAttri
 +--- shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp.orig	2015-10-19 17:29:03.000000000 -0700
 ++++ shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp	2015-10-19 17:29:32.000000000 -0700
 +@@ -240,7 +240,7 @@
                   m_resolvers.push_back(np.get());
                   np.release();
               }
  -            catch (exception& ex) {
  +            catch (std::exception& ex) {
 -                 Category::getInstance(SHIBSP_LOGCAT".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).error(
 +                 Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver." CHAINING_ATTRIBUTE_RESOLVER).error(
                       "caught exception processing embedded AttributeResolver element: %s", ex.what()
                       );
 -@@ -274,7 +274,7 @@ void ChainingAttributeResolver::resolveA
 +@@ -274,7 +274,7 @@
               chain.m_ownedAssertions.insert(chain.m_ownedAssertions.end(), context->getResolvedAssertions().begin(), context->getResolvedAssertions().end());
               context->getResolvedAssertions().clear();
           }
  -        catch (exception& ex) {
  +        catch (std::exception& ex) {
 -             Category::getInstance(SHIBSP_LOGCAT".AttributeResolver."CHAINING_ATTRIBUTE_RESOLVER).error(
 +             Category::getInstance(SHIBSP_LOGCAT ".AttributeResolver." CHAINING_ATTRIBUTE_RESOLVER).error(
                   "caught exception applying AttributeResolver in chain: %s", ex.what()
                   );
 
 --------------070602040809060905030308--
 


Home | Main Index | Thread Index | Old Index