- moved snort note to -client %%post

- added more path changes to config patch
- added whois-fix which fixes detection of BSD-style whois
- release 2

Changed files:
    demarc-config.patch -> 1.3
    demarc-whois-fix.patch -> 1.1
    demarc.spec -> 1.7

diff --git a/demarc-config.patch b/demarc-config.patch
index cdab5c2cc703653b670d9f55546e2f3ef9206a58..042f41b599bbdedeace592246412d87bbd978ac0 100644 (file)
--- a/demarc-config.patch
+++ b/demarc-config.patch
@@ -1,6 +1,6 @@
-diff -urN demarc-1.05-RC1.org/bin/demarcd demarc-1.05-RC1/bin/demarcd
---- demarc-1.05-RC1.org/bin/demarcd    Sat Sep  1 14:40:42 2001
-+++ demarc-1.05-RC1/bin/demarcd        Sat Sep  1 14:43:17 2001
+diff -Nur demarc-1.05-RC1.orig/bin/demarcd demarc-1.05-RC1/bin/demarcd
+--- demarc-1.05-RC1.orig/bin/demarcd   Wed Aug 29 20:05:11 2001
++++ demarc-1.05-RC1/bin/demarcd        Fri Sep 28 20:09:16 2001
 @@ -78,7 +78,7 @@
  # Get all options from the command line / conf file:
  getopts("hDi:c:Ff:SkI",\%opts) || &print_usage;
@@ -10,7 +10,7 @@ diff -urN demarc-1.05-RC1.org/bin/demarcd demarc-1.05-RC1/bin/demarcd
  %conf = &parse_config;
  
  ############
-@@ -104,12 +104,12 @@
+@@ -104,19 +104,19 @@
  
  ##########
  # Path/filename of logfile
@@ -25,6 +25,23 @@ diff -urN demarc-1.05-RC1.org/bin/demarcd demarc-1.05-RC1/bin/demarcd
  ##########
  
  my $temp_binary_directories           = &get_config_value("binary_dirs");
+ @binary_dirs                                          = split(/,/,$temp_binary_directories);
+ 
+ if (!(@binary_dirs)){
+-      @binary_dirs = qw ( /sbin /usr/sbin/ /usr/local/sbin
++      @binary_dirs = qw ( /sbin /usr/sbin /usr/local/sbin
+                           /bin  /usr/bin  /usr/local/bin
+                           /usr/libexec /usr/local/libexec
+         );
+@@ -127,7 +127,7 @@
+ my $w_binary                                  = &binary_search($conf{'w_binary'},"w");
+ my $su_binary                                 = &binary_search($conf{'su_binary'},"su");
+ my $ping_binary                                       = &binary_search($conf{'ping_binary'},"ping");
+-my $mailprog                                  = &binary_search($conf{'mailprog'},"sendmail");
++my $mailprog                                  = &binary_search($conf{'mailprog'},"/usr/lib/sendmail");
+ my $ps_binary                                 = &binary_search($conf{'ps_binary'},"ps");
+ my $df_binary                                 = &binary_search($conf{'df_binary'},"df");
+ my $lynx_binary                                       = &binary_search($conf{'lynx_binary'},"lynx",1);
 @@ -152,7 +152,7 @@
  
  if ($run_snort_locally){
@@ -34,9 +51,9 @@ diff -urN demarc-1.05-RC1.org/bin/demarcd demarc-1.05-RC1/bin/demarcd
        $snort_options                  = &get_config_value("snort_options") || " -o -D -q ";#Special options for snort
  }
  
-diff -urN demarc-1.05-RC1.org/cgi/DEMARC_config.pm demarc-1.05-RC1/cgi/DEMARC_config.pm
---- demarc-1.05-RC1.org/cgi/DEMARC_config.pm   Sat Sep  1 14:40:42 2001
-+++ demarc-1.05-RC1/cgi/DEMARC_config.pm       Sat Sep  1 14:44:04 2001
+diff -Nur demarc-1.05-RC1.orig/cgi/DEMARC_config.pm demarc-1.05-RC1/cgi/DEMARC_config.pm
+--- demarc-1.05-RC1.orig/cgi/DEMARC_config.pm  Wed Aug 29 15:59:49 2001
++++ demarc-1.05-RC1/cgi/DEMARC_config.pm       Fri Sep 28 20:05:56 2001
 @@ -23,7 +23,7 @@
  
  $conf{'whois_command'}                   = "/usr/bin/whois";
@@ -46,9 +63,9 @@ diff -urN demarc-1.05-RC1.org/cgi/DEMARC_config.pm demarc-1.05-RC1/cgi/DEMARC_co
  $conf{'ping_command'}                    = "/usr/sbin/ping";
  
  $conf{'allow_anonymous_access'}          = 0;
-diff -urN demarc-1.05-RC1.org/cgi/demarc demarc-1.05-RC1/cgi/demarc
---- demarc-1.05-RC1.org/cgi/demarc     Sat Sep  1 14:40:42 2001
-+++ demarc-1.05-RC1/cgi/demarc Sat Sep  1 14:44:52 2001
+diff -Nur demarc-1.05-RC1.orig/cgi/demarc demarc-1.05-RC1/cgi/demarc
+--- demarc-1.05-RC1.orig/cgi/demarc    Wed Aug 29 20:05:11 2001
++++ demarc-1.05-RC1/cgi/demarc Fri Sep 28 20:05:57 2001
 @@ -62,7 +62,7 @@
  BEGIN{
        # CHANGE this to reflect where you have your StaticServices.pm module
@@ -67,9 +84,9 @@ diff -urN demarc-1.05-RC1.org/cgi/demarc demarc-1.05-RC1/cgi/demarc
  my $template_subdir  = "/templates";
  my $home_url         = "$v_base_path/$this_program";
  ##############################################
-diff -urN demarc-1.05-RC1.org/conf/demarcd.conf demarc-1.05-RC1/conf/demarcd.conf
---- demarc-1.05-RC1.org/conf/demarcd.conf      Sat Sep  1 14:40:42 2001
-+++ demarc-1.05-RC1/conf/demarcd.conf  Sat Sep  1 14:46:41 2001
+diff -Nur demarc-1.05-RC1.orig/conf/demarcd.conf demarc-1.05-RC1/conf/demarcd.conf
+--- demarc-1.05-RC1.orig/conf/demarcd.conf     Wed Aug 29 16:04:18 2001
++++ demarc-1.05-RC1/conf/demarcd.conf  Fri Sep 28 20:09:00 2001
 @@ -49,16 +49,16 @@
  #
  
@@ -103,3 +120,34 @@ diff -urN demarc-1.05-RC1.org/conf/demarcd.conf demarc-1.05-RC1/conf/demarcd.con
  
  # If you have multiple interfaces and want to have snort monitor ONLY one of them,
  # name the interface you wish to monitor below (ie "eth0")
+@@ -84,7 +84,7 @@
+ 
+ 
+ # Directories in which to search for needed binaries
+-binary_dirs = "/sbin,/usr/sbin/,/usr/local/sbin,/bin,/usr/bin,/usr/local/bin,/usr/libexec,/usr/locl/libexec"
++binary_dirs = "/sbin,/usr/sbin,/usr/local/sbin,/bin,/usr/bin,/usr/local/bin,/usr/libexec,/usr/locl/libexec"
+ 
+ ## Paths to general system binaries
+ #
+@@ -93,14 +93,14 @@
+ #listed above in the "binary_dirs" variable
+ 
+ #grep_binary  = "/bin/grep"
+-#w_binary             = "/usr/bin/w"
+-#su_binary            = "/usr/bin/su"
++#w_binary     = "/usr/bin/w"
++#su_binary    = "/bin/su"
+ #ping_binary  = "/sbin/ping"
+-#mailprog             = "/usr/sbin/sendmail"
+-#ps_binary            = "/bin/ps"
+-#df_binary            = "/bin/df"
+-#lynx_binary    = "/usr/local/bin/lynx -width=1000000000000000"
+-#tar_binary     = "/usr/bin/tar"
++#mailprog     = "/usr/lib/sendmail"
++#ps_binary    = "/bin/ps"
++#df_binary    = "/bin/df"
++#lynx_binary    = "/usr/bin/lynx -width=1000000000000000"
++#tar_binary     = "/bin/tar"
+ 
+ ##########
+ 

diff --git a/demarc-whois-fix.patch b/demarc-whois-fix.patch
new file mode 100644 (file)
index 0000000..ea509f1
--- /dev/null
+++ b/demarc-whois-fix.patch
@@ -0,0 +1,15 @@
+diff -Nur demarc-1.05-RC1.orig/cgi/demarc demarc-1.05-RC1/cgi/demarc
+--- demarc-1.05-RC1.orig/cgi/demarc    Fri Sep 28 20:05:57 2001
++++ demarc-1.05-RC1/cgi/demarc Fri Sep 28 20:14:11 2001
+@@ -2789,9 +2789,9 @@
+ 
+ ##########
+ # Check to see which syntax the whois command should take:
+-my $temp_result = `whois 2>&1`;
++my $temp_result = `$whois_command 2>&1`;
+ 
+-if ($temp_result=~/-h host/){
++if ($temp_result=~/-h host/i){
+       #then this is a BSD type whois
+       $result .= `$whois_command -h $server $host`;
+ }

diff --git a/demarc.spec b/demarc.spec
index 79eafecc9f06b7b345c6022723e8235495b078a8..5f9a0e7795b2b8bab78adb968ffded1cc1fbb190 100644 (file)
--- a/demarc.spec
+++ b/demarc.spec
@@ -5,18 +5,19 @@ Summary:      Network monitoring program
 Summary(pl):   Program do monitorowania sieci
 Name:          demarc
 Version:       %{ver}.%{subver}
-Release:       1
-License:       http://www.demarc.org/license/
+Release:       2
+License:       http://www.demarc.org/license/ (Free for non-commercial use)
 Group:         Networking
 Group(de):     Netzwerkwesen
 Group(es):     Red
 Group(pl):     Sieciowe
 Group(pt_BR):  Rede
-Source0:       http://www.demarc.org/downloads/demarc-105/demarc-%{ver}-%{subver}.tar.gz
+Source0:       http://www.demarc.org/downloads/demarc-105/%{name}-%{ver}-%{subver}.tar.gz
 Source1:       %{name}-apache.conf
 Source2:       %{name}.init
 Source3:       %{name}.cron
 Patch0:                %{name}-config.patch
+Patch1:                %{name}-whois-fix.patch
 URL:           http://www.demarc.org/
 BuildRequires: rpm-perlprov >= 4.0
 BuildRequires: perl >= 5.6
@@ -59,28 +60,34 @@ tylko mo
 mo¿esz reagowaæ na zmiany z jednej centralnej lokalizacji.
 
 %package client
-Summary:        Network monitoring program - client
-Summary(pl):    Program do monitorowania sieci - klient
+Summary:       Network monitoring program - client
+Summary(pl):   Program do monitorowania sieci - klient
 Requires:      snort(mysql) >= 1.8.1
-Group:          Networking
+Group:         Networking
+Group(de):     Netzwerkwesen
+Group(es):     Red
+Group(pl):     Sieciowe
+Group(pt_BR):  Rede
 
 %description client
 DEMARC is an all-inclusive network monitoring program that allows you
 to monitor an entire network of servers from one powerful web
 interface.
 
-This is client program which should be installed on all monitored servers.
+This is client program which should be installed on all monitored
+servers.
 
 %description -l pl client
 DEMARC to kompletny system monitorowania sieci pozwalaj±cy monitorowaæ
 ca³± sieæ serwerów z jednego interfejsu www.
 
-To jest program kliencki, który powinien byæ zainstalowany na wszystkich
-monitorowanych serwerach.
+To jest program kliencki, który powinien byæ zainstalowany na
+wszystkich monitorowanych serwerach.
 
 %prep
 %setup -q -n %{name}-%{ver}-%{subver}
 %patch0 -p1
+%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -103,9 +110,7 @@ gzip -9nf install/{CHAN*,INS*,LIC*}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-echo 'Remember to add "Include demarc.conf" to httpd.conf and note that'
-echo 'in most cases there is no need to start "snort" as separate'
-echo 'daemon, so turn it off using "/sbin/chkconfig snort off".'
+echo 'Remember to add "Include demarc.conf" to httpd.conf.'
 
 %post client
 if [ "$1" = "1" ] ; then
@@ -117,6 +122,8 @@ if [ -f /var/lock/subsys/demarcd ]; then
 else
        echo "Run \"%{_sbindir}/demarcd -I\" to install new snort sensor and then"
         echo "run \"/etc/rc.d/init.d/demarcd start\" to start demarcd daemon."
+       echo "Note that in most cases there is no need to start \"snort\" as"
+       echo "separate daemon, so turn it off using \"/sbin/chkconfig snort off\"."
 fi