[shibboleth-sp2] 01/02: Merge branch 'master' into wheezy-backports
Russ Allbery
rra at stanford.edu
Fri Jul 11 06:31:52 UTC 2014
This is an automated email from the git hooks/post-receive script.
rra pushed a commit to branch wheezy-backports
in repository shibboleth-sp2.
commit 109da68647db0ccad8bfe2a7e1e232f2f0d2dc81
Merge: d1ac1f3 f7da2e8
Author: Russ Allbery <rra at debian.org>
Date: Thu Jul 10 22:20:11 2014 -0700
Merge branch 'master' into wheezy-backports
Conflicts:
debian/changelog
debian/control
debian/libapache2-mod-shib2.dirs
debian/rules
adfs/adfs.rc | 10 +-
apache/mod_shib.cpp | 11 +-
apache/mod_shib_13.rc | 10 +-
apache/mod_shib_20.rc | 10 +-
apache/mod_shib_22.rc | 10 +-
apache/mod_shib_24.rc | 10 +-
build-aux/ltmain.sh | 4 +-
config_win32.h | 6 +-
configs/Makefile.am | 2 +-
configs/apache.config.in | 3 +-
configs/apache2.config.in | 3 +-
configs/apache22.config.in | 3 +-
configs/apache24.config.in | 2 +-
configs/keygen.sh | 9 +-
configs/native.logger.in | 44 ++---
configs/postTemplate.html | 10 +-
configs/shibd-debian.in | 143 +++------------
configs/shibd-redhat.in | 4 +-
configure | 20 +--
configure.ac | 2 +-
debian/changelog | 38 +++-
debian/clean | 2 +-
debian/control | 80 ++++++++-
debian/libapache2-mod-shib2.dirs | 2 -
debian/libapache2-mod-shib2.install | 4 -
debian/libshibsp-doc.lintian-overrides | 6 +
debian/libshibsp-plugins.install | 1 +
.../patches/0001-Improve-shibd-init-script.patch | 196 +++++++++++++++++++++
.../0002-keygen-improvements-for-Debian.patch | 39 ++++
.../patches/0003-Avoid-libtool-silent-flag.patch | 24 +++
.../patches/0004-Shire-log-path-for-Debian.patch | 23 +++
.../0005-Default-native-logger-to-syslog.patch | 69 ++++++++
.../0006-Remove-WSTrust-schema-references.patch | 38 ++++
debian/patches/series | 6 +
debian/rules | 51 +++---
debian/shibboleth-sp2-common.install | 2 +
debian/shibboleth-sp2-schemas.install | 1 -
debian/shibboleth-sp2-utils.dirs | 2 +
debian/shibboleth-sp2-utils.install | 4 +
...hib2.postinst => shibboleth-sp2-utils.postinst} | 2 +-
...od-shib2.postrm => shibboleth-sp2-utils.postrm} | 0
....default => shibboleth-sp2-utils.shibd.default} | 0
debian/source/local-options | 1 -
debian/source/local-patch-header | 10 --
fastcgi/Makefile.in | 12 +-
fastcgi/shibauthorizer.rc | 10 +-
fastcgi/shibresponder.rc | 10 +-
isapi_shib/isapi_shib.rc | 10 +-
memcache-store/memcache-store.rc | 12 +-
nsapi_shib/nsapi_shib.rc | 10 +-
odbc-store/odbc-store.rc | 12 +-
plugins/plugins.rc | 10 +-
schemas/Makefile.am | 3 +-
schemas/catalog.xml.in | 2 -
schemas/shibboleth-2.0-native-sp-config.xsd | 3 +-
shibboleth.spec | 2 +-
shibd/shibd.rc | 10 +-
shibsp/Makefile.am | 8 +-
shibsp/Makefile.in | 8 +-
shibsp/SPConfig.cpp | 15 +-
shibsp/handler/impl/AbstractHandler.cpp | 4 +-
shibsp/metadata/DynamicMetadataProvider.cpp | 7 +
shibsp/shibsp.rc | 10 +-
shibsp/version.h | 2 +-
util/mdquery.rc | 10 +-
util/resolvertest.rc | 10 +-
66 files changed, 745 insertions(+), 352 deletions(-)
diff --cc debian/changelog
index a3d5b17,031b6be..fdb4372
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,39 +1,47 @@@
- shibboleth-sp2 (2.5.2+dfsg-2~bpo70+1) wheezy-backports; urgency=medium
++shibboleth-sp2 (2.5.3+dfsg-1~bpo70+1) wheezy-backports; urgency=medium
+
+ * Backport to wheezy.
+ * Revert the changes to build against Apache 2.4 and use dh_apache2, but
+ keep the change to enable the module by default on new installs.
+
+ -- Russ Allbery <rra at debian.org> Sun, 06 Apr 2014 18:23:31 -0700
+
+ shibboleth-sp2 (2.5.3+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Fix server-side includes and directory indexes with Basic
+ authentication when the Shibboleth module is loaded.
+ - Fix preserved POST data size limit enforcement.
+ - Fix POST data replay if a submit key is present.
+ - Fix support for idpHistoryProps in Sessions.
+ * Split libshibsp-plugins, shibboleth-sp2-common, and
+ shibboleth-sp2-utils packages off of libapache2-mod-shib2, and merge
+ shibboleth-sp2-schemas with shibboleth-sp2-common.
+ shibboleth-sp2-schemas becomes a transitional package.
+ shibboleth-sp2-common contains the configuration, which is also
+ required by the shared library. shibboleth-sp2-utils contains the
+ shibd daemon plus the other utility commands that were in
+ libapache2-mod-shib2. libshibsp-plugins contains the library plugins
+ (which eventually should be installed in a per-SONAME path and then be
+ merged back with the library package). (Closes: #740603)
+ * Move /usr/include/shibsp/paths.h to the architecture-specific include
+ directory, since it varies by architecture. Thanks, Andreas
+ Beckmann. (Closes: #720036)
+ * Disable the forcing of --silent mode in Libtool since Debian build log
+ analysis wants verbose logs.
+ * Stop symlinking the minimized jQuery installed by Doxygen and remove
+ the dependency on libjs-jquery. The Doxygen maintainers recommend
+ against this approach since this file is apparently not just a
+ straight copy of jQuery.
+ * Remove the now-unnecessary dh_builddeb override to use xz compression.
+ * Remove unnecessary dh_installinit parameters. update-rc.d now uses
+ LSB headers exclusively and no longer pays attention to any runlevel
+ information on the command line.
+ * Convert all Debian patches to separate patch files managed via gbp pq.
+ * Update standards version to 3.9.5 (no changes required).
+
+ -- Russ Allbery <rra at debian.org> Mon, 31 Mar 2014 20:33:42 -0700
+
shibboleth-sp2 (2.5.2+dfsg-2) unstable; urgency=low
* Upload to unstable.
diff --cc debian/control
index 662fc07,4f604f3..53668c5
--- a/debian/control
+++ b/debian/control
@@@ -18,8 -18,8 +18,9 @@@ Vcs-Browser: http://anonscm.debian.org/
Package: libapache2-mod-shib2
Section: httpd
Architecture: any
- Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
- Recommends: apache2, openssl
+ Depends: ${shlibs:Depends}, ${misc:Depends},
+ libshibsp-plugins (= ${binary:Version}), shibboleth-sp2-utils (>= 2.5)
++Recommends: apache2
Description: Federated web single sign-on system (Apache module)
The Shibboleth System is a standards based software package for web
single sign-on across or within organizational boundaries. It supports
diff --cc debian/libapache2-mod-shib2.dirs
index d4aa339,0a2c9ce..34535f9
--- a/debian/libapache2-mod-shib2.dirs
+++ b/debian/libapache2-mod-shib2.dirs
@@@ -1,4 -1,1 +1,2 @@@
+usr/lib/apache2/modules
- usr/share/man/man1
- usr/share/man/man8
var/log/shibboleth
diff --cc debian/libapache2-mod-shib2.install
index a5153f8,c326239..28302a7
--- a/debian/libapache2-mod-shib2.install
+++ b/debian/libapache2-mod-shib2.install
@@@ -1,7 -1,1 +1,3 @@@
- usr/bin
- usr/sbin
- etc/shibboleth
- usr/lib/*/shibboleth
usr/share/shibboleth
+
+debian/shib2.load etc/apache2/mods-available
diff --cc debian/rules
index f8e1a66,31799cf..934fd7a
--- a/debian/rules
+++ b/debian/rules
@@@ -44,10 -44,14 +44,14 @@@ override_dh_autoreconf
override_dh_auto_configure:
dh_auto_configure -- \
--libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/shibboleth \
- --localstatedir=/var --enable-apache-24 \
- --with-apxs24=/usr/bin/apxs2 --disable-dependency-tracking \
+ --localstatedir=/var --enable-apache-22 \
+ --with-apxs2=/usr/bin/apxs2 --disable-dependency-tracking \
--with-memcached --with-fastcgi --with-gssapi $(SYSTEM)
+ # Move supporting scripts from the configuration directory into /usr/sbin
+ # and remove various configuration files that aren't of interest on Debian.
+ # Also move the one architecture-dependent header file into an
+ # architecture-specific directory.
override_dh_auto_install:
NOKEYGEN=1 dh_auto_install
rm -r debian/tmp/usr/share/doc/shibboleth*
@@@ -61,27 -65,31 +65,30 @@@
mv debian/tmp/etc/shibboleth/keygen.sh debian/tmp/usr/sbin/shib-keygen
mv debian/tmp/etc/shibboleth/metagen.sh debian/tmp/usr/bin/shib-metagen
mv debian/tmp/etc/shibboleth/shibd-debian \
- debian/libapache2-mod-shib2.shibd.init
+ debian/shibboleth-sp2-utils.shibd.init
+ mkdir -p debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp
+ mv debian/tmp/usr/include/shibsp/paths.h \
+ debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/shibsp/
override_dh_install:
- mkdir -p debian/tmp/usr/lib/apache2/modules
- mv debian/tmp/usr/lib/*/shibboleth/mod_shib_24.so \
- debian/tmp/usr/lib/apache2/modules/mod_shib2.so
+ mv debian/tmp/usr/lib/*/shibboleth/mod_shib_22.so \
+ debian/libapache2-mod-shib2/usr/lib/apache2/modules
- pod2man debian/man-pages/mdquery.pod --section 1 \
- --center 'Shibboleth' --release $(VERSION) \
- debian/libapache2-mod-shib2/usr/share/man/man1/mdquery.1
- pod2man debian/man-pages/resolvertest.pod --section 1 \
- --center 'Shibboleth' --release $(VERSION) \
- debian/libapache2-mod-shib2/usr/share/man/man1/resolvertest.1
- pod2man debian/man-pages/shib-metagen.pod --section 1 \
- --center 'Shibboleth' --release $(VERSION) \
- debian/libapache2-mod-shib2/usr/share/man/man1/shib-metagen.1
- pod2man debian/man-pages/shib-keygen.pod --section 8 \
- --center 'Shibboleth' --release $(VERSION) \
- debian/libapache2-mod-shib2/usr/share/man/man8/shib-keygen.8
- pod2man debian/man-pages/shibd.pod --section 8 \
- --center 'Shibboleth' --release $(VERSION) \
- debian/libapache2-mod-shib2/usr/share/man/man8/shibd.8
- dh_install -s -i --fail-missing
+ pod2man debian/man-pages/mdquery.pod --section 1 \
+ --center 'Shibboleth' --release $(VERSION) \
+ debian/shibboleth-sp2-utils/usr/share/man/man1/mdquery.1
+ pod2man debian/man-pages/resolvertest.pod --section 1 \
+ --center 'Shibboleth' --release $(VERSION) \
+ debian/shibboleth-sp2-utils/usr/share/man/man1/resolvertest.1
+ pod2man debian/man-pages/shib-metagen.pod --section 1 \
+ --center 'Shibboleth' --release $(VERSION) \
+ debian/shibboleth-sp2-utils/usr/share/man/man1/shib-metagen.1
+ pod2man debian/man-pages/shib-keygen.pod --section 8 \
+ --center 'Shibboleth' --release $(VERSION) \
+ debian/shibboleth-sp2-utils/usr/share/man/man8/shib-keygen.8
+ pod2man debian/man-pages/shibd.pod --section 8 \
+ --center 'Shibboleth' --release $(VERSION) \
+ debian/shibboleth-sp2-utils/usr/share/man/man8/shibd.8
+ dh_install -s -i -X mod_shib2.so --fail-missing
override_dh_installchangelogs:
dh_installchangelogs doc/RELEASE.txt
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git
More information about the Pkg-shibboleth-devel
mailing list