The following commit has been merged in the master branch:
commit bd7da5ab734e435e334bf15173f272ec398575dc
Merge: 521a131161452d3e6680d7fcb9a7d2c284c6bf8e d56ea3502b0150e69ff219fab353547bf0debef7
Author: Russ Allbery <rra at debian.org>
Date: Sat Aug 23 16:43:54 2008 -0700
Merge branch 'bug/gcc-4.3'
diff --combined configs/Makefile.in
index f913343,6a9a049..7bcc888
--- a/configs/Makefile.in
+++ b/configs/Makefile.in
@@@ -43,7 -43,7 +43,7 @@@ am__aclocal_m4_deps = $(top_srcdir)/lib
$(top_srcdir)/acx_pthread.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
@@@ -87,6 -87,8 +87,8 @@@ BUILD_AP22_FALSE = @BUILD_AP22_FALSE
BUILD_AP22_TRUE = @BUILD_AP22_TRUE@
BUILD_FASTCGI_FALSE = @BUILD_FASTCGI_FALSE@
BUILD_FASTCGI_TRUE = @BUILD_FASTCGI_TRUE@
+ BUILD_MEMCACHED_FALSE = @BUILD_MEMCACHED_FALSE@
+ BUILD_MEMCACHED_TRUE = @BUILD_MEMCACHED_TRUE@
BUILD_NSAPI_FALSE = @BUILD_NSAPI_FALSE@
BUILD_NSAPI_TRUE = @BUILD_NSAPI_TRUE@
CC = @CC@
@@@ -158,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@
@@@ -173,6 -174,9 +175,9 @@@ LOG4CPP_CONFIG = @LOG4CPP_CONFIG
LOG4SHIB_CONFIG = @LOG4SHIB_CONFIG@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+ MEMCACHED_INCLUDE = @MEMCACHED_INCLUDE@
+ MEMCACHED_LDFLAGS = @MEMCACHED_LDFLAGS@
+ MEMCACHED_LIBS = @MEMCACHED_LIBS@
NSAPI_INCLUDE = @NSAPI_INCLUDE@
OBJEXT = @OBJEXT@
ODBC_CFLAGS = @ODBC_CFLAGS@
@@@ -198,9 -202,21 +203,9 @@@ VERSION = @VERSION
WANT_SUBDIRS = @WANT_SUBDIRS@
XMLSEC_LIBS = @XMLSEC_LIBS@
XMLTOOLINGXMLDIR = @XMLTOOLINGXMLDIR@
-ac_ct_AR = @ac_ct_AR@
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@
@@@ -218,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@
@@@ -250,7 -259,7 +255,7 @@@ xs = @xs
AUTOMAKE_OPTIONS = foreign
pkglogdir = ${localstatedir}/log/@PACKAGE@
pkgdocdir = ${datadir}/doc/@PACKAGE@
-shirelogdir = ${localstatedir}/log/httpd
+shirelogdir = ${localstatedir}/log/apache2
pkgxmldir = $(datadir)/xml/@PACKAGE@
pkgrundir = $(localstatedir)/run/@PACKAGE@
pkgsysconfdir = $(sysconfdir)/@PACKAGE@
diff --combined configs/keygen.sh
index 534516c,0729fe3..44caa2e
--- a/configs/keygen.sh
+++ b/configs/keygen.sh
@@@ -1,10 -1,5 +1,10 @@@
#! /bin/sh
+# Added for Debian. The upstream version is installed in /etc/shibboleth and
+# for Debian we wanted to move it to /usr/bin, so change directories so that
+# it puts files in the correct location.
+cd /etc/shibboleth
+
while getopts h:e:y:bf c
do
case $c in
@@@ -31,9 -26,8 +31,9 @@@ if [ -s sp-key.pem -o -s sp-cert.pem
exit 0
fi
+# --fqdn flag added for Debian to generate better names for certificates.
if [ -z "$FQDN" ] ; then
- FQDN=`hostname`
+ FQDN=`hostname --fqdn`
fi
if [ -z "$YEARS" ] ; then
@@@ -72,4 -66,5 +72,5 @@@ els
openssl req -config sp-cert.cnf -new -x509 -days $DAYS -keyout sp-key.pem -out sp-cert.pem 2> /dev/null
fi
+ chmod 600 sp-key.pem
rm sp-cert.cnf
--
Debian packaging for the 2.0 Apache Shibboleth SP