Hello community,
here is the log from the commit of package cacti for openSUSE:Factory checked
in at 2012-09-15 11:52:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cacti (Old)
and /work/SRC/openSUSE:Factory/.cacti.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cacti", Maintainer is "crrodrig...@novell.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cacti/cacti.changes 2012-05-14
16:11:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cacti.new/cacti.changes 2012-09-15
11:52:17.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jun 4 08:57:00 UTC 2012 - aldemir.akpi...@airties.com
+
+- Added official cacti 0.8.8a patch
+
+-------------------------------------------------------------------
New:
----
cacti-0.8.8a-snmpv3-priv-proto-none.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cacti.spec ++++++
--- /var/tmp/diff_new_pack.a6pnmp/_old 2012-09-15 11:52:20.000000000 +0200
+++ /var/tmp/diff_new_pack.a6pnmp/_new 2012-09-15 11:52:20.000000000 +0200
@@ -16,6 +16,7 @@
#
+
Name: cacti
Version: 0.8.8a
Release: 0.0
@@ -35,6 +36,8 @@
Patch0: %{name}-%{version}-cacti-log-path.patch
# PATCH-FIX-OPENSUSE cacti-0.8.8-cacti-script.patch
Patch1: %{name}-%{version}-cacti-script.patch
+# 0.8.8a specific patch remove after next release
+Patch2: %{name}-%{version}-snmpv3-priv-proto-none.patch
Provides: cacti-system
%if 0%{?suse_version}
BuildRequires: apache2-devel
@@ -103,6 +106,7 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
#nothing to build
++++++ cacti-0.8.8a-snmpv3-priv-proto-none.patch ++++++
--- 0.8.8a/lib/api_device.php
+++ 0.8.8a-patched/lib/api_device.php
@@ -119,13 +119,17 @@
if ($save["snmp_version"] == 3) {
$save["snmp_username"] =
form_input_validate($snmp_username, "snmp_username", "", true, 3);
$save["snmp_password"] =
form_input_validate($snmp_password, "snmp_password", "", true, 3);
- $save["snmp_auth_protocol"] =
form_input_validate($snmp_auth_protocol, "snmp_auth_protocol", "^MD5|SHA$",
true, 3);
+ $save["snmp_auth_protocol"] =
form_input_validate($snmp_auth_protocol, "snmp_auth_protocol",
"^\[None\]|MD5|SHA$", true, 3);
$save["snmp_priv_passphrase"] =
form_input_validate($snmp_priv_passphrase, "snmp_priv_passphrase", "", true, 3);
- $save["snmp_priv_protocol"] =
form_input_validate($snmp_priv_protocol, "snmp_priv_protocol", "^DES|AES128$",
true, 3);
+ $save["snmp_priv_protocol"] =
form_input_validate($snmp_priv_protocol, "snmp_priv_protocol",
"^\[None\]|DES|AES128$", true, 3);
$save["snmp_context"] =
form_input_validate($snmp_context, "snmp_context", "", true, 3);
} else {
$save["snmp_username"] = "";
$save["snmp_password"] = "";
+ $save["snmp_auth_protocol"] = "";
+ $save["snmp_priv_passphrase"] = "";
+ $save["snmp_priv_protocol"] = "";
+ $save["snmp_context"] = "";
}
$save["snmp_port"] = form_input_validate($snmp_port,
"snmp_port", "^[0-9]+$", false, 3);
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
