pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/www/shibboleth-sp
Module Name: pkgsrc
Committed By: wiz
Date: Thu Dec 18 00:19:08 UTC 2025
Modified Files:
pkgsrc/www/shibboleth-sp: Makefile PLIST distinfo
pkgsrc/www/shibboleth-sp/patches: patch-configs_Makefile.in
patch-configs_keygen.sh
patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp
patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp
patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp
patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp
patch-shibsp_base.h
Log Message:
shibboleth-sp: fix build with NetBSD 11's sh(1)
Fix some pkglint while here.
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/www/shibboleth-sp/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/shibboleth-sp/PLIST
cvs rdiff -u -r1.11 -r1.12 pkgsrc/www/shibboleth-sp/distinfo
cvs rdiff -u -r1.3 -r1.4 \
pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in \
pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp \
pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/www/shibboleth-sp/patches/patch-configs_keygen.sh
cvs rdiff -u -r1.2 -r1.3 \
pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp \
pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp \
pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/www/shibboleth-sp/Makefile
diff -u pkgsrc/www/shibboleth-sp/Makefile:1.67 pkgsrc/www/shibboleth-sp/Makefile:1.68
--- pkgsrc/www/shibboleth-sp/Makefile:1.67 Sun Oct 5 19:26:28 2025
+++ pkgsrc/www/shibboleth-sp/Makefile Thu Dec 18 00:19:07 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2025/10/05 19:26:28 js Exp $
+# $NetBSD: Makefile,v 1.68 2025/12/18 00:19:07 wiz Exp $
DISTNAME= shibboleth-sp-3.5.0
PKGREVISION= 3
@@ -15,6 +15,7 @@ BUILD_DEFS+= VARBASE
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-xmltooling=${PREFIX}
CONFIGURE_ARGS+= --localstatedir=${VARBASE}
+CONFIGURE_ARGS+= --with-boost=${BUILDLINK_PREFIX.boost-libs}
USE_TOOLS+= pkg-config
EGDIR= ${PREFIX}/share/examples/shibboleth
@@ -32,8 +33,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
+SUBST_FILES.paths= configs/Makefile.in
+SUBST_FILES.paths+= configs/keygen.sh
SUBST_STAGE.paths= pre-configure
SUBST_VARS.paths= EGDIR
SUBST_VARS.paths+= SHIB_CONFDIR
Index: pkgsrc/www/shibboleth-sp/PLIST
diff -u pkgsrc/www/shibboleth-sp/PLIST:1.7 pkgsrc/www/shibboleth-sp/PLIST:1.8
--- pkgsrc/www/shibboleth-sp/PLIST:1.7 Mon Apr 21 21:10:48 2025
+++ pkgsrc/www/shibboleth-sp/PLIST Thu Dec 18 00:19:07 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2025/04/21 21:10:48 perseant Exp $
+@comment $NetBSD: PLIST,v 1.8 2025/12/18 00:19:07 wiz Exp $
bin/mdquery
bin/resolvertest
bin/shib-metagen
@@ -59,33 +59,15 @@ include/shibsp/util/PropertySet.h
include/shibsp/util/SPConstants.h
include/shibsp/util/TemplateParameters.h
include/shibsp/version.h
-lib/libshibsp-lite.a
lib/libshibsp-lite.la
-lib/libshibsp-lite.so
-lib/libshibsp-lite.so.12
-lib/libshibsp-lite.so.12.0.0
-lib/libshibsp.a
lib/libshibsp.la
-lib/libshibsp.so
-lib/libshibsp.so.12
-lib/libshibsp.so.12.0.0
lib/pkgconfig/shibsp-lite.pc
lib/pkgconfig/shibsp.pc
-lib/shibboleth/adfs-lite.a
lib/shibboleth/adfs-lite.la
-lib/shibboleth/adfs-lite.so
-lib/shibboleth/adfs.a
lib/shibboleth/adfs.la
-lib/shibboleth/adfs.so
-lib/shibboleth/mod_shib_${PKG_APACHE_NUM}.a
-lib/shibboleth/mod_shib_${PKG_APACHE_NUM}.so
lib/shibboleth/mod_shib_24.la
-lib/shibboleth/plugins-lite.a
lib/shibboleth/plugins-lite.la
-lib/shibboleth/plugins-lite.so
-lib/shibboleth/plugins.a
lib/shibboleth/plugins.la
-lib/shibboleth/plugins.so
sbin/shib-keygen
sbin/shibd
share/doc/shibboleth-${PKGVERSION}/CREDITS.txt
Index: pkgsrc/www/shibboleth-sp/distinfo
diff -u pkgsrc/www/shibboleth-sp/distinfo:1.11 pkgsrc/www/shibboleth-sp/distinfo:1.12
--- pkgsrc/www/shibboleth-sp/distinfo:1.11 Mon Apr 21 21:10:48 2025
+++ pkgsrc/www/shibboleth-sp/distinfo Thu Dec 18 00:19:07 2025
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.11 2025/04/21 21:10:48 perseant Exp $
+$NetBSD: distinfo,v 1.12 2025/12/18 00:19:07 wiz Exp $
BLAKE2s (shibboleth-sp-3.5.0.tar.gz) = d48d65da6d60780f85d5c37edfbb141d58579d3746ea412c1025a694029621a0
SHA512 (shibboleth-sp-3.5.0.tar.gz) = 1631708d160a082213623e01a0d42ead2632883e62d9026a1c56ed11a01c83a16e5259d6b6b4dd96cc3d7225360dfd720b6cdf21aeae1523dad56278904c6b31
Size (shibboleth-sp-3.5.0.tar.gz) = 1127872 bytes
-SHA1 (patch-configs_Makefile.in) = 452741659276be98e9c0b2531b69ad1fa5c421f8
-SHA1 (patch-configs_keygen.sh) = 414467335f80da97643863fb221c152fd7139a9e
-SHA1 (patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp) = 3de173b5680b71d964af7aaf50b351da7b58228a
-SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp) = 40cb02c0edeaa3423ff2ec0289c6ea50f85da42b
-SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp) = 38055a70f1d7f884a58b9452bbf44ff2005febf1
-SHA1 (patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp) = e34302974301d69d6c7c1ba40826d20a7dc6c001
-SHA1 (patch-shibsp_base.h) = 74e6936f0471014697511c267d0bcd5b63a82a01
+SHA1 (patch-configs_Makefile.in) = 01e1867150900dde2385a002fe181fa5c0c331fa
+SHA1 (patch-configs_keygen.sh) = 089dfdb7214c5dcc776ff5571cc49d4b7df9671b
+SHA1 (patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp) = ef67d7687e5bde0ee9078b7f2f0047d8c002632c
+SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp) = 5f75906f9a9cc4a6aa30ada4700705b42ccf55b8
+SHA1 (patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp) = 215ec5b5c9fdd29625215d674d34b24f967b2ad2
+SHA1 (patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp) = 66edc0bed0f3bf7baee44ee3b7f313157c6371d3
+SHA1 (patch-shibsp_base.h) = f553d944a3eb460d2bd1970ca89cbf5c2f2a2bd0
Index: pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in
diff -u pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in:1.3 pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in:1.4
--- pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in:1.3 Thu Jul 16 14:49:13 2020
+++ pkgsrc/www/shibboleth-sp/patches/patch-configs_Makefile.in Thu Dec 18 00:19:08 2025
@@ -1,3 +1,5 @@
+$NetBSD: patch-configs_Makefile.in,v 1.4 2025/12/18 00:19:08 wiz Exp $
+
--- configs/Makefile.in.orig 2020-03-06 09:16:20.000000000 -0800
+++ configs/Makefile.in 2020-07-07 12:59:05.660340097 -0700
@@ -381,20 +381,13 @@
Index: pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp
diff -u pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp:1.3
pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp:1.4
--- pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp:1.3 Thu Jul 16 14:49:13 2020
+++ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp Thu Dec 18 00:19:08 2025
@@ -1,3 +1,5 @@
+$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeExtractor.cpp,v 1.4 2025/12/18 00:19:08 wiz Exp $
+
--- shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp.orig 2018-07-09 18:17:23.000000000 -0700
+++ shibsp/attribute/resolver/impl/ChainingAttributeExtractor.cpp 2020-07-07 12:26:19.008490542 -0700
@@ -139,7 +139,7 @@
Index: pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp
diff -u pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp:1.3
pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp:1.4
--- pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp:1.3 Thu Jul 16 14:49:13 2020
+++ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp Thu Dec 18 00:19:08 2025
@@ -1,3 +1,5 @@
+$NetBSD: patch-shibsp_attribute_resolver_impl_ChainingAttributeResolver.cpp,v 1.4 2025/12/18 00:19:08 wiz Exp $
+
--- shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp.orig 2018-07-09 18:17:23.000000000 -0700
+++ shibsp/attribute/resolver/impl/ChainingAttributeResolver.cpp 2020-07-07 12:26:03.316192576 -0700
@@ -197,7 +197,7 @@
Index: pkgsrc/www/shibboleth-sp/patches/patch-configs_keygen.sh
diff -u pkgsrc/www/shibboleth-sp/patches/patch-configs_keygen.sh:1.1 pkgsrc/www/shibboleth-sp/patches/patch-configs_keygen.sh:1.2
--- pkgsrc/www/shibboleth-sp/patches/patch-configs_keygen.sh:1.1 Thu Jul 16 14:49:13 2020
+++ pkgsrc/www/shibboleth-sp/patches/patch-configs_keygen.sh Thu Dec 18 00:19:08 2025
@@ -1,3 +1,5 @@
+$NetBSD: patch-configs_keygen.sh,v 1.2 2025/12/18 00:19:08 wiz Exp $
+
--- configs/keygen.sh.orig 2018-07-09 18:17:23.000000000 -0700
+++ configs/keygen.sh 2020-07-07 12:39:12.562183624 -0700
@@ -1,5 +1,8 @@
Index: pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp
diff -u pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp:1.2
pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp:1.3
--- pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp:1.2 Thu Jul 16 14:49:13 2020
+++ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp Thu Dec 18 00:19:08 2025
@@ -1,3 +1,5 @@
+$NetBSD: patch-shibsp_attribute_filtering_impl_XMLAttributeFilter.cpp,v 1.3 2025/12/18 00:19:08 wiz Exp $
+
--- shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp.orig 2020-04-01 16:27:44.000000000 -0700
+++ shibsp/attribute/filtering/impl/XMLAttributeFilter.cpp 2020-07-07 12:23:32.612919412 -0700
@@ -259,7 +259,7 @@
Index: pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp
diff -u pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp:1.2
pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp:1.3
--- pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp:1.2 Thu Jul 16 14:49:13 2020
+++ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp Thu Dec 18 00:19:08 2025
@@ -1,3 +1,5 @@
+$NetBSD: patch-shibsp_attribute_resolver_impl_QueryAttributeResolver.cpp,v 1.3 2025/12/18 00:19:08 wiz Exp $
+
--- shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp.orig 2020-03-18 11:45:13.000000000 -0700
+++ shibsp/attribute/resolver/impl/QueryAttributeResolver.cpp 2020-07-07 12:26:37.773204823 -0700
@@ -266,7 +266,7 @@
Index: pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h
diff -u pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h:1.2 pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h:1.3
--- pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h:1.2 Thu Jul 16 14:49:13 2020
+++ pkgsrc/www/shibboleth-sp/patches/patch-shibsp_base.h Thu Dec 18 00:19:08 2025
@@ -1,3 +1,5 @@
+$NetBSD: patch-shibsp_base.h,v 1.3 2025/12/18 00:19:08 wiz Exp $
+
--- shibsp/base.h.orig 2018-07-09 18:17:23.000000000 -0700
+++ shibsp/base.h 2020-07-07 12:13:39.779239618 -0700
@@ -32,6 +32,7 @@
Home |
Main Index |
Thread Index |
Old Index