[cpp-log4shib] 05/20: Merge tag 'upstream/1.0.9' into debian/master
Scott Cantor
cantor.2 at osu.edu
Tue Oct 19 16:14:02 UTC 2021
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to annotated tag debian/1.0.9-1
in repository cpp-log4shib.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=79a91bd1805ff4b61b0fa02506f0537766c8d8df
commit 79a91bd1805ff4b61b0fa02506f0537766c8d8df
Merge: 48c1fea b515046
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Thu Jan 14 13:55:16 2016 +0100
Merge tag 'upstream/1.0.9' into debian/master
Upstream version 1.0.9
Conflicts:
Makefile.am
debian/Makefile.in
* Use upstream Makefile.am, it incorporated the ACLOCAL_AMFLAGS = -I m4
setting originally added by c28098e.
* Remove debian/Makefile.in, the upstream one is for building un-official
packages.
Makefile.am | 10 +-
Makefile.in | 279 +-
Portfile | 2 +-
aclocal.m4 | 422 +-
bcb5/Makefile.am | 3 -
bcb5/Makefile.in | 603 ---
bcb5/bcb5.bpg | 46 -
bcb5/bcb5.mak | 48 -
bcb5/log4shib/Makefile.am | 1 -
bcb5/log4shib/Makefile.in | 413 --
bcb5/log4shib/log4shib.bpf | 44 -
bcb5/log4shib/log4shib.bpr | 113 -
bcb5/log4shib/log4shib.mak | 217 -
bcb5/testCategory/Makefile.am | 1 -
bcb5/testCategory/Makefile.in | 413 --
bcb5/testCategory/testCategory.bpf | 7 -
bcb5/testCategory/testCategory.bpr | 105 -
bcb5/testCategory/testCategory.mak | 62 -
bcb5/testConfig/Makefile.am | 1 -
bcb5/testConfig/Makefile.in | 413 --
bcb5/testConfig/testConfig.bpf | 7 -
bcb5/testConfig/testConfig.bpr | 116 -
bcb5/testConfig/testConfig.mak | 62 -
bcb5/testFixedContextCategory/Makefile.am | 1 -
bcb5/testFixedContextCategory/Makefile.in | 413 --
.../testFixedContextCategory.bpf | 7 -
.../testFixedContextCategory.bpr | 105 -
.../testFixedContextCategory.mak | 61 -
bcb5/testNDC/Makefile.am | 1 -
bcb5/testNDC/Makefile.in | 413 --
bcb5/testNDC/testNDC.bpf | 7 -
bcb5/testNDC/testNDC.bpr | 105 -
bcb5/testNDC/testNDC.mak | 61 -
bcb5/testPattern/Makefile.am | 1 -
bcb5/testPattern/Makefile.in | 413 --
bcb5/testPattern/testPattern.bpf | 7 -
bcb5/testPattern/testPattern.bpr | 118 -
bcb5/testPattern/testPattern.mak | 62 -
bcb5/testmain/Makefile.am | 1 -
bcb5/testmain/Makefile.in | 413 --
bcb5/testmain/testmain.bpf | 7 -
bcb5/testmain/testmain.bpr | 105 -
bcb5/testmain/testmain.mak | 61 -
config/Makefile.in | 118 +-
config/compile | 347 ++
config/config.guess | 1086 ++--
config/config.sub | 522 +-
config/depcomp | 410 +-
config/install-sh | 366 +-
config/ltmain.sh | 5566 ++++++++++++--------
config/missing | 405 +-
config/test-driver | 148 +
configure | 3335 +++++++-----
configure.ac | 18 +-
doc/Makefile.in | 214 +-
doc/html/Makefile.in | 116 +-
include/Makefile.in | 238 +-
include/config.h.in | 3 +-
include/log4shib/Makefile.in | 237 +-
include/log4shib/threading/Makefile.in | 177 +-
log4shib.spec | 4 +-
m4/libtool.m4 | 2554 +++++----
m4/ltoptions.m4 | 127 +-
m4/ltsugar.m4 | 7 +-
m4/ltversion.m4 | 12 +-
m4/lt~obsolete.m4 | 7 +-
msvc10/Makefile.in | 217 +-
msvc10/log4shib/Makefile.in | 116 +-
msvc10/log4shibDLL/Makefile.in | 116 +-
msvc10/log4shibDLL/log4shibDLL.rc | 12 +-
msvc10/log4shibDLL/log4shibDLL.vcxproj | 2 +-
msvc10/testCategory/Makefile.in | 116 +-
msvc10/testMain/Makefile.in | 116 +-
msvc10/testNDC/Makefile.in | 116 +-
msvc10/testNTEventLog/Makefile.in | 116 +-
msvc10/testPattern/Makefile.in | 116 +-
msvc6/Makefile.in | 217 +-
msvc6/log4shib/Makefile.in | 116 +-
msvc6/log4shib/log4shib.dsp | 866 +--
msvc6/log4shibDLL/Makefile.in | 116 +-
msvc6/log4shibDLL/log4shibDLL.dsp | 888 ++--
msvc6/log4shibDLL/log4shibDLL.rc | 12 +-
msvc6/msvc6.dsw | 262 +-
msvc6/testCategory/Makefile.in | 116 +-
msvc6/testCategory/testCategory.dsp | 200 +-
msvc6/testDLL/Makefile.in | 116 +-
msvc6/testDLL/testDLL.dsp | 178 +-
msvc6/testMain/Makefile.in | 116 +-
msvc6/testMain/testMain.dsp | 178 +-
msvc6/testNDC/Makefile.in | 116 +-
msvc6/testNDC/testNDC.dsp | 200 +-
msvc6/testNTEventLog/Makefile.in | 116 +-
msvc6/testNTEventLog/testNTEventLog.dsp | 180 +-
msvc6/testPattern/Makefile.in | 116 +-
msvc6/testPattern/testPattern.dsp | 180 +-
msvc8/Makefile.in | 217 +-
msvc8/log4shib/Makefile.in | 116 +-
msvc8/log4shibDLL/Makefile.in | 116 +-
msvc8/log4shibDLL/log4shibDLL.rc | 12 +-
msvc8/testCategory/Makefile.in | 116 +-
msvc8/testDLL/Makefile.in | 116 +-
msvc8/testMain/Makefile.in | 116 +-
msvc8/testNDC/Makefile.in | 116 +-
msvc8/testNTEventLog/Makefile.in | 116 +-
msvc8/testPattern/Makefile.in | 116 +-
msvc9/Makefile.in | 217 +-
msvc9/log4shib/Makefile.in | 116 +-
msvc9/log4shibDLL/Makefile.in | 116 +-
msvc9/log4shibDLL/log4shibDLL.rc | 12 +-
msvc9/testCategory/Makefile.in | 116 +-
msvc9/testDLL/Makefile.in | 116 +-
msvc9/testMain/Makefile.in | 116 +-
msvc9/testNDC/Makefile.in | 116 +-
msvc9/testNTEventLog/Makefile.in | 116 +-
msvc9/testPattern/Makefile.in | 116 +-
openvms/Makefile.in | 116 +-
src/Makefile.in | 256 +-
src/RemoteSyslogAppender.cpp | 143 +-
tests/Makefile.in | 781 ++-
119 files changed, 15980 insertions(+), 14729 deletions(-)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list