Author: misc
Date: Tue Dec 5 17:12:26 2006
New Revision: 91302
Added:
packages/cooker/nuface/current/SOURCES/nuface-1.0.7.tar.bz2 (contents,
props changed)
Removed:
packages/cooker/nuface/current/SOURCES/nuface-1.0.6.tar.bz2
Modified:
packages/cooker/nuface/current/SOURCES/nuface-1.0.5-mdv_config.diff
packages/cooker/nuface/current/SPECS/nuface.spec
Log:
- update to 1.0.7, rediff patch 0
Modified: packages/cooker/nuface/current/SOURCES/nuface-1.0.5-mdv_config.diff
==============================================================================
--- packages/cooker/nuface/current/SOURCES/nuface-1.0.5-mdv_config.diff
(original)
+++ packages/cooker/nuface/current/SOURCES/nuface-1.0.5-mdv_config.diff Tue Dec
5 17:12:26 2006
@@ -1,53 +1,118 @@
-diff -Naur nuface-1.0.5/acls.php nuface-1.0.5.oden/acls.php
---- nuface-1.0.5/acls.php 2006-06-09 12:02:20.000000000 +0200
-+++ nuface-1.0.5.oden/acls.php 2006-06-14 16:21:50.000000000 +0200
-@@ -23,7 +23,7 @@
-
+Index: acls.php
+===================================================================
+--- acls.php
++++ acls.php 2006-12-05 12:08:30.822287262 +0100
+@@ -24,7 +24,7 @@
$title='acls';
$singtitle='acl';
+ require("include/security.php");
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/messages.php");
$header_onclick="return ask_list_change(new
Array('sortcat'),'$gal_confirm_change_order')";
require("include/headers.php");
-diff -Naur nuface-1.0.5/applications.php nuface-1.0.5.oden/applications.php
---- nuface-1.0.5/applications.php 2006-06-07 16:45:52.000000000 +0200
-+++ nuface-1.0.5.oden/applications.php 2006-06-14 16:21:50.000000000 +0200
-@@ -23,7 +23,7 @@
-
+Index: applications.php
+===================================================================
+--- applications.php
++++ applications.php 2006-12-05 12:08:19.380575325 +0100
+@@ -24,7 +24,7 @@
$title="applications";
$singtitle="application";
+ require("include/security.php");
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/headers.php");
require("include/function.php");
require("include/types.php");
-diff -Naur nuface-1.0.5/floatings.php nuface-1.0.5.oden/floatings.php
---- nuface-1.0.5/floatings.php 2006-04-23 12:29:04.000000000 +0200
-+++ nuface-1.0.5.oden/floatings.php 2006-06-14 16:21:50.000000000 +0200
-@@ -3,7 +3,7 @@
-
+Index: floatings.php
+===================================================================
+--- floatings.php
++++ floatings.php 2006-12-05 12:10:02.576016422 +0100
+@@ -4,7 +4,7 @@
$title='floatings';
+ require("include/security.php");
-require("include/config.php");
+require("/etc/nuface/config.php");
require("include/headers.php");
require("include/function.php");
require("include/types.php");
-diff -Naur nuface-1.0.5/include/config.php nuface-1.0.5.oden/include/config.php
---- nuface-1.0.5/include/config.php 2006-06-14 15:33:10.000000000 +0200
-+++ nuface-1.0.5.oden/include/config.php 2006-06-14 16:23:49.000000000
+0200
-@@ -19,31 +19,27 @@
- # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- #
-
+Index: nat.php
+===================================================================
+--- nat.php
++++ nat.php 2006-12-05 12:09:27.790811340 +0100
+@@ -24,7 +24,7 @@
+ $title='nat';
+ $singtitle='nat';
+ require("include/security.php");
+-require("include/config.php");
++require("/etc/nuface/config.php");
+ require("include/messages.php");
+ $header_onclick = "return ask_list_change(new
Array('sortsnat','sortdnat','sortpnat'),'$gal_confirm_change_order')";
+ require("include/headers.php");
+Index: protocols.php
+===================================================================
+--- protocols.php
++++ protocols.php 2006-12-05 12:10:12.389484893 +0100
+@@ -23,7 +23,7 @@
+ $title="protocols";
+ $singtitle="protocol";
+ require("include/security.php");
+-require("include/config.php");
++require("/etc/nuface/config.php");
+ require("include/headers.php");
+ require("include/function.php");
+ require("include/types.php");
+Index: ressources.php
+===================================================================
+--- ressources.php
++++ ressources.php 2006-12-05 12:10:21.582860586 +0100
+@@ -22,7 +22,7 @@
+ $title="ressources";
+ $singtitle="ressource";
+ require("include/security.php");
+-require("include/config.php");
++require("/etc/nuface/config.php");
+ require("include/headers.php");
+ require("include/function.php");
+ require("include/types.php");
+Index: subjects.php
+===================================================================
+--- subjects.php
++++ subjects.php 2006-12-05 12:09:15.753010107 +0100
+@@ -24,7 +24,7 @@
+ $title="subjects";
+ $singtitle="subject";
+ require("include/security.php");
+-require("include/config.php");
++require("/etc/nuface/config.php");
+ require("include/headers.php");
+ require("include/function.php");
+ require("include/types.php");
+Index: include/config.php
+===================================================================
+--- include/config.php
++++ include/config.php 2006-12-05 12:14:23.207021666 +0100
+@@ -22,7 +22,7 @@
+ #if set to "true", user of the interface will be provided a way to change
language on the fly
+ $lang_override=true;
+ #[default] language of the interface
-$lang='fr';
--$policyfile="/etc/network/firewall/specs/spec.xml";
--
--
+$lang='en';
+ #if one adds languages in messages.php, also add it to this array
+ $available_langs=array('fr','en');
+
+@@ -37,7 +37,7 @@
+ }
+ }
+ }
+-$policyfile="/etc/network/firewall/specs/spec.xml";
++$policyfile="/etc/nuface/specs/spec.xml";
+
+
+ #Whether the firewall is NuFW or plain netfilter
+@@ -45,24 +45,23 @@
-
$pages_list=array("index","nat","acls","protocols","subjects","ressources","applications","floatings");
-$datadir="/var/local/nuface";
@@ -60,6 +125,7 @@
$tmpdir="/tmp";
+
-$rules_dir="/etc/network/firewall/dyn";
-$nufw_rules_dir="/etc/network/firewall/dyn/nufw";
-$std_rules_dir="/etc/network/firewall/dyn/standard";
@@ -77,86 +143,3 @@
$network_desc_file="desc.xml";
#$network_desc_file=array("desc.xml","desc2.xml");
-@@ -51,8 +47,8 @@
-
- $sudo_command="/usr/bin/sudo";
-
--$network_script_dir="/etc/network/firewall";
--$firewall_script="/etc/init.d/init-firewall";
-+$network_script_dir="/etc/nuface";
-+$firewall_script="/etc/rc.d/init.d/nupyf";
-
-
- $manage_input=true;
-diff -Naur nuface-1.0.5/include/headers.php
nuface-1.0.5.oden/include/headers.php
---- nuface-1.0.5/include/headers.php 2006-04-10 15:17:42.000000000 +0200
-+++ nuface-1.0.5.oden/include/headers.php 2006-06-14 16:21:50.000000000
+0200
-@@ -55,7 +55,7 @@
- <body>
- <div class="headers">
- <?php
--require("include/config.php");
-+require("/etc/nuface/config.php");
- require("include/messages.php");
- if ($edenwall_integration!=0)
- include('../nuconf/include/edennavbar.php');
-diff -Naur nuface-1.0.5/index.php nuface-1.0.5.oden/index.php
---- nuface-1.0.5/index.php 2006-06-07 16:53:36.000000000 +0200
-+++ nuface-1.0.5.oden/index.php 2006-06-14 16:21:50.000000000 +0200
-@@ -20,7 +20,7 @@
- #
-
- require("include/function.php");
--require("include/config.php");
-+require("/etc/nuface/config.php");
- require("include/messages.php");
-
- $title='index';
-diff -Naur nuface-1.0.5/nat.php nuface-1.0.5.oden/nat.php
---- nuface-1.0.5/nat.php 2006-06-07 16:45:52.000000000 +0200
-+++ nuface-1.0.5.oden/nat.php 2006-06-14 16:21:50.000000000 +0200
-@@ -23,7 +23,7 @@
-
- $title='nat';
- $singtitle='nat';
--require("include/config.php");
-+require("/etc/nuface/config.php");
- require("include/messages.php");
- $header_onclick = "return ask_list_change(new
Array('sortsnat','sortdnat','sortpnat'),'$gal_confirm_change_order')";
- require("include/headers.php");
-diff -Naur nuface-1.0.5/protocols.php nuface-1.0.5.oden/protocols.php
---- nuface-1.0.5/protocols.php 2006-05-15 15:42:19.000000000 +0200
-+++ nuface-1.0.5.oden/protocols.php 2006-06-14 16:21:50.000000000 +0200
-@@ -22,7 +22,7 @@
- session_start();
- $title="protocols";
- $singtitle="protocol";
--require("include/config.php");
-+require("/etc/nuface/config.php");
- require("include/headers.php");
- require("include/function.php");
- require("include/types.php");
-diff -Naur nuface-1.0.5/ressources.php nuface-1.0.5.oden/ressources.php
---- nuface-1.0.5/ressources.php 2006-06-07 16:45:52.000000000 +0200
-+++ nuface-1.0.5.oden/ressources.php 2006-06-14 16:21:50.000000000 +0200
-@@ -21,7 +21,7 @@
- session_start();
- $title="ressources";
- $singtitle="ressource";
--require("include/config.php");
-+require("/etc/nuface/config.php");
- require("include/headers.php");
- require("include/function.php");
- require("include/types.php");
-diff -Naur nuface-1.0.5/subjects.php nuface-1.0.5.oden/subjects.php
---- nuface-1.0.5/subjects.php 2006-06-12 11:10:53.000000000 +0200
-+++ nuface-1.0.5.oden/subjects.php 2006-06-14 16:21:50.000000000 +0200
-@@ -23,7 +23,7 @@
-
- $title="subjects";
- $singtitle="subject";
--require("include/config.php");
-+require("/etc/nuface/config.php");
- require("include/headers.php");
- require("include/function.php");
- require("include/types.php");
Added: packages/cooker/nuface/current/SOURCES/nuface-1.0.7.tar.bz2
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/nuface/current/SPECS/nuface.spec
==============================================================================
--- packages/cooker/nuface/current/SPECS/nuface.spec (original)
+++ packages/cooker/nuface/current/SPECS/nuface.spec Tue Dec 5 17:12:26 2006
@@ -1,6 +1,6 @@
Summary: A firewall administration web interface
Name: nuface
-Version: 1.0.6
+Version: 1.0.7
Release: %mkrel 1
License: GPL
Group: System/Servers
@@ -28,7 +28,7 @@
%prep
%setup -q
-%patch0 -p1
+%patch0 -p0
# clean up CVS stuff
for i in `find . -type d -name CVS` `find . -type f -name .cvs\*` `find .
-type f -name .#\*`; do
@@ -221,3 +221,5 @@
%{_iconsdir}/%{name}.png
%{_miconsdir}/%{name}.png
%{_liconsdir}/%{name}.png
+# TODO what about backport ?
+%py_platsitedir/*.egg-info
