packages: ccze/ccze.spec, ccze/ccze-Wmulticharacter.patch (NEW), ccze/ccze-...

blues blues at pld-linux.org
Thu Jun 9 17:55:27 CEST 2011 

Author: blues                        Date: Thu Jun  9 15:55:27 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel. 2 - some patches to make it build (some from gentoo)

---- Files affected:
packages/ccze:
   ccze.spec (1.7 -> 1.8) , ccze-Wmulticharacter.patch (NONE -> 1.1)  (NEW), ccze-error.patch (NONE -> 1.1)  (NEW), ccze-fbsd.patch (NONE -> 1.1)  (NEW), ccze-ldflags.patch (NONE -> 1.1)  (NEW), ccze-segfault.patch (NONE -> 1.1)  (NEW), ccze-tinfo.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/ccze/ccze.spec
diff -u packages/ccze/ccze.spec:1.7 packages/ccze/ccze.spec:1.8
--- packages/ccze/ccze.spec:1.7	Mon Feb 12 22:23:50 2007
+++ packages/ccze/ccze.spec	Thu Jun  9 17:55:22 2011
@@ -1,14 +1,22 @@
 # $Revision$, $Date$
+# TODO:
+# - fix outdated url
 Summary:	A robust log colorizer
 Summary(pl.UTF-8):	Program w C do kolorowania logów
 Name:		ccze
 Version:	0.2.1
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL
 Group:		Applications/Text
 Source0:	ftp://bonehunter.rulez.org/pub/ccze/stable/%{name}-%{version}.tar.gz
 # Source0-md5:	221966bce7c5f011eca38157241a0432
+Patch0:		%{name}-ldflags.patch
+Patch1:		%{name}-segfault.patch
+Patch2:		%{name}-fbsd.patch
+Patch3:		%{name}-Wmulticharacter.patch
+Patch4:		%{name}-error.patch
+Patch5:		%{name}-tinfo.patch
 URL:		http://bonehunter.rulez.org/CCZE.html
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -16,6 +24,8 @@
 BuildRequires:	pcre-devel >= 3.1
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+#define		filterout_ld	-Wl,--as-needed
+
 %description
 CCZE is a roboust and modular log colorizer, with plugins for apm,
 exim, fetchmail, httpd, postfix, procmail, squid, syslog, ulogd,
@@ -43,6 +53,12 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p0
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 %{__aclocal}
@@ -86,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2011/06/09 15:55:22  blues
+- rel. 2 - some patches to make it build (some from gentoo)
+
 Revision 1.7  2007/02/12 21:23:50  glen
 - tabs in preamble
 

================================================================
Index: packages/ccze/ccze-Wmulticharacter.patch
diff -u /dev/null packages/ccze/ccze-Wmulticharacter.patch:1.1
--- /dev/null	Thu Jun  9 17:55:27 2011
+++ packages/ccze/ccze-Wmulticharacter.patch	Thu Jun  9 17:55:22 2011
@@ -0,0 +1,11 @@
+--- ./src/Makefile.in.org	2011-06-09 17:32:46.600140054 +0200
++++ ./src/Makefile.in	2011-06-09 17:35:36.351287312 +0200
+@@ -22,7 +22,7 @@ WFLAGS_GCC	= -Wshadow -Wpointer-arith -W
+ 		-Wbad-function-cast -Wsign-compare -Wchar-subscripts \
+ 		-Wcomment -Wformat -Wformat-nonliteral -Wformat-security \
+ 		-Wimplicit -Wmain -Wmissing-braces -Wparentheses \
+-		-Wreturn-type -Wswitch -Wmulticharacter \
++		-Wreturn-type -Wswitch \
+ 		-Wmissing-noreturn -Wmissing-declarations @WFLAGS_3X@
+ WFLAGS_ICC	= -Wall -wd193,279,810,869,1418,1419
+ WFLAGS_3X	= -Wsequence-point -Wdiv-by-zero -W -Wunused \

================================================================
Index: packages/ccze/ccze-error.patch
diff -u /dev/null packages/ccze/ccze-error.patch:1.1
--- /dev/null	Thu Jun  9 17:55:27 2011
+++ packages/ccze/ccze-error.patch	Thu Jun  9 17:55:22 2011
@@ -0,0 +1,10 @@
+--- ./configure.ac.org	2003-05-13 20:09:30.000000000 +0200
++++ ./configure.ac	2011-06-09 17:47:07.763111535 +0200
+@@ -84,7 +84,6 @@ AC_C_VOLATILE
+ AC_TYPE_SIZE_T
+ AC_TYPE_SIGNAL
+ 
+-AC_CHECK_TYPE(error_t, int)
+ 
+ dnl **********************
+ dnl * Library functions

================================================================
Index: packages/ccze/ccze-fbsd.patch
diff -u /dev/null packages/ccze/ccze-fbsd.patch:1.1
--- /dev/null	Thu Jun  9 17:55:27 2011
+++ packages/ccze/ccze-fbsd.patch	Thu Jun  9 17:55:22 2011
@@ -0,0 +1,25 @@
+--- src/ccze-compat.h.old	2006-10-13 12:50:16 +0200
++++ src/ccze-compat.h	2006-10-13 12:49:21 +0200
+@@ -29,6 +29,11 @@
+ #include <stddef.h>
+ #include <stdio.h>
+ 
++# ifndef __error_t_defined
++typedef int error_t;
++#  define __error_t_defined     1
++# endif
++
+ #ifndef HAVE_STRNDUP
+ char *strndup (const char *s, size_t size);
+ #endif
+--- src/ccze-compat.c.old	2006-10-13 12:51:35 +0200
++++ src/ccze-compat.c	2006-10-13 12:51:44 +0200
+@@ -275,7 +275,7 @@
+ 		char **valuep)
+ {
+   int i = getsubopt (optionp, tokens, valuep);
+-#if HAVE_SUBOPTARg
++#if HAVE_SUBOPTARG
+   if (!*valuep && suboptarg)
+     *valuep = strdup (suboptarg);
+ #endif

================================================================
Index: packages/ccze/ccze-ldflags.patch
diff -u /dev/null packages/ccze/ccze-ldflags.patch:1.1
--- /dev/null	Thu Jun  9 17:55:27 2011
+++ packages/ccze/ccze-ldflags.patch	Thu Jun  9 17:55:22 2011
@@ -0,0 +1,11 @@
+--- ccze-0.2.1/src/Makefile.in.org	2010-01-22 17:06:57.000000000 +0100
++++ ccze-0.2.1/src/Makefile.in	2010-01-22 18:00:28.000000000 +0100
+@@ -75,7 +75,7 @@
+ ${PROGRAM}: ${OBJECTS} ${PLUGIN_SOBJS}
+ 	${CC} -rdynamic ${ALL_CFLAGS} -o $@ $^ ${ALL_LDFLAGS}
+ ccze-dump ccze-cssdump: %: %.o ccze-compat.o ccze-color.c
+-	${CC} ${ALL_CFLAGS} -o $@ $@.o ccze-compat.o
++	${CC} ${ALL_CFLAGS} ${ALL_LDFLAGS} -o $@ $@.o ccze-compat.o
+ ccze-builtins.c: Makefile
+ 	echo '#include <ccze.h>' >$@
+ 	echo '#include "ccze-private.h"' >>$@

================================================================
Index: packages/ccze/ccze-segfault.patch
diff -u /dev/null packages/ccze/ccze-segfault.patch:1.1
--- /dev/null	Thu Jun  9 17:55:27 2011
+++ packages/ccze/ccze-segfault.patch	Thu Jun  9 17:55:22 2011
@@ -0,0 +1,30 @@
+diff -ruN ccze-0.2.1.orig/src/ccze.c ccze-0.2.1/src/ccze.c
+--- ccze-0.2.1.orig/src/ccze.c	2003-05-13 20:09:30.000000000 +0200
++++ ccze-0.2.1/src/ccze.c	2006-12-12 20:36:09.000000000 +0100
+@@ -209,7 +209,7 @@
+ 	}
+       break;
+     case 'a':
+-      plugin = strtok (optarg, "=");
++      plugin = strtok (arg, "=");
+       value = strtok (NULL, "\n");
+       ccze_plugin_argv_set (plugin, value);
+       break;
+@@ -249,7 +249,7 @@
+       ccze_config.remfac = 1;
+       break;
+     case 'm':
+-      subopts = optarg;
++      subopts = arg;
+       while (*subopts != '\0')
+ 	{
+ 	  switch (getsubopt (&subopts, m_subopts, &value))
+@@ -273,7 +273,7 @@
+ 	}
+       break;
+     case 'o':
+-      subopts = optarg;
++      subopts = arg;
+       while (*subopts != '\0')
+ 	{
+ 	  switch (getsubopt (&subopts, o_subopts, &value))

================================================================
Index: packages/ccze/ccze-tinfo.patch
diff -u /dev/null packages/ccze/ccze-tinfo.patch:1.1
--- /dev/null	Thu Jun  9 17:55:27 2011
+++ packages/ccze/ccze-tinfo.patch	Thu Jun  9 17:55:22 2011
@@ -0,0 +1,10 @@
+--- ./configure.ac.org	2011-06-09 17:48:59.884939619 +0200
++++ ./configure.ac	2011-06-09 17:51:52.126202394 +0200
+@@ -100,6 +100,7 @@ AC_CHECK_FUNCS([alphasort argp_parse asp
+ 		strndup strstr])
+ 
+ AC_CHECK_LIB(ncurses, initscr, [], [AC_ERROR(NCurses library not found)])
++AC_CHECK_LIB(tinfo, stdscr, [], [AC_ERROR(TInfo library not found)])
+ AC_CHECK_FUNC(dlopen, [], [AC_CHECK_LIB(dl, dlopen)])
+ AC_CHECK_FUNC(getopt_long, [], [AC_CHECK_LIB(gnugetopt, getopt_long)])
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ccze/ccze.spec?r1=1.7&r2=1.8&f=u

More information about the pld-cvs-commit mailing list