jer 14/07/12 19:06:20
Modified: knocker-0.7.1-free.patch
Added: knocker-0.7.1-knocker_user_is_root.patch
knocker-0.7.1-fency.patch
Log:
fency -> fancy. Call knocker_user_is_root() properly.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
A792A613)
Revision Changes Path
1.2 net-analyzer/knocker/files/knocker-0.7.1-free.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/knocker/files/knocker-0.7.1-free.patch?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/knocker/files/knocker-0.7.1-free.patch?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/knocker/files/knocker-0.7.1-free.patch?r1=1.1&r2=1.2
Index: knocker-0.7.1-free.patch
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/net-analyzer/knocker/files/knocker-0.7.1-free.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- knocker-0.7.1-free.patch 6 Sep 2007 08:06:45 -0000 1.1
+++ knocker-0.7.1-free.patch 12 Jul 2014 19:06:20 -0000 1.2
@@ -1,6 +1,5 @@
-diff -ur knocker-0.7.1/src/knocker_conf.c knocker-0.7.1.new/src/knocker_conf.c
---- knocker-0.7.1/src/knocker_conf.c 2002-05-24 01:58:45.000000000 +0200
-+++ knocker-0.7.1.new/src/knocker_conf.c 2007-07-15 02:14:17.000000000
+0200
+--- a/src/knocker_conf.c
++++ b/src/knocker_conf.c
@@ -223,6 +223,8 @@
{
char *tmpp = malloc (strlen (line));
1.1
net-analyzer/knocker/files/knocker-0.7.1-knocker_user_is_root.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/knocker/files/knocker-0.7.1-knocker_user_is_root.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/knocker/files/knocker-0.7.1-knocker_user_is_root.patch?rev=1.1&content-type=text/plain
Index: knocker-0.7.1-knocker_user_is_root.patch
===================================================================
--- a/src/knocker_user.c
+++ b/src/knocker_user.c
@@ -82,7 +82,7 @@
_dir_create (user->dir);
}
- if (knocker_user_is_root)
+ if (knocker_user_is_root())
user->super = 1;
else
user->super = 0;
1.1 net-analyzer/knocker/files/knocker-0.7.1-fency.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/knocker/files/knocker-0.7.1-fency.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-analyzer/knocker/files/knocker-0.7.1-fency.patch?rev=1.1&content-type=text/plain
Index: knocker-0.7.1-fency.patch
===================================================================
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,7 +23,7 @@
.conf in the user ~/.knocker subdirectory.
13 May 2002
- - --no-fency (-nf for short) option added. This switch tells knocker to show
+ - --no-fancy (-nf for short) option added. This switch tells knocker to show
the output in a "polite" way. All the lines and stuffs shown in the default
mode, will not be displayed using this option.
--- a/src/knocker_args.c
+++ b/src/knocker_args.c
@@ -82,7 +82,7 @@
fprintf (stdout, "Extra options:\n");
fprintf (stdout, " %s, %s quiet mode (no console output,
logs to file)\n", QUIET_MODE_SHORT_OPT, QUIET_MODE_LONG_OPT);
fprintf (stdout, " %s, %s <logfile> log scan results to the specified
file\n", ENABLE_LOGFILE_SHORT_OPT, ENABLE_LOGFILE_LONG_OPT);
- fprintf (stdout, " %s, %s disable fency output\n",
NO_FENCY_SHORT_OPT, NO_FENCY_LONG_OPT);
+ fprintf (stdout, " %s, %s disable fancy output\n",
NO_FANCY_SHORT_OPT, NO_FANCY_LONG_OPT);
fprintf (stdout, " %s, %s disable colored output\n",
NO_COLORS_SHORT_OPT, NO_COLORS_LONG_OPT);
fprintf (stdout, "\n");
fprintf (stdout, " %s let you configure %s\n",
CONFIGURE_LONG_OPT, PACKAGE);
@@ -111,7 +111,7 @@
args->logfile = logfile;
args->quiet = quiet;
args->colors = colors;
- args->fency = TRUE; /* true by default */
+ args->fancy = TRUE; /* true by default */
return 0;
}
@@ -189,10 +189,10 @@
}
return (0); /* we should have all arguments here */
}
- else if ((!strcmp (argv[i], NO_FENCY_SHORT_OPT)) || (!strcmp (argv[i],
NO_FENCY_LONG_OPT)))
+ else if ((!strcmp (argv[i], NO_FANCY_SHORT_OPT)) || (!strcmp (argv[i],
NO_FANCY_LONG_OPT)))
{
- /* Disable fency output */
- args->fency = FALSE;
+ /* Disable fancy output */
+ args->fancy = FALSE;
}
else if ((!strcmp (argv[i], NO_COLORS_SHORT_OPT)) || (!strcmp (argv[i],
NO_COLORS_LONG_OPT)))
{
--- a/src/knocker_output.c
+++ b/src/knocker_output.c
@@ -48,7 +48,7 @@
{
time_t timenow;
- if (!knocker_args.fency)
+ if (!knocker_args.fancy)
return 0;
@@ -104,7 +104,7 @@
*/
void knocker_output_host_info (const char *hostname_str, const char
*hostip_str)
{
- if (knocker_args.fency)
+ if (knocker_args.fancy)
{
knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1,
KNOCKER_COLOR_1_ATTR);
knocker_term_color_fprintf (knocker_output_fp, "hostname to scan: ",
KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
@@ -134,7 +134,7 @@
*/
void knocker_output_resolve_error (char *hostname_str)
{
- if (knocker_args.fency)
+ if (knocker_args.fancy)
{
knocker_term_color_fprintf (knocker_output_fp, " - ", KNOCKER_COLOR_1,
KNOCKER_COLOR_1_ATTR);
knocker_term_color_fprintf (knocker_output_fp, "failed to resolve given
hostname/IP: ", KNOCKER_COLOR_1, KNOCKER_COLOR_1_ATTR);
@@ -157,7 +157,7 @@
*/
void knocker_output_ports_info (int sp, int ep)
{
- if (!knocker_args.fency)
+ if (!knocker_args.fancy)
{
knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2,
KNOCKER_COLOR_2_ATTR);
return;
@@ -183,7 +183,7 @@
*/
void knocker_output_open_port (int port, char *service_str)
{
- if (knocker_args.fency)
+ if (knocker_args.fancy)
{
knocker_term_color_fprintf (knocker_output_fp, " -=[ ", KNOCKER_COLOR_1,
KNOCKER_COLOR_1_ATTR);
knocker_term_color_intfprintf (knocker_output_fp, port, KNOCKER_COLOR_2,
KNOCKER_COLOR_2_ATTR);
@@ -216,7 +216,7 @@
*/
void knocker_output_results (char *hostname_str, char *hostname_ip, int
tot_ps, int open_ps, char *secs)
{
- if (knocker_args.fency)
+ if (knocker_args.fancy)
{
knocker_term_color_fprintf (knocker_output_fp, "\n", KNOCKER_COLOR_2,
KNOCKER_COLOR_2_ATTR);
knocker_term_color_fprintf (knocker_output_fp, "+=- - - - - - - - - - -
- - - - - - - - - - - - - - - - - ",
--- a/src/knocker_main.c
+++ b/src/knocker_main.c
@@ -75,7 +75,7 @@
knocker_core_init_portscan_data (&pscan_data);
- if (knocker_args.fency)
+ if (knocker_args.fancy)
knocker_term_clear ();
knocker_output_open ();
--- a/src/knocker_args.h
+++ b/src/knocker_args.h
@@ -53,9 +53,9 @@
#define QUIET_MODE_SHORT_OPT "-q"
#define QUIET_MODE_LONG_OPT "--quiet"
- /* option to disable fency cool out put */
-#define NO_FENCY_SHORT_OPT "-nf"
-#define NO_FENCY_LONG_OPT "--no-fency"
+ /* option to disable fancy cool out put */
+#define NO_FANCY_SHORT_OPT "-nf"
+#define NO_FANCY_LONG_OPT "--no-fancy"
/* option to disable colored out put */
#define NO_COLORS_SHORT_OPT "-nc"
@@ -88,7 +88,7 @@
int logfile; /* log to file TRUE,FALSE */
int quiet; /* quiet mode TRUE,FALSE */
int colors; /* no colors, TRUE,FALSE */
- int fency; /* fency output, TRUE, FALSE */
+ int fancy; /* fancy output, TRUE, FALSE */
int win32_frontend;
} knocker_args_t;
--- a/docs/knocker.1
+++ b/docs/knocker.1
@@ -38,8 +38,8 @@
\fB\-lf\fr, \fB\-\-logfile <logfile>\fR
log the results to a specified file.
.TP
-\fB\-nf\fr, \fB\-\-no-fency\fR
-disable fency output
+\fB\-nf\fr, \fB\-\-no-fancy\fR
+disable fancy output
.TP
\fB\-nc\fr, \fB\-\-no-colors\fR
disable colored output
