Russ Allbery [Sun, 3 Jan 2010 21:55:41 +0000 (13:55 -0800)]
Merge branch 'debian'
Russ Allbery [Sun, 3 Jan 2010 21:55:25 +0000 (13:55 -0800)]
Finalize changes for 2.3.1+dfsg-1
Russ Allbery [Sun, 3 Jan 2010 08:29:32 +0000 (00:29 -0800)]
Merge branch 'debian'
Russ Allbery [Sun, 3 Jan 2010 08:29:01 +0000 (00:29 -0800)]
Add ${misc:Depends} and ${shlibs:Depends} to dependencies
* Add ${shlibs:Depends} to the libshibsp-dev package dependencies.
* Add ${misc:Depends} to all package dependencies.
Russ Allbery [Sun, 3 Jan 2010 08:17:18 +0000 (00:17 -0800)]
Merge branch 'debian'
Russ Allbery [Sun, 3 Jan 2010 08:16:58 +0000 (00:16 -0800)]
Add changelog entry for the shibd PID bug fix
Russ Allbery [Sun, 3 Jan 2010 08:13:16 +0000 (00:13 -0800)]
Merge branch 'bug/unlink-pidfile'
Russ Allbery [Sun, 3 Jan 2010 08:11:46 +0000 (00:11 -0800)]
Add upstream changes for 2.3.1
Russ Allbery [Sun, 3 Jan 2010 08:06:04 +0000 (00:06 -0800)]
Merge commit 'upstream/2.3.1+dfsg' into debian
Russ Allbery [Fri, 18 Dec 2009 00:52:54 +0000 (16:52 -0800)]
Merge commit 'upstream/2.3.1+dfsg'
Russ Allbery [Fri, 18 Dec 2009 00:52:52 +0000 (16:52 -0800)]
Imported Upstream version 2.3.1+dfsg
Russ Allbery [Fri, 18 Dec 2009 00:52:33 +0000 (16:52 -0800)]
Initial changelog entry for 2.3.1+dfsg-1
Ferenc Wagner [Wed, 9 Dec 2009 11:36:45 +0000 (12:36 +0100)]
Fix pidfile removal
The http://svn.middleware.georgetown.edu/view/cpp-sp?view=rev&revision=3209
upstream fix for https://bugs.internet2.edu/jira/browse/SSPCPP-272.
Russ Allbery [Wed, 11 Nov 2009 22:40:00 +0000 (14:40 -0800)]
Merge branch 'debian'
Russ Allbery [Wed, 11 Nov 2009 22:39:49 +0000 (14:39 -0800)]
Update date for the 2.3+dfsg-1 release
Russ Allbery [Wed, 11 Nov 2009 22:38:07 +0000 (14:38 -0800)]
Fix documentation in /etc/default/shibd
We load this file after setting DAEMON_OPTS in the init script, so it
overrides completely. Update the documentation accordingly, and mention
that if the PID file location is changed, PIDFILE should also be set to
point to the new location. Thanks, Ferenc Wagner.
Ferenc Wagner [Wed, 11 Nov 2009 14:05:42 +0000 (15:05 +0100)]
Fix comment typos in init script
Russ Allbery [Wed, 11 Nov 2009 01:34:29 +0000 (17:34 -0800)]
Fix logic mistake in shibd as non-root user probe
I introduced a logic error when refactoring the init script. shibd -t
doesn't return non-zero status when it can't open the private key file.
Russ Allbery [Wed, 11 Nov 2009 01:08:20 +0000 (17:08 -0800)]
Fix stray whitespace in init restart rule from mismerge
Russ Allbery [Wed, 11 Nov 2009 00:56:53 +0000 (16:56 -0800)]
Merge branch 'debian'
Russ Allbery [Wed, 11 Nov 2009 00:56:11 +0000 (16:56 -0800)]
Finalize changes for 2.3+dfsg-1
Russ Allbery [Wed, 11 Nov 2009 00:55:45 +0000 (16:55 -0800)]
Make NEWS.Debian urgency match debian/changelog urgency
Russ Allbery [Wed, 11 Nov 2009 00:49:04 +0000 (16:49 -0800)]
Merge branch 'debian'
Russ Allbery [Wed, 11 Nov 2009 00:48:14 +0000 (16:48 -0800)]
Add a NEWS.Debian entry for the shibd run-time user change
Russ Allbery [Wed, 11 Nov 2009 00:43:57 +0000 (16:43 -0800)]
Additional documentation and formatting for DAEMON_USER support
Add a comment to the init script explaining what's going on with the
DAEMON_USER support and reformat to keep lines below 80 columns.
Russ Allbery [Wed, 11 Nov 2009 00:33:51 +0000 (16:33 -0800)]
Improve documentation of DAEMON_OPTS in /etc/default/shibd
Russ Allbery [Wed, 11 Nov 2009 00:33:26 +0000 (16:33 -0800)]
Document removal of unnecessary patches to generated files
Russ Allbery [Wed, 11 Nov 2009 00:27:57 +0000 (16:27 -0800)]
Revert to upstream configs/Makefile.in
We rebuild all the Makefile.in files using automake during the build
anyway, so no need to ship a diff to a Makefile.in as part of the package.
Russ Allbery [Wed, 11 Nov 2009 00:16:54 +0000 (16:16 -0800)]
Revert local modification of shibsp/paths.h
This file is generated during the build from paths.h.in and will be
correct for our builds, so no need to modify this file in the package.
Instead, just remove this file in the clean target so that the diff
is not included in the package.
Russ Allbery [Wed, 11 Nov 2009 00:05:07 +0000 (16:05 -0800)]
Merge branch 'debian'
Russ Allbery [Wed, 11 Nov 2009 00:04:10 +0000 (16:04 -0800)]
Fix another location of the library package name
Russ Allbery [Tue, 10 Nov 2009 23:57:15 +0000 (15:57 -0800)]
Merge branch 'debian'
Faidon Liambotis [Tue, 10 Nov 2009 23:56:02 +0000 (15:56 -0800)]
Run make install with NOKEYGEN=1
* Run make install with NOKEYGEN=1 and stop rm-ing generated certificates.
Fixes FTBFS.
Russ Allbery [Tue, 10 Nov 2009 23:53:02 +0000 (15:53 -0800)]
Rename library package for upstream SONAME bump
Russ Allbery [Tue, 10 Nov 2009 23:51:35 +0000 (15:51 -0800)]
Bump urgency for security fix
Russ Allbery [Tue, 10 Nov 2009 23:50:46 +0000 (15:50 -0800)]
Tighten build and package dependencies
* Tighten build and package dependencies on xmltooling and opensaml2 to
require the versions with the security fix.
Russ Allbery [Tue, 10 Nov 2009 23:45:09 +0000 (15:45 -0800)]
Merge branch 'debian'
Conflicts:
configs/shibd-debian.in
Russ Allbery [Tue, 10 Nov 2009 23:42:43 +0000 (15:42 -0800)]
Add additional upstream changes for 2.3
Russ Allbery [Tue, 10 Nov 2009 23:10:19 +0000 (15:10 -0800)]
Update README.Debian for new require session syntax
The new upstream recommended syntax for requiring a session is to
use ShibRequestSetting, so change README.Debian accordingly.
Russ Allbery [Tue, 10 Nov 2009 23:06:21 +0000 (15:06 -0800)]
Merge branch 'upstream' into debian
Conflicts:
shibsp/paths.h
Russ Allbery [Tue, 10 Nov 2009 23:03:58 +0000 (15:03 -0800)]
Merge branch 'bug/init'
Russ Allbery [Tue, 10 Nov 2009 23:03:48 +0000 (15:03 -0800)]
Merge branch 'upstream' into bug/init
Russ Allbery [Tue, 10 Nov 2009 23:03:35 +0000 (15:03 -0800)]
Merge commit 'upstream/2.3+dfsg'
Conflicts:
shibsp/paths.h
Russ Allbery [Tue, 10 Nov 2009 22:59:40 +0000 (14:59 -0800)]
Imported Upstream version 2.3+dfsg
Russ Allbery [Tue, 10 Nov 2009 22:58:03 +0000 (14:58 -0800)]
Fix watch file for the new version mangling
Russ Allbery [Tue, 10 Nov 2009 22:57:04 +0000 (14:57 -0800)]
Initial changelog for 2.3
Ferenc Wagner [Fri, 18 Sep 2009 11:05:09 +0000 (13:05 +0200)]
Run shibd as non-root
On installation, create a new system user (_shibd) and run
shibd as this user if possible.
Russ Allbery [Wed, 16 Sep 2009 04:38:04 +0000 (21:38 -0700)]
Merge branch 'debian'
Russ Allbery [Wed, 16 Sep 2009 03:48:23 +0000 (20:48 -0700)]
Add a NEWS.Debian entry for shibboleth2.xml updates
* Add a NEWS.Debian entry for libapache2-mod-shib2 that explains the
recommended configuration update for the 2.2 version. Thanks, Scott
Cantor and Kristof BAJNOK.
Russ Allbery [Wed, 9 Sep 2009 19:15:14 +0000 (12:15 -0700)]
Change the libapache2-mod-shib2 section to httpd
* Change the libapache2-mod-shib2 section to httpd, matching override.
Russ Allbery [Tue, 8 Sep 2009 00:08:14 +0000 (17:08 -0700)]
Merge branch 'debian'
Russ Allbery [Mon, 7 Sep 2009 23:14:50 +0000 (16:14 -0700)]
Finalize changes for 2.2.1+dfsg-1
Russ Allbery [Mon, 7 Sep 2009 21:51:08 +0000 (14:51 -0700)]
Fix syntax error in shib-metagen man page
Russ Allbery [Mon, 7 Sep 2009 21:34:07 +0000 (14:34 -0700)]
Merge branch 'debian'
Russ Allbery [Mon, 7 Sep 2009 21:33:28 +0000 (14:33 -0700)]
Use the upstream version as the man page version
* Use the automatically-extracted package version as the version number
for the man pages.
Russ Allbery [Mon, 7 Sep 2009 21:32:11 +0000 (14:32 -0700)]
metagen.sh should be a bash script
metagen.sh uses bash-specific features (arrays) and should therefore
start with #!/bin/bash.
Russ Allbery [Mon, 7 Sep 2009 21:28:19 +0000 (14:28 -0700)]
Properly install and document the metagen script
Move metagen.sh out of /etc/shibboleth to /usr/bin/shib-metagen and
install a man page for it.
Russ Allbery [Mon, 7 Sep 2009 20:57:33 +0000 (13:57 -0700)]
Remove the SuSE init script installed by upstream
Russ Allbery [Mon, 7 Sep 2009 20:56:15 +0000 (13:56 -0700)]
Add debhelper token to libapache2-mod-shib2 postrm
Russ Allbery [Mon, 7 Sep 2009 20:19:05 +0000 (13:19 -0700)]
Merge branch 'debian'
Russ Allbery [Mon, 7 Sep 2009 20:18:36 +0000 (13:18 -0700)]
Generate shlibs for the correct binary package
debian/rules had missed a required change for the renaming of the shared
library package. Fix the package name passed to dh_makeshlibs.
Russ Allbery [Mon, 7 Sep 2009 20:00:42 +0000 (13:00 -0700)]
Merge branch 'debian'
Russ Allbery [Mon, 7 Sep 2009 20:00:00 +0000 (13:00 -0700)]
Remove the new upstream doc installation
Upstream now installs the API documentation in a versioned directory, so
remove that in debian/rules. We install our copy of the documentation
directly out of the build tree.
Russ Allbery [Mon, 7 Sep 2009 19:48:23 +0000 (12:48 -0700)]
Merge branch 'debian'
Russ Allbery [Mon, 7 Sep 2009 19:48:03 +0000 (12:48 -0700)]
/var/run/shibboleth is no more, so stop installing it
Russ Allbery [Fri, 21 Aug 2009 18:57:52 +0000 (11:57 -0700)]
Merge branch 'debian'
Russ Allbery [Fri, 21 Aug 2009 18:56:50 +0000 (11:56 -0700)]
Don't include /var/run/shibboleth in the package and clean up on remove
- Don't ship /var/run/shibboleth in the package.
- Remove /var/run/shibboleth in postrm if it exists.
Russ Allbery [Fri, 21 Aug 2009 18:56:50 +0000 (11:56 -0700)]
Don't include /var/run/shibboleth in the package and clean up on remove
- Don't ship /var/run/shibboleth in the package.
- Remove /var/run/shibboleth in postrm if it exists.
Russ Allbery [Fri, 21 Aug 2009 18:44:02 +0000 (11:44 -0700)]
Merge branch 'debian'
Russ Allbery [Fri, 21 Aug 2009 18:43:48 +0000 (11:43 -0700)]
Also require xml-security-c 1.5 or later for build
Russ Allbery [Fri, 21 Aug 2009 18:40:40 +0000 (11:40 -0700)]
Merge branch 'debian'
Russ Allbery [Fri, 21 Aug 2009 18:40:16 +0000 (11:40 -0700)]
Update standards version to 3.8.3
* Update standards version to 3.8.3.
- Create /var/run/shibboleth in the init script if it doesn't exist.
Russ Allbery [Fri, 21 Aug 2009 18:27:41 +0000 (11:27 -0700)]
Rename library package for upstream SONAME bump
Russ Allbery [Fri, 21 Aug 2009 18:26:46 +0000 (11:26 -0700)]
Build against Xerces-C 3.0
Russ Allbery [Fri, 21 Aug 2009 18:25:41 +0000 (11:25 -0700)]
Tighten dependencies for the 2.2 release
* Tighten build dependencies and schema package dependencies on
opensaml2 and xmltooling.
Russ Allbery [Fri, 21 Aug 2009 18:23:30 +0000 (11:23 -0700)]
Merge branch 'debian'
Russ Allbery [Fri, 21 Aug 2009 18:23:17 +0000 (11:23 -0700)]
Merge branch 'bug/autoconf-doxygen'
Russ Allbery [Fri, 21 Aug 2009 18:22:37 +0000 (11:22 -0700)]
Remove remaining unnecessary delta from upstream
Upstream applied a slightly different fix to the Doxygen macro that
didn't require one change of quoting that our fix had. Remove the
unnecessary delta.
Russ Allbery [Fri, 21 Aug 2009 18:14:36 +0000 (11:14 -0700)]
Update the shibd man page for new upstream options
Also alphabetize the options, clarify the options with arguments in
the SYNOPSIS, and add a bit more of a summary of what shibd is for.
Russ Allbery [Fri, 21 Aug 2009 18:10:13 +0000 (11:10 -0700)]
Update copyright dates for 2.2.1 release and packaging
Russ Allbery [Fri, 21 Aug 2009 17:59:30 +0000 (10:59 -0700)]
Add changelog for upstream 2.2.1 release
Russ Allbery [Fri, 21 Aug 2009 17:40:28 +0000 (10:40 -0700)]
Merge branch 'debian'
Russ Allbery [Fri, 21 Aug 2009 17:40:26 +0000 (10:40 -0700)]
Merge branch 'bug/init'
Russ Allbery [Fri, 21 Aug 2009 17:40:12 +0000 (10:40 -0700)]
Merge branch 'bug/autoconf-doxygen'
Conflicts:
configs/Makefile.am
configs/Makefile.in
configs/shibd-debian.in
shibsp/paths.h
Russ Allbery [Fri, 21 Aug 2009 17:39:49 +0000 (10:39 -0700)]
Merge branch 'upstream' into debian
Conflicts:
configs/Makefile.am
configs/Makefile.in
shibsp/paths.h
Russ Allbery [Fri, 21 Aug 2009 17:36:20 +0000 (10:36 -0700)]
Merge branch 'upstream' into bug/init
Conflicts:
configs/shibd-debian.in
Russ Allbery [Fri, 21 Aug 2009 17:34:29 +0000 (10:34 -0700)]
Merge branch 'upstream' into bug/autoconf-doxygen
Russ Allbery [Fri, 21 Aug 2009 17:32:58 +0000 (10:32 -0700)]
Imported Upstream version 2.2.1+dfsg
Russ Allbery [Fri, 21 Aug 2009 17:32:09 +0000 (10:32 -0700)]
Prepare for 2.2.1 packaging
Add initial changelog entry for 2.2.1. Dynamically determine the Debian
and upstream package versions for get-orig-source from debian/changelog.
Russ Allbery [Fri, 24 Jul 2009 22:29:39 +0000 (15:29 -0700)]
Update TestShib testing instructions
* Update libapache2-mod-shib2's README.Debian for changes to the
TestShib web pages.
Russ Allbery [Tue, 3 Mar 2009 23:03:41 +0000 (15:03 -0800)]
Merge branch 'debian'
Russ Allbery [Tue, 3 Mar 2009 23:03:20 +0000 (15:03 -0800)]
Add changelog entry for 2.1.dfsg1-2
Russ Allbery [Tue, 3 Mar 2009 22:48:25 +0000 (14:48 -0800)]
Merge branch 'bug/autoconf-doxygen'
Russ Allbery [Tue, 3 Mar 2009 22:24:41 +0000 (14:24 -0800)]
Fix quoting for Autoconf 2.63
Autoconf 2.63 didn't like the way variables were formed inside the
doxygen.m4 macros. Redo the quoting in a way that appears to work
for Autoconf 2.63 and hopefully doesn't break anything.
Russ Allbery [Sat, 28 Feb 2009 04:55:08 +0000 (20:55 -0800)]
Merge branch 'debian'
Russ Allbery [Sat, 28 Feb 2009 04:54:57 +0000 (20:54 -0800)]
Finalize changes for 2.1.dfsg1-1
Russ Allbery [Sat, 28 Feb 2009 04:54:37 +0000 (20:54 -0800)]
Remove duplicate Section field for libapache2-mod-shib2
Russ Allbery [Sat, 28 Feb 2009 03:58:48 +0000 (19:58 -0800)]
Merge branch 'debian'
Russ Allbery [Thu, 22 Jan 2009 01:47:10 +0000 (17:47 -0800)]
Tighten the dependencies on the OpenSAML and XMLTooling schemas
* Tighten the dependency versioning; the 2.1 SP library requires the
2.1 schemas from the Shibboleth SP and OpenSAML and the 1.1 schemas
from XMLTooling.
Russ Allbery [Tue, 20 Jan 2009 18:46:51 +0000 (10:46 -0800)]
Tighten the shibboleth-sp2-schemas dependency
* Tighten the dependency versioning; the 2.1 SP library requires the
2.1 schemas.