[ipplan/el6/master] + Upgrade to latest upstream + Fix bugzilla #663897
topdog
topdog at fedoraproject.org
Sat Feb 12 10:57:29 UTC 2011
commit 179b6e71860ef65298e27043c1d4efbf2c5adf59
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date: Sat Feb 12 12:52:35 2011 +0200
+ Upgrade to latest upstream
+ Fix bugzilla #663897
.gitignore | 1 +
ipplan-set-menus-path.patch | 50 +++++-------
ipplan-set-phpmailer-path.patch | 29 -------
ipplan-use-qmagic.patch | 159 +++++++++++++++++++++------------------
ipplan.spec | 9 ++-
sources | 2 +-
6 files changed, 116 insertions(+), 134 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a4253d..3fbcb44 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
ipplan-4.92.tar.gz
+/ipplan-4.92a.tar.gz
diff --git a/ipplan-set-menus-path.patch b/ipplan-set-menus-path.patch
index 0bad690..515035a 100644
--- a/ipplan-set-menus-path.patch
+++ b/ipplan-set-menus-path.patch
@@ -1,6 +1,6 @@
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
---- ipplan.orig/admin/usermanager.php 2009-03-18 22:44:03.000000000 +0200
-+++ ipplan/admin/usermanager.php 2009-07-23 18:39:21.905261618 +0200
+--- ipplan.orig/admin/usermanager.php 2009-08-17 23:44:07.000000000 +0200
++++ ipplan/admin/usermanager.php 2011-02-12 11:45:21.116372017 +0200
@@ -22,9 +22,9 @@
require_once("../adodb/adodb.inc.php");
require_once("../class.dbflib.php");
@@ -23,7 +23,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
$w=myheading($p,my_("User Manager"));
insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu.css")));
insert($w, generic("link",array("rel"=>"stylesheet","href"=>"$myWwwPath"."layerstreemenu-hidden.css")));
-@@ -190,12 +190,12 @@
+@@ -191,12 +191,12 @@
insert($view, block("<i>".my_("Click on a group or user")."</i>"));
$mid = new TreeMenu();
@@ -43,9 +43,9 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
$mid->setIconsize(16, 16);
$mid->parseStructureForMenu('treemenu1');
diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
---- ipplan.orig/ipplanlib.php 2009-03-18 22:43:54.000000000 +0200
-+++ ipplan/ipplanlib.php 2009-07-23 18:49:26.576261171 +0200
-@@ -540,8 +540,9 @@
+--- ipplan.orig/ipplanlib.php 2009-08-17 23:43:43.000000000 +0200
++++ ipplan/ipplanlib.php 2011-02-12 11:56:12.394372210 +0200
+@@ -547,11 +547,12 @@
$BASE_URL = base_url();
$BASE_DIR = base_dir();
@@ -56,8 +56,12 @@ diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
+ $myWwwPath = $myMenPath . '/menus/';
// these files should probably not be here
- require_once $myDirPath . 'lib/PHPLIB.php';
-@@ -583,13 +584,13 @@
+- require_once $myDirPath . 'lib/PHPLIB.php';
++ require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
+ require_once $myDirPath . 'lib/layersmenu-common.inc.php';
+ require_once $myDirPath . 'lib/layersmenu.inc.php';
+ require_once $BASE_DIR . '/menudefs.php';
+@@ -590,13 +591,13 @@
insert($w, script("",array("language"=>"JavaScript","type"=>"text/javascript","src"=> $myWwwPath . 'libjs/layersmenu.js')));
$mid= new LayersMenu(6, 7, 2, 1);
@@ -68,19 +72,19 @@ diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
- $mid->setIcondir ($BASE_DIR.'/menus/menuicons/');
- $mid->setIconwww ($BASE_URL.'/menus/menuicons/');
- $mid->setTpldir ($BASE_DIR.'/menus/templates/');
-+ $mid->setDirroot ('/usr/share/php/php-layers-menu/');
-+ $mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
-+ $mid->setImgdir ('/usr/share/php/php-layers-menu/menuimages/');
-+ $mid->setImgwww ('../../menus/menuimages/');
-+ $mid->setIcondir ('/usr/share/php/php-layers-menu/menuicons/');
-+ $mid->setIconwww ('../../menus/menuicons/');
-+ $mid->setTpldir ('/usr/share/php/php-layers-menu/templates/');
++ $mid->setDirroot ('/usr/share/php/php-layers-menu/');
++ $mid->setLibjsdir('/usr/share/php/php-layers-menu/libjs/');
++ $mid->setImgdir ('/usr/share/php/php-layers-menu/menuimages/');
++ $mid->setImgwww ('../../menus/menuimages/');
++ $mid->setIcondir ('/usr/share/php/php-layers-menu/menuicons/');
++ $mid->setIconwww ('../../menus/menuicons/');
++ $mid->setTpldir ('/usr/share/php/php-layers-menu/templates/');
$mid->SetMenuStructureString($ADMIN_MENU);
$mid->setIconsize(16, 16);
$mid->parseStructureForMenu('hormenu1');
diff -ruN ipplan.orig/user/treeview.php ipplan/user/treeview.php
---- ipplan.orig/user/treeview.php 2009-03-18 22:43:59.000000000 +0200
-+++ ipplan/user/treeview.php 2009-07-23 18:52:03.193261518 +0200
+--- ipplan.orig/user/treeview.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/treeview.php 2011-02-12 11:54:47.486374985 +0200
@@ -24,9 +24,9 @@
require_once("../class.dbflib.php");
require_once("../layout/class.layout");
@@ -122,15 +126,3 @@ diff -ruN ipplan.orig/user/treeview.php ipplan/user/treeview.php
if(!$menustring) myError($w,$p, my_("No customers"));
$mid->setMenuStructureString($menustring);
$mid->setIconsize(16, 16);
-diff -ruN ipplan.orig/ipplanlib.php ipplan/ipplanlib.php
---- ipplan.orig/ipplanlib.php 2009-07-27 18:18:17.073261816 +0200
-+++ ipplan/ipplanlib.php 2009-07-27 18:19:44.414278370 +0200
-@@ -545,7 +545,7 @@
- $myWwwPath = $myMenPath . '/menus/';
-
- // these files should probably not be here
-- require_once $myDirPath . 'lib/PHPLIB.php';
-+ require_once '/usr/share/pear/HTML/Template/PHPLIB.php';
- require_once $myDirPath . 'lib/layersmenu-common.inc.php';
- require_once $myDirPath . 'lib/layersmenu.inc.php';
- require_once $BASE_DIR . '/menudefs.php';
diff --git a/ipplan-set-phpmailer-path.patch b/ipplan-set-phpmailer-path.patch
index 55d39a1..67d9e21 100644
--- a/ipplan-set-phpmailer-path.patch
+++ b/ipplan-set-phpmailer-path.patch
@@ -27,35 +27,6 @@ diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
$mail->Host = EMAILSERVER; // SMTP server
$mail->From = HELPDESKEMAIL;
$mail->IsHTML(false);
-diff -ruN ipplan.orig/user/displaysubnet.php.orig ipplan/user/displaysubnet.php.orig
---- ipplan.orig/user/displaysubnet.php.orig 2009-08-23 11:16:42.634555924 +0200
-+++ ipplan/user/displaysubnet.php.orig 2009-08-23 11:26:26.055552579 +0200
-@@ -261,10 +261,10 @@
- }
-
- if ($sendwarningmail) {
-- require_once("../class.phpmailer.php");
-+ require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
- $mail = new PHPMailer();
- $mail->IsSMTP(); // telling the class to use SMTP
-- $mail->SetLanguage("en", "../");
-+ $mail->SetLanguage("en");
- $mail->Host = EMAILSERVER; // SMTP server
- $mail->From = HELPDESKEMAIL;
- $mail->IsHTML(false);
-@@ -347,10 +347,10 @@
- else {
-
- //Send email notification that IP Request was entered
-- require_once("../class.phpmailer.php");
-+ require_once("/usr/share/php/PHPMailer/class.phpmailer.php");
- $mail = new PHPMailer();
- $mail->IsSMTP(); // telling the class to use SMTP
-- $mail->SetLanguage("en", "../");
-+ $mail->SetLanguage("en");
- $mail->Host = EMAILSERVER; // SMTP server
- $mail->From = HELPDESKEMAIL;
- $mail->IsHTML(false);
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
--- ipplan.orig/user/requestip.php 2009-08-23 11:17:07.345554665 +0200
+++ ipplan/user/requestip.php 2009-08-23 11:27:11.342553873 +0200
diff --git a/ipplan-use-qmagic.patch b/ipplan-use-qmagic.patch
index c038390..5e158f9 100644
--- a/ipplan-use-qmagic.patch
+++ b/ipplan-use-qmagic.patch
@@ -1,6 +1,6 @@
diff -ruN ipplan.orig/admin/changepassword.php ipplan/admin/changepassword.php
---- ipplan.orig/admin/changepassword.php 2009-07-24 16:35:37.067261296 +0200
-+++ ipplan/admin/changepassword.php 2009-07-24 16:52:07.366262054 +0200
+--- ipplan.orig/admin/changepassword.php 2009-08-17 23:44:07.000000000 +0200
++++ ipplan/admin/changepassword.php 2011-02-12 12:15:22.107373824 +0200
@@ -67,8 +67,8 @@
$ds->DbfTransactionStart();
@@ -13,8 +13,8 @@ diff -ruN ipplan.orig/admin/changepassword.php ipplan/admin/changepassword.php
if ($result) {
diff -ruN ipplan.orig/admin/deletebounds.php ipplan/admin/deletebounds.php
---- ipplan.orig/admin/deletebounds.php 2009-07-24 16:35:37.068261756 +0200
-+++ ipplan/admin/deletebounds.php 2009-07-24 16:51:07.699261009 +0200
+--- ipplan.orig/admin/deletebounds.php 2009-08-17 23:44:07.000000000 +0200
++++ ipplan/admin/deletebounds.php 2011-02-12 12:15:22.107373824 +0200
@@ -54,7 +54,7 @@
$ds->DbfTransactionStart();
@@ -25,8 +25,8 @@ diff -ruN ipplan.orig/admin/deletebounds.php ipplan/admin/deletebounds.php
if ($result) {
$ds->DbfTransactionEnd();
diff -ruN ipplan.orig/admin/displayboundsform.php ipplan/admin/displayboundsform.php
---- ipplan.orig/admin/displayboundsform.php 2009-07-24 16:35:37.072265328 +0200
-+++ ipplan/admin/displayboundsform.php 2009-07-24 16:51:25.950266841 +0200
+--- ipplan.orig/admin/displayboundsform.php 2009-08-17 23:44:07.000000000 +0200
++++ ipplan/admin/displayboundsform.php 2011-02-12 12:15:22.108373766 +0200
@@ -51,7 +51,7 @@
$where="";
@@ -37,8 +37,8 @@ diff -ruN ipplan.orig/admin/displayboundsform.php ipplan/admin/displayboundsform
$result=&$ds->ds->Execute("SELECT boundsaddr, boundssize, grp
diff -ruN ipplan.orig/admin/importbase.php ipplan/admin/importbase.php
---- ipplan.orig/admin/importbase.php 2009-07-24 16:35:37.085272914 +0200
-+++ ipplan/admin/importbase.php 2009-07-24 16:51:47.829261312 +0200
+--- ipplan.orig/admin/importbase.php 2009-08-17 23:44:07.000000000 +0200
++++ ipplan/admin/importbase.php 2011-02-12 12:15:22.109373710 +0200
@@ -206,10 +206,10 @@
insert($w,block("<b>".sprintf(my_("Row is duplicate - updating with [ %s, %s ]"), $ipaddr, $descrip)."</b>"));
@@ -84,9 +84,9 @@ diff -ruN ipplan.orig/admin/importbase.php ipplan/admin/importbase.php
if ( $result == FALSE ) {
diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
---- ipplan.orig/admin/usermanager.php 2009-07-24 16:35:37.096261011 +0200
-+++ ipplan/admin/usermanager.php 2009-07-24 16:50:49.924261394 +0200
-@@ -96,8 +96,8 @@
+--- ipplan.orig/admin/usermanager.php 2009-08-17 23:44:07.000000000 +0200
++++ ipplan/admin/usermanager.php 2011-02-12 12:15:22.113373505 +0200
+@@ -97,8 +97,8 @@
if ($usersearch != "") {
$result=&$ds->ds->Execute("SELECT userid, userdescrip
FROM users
@@ -97,7 +97,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
$MENU=".|".my_("Search Result")."\n";
$count=0;
-@@ -293,7 +293,7 @@
+@@ -295,7 +295,7 @@
list($ipaddr, $userid, $grp, $grpdescrip, $createcust, $grpview) = myRegister("S:ipaddr S:userid S:grp S:grpdescrip S:createcust S:grpview");
$grp=trim($grp);
$grpdescrip=trim($grpdescrip);
@@ -106,7 +106,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
if ($result) {
$row=$result->FetchRow();
}
-@@ -362,7 +362,7 @@
+@@ -386,7 +386,7 @@
// in a table and allow the user to delete them.
insert($con, generic("br"));
@@ -115,7 +115,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
$lst=array();
while($row = $result->FetchRow()) {
-@@ -399,7 +399,7 @@
+@@ -423,7 +423,7 @@
list($ipaddr, $size, $grp) = myRegister("S:ipaddr S:size S:grp");
@@ -124,7 +124,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
$row=$result->FetchRow();
$grpdescrip=$row["grpdescrip"];
$createcust=$row["createcust"];
-@@ -474,7 +474,7 @@
+@@ -501,7 +501,7 @@
insert($f2,submit(array("value"=>my_("Add User"))));
// Edit users assigned to the group.
@@ -133,7 +133,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
$lst=array();
while($row = $result->FetchRow()) {
-@@ -568,7 +568,7 @@
+@@ -595,7 +595,7 @@
$result=&$ds->ds->Execute("SELECT boundsaddr, boundssize, grp
FROM bounds
@@ -142,7 +142,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
ORDER BY boundsaddr");
// logic here is:
-@@ -706,25 +706,25 @@
+@@ -733,25 +733,25 @@
$ds->DbfTransactionStart();
// emulates mysql REPLACE
$result=&$ds->ds->Execute("DELETE FROM users
@@ -177,7 +177,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
}
if ($result) {
$ds->DbfTransactionEnd();
-@@ -779,9 +779,9 @@
+@@ -806,9 +806,9 @@
$result=&$ds->ds->Execute("INSERT INTO grp
(grp, createcust, grpdescrip, grpopt, resaddr)
VALUES
@@ -190,7 +190,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
".$grpbit.", $resaddr)");
if ($result) {
-@@ -803,8 +803,8 @@
+@@ -830,8 +830,8 @@
$ds->DbfTransactionStart();
$result=&$ds->ds->Execute("DELETE FROM usergrp
@@ -201,7 +201,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
if ($result) {
$ds->DbfTransactionEnd();
insert($w,text(my_("User deleted from group")));
-@@ -835,9 +835,9 @@
+@@ -862,9 +862,9 @@
if ($userid) {
$ds->DbfTransactionStart();
$result=&$ds->ds->Execute("DELETE FROM users
@@ -213,7 +213,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
if ($result) {
$ds->DbfTransactionEnd();
-@@ -853,8 +853,8 @@
+@@ -880,8 +880,8 @@
$userid=$usergrp;
$ds->DbfTransactionStart();
$result=&$ds->ds->Execute("DELETE FROM usergrp
@@ -224,7 +224,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
if ($result) {
$ds->DbfTransactionEnd();
-@@ -874,7 +874,7 @@
+@@ -901,7 +901,7 @@
// check if grp has customers
$result=&$ds->ds->Execute("SELECT custdescrip
FROM customer
@@ -233,7 +233,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
if ($row=$result->FetchRow()) {
$formerror .=my_("Cannot delete group because the following customers are assigned to the group:");
do {
-@@ -886,7 +886,7 @@
+@@ -913,7 +913,7 @@
// check if grp has subnets
$result=&$ds->ds->Execute("SELECT baseaddr, descrip
FROM base
@@ -242,7 +242,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
ORDER BY baseaddr");
if ($row=$result->FetchRow()) {
$formerror .= my_("Cannot delete group because the following subnets are assigned to the group:");
-@@ -898,11 +898,11 @@
+@@ -925,11 +925,11 @@
$ds->DbfTransactionStart();
$result=&$ds->ds->Execute("DELETE FROM grp
@@ -257,7 +257,20 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
if ($result) {
$ds->DbfTransactionEnd();
-@@ -934,8 +934,8 @@
+@@ -955,9 +955,9 @@
+ if ($formerror == "" ) {
+ $ds->DbfTransactionStart();
+ $result=&$ds->ds->Execute("UPDATE users
+- SET userdescrip=".$ds->ds->qstr($userdescrip).",
+- useremail=".$ds->ds->qstr($useremail)."
+- WHERE userid=".$ds->ds->qstr($userid));
++ SET userdescrip=".$ds->ds->QMagic($userdescrip).",
++ useremail=".$ds->ds->QMagic($useremail)."
++ WHERE userid=".$ds->ds->QMagic($userid));
+ $ds->AuditLog(sprintf(my_("User %s modified"), $userid));
+
+ if ($result) {
+@@ -991,8 +991,8 @@
$ds->DbfTransactionStart();
$result=&$ds->ds->Execute("UPDATE users
@@ -268,7 +281,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
$ds->AuditLog(sprintf(my_("User %s changed password"), $userid));
if ($result) {
-@@ -961,13 +961,13 @@
+@@ -1018,13 +1018,13 @@
$ds->DbfTransactionStart();
// emulate mysql REPLACE
$result=&$ds->ds->Execute("DELETE FROM usergrp
@@ -286,7 +299,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
if ($result) {
$ds->DbfTransactionEnd();
-@@ -1007,11 +1007,11 @@
+@@ -1064,11 +1064,11 @@
}
$result=&$ds->ds->Execute("UPDATE grp
@@ -301,7 +314,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
if ($result) {
$ds->DbfTransactionEnd();
-@@ -1037,7 +1037,7 @@
+@@ -1094,7 +1094,7 @@
// creating readonly group?
if ($base == 0 and $size == 0) {
@@ -310,7 +323,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
$formerror .= my_("Boundary cannot be created - overlaps with existing boundary")."\n";
}
}
-@@ -1065,7 +1065,7 @@
+@@ -1122,7 +1122,7 @@
$result=&$ds->ds->Execute("INSERT INTO bounds
(boundsaddr, boundssize, grp)
VALUES
@@ -319,7 +332,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
if ($result) {
$ds->DbfTransactionEnd();
-@@ -1090,7 +1090,7 @@
+@@ -1147,7 +1147,7 @@
($boundsaddr < boundsaddr AND
$boundsaddr+$boundssize >
boundsaddr + boundssize - 1)) AND
@@ -328,7 +341,7 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
if ($result->FetchRow()) {
return 1;
}
-@@ -1101,7 +1101,7 @@
+@@ -1158,7 +1158,7 @@
list($grp, $boundsaddr) = myRegister("S:grp S:boundsaddr");
$result=&$ds->ds->Execute("DELETE FROM bounds
@@ -338,8 +351,8 @@ diff -ruN ipplan.orig/admin/usermanager.php ipplan/admin/usermanager.php
if ($result) {
$ds->DbfTransactionEnd();
diff -ruN ipplan.orig/auth.php ipplan/auth.php
---- ipplan.orig/auth.php 2009-03-18 22:43:54.000000000 +0200
-+++ ipplan/auth.php 2009-07-24 16:49:49.184261940 +0200
+--- ipplan.orig/auth.php 2009-08-17 23:43:43.000000000 +0200
++++ ipplan/auth.php 2011-02-12 12:15:02.887364589 +0200
@@ -192,14 +192,14 @@
$passwd=crypt($passwd, 'xq');
$result=$ds->Execute("SELECT usergrp.grp AS grp
@@ -359,8 +372,8 @@ diff -ruN ipplan.orig/auth.php ipplan/auth.php
}
diff -ruN ipplan.orig/class.dbflib.php ipplan/class.dbflib.php
---- ipplan.orig/class.dbflib.php 2009-03-18 22:43:54.000000000 +0200
-+++ ipplan/class.dbflib.php 2009-07-24 16:49:36.394261175 +0200
+--- ipplan.orig/class.dbflib.php 2009-08-17 23:43:43.000000000 +0200
++++ ipplan/class.dbflib.php 2011-02-12 12:15:02.889364823 +0200
@@ -143,14 +143,14 @@
WHERE baseindex=$baseindex AND
ipaddr=$ipaddr")) { // should have FOR UPDATE here!
@@ -601,8 +614,8 @@ diff -ruN ipplan.orig/class.dbflib.php ipplan/class.dbflib.php
// should there be an AND?
if ($addand) {
diff -ruN ipplan.orig/class.dnslib.php ipplan/class.dnslib.php
---- ipplan.orig/class.dnslib.php 2009-03-18 22:43:54.000000000 +0200
-+++ ipplan/class.dnslib.php 2009-07-24 16:49:13.294270409 +0200
+--- ipplan.orig/class.dnslib.php 2009-08-17 23:43:43.000000000 +0200
++++ ipplan/class.dnslib.php 2011-02-12 12:15:02.890364937 +0200
@@ -262,10 +262,10 @@
recordtype, userid, ip_hostname) ".
"VALUES ($this->cust, $dataid, ". $i.",".
@@ -866,8 +879,8 @@ diff -ruN ipplan.orig/class.dnslib.php ipplan/class.dnslib.php
" WHERE customer=$cust AND data_id=".$zoneid);
diff -ruN ipplan.orig/contrib/ipplan-poller.php ipplan/contrib/ipplan-poller.php
---- ipplan.orig/contrib/ipplan-poller.php 2009-07-24 16:35:37.098269923 +0200
-+++ ipplan/contrib/ipplan-poller.php 2009-07-24 16:48:58.061261570 +0200
+--- ipplan.orig/contrib/ipplan-poller.php 2009-02-22 23:44:50.000000000 +0200
++++ ipplan/contrib/ipplan-poller.php 2011-02-12 12:15:22.114373458 +0200
@@ -242,7 +242,7 @@
if ($hostnames) {
@@ -910,8 +923,8 @@ diff -ruN ipplan.orig/contrib/ipplan-poller.php ipplan/contrib/ipplan-poller.php
}
}
diff -ruN ipplan.orig/user/createarea.php ipplan/user/createarea.php
---- ipplan.orig/user/createarea.php 2009-07-24 16:35:37.104261224 +0200
-+++ ipplan/user/createarea.php 2009-07-24 16:45:44.647275743 +0200
+--- ipplan.orig/user/createarea.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/createarea.php 2011-02-12 12:15:22.118373284 +0200
@@ -84,7 +84,7 @@
$ds->DbfTransactionStart();
if ($action=="modify") {
@@ -931,8 +944,8 @@ diff -ruN ipplan.orig/user/createarea.php ipplan/user/createarea.php
"descrip"=>$descrip, "user"=>getAuthUsername(), "area"=>$ipaddr,
"cust"=>$cust));
diff -ruN ipplan.orig/user/createrange.php ipplan/user/createrange.php
---- ipplan.orig/user/createrange.php 2009-07-24 16:35:37.106272084 +0200
-+++ ipplan/user/createrange.php 2009-07-24 16:45:10.911264478 +0200
+--- ipplan.orig/user/createrange.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/createrange.php 2011-02-12 12:15:22.118373284 +0200
@@ -166,7 +166,7 @@
if ($action=="modify") {
@@ -952,8 +965,8 @@ diff -ruN ipplan.orig/user/createrange.php ipplan/user/createrange.php
$ds->AuditLog(array("event"=>160, "action"=>"create range",
"descrip"=>$descrip, "user"=>getAuthUsername(), "areaindex"=>$areaindex,
diff -ruN ipplan.orig/user/createsubnet.php ipplan/user/createsubnet.php
---- ipplan.orig/user/createsubnet.php 2009-07-24 16:35:37.111261269 +0200
-+++ ipplan/user/createsubnet.php 2009-07-24 16:47:00.295261634 +0200
+--- ipplan.orig/user/createsubnet.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/createsubnet.php 2011-02-12 12:15:22.118373284 +0200
@@ -219,7 +219,7 @@
$result = &$ds->ds->Execute("INSERT INTO baseadd
(info, baseindex)
@@ -964,8 +977,8 @@ diff -ruN ipplan.orig/user/createsubnet.php ipplan/user/createsubnet.php
$ds->DbfTransactionEnd();
diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
---- ipplan.orig/user/displaysubnet.php 2009-07-24 16:35:37.134260756 +0200
-+++ ipplan/user/displaysubnet.php 2009-07-24 16:45:26.829261752 +0200
+--- ipplan.orig/user/displaysubnet.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/displaysubnet.php 2011-02-12 12:15:22.121373166 +0200
@@ -221,7 +221,7 @@
WHERE base.customer=$cust AND
base.baseindex=ipaddr.baseindex AND
@@ -984,7 +997,7 @@ diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
$body="?Subject=IP address request actioned&body=";
$body2="The request details submitted: $requestdesc\n\n";
-@@ -925,15 +925,15 @@
+@@ -931,15 +931,15 @@
FROM fwdzone, fwdzonerec
WHERE fwdzone.data_id=fwdzonerec.data_id AND
fwdzone.customer=$cust AND
@@ -1006,7 +1019,7 @@ diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
// must be exactly one A record on one domain else cannot delete
if($recs == 1) {
$row=$result->FetchRow();
-@@ -944,7 +944,7 @@
+@@ -950,7 +950,7 @@
$result = &$ds->ds->Execute("DELETE FROM fwdzonerec
WHERE customer=$cust AND recidx=$recidx") and
@@ -1015,7 +1028,7 @@ diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
" WHERE customer=$cust AND data_id=".$dom_id) and
$ds->AuditLog(array("event"=>120, "action"=>"delete zone record", "cust"=>$cust,
"user"=>getAuthUsername(), "id"=>$recidx));
-@@ -979,13 +979,13 @@
+@@ -985,13 +985,13 @@
FROM fwdzone, fwdzonerec
WHERE fwdzone.data_id=fwdzonerec.data_id AND
fwdzone.customer=$cust AND
@@ -1033,7 +1046,7 @@ diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
// must be exactly one A record on one domain else cannot update
if($recs == 1) {
// does domain name of record match ip records hostname?
-@@ -1005,13 +1005,13 @@
+@@ -1011,13 +1011,13 @@
}
insert($w,textbr(my_("IP hostname field in DNS forward zone modified")));
@@ -1052,7 +1065,7 @@ diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
" WHERE customer=$cust AND data_id=".$dataid) and
$ds->AuditLog(array("event"=>122, "action"=>"modified zone record", "cust"=>$cust,
"user"=>getAuthUsername(), "domain"=>$domain, "host"=>$hnametmp,
-@@ -1042,12 +1042,12 @@
+@@ -1048,12 +1048,12 @@
$result = &$ds->ds->Execute("SELECT length(domain) AS domainlen, data_id, domain
FROM fwdzone
WHERE customer=$cust AND
@@ -1067,7 +1080,7 @@ diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
// must be exactly one matching zone only, or more than one zone
// sorted DESC. If second case, use first record for longest match
-@@ -1063,12 +1063,12 @@
+@@ -1069,12 +1069,12 @@
recordtype, error_message, userid, ip_hostname) ".
"VALUES ($cust, $dataid, 9999,".
$ds->ds->DBTimeStamp(time()).",".
@@ -1087,8 +1100,8 @@ diff -ruN ipplan.orig/user/displaysubnet.php ipplan/user/displaysubnet.php
$ds->AuditLog(array("event"=>121, "action"=>"add zone record", "cust"=>$cust,
"user"=>getAuthUsername(), "domain"=>$domain, "host"=>$hnametmp,
diff -ruN ipplan.orig/user/exportdhcp.php ipplan/user/exportdhcp.php
---- ipplan.orig/user/exportdhcp.php 2009-07-24 16:35:37.142261270 +0200
-+++ ipplan/user/exportdhcp.php 2009-07-24 16:47:14.257261620 +0200
+--- ipplan.orig/user/exportdhcp.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/exportdhcp.php 2011-02-12 12:15:22.122373129 +0200
@@ -150,7 +150,7 @@
$result_ip=&$ds->ds->Execute("SELECT ipaddr, macaddr, hname
FROM ipaddr
@@ -1099,8 +1112,8 @@ diff -ruN ipplan.orig/user/exportdhcp.php ipplan/user/exportdhcp.php
$iprange_dynamicIPs=array();
diff -ruN ipplan.orig/user/modifybase.php ipplan/user/modifybase.php
---- ipplan.orig/user/modifybase.php 2009-07-24 16:35:37.157277068 +0200
-+++ ipplan/user/modifybase.php 2009-07-24 16:48:36.765261577 +0200
+--- ipplan.orig/user/modifybase.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/modifybase.php 2011-02-12 12:15:22.124373058 +0200
@@ -224,7 +224,7 @@
$result=&$ds->ds->Execute("UPDATE base
SET subnetsize=$size*2,
@@ -1120,8 +1133,8 @@ diff -ruN ipplan.orig/user/modifybase.php ipplan/user/modifybase.php
// ... and create new subnet
$timetmp=time();
diff -ruN ipplan.orig/user/modifycustomer.php ipplan/user/modifycustomer.php
---- ipplan.orig/user/modifycustomer.php 2009-07-24 16:35:37.160261295 +0200
-+++ ipplan/user/modifycustomer.php 2009-07-24 16:48:21.805261227 +0200
+--- ipplan.orig/user/modifycustomer.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/modifycustomer.php 2011-02-12 12:15:22.124373058 +0200
@@ -126,9 +126,9 @@
$result=&$ds->ds->Execute("INSERT INTO customer
(custdescrip, crm, admingrp)
@@ -1241,8 +1254,8 @@ diff -ruN ipplan.orig/user/modifycustomer.php ipplan/user/modifycustomer.php
}
diff -ruN ipplan.orig/user/modifydns.php ipplan/user/modifydns.php
---- ipplan.orig/user/modifydns.php 2009-07-24 16:35:37.165261158 +0200
-+++ ipplan/user/modifydns.php 2009-07-24 16:47:32.669263630 +0200
+--- ipplan.orig/user/modifydns.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/modifydns.php 2011-02-12 12:15:22.125373029 +0200
@@ -245,10 +245,10 @@
recordtype, userid, ip_hostname) ".
"VALUES ($cust, $ds->dataid, 9999,".
@@ -1268,8 +1281,8 @@ diff -ruN ipplan.orig/user/modifydns.php ipplan/user/modifydns.php
}
diff -ruN ipplan.orig/user/modifydnsrecord.php ipplan/user/modifydnsrecord.php
---- ipplan.orig/user/modifydnsrecord.php 2009-07-24 16:35:37.170261039 +0200
-+++ ipplan/user/modifydnsrecord.php 2009-07-24 16:46:37.127261298 +0200
+--- ipplan.orig/user/modifydnsrecord.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/modifydnsrecord.php 2011-02-12 12:15:22.126372966 +0200
@@ -81,7 +81,7 @@
if ($action=="delete") {
if (!$dom_id=$ds->ds->GetOne("SELECT data_id
@@ -1401,8 +1414,8 @@ diff -ruN ipplan.orig/user/modifydnsrecord.php ipplan/user/modifydnsrecord.php
if (!$result) {
myError($w,$p, my_("No domains found. Create some domains and try again."));
diff -ruN ipplan.orig/user/modifyipform.php ipplan/user/modifyipform.php
---- ipplan.orig/user/modifyipform.php 2009-07-24 16:35:37.175260999 +0200
-+++ ipplan/user/modifyipform.php 2009-07-24 16:47:47.499261554 +0200
+--- ipplan.orig/user/modifyipform.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/modifyipform.php 2011-02-12 12:15:22.127372904 +0200
@@ -192,7 +192,7 @@
// add serialized info from file upload
@@ -1431,8 +1444,8 @@ diff -ruN ipplan.orig/user/modifyipform.php ipplan/user/modifyipform.php
ipaddr=$ip") and
$ds->AuditLog(array("event"=>141, "action"=>"delete file",
diff -ruN ipplan.orig/user/modifysubnet.php ipplan/user/modifysubnet.php
---- ipplan.orig/user/modifysubnet.php 2009-07-24 16:35:37.177261840 +0200
-+++ ipplan/user/modifysubnet.php 2009-07-24 16:44:56.606265283 +0200
+--- ipplan.orig/user/modifysubnet.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/modifysubnet.php 2011-02-12 12:15:22.127372904 +0200
@@ -129,11 +129,11 @@
// between base and baseadd is baseindex column
if ($duplicatesubnet==0) {
@@ -1502,8 +1515,8 @@ diff -ruN ipplan.orig/user/modifysubnet.php ipplan/user/modifysubnet.php
}
diff -ruN ipplan.orig/user/modifyzone.php ipplan/user/modifyzone.php
---- ipplan.orig/user/modifyzone.php 2009-07-24 16:35:37.182261244 +0200
-+++ ipplan/user/modifyzone.php 2009-07-24 16:46:00.574261375 +0200
+--- ipplan.orig/user/modifyzone.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/modifyzone.php 2011-02-12 12:15:22.128372846 +0200
@@ -276,7 +276,7 @@
WHERE zones.customer=base.customer AND
base.baseindex=ipaddr.baseindex AND
@@ -1514,8 +1527,8 @@ diff -ruN ipplan.orig/user/modifyzone.php ipplan/user/modifyzone.php
ipaddr.ipaddr < zones.zoneip+zones.zonesize");
}
diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
---- ipplan.orig/user/requestip.php 2009-07-24 16:35:37.186261178 +0200
-+++ ipplan/user/requestip.php 2009-07-24 16:46:16.008271108 +0200
+--- ipplan.orig/user/requestip.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/requestip.php 2011-02-12 12:15:22.128372846 +0200
@@ -120,14 +120,14 @@
hname, telno, macaddr, info)
VALUES
@@ -1540,8 +1553,8 @@ diff -ruN ipplan.orig/user/requestip.php ipplan/user/requestip.php
"descrip"=>$descrip, "user"=>getAuthUsername(), "userinf"=>$user,
"location"=>$location, "hname"=>$hname, "telno"=>$telno,
diff -ruN ipplan.orig/user/searchall.php ipplan/user/searchall.php
---- ipplan.orig/user/searchall.php 2009-07-24 16:35:37.191261348 +0200
-+++ ipplan/user/searchall.php 2009-07-24 16:48:04.835262321 +0200
+--- ipplan.orig/user/searchall.php 2009-08-17 23:43:59.000000000 +0200
++++ ipplan/user/searchall.php 2011-02-12 12:15:22.129372792 +0200
@@ -94,35 +94,35 @@
myError($w,$p, my_("Regular expression repetition-operator operand invalid"));
}
diff --git a/ipplan.spec b/ipplan.spec
index 88a5c6f..c2207ec 100644
--- a/ipplan.spec
+++ b/ipplan.spec
@@ -1,11 +1,11 @@
Name: ipplan
Version: 4.92
-Release: 3%{?dist}
+Release: 4.a%{?dist}
Summary: Web-based IP address manager and tracker
Group: Applications/Internet
License: GPLv2+
URL: http://iptrack.sourceforge.net/
-Source0: http://downloads.sourceforge.net/sourceforge/iptrack/ipplan-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/iptrack/ipplan-%{version}a.tar.gz
Source1: %{name}-mysql.sql
Source2: %{name}-pgsql.sql
Source3: README.%{name}
@@ -31,6 +31,7 @@ It is written in PHP and requires a MySQL or PostgresSQL database.
%prep
%setup -q -n %{name}
+find . -name '*.rej' -delete
%patch1 -p1
%patch2 -p1
%patch3 -p1
@@ -137,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}/*
%changelog
+* Tue Jan 18 2011 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-4.a
+- Upgrade to latest upstream
+- Fix bugzilla #663897
+
* Mon Aug 24 2009 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-3
- Remove unnessesary dependency on /sbin/service
diff --git a/sources b/sources
index 844c495..a095813 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2540b381744d1891b53b660fffc5ec56 ipplan-4.92.tar.gz
+51543971eef3d78f08c7a9abb04759a6 ipplan-4.92a.tar.gz
More information about the scm-commits
mailing list