From 19fd0d443c6f136d25a1731782e92fab3f6ff226 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Mon, 18 Oct 2021 22:08:07 +0100 Subject: [PATCH] merge in some of the downstream debian package changes - see also #529 --- debian/README.Debian | 2 + debian/changelog | 236 +++++++++++++++++++++++++++++++---- debian/control | 12 +- debian/postfixadmin.dirs | 11 +- debian/postfixadmin.docs | 0 debian/postfixadmin.install | 10 +- debian/postfixadmin.links | 1 - debian/postfixadmin.postinst | 21 +--- debian/postfixadmin.prerm | 2 +- debian/rules | 9 +- debian/upstream/metadata | 4 + debian/watch | 4 +- 12 files changed, 247 insertions(+), 65 deletions(-) mode change 100755 => 100644 debian/postfixadmin.docs create mode 100644 debian/upstream/metadata diff --git a/debian/README.Debian b/debian/README.Debian index 10ba713f..f93533ec 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -20,3 +20,5 @@ The first stop would be the Postfixadmin Website, Forum or IRC channel. See : - http://postfixadmin.sf.net - #postfixadmin on irc.freenode.net + + -- Christoph Martin , Mon, 27 Jun 2016 16:58:12 +0200 diff --git a/debian/changelog b/debian/changelog index 13ed2412..3a150abf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,25 +1,153 @@ -postfixadmin (3.2-1) unstable; urgency=low +postfixadmin (3.3.10-2) unstable; urgency=medium - * New upstream release - PostfixAdmin v3.2 + * remove unnessesary fix for mysqli instead of mysql + * fix permissions of templates_c directory - -- David Goodwin Wed, 02 May 2018 21:36:01 +0100 + -- Christoph Martin Thu, 19 Aug 2021 23:30:30 +0200 -postfixadmin (3.1-1) unstable; urgency=low +postfixadmin (3.3.10-1) unstable; urgency=medium - * New upstream release + * update watch file + * New upstream version 3.3.10 + * fix lighttpd config (closes: #987998) + * include templates_c directory in /var/cache (closes: #926253) + * offer mysqli instead mysql as PHP database type (closes: #857791) + * symlink /etc/postfixadmin/config.local.php to + /usr/share/postfixadmin/config.local.php (closes: #926354) - -- David Goodwin Sun, 25 Jun 2017 16:27:01 +0000 + -- Christoph Martin Mon, 16 Aug 2021 19:05:26 +0200 -postfixadmin (3.0.2-1) unstable; urgency=low +postfixadmin (3.3.7-1) unstable; urgency=medium - * Security fix (don't delete protected aliases, CVE-2017-5930) + * New upstream version 3.3.7 + * recommend sqlite3 instead of sqlite (closes: #905726) + * fix alias in apache config (closes: #965075) + * fix dependency on mariadb-server (closes: #968931) + + -- Christoph Martin Wed, 03 Mar 2021 14:57:26 +0100 + +postfixadmin (3.3.5-1) unstable; urgency=medium + + * New upstream version 3.3.5 + + -- Christoph Martin Thu, 28 Jan 2021 08:23:28 +0100 + +postfixadmin (3.3.4-1) unstable; urgency=medium + + * New upstream version 3.3.4 + + -- Christoph Martin Mon, 25 Jan 2021 10:46:01 +0100 + +postfixadmin (3.3.3-1) unstable; urgency=medium + + * New upstream version 3.3.3 + + -- Christoph Martin Mon, 18 Jan 2021 16:23:33 +0100 + +postfixadmin (3.3.1-1) unstable; urgency=medium + + * New upstream version 3.3.1 + + -- Christoph Martin Tue, 12 Jan 2021 11:44:54 +0100 + +postfixadmin (3.2.4-1) unstable; urgency=medium + + * New upstream version 3.2.4 + + -- Christoph Martin Mon, 21 Sep 2020 11:13:46 +0200 + +postfixadmin (3.2.1-4) unstable; urgency=medium + + [ Debian Janitor ] + * Trim trailing whitespace. + * Wrap long lines in changelog entries: 3.0.2-2, 3.0.2-1, 3.0.1-2. + * Bump debhelper from deprecated 7 to 12. + * Set debhelper-compat version in Build-Depends. + * Set upstream metadata fields: Bug-Database, Bug-Submit, Repository, + Repository-Browse. + + -- Christoph Martin Mon, 14 Sep 2020 16:10:16 +0200 + +postfixadmin (3.2.1-3) unstable; urgency=medium + + [ Jean-Michel Vourgère ] + * Update apache2 configuration (closes: #926252) + + [ Christian Schrötter ] + * Fix missing SSL at persistent MySQLi reconnect + + -- Christoph Martin Mon, 10 Feb 2020 15:50:48 +0100 + +postfixadmin (3.2.1-2) unstable; urgency=medium + + * remove backported code which results in errors (closes: #920564) + * link /usr/share/postfixadmin/scripts/postfixadmin-cli to /usr/bin + closes: #920264) + + -- Christoph Martin Mon, 28 Jan 2019 14:16:05 +0100 + +postfixadmin (3.2.1-1) unstable; urgency=medium + + * fix debian/changelog + * New upstream version 3.2.1 + + -- Christoph Martin Mon, 14 Jan 2019 11:44:58 +0100 + +postfixadmin (3.2-4) unstable; urgency=medium + + [ Christoph Martin ] + * fix sqlite database upgrade (closes: #909263) + + [ Ondřej Nový ] + * d/rules: Remove trailing whitespaces + + -- Christoph Martin Fri, 28 Sep 2018 11:19:19 +0200 + +postfixadmin (3.2-3) unstable; urgency=medium + + * include missing lib folder (closes: #908605) + + -- Christoph Martin Wed, 12 Sep 2018 09:17:27 +0200 + +postfixadmin (3.2-2) unstable; urgency=medium + + * reupload with missing public folder included (closes: #908317) + + -- Christoph Martin Mon, 10 Sep 2018 11:40:37 +0200 + +postfixadmin (3.2-1) unstable; urgency=medium + + [ Christoph Martin ] + * Move watch target to github + * Move Vcs-* to Salsa + * New upstream version 3.2 + + -- Christoph Martin Fri, 04 May 2018 11:39:57 +0200 + +postfixadmin (3.0.2-2) unstable; urgency=medium + + * fix mysql connection problems (closes: #861260) see: + https://github.com/postfixadmin/postfixadmin/issues/38 and + https://github.com/postfixadmin/postfixadmin/commit/6ee85ac6cc427392a1d37339e45a5dbb4b96461c + + -- Christoph Martin Thu, 27 Apr 2017 12:43:15 +0200 + +postfixadmin (3.0.2-1) unstable; urgency=high + + [ David Goodwin ] + * Security fix (don't delete protected aliases, CVE-2017-5930) (closes: + #854742) * Fix MySQL vacation.cache column (regression fix) - -- David Goodwin Wed, 08 Feb 2017 19:30:00 +0000 + [ Christoph Martin ] + * remove recommends zendframework (closes: #780418) + + -- Christoph Martin Fri, 10 Feb 2017 15:08:46 +0100 postfixadmin (3.0.1-2) unstable; urgency=low - * Try and make dependencies less strict (and perhaps work for Ubuntu Precise as well) + * Try and make dependencies less strict (and perhaps work for Ubuntu Precise + as well) -- David Goodwin Mon, 10 Oct 2016 20:00:00 +0100 @@ -29,42 +157,101 @@ postfixadmin (3.0.1-1) unstable; urgency=low -- David Goodwin Mon, 19 Sep 2016 10:08:00 +0100 +postfixadmin (3.0-2) unstable; urgency=medium + + * include missing files (closes: #847074) + + -- Christoph Martin Thu, 08 Dec 2016 15:06:27 +0100 + postfixadmin (3.0-1) unstable; urgency=low + [ David Goodwin ] * New upstream release - -- David Goodwin Sun, 11 Sep 2016 18:42:00 +0100 + [ Christoph Martin ] + * merge Debian changes -postfixadmin (2.93-2) unstable; urgency=low + -- Christoph Martin Wed, 09 Nov 2016 15:43:41 +0100 +postfixadmin (2.93-2) unstable; urgency=medium + + [ Christoph Martin ] + * add fix for missing token bug (closes: #825151) + * add depend on php-mbstring + + [ David Goodwin ] * Replace debian/ using Debian v2.3.7-2. See Debian's #821643 * This adds : PHP7 and Apache 2.4 support. - -- David Goodwin Sun, 22 May 2016 19:41:01 +0100 + -- Christoph Martin Thu, 07 Jul 2016 16:36:08 +0200 postfixadmin (2.93-1) unstable; urgency=low - * New upstream release (effectively beta3 for v3.0) - * update dependencies to allow mariadb as database + [ David Goodwin ] + * New upstream release (closes: #819218) + * update dependencies to allow mariadb as database (closes: #778794) - -- David Goodwin Sat, 26 Sep 2015 15:05:00 +0100 + [ Christoph Martin ] + * merge to Debian build + * include patch remove code which needs mysql >= 5.6 + * update standards version to 3.9.6 -postfixadmin (2.92-1) unstable; urgency=low + -- Christoph Martin Mon, 27 Jun 2016 17:59:10 +0200 - * New upstream release (effectively beta2 for v3.0) +postfixadmin (2.3.7-2) unstable; urgency=medium - -- David Goodwin Wed, 28 Oct 2014 21:02:00 +0100 + * depend on php instead of php7 (closes: #821643) -postfixadmin (2.91-1) unstable; urgency=low + -- Christoph Martin Fri, 20 May 2016 15:34:04 +0200 - * New upstream release (effectively beta for v3.0) +postfixadmin (2.3.7-1) unstable; urgency=medium - -- David Goodwin Tue, 06 May 2014 21:36:00 +0100 + [ Norman Meßtorff ] + * [76ef] change recommends of postgresql-server (not existing) to postgresql. + Thanks to Michael Neuffer (Closes: 699602) + * [4bb5] Change suggestion of transitional package dovecot-common + to dovecot-core + * [f06f] Add new recommended package 'zendframework' + Thanks to Benedikt Trefzer (Closes: 684080) + * [d25a] rules: remove not needed target 'prep' + * [47f7] control: update standards-version to 3.9.5 without changes + * [6f51] Imported Upstream version 2.3.7 (Closes: #741969) + * [4256] Remove patch 0002-fix-sql-injection_show_alias + * [0e04] Update Vcs-* tags in control file + * [4f90] remove legacy apache configuration in prerm, if existing + + [ Gaudenz Steinlin ] + * [a5a3] Apache 2.4 transition (Closes: #669834) + * [68fe] Use doveadm pw instead of dovecotpw by default (Closes: #706698) + * [1da4] Remove wwwconfig-common support (Closes: #691936, #719933) + * [b509] Add myself as uploader + * [f628] Rename lighttpd config to 90-postfixadmin.conf + * [a0e6] Remove config symlink for lighttpd in postinst + + -- Gaudenz Steinlin Mon, 06 Oct 2014 13:27:25 +0200 + +postfixadmin (2.3.5-3) unstable; urgency=high + + [ Norman Messtorff ] + * [a620b76] fix possible SQL injection of $show_alias in function + gen_show status() + + -- Norman Messtorff Sun, 23 Mar 2014 19:07:23 +0100 + +postfixadmin (2.3.5-2+deb7u1) wheezy-security; urgency=high + + * Non-maintainer upload + * SECURITY: fix SQL injection in show_gen_status() + This is only exploitable by authenticated users able + to create new aliases. + Upstream commit: http://sourceforge.net/p/postfixadmin/code/1650 + + -- Gaudenz Steinlin Thu, 20 Mar 2014 10:41:47 +0100 postfixadmin (2.3.5-2) unstable; urgency=low - * Added .po translation files (Closes: 667951, #667962, #668202, #668288) - * Closes: #668298, #668301, #668405, #668635 + * Added .po translation files (Closes: #667951, #667962, #668202, #668288, + #668298, #668301, #668405, #668635) * Updated standards version to 3.9.3 without changes. -- Norman Messtorff Thu, 26 Apr 2012 20:55:57 +0200 @@ -74,4 +261,3 @@ postfixadmin (2.3.5-1) unstable; urgency=low * Initial Debian release (Closes: #247225) -- Norman Messtorff Sun, 15 Jan 2012 12:27:28 +0100 - diff --git a/debian/control b/debian/control index 0f15638e..ae609b7d 100644 --- a/debian/control +++ b/debian/control @@ -3,16 +3,16 @@ Section: admin Priority: optional Maintainer: Norman Messtorff Uploaders: Gaudenz Steinlin , Christoph Martin -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 +Build-Depends: debhelper-compat (= 12), po-debconf, dh-apache2 +Standards-Version: 3.9.6 +Vcs-Browser: https://salsa.debian.org/debian/postfixadmin +Vcs-Git: https://salsa.debian.org/debian/postfixadmin.git Homepage: http://postfixadmin.sourceforge.net Package: postfixadmin Architecture: all -Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php | php-cgi | php-fpm | php, php-mysql | php-mysqlnd | php-pgsql | php-pgsql | php-sqlite3, php-mbstring, default-mysql-client | mysql-client | postgresql-client | mariadb-client -Recommends: postfix-mysql | postfix-pgsql, virtual-mysql-server | postgresql | sqlite3 | mariadb-server, zendframework, php-imap, dovecot-core | courier-authlib-mysql | courier-authlib-postgresql, php-cli +Depends: debconf (>= 0.5), dbconfig-common, wwwconfig-common, apache2 | lighttpd | httpd, libapache2-mod-php | php-cgi | php-fpm | php, php-imap, php-mysql | php-mysqlnd | php-pgsql | php-sqlite3, php-mbstring, default-mysql-client | postgresql-client | mariadb-client, ${misc:Depends} +Recommends: postfix-mysql | postfix-pgsql, virtual-mysql-server | postgresql | sqlite3 (>= 3.12.0) | mariadb-server, zendframework, dovecot-core | courier-authlib-mysql | courier-authlib-postgresql, php-cli 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, diff --git a/debian/postfixadmin.dirs b/debian/postfixadmin.dirs index 88e88170..442e2290 100644 --- a/debian/postfixadmin.dirs +++ b/debian/postfixadmin.dirs @@ -1,8 +1,7 @@ -usr/share/postfixadmin -usr/share/postfixadmin/scripts -usr/share/postfixadmin/public -usr/share/postfixadmin/lib -usr/share/doc/postfixadmin -var/cache/postfixadmin usr/bin +usr/share/postfixadmin +#usr/share/postfixadmin/css +usr/share/doc/postfixadmin etc/postfixadmin +etc/apache2/conf-available +var/cache/postfixadmin/templates_c diff --git a/debian/postfixadmin.docs b/debian/postfixadmin.docs old mode 100755 new mode 100644 diff --git a/debian/postfixadmin.install b/debian/postfixadmin.install index 96ddd070..9ef93ceb 100644 --- a/debian/postfixadmin.install +++ b/debian/postfixadmin.install @@ -1,9 +1,11 @@ *.php usr/share/postfixadmin public usr/share/postfixadmin -languages usr/share/postfixadmin -model usr/share/postfixadmin -templates usr/share/postfixadmin -lib usr/share/postfixadmin configs usr/share/postfixadmin +languages usr/share/postfixadmin +lib usr/share/postfixadmin +model usr/share/postfixadmin scripts usr/share/postfixadmin +templates usr/share/postfixadmin +configs usr/share/postfixadmin debian/lighttpd/90-postfixadmin.conf etc/lighttpd/conf-available +debian/apache/postfixadmin.conf etc/apache2/conf-available diff --git a/debian/postfixadmin.links b/debian/postfixadmin.links index e2d3c91c..3a18ba42 100644 --- a/debian/postfixadmin.links +++ b/debian/postfixadmin.links @@ -1,2 +1 @@ etc/postfixadmin/config.inc.php usr/share/postfixadmin/config.inc.php -var/cache/postfixadmin usr/share/postfixadmin/templates_c diff --git a/debian/postfixadmin.postinst b/debian/postfixadmin.postinst index 9e15b504..26bc94a6 100644 --- a/debian/postfixadmin.postinst +++ b/debian/postfixadmin.postinst @@ -19,28 +19,13 @@ if [ "$(readlink /etc/lighttpd/conf-available/postfixadmin)" = "../../postfixadm rm -f /etc/lighttpd/conf-available/postfixadmin fi -# Try and avoid templates_c being in /usr/share/postfixadmin and ensure it's writeable by the webserver -if [ ! -d /var/cache/postfixadmin ]; then - mkdir -p /var/cache/postfixadmin - chown www-data:root /var/cache/postfixadmin - chmod 700 /var/cache/postfixadmin - ln -s /var/cache/postfixadmin /usr/share/postfixadmin/templates_c -fi - # See : https://sourceforge.net/p/postfixadmin/bugs/376/ - remove any existing templates_c files on upgrade. if [ -d /usr/share/postfixadmin/templates_c ]; then - find /usr/share/postfixadmin/templates_c -type f -delete + find /usr/share/postfixadmin/templates_c -type f -exec rm -r {} \; fi - -if [ -d /usr/share/postfixadmin/templates_c ]; then - chown www-data /usr/share/postfixadmin/templates_c +if [ -d /var/cache/postfixadmin/templates_c ]; then + find /var/cache/postfixadmin/templates_c -type f -exec rm -r {} \; fi - -if [ -d /var/cache/postfixadmin ]; then - find /var/cache/postfixadmin -type f -delete - chown www-data /var/cache/postfixadmin -fi - #DEBHELPER# exit 0 diff --git a/debian/postfixadmin.prerm b/debian/postfixadmin.prerm index 27a398a4..3b553f1e 100644 --- a/debian/postfixadmin.prerm +++ b/debian/postfixadmin.prerm @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e . /usr/share/debconf/confmodule diff --git a/debian/rules b/debian/rules index 7ba9c433..fa3e8041 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,7 @@ export DEBVERSION = $(shell grep -E "postfixadmin .([0-9]+|\.)+" debian/changelo # 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}) + cd ..; tar --exclude-vcs --exclude=$(notdir ${CURDIR})/debian --exclude=$(notdir ${CURDIR})/.pc -cvzf postfixadmin_${DEBVERSION}.orig.tar.gz $(notdir ${CURDIR}) build: build-arch build-indep build-arch: build-stamp @@ -33,7 +33,10 @@ install: build dh_install dh_apache2 mv debian/postfixadmin/usr/share/postfixadmin/config.inc.php debian/postfixadmin/etc/postfixadmin/config.inc.php - ln -s /usr/share/postfixadmin/scripts/postfixadmin-cli debian/postfixadmin/usr/bin/postfixadmin-cli + ln -s /etc/postfixadmin/config.local.php debian/postfixadmin/usr/share/postfixadmin/config.local.php + find debian/postfixadmin -name .svn | xargs -r rm -r + ln -s ../share/postfixadmin/scripts/postfixadmin-cli debian/postfixadmin/usr/bin/ + ln -s /var/cache/postfixadmin/templates_c debian/postfixadmin/usr/share/postfixadmin/ # Build architecture-independent files here. binary-indep: build install @@ -46,6 +49,8 @@ binary-indep: build install dh_link dh_compress dh_fixperms + chown www-data debian/postfixadmin/var/cache/postfixadmin/templates_c -R + chmod 700 debian/postfixadmin/var/cache/postfixadmin/templates_c dh_installdeb dh_gencontrol dh_md5sums diff --git a/debian/upstream/metadata b/debian/upstream/metadata new file mode 100644 index 00000000..56199d8a --- /dev/null +++ b/debian/upstream/metadata @@ -0,0 +1,4 @@ +Bug-Database: https://github.com/postfixadmin/postfixadmin/issues +Bug-Submit: https://github.com/postfixadmin/postfixadmin/issues/new +Repository: https://github.com/postfixadmin/postfixadmin.git +Repository-Browse: https://github.com/postfixadmin/postfixadmin diff --git a/debian/watch b/debian/watch index 26cff355..a8ca515a 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ -version=3 -http://sf.net/postfixadmin/postfixadmin-([\d\.]+)\.tar\.gz +version=4 +https://github.com/postfixadmin/postfixadmin/releases .*/postfixadmin-(\d[\d.]*)\.tar\.gz