[ipplan/f17] update to latest upstream
topdog
topdog at fedoraproject.org
Sat Aug 4 10:02:47 UTC 2012
commit 6dc5e051ed653c89ef2d076af1c8ce80f1c77817
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date: Sat Aug 4 12:01:17 2012 +0200
update to latest upstream
.gitignore | 1 +
ipplan-mysql.sql | 48 ++++++++++++++++++++++++------------------------
ipplan.spec | 8 ++++++--
sources | 2 +-
4 files changed, 32 insertions(+), 27 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3fbcb44..8843839 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
ipplan-4.92.tar.gz
/ipplan-4.92a.tar.gz
+/ipplan-4.92b.tar.gz
diff --git a/ipplan-mysql.sql b/ipplan-mysql.sql
index 3cecd8e..87fc3ed 100644
--- a/ipplan-mysql.sql
+++ b/ipplan-mysql.sql
@@ -5,7 +5,7 @@ descrip VARCHAR(80) NOT NULL,
areaindex BIGINT NOT NULL AUTO_INCREMENT,
customer SMALLINT UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (areaindex)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE area ADD UNIQUE INDEX area_customer (customer, descrip);
@@ -18,7 +18,7 @@ CREATE TABLE auditlog (
userid VARCHAR(40),
action VARCHAR(254) NOT NULL,
dt TIMESTAMP NOT NULL
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE auditlog ADD INDEX auditlog_dt (dt);
@@ -36,7 +36,7 @@ userid VARCHAR(40),
baseopt INT UNSIGNED DEFAULT 0,
swipmod DATETIME,
PRIMARY KEY (baseindex)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE base ADD UNIQUE INDEX base_baseaddr (baseaddr, customer);
@@ -54,7 +54,7 @@ info LONGTEXT,
infobin LONGBLOB,
infobinfn VARCHAR(255),
PRIMARY KEY (baseindex)
-)TYPE=INNODB;
+)ENGINE=INNODB;
CREATE TABLE custinfo (
@@ -79,7 +79,7 @@ tcntry VARCHAR(2),
phne VARCHAR(20),
mbox VARCHAR(100),
PRIMARY KEY (customer)
-)TYPE=INNODB;
+)ENGINE=INNODB;
CREATE TABLE custadd (
@@ -87,7 +87,7 @@ customer SMALLINT UNSIGNED NOT NULL DEFAULT 0,
info LONGTEXT,
infobinfn VARCHAR(255),
PRIMARY KEY (customer)
-)TYPE=INNODB;
+)ENGINE=INNODB;
CREATE TABLE customer (
@@ -96,7 +96,7 @@ customer SMALLINT UNSIGNED NOT NULL AUTO_INCREMENT,
crm VARCHAR(20),
admingrp VARCHAR(40) NOT NULL,
PRIMARY KEY (customer)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE customer ADD UNIQUE INDEX customer_custdescrip (custdescrip);
@@ -115,7 +115,7 @@ createcust VARCHAR(1) NOT NULL DEFAULT 'N',
resaddr SMALLINT UNSIGNED DEFAULT 0,
grpopt INT UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (grp)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE grp ADD UNIQUE INDEX grp_grpdescrip (grpdescrip);
@@ -134,7 +134,7 @@ lastmod TIMESTAMP NOT NULL,
lastpol DATETIME,
userid VARCHAR(40),
PRIMARY KEY (ipaddr, baseindex)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE ipaddr ADD INDEX ipaddr_baseindex (baseindex);
@@ -147,7 +147,7 @@ info LONGTEXT,
infobin LONGBLOB,
infobinfn VARCHAR(255),
PRIMARY KEY (ipaddr, baseindex)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE ipaddradd ADD INDEX ipaddradd_baseindex (baseindex);
@@ -159,7 +159,7 @@ baseindex BIGINT NOT NULL DEFAULT 0,
customer SMALLINT UNSIGNED NOT NULL DEFAULT 0,
dstipaddr INT UNSIGNED NOT NULL DEFAULT 0,
dstcustomer SMALLINT UNSIGNED NOT NULL DEFAULT 0
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE ipaddrlnk ADD UNIQUE INDEX ipaddrlnk_uniq (baseindex, ipaddr, customer, dstipaddr, dstcustomer);
@@ -184,7 +184,7 @@ macaddr VARCHAR(12),
lastmod TIMESTAMP NOT NULL,
info LONGTEXT,
PRIMARY KEY (requestindex)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE requestip ADD UNIQUE INDEX requestip_desc (customer, requestdesc);
@@ -198,7 +198,7 @@ rangeindex BIGINT NOT NULL AUTO_INCREMENT,
areaindex BIGINT NOT NULL DEFAULT 0,
customer SMALLINT UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (rangeindex)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE netrange ADD INDEX range_rangeaddr (rangeaddr, customer);
@@ -215,7 +215,7 @@ customer SMALLINT UNSIGNED NOT NULL DEFAULT 0,
hname VARCHAR(100) NOT NULL,
ipaddr VARCHAR(15) NOT NULL,
horder TINYINT UNSIGNED NOT NULL DEFAULT 0
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE revdns ADD INDEX revdns_customer (customer);
@@ -223,7 +223,7 @@ ALTER TABLE revdns ADD INDEX revdns_customer (customer);
CREATE TABLE version (
version INTEGER NOT NULL DEFAULT 0
-)TYPE=INNODB;
+)ENGINE=INNODB;
CREATE TABLE users (
@@ -232,13 +232,13 @@ userdescrip VARCHAR(80) NOT NULL,
useremail VARCHAR(64),
password VARCHAR(40) NOT NULL,
PRIMARY KEY (userid)
-)TYPE=INNODB;
+)ENGINE=INNODB;
CREATE TABLE usergrp (
userid VARCHAR(40) NOT NULL,
grp VARCHAR(40) NOT NULL
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE usergrp ADD UNIQUE INDEX usergrp_userid (userid, grp);
@@ -251,7 +251,7 @@ CREATE TABLE bounds (
boundsaddr INT UNSIGNED NOT NULL DEFAULT 0,
boundssize INT UNSIGNED NOT NULL DEFAULT 0,
grp VARCHAR(40) NOT NULL
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE bounds ADD INDEX bounds_grp (grp);
@@ -285,7 +285,7 @@ zonefilepath2 VARCHAR(254),
customer SMALLINT UNSIGNED NOT NULL DEFAULT 0,
admingrp VARCHAR(40),
PRIMARY KEY (data_id)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE fwdzone ADD INDEX fwdzone_customer (customer);
@@ -299,7 +299,7 @@ customer SMALLINT UNSIGNED NOT NULL DEFAULT 0,
data_id BIGINT NOT NULL DEFAULT 0,
info LONGTEXT,
infobinfn VARCHAR(255)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE fwdzoneadd ADD UNIQUE INDEX fwdzoneadd_customer (customer, data_id);
@@ -317,7 +317,7 @@ sortorder INTEGER NOT NULL DEFAULT 0,
userid VARCHAR(40) NOT NULL,
customer SMALLINT UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (recidx)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE fwdzonerec ADD INDEX fwdzonerec_data_id (data_id);
@@ -333,7 +333,7 @@ CREATE TABLE fwddns (
id BIGINT NOT NULL DEFAULT 0,
hname VARCHAR(100) NOT NULL,
horder TINYINT UNSIGNED NOT NULL DEFAULT 0
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE fwddns ADD INDEX fwddns_id (id);
@@ -361,7 +361,7 @@ zonefilepath2 VARCHAR(254),
responsiblemail VARCHAR(64),
customer SMALLINT UNSIGNED NOT NULL DEFAULT 0,
PRIMARY KEY (id)
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE zones ADD INDEX zones_customer (customer);
@@ -374,7 +374,7 @@ CREATE TABLE zonedns (
id BIGINT NOT NULL DEFAULT 0,
hname VARCHAR(100) NOT NULL,
horder TINYINT UNSIGNED NOT NULL DEFAULT 0
-)TYPE=INNODB;
+)ENGINE=INNODB;
ALTER TABLE zonedns ADD INDEX zonedns_id (id);
diff --git a/ipplan.spec b/ipplan.spec
index f34ec09..f2f2e97 100644
--- a/ipplan.spec
+++ b/ipplan.spec
@@ -1,11 +1,11 @@
Name: ipplan
Version: 4.92
-Release: 5.a%{?dist}
+Release: 6.b%{?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}a.tar.gz
+Source0: http://downloads.sourceforge.net/sourceforge/iptrack/ipplan-%{version}b.tar.gz
Source1: %{name}-mysql.sql
Source2: %{name}-pgsql.sql
Source3: README.%{name}
@@ -138,6 +138,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/%{name}/*
%changelog
+* Sat Aug 04 2012 Andrew Colin Kissa <andrew at topdog.za.net> - 4.92-6.b
+- Latest upstream
+- Fix bugzilla #771693
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.92-5.a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index a095813..064afd1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-51543971eef3d78f08c7a9abb04759a6 ipplan-4.92a.tar.gz
+92f2499755e13260c06f51424cfce173 ipplan-4.92b.tar.gz
More information about the scm-commits
mailing list