Browse Source

specter: integrated important patches from upstream

stable/0.2
Christian Wiese 14 years ago
parent
commit
15dfda2819
  1. 33
      network/specter/specter-1.4-0001-postgres-plugin-initialization.patch
  2. 45
      network/specter/specter-1.4-0002-SQL-boolean.patch
  3. 1120
      network/specter/specter-1.4-0003-EXEC-plugin-zombie.patch
  4. 31
      network/specter/specter-1.4-0004-PATH_MAX.patch

33
network/specter/specter-1.4-0001-postgres-plugin-initialization.patch

@ -0,0 +1,33 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../specter/specter-1.4-0001-postgres-plugin-initialization.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Description: Fixed postgres plugin initialization
Origin: Upstream (http://bazaar.launchpad.net/~ruby/specter/trunk/diff/2)
=== modified file 'plugins/specter_PGSQL.c'
--- specter-1.4/plugins/specter_PGSQL.c 2008-01-06 17:26:23 +0000
+++ specter-1.4/plugins/specter_PGSQL.c 2008-01-07 00:13:54 +0000
@@ -73,7 +73,8 @@
+ strlen(GET_CE(ce,1)->u.string)
+ strlen(GET_CE(ce,2)->u.string)
+ strlen(GET_CE(ce,3)->u.string)
- + (GET_CE(ce,6)->u.value) ? 13 : 0;
+ + ((GET_CE(ce,6)->u.value) ? 13 : 0)
+ + strlen(GET_CE(ce,7)->u.string);
if ((initbuff = malloc(initlen)) == NULL) {
specter_log(SPECTER_FATAL, "Couldn't allocate data: %s.\n",
strerror(errno));

45
network/specter/specter-1.4-0002-SQL-boolean.patch

@ -0,0 +1,45 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../specter/specter-1.4-0002-SQL-boolean.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Description: Fixed SQL to use 'True' and 'False' for saving boolean values
Origin: Upstream (http://bazaar.launchpad.net/~ruby/specter/trunk/diff/4)
=== modified file 'plugins/sql.c'
--- specter-1.4/plugins/sql.c 2008-01-06 17:26:23 +0000
+++ specter-1.4/plugins/sql.c 2008-01-07 00:22:02 +0000
@@ -126,9 +126,9 @@
size_min += 16;
size_avg += 20; /* 18446744073709551615 */
break;
- case SPECTER_IRET_BOOL:
- size_min++;
- size_avg++;
+ case SPECTER_IRET_BOOL: /* string "True" of "False" */
+ size_min += 5;
+ size_avg += 5;
break;
case SPECTER_IRET_STRING:
size_min += 64;
@@ -265,7 +265,7 @@
break;
case SPECTER_IRET_BOOL:
buff += snprintf(buff, buff_end-buff,
- "%i,", f->iret->value.b);
+ f->iret->value.b ? "True, " : "False,");
break;
case SPECTER_IRET_STRING:
/* check if string is empty */

1120
network/specter/specter-1.4-0003-EXEC-plugin-zombie.patch

File diff suppressed because it is too large Load Diff

31
network/specter/specter-1.4-0004-PATH_MAX.patch

@ -0,0 +1,31 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../specter/specter-1.4-0004-PATH_MAX.patch
# Copyright (C) 2011 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
Description: Added limits.h include to specter.h, as we use PATH_MAX
Origin: Upstream (http://bazaar.launchpad.net/~ruby/specter/trunk/diff/12)
=== modified file 'include/specter/specter.h'
--- specter-1.4/include/specter/specter.h 2008-02-25 01:34:02 +0000
+++ specter-1.4/include/specter/specter.h 2008-06-17 09:15:14 +0000
@@ -12,6 +12,7 @@
#ifndef _SPECTER_H
#define _SPECTER_H
+#include <limits.h>
#include <sys/socket.h>
#include <net/if.h>
#include <linux/netfilter_ipv4/ipt_ULOG.h>
Loading…
Cancel
Save