[cpp-log4shib] 02/07: Merge tag 'upstream/1.0.5'
Scott Cantor
cantor.2 at osu.edu
Tue Oct 19 16:13:35 UTC 2021
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to annotated tag debian/1.0.5-1
in repository cpp-log4shib.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=3cf81aaade35c6134e6344c51deedce1d5a0270d
commit 3cf81aaade35c6134e6344c51deedce1d5a0270d
Merge: 42b16d4 026b1a5
Author: Russ Allbery <rra at stanford.edu>
AuthorDate: Wed May 22 20:00:08 2013 -0700
Merge tag 'upstream/1.0.5'
Upstream version 1.0.5
Conflicts:
Makefile.am
debian/Makefile.in
Makefile.am | 20 +-
Makefile.in | 655 +-
Portfile | 2 +-
aclocal.m4 | 14036 ++++----
bcb5/Makefile.in | 415 +-
bcb5/log4shib/Makefile.in | 205 +-
bcb5/testCategory/Makefile.in | 205 +-
bcb5/testConfig/Makefile.in | 205 +-
bcb5/testFixedContextCategory/Makefile.in | 205 +-
bcb5/testNDC/Makefile.in | 205 +-
bcb5/testPattern/Makefile.in | 205 +-
bcb5/testmain/Makefile.in | 205 +-
config/Makefile.in | 205 +-
config/config.guess | 40 +-
config/config.sub | 49 +-
config/depcomp | 397 +-
config/install-sh | 575 +-
config/ltmain.sh | 14391 +++++---
config/missing | 288 +-
configure | 33404 ++++++++-----------
configure.in | 27 +-
doc/Makefile.in | 413 +-
doc/html/Makefile.in | 205 +-
include/Makefile.in | 423 +-
include/config.h.in | 10 +
include/log4shib/Makefile.in | 472 +-
include/log4shib/config-win32.h | 2 +-
include/log4shib/threading/Makefile.in | 309 +-
log4shib.m4 | 2 +-
log4shib.spec | 56 +-
log4shib.spec.in | 78 +-
m4/AC_CREATE_PREFIX_CONFIG_H.m4 | 107 -
m4/BB_CHECK_OMNITHREADS.m4 | 78 -
m4/BB_CHECK_PTHREADS.m4 | 17 -
m4/ax_prefix_config_h.m4 | 183 +
m4/{acx_pthread.m4 => ax_pthread.m4} | 234 +-
msvc10/Makefile.am | 4 +
msvc10/Makefile.in | 600 +
msvc10/NTEventLogCategories.mc | 40 +
msvc10/log4shib/Makefile.am | 1 +
{msvc8/testMain => msvc10/log4shib}/Makefile.in | 209 +-
msvc10/log4shib/log4shib.vcxproj | 596 +
msvc10/log4shibDLL/Makefile.am | 2 +
{msvc8 => msvc10}/log4shibDLL/Makefile.in | 209 +-
msvc10/log4shibDLL/log4shibDLL.rc | 54 +
msvc10/log4shibDLL/log4shibDLL.vcxproj | 666 +
msvc10/msvc10.sln | 86 +
msvc10/testCategory/Makefile.am | 1 +
{msvc6 => msvc10}/testCategory/Makefile.in | 209 +-
msvc10/testCategory/testCategory.vcxproj | 223 +
msvc10/testMain/Makefile.am | 2 +
{msvc8 => msvc10}/testMain/Makefile.in | 209 +-
msvc10/testMain/testMain.vcxproj | 223 +
msvc10/testNDC/Makefile.am | 1 +
{bcb5/testmain => msvc10/testNDC}/Makefile.in | 209 +-
msvc10/testNDC/testNDC.vcxproj | 223 +
msvc10/testNTEventLog/Makefile.am | 2 +
{msvc6 => msvc10}/testNTEventLog/Makefile.in | 209 +-
msvc10/testNTEventLog/testNTEventLog.vcxproj | 225 +
msvc10/testPattern/Makefile.am | 2 +
.../log4shibDLL => msvc10/testPattern}/Makefile.in | 209 +-
msvc10/testPattern/testPattern.vcxproj | 225 +
msvc6/Makefile.in | 415 +-
msvc6/log4shib/Makefile.in | 205 +-
msvc6/log4shibDLL/Makefile.in | 205 +-
msvc6/testCategory/Makefile.in | 205 +-
msvc6/testDLL/Makefile.in | 205 +-
msvc6/testMain/Makefile.in | 205 +-
msvc6/testNDC/Makefile.in | 205 +-
msvc6/testNTEventLog/Makefile.in | 205 +-
msvc6/testPattern/Makefile.in | 205 +-
msvc8/Makefile.in | 415 +-
msvc8/log4shib/Makefile.in | 205 +-
msvc8/log4shibDLL/Makefile.in | 205 +-
msvc8/testCategory/Makefile.in | 205 +-
msvc8/testDLL/Makefile.in | 205 +-
msvc8/testMain/Makefile.in | 205 +-
msvc8/testNDC/Makefile.in | 205 +-
msvc8/testNTEventLog/Makefile.in | 205 +-
msvc8/testPattern/Makefile.in | 205 +-
msvc9/Makefile.in | 415 +-
msvc9/log4shib/Makefile.in | 205 +-
msvc9/log4shibDLL/Makefile.in | 205 +-
msvc9/testCategory/Makefile.in | 205 +-
msvc9/testDLL/Makefile.in | 205 +-
msvc9/testMain/Makefile.in | 205 +-
msvc9/testNDC/Makefile.in | 205 +-
msvc9/testNTEventLog/Makefile.in | 205 +-
msvc9/testPattern/Makefile.in | 205 +-
openvms/Makefile.in | 205 +-
src/Makefile.in | 422 +-
src/PatternLayout.cpp | 4 +
src/RemoteSyslogAppender.cpp | 2 +
tests/Makefile.in | 477 +-
94 files changed, 45203 insertions(+), 35239 deletions(-)
diff --cc Makefile.am
index ae9ce8d,f255db8..c8f6b5e
--- a/Makefile.am
+++ b/Makefile.am
@@@ -1,12 -1,10 +1,12 @@@
+ACLOCAL_AMFLAGS = -I m4
+
if DOC
- SUBDIRS = msvc6 msvc8 msvc9 bcb5 config src include tests doc
-SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests doc
++SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests doc
else
- SUBDIRS = msvc6 msvc8 msvc9 bcb5 config src include tests
-SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests
++SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 config src include tests
endif
- DIST_SUBDIRS = msvc6 msvc8 msvc9 bcb5 openvms config src include doc tests
-DIST_SUBDIRS = debian msvc6 msvc8 msvc9 msvc10 bcb5 openvms config src include doc tests
++DIST_SUBDIRS = msvc6 msvc8 msvc9 msvc10 bcb5 openvms config src include doc tests
bin_SCRIPTS = log4shib-config
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list