Commit 7ad9b61058b8c6a3ffacbcafdb8ae399cf06abb7 - shibboleth-resolver

Update upstream source from tag 'upstream/3.1.0' Update to upstream version '3.1.0' with Debian dir f770ba23ce482a93d3668e4bd276a18cfba0fa6b Sam Hartman 3 years ago

15 changed file(s) with 247 addition(s) and 455 deletion(s). Raw diff Collapse all Expand all

-2

Makefile.in less more

203	203	$(top_srcdir)/build-aux/missing \
204	204	$(top_srcdir)/src/shibresolver/config_pub.h.in \
205	205	build-aux/compile build-aux/config.guess build-aux/config.sub \
206		build-aux/install-sh build-aux/ltmain.sh build-aux/missing
	206	build-aux/depcomp build-aux/install-sh build-aux/ltmain.sh \
	207	build-aux/missing
207	208	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
208	209	distdir = $(PACKAGE)-$(VERSION)
209	210	top_distdir = $(distdir)

381	382	prefix = @prefix@
382	383	program_transform_name = @program_transform_name@
383	384	psdir = @psdir@
384		runstatedir = @runstatedir@
385	385	sbindir = @sbindir@
386	386	sharedstatedir = @sharedstatedir@
387	387	shibsp_CFLAGS = @shibsp_CFLAGS@

-8

aclocal.m4 less more

19	19	If you have problems, you may need to regenerate the build system entirely.
20	20	To do so, use the procedure documented by the package, typically 'autoreconf'.])])
21	21
22		dnl pkg.m4 - Macros to locate and utilise pkg-config. -- Autoconf --
23		dnl serial 11 (pkg-config-0.29)
24		dnl
	22	# pkg.m4 - Macros to locate and utilise pkg-config. -- Autoconf --
	23	# serial 12 (pkg-config-0.29.2)
	24
25	25	dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
26	26	dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
27	27	dnl

62	62	dnl See the "Since" comment for each macro you use to see what version
63	63	dnl of the macros you require.
64	64	m4_defun([PKG_PREREQ],
65		[m4_define([PKG_MACROS_VERSION], [0.29])
	65	[m4_define([PKG_MACROS_VERSION], [0.29.2])
66	66	m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
67	67	[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
68	68	])dnl PKG_PREREQ

163	163	AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
164	164
165	165	pkg_failed=no
166		AC_MSG_CHECKING([for $1])
	166	AC_MSG_CHECKING([for $2])
167	167
168	168	_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
169	169	_PKG_CONFIG([$1][_LIBS], [libs], [$2])

173	173	See the pkg-config man page for more details.])
174	174
175	175	if test $pkg_failed = yes; then
176		AC_MSG_RESULT([no])
	176	AC_MSG_RESULT([no])
177	177	_PKG_SHORT_ERRORS_SUPPORTED
178	178	if test $_pkg_short_errors_supported = yes; then
179	179	$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
180		else
	180	else
181	181	$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
182	182	fi
183	183	# Put the nasty error message in config.log where it belongs

194	194	_PKG_TEXT])[]dnl
195	195	])
196	196	elif test $pkg_failed = untried; then
197		AC_MSG_RESULT([no])
	197	AC_MSG_RESULT([no])
198	198	m4_default([$4], [AC_MSG_FAILURE(
199	199	[The pkg-config script could not be found or is too old. Make sure it
200	200	is in your PATH or set the PKG_CONFIG environment variable to the full

-7

build-aux/config.guess less more

1	1	# Attempt to guess a canonical system name.
2	2	# Copyright 1992-2018 Free Software Foundation, Inc.
3	3
4		timestamp='2018-02-24'
	4	timestamp='2018-03-08'
5	5
6	6	# This file is free software; you can redistribute it and/or modify it
7	7	# under the terms of the GNU General Public License as published by

1045	1045	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
1046	1046	exit ;;
1047	1047	x86_64:Linux::)
1048		if objdump -f /bin/sh \| grep -q elf32-x86-64; then
1049		echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32
1050		else
1051		echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
1052		fi
	1048	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
1053	1049	exit ;;
1054	1050	xtensa:Linux::*)
1055	1051	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"

1472	1468	exit 1
1473	1469
1474	1470	# Local variables:
1475		# eval: (add-hook 'write-file-functions 'time-stamp)
	1471	# eval: (add-hook 'before-save-hook 'time-stamp)
1476	1472	# time-stamp-start: "timestamp='"
1477	1473	# time-stamp-format: "%:y-%02m-%02d"
1478	1474	# time-stamp-end: "'"

-3

build-aux/config.sub less more

1	1	# Configuration validation subroutine script.
2	2	# Copyright 1992-2018 Free Software Foundation, Inc.
3	3
4		timestamp='2018-02-22'
	4	timestamp='2018-03-08'
5	5
6	6	# This file is free software; you can redistribute it and/or modify it
7	7	# under the terms of the GNU General Public License as published by

1375	1375	\| -ekkobsd* \| -kfreebsd* \| -freebsd* \| -riscix* \| -lynxos* \
1376	1376	\| -bosx* \| -nextstep* \| -cxux* \| -aout* \| -elf* \| -oabi* \
1377	1377	\| -ptx* \| -coff* \| -ecoff* \| -winnt* \| -domain* \| -vsta* \
1378		\| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \
	1378	\| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \| -hcos* \
1379	1379	\| -chorusos* \| -chorusrdb* \| -cegcc* \| -glidix* \
1380	1380	\| -cygwin* \| -msys* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \
1381	1381	\| -midipix* \| -mingw32* \| -mingw64* \| -linux-gnu* \| -linux-android* \

1793	1793	exit
1794	1794
1795	1795	# Local variables:
1796		# eval: (add-hook 'write-file-functions 'time-stamp)
	1796	# eval: (add-hook 'before-save-hook 'time-stamp)
1797	1797	# time-stamp-start: "timestamp='"
1798	1798	# time-stamp-format: "%:y-%02m-%02d"
1799	1799	# time-stamp-end: "'"

+88

-236

build-aux/ltmain.sh less more

30	30
31	31	PROGRAM=libtool
32	32	PACKAGE=libtool
33		VERSION="2.4.6 Debian-2.4.6-6"
	33	VERSION=2.4.6
34	34	package_revision=2.4.6
35	35
36	36

63	63	# libraries, which are installed to $pkgauxdir.
64	64
65	65	# Set a version string for this script.
66		scriptversion=2015-10-04.22; # UTC
	66	scriptversion=2015-01-20.17; # UTC
67	67
68	68	# General shell script boiler plate, and helper functions.
69	69	# Written by Gary V. Vaughan, 2004

1090	1090	}
1091	1091
1092	1092
1093		# func_quote ARG
1094		# --------------
1095		# Aesthetically quote one ARG, store the result into $func_quote_result. Note
1096		# that we keep attention to performance here (so far O(N) complexity as long as
1097		# func_append is O(1)).
1098		func_quote ()
1099		{
1100		$debug_cmd
1101
1102		func_quote_result=$1
1103
1104		case $func_quote_result in
1105		[\\\`\"\$])
1106		case $func_quote_result in
1107		[\[\\?]*)
1108		func_quote_result=`$ECHO "$func_quote_result" \| $SED "$sed_quote_subst"`
1109		return 0
1110		;;
1111		esac
1112
1113		func_quote_old_IFS=$IFS
1114		for _G_char in '\' '`' '"' '$'
1115		do
1116		# STATE($1) PREV($2) SEPARATOR($3)
1117		set start "" ""
1118		func_quote_result=dummy"$_G_char$func_quote_result$_G_char"dummy
1119		IFS=$_G_char
1120		for _G_part in $func_quote_result
1121		do
1122		case $1 in
1123		quote)
1124		func_append func_quote_result "$3$2"
1125		set quote "$_G_part" "\\$_G_char"
1126		;;
1127		start)
1128		set first "" ""
1129		func_quote_result=
1130		;;
1131		first)
1132		set quote "$_G_part" ""
1133		;;
1134		esac
1135		done
1136		IFS=$func_quote_old_IFS
1137		done
1138		;;
1139		*) ;;
1140		esac
1141		}
1142
1143
1144	1093	# func_quote_for_eval ARG...
1145	1094	# --------------------------
1146	1095	# Aesthetically quote ARGs to be evaled later.

1157	1106	func_quote_for_eval_unquoted_result=
1158	1107	func_quote_for_eval_result=
1159	1108	while test 0 -lt $#; do
1160		func_quote "$1"
1161		_G_unquoted_arg=$func_quote_result
	1109	case $1 in
	1110	[\\\`\"\$])
	1111	_G_unquoted_arg=`printf '%s\n' "$1" \|$SED "$sed_quote_subst"` ;;
	1112	*)
	1113	_G_unquoted_arg=$1 ;;
	1114	esac
1162	1115	if test -n "$func_quote_for_eval_unquoted_result"; then
1163	1116	func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
1164	1117	else

1416	1369	#! /bin/sh
1417	1370
1418	1371	# Set a version string for this script.
1419		scriptversion=2015-10-07.11; # UTC
	1372	scriptversion=2014-01-07.03; # UTC
1420	1373
1421	1374	# A portable, pluggable option parser for Bourne shell.
1422	1375	# Written by Gary V. Vaughan, 2010

1576	1529	{
1577	1530	$debug_cmd
1578	1531
1579		_G_rc_run_hooks=false
1580
1581	1532	case " $hookable_fns " in
1582	1533	" $1 ") ;;
1583	1534	*) func_fatal_error "'$1' does not support hook funcions.n" ;;

1586	1537	eval _G_hook_fns=\$$1_hooks; shift
1587	1538
1588	1539	for _G_hook in $_G_hook_fns; do
1589		if eval $_G_hook '"$@"'; then
1590		# store returned options list back into positional
1591		# parameters for next 'cmd' execution.
1592		eval _G_hook_result=\$${_G_hook}_result
1593		eval set dummy "$_G_hook_result"; shift
1594		_G_rc_run_hooks=:
1595		fi
	1540	eval $_G_hook '"$@"'
	1541
	1542	# store returned options list back into positional
	1543	# parameters for next 'cmd' execution.
	1544	eval _G_hook_result=\$${_G_hook}_result
	1545	eval set dummy "$_G_hook_result"; shift
1596	1546	done
1597	1547
1598		$_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result
	1548	func_quote_for_eval ${1+"$@"}
	1549	func_run_hooks_result=$func_quote_for_eval_result
1599	1550	}
1600	1551
1601	1552

1605	1556	## --------------- ##
1606	1557
1607	1558	# In order to add your own option parsing hooks, you must accept the
1608		# full positional parameter list in your hook function, you may remove/edit
1609		# any options that you action, and then pass back the remaining unprocessed
	1559	# full positional parameter list in your hook function, remove any
	1560	# options that you action, and then pass back the remaining unprocessed
1610	1561	# options in '<hooked_function_name>_result', escaped suitably for
1611		# 'eval'. In this case you also must return $EXIT_SUCCESS to let the
1612		# hook's caller know that it should pay attention to
1613		# '<hooked_function_name>_result'. Returning $EXIT_FAILURE signalizes that
1614		# arguments are left untouched by the hook and therefore caller will ignore the
1615		# result variable.
1616		#
1617		# Like this:
	1562	# 'eval'. Like this:
1618	1563	#
1619	1564	# my_options_prep ()
1620	1565	# {

1624	1569	# usage_message=$usage_message'
1625	1570	# -s, --silent don'\''t print informational messages
1626	1571	# '
1627		# # No change in '$@' (ignored completely by this hook). There is
1628		# # no need to do the equivalent (but slower) action:
1629		# # func_quote_for_eval ${1+"$@"}
1630		# # my_options_prep_result=$func_quote_for_eval_result
1631		# false
	1572	#
	1573	# func_quote_for_eval ${1+"$@"}
	1574	# my_options_prep_result=$func_quote_for_eval_result
1632	1575	# }
1633	1576	# func_add_hook func_options_prep my_options_prep
1634	1577	#

1637	1580	# {
1638	1581	# $debug_cmd
1639	1582	#
1640		# args_changed=false
1641		#
1642	1583	# # Note that for efficiency, we parse as many options as we can
1643	1584	# # recognise in a loop before passing the remainder back to the
1644	1585	# # caller on the first unrecognised argument we encounter.
1645	1586	# while test $# -gt 0; do
1646	1587	# opt=$1; shift
1647	1588	# case $opt in
1648		# --silent\|-s) opt_silent=:
1649		# args_changed=:
1650		# ;;
	1589	# --silent\|-s) opt_silent=: ;;
1651	1590	# # Separate non-argument short options:
1652	1591	# -s*) func_split_short_opt "$_G_opt"
1653	1592	# set dummy "$func_split_short_opt_name" \
1654	1593	# "-$func_split_short_opt_arg" ${1+"$@"}
1655	1594	# shift
1656		# args_changed=:
1657	1595	# ;;
1658		# *) # Make sure the first unrecognised option "$_G_opt"
1659		# # is added back to "$@", we could need that later
1660		# # if $args_changed is true.
1661		# set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
	1596	# ) set dummy "$_G_opt" "$"; shift; break ;;
1662	1597	# esac
1663	1598	# done
1664	1599	#
1665		# if $args_changed; then
1666		# func_quote_for_eval ${1+"$@"}
1667		# my_silent_option_result=$func_quote_for_eval_result
1668		# fi
1669		#
1670		# $args_changed
	1600	# func_quote_for_eval ${1+"$@"}
	1601	# my_silent_option_result=$func_quote_for_eval_result
1671	1602	# }
1672	1603	# func_add_hook func_parse_options my_silent_option
1673	1604	#

1679	1610	# $opt_silent && $opt_verbose && func_fatal_help "\
1680	1611	# '--silent' and '--verbose' options are mutually exclusive."
1681	1612	#
1682		# false
	1613	# func_quote_for_eval ${1+"$@"}
	1614	# my_option_validation_result=$func_quote_for_eval_result
1683	1615	# }
1684	1616	# func_add_hook func_validate_options my_option_validation
1685	1617	#
1686		# You'll also need to manually amend $usage_message to reflect the extra
	1618	# You'll alse need to manually amend $usage_message to reflect the extra
1687	1619	# options you parse. It's preferable to append if you can, so that
1688	1620	# multiple option parsing hooks can be added safely.
1689
1690
1691		# func_options_finish [ARG]...
1692		# ----------------------------
1693		# Finishing the option parse loop (call 'func_options' hooks ATM).
1694		func_options_finish ()
1695		{
1696		$debug_cmd
1697
1698		_G_func_options_finish_exit=false
1699		if func_run_hooks func_options ${1+"$@"}; then
1700		func_options_finish_result=$func_run_hooks_result
1701		_G_func_options_finish_exit=:
1702		fi
1703
1704		$_G_func_options_finish_exit
1705		}
1706	1621
1707	1622
1708	1623	# func_options [ARG]...

1714	1629	{
1715	1630	$debug_cmd
1716	1631
1717		_G_rc_options=false
1718
1719		for my_func in options_prep parse_options validate_options options_finish
1720		do
1721		if eval func_$my_func '${1+"$@"}'; then
1722		eval _G_res_var='$'"func_${my_func}_result"
1723		eval set dummy "$_G_res_var" ; shift
1724		_G_rc_options=:
1725		fi
1726		done
1727
1728		# Save modified positional parameters for caller. As a top-level
1729		# options-parser function we always need to set the 'func_options_result'
1730		# variable (regardless the $_G_rc_options value).
1731		if $_G_rc_options; then
1732		func_options_result=$_G_res_var
1733		else
1734		func_quote_for_eval ${1+"$@"}
1735		func_options_result=$func_quote_for_eval_result
1736		fi
1737
1738		$_G_rc_options
	1632	func_options_prep ${1+"$@"}
	1633	eval func_parse_options \
	1634	${func_options_prep_result+"$func_options_prep_result"}
	1635	eval func_validate_options \
	1636	${func_parse_options_result+"$func_parse_options_result"}
	1637
	1638	eval func_run_hooks func_options \
	1639	${func_validate_options_result+"$func_validate_options_result"}
	1640
	1641	# save modified positional parameters for caller
	1642	func_options_result=$func_run_hooks_result
1739	1643	}
1740	1644
1741	1645

1744	1648	# All initialisations required before starting the option parse loop.
1745	1649	# Note that when calling hook functions, we pass through the list of
1746	1650	# positional parameters. If a hook function modifies that list, and
1747		# needs to propagate that back to rest of this script, then the complete
	1651	# needs to propogate that back to rest of this script, then the complete
1748	1652	# modified list must be put in 'func_run_hooks_result' before
1749		# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned).
	1653	# returning.
1750	1654	func_hookable func_options_prep
1751	1655	func_options_prep ()
1752	1656	{

1756	1660	opt_verbose=false
1757	1661	opt_warning_types=
1758	1662
1759		_G_rc_options_prep=false
1760		if func_run_hooks func_options_prep ${1+"$@"}; then
1761		_G_rc_options_prep=:
1762		# save modified positional parameters for caller
1763		func_options_prep_result=$func_run_hooks_result
1764		fi
1765
1766		$_G_rc_options_prep
	1663	func_run_hooks func_options_prep ${1+"$@"}
	1664
	1665	# save modified positional parameters for caller
	1666	func_options_prep_result=$func_run_hooks_result
1767	1667	}
1768	1668
1769	1669

1777	1677
1778	1678	func_parse_options_result=
1779	1679
1780		_G_rc_parse_options=false
1781	1680	# this just eases exit handling
1782	1681	while test $# -gt 0; do
1783	1682	# Defer to hook functions for initial option parsing, so they
1784	1683	# get priority in the event of reusing an option name.
1785		if func_run_hooks func_parse_options ${1+"$@"}; then
1786		eval set dummy "$func_run_hooks_result"; shift
1787		_G_rc_parse_options=:
1788		fi
	1684	func_run_hooks func_parse_options ${1+"$@"}
	1685
	1686	# Adjust func_parse_options positional parameters to match
	1687	eval set dummy "$func_run_hooks_result"; shift
1789	1688
1790	1689	# Break out of the loop if we already parsed every option.
1791	1690	test $# -gt 0 \|\| break
1792	1691
1793		_G_match_parse_options=:
1794	1692	_G_opt=$1
1795	1693	shift
1796	1694	case $_G_opt in

1805	1703	;;
1806	1704
1807	1705	--warnings\|--warning\|-W)
1808		if test $# = 0 && func_missing_arg $_G_opt; then
1809		_G_rc_parse_options=:
1810		break
1811		fi
	1706	test $# = 0 && func_missing_arg $_G_opt && break
1812	1707	case " $warning_categories $1" in
1813	1708	" $1 ")
1814	1709	# trailing space prevents matching last $1 above

1861	1756	shift
1862	1757	;;
1863	1758
1864		--) _G_rc_parse_options=: ; break ;;
	1759	--) break ;;
1865	1760	-*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
1866		*) set dummy "$_G_opt" ${1+"$@"}; shift
1867		_G_match_parse_options=false
1868		break
1869		;;
	1761	*) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
1870	1762	esac
1871
1872		$_G_match_parse_options && _G_rc_parse_options=:
1873	1763	done
1874	1764
1875
1876		if $_G_rc_parse_options; then
1877		# save modified positional parameters for caller
1878		func_quote_for_eval ${1+"$@"}
1879		func_parse_options_result=$func_quote_for_eval_result
1880		fi
1881
1882		$_G_rc_parse_options
	1765	# save modified positional parameters for caller
	1766	func_quote_for_eval ${1+"$@"}
	1767	func_parse_options_result=$func_quote_for_eval_result
1883	1768	}
1884	1769
1885	1770

1892	1777	{
1893	1778	$debug_cmd
1894	1779
1895		_G_rc_validate_options=false
1896
1897	1780	# Display all warnings if -W was not given.
1898	1781	test -n "$opt_warning_types" \|\| opt_warning_types=" $warning_categories"
1899	1782
1900		if func_run_hooks func_validate_options ${1+"$@"}; then
1901		# save modified positional parameters for caller
1902		func_validate_options_result=$func_run_hooks_result
1903		_G_rc_validate_options=:
1904		fi
	1783	func_run_hooks func_validate_options ${1+"$@"}
1905	1784
1906	1785	# Bail if the options were screwed!
1907	1786	$exit_cmd $EXIT_FAILURE
1908	1787
1909		$_G_rc_validate_options
	1788	# save modified positional parameters for caller
	1789	func_validate_options_result=$func_run_hooks_result
1910	1790	}
1911	1791
1912	1792

2187	2067	compiler: $LTCC
2188	2068	compiler flags: $LTCFLAGS
2189	2069	linker: $LD (gnu? $with_gnu_ld)
2190		version: $progname $scriptversion Debian-2.4.6-6
	2070	version: $progname (GNU libtool) 2.4.6
2191	2071	automake: `($AUTOMAKE --version) 2>/dev/null \|$SED 1q`
2192	2072	autoconf: `($AUTOCONF --version) 2>/dev/null \|$SED 1q`
2193	2073
2194	2074	Report bugs to <bug-libtool@gnu.org>.
2195		GNU libtool home page: <http://www.gnu.org/s/libtool/>.
	2075	GNU libtool home page: <http://www.gnu.org/software/libtool/>.
2196	2076	General help using GNU software: <http://www.gnu.org/gethelp/>."
2197	2077	exit 0
2198	2078	}

2389	2269	nonopt=
2390	2270	preserve_args=
2391	2271
2392		_G_rc_lt_options_prep=:
2393
2394	2272	# Shorthand for --mode=foo, only valid as the first argument
2395	2273	case $1 in
2396	2274	clean\|clea\|cle\|cl)

2414	2292	uninstall\|uninstal\|uninsta\|uninst\|unins\|unin\|uni\|un\|u)
2415	2293	shift; set dummy --mode uninstall ${1+"$@"}; shift
2416	2294	;;
2417		*)
2418		_G_rc_lt_options_prep=false
2419		;;
2420	2295	esac
2421	2296
2422		if $_G_rc_lt_options_prep; then
2423		# Pass back the list of options.
2424		func_quote_for_eval ${1+"$@"}
2425		libtool_options_prep_result=$func_quote_for_eval_result
2426		fi
2427
2428		$_G_rc_lt_options_prep
	2297	# Pass back the list of options.
	2298	func_quote_for_eval ${1+"$@"}
	2299	libtool_options_prep_result=$func_quote_for_eval_result
2429	2300	}
2430	2301	func_add_hook func_options_prep libtool_options_prep
2431	2302

2437	2308	{
2438	2309	$debug_cmd
2439	2310
2440		_G_rc_lt_parse_options=false
2441
2442	2311	# Perform our own loop to consume as many options as possible in
2443	2312	# each iteration.
2444	2313	while test $# -gt 0; do
2445		_G_match_lt_parse_options=:
2446	2314	_G_opt=$1
2447	2315	shift
2448	2316	case $_G_opt in

2517	2385	func_append preserve_args " $_G_opt"
2518	2386	;;
2519	2387
2520		# An option not handled by this hook function:
2521		*) set dummy "$_G_opt" ${1+"$@"} ; shift
2522		_G_match_lt_parse_options=false
2523		break
2524		;;
	2388	# An option not handled by this hook function:
	2389	*) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
2525	2390	esac
2526		$_G_match_lt_parse_options && _G_rc_lt_parse_options=:
2527	2391	done
2528	2392
2529		if $_G_rc_lt_parse_options; then
2530		# save modified positional parameters for caller
2531		func_quote_for_eval ${1+"$@"}
2532		libtool_parse_options_result=$func_quote_for_eval_result
2533		fi
2534
2535		$_G_rc_lt_parse_options
	2393
	2394	# save modified positional parameters for caller
	2395	func_quote_for_eval ${1+"$@"}
	2396	libtool_parse_options_result=$func_quote_for_eval_result
2536	2397	}
2537	2398	func_add_hook func_parse_options libtool_parse_options
2538	2399

5396	5257	if test \"\$libtool_execute_magic\" != \"$magic\"; then
5397	5258	file=\"\$0\""
5398	5259
5399		func_quote "$ECHO"
5400		qECHO=$func_quote_result
	5260	qECHO=`$ECHO "$ECHO" \| $SED "$sed_quote_subst"`
5401	5261	$ECHO "\
5402	5262
5403	5263	# A function that is used when there is no print builtin or printf.

7411	7271	# -tp=* Portland pgcc target processor selection
7412	7272	# --sysroot=* for sysroot support
7413	7273	# -O, -g, -flto, -fwhopr, -fuse-linker-plugin GCC link-time optimization
7414		# -specs=* GCC specs files
7415	7274	# -stdlib=* select c++ std lib with clang
7416		# -fsanitize=* Clang/GCC memory and address sanitizer
	7275	# -fsanitize=* Clang memory and address sanitizer
7417	7276	-64\|-mips[0-9]\|-r[0-9][0-9]\|-xarch=\|-xtarget=\|+DA\|+DD\|-q\|-m*\| \
7418	7277	-t[45]\|-txscale\|-p\|-pg\|--coverage\|-fprofile-\|-F\|@\|-tp=\|--sysroot=*\| \
7419	7278	-O\|-g\|-flto\|-fwhopr\|-fuse-linker-plugin\|-fstack-protector\|-stdlib=\| \
7420		-specs=\|-fsanitize=)
	7279	-fsanitize=*)
7421	7280	func_quote_for_eval "$arg"
7422	7281	arg=$func_quote_for_eval_result
7423	7282	func_append compile_command " $arg"

7710	7569	case $pass in
7711	7570	dlopen) libs=$dlfiles ;;
7712	7571	dlpreopen) libs=$dlprefiles ;;
7713		link)
7714		libs="$deplibs %DEPLIBS%"
7715		test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
7716		;;
	7572	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
7717	7573	esac
7718	7574	fi
7719	7575	if test lib,dlpreopen = "$linkmode,$pass"; then

8032	7888	# It is a libtool convenience library, so add in its objects.
8033	7889	func_append convenience " $ladir/$objdir/$old_library"
8034	7890	func_append old_convenience " $ladir/$objdir/$old_library"
8035		tmp_libs=
8036		for deplib in $dependency_libs; do
8037		deplibs="$deplib $deplibs"
8038		if $opt_preserve_dup_deps; then
8039		case "$tmp_libs " in
8040		" $deplib ") func_append specialdeplibs " $deplib" ;;
8041		esac
8042		fi
8043		func_append tmp_libs " $deplib"
8044		done
8045	7891	elif test prog != "$linkmode" && test lib != "$linkmode"; then
8046	7892	func_fatal_error "'$lib' is not a convenience library"
8047	7893	fi
	7894	tmp_libs=
	7895	for deplib in $dependency_libs; do
	7896	deplibs="$deplib $deplibs"
	7897	if $opt_preserve_dup_deps; then
	7898	case "$tmp_libs " in
	7899	" $deplib ") func_append specialdeplibs " $deplib" ;;
	7900	esac
	7901	fi
	7902	func_append tmp_libs " $deplib"
	7903	done
8048	7904	continue
8049	7905	fi # $pass = conv
8050	7906

8967	8823	age=$number_minor
8968	8824	revision=$number_minor
8969	8825	lt_irix_increment=no
8970		;;
8971		*)
8972		func_fatal_configuration "$modename: unknown library version type '$version_type'"
8973	8826	;;
8974	8827	esac
8975	8828	;;

10654	10507	relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command"
10655	10508	fi
10656	10509	done
10657		func_quote "(cd `pwd`; $relink_command)"
10658		relink_command=$func_quote_result
	10510	relink_command="(cd `pwd`; $relink_command)"
	10511	relink_command=`$ECHO "$relink_command" \| $SED "$sed_quote_subst"`
10659	10512	fi
10660	10513
10661	10514	# Only actually do things if not in dry run mode.

10901	10754	done
10902	10755	# Quote the link command for shipping.
10903	10756	relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
10904		func_quote "$relink_command"
10905		relink_command=$func_quote_result
	10757	relink_command=`$ECHO "$relink_command" \| $SED "$sed_quote_subst"`
10906	10758	if test yes = "$hardcode_automatic"; then
10907	10759	relink_command=
10908	10760	fi

-3

config_win32.h less more

54	54	#define PACKAGE_NAME "shibboleth-resolver"
55	55
56	56	/* Define to the full name and version of this package. */
57		#define PACKAGE_STRING "shibboleth-resolver 3.0.0"
	57	#define PACKAGE_STRING "shibboleth-resolver 3.1.0"
58	58
59	59	/* Define to the one symbol short name of this package. */
60	60	#define PACKAGE_TARNAME "shibboleth-resolver"
61	61
62	62	/* Define to the version of this package. */
63		#define PACKAGE_VERSION "3.0.0"
	63	#define PACKAGE_VERSION "3.1.0"
64	64
65	65	/* Define to the necessary symbol if this constant uses a non-standard name on
66	66	your system. */

73	73	/* #undef TM_IN_SYS_TIME */
74	74
75	75	/* Version number of package */
76		#define VERSION "3.0.0"
	76	#define VERSION "3.1.0"
77	77
78	78	/* Define to empty if `const' does not conform to ANSI C. */
79	79	/* #undef const */

+79

-118

configure less more

0	0	#! /bin/sh
1	1	# Guess values for system-dependent variables and create Makefiles.
2		# Generated by GNU Autoconf 2.69 for shibboleth-resolver 3.0.0.
	2	# Generated by GNU Autoconf 2.69 for shibboleth-resolver 3.1.0.
3	3	#
4	4	# Report bugs to <MOONSHOT-COMMUNITY@JISCMAIL.AC.UK>.
5	5	#

589	589	# Identity of this package.
590	590	PACKAGE_NAME='shibboleth-resolver'
591	591	PACKAGE_TARNAME='shibboleth-resolver'
592		PACKAGE_VERSION='3.0.0'
593		PACKAGE_STRING='shibboleth-resolver 3.0.0'
	592	PACKAGE_VERSION='3.1.0'
	593	PACKAGE_STRING='shibboleth-resolver 3.1.0'
594	594	PACKAGE_BUGREPORT='MOONSHOT-COMMUNITY@JISCMAIL.AC.UK'
595	595	PACKAGE_URL=''
596	596

770	770	docdir
771	771	oldincludedir
772	772	includedir
773		runstatedir
774	773	localstatedir
775	774	sharedstatedir
776	775	sysconfdir

886	885	sysconfdir='${prefix}/etc'
887	886	sharedstatedir='${prefix}/com'
888	887	localstatedir='${prefix}/var'
889		runstatedir='${localstatedir}/run'
890	888	includedir='${prefix}/include'
891	889	oldincludedir='/usr/include'
892	890	docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'

1139	1137	\| -silent \| --silent \| --silen \| --sile \| --sil)
1140	1138	silent=yes ;;
1141	1139
1142		-runstatedir \| --runstatedir \| --runstatedi \| --runstated \
1143		\| --runstate \| --runstat \| --runsta \| --runst \| --runs \
1144		\| --run \| --ru \| --r)
1145		ac_prev=runstatedir ;;
1146		-runstatedir=* \| --runstatedir=* \| --runstatedi=* \| --runstated=* \
1147		\| --runstate=* \| --runstat=* \| --runsta=* \| --runst=* \| --runs=* \
1148		\| --run=* \| --ru=* \| --r=*)
1149		runstatedir=$ac_optarg ;;
1150
1151	1140	-sbindir \| --sbindir \| --sbindi \| --sbind \| --sbin \| --sbi \| --sb)
1152	1141	ac_prev=sbindir ;;
1153	1142	-sbindir=* \| --sbindir=* \| --sbindi=* \| --sbind=* \| --sbin=* \

1285	1274	for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
1286	1275	datadir sysconfdir sharedstatedir localstatedir includedir \
1287	1276	oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
1288		libdir localedir mandir runstatedir
	1277	libdir localedir mandir
1289	1278	do
1290	1279	eval ac_val=\$$ac_var
1291	1280	# Remove trailing slashes.

1398	1387	# Omit some internal or obsolete options to make the list less imposing.
1399	1388	# This message is too long to be a string in the A/UX 3.1 sh.
1400	1389	cat <<_ACEOF
1401		\`configure' configures shibboleth-resolver 3.0.0 to adapt to many kinds of systems.
	1390	\`configure' configures shibboleth-resolver 3.1.0 to adapt to many kinds of systems.
1402	1391
1403	1392	Usage: $0 [OPTION]... [VAR=VALUE]...
1404	1393

1438	1427	--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
1439	1428	--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
1440	1429	--localstatedir=DIR modifiable single-machine data [PREFIX/var]
1441		--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
1442	1430	--libdir=DIR object code libraries [EPREFIX/lib]
1443	1431	--includedir=DIR C header files [PREFIX/include]
1444	1432	--oldincludedir=DIR C header files for non-gcc [/usr/include]

1470	1458
1471	1459	if test -n "$ac_init_help"; then
1472	1460	case $ac_init_help in
1473		short \| recursive ) echo "Configuration of shibboleth-resolver 3.0.0:";;
	1461	short \| recursive ) echo "Configuration of shibboleth-resolver 3.1.0:";;
1474	1462	esac
1475	1463	cat <<\_ACEOF
1476	1464

1632	1620	test -n "$ac_init_help" && exit $ac_status
1633	1621	if $ac_init_version; then
1634	1622	cat <<\_ACEOF
1635		shibboleth-resolver configure 3.0.0
	1623	shibboleth-resolver configure 3.1.0
1636	1624	generated by GNU Autoconf 2.69
1637	1625
1638	1626	Copyright (C) 2012 Free Software Foundation, Inc.

2131	2119	This file contains any messages produced by compilers while
2132	2120	running configure, to aid debugging if configure makes a mistake.
2133	2121
2134		It was created by shibboleth-resolver $as_me 3.0.0, which was
	2122	It was created by shibboleth-resolver $as_me 3.1.0, which was
2135	2123	generated by GNU Autoconf 2.69. Invocation command line was
2136	2124
2137	2125	$ $0 $@

2996	2984
2997	2985	# Define the identity of the package.
2998	2986	PACKAGE='shibboleth-resolver'
2999		VERSION='3.0.0'
	2987	VERSION='3.1.0'
3000	2988
3001	2989
3002	2990	cat >>confdefs.h <<_ACEOF

5468	5456	lt_cv_deplibs_check_method=pass_all
5469	5457	;;
5470	5458
5471		netbsd* \| netbsdelf*-gnu)
	5459	netbsd*)
5472	5460	if echo __ELF__ \| $CC -E - \| $GREP __ELF__ > /dev/null; then
5473	5461	lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+\|_pic\.a)$'
5474	5462	else

6332	6320	test $ac_status = 0; }; then
6333	6321	# Now try to grab the symbols.
6334	6322	nlist=conftest.nm
6335		$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe > $nlist" >&5
6336		if eval "$NM" conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then
	6323	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
	6324	(eval $NM conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
	6325	ac_status=$?
	6326	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	6327	test $ac_status = 0; } && test -s "$nlist"; then
6337	6328	# Try sorting and uniquifying the output.
6338	6329	if sort "$nlist" \| uniq > "$nlist"T; then
6339	6330	mv -f "$nlist"T "$nlist"

9128	9119	openbsd* \| bitrig*)
9129	9120	with_gnu_ld=no
9130	9121	;;
9131		linux* \| kbsd-gnu \| gnu*)
9132		link_all_deplibs=no
9133		;;
9134	9122	esac
9135	9123
9136	9124	ld_shlibs=yes

9385	9373	fi
9386	9374	;;
9387	9375
9388		netbsd* \| netbsdelf*-gnu)
	9376	netbsd*)
9389	9377	if echo __ELF__ \| $CC -E - \| $GREP __ELF__ >/dev/null; then
9390	9378	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
9391	9379	wlarc=

10055	10043	if test yes = "$lt_cv_irix_exported_symbol"; then
10056	10044	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
10057	10045	fi
10058		link_all_deplibs=no
10059	10046	else
10060	10047	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
10061	10048	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'

10077	10064	esac
10078	10065	;;
10079	10066
10080		netbsd* \| netbsdelf*-gnu)
	10067	netbsd*)
10081	10068	if echo __ELF__ \| $CC -E - \| $GREP __ELF__ >/dev/null; then
10082	10069	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
10083	10070	else

11192	11179	dynamic_linker='GNU/Linux ld.so'
11193	11180	;;
11194	11181
11195		netbsdelf*-gnu)
11196		version_type=linux
11197		need_lib_prefix=no
11198		need_version=no
11199		library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
11200		soname_spec='${libname}${release}${shared_ext}$major'
11201		shlibpath_var=LD_LIBRARY_PATH
11202		shlibpath_overrides_runpath=no
11203		hardcode_into_libs=yes
11204		dynamic_linker='NetBSD ld.elf_so'
11205		;;
11206
11207	11182	netbsd*)
11208	11183	version_type=sunos
11209	11184	need_lib_prefix=no

13584	13559	# Commands to make compiler produce verbose output that lists
13585	13560	# what "hidden" libraries, object files and flags are used when
13586	13561	# linking a shared library.
13587		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
	13562	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
13588	13563
13589	13564	else
13590	13565	GXX=no

14076	14051	# explicitly linking system object files so we need to strip them
14077	14052	# from the output so that they don't get included in the library
14078	14053	# dependencies.
14079		output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
	14054	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
14080	14055	;;
14081	14056	*)
14082	14057	if test yes = "$GXX"; then

14141	14116	# explicitly linking system object files so we need to strip them
14142	14117	# from the output so that they don't get included in the library
14143	14118	# dependencies.
14144		output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
	14119	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
14145	14120	;;
14146	14121	*)
14147	14122	if test yes = "$GXX"; then

14480	14455	# Commands to make compiler produce verbose output that lists
14481	14456	# what "hidden" libraries, object files and flags are used when
14482	14457	# linking a shared library.
14483		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
	14458	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
14484	14459
14485	14460	else
14486	14461	# FIXME: insert proper C++ library support

14564	14539	# Commands to make compiler produce verbose output that lists
14565	14540	# what "hidden" libraries, object files and flags are used when
14566	14541	# linking a shared library.
14567		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
	14542	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
14568	14543	else
14569	14544	# g++ 2.7 appears to require '-G' NOT '-shared' on this
14570	14545	# platform.

14575	14550	# Commands to make compiler produce verbose output that lists
14576	14551	# what "hidden" libraries, object files and flags are used when
14577	14552	# linking a shared library.
14578		output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
	14553	output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
14579	14554	fi
14580	14555
14581	14556	hardcode_libdir_flag_spec_CXX='$wl-R $wl$libdir'

15088	15063	;;
15089	15064	esac
15090	15065	;;
15091		netbsd* \| netbsdelf*-gnu)
	15066	netbsd*)
15092	15067	;;
15093	15068	qnx \| nto)
15094	15069	# QNX uses GNU C++, but need to define -shared option too, otherwise

15463	15438	;;
15464	15439	esac
15465	15440	;;
15466		linux* \| kbsd-gnu \| gnu*)
15467		link_all_deplibs_CXX=no
15468		;;
15469	15441	*)
15470	15442	export_symbols_cmds_CXX='$NM $libobjs $convenience \| $global_symbol_pipe \| $SED '\''s/.* //'\'' \| sort \| uniq > $export_symbols'
15471	15443	;;

16159	16131	dynamic_linker='GNU/Linux ld.so'
16160	16132	;;
16161	16133
16162		netbsdelf*-gnu)
16163		version_type=linux
16164		need_lib_prefix=no
16165		need_version=no
16166		library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
16167		soname_spec='${libname}${release}${shared_ext}$major'
16168		shlibpath_var=LD_LIBRARY_PATH
16169		shlibpath_overrides_runpath=no
16170		hardcode_into_libs=yes
16171		dynamic_linker='NetBSD ld.elf_so'
16172		;;
16173
16174	16134	netbsd*)
16175	16135	version_type=sunos
16176	16136	need_lib_prefix=no

17544	17504
17545	17505
17546	17506	pkg_failed=no
17547		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for log4shib" >&5
17548		$as_echo_n "checking for log4shib... " >&6; }
	17507	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for log4shib" >&5
	17508	$as_echo_n "checking for log4shib... " >&6; }
17549	17509
17550	17510	if test -n "$log4shib_CFLAGS"; then
17551	17511	pkg_cv_log4shib_CFLAGS="$log4shib_CFLAGS"

17585	17545
17586	17546
17587	17547	if test $pkg_failed = yes; then
17588		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	17548	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17589	17549	$as_echo "no" >&6; }
17590	17550
17591	17551	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

17607	17567
17608	17568
17609	17569	pkg_failed=no
17610		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for log4cpp" >&5
17611		$as_echo_n "checking for log4cpp... " >&6; }
	17570	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for log4cpp" >&5
	17571	$as_echo_n "checking for log4cpp... " >&6; }
17612	17572
17613	17573	if test -n "$log4cpp_CFLAGS"; then
17614	17574	pkg_cv_log4cpp_CFLAGS="$log4cpp_CFLAGS"

17648	17608
17649	17609
17650	17610	if test $pkg_failed = yes; then
17651		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	17611	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17652	17612	$as_echo "no" >&6; }
17653	17613
17654	17614	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

17675	17635	and log4cpp_LIBS to avoid the need to call pkg-config.
17676	17636	See the pkg-config man page for more details." "$LINENO" 5
17677	17637	elif test $pkg_failed = untried; then
17678		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	17638	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17679	17639	$as_echo "no" >&6; }
17680	17640	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
17681	17641	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

17707	17667
17708	17668
17709	17669	elif test $pkg_failed = untried; then
17710		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	17670	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17711	17671	$as_echo "no" >&6; }
17712	17672
17713	17673

17715	17675
17716	17676
17717	17677	pkg_failed=no
17718		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for log4cpp" >&5
17719		$as_echo_n "checking for log4cpp... " >&6; }
	17678	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for log4cpp" >&5
	17679	$as_echo_n "checking for log4cpp... " >&6; }
17720	17680
17721	17681	if test -n "$log4cpp_CFLAGS"; then
17722	17682	pkg_cv_log4cpp_CFLAGS="$log4cpp_CFLAGS"

17756	17716
17757	17717
17758	17718	if test $pkg_failed = yes; then
17759		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	17719	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17760	17720	$as_echo "no" >&6; }
17761	17721
17762	17722	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

17783	17743	and log4cpp_LIBS to avoid the need to call pkg-config.
17784	17744	See the pkg-config man page for more details." "$LINENO" 5
17785	17745	elif test $pkg_failed = untried; then
17786		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	17746	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17787	17747	$as_echo "no" >&6; }
17788	17748	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
17789	17749	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

17838	17798
17839	17799
17840	17800	pkg_failed=no
17841		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xerces" >&5
17842		$as_echo_n "checking for xerces... " >&6; }
	17801	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xerces-c >= 3.2" >&5
	17802	$as_echo_n "checking for xerces-c >= 3.2... " >&6; }
17843	17803
17844	17804	if test -n "$xerces_CFLAGS"; then
17845	17805	pkg_cv_xerces_CFLAGS="$xerces_CFLAGS"

17879	17839
17880	17840
17881	17841	if test $pkg_failed = yes; then
17882		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	17842	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17883	17843	$as_echo "no" >&6; }
17884	17844
17885	17845	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

17906	17866	and xerces_LIBS to avoid the need to call pkg-config.
17907	17867	See the pkg-config man page for more details." "$LINENO" 5
17908	17868	elif test $pkg_failed = untried; then
17909		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	17869	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17910	17870	$as_echo "no" >&6; }
17911	17871	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
17912	17872	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

17942	17902
17943	17903
17944	17904	pkg_failed=no
17945		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmlsec" >&5
17946		$as_echo_n "checking for xmlsec... " >&6; }
	17905	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xml-security-c >= 2" >&5
	17906	$as_echo_n "checking for xml-security-c >= 2... " >&6; }
17947	17907
17948	17908	if test -n "$xmlsec_CFLAGS"; then
17949	17909	pkg_cv_xmlsec_CFLAGS="$xmlsec_CFLAGS"

17983	17943
17984	17944
17985	17945	if test $pkg_failed = yes; then
17986		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	17946	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
17987	17947	$as_echo "no" >&6; }
17988	17948
17989	17949	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

18010	17970	and xmlsec_LIBS to avoid the need to call pkg-config.
18011	17971	See the pkg-config man page for more details." "$LINENO" 5
18012	17972	elif test $pkg_failed = untried; then
18013		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	17973	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18014	17974	$as_echo "no" >&6; }
18015	17975	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
18016	17976	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

18046	18006
18047	18007
18048	18008	pkg_failed=no
18049		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmltooling" >&5
18050		$as_echo_n "checking for xmltooling... " >&6; }
	18009	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmltooling >= 3" >&5
	18010	$as_echo_n "checking for xmltooling >= 3... " >&6; }
18051	18011
18052	18012	if test -n "$xmltooling_CFLAGS"; then
18053	18013	pkg_cv_xmltooling_CFLAGS="$xmltooling_CFLAGS"

18087	18047
18088	18048
18089	18049	if test $pkg_failed = yes; then
18090		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18050	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18091	18051	$as_echo "no" >&6; }
18092	18052
18093	18053	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

18114	18074	and xmltooling_LIBS to avoid the need to call pkg-config.
18115	18075	See the pkg-config man page for more details." "$LINENO" 5
18116	18076	elif test $pkg_failed = untried; then
18117		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18077	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18118	18078	$as_echo "no" >&6; }
18119	18079	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
18120	18080	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

18150	18110
18151	18111
18152	18112	pkg_failed=no
18153		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmltooling_lite" >&5
18154		$as_echo_n "checking for xmltooling_lite... " >&6; }
	18113	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmltooling-lite >= 3" >&5
	18114	$as_echo_n "checking for xmltooling-lite >= 3... " >&6; }
18155	18115
18156	18116	if test -n "$xmltooling_lite_CFLAGS"; then
18157	18117	pkg_cv_xmltooling_lite_CFLAGS="$xmltooling_lite_CFLAGS"

18191	18151
18192	18152
18193	18153	if test $pkg_failed = yes; then
18194		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18154	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18195	18155	$as_echo "no" >&6; }
18196	18156
18197	18157	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

18218	18178	and xmltooling_lite_LIBS to avoid the need to call pkg-config.
18219	18179	See the pkg-config man page for more details." "$LINENO" 5
18220	18180	elif test $pkg_failed = untried; then
18221		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18181	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18222	18182	$as_echo "no" >&6; }
18223	18183	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
18224	18184	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

18254	18214
18255	18215
18256	18216	pkg_failed=no
18257		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opensaml" >&5
18258		$as_echo_n "checking for opensaml... " >&6; }
	18217	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for opensaml >= 3" >&5
	18218	$as_echo_n "checking for opensaml >= 3... " >&6; }
18259	18219
18260	18220	if test -n "$opensaml_CFLAGS"; then
18261	18221	pkg_cv_opensaml_CFLAGS="$opensaml_CFLAGS"

18295	18255
18296	18256
18297	18257	if test $pkg_failed = yes; then
18298		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18258	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18299	18259	$as_echo "no" >&6; }
18300	18260
18301	18261	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

18322	18282	and opensaml_LIBS to avoid the need to call pkg-config.
18323	18283	See the pkg-config man page for more details." "$LINENO" 5
18324	18284	elif test $pkg_failed = untried; then
18325		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18285	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18326	18286	$as_echo "no" >&6; }
18327	18287	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
18328	18288	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

18358	18318
18359	18319
18360	18320	pkg_failed=no
18361		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shibsp" >&5
18362		$as_echo_n "checking for shibsp... " >&6; }
	18321	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shibsp >= 3" >&5
	18322	$as_echo_n "checking for shibsp >= 3... " >&6; }
18363	18323
18364	18324	if test -n "$shibsp_CFLAGS"; then
18365	18325	pkg_cv_shibsp_CFLAGS="$shibsp_CFLAGS"

18399	18359
18400	18360
18401	18361	if test $pkg_failed = yes; then
18402		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18362	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18403	18363	$as_echo "no" >&6; }
18404	18364
18405	18365	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

18426	18386	and shibsp_LIBS to avoid the need to call pkg-config.
18427	18387	See the pkg-config man page for more details." "$LINENO" 5
18428	18388	elif test $pkg_failed = untried; then
18429		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18389	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18430	18390	$as_echo "no" >&6; }
18431	18391	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
18432	18392	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

18462	18422
18463	18423
18464	18424	pkg_failed=no
18465		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shibsp_lite" >&5
18466		$as_echo_n "checking for shibsp_lite... " >&6; }
	18425	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shibsp-lite >= 3" >&5
	18426	$as_echo_n "checking for shibsp-lite >= 3... " >&6; }
18467	18427
18468	18428	if test -n "$shibsp_lite_CFLAGS"; then
18469	18429	pkg_cv_shibsp_lite_CFLAGS="$shibsp_lite_CFLAGS"

18503	18463
18504	18464
18505	18465	if test $pkg_failed = yes; then
18506		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18466	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18507	18467	$as_echo "no" >&6; }
18508	18468
18509	18469	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

18530	18490	and shibsp_lite_LIBS to avoid the need to call pkg-config.
18531	18491	See the pkg-config man page for more details." "$LINENO" 5
18532	18492	elif test $pkg_failed = untried; then
18533		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18493	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18534	18494	$as_echo "no" >&6; }
18535	18495	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
18536	18496	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

18575	18535
18576	18536
18577	18537	pkg_failed=no
18578		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss" >&5
18579		$as_echo_n "checking for gss... " >&6; }
	18538	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5-gssapi" >&5
	18539	$as_echo_n "checking for krb5-gssapi... " >&6; }
18580	18540
18581	18541	if test -n "$gss_CFLAGS"; then
18582	18542	pkg_cv_gss_CFLAGS="$gss_CFLAGS"

18616	18576
18617	18577
18618	18578	if test $pkg_failed = yes; then
18619		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18579	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18620	18580	$as_echo "no" >&6; }
18621	18581
18622	18582	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

18638	18598
18639	18599
18640	18600	pkg_failed=no
18641		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu_gss" >&5
18642		$as_echo_n "checking for gnu_gss... " >&6; }
	18601	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss" >&5
	18602	$as_echo_n "checking for gss... " >&6; }
18643	18603
18644	18604	if test -n "$gnu_gss_CFLAGS"; then
18645	18605	pkg_cv_gnu_gss_CFLAGS="$gnu_gss_CFLAGS"

18679	18639
18680	18640
18681	18641	if test $pkg_failed = yes; then
18682		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18642	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18683	18643	$as_echo "no" >&6; }
18684	18644
18685	18645	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

18697	18657
18698	18658	with_gssapi=no
18699	18659	elif test $pkg_failed = untried; then
18700		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18660	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18701	18661	$as_echo "no" >&6; }
18702	18662	with_gssapi=no
18703	18663	else

18718	18678
18719	18679
18720	18680	elif test $pkg_failed = untried; then
18721		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18681	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18722	18682	$as_echo "no" >&6; }
18723	18683
18724	18684

18726	18686
18727	18687
18728	18688	pkg_failed=no
18729		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu_gss" >&5
18730		$as_echo_n "checking for gnu_gss... " >&6; }
	18689	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gss" >&5
	18690	$as_echo_n "checking for gss... " >&6; }
18731	18691
18732	18692	if test -n "$gnu_gss_CFLAGS"; then
18733	18693	pkg_cv_gnu_gss_CFLAGS="$gnu_gss_CFLAGS"

18767	18727
18768	18728
18769	18729	if test $pkg_failed = yes; then
18770		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18730	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18771	18731	$as_echo "no" >&6; }
18772	18732
18773	18733	if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

18785	18745
18786	18746	with_gssapi=no
18787	18747	elif test $pkg_failed = untried; then
18788		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	18748	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
18789	18749	$as_echo "no" >&6; }
18790	18750	with_gssapi=no
18791	18751	else

19573	19533	# report actual input values of CONFIG_FILES etc. instead of their
19574	19534	# values after options handling.
19575	19535	ac_log="
19576		This file was extended by shibboleth-resolver $as_me 3.0.0, which was
	19536	This file was extended by shibboleth-resolver $as_me 3.1.0, which was
19577	19537	generated by GNU Autoconf 2.69. Invocation command line was
19578	19538
19579	19539	CONFIG_FILES = $CONFIG_FILES

19639	19599	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
19640	19600	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
19641	19601	ac_cs_version="\\
19642		shibboleth-resolver config.status 3.0.0
	19602	shibboleth-resolver config.status 3.1.0
19643	19603	configured by $0, generated by GNU Autoconf 2.69,
19644	19604	with options \\"\$ac_cs_config\\"
19645	19605

20863	20823	cat <<_LT_EOF >> "$cfgfile"
20864	20824	#! $SHELL
20865	20825	# Generated automatically by $as_me ($PACKAGE) $VERSION
	20826	# Libtool was configured on host `(hostname \|\| uname -n) 2>/dev/null \| sed 1q`:
20866	20827	# NOTE: Changes made to this file will be lost: look at ltmain.sh.
20867	20828
20868	20829	# Provide generalized library-building support services.

-1

configure.ac less more

0	0	AC_PREREQ([2.50])
1		AC_INIT([shibboleth-resolver], [3.0.0], [MOONSHOT-COMMUNITY@JISCMAIL.AC.UK], [shibboleth-resolver])
	1	AC_INIT([shibboleth-resolver], [3.1.0], [MOONSHOT-COMMUNITY@JISCMAIL.AC.UK], [shibboleth-resolver])
2	2	AC_CONFIG_SRCDIR(src)
3	3	AC_CONFIG_AUX_DIR(build-aux)
4	4	AC_CONFIG_MACRO_DIR(m4)

-1

doc/Makefile.in less more

291	291	prefix = @prefix@
292	292	program_transform_name = @program_transform_name@
293	293	psdir = @psdir@
294		runstatedir = @runstatedir@
295	294	sbindir = @sbindir@
296	295	sharedstatedir = @sharedstatedir@
297	296	shibsp_CFLAGS = @shibsp_CFLAGS@

+12

-31

m4/libtool.m4 less more

727	727	cat <<_LT_EOF >> "$cfgfile"
728	728	#! $SHELL
729	729	# Generated automatically by $as_me ($PACKAGE) $VERSION
	730	# Libtool was configured on host `(hostname \|\| uname -n) 2>/dev/null \| sed 1q`:
730	731	# NOTE: Changes made to this file will be lost: look at ltmain.sh.
731	732
732	733	# Provide generalized library-building support services.

2885	2886	dynamic_linker='GNU/Linux ld.so'
2886	2887	;;
2887	2888
2888		netbsdelf*-gnu)
2889		version_type=linux
2890		need_lib_prefix=no
2891		need_version=no
2892		library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
2893		soname_spec='${libname}${release}${shared_ext}$major'
2894		shlibpath_var=LD_LIBRARY_PATH
2895		shlibpath_overrides_runpath=no
2896		hardcode_into_libs=yes
2897		dynamic_linker='NetBSD ld.elf_so'
2898		;;
2899
2900	2889	netbsd*)
2901	2890	version_type=sunos
2902	2891	need_lib_prefix=no

3556	3545	lt_cv_deplibs_check_method=pass_all
3557	3546	;;
3558	3547
3559		netbsd* \| netbsdelf*-gnu)
	3548	netbsd*)
3560	3549	if echo __ELF__ \| $CC -E - \| $GREP __ELF__ > /dev/null; then
3561	3550	lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+\|_pic\.a)$'
3562	3551	else

4062	4051	if AC_TRY_EVAL(ac_compile); then
4063	4052	# Now try to grab the symbols.
4064	4053	nlist=conftest.nm
4065		$ECHO "$as_me:$LINENO: $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
4066		if eval "$NM" conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
	4054	if AC_TRY_EVAL(NM conftest.$ac_objext \\| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
4067	4055	# Try sorting and uniquifying the output.
4068	4056	if sort "$nlist" \| uniq > "$nlist"T; then
4069	4057	mv -f "$nlist"T "$nlist"

4435	4423	;;
4436	4424	esac
4437	4425	;;
4438		netbsd* \| netbsdelf*-gnu)
	4426	netbsd*)
4439	4427	;;
4440	4428	qnx \| nto)
4441	4429	# QNX uses GNU C++, but need to define -shared option too, otherwise

4947	4935	;;
4948	4936	esac
4949	4937	;;
4950		linux* \| kbsd-gnu \| gnu*)
4951		_LT_TAGVAR(link_all_deplibs, $1)=no
4952		;;
4953	4938	*)
4954	4939	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience \| $global_symbol_pipe \| $SED '\''s/.* //'\'' \| sort \| uniq > $export_symbols'
4955	4940	;;

5011	4996	;;
5012	4997	openbsd* \| bitrig*)
5013	4998	with_gnu_ld=no
5014		;;
5015		linux* \| kbsd-gnu \| gnu*)
5016		_LT_TAGVAR(link_all_deplibs, $1)=no
5017	4999	;;
5018	5000	esac
5019	5001

5269	5251	fi
5270	5252	;;
5271	5253
5272		netbsd* \| netbsdelf*-gnu)
	5254	netbsd*)
5273	5255	if echo __ELF__ \| $CC -E - \| $GREP __ELF__ >/dev/null; then
5274	5256	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
5275	5257	wlarc=

5790	5772	if test yes = "$lt_cv_irix_exported_symbol"; then
5791	5773	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
5792	5774	fi
5793		_LT_TAGVAR(link_all_deplibs, $1)=no
5794	5775	else
5795	5776	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
5796	5777	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'

5812	5793	esac
5813	5794	;;
5814	5795
5815		netbsd* \| netbsdelf*-gnu)
	5796	netbsd*)
5816	5797	if echo __ELF__ \| $CC -E - \| $GREP __ELF__ >/dev/null; then
5817	5798	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
5818	5799	else

6438	6419	# Commands to make compiler produce verbose output that lists
6439	6420	# what "hidden" libraries, object files and flags are used when
6440	6421	# linking a shared library.
6441		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
	6422	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
6442	6423
6443	6424	else
6444	6425	GXX=no

6813	6794	# explicitly linking system object files so we need to strip them
6814	6795	# from the output so that they don't get included in the library
6815	6796	# dependencies.
6816		output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
	6797	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
6817	6798	;;
6818	6799	*)
6819	6800	if test yes = "$GXX"; then

6878	6859	# explicitly linking system object files so we need to strip them
6879	6860	# from the output so that they don't get included in the library
6880	6861	# dependencies.
6881		output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
	6862	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) \| $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; .$objext);; ) list="$list $z";;esac; done; func_echo_all "$list"'
6882	6863	;;
6883	6864	*)
6884	6865	if test yes = "$GXX"; then

7217	7198	# Commands to make compiler produce verbose output that lists
7218	7199	# what "hidden" libraries, object files and flags are used when
7219	7200	# linking a shared library.
7220		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
	7201	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
7221	7202
7222	7203	else
7223	7204	# FIXME: insert proper C++ library support

7301	7282	# Commands to make compiler produce verbose output that lists
7302	7283	# what "hidden" libraries, object files and flags are used when
7303	7284	# linking a shared library.
7304		output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
	7285	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
7305	7286	else
7306	7287	# g++ 2.7 appears to require '-G' NOT '-shared' on this
7307	7288	# platform.

7312	7293	# Commands to make compiler produce verbose output that lists
7313	7294	# what "hidden" libraries, object files and flags are used when
7314	7295	# linking a shared library.
7315		output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP " \-L"'
	7296	output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 \| $GREP -v "^Configured with:" \| $GREP "\-L"'
7316	7297	fi
7317	7298
7318	7299	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'

+20

-18

resolver.spec less more

0	0	Name: shibboleth-resolver
1		Version: 3.0.0
	1	Version: 3.1.0
2	2	Summary: Shibboleth SP Attribute Resolver Library
3	3	Release: 1
4	4	Vendor: Shibboleth Consortium

9	9	BuildRoot: %{_tmppath}/%{name}-%{version}-root
10	10	BuildRequires: libxerces-c-devel >= 3.2
11	11	BuildRequires: libxml-security-c-devel >= 2.0.0
12		BuildRequires: libxmltooling-devel >= 3.0.0
13		BuildRequires: libsaml-devel >= 3.0.0
14		BuildRequires: shibboleth-devel >= 3.0.0
	12	BuildRequires: libxmltooling-devel >= 3.1.0
	13	BuildRequires: libsaml-devel >= 3.1.0
	14	BuildRequires: shibboleth-devel >= 3.1.0
15	15	%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
16	16	%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
17	17	%{!?_without_gssapi:BuildRequires: krb5-devel}

31	31	externally accessible attribute resolver functionality for processing
32	32	local and remote sources of federated attribute information.
33	33
34		%package -n libshibresolver2
	34	%package -n libshibresolver3
35	35	Summary: Shibboleth SP Attribute Resolver library
36	36	Group: Development/Libraries
37	37	Provides: shibboleth-resolver = %{version}-%{release}
38	38	Obsoletes: shibboleth-resolver < %{version}-%{release}
39	39
40		%description -n libshibresolver2
	40	%description -n libshibresolver3
41	41	This package contains a Shibboleth SP Extension that provides
42	42	externally accessible attribute resolver functionality for processing
43	43	local and remote sources of federated attribute information.

47	47	%package -n libshibresolver-devel
48	48	Summary: Shibboleth SP Attribute Resolver development Headers
49	49	Group: Development/Libraries
50		Requires: libshibresolver2 = %{version}-%{release}
	50	Requires: libshibresolver3 = %{version}-%{release}
51	51	Provides: shibboleth-resolver-devel = %{version}-%{release}
52	52	Obsoletes: shibboleth-resolver-devel < %{version}-%{release}
53	53	Requires: libxerces-c-devel >= 3.2
54	54	Requires: libxml-security-c-devel >= 2.0.0
55		Requires: libxmltooling-devel >= 3.0.0
56		Requires: shibboleth-devel >= 3.0.0
	55	Requires: libxmltooling-devel >= 3.1.0
	56	Requires: shibboleth-devel >= 3.1.0
57	57	%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
58	58	%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
59	59

74	74	%if 0%{?suse_version} >= 1210
75	75	%configure --with-gssapi %{?shib_options}
76	76	%else
77		%if 0%{?rhel} >= 7 \|\| 0%{?centos_version} >= 700
	77	%if 0%{?rhel} >= 7
78	78	%configure --with-gssapi %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
79	79	%else
80		%if 0%{?centos_version} >= 600 \|\| 0%{?rhel} >= 6
	80	%if 0%{?rhel} >= 6
81	81	%configure --with-gssapi %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
82	82	%else
83	83	%if 0%{?rhel} >= 5

101	101	%clean
102	102	[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
103	103
104		%ifnos solaris2.8 solaris2.9 solaris2.10
105		%post -n libshibresolver2 -p /sbin/ldconfig
106		%endif
	104	%post -n libshibresolver3 -p /sbin/ldconfig
107	105
108		%ifnos solaris2.8 solaris2.9 solaris2.10
109		%postun -n libshibresolver2 -p /sbin/ldconfig
110		%endif
	106	%postun -n libshibresolver3 -p /sbin/ldconfig
111	107
112		%files -n libshibresolver2
	108	%files -n libshibresolver3
113	109	%defattr(-,root,root,-)
114	110	%{_libdir}/libshibresolver-lite.so.*
115	111	%{_libdir}/libshibresolver.so.*

124	120	%doc %{pkgdocdir}
125	121
126	122	%changelog
	123	* Thu Apr 2 2020 Scott Cantor <cantor.2@osu.edu> - 3.1.0-1
	124	- Bump version
	125
	126	* Mon Sep 30 2019 Scott Cantor <cantor.2@osu.edu> - 3.0.0-2
	127	- CentOS 8 changes
	128
127	129	* Fri Jul 20 2018 Scott Cantor <cantor.2@osu.edu> - 3.0.0-1
128	130	- Redo package for SP 3 release
129	131

+19

-17

resolver.spec.in less more

9	9	BuildRoot: %{_tmppath}/%{name}-%{version}-root
10	10	BuildRequires: libxerces-c-devel >= 3.2
11	11	BuildRequires: libxml-security-c-devel >= 2.0.0
12		BuildRequires: libxmltooling-devel >= 3.0.0
13		BuildRequires: libsaml-devel >= 3.0.0
14		BuildRequires: shibboleth-devel >= 3.0.0
	12	BuildRequires: libxmltooling-devel >= 3.1.0
	13	BuildRequires: libsaml-devel >= 3.1.0
	14	BuildRequires: shibboleth-devel >= 3.1.0
15	15	%{?_with_log4cpp:BuildRequires: liblog4cpp-devel >= 1.0}
16	16	%{!?_with_log4cpp:BuildRequires: liblog4shib-devel >= 1.0.4}
17	17	%{!?_without_gssapi:BuildRequires: krb5-devel}

31	31	externally accessible attribute resolver functionality for processing
32	32	local and remote sources of federated attribute information.
33	33
34		%package -n libshibresolver2
	34	%package -n libshibresolver3
35	35	Summary: Shibboleth SP Attribute Resolver library
36	36	Group: Development/Libraries
37	37	Provides: @PACKAGE_NAME@ = %{version}-%{release}
38	38	Obsoletes: @PACKAGE_NAME@ < %{version}-%{release}
39	39
40		%description -n libshibresolver2
	40	%description -n libshibresolver3
41	41	This package contains a Shibboleth SP Extension that provides
42	42	externally accessible attribute resolver functionality for processing
43	43	local and remote sources of federated attribute information.

47	47	%package -n libshibresolver-devel
48	48	Summary: Shibboleth SP Attribute Resolver development Headers
49	49	Group: Development/Libraries
50		Requires: libshibresolver2 = %{version}-%{release}
	50	Requires: libshibresolver3 = %{version}-%{release}
51	51	Provides: @PACKAGE_NAME@-devel = %{version}-%{release}
52	52	Obsoletes: @PACKAGE_NAME@-devel < %{version}-%{release}
53	53	Requires: libxerces-c-devel >= 3.2
54	54	Requires: libxml-security-c-devel >= 2.0.0
55		Requires: libxmltooling-devel >= 3.0.0
56		Requires: shibboleth-devel >= 3.0.0
	55	Requires: libxmltooling-devel >= 3.1.0
	56	Requires: shibboleth-devel >= 3.1.0
57	57	%{?_with_log4cpp:Requires: liblog4cpp-devel >= 1.0}
58	58	%{!?_with_log4cpp:Requires: liblog4shib-devel >= 1.0.4}
59	59

74	74	%if 0%{?suse_version} >= 1210
75	75	%configure --with-gssapi %{?shib_options}
76	76	%else
77		%if 0%{?rhel} >= 7 \|\| 0%{?centos_version} >= 700
	77	%if 0%{?rhel} >= 7
78	78	%configure --with-gssapi %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig
79	79	%else
80		%if 0%{?centos_version} >= 600 \|\| 0%{?rhel} >= 6
	80	%if 0%{?rhel} >= 6
81	81	%configure --with-gssapi %{?shib_options} PKG_CONFIG_PATH=/opt/shibboleth/%{_lib}/pkgconfig:./pkgconfig-workarounds/rh6
82	82	%else
83	83	%if 0%{?rhel} >= 5

101	101	%clean
102	102	[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
103	103
104		%ifnos solaris2.8 solaris2.9 solaris2.10
105		%post -n libshibresolver2 -p /sbin/ldconfig
106		%endif
	104	%post -n libshibresolver3 -p /sbin/ldconfig
107	105
108		%ifnos solaris2.8 solaris2.9 solaris2.10
109		%postun -n libshibresolver2 -p /sbin/ldconfig
110		%endif
	106	%postun -n libshibresolver3 -p /sbin/ldconfig
111	107
112		%files -n libshibresolver2
	108	%files -n libshibresolver3
113	109	%defattr(-,root,root,-)
114	110	%{_libdir}/libshibresolver-lite.so.*
115	111	%{_libdir}/libshibresolver.so.*

124	120	%doc %{pkgdocdir}
125	121
126	122	%changelog
	123	* Thu Apr 2 2020 Scott Cantor <cantor.2@osu.edu> - 3.1.0-1
	124	- Bump version
	125
	126	* Mon Sep 30 2019 Scott Cantor <cantor.2@osu.edu> - 3.0.0-2
	127	- CentOS 8 changes
	128
127	129	* Fri Jul 20 2018 Scott Cantor <cantor.2@osu.edu> - 3.0.0-1
128	130	- Redo package for SP 3 release
129	131

-2

src/Makefile.am less more

22	22
23	23	# this is different from the project version
24	24	# http://sources.redhat.com/autobook/autobook/autobook_91.html
25		libshibresolver_la_LDFLAGS = -version-info 2:0:0
	25	libshibresolver_la_LDFLAGS = -version-info 3:0:0
26	26	libshibresolver_la_CXXFLAGS = \
27	27	$(PTHREAD_CFLAGS) \
28	28	$(gss_CFLAGS) $(gnu_gss_CFLAGS) \

42	42	$(xmlsec_LIBS) \
43	43	$(xmltooling_LIBS)
44	44
45		libshibresolver_lite_la_LDFLAGS = -version-info 2:0:0
	45	libshibresolver_lite_la_LDFLAGS = -version-info 3:0:0
46	46	libshibresolver_lite_la_CPPFLAGS = -DSHIBSP_LITE \
47	47	$(PTHREAD_CFLAGS) \
48	48	$(gss_CFLAGS) $(gnu_gss_CFLAGS) \

-3

src/Makefile.in less more

373	373	prefix = @prefix@
374	374	program_transform_name = @program_transform_name@
375	375	psdir = @psdir@
376		runstatedir = @runstatedir@
377	376	sbindir = @sbindir@
378	377	sharedstatedir = @sharedstatedir@
379	378	shibsp_CFLAGS = @shibsp_CFLAGS@

417	416
418	417	# this is different from the project version
419	418	# http://sources.redhat.com/autobook/autobook/autobook_91.html
420		libshibresolver_la_LDFLAGS = -version-info 2:0:0
	419	libshibresolver_la_LDFLAGS = -version-info 3:0:0
421	420	libshibresolver_la_CXXFLAGS = \
422	421	$(PTHREAD_CFLAGS) \
423	422	$(gss_CFLAGS) $(gnu_gss_CFLAGS) \

438	437	$(xmlsec_LIBS) \
439	438	$(xmltooling_LIBS)
440	439
441		libshibresolver_lite_la_LDFLAGS = -version-info 2:0:0
	440	libshibresolver_lite_la_LDFLAGS = -version-info 3:0:0
442	441	libshibresolver_lite_la_CPPFLAGS = -DSHIBSP_LITE \
443	442	$(PTHREAD_CFLAGS) \
444	443	$(gss_CFLAGS) $(gnu_gss_CFLAGS) \

-5

src/shibresolver/resolver.rc less more

53	53	//
54	54
55	55	VS_VERSION_INFO VERSIONINFO
56		FILEVERSION 0,2,0,0
57		PRODUCTVERSION 0,2,0,0
	56	FILEVERSION 3,1,0,0
	57	PRODUCTVERSION 3,1,0,0
58	58	FILEFLAGSMASK 0x3fL
59	59	#ifdef _DEBUG
60	60	FILEFLAGS 0x1L

72	72	VALUE "Comments", "\0"
73	73	VALUE "CompanyName", "JANET(UK)\0"
74	74	VALUE "FileDescription", "Shibboleth SP Attribute Resolver Extension\0"
75		VALUE "FileVersion", "0, 2, 0, 0\0"
	75	VALUE "FileVersion", "3, 1, 0, 0\0"
76	76	#ifdef SHIBSP_LITE
77	77	#ifdef _DEBUG
78	78	VALUE "InternalName", "shibresolver-lite1_0D\0"

86	86	VALUE "InternalName", "shibresolver1_0\0"
87	87	#endif
88	88	#endif
89		VALUE "LegalCopyright", "Copyright © 2011 JANET(UK)\0"
	89	VALUE "LegalCopyright", "Copyright © 2020 JANET(UK)\0"
90	90	VALUE "LegalTrademarks", "\0"
91	91	#ifdef XMLTOOLING_LITE
92	92	#ifdef _DEBUG

103	103	#endif
104	104	VALUE "PrivateBuild", "\0"
105	105	VALUE "ProductName", "Project Moonshot\0"
106		VALUE "ProductVersion", "0, 2, 0, 0\0"
	106	VALUE "ProductVersion", "3, 1, 0, 0\0"
107	107	VALUE "SpecialBuild", "\0"
108	108	END
109	109	END