[cpp-log4shib] 01/04: Imported Upstream version 1.0.8
Scott Cantor
cantor.2 at osu.edu
Tue Oct 19 16:13:53 UTC 2021
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to annotated tag debian/1.0.8-1
in repository cpp-log4shib.
View the commit online:
http://git.shibboleth.net/view/?p=cpp-log4shib.git;a=commit;h=7a6bff033e404893ee31e13ea7a54703b651d0c2
commit 7a6bff033e404893ee31e13ea7a54703b651d0c2
Author: Russ Allbery <rra at stanford.edu>
AuthorDate: Tue Jun 25 15:58:35 2013 -0700
Imported Upstream version 1.0.8
---
Portfile | 2 +-
configure | 22 +++++++++++-----------
configure.ac | 4 ++--
include/log4shib/config-win32.h | 2 +-
log4shib.spec | 4 ++--
msvc10/log4shibDLL/log4shibDLL.rc | 8 ++++----
msvc6/log4shibDLL/log4shibDLL.rc | 10 +++++-----
msvc8/log4shibDLL/log4shibDLL.rc | 10 +++++-----
msvc9/log4shibDLL/log4shibDLL.rc | 10 +++++-----
src/PThreads.cpp | 8 +++++---
10 files changed, 41 insertions(+), 39 deletions(-)
diff --git a/Portfile b/Portfile
index 93d62c9..3f0552a 100644
--- a/Portfile
+++ b/Portfile
@@ -1,7 +1,7 @@
PortSystem 1.0
name log4shib
-version 1.0.7
+version 1.0.8
categories sysutils shibboleth devel
maintainers snc scantor
description configurable logging for C++, fork of log4cpp
diff --git a/configure b/configure
index b5a6ea9..57cf59a 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for log4shib 1.0.7.
+# Generated by GNU Autoconf 2.69 for log4shib 1.0.8.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='log4shib'
PACKAGE_TARNAME='log4shib'
-PACKAGE_VERSION='1.0.7'
-PACKAGE_STRING='log4shib 1.0.7'
+PACKAGE_VERSION='1.0.8'
+PACKAGE_STRING='log4shib 1.0.8'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1338,7 +1338,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures log4shib 1.0.7 to adapt to many kinds of systems.
+\`configure' configures log4shib 1.0.8 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1408,7 +1408,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of log4shib 1.0.7:";;
+ short | recursive ) echo "Configuration of log4shib 1.0.8:";;
esac
cat <<\_ACEOF
@@ -1520,7 +1520,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-log4shib configure 1.0.7
+log4shib configure 1.0.8
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2052,7 +2052,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by log4shib $as_me 1.0.7, which was
+It was created by log4shib $as_me 1.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2412,7 +2412,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# ? :+1 : ? == just some internal changes, nothing breaks but might work
# better
# CURRENT : REVISION : AGE
-LT_VERSION=1:7:0
+LT_VERSION=1:8:0
@@ -2898,7 +2898,7 @@ fi
# Define the identity of the package.
PACKAGE='log4shib'
- VERSION='1.0.7'
+ VERSION='1.0.8'
cat >>confdefs.h <<_ACEOF
@@ -17066,7 +17066,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by log4shib $as_me 1.0.7, which was
+This file was extended by log4shib $as_me 1.0.8, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17132,7 +17132,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-log4shib config.status 1.0.7
+log4shib config.status 1.0.8
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 36d981d..f7157da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(log4shib, 1.0.7)
+AC_INIT(log4shib, 1.0.8)
# autoconf 2.50 or higher to rebuild aclocal.m4, because the
# AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro.
@@ -11,7 +11,7 @@ AC_PREREQ(2.50)
# ? :+1 : ? == just some internal changes, nothing breaks but might work
# better
# CURRENT : REVISION : AGE
-LT_VERSION=1:7:0
+LT_VERSION=1:8:0
AC_SUBST(LT_VERSION)
diff --git a/include/log4shib/config-win32.h b/include/log4shib/config-win32.h
index 432f5d0..5fd96be 100644
--- a/include/log4shib/config-win32.h
+++ b/include/log4shib/config-win32.h
@@ -62,7 +62,7 @@ typedef u_long in_addr_t;
/* Version number of package */
#ifndef LOG4SHIB_VERSION
-#define LOG4SHIB_VERSION "1.0.6"
+#define LOG4SHIB_VERSION "1.0.8"
#endif
/* define if the compiler implements namespaces */
diff --git a/log4shib.spec b/log4shib.spec
index 526b3df..f8de44f 100644
--- a/log4shib.spec
+++ b/log4shib.spec
@@ -1,11 +1,11 @@
Name: log4shib
-Version: 1.0.7
+Version: 1.0.8
Release: 1
Summary: Log for C++, Shibboleth Edition
License: LGPL
Group: Development/Libraries
Vendor: Shibboleth Consortium
-URL: http://shibboleth.net/downloads/log4shib/1.0.7
+URL: http://shibboleth.net/downloads/log4shib/1.0.8
Source: %name-%version.tar.gz
BuildRoot: %_tmppath/%name-%version-root
BuildRequires: gcc-c++
diff --git a/msvc10/log4shibDLL/log4shibDLL.rc b/msvc10/log4shibDLL/log4shibDLL.rc
index f82be9f..d3fb3b1 100644
--- a/msvc10/log4shibDLL/log4shibDLL.rc
+++ b/msvc10/log4shibDLL/log4shibDLL.rc
@@ -10,8 +10,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,7,0
- PRODUCTVERSION 1,0,7,0
+ FILEVERSION 1,0,8,0
+ PRODUCTVERSION 1,0,8,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -30,7 +30,7 @@ BEGIN
VALUE "CompanyName", "Internet2\0"
VALUE "ContributingAuthors", "Cedric Le Goater, Marc Welz, others. See documentation for complete list\0"
VALUE "FileDescription", "Log library for C++ DLL\0"
- VALUE "FileVersion", "1.0.7\0"
+ VALUE "FileVersion", "1.0.8\0"
VALUE "InternalName", "log4shib\0"
VALUE "LegalCopyright", "Copyright � 2000-2013 the Log4cpp Project, others\0"
VALUE "LegalTrademarks", "\0"
@@ -41,7 +41,7 @@ BEGIN
#endif
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Log library for C++\0"
- VALUE "ProductVersion", "1.0.7\0"
+ VALUE "ProductVersion", "1.0.8\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/msvc6/log4shibDLL/log4shibDLL.rc b/msvc6/log4shibDLL/log4shibDLL.rc
index 5680d39..d3fb3b1 100644
--- a/msvc6/log4shibDLL/log4shibDLL.rc
+++ b/msvc6/log4shibDLL/log4shibDLL.rc
@@ -10,8 +10,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,4,0
- PRODUCTVERSION 1,0,4,0
+ FILEVERSION 1,0,8,0
+ PRODUCTVERSION 1,0,8,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -30,9 +30,9 @@ BEGIN
VALUE "CompanyName", "Internet2\0"
VALUE "ContributingAuthors", "Cedric Le Goater, Marc Welz, others. See documentation for complete list\0"
VALUE "FileDescription", "Log library for C++ DLL\0"
- VALUE "FileVersion", "1.0.4\0"
+ VALUE "FileVersion", "1.0.8\0"
VALUE "InternalName", "log4shib\0"
- VALUE "LegalCopyright", "Copyright � 2000-2002 the Log4cpp Project, others\0"
+ VALUE "LegalCopyright", "Copyright � 2000-2013 the Log4cpp Project, others\0"
VALUE "LegalTrademarks", "\0"
#ifdef _DEBUG
VALUE "OriginalFilename", "log4shib1_0D.dll\0"
@@ -41,7 +41,7 @@ BEGIN
#endif
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Log library for C++\0"
- VALUE "ProductVersion", "1.0.4\0"
+ VALUE "ProductVersion", "1.0.8\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/msvc8/log4shibDLL/log4shibDLL.rc b/msvc8/log4shibDLL/log4shibDLL.rc
index 5680d39..d3fb3b1 100644
--- a/msvc8/log4shibDLL/log4shibDLL.rc
+++ b/msvc8/log4shibDLL/log4shibDLL.rc
@@ -10,8 +10,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,4,0
- PRODUCTVERSION 1,0,4,0
+ FILEVERSION 1,0,8,0
+ PRODUCTVERSION 1,0,8,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -30,9 +30,9 @@ BEGIN
VALUE "CompanyName", "Internet2\0"
VALUE "ContributingAuthors", "Cedric Le Goater, Marc Welz, others. See documentation for complete list\0"
VALUE "FileDescription", "Log library for C++ DLL\0"
- VALUE "FileVersion", "1.0.4\0"
+ VALUE "FileVersion", "1.0.8\0"
VALUE "InternalName", "log4shib\0"
- VALUE "LegalCopyright", "Copyright � 2000-2002 the Log4cpp Project, others\0"
+ VALUE "LegalCopyright", "Copyright � 2000-2013 the Log4cpp Project, others\0"
VALUE "LegalTrademarks", "\0"
#ifdef _DEBUG
VALUE "OriginalFilename", "log4shib1_0D.dll\0"
@@ -41,7 +41,7 @@ BEGIN
#endif
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Log library for C++\0"
- VALUE "ProductVersion", "1.0.4\0"
+ VALUE "ProductVersion", "1.0.8\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/msvc9/log4shibDLL/log4shibDLL.rc b/msvc9/log4shibDLL/log4shibDLL.rc
index 5680d39..d3fb3b1 100644
--- a/msvc9/log4shibDLL/log4shibDLL.rc
+++ b/msvc9/log4shibDLL/log4shibDLL.rc
@@ -10,8 +10,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,4,0
- PRODUCTVERSION 1,0,4,0
+ FILEVERSION 1,0,8,0
+ PRODUCTVERSION 1,0,8,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -30,9 +30,9 @@ BEGIN
VALUE "CompanyName", "Internet2\0"
VALUE "ContributingAuthors", "Cedric Le Goater, Marc Welz, others. See documentation for complete list\0"
VALUE "FileDescription", "Log library for C++ DLL\0"
- VALUE "FileVersion", "1.0.4\0"
+ VALUE "FileVersion", "1.0.8\0"
VALUE "InternalName", "log4shib\0"
- VALUE "LegalCopyright", "Copyright � 2000-2002 the Log4cpp Project, others\0"
+ VALUE "LegalCopyright", "Copyright � 2000-2013 the Log4cpp Project, others\0"
VALUE "LegalTrademarks", "\0"
#ifdef _DEBUG
VALUE "OriginalFilename", "log4shib1_0D.dll\0"
@@ -41,7 +41,7 @@ BEGIN
#endif
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Log library for C++\0"
- VALUE "ProductVersion", "1.0.4\0"
+ VALUE "ProductVersion", "1.0.8\0"
VALUE "SpecialBuild", "\0"
END
END
diff --git a/src/PThreads.cpp b/src/PThreads.cpp
index 334c89d..20ab474 100644
--- a/src/PThreads.cpp
+++ b/src/PThreads.cpp
@@ -2,13 +2,15 @@
#if defined(LOG4SHIB_HAVE_THREADING) && defined(LOG4SHIB_USE_PTHREADS)
+#include <sstream>
+
namespace log4shib {
namespace threading {
std::string getThreadId() {
- char buffer[16];
- ::sprintf(buffer, "%ld", pthread_self());
- return std::string(buffer);
+ std::ostringstream os;
+ os << pthread_self();
+ return os.str();
}
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list