Bump and add socket patch

Package-Manager: portage-2.2.0_alpha188
RepoMan-Options: --force
This commit is contained in:
Mario Fetka
2013-11-22 17:01:27 +01:00
parent 98adf64843
commit 5e17ec7e58
6 changed files with 90 additions and 94 deletions

View File

@@ -1,13 +0,0 @@
Index: log4c-1.2.1/log4c.m4
===================================================================
--- log4c-1.2.1.orig/log4c.m4
+++ log4c-1.2.1/log4c.m4
@@ -4,7 +4,7 @@
dnl AM_PATH_LOG4C([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for LOG4C, and define LOG4C_CFLAGS and LOG4C_LIBS
dnl
-AC_DEFUN(AM_PATH_LOG4C,
+AC_DEFUN([AM_PATH_LOG4C],
[dnl
dnl Get the cflags and libraries from the log4c-config script
dnl

View File

@@ -25,34 +25,6 @@ index a4b49dd..0e2993a 100644
#####################################
# Enable test compilation if required
diff --git a/src/log4c/Makefile.am b/src/log4c/Makefile.am
index f9f5882..c14dac9 100644
--- a/src/log4c/Makefile.am
+++ b/src/log4c/Makefile.am
@@ -22,10 +22,14 @@ liblog4c_la_SOURCES = \
category.c
if WITH_ROLLINGFILE
- liblog4c_la_SOURCES += appender_type_rollingfile.c \
+liblog4c_la_SOURCES += appender_type_rollingfile.c \
rollingpolicy.c rollingpolicy_type_sizewin.c
endif
+if WITH_SOCKET
+liblog4c_la_SOURCES += appender_type_socket.c
+endif
+
if WITH_MMAP
liblog4c_la_SOURCES += appender_type_mmap.c
endif
@@ -48,6 +52,7 @@ pkginclude_HEADERS = \
layout_type_basic_r.h \
layout_type_dated_r.h \
layout.h \
+ appender_type_socket.h \
appender_type_stream.h \
appender_type_stream2.h \
appender_type_syslog.h \
diff --git a/src/log4c/appender_type_socket.c b/src/log4c/appender_type_socket.c
new file mode 100644
index 0000000..9ce215e
@@ -1167,3 +1139,26 @@ index 0000000..db9afe4
+
+ return(0);
+}
diff --git a/src/log4c/Makefile.am b/src/log4c/Makefile.am
index f9f5882..c14dac9 100644
--- a/src/log4c/Makefile.am
+++ b/src/log4c/Makefile.am
@@ -33,6 +33,10 @@
rollingpolicy.c rollingpolicy_type_sizewin.c
endif
+if WITH_SOCKET
+liblog4c_la_SOURCES += appender_type_socket.c
+endif
+
if WITH_MMAP
liblog4c_la_SOURCES += appender_type_mmap.c
endif
@@ -58,6 +62,7 @@
layout_type_dated_r.h \
layout_type_dated_local_r.h \
layout.h \
+ appender_type_socket.h \
appender_type_stream.h \
appender_type_stream2.h \
appender_type_syslog.h \