SF.net SVN: postfixadmin:[1848] trunk/debian
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
SF.net SVN: postfixadmin:[1848] trunk/debian
|
From: <gin...@us...> - 2016-05-22 18:50:05
|
Revision: 1848
http://sourceforge.net/p/postfixadmin/code/1848
Author: gingerdog
Date: 2016-05-22 18:50:03 +0000 (Sun, 22 May 2016)
Log Message:
-----------
Merge in Debian's /debian so we also support Apache 2.4 and PHP7 in our debs.... see: http://http.debian.net/debian/pool/main/p/postfixadmin/postfixadmin_2.3.7-2.debian.tar.xz and https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=821643
Modified Paths:
--------------
trunk/debian/README.Debian
trunk/debian/changelog
trunk/debian/control
trunk/debian/patches/series
trunk/debian/postfixadmin.config
trunk/debian/postfixadmin.dirs
trunk/debian/postfixadmin.install
trunk/debian/postfixadmin.postinst
trunk/debian/postfixadmin.postrm
trunk/debian/postfixadmin.prerm
trunk/debian/rules
Added Paths:
-----------
trunk/debian/apache/
trunk/debian/apache/postfixadmin.conf
trunk/debian/lighttpd/
trunk/debian/lighttpd/90-postfixadmin.conf
trunk/debian/patches/0001-db_credentials.patch
trunk/debian/patches/0002-dovecotpw.patch
trunk/debian/postfixadmin.apache2
trunk/debian/postfixadmin.maintscript
trunk/debian/stamp-patched
Removed Paths:
-------------
trunk/debian/apache.conf
trunk/debian/lighttpd.conf
trunk/debian/patches/db_credentials
trunk/debian/po/
trunk/debian/templates
Modified: trunk/debian/README.Debian
===================================================================
--- trunk/debian/README.Debian 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/README.Debian 2016-05-22 18:50:03 UTC (rev 1848)
@@ -6,17 +6,6 @@
guide you through the appropriate process.
-Integration with Postfix, Dovecot etc.
-======================================
-
-Now that PostfixAdmin is working, you need to do some configuration
-in Postfix, Dovecot etc. so that they use the domains, mailboxes and
-aliases you setup in PostfixAdmin.
-
-The files in /usr/share/doc/postfixadmin/ directory explain which
-settings you need to do/change.
-
-
Recommended and Suggested Packages
==================================
- Postfix
Added: trunk/debian/apache/postfixadmin.conf
===================================================================
--- trunk/debian/apache/postfixadmin.conf (rev 0)
+++ trunk/debian/apache/postfixadmin.conf 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1,5 @@
+# BEGIN FOR POSTFIXADMIN
+
+Alias /postfixadmin /usr/share/postfixadmin
+
+# END FOR POSTFIXADMIN
Deleted: trunk/debian/apache.conf
===================================================================
--- trunk/debian/apache.conf 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/apache.conf 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,5 +0,0 @@
-# BEGIN FOR POSTFIXADMIN
-
-Alias /postfixadmin /usr/share/postfixadmin
-
-# END FOR POSTFIXADMIN
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/changelog 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,3 +1,10 @@
+postfixadmin (2.93-2) unstable; urgency=low
+
+ * Replace debian/ using Debian v2.3.7-2. See Debian's #821643
+ * This adds : PHP7 and Apache 2.4 support.
+
+ -- David Goodwin <da...@pa...> Sun, 22 May 2016 19:41:01 +0100
+
postfixadmin (2.93-1) unstable; urgency=low
* New upstream release (effectively beta3 for v3.0)
Modified: trunk/debian/control
===================================================================
--- trunk/debian/control 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/control 2016-05-22 18:50:03 UTC (rev 1848)
@@ -2,23 +2,23 @@
Section: admin
Priority: optional
Maintainer: Norman Messtorff <no...@no...>
-Build-Depends: debhelper (>= 7), po-debconf
-Standards-Version: 3.9.3
-XS-Vcs-Svn: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk
-XS-Vcs-Browser: https://postfixadmin.svn.sourceforge.net/svnroot/postfixadmin/trunk
+Uploaders: Gaudenz Steinlin <ga...@de...>, Christoph Martin <ma...@un...>
+Build-Depends: debhelper (>= 7), po-debconf, dh-apache2
+Standards-Version: 3.9.5
+Vcs-Git: git://anonscm.debian.org/collab-maint/postfixadmin.git
+Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/postfixadmin.git
Homepage: http://postfixadmin.sourceforge.net
Package: postfixadmin
Architecture: all
-Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php5 | php5-cgi | php5, php5-cli, php5-imap, php5-mysql | php5-mysqlnd | php5-pgsql, mysql-client | postgresql-client | mariadb-client, ${misc:Depends}
-Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql-server | mariadb-server
-Suggests: dovecot-common | courier-authlib-mysql | courier-authlib-postgresql
+Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php | php-cgi | php, php-imap, php-mysql | php-pgsql, mysql-client | postgresql-client, ${misc:Depends}
+Recommends: postfix-mysql | postfix-pgsql, mysql-server | postgresql, zendframework, dovecot-core | courier-authlib-mysql | courier-authlib-postgresql
Description: Virtual mail hosting interface for Postfix
Postfixadmin is a web interface to manage virtual users and domains
- for a Postfix mail transport agent. It supports Virtual mailboxes,
+ for a Postfix mail transport agent. It supports Virtual mailboxes,
aliases, forwarders and vacation.
.
- Postfixadmin allows administrators to delegate account handling
+ Postfixadmin allows administrators to delegate account handling
to domain administrators and allows users to login and change their own
settings (e.g. forwarders, vacation, passwords etc).
.
Added: trunk/debian/lighttpd/90-postfixadmin.conf
===================================================================
--- trunk/debian/lighttpd/90-postfixadmin.conf (rev 0)
+++ trunk/debian/lighttpd/90-postfixadmin.conf 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1,4 @@
+# Alias for Postfixadmin
+alias.url += (
+ "/postfixadmin" => "/usr/share/postfixadmin",
+)
Deleted: trunk/debian/lighttpd.conf
===================================================================
--- trunk/debian/lighttpd.conf 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/lighttpd.conf 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,4 +0,0 @@
-# Alias for Postfixadmin
-alias.url += (
- "/postfixadmin" => "/usr/share/postfixadmin",
-)
Added: trunk/debian/patches/0001-db_credentials.patch
===================================================================
--- trunk/debian/patches/0001-db_credentials.patch (rev 0)
+++ trunk/debian/patches/0001-db_credentials.patch 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1,59 @@
+From: Norman Messtorff <no...@no...>
+Date: Sun, 23 Mar 2014 17:40:30 +0100
+Subject: db_credentials
+
+---
+ config.inc.php | 19 ++++++++++++-------
+ 1 file changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/config.inc.php b/config.inc.php
+index e41e7c3..538446d 100644
+--- a/config.inc.php
++++ b/config.inc.php
+@@ -16,6 +16,11 @@
+ * Contains configuration options.
+ */
+
++// This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
++require_once('dbconfig.inc.php');
++if (!isset($dbserver) || empty($dbserver))
++ $dbserver='localhost';
++
+ /*****************************************************************
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * You have to set $CONF['configured'] = true; before the
+@@ -23,7 +28,7 @@
+ * Doing this implies you have changed this file as required.
+ * i.e. configuring database etc; specifying setup.php password etc.
+ */
+-$CONF['configured'] = false;
++$CONF['configured'] = true;
+
+ // In order to setup Postfixadmin, you MUST specify a hashed password here.
+ // To create the hash, visit setup.php in a browser and type a password into the field,
+@@ -33,7 +38,7 @@ $CONF['setup_password'] = 'changeme';
+ // Postfix Admin Path
+ // Set the location of your Postfix Admin installation here.
+ // YOU MUST ENTER THE COMPLETE URL e.g. http://domain.tld/postfixadmin
+-$CONF['postfix_admin_url'] = '';
++$CONF['postfix_admin_url'] = '/postfixadmin';
+
+ // shouldn't need changing.
+ $CONF['postfix_admin_path'] = dirname(__FILE__);
+@@ -46,11 +51,11 @@ $CONF['default_language'] = 'en';
+ // mysql = MySQL 3.23 and 4.0, 4.1 or 5
+ // mysqli = MySQL 4.1+
+ // pgsql = PostgreSQL
+-$CONF['database_type'] = 'mysql';
+-$CONF['database_host'] = 'localhost';
+-$CONF['database_user'] = 'postfix';
+-$CONF['database_password'] = 'postfixadmin';
+-$CONF['database_name'] = 'postfix';
++$CONF['database_type'] = $dbtype;
++$CONF['database_host'] = $dbserver;
++$CONF['database_user'] = $dbuser;
++$CONF['database_password'] = $dbpass;
++$CONF['database_name'] = $dbname;
+ // If you need to specify a different port for a MYSQL database connection, use e.g.
+ // $CONF['database_host'] = '172.30.33.66:3308';
+ // If you need to specify a different port for POSTGRESQL database connection
Added: trunk/debian/patches/0002-dovecotpw.patch
===================================================================
--- trunk/debian/patches/0002-dovecotpw.patch (rev 0)
+++ trunk/debian/patches/0002-dovecotpw.patch 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1,21 @@
+Description: Use doveadm pw instead of dovecotpw by default
+ Newer versions of dovecot no longer have the dovecotpw command.
+Author: Gaudenz Steinlin <ga...@de...>
+Forwarded: not-needed
+Applied-Upstream: fixed upstream in version 2.91
+Last-Update: 2014-10-03
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: postfixadmin/config.inc.php
+===================================================================
+--- postfixadmin.orig/config.inc.php 2014-10-02 17:21:08.000000000 +0200
++++ postfixadmin/config.inc.php 2014-10-03 10:40:32.836919086 +0200
+@@ -111,7 +111,7 @@
+ $CONF['authlib_default_flavor'] = 'md5raw';
+
+ // If you use the dovecot encryption method: where is the dovecotpw binary located?
+-$CONF['dovecotpw'] = "/usr/sbin/dovecotpw";
++$CONF['dovecotpw'] = "/usr/bin/doveadm pw";
+
+ // Minimum length required for passwords. Postfixadmin will not
+ // allow users to set passwords which are shorter than this value.
Deleted: trunk/debian/patches/db_credentials
===================================================================
--- trunk/debian/patches/db_credentials 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/patches/db_credentials 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,47 +0,0 @@
-Description: This patch sets the dbconfig placeholders in config.inc.php.
-Forwarded: not-needed
-Author: Norman Messtorff <no...@no...>
-Last-Update: 2012-05-28
-
-Index: postfixadmin/config.inc.php
-===================================================================
---- postfixadmin.orig/config.inc.php 2015-09-26 15:03:05.000000000 +0100
-+++ postfixadmin/config.inc.php 2015-09-26 15:03:16.000000000 +0100
-@@ -15,6 +15,11 @@
- * Contains configuration options.
- */
-
-+// This loads the automatic generated DB credentials from /etc/postfixadmin/dbconfig.inc.php
-+require_once('/etc/postfixadmin/dbconfig.inc.php');
-+if (!isset($dbserver) || empty($dbserver))
-+ $dbserver='localhost';
-+
- /*****************************************************************
- * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
- * You have to set $CONF['configured'] = true; before the
-@@ -22,7 +27,7 @@
- * Doing this implies you have changed this file as required.
- * i.e. configuring database etc; specifying setup.php password etc.
- */
--$CONF['configured'] = false;
-+$CONF['configured'] = true;
-
- // In order to setup Postfixadmin, you MUST specify a hashed password here.
- // To create the hash, visit setup.php in a browser and type a password into the field,
-@@ -80,11 +85,11 @@
- // mysql = MySQL 3.23 and 4.0, 4.1 or 5
- // mysqli = MySQL 4.1+ or MariaDB
- // pgsql = PostgreSQL
--$CONF['database_type'] = 'mysqli';
--$CONF['database_host'] = 'localhost';
--$CONF['database_user'] = 'postfix';
--$CONF['database_password'] = 'postfixadmin';
--$CONF['database_name'] = 'postfix';
-+$CONF['database_type'] = $dbtype;
-+$CONF['database_host'] = $dbserver;
-+$CONF['database_user'] = $dbuser;
-+$CONF['database_password'] = $dbpass;
-+$CONF['database_name'] = $dbname;
- // If you need to specify a different port for a MYSQL database connection, use e.g.
- // $CONF['database_host'] = '172.30.33.66:3308';
- // If you need to specify a different port for POSTGRESQL database connection
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/patches/series 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1 +1,2 @@
-db_credentials
+0001-db_credentials.patch
+0002-dovecotpw.patch
Added: trunk/debian/postfixadmin.apache2
===================================================================
--- trunk/debian/postfixadmin.apache2 (rev 0)
+++ trunk/debian/postfixadmin.apache2 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1 @@
+conf debian/apache/postfixadmin.conf
\ No newline at end of file
Modified: trunk/debian/postfixadmin.config
===================================================================
--- trunk/debian/postfixadmin.config 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.config 2016-05-22 18:50:03 UTC (rev 1848)
@@ -2,9 +2,6 @@
set -e
. /usr/share/debconf/confmodule
-db_version 2.0
-db_input high postfixadmin/reconfigure-webserver || true
-db_go || true
if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
# we support mysql and pgsql
Modified: trunk/debian/postfixadmin.dirs
===================================================================
--- trunk/debian/postfixadmin.dirs 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.dirs 2016-05-22 18:50:03 UTC (rev 1848)
@@ -2,4 +2,3 @@
usr/share/postfixadmin/css
usr/share/doc/postfixadmin
etc/postfixadmin
-etc/apache2/conf.d
Modified: trunk/debian/postfixadmin.install
===================================================================
--- trunk/debian/postfixadmin.install 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.install 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,14 +1,9 @@
*.php usr/share/postfixadmin
-*.js usr/share/postfixadmin
-configs usr/share/postfixadmin
+admin usr/share/postfixadmin
css usr/share/postfixadmin
images usr/share/postfixadmin
languages usr/share/postfixadmin
model usr/share/postfixadmin
-scripts usr/share/postfixadmin
-smarty usr/share/postfixadmin
templates usr/share/postfixadmin
-templates_c usr/share/postfixadmin
users usr/share/postfixadmin
-debian/apache.conf etc/postfixadmin
-debian/lighttpd.conf etc/postfixadmin
+debian/lighttpd/90-postfixadmin.conf etc/lighttpd/conf-available
Added: trunk/debian/postfixadmin.maintscript
===================================================================
--- trunk/debian/postfixadmin.maintscript (rev 0)
+++ trunk/debian/postfixadmin.maintscript 2016-05-22 18:50:03 UTC (rev 1848)
@@ -0,0 +1,3 @@
+# move webserver configuration files
+mv_conffile /etc/postfixadmin/apache.conf /etc/apache2/conf-available/postfixadmin.conf 2.3.7-1~
+mv_conffile /etc/postfixadmin/lighttpd.conf /etc/lighttpd/conf-available/postfixadmin.conf 2.3.7-1~
Modified: trunk/debian/postfixadmin.postinst
===================================================================
--- trunk/debian/postfixadmin.postinst 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.postinst 2016-05-22 18:50:03 UTC (rev 1848)
@@ -8,24 +8,17 @@
. /usr/share/debconf/confmodule
. /usr/share/dbconfig-common/dpkg/postinst
dbc_go postfixadmin $@
-
- # configure webserver stuff
- db_get postfixadmin/reconfigure-webserver
- servers="$RET"
- restart="$servers"
- linkdestination_apache="../../postfixadmin/apache.conf"
- linkdestination_lighttpd="../../postfixadmin/lighttpd.conf"
- linkname="postfixadmin"
- if [ -e /usr/share/wwwconfig-common/confd-link.sh ]; then
- . /usr/share/wwwconfig-common/confd-link.sh
- else
- . /usr/share/postfixadmin/confd-link.sh
- fi
- . /usr/share/wwwconfig-common/restart.sh
fi
+# remove legacy apache and lighthttpd configuration symlink,
+# conf.d is no longer supported with Apache 2.4
+if [ "$(readlink /etc/apache2/conf.d/postfixadmin)" = "../../postfixadmin/apache.conf" ]; then
+ rm -f /etc/apache2/conf.d/postfixadmin
+fi
+if [ "$(readlink /etc/lighttpd/conf-available/postfixadmin)" = "../../postfixadmin/lighttpd.conf" ]; then
+ rm -f /etc/lighttpd/conf-available/postfixadmin
+fi
+
#DEBHELPER#
-chown www-data /usr/share/postfixadmin/templates_c
-
exit 0
Modified: trunk/debian/postfixadmin.postrm
===================================================================
--- trunk/debian/postfixadmin.postrm 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.postrm 2016-05-22 18:50:03 UTC (rev 1848)
@@ -6,16 +6,6 @@
. /usr/share/debconf/confmodule
db_version 2.0
- # restart the webserver only if we know which one was configured.
- if db_get postfixadmin/reconfigure-webserver; then
- servers="$RET"
- restart=$servers
- linkname="postfixadmin"
- if [ -e /usr/share/wwwconfig-common/restart.sh ]; then
- . /usr/share/wwwconfig-common/restart.sh
- fi
- fi
-
if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
. /usr/share/dbconfig-common/dpkg/postrm
dbc_go postfixadmin $@
Modified: trunk/debian/postfixadmin.prerm
===================================================================
--- trunk/debian/postfixadmin.prerm 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/postfixadmin.prerm 2016-05-22 18:50:03 UTC (rev 1848)
@@ -8,17 +8,4 @@
dbc_go postfixadmin $@
fi
-if [ -f /usr/share/debconf/confmodule ]; then
- . /usr/share/debconf/confmodule
- db_version 2.0
- db_get postfixadmin/reconfigure-webserver
- servers="$RET"
- linkname="postfixadmin"
- if [ -e /usr/share/wwwconfig-common/confd-link.sh ]; then
- . /usr/share/wwwconfig-common/confd-link.sh
- else
- . /usr/share/postfixadmin/confd-link.sh
- fi
-fi
-
#DEBHELPER#
Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/rules 2016-05-22 18:50:03 UTC (rev 1848)
@@ -7,6 +7,7 @@
export VERSION = $(shell grep -E "version = '.*';" functions.inc.php |sed -e "s/.version = '//" |sed -e "s/';.*//" |sed -e "s/ /-/g")
export DEBVERSION = $(shell grep -E "postfixadmin .([0-9]+|\.)+" debian/changelog |head -1 |sed -e "s/postfixadmin .//" |sed -e "s/-.*//")
+
build: build-arch build-indep
build-arch: build-stamp
build-indep: build-stamp
@@ -14,16 +15,10 @@
dh_testdir
touch build-stamp
-# Create a needed tar.gz file to build a non-nativ .dpkg
-prep:
- rm -f ../postfixadmin_*orig.tar.gz
- cd ..; tar --exclude-vcs --exclude=$(notdir ${CURDIR})/debian --exclude=$(notdir ${CURDIR})/.pc -cvzf postfixadmin_${DEBVERSION}.orig.tar.gz $(notdir ${CURDIR})
-
clean:
dh_testdir
dh_testroot
dh_clean
- debconf-updatepo
install: build
dh_testdir
@@ -31,13 +26,10 @@
dh_prep
dh_installdirs
dh_install
+ dh_apache2
mv debian/postfixadmin/usr/share/postfixadmin/config.inc.php debian/postfixadmin/etc/postfixadmin/config.inc.php
find debian/postfixadmin -name .svn | xargs -r rm -r
- chmod +x debian/postfixadmin/usr/share/postfixadmin/scripts/postfixadmin-cli
- chmod +x debian/postfixadmin/usr/share/postfixadmin/scripts/postfixadmin-cli.php
- chown www-data debian/postfixadmin/usr/share/postfixadmin/templates_c
-
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
Added: trunk/debian/stamp-patched
===================================================================
Deleted: trunk/debian/templates
===================================================================
--- trunk/debian/templates 2016-05-22 17:44:17 UTC (rev 1847)
+++ trunk/debian/templates 2016-05-22 18:50:03 UTC (rev 1848)
@@ -1,6 +0,0 @@
-Template: postfixadmin/reconfigure-webserver
-Type: multiselect
-Choices: apache2, apache, apache-ssl, apache-perl, lighttpd
-_Description: Web server to reconfigure automatically:
- Please choose the web server that should be automatically configured
- to run postfixadmin.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
