[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.1.dfsg1-2-22-gd7c3214
Russ Allbery
rra at debian.org
Fri Aug 21 18:44:11 UTC 2009
The following commit has been merged in the master branch:
commit 762a4b7238029366c96a7d688b229b861e4d4716
Merge: 4db637df03112d99ce0919adbfdc8591940e4c89 dd8cdbdc8a3361012af7e913ca048f298c05f8f1
Author: Russ Allbery <rra at debian.org>
Date: Fri Aug 21 10:40:12 2009 -0700
Merge branch 'bug/autoconf-doxygen'
Conflicts:
configs/Makefile.am
configs/Makefile.in
configs/shibd-debian.in
shibsp/paths.h
diff --combined configs/Makefile.am
index ab045c6,cd01d03..a12df8c
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@@ -1,22 -1,24 +1,24 @@@
- ## $Id: Makefile.am 2779 2008-03-15 03:54:53Z cantor $
+ ## $Id: Makefile.am 3088 2009-08-10 16:43:09Z cantor $
AUTOMAKE_OPTIONS = foreign
pkglibdir = ${libdir}/@PACKAGE@
pkglogdir = ${localstatedir}/log/@PACKAGE@
-pkgdocdir = $(datadir)/doc/@PACKAGE at -@PACKAGE_VERSION@
-shirelogdir = ${localstatedir}/log/httpd
+pkgdocdir = ${datadir}/doc/@PACKAGE@
+shirelogdir = ${localstatedir}/log/apache2
pkgxmldir = $(datadir)/xml/@PACKAGE@
pkgrundir = $(localstatedir)/run/@PACKAGE@
pkgsysconfdir = $(sysconfdir)/@PACKAGE@
pkgsysconf_DATA = \
shibd-redhat \
+ shibd-suse \
shibd-debian \
shibd-osx.plist \
apache.config \
apache2.config \
apache22.config \
keygen.sh \
+ metagen.sh \
upgrade.xsl
# The config files are installed "special". Unlike the entries in
@@@ -41,6 -43,7 +43,7 @@@ CONFIGFILES =
metadataError.html \
bindingTemplate.html \
discoveryTemplate.html \
+ postTemplate.html \
localLogout.html \
globalLogout.html \
sslError.html
@@@ -74,6 -77,9 +77,9 @@@ apache22.config: ${srcdir}/apache22.con
shibd-redhat: ${srcdir}/shibd-redhat.in Makefile ${top_builddir}/config.status
$(MAKE) do-build-file FILE=$@
+ shibd-suse: ${srcdir}/shibd-suse.in Makefile ${top_builddir}/config.status
+ $(MAKE) do-build-file FILE=$@
+
shibd-debian: ${srcdir}/shibd-debian.in Makefile ${top_builddir}/config.status
$(MAKE) do-build-file FILE=$@
@@@ -109,6 -115,8 +115,8 @@@ install-data-local: all-data-loca
done
install-data-hook:
+ chmod +x $(DESTDIR)$(pkgsysconfdir)/keygen.sh
+ chmod +x $(DESTDIR)$(pkgsysconfdir)/metagen.sh
if test -z "$(NOKEYGEN)"; then \
cd $(DESTDIR)$(pkgsysconfdir); \
sh ./keygen.sh -b ; \
@@@ -119,6 -127,7 +127,7 @@@ CLEANFILES =
apache2.config \
apache22.config \
shibd-redhat \
+ shibd-suse \
shibd-debian \
shibd-osx.plist \
shibd.logger \
@@@ -131,10 -140,12 +140,12 @@@ EXTRA_DIST =
apache2.config.in \
apache22.config.in \
shibd-redhat.in \
+ shibd-suse.in \
shibd-debian.in \
shibd-osx.plist.in \
keygen.bat \
keygen.sh \
+ metagen.sh \
upgrade.xsl \
xsltproc.js \
$(CONFIGFILES)
diff --combined configs/Makefile.in
index 7bcc888,40939a8..1e86cad
--- a/configs/Makefile.in
+++ b/configs/Makefile.in
@@@ -160,7 -160,6 +160,7 @@@ FASTCGI_INCLUDE = @FASTCGI_INCLUDE
FASTCGI_LDFLAGS = @FASTCGI_LDFLAGS@
FASTCGI_LIBS = @FASTCGI_LIBS@
FFLAGS = @FFLAGS@
+GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@@ -203,9 -202,21 +203,9 @@@ VERSION = @VERSION
WANT_SUBDIRS = @WANT_SUBDIRS@
XMLSEC_LIBS = @XMLSEC_LIBS@
XMLTOOLINGXMLDIR = @XMLTOOLINGXMLDIR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_DX_DOT = @ac_pt_DX_DOT@
-ac_pt_DX_DOXYGEN = @ac_pt_DX_DOXYGEN@
-ac_pt_DX_DVIPS = @ac_pt_DX_DVIPS@
-ac_pt_DX_EGREP = @ac_pt_DX_EGREP@
-ac_pt_DX_HHC = @ac_pt_DX_HHC@
-ac_pt_DX_LATEX = @ac_pt_DX_LATEX@
-ac_pt_DX_MAKEINDEX = @ac_pt_DX_MAKEINDEX@
-ac_pt_DX_PDFLATEX = @ac_pt_DX_PDFLATEX@
-ac_pt_DX_PERL = @ac_pt_DX_PERL@
acx_pthread_config = @acx_pthread_config@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
@@@ -223,30 -234,23 +223,30 @@@ build_cpu = @build_cpu
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
+htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
+localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
+psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@@@ -254,19 -258,21 +254,21 @@@ target_alias = @target_alias
xs = @xs@
AUTOMAKE_OPTIONS = foreign
pkglogdir = ${localstatedir}/log/@PACKAGE@
-pkgdocdir = $(datadir)/doc/@PACKAGE at -@PACKAGE_VERSION@
-shirelogdir = ${localstatedir}/log/httpd
+pkgdocdir = ${datadir}/doc/@PACKAGE@
+shirelogdir = ${localstatedir}/log/apache2
pkgxmldir = $(datadir)/xml/@PACKAGE@
pkgrundir = $(localstatedir)/run/@PACKAGE@
pkgsysconfdir = $(sysconfdir)/@PACKAGE@
pkgsysconf_DATA = \
shibd-redhat \
+ shibd-suse \
shibd-debian \
shibd-osx.plist \
apache.config \
apache2.config \
apache22.config \
keygen.sh \
+ metagen.sh \
upgrade.xsl
@@@ -293,6 -299,7 +295,7 @@@ CONFIGFILES =
metadataError.html \
bindingTemplate.html \
discoveryTemplate.html \
+ postTemplate.html \
localLogout.html \
globalLogout.html \
sslError.html
@@@ -302,6 -309,7 +305,7 @@@ CLEANFILES =
apache2.config \
apache22.config \
shibd-redhat \
+ shibd-suse \
shibd-debian \
shibd-osx.plist \
shibd.logger \
@@@ -314,10 -322,12 +318,12 @@@ EXTRA_DIST =
apache2.config.in \
apache22.config.in \
shibd-redhat.in \
+ shibd-suse.in \
shibd-debian.in \
shibd-osx.plist.in \
keygen.bat \
keygen.sh \
+ metagen.sh \
upgrade.xsl \
xsltproc.js \
$(CONFIGFILES)
@@@ -537,6 -547,9 +543,9 @@@ apache22.config: ${srcdir}/apache22.con
shibd-redhat: ${srcdir}/shibd-redhat.in Makefile ${top_builddir}/config.status
$(MAKE) do-build-file FILE=$@
+ shibd-suse: ${srcdir}/shibd-suse.in Makefile ${top_builddir}/config.status
+ $(MAKE) do-build-file FILE=$@
+
shibd-debian: ${srcdir}/shibd-debian.in Makefile ${top_builddir}/config.status
$(MAKE) do-build-file FILE=$@
@@@ -572,6 -585,8 +581,8 @@@ install-data-local: all-data-loca
done
install-data-hook:
+ chmod +x $(DESTDIR)$(pkgsysconfdir)/keygen.sh
+ chmod +x $(DESTDIR)$(pkgsysconfdir)/metagen.sh
if test -z "$(NOKEYGEN)"; then \
cd $(DESTDIR)$(pkgsysconfdir); \
sh ./keygen.sh -b ; \
diff --combined configs/shibd-debian.in
index 7ffc1f6,13e8240..3b59c86
--- a/configs/shibd-debian.in
+++ b/configs/shibd-debian.in
@@@ -7,8 -7,8 +7,8 @@@
# Default-Stop: 0 1 6
# Short-Description: Shibboleth 2 Service Provider Daemon
# Description: Starts the separate daemon used by the Shibboleth
-# Apache module to manage sessions and to retrieve
-# attributes from Shibboleth Identity Providers.
+# Apache module to manage sessions and to retrieve
+# attributes from Shibboleth Identity Providers.
### END INIT INFO
#
# Written by Quanah Gibson-Mount <quanah at stanford.edu>
@@@ -56,22 -56,23 +56,22 @@@ start
exit 0
fi
echo -n "Starting $DESC: "
- start-stop-daemon --background --start --quiet \
+ start-stop-daemon --start --quiet \
--pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
echo "$NAME."
;;
stop)
echo -n "Stopping $DESC: "
start-stop-daemon --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON
+ --retry TERM/30/KILL/5 --exec $DAEMON
echo "$NAME."
;;
restart|force-reload)
echo -n "Restarting $DESC: "
start-stop-daemon --stop --quiet --pidfile $PIDFILE \
- --exec $DAEMON
- sleep 1
- start-stop-daemon --start --quiet \
- --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
+ --retry TERM/30/KILL/5 --exec $DAEMON
- start-stop-daemon --background --start --quiet \
- --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_OPTS
++ start-stop-daemon --start --quiet --pidfile $PIDFILE \
++ --exec $DAEMON -- $DAEMON_OPTS
echo "$NAME."
;;
*)
diff --combined shibsp/paths.h
index cd361ea,6eb507d..6ad2036
--- a/shibsp/paths.h
+++ b/shibsp/paths.h
@@@ -1,5 -1,5 +1,5 @@@
/*
- * Copyright 2001-2005 Internet2
+ * Copyright 2001-2009 Internet2
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@@ -23,24 -23,31 +23,31 @@@
#ifndef __shibsp_paths_h__
#define __shibsp_paths_h__
- /**
- * Default schema catalogs.
- */
+ /** Default schema catalogs. */
-#define SHIBSP_SCHEMAS "/opt/shibboleth-sp/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/opt/shibboleth-sp/share/xml/shibboleth/catalog.xml"
+#define SHIBSP_SCHEMAS "/usr/share/xml/xmltooling/catalog.xml:/usr/share/xml/opensaml/saml20-catalog.xml:/usr/share/xml/opensaml/saml11-catalog.xml:/usr/share/xml/shibboleth/catalog.xml"
- /**
- * Default name of SP configuration file.
- */
+ /** Default name of SP configuration file. */
#define SHIBSP_CONFIG "shibboleth2.xml"
- /**
- * Default name of SP console tool logging file.
- */
+ /** Default name of SP console tool logging file. */
#define SHIBSP_LOGGING "console.logger"
- /**
- * Default prefix for installation (used to resolve relative paths).
- */
+ /** Default prefix for installation (used to resolve relative paths). */
-#define SHIBSP_PREFIX "/opt/shibboleth-sp"
+#define SHIBSP_PREFIX "/usr"
+ /** Library directory for installation (used to resolve relative paths). */
-#define SHIBSP_LIBDIR "/opt/shibboleth-sp/lib"
++#define SHIBSP_LIBDIR "/usr/lib"
+
+ /** Log directory for installation (used to resolve relative paths). */
-#define SHIBSP_LOGDIR "/opt/shibboleth-sp/var/log"
++#define SHIBSP_LOGDIR "/var/log/shibboleth"
+
+ /** Configuration directory for installation (used to resolve relative paths). */
-#define SHIBSP_CFGDIR "/opt/shibboleth-sp/etc"
++#define SHIBSP_CFGDIR "/etc/shibboleth"
+
+ /** Runtime state directory for installation (used to resolve relative paths). */
-#define SHIBSP_RUNDIR "/opt/shibboleth-sp/var/run"
++#define SHIBSP_RUNDIR "/var/run/shibboleth"
+
+ /** XML directory for installation (used to resolve relative paths). */
-#define SHIBSP_XMLDIR "/opt/shibboleth-sp/share/xml"
++#define SHIBSP_XMLDIR "/usr/share/xml/shibboleth"
+
#endif /* __shibsp_paths_h__ */
--
Debian packaging for the 2.0 Apache Shibboleth SP
More information about the Pkg-shibboleth-devel
mailing list