Package: release.debian.org User: release.debian.org@packages.debian.org Usertags: freeze-exception Severity: normal Please unblock package cacti This upload would fix bug 681558 (http://bugs.debian.org/681558) cacti version 0.8.8a included a new plug-in architecture. The first implementation by me in the packaging was to let admins install the plug-ins in /usr/local/share/cacti/plugins/ Unfortunately most plug-ins use php's chdir which resolves symlinks, so that includes from the main code don't work. This upload would install the plugins directory in the main code base, but tell administrators to create the proper three symlinks themselves. Please see attached proposed debdiff. unblock cacti/0.8.8a-4
diff -Nru cacti-0.8.8a/debian/cacti.install cacti-0.8.8a/debian/cacti.install
--- cacti-0.8.8a/debian/cacti.install 2012-04-30 20:18:03.000000000 +0200
+++ cacti-0.8.8a/debian/cacti.install 2012-08-01 23:15:24.000000000 +0200
@@ -4,5 +4,6 @@
include usr/share/cacti/site
install usr/share/cacti/site
lib usr/share/cacti/site
+plugins usr/share/cacti/site
resource usr/share/cacti
scripts usr/share/cacti/site
diff -Nru cacti-0.8.8a/debian/cacti.links cacti-0.8.8a/debian/cacti.links
--- cacti-0.8.8a/debian/cacti.links 2012-05-04 07:55:53.000000000 +0200
+++ cacti-0.8.8a/debian/cacti.links 2012-08-02 21:18:40.000000000 +0200
@@ -1,5 +1,5 @@
-/usr/local/share/cacti/plugins /usr/share/cacti/site/plugins
/usr/share/cacti/resource /usr/share/cacti/site/resource
+/usr/share/doc/cacti/README.Plugins /usr/share/cacti/site/plugins/README.Plugins
/usr/share/doc/cacti/html /usr/share/cacti/site/docs/html
/usr/share/dbconfig-common/data/cacti/install/mysql /usr/share/doc/cacti/cacti.sql
/etc/cacti/debian.php /usr/share/cacti/site/include/config.php
diff -Nru cacti-0.8.8a/debian/changelog cacti-0.8.8a/debian/changelog
--- cacti-0.8.8a/debian/changelog 2012-06-08 19:30:01.000000000 +0200
+++ cacti-0.8.8a/debian/changelog 2012-08-02 21:44:30.000000000 +0200
@@ -1,3 +1,13 @@
+cacti (0.8.8a-4) UNRELEASED; urgency=low
+
+ * Remove the logic to install plugins in /usr/local/share/cacti/plugins as the
+ implementation of chdir in php resolves symlinks (Closes: 681558).
+ - Update README.Debian and add NEWS.Debian and README.Plugins
+ - Update d/cacti.links and d/cacti.install
+ * Update my e-mail address to elbrus@debian.org
+
+ -- Paul Gevers <elbrus@debian.org> Wed, 01 Aug 2012 22:32:32 +0200
+
cacti (0.8.8a-3) unstable; urgency=low
* Update postrm with new debconf answers (Closes: #673764)
diff -Nru cacti-0.8.8a/debian/control cacti-0.8.8a/debian/control
--- cacti-0.8.8a/debian/control 2012-05-20 20:20:58.000000000 +0200
+++ cacti-0.8.8a/debian/control 2012-08-01 23:15:24.000000000 +0200
@@ -4,7 +4,7 @@
Maintainer: Cacti Maintainer <pkg-cacti-maint@lists.alioth.debian.org>
Uploaders: Sean Finney <seanius@debian.org>,
Mahyuddin Susanto <udienz@ubuntu.com>,
- Paul Gevers <paul@climbing.nl>
+ Paul Gevers <elbrus@debian.org>
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50~),
po-debconf
diff -Nru cacti-0.8.8a/debian/dirs cacti-0.8.8a/debian/dirs
--- cacti-0.8.8a/debian/dirs 2012-05-06 15:20:06.000000000 +0200
+++ cacti-0.8.8a/debian/dirs 2012-08-02 21:02:42.000000000 +0200
@@ -1,7 +1,6 @@
etc/cacti
var/log/cacti
var/lib/cacti/rra
-usr/local/share/cacti/plugins
usr/local/share/cacti/resource/script_queries
usr/local/share/cacti/resource/script_server
usr/local/share/cacti/resource/snmp_queries
diff -Nru cacti-0.8.8a/debian/docs cacti-0.8.8a/debian/docs
--- cacti-0.8.8a/debian/docs 2012-05-04 07:45:44.000000000 +0200
+++ cacti-0.8.8a/debian/docs 2012-08-02 21:08:31.000000000 +0200
@@ -5,3 +5,4 @@
debian/cacti.apache.conf
debian/cacti.lighttpd.conf
debian/debian.php.dist
+debian/README.Plugins
diff -Nru cacti-0.8.8a/debian/NEWS.Debian cacti-0.8.8a/debian/NEWS.Debian
--- cacti-0.8.8a/debian/NEWS.Debian 1970-01-01 01:00:00.000000000 +0100
+++ cacti-0.8.8a/debian/NEWS.Debian 2012-08-02 21:43:10.000000000 +0200
@@ -0,0 +1,14 @@
+cacti (0.8.8a-4) unstable; urgency=low
+
+ In 0.8.8 cacti introduced the Plugin Architecture in the main package. In
+ the Debian package I decided to let the user put all his plug-ins into
+ /usr/local/share/cacti/plugins. Unfortunately bug #681558 prevents this from
+ working out of the box. Therefore I moved the packaged location back to
+ /usr/share/cacti/site/plugins, but system administrators are encouraged to
+ setup the system properly, i.e. by soft-linking /usr/share/cacti/site/plugins
+ to /usr/local/share/cacti/plugins and adding two links back from
+ /usr/local/share/cacti/lib to /usr/share/cacti/site/lib and
+ /usr/local/share/cacti/include to /usr/share/cacti/site/include. This is also
+ documented in README.Plugins
+
+ -- Paul Gevers <elbrus@debian.org> Wed, 01 Aug 2012 22:13:57 +0200
diff -Nru cacti-0.8.8a/debian/README.Debian cacti-0.8.8a/debian/README.Debian
--- cacti-0.8.8a/debian/README.Debian 2012-05-08 21:18:58.000000000 +0200
+++ cacti-0.8.8a/debian/README.Debian 2012-08-01 23:15:24.000000000 +0200
@@ -8,13 +8,12 @@
Fri, 06 Jan 2006 08:07:46 +0100
edited by Paul Gevers <paul@climbing.nl>
-Tue, 08 May 2012 21:18:38 +0200
+Wed, 01 Aug 2012 22:13:57 +0200
----------------
* plugin architecture
Since release 0.8.8 Cacti supports the plugin architecture out of the
- box. To use it, follow the discriptions from the Cacti website, but
- put the plugins you want to use in /usr/local/share/cacti/plugins/
+ box. To use it, first read README.Plugins
* Debian is one of the distribution that tries to get php5-suhosin
installed by default if you are running php5. However due to bug 668157
diff -Nru cacti-0.8.8a/debian/README.Plugins cacti-0.8.8a/debian/README.Plugins
--- cacti-0.8.8a/debian/README.Plugins 1970-01-01 01:00:00.000000000 +0100
+++ cacti-0.8.8a/debian/README.Plugins 2012-08-02 21:06:53.000000000 +0200
@@ -0,0 +1,18 @@
+If you read this and care about keeping your system maintainable, please change
+the layout of the plugins structure of cacti. Due to the way a lot of plug-ins
+are written (details in bug #681558) in combination with Debian policy, I can
+not fix this in the package.
+
+* Create a directory /usr/local/share/cacti/plugins:
+ mkdir /usr/local/share/cacti/plugins
+* Move all content of /usr/share/cacti/site/plugins to
+ /usr/local/share/cacti/plugins
+ mv /usr/share/cacti/site/plugins/* /usr/local/share/cacti/plugins/
+* Remove the empty /usr/share/cacti/site/plugins directory
+ rmdir /usr/share/cacti/site/plugins
+* Create the following symlinks:
+ ln -s /usr/local/share/cacti/plugins /usr/share/cacti/site/plugins
+ ln -s /usr/share/cacti/site/include /usr/local/share/cacti/include
+ ln -s /usr/share/cacti/site/lib /usr/local/share/cacti/site/lib
+
+ -- Paul Gevers <elbrus@debian.org> Wed, 01 Aug 2012 22:32:32 +0200
Attachment:
signature.asc
Description: OpenPGP digital signature