[SCM] Debian packaging for the 2.0 Apache Shibboleth SP branch, master, updated. debian/2.4.3+dfsg-5-17-g7b47b27
Russ Allbery
rra at debian.org
Fri May 31 00:47:59 UTC 2013
The following commit has been merged in the master branch:
commit 4f6280863f20bd8a2feee266beb6e1523fa9ba5f
Merge: 77a063f35fd2593d578c3eca796f306ddbbbdbf3 2c4682acf8572f5a15935e26bff7bba43a4fbd46
Author: Russ Allbery <rra at debian.org>
Date: Thu May 30 16:39:26 2013 -0700
Merge tag 'upstream/2.5.1+dfsg'
Upstream version 2.5.1+dfsg
Conflicts:
configs/Makefile.am
configs/metagen.sh
memcache-store/memcache-store.cpp
diff --combined configs/Makefile.am
index 9ff0a9b,ee90def..841f9de
--- a/configs/Makefile.am
+++ b/configs/Makefile.am
@@@ -1,14 -1,15 +1,15 @@@
- ## $Id: Makefile.am 3293 2010-08-13 04:23:23Z cantor $
+ ## $Id: Makefile.am 3779 2012-10-09 20:04:57Z scantor $
AUTOMAKE_OPTIONS = foreign
- pkglibdir = ${libdir}/@PACKAGE@
- pkglogdir = ${localstatedir}/log/@PACKAGE@
- pkgdocdir = ${datadir}/doc/@PACKAGE@
+ pkglibdir = ${libdir}/@PACKAGE_NAME@
+ pkglogdir = ${localstatedir}/log/@PACKAGE_NAME@
-shirelogdir = ${localstatedir}/log/httpd
+shirelogdir = ${localstatedir}/log/apache2
- pkgxmldir = $(datadir)/xml/@PACKAGE@
- pkgrundir = $(localstatedir)/run/@PACKAGE@
- pkgsysconfdir = $(sysconfdir)/@PACKAGE@
+ pkgxmldir = $(datadir)/xml/@PACKAGE_NAME@
+ pkgwebdir = $(datadir)/@PACKAGE_NAME@
+ pkgrundir = $(localstatedir)/run/@PACKAGE_NAME@
+ pkgcachedir = $(localstatedir)/cache/@PACKAGE_NAME@
+ pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
pkgsysconf_DATA = \
shibd-redhat \
shibd-suse \
@@@ -17,6 -18,7 +18,7 @@@
apache.config \
apache2.config \
apache22.config \
+ apache24.config \
keygen.sh \
metagen.sh \
upgrade.xsl
@@@ -42,11 -44,12 +44,12 @@@ CONFIGFILES =
console.logger \
syslog.logger \
accessError.html \
+ attrChecker.html \
sessionError.html \
metadataError.html \
bindingTemplate.html \
discoveryTemplate.html \
- postTemplate.html \
+ postTemplate.html \
localLogout.html \
globalLogout.html \
partialLogout.html \
@@@ -58,14 -61,14 +61,14 @@@
do-build-file:
rm -f ${FILE}.tmp
sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \
- -e 's:@-PREFIX-@:${prefix}:g' \
- -e 's:@-PKGLIBDIR-@:${pkglibdir}:g' \
- -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
- -e 's:@-PKGDOCDIR-@:${pkgdocdir}:g' \
- -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
- -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
- -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
- -e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
+ -e 's:@-PREFIX-@:${prefix}:g' \
+ -e 's:@-PKGLIBDIR-@:${pkglibdir}:g' \
+ -e 's:@-PKGSYSCONFDIR-@:${pkgsysconfdir}:g' \
+ -e 's:@-PKGXMLDIR-@:${pkgxmldir}:g' \
+ -e 's:@-PKGWEBDIR-@:${pkgwebdir}:g' \
+ -e 's:@-PKGLOGDIR-@:${pkglogdir}:g' \
+ -e 's:@-SHIRELOGDIR-@:${shirelogdir}:g' \
+ -e 's:@-PKGRUNDIR-@:${pkgrundir}:g'
cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
rm -f ${FILE}.tmp
@@@ -78,6 -81,9 +81,9 @@@ apache2.config: ${srcdir}/apache2.confi
apache22.config: ${srcdir}/apache22.config.in Makefile ${top_builddir}/config.status
$(MAKE) do-build-file FILE=$@
+ apache24.config: ${srcdir}/apache24.config.in Makefile ${top_builddir}/config.status
+ $(MAKE) do-build-file FILE=$@
+
shibd-redhat: ${srcdir}/shibd-redhat.in Makefile ${top_builddir}/config.status
$(MAKE) do-build-file FILE=$@
@@@ -100,9 -106,9 +106,9 @@@ all-data-local: $(BUILTCONFIGFILES
install-data-local: all-data-local
$(mkinstalldirs) $(DESTDIR)$(pkglogdir)
- $(mkinstalldirs) $(DESTDIR)$(pkgdocdir)
$(mkinstalldirs) $(DESTDIR)$(shirelogdir)
$(mkinstalldirs) $(DESTDIR)$(pkgrundir)
+ $(mkinstalldirs) $(DESTDIR)$(pkgcachedir)
$(mkinstalldirs) $(DESTDIR)$(pkgxmldir)
$(mkinstalldirs) $(DESTDIR)$(pkgsysconfdir)
for f in $(BUILTCONFIGFILES); do \
@@@ -130,6 -136,7 +136,7 @@@ CLEANFILES =
apache.config \
apache2.config \
apache22.config \
+ apache24.config \
shibd-redhat \
shibd-suse \
shibd-debian \
@@@ -143,6 -150,7 +150,7 @@@ EXTRA_DIST =
apache.config.in \
apache2.config.in \
apache22.config.in \
+ apache24.config.in \
shibd-redhat.in \
shibd-suse.in \
shibd-debian.in \
@@@ -150,6 -158,8 +158,8 @@@
keygen.bat \
keygen.sh \
metagen.sh \
+ SetService32.bat \
+ SetService64.bat \
upgrade.xsl \
xsltproc.js \
$(CONFIGFILES)
diff --combined configs/native.logger.in
index 4167b7c,52a90ae..5785d7e
--- a/configs/native.logger.in
+++ b/configs/native.logger.in
@@@ -1,13 -1,10 +1,14 @@@
# set overall behavior
-log4j.rootCategory=INFO, native_log, warn_log
+#
+# Debian: remove warn_log. All logs go to syslog, so there's no need to
+# have multiple log destinations differentiated only by log threshold.
+#log4j.rootCategory=INFO, native_log, warn_log
+log4j.rootCategory=INFO, native_log
# fairly verbose for DEBUG, so generally leave at INFO
log4j.category.XMLTooling.XMLObject=INFO
log4j.category.XMLTooling.KeyInfoResolver=INFO
+ log4j.category.Shibboleth.IPRange=INFO
log4j.category.Shibboleth.PropertySet=INFO
# raise for low-level tracing of SOAP client HTTP/SSL behavior
@@@ -30,29 -27,17 +31,29 @@@ log4j.category.XMLTooling.libcurl=INF
# define the appender
-log4j.appender.native_log=org.apache.log4j.RollingFileAppender
-log4j.appender.native_log.fileName=@-SHIRELOGDIR-@/native.log
-log4j.appender.native_log.maxFileSize=1000000
-log4j.appender.native_log.maxBackupIndex=10
-log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
-log4j.appender.native_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
+# This is the default, but it's essentially useless under normal
+# circumstances since Apache doesn't have access to write to that
+# directory.
+#log4j.appender.native_log=org.apache.log4j.RollingFileAppender
+#log4j.appender.native_log.fileName=@-SHIRELOGDIR-@/native.log
+#log4j.appender.native_log.maxFileSize=1000000
+#log4j.appender.native_log.maxBackupIndex=10
+#log4j.appender.native_log.layout=org.apache.log4j.PatternLayout
+#log4j.appender.native_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
+#log4j.appender.warn_log=org.apache.log4j.RollingFileAppender
+#log4j.appender.warn_log.fileName=@-SHIRELOGDIR-@/native_warn.log
+#log4j.appender.warn_log.maxFileSize=1000000
+#log4j.appender.warn_log.maxBackupIndex=10
+#log4j.appender.warn_log.layout=org.apache.log4j.PatternLayout
+#log4j.appender.warn_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
+#log4j.appender.warn_log.threshold=WARN
-log4j.appender.warn_log=org.apache.log4j.RollingFileAppender
-log4j.appender.warn_log.fileName=@-SHIRELOGDIR-@/native_warn.log
-log4j.appender.warn_log.maxFileSize=1000000
-log4j.appender.warn_log.maxBackupIndex=10
-log4j.appender.warn_log.layout=org.apache.log4j.PatternLayout
-log4j.appender.warn_log.layout.ConversionPattern=%d{%Y-%m-%d %H:%M:%S} %p %c %x: %m%n
-log4j.appender.warn_log.threshold=WARN
+# Use syslog instead, since then at least the messages will go somewhere.
+# That facility is LOG_DAEMON, since log4cpp apparently doesn't recognize
+# symbolic log facilities.
+#
+# This is a Debian-specific change.
+log4j.appender.native_log=org.apache.log4j.LocalSyslogAppender
+log4j.appender.native_log.syslogName=shibboleth-sp
+log4j.appender.native_log.facility=3
+log4j.appender.native_log.layout=org.apache.log4j.BasicLayout
--
Debian packaging for the 2.0 Apache Shibboleth SP
More information about the Pkg-shibboleth-devel
mailing list