make FHS happy

Changed files:
    demarc-config.patch -> 1.2
    demarc.spec -> 1.4

diff --git a/demarc-config.patch b/demarc-config.patch
index cb1d092f6621dc90b19aad5affe4383639b60e14..cdab5c2cc703653b670d9f55546e2f3ef9206a58 100644 (file)
--- a/demarc-config.patch
+++ b/demarc-config.patch
@@ -30,7 +30,7 @@ diff -urN demarc-1.05-RC1.org/bin/demarcd demarc-1.05-RC1/bin/demarcd
  if ($run_snort_locally){
        $snort_binary_path                      = &binary_search($conf{'snort_binary'},"snort");
 -      $snort_conf_file  = $opts{'c'} || &get_config_value("snort_conf_file") || "/usr/local/demarc/conf/snort.conf";
-+      $snort_conf_file  = $opts{'c'} || &get_config_value("snort_conf_file") || "/var/state/demarcd/snort.conf";
++      $snort_conf_file  = $opts{'c'} || &get_config_value("snort_conf_file") || "/var/lib/demarcd/snort.conf";
        $snort_options                  = &get_config_value("snort_options") || " -o -D -q ";#Special options for snort
  }
  
@@ -99,7 +99,7 @@ diff -urN demarc-1.05-RC1.org/conf/demarcd.conf demarc-1.05-RC1/conf/demarcd.con
 -snort_binary_path                 = "/usr/local/bin/snort"
 -snort_conf_file             = "/usr/local/demarc/conf/snort.conf"
 +snort_binary_path                 = "/usr/sbin/snort"
-+snort_conf_file             = "/var/state/demarcd/snort.conf"
++snort_conf_file             = "/var/lib/demarcd/snort.conf"
  
  # 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")

diff --git a/demarc.spec b/demarc.spec
index e3d37c38f9ffe892fc2d9f7c4d8099b5457d67de..18eae914b932151f7d01174d05688832e48ba159 100644 (file)
--- a/demarc.spec
+++ b/demarc.spec
@@ -86,7 +86,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,cron.d,demarcd,httpd}
 install -d $RPM_BUILD_ROOT%{_sbindir}
 install -d $RPM_BUILD_ROOT%{_datadir}/demarc/{images,cgi}
-install -d $RPM_BUILD_ROOT/var/state/demarcd
+install -d $RPM_BUILD_ROOT/%{_var}/lib/demarcd
 
 install %{SOURCE1}             $RPM_BUILD_ROOT/etc/httpd/%{name}.conf
 install %{SOURCE2}             $RPM_BUILD_ROOT/etc/rc.d/init.d/demarcd
@@ -156,4 +156,4 @@ fi
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/demarcd/*.conf
 %attr(750,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/demarcd/*.cmds
 %attr(640,root,root) %config /etc/cron.d/%{name}
-%attr(750,root,root) /var/state/demarcd
+%attr(750,root,root) %{_var}/lib/demarcd