Package: release.debian.org Severity: normal Tags: stretch User: [email protected] Usertags: pu
Vincent Danjean spotted a flaw in gosa-plugin-mailaddress, recently, that relates to the renaming of class constructor names as required with PHP 7. The attached .debdiff fixes this issue for Debian stretch. Please accept the .debdiff as a stretch-pu upload candidate. Thanks, Mike -- System Information: Debian Release: 9.0 APT prefers stable APT policy: (990, 'stable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system)
diff -Nru gosa-plugin-mailaddress-0.99.5/debian/changelog gosa-plugin-mailaddress-0.99.5/debian/changelog --- gosa-plugin-mailaddress-0.99.5/debian/changelog 2017-01-09 16:34:17.000000000 +0100 +++ gosa-plugin-mailaddress-0.99.5/debian/changelog 2017-07-28 10:51:19.000000000 +0200 @@ -1,3 +1,15 @@ +gosa-plugin-mailaddress (0.99.5-2+deb9u1) stretch-proposed-updates; urgency=medium + + * debian/patches: + + Add 0001_php-7-compat-fix-parent-constructor-calls.patch. Fix parent + constructor calls. (Closes: #869214). + * debian/control: + + Update versioned D (gosa-plugin-mailaddress): gosa + (>= 2.7.4+reloaded2-12~). Reason: since rev 12, gosa in Debian uses the + new constructor API required for PHP 7. + + -- Mike Gabriel <[email protected]> Fri, 28 Jul 2017 10:51:19 +0200 + gosa-plugin-mailaddress (0.99.5-2) unstable; urgency=medium * debian/{control,copyright,watch}: diff -Nru gosa-plugin-mailaddress-0.99.5/debian/control gosa-plugin-mailaddress-0.99.5/debian/control --- gosa-plugin-mailaddress-0.99.5/debian/control 2017-01-09 16:34:17.000000000 +0100 +++ gosa-plugin-mailaddress-0.99.5/debian/control 2017-07-28 10:51:19.000000000 +0200 @@ -16,7 +16,7 @@ Architecture: all Depends: ${misc:Depends}, - gosa (>= 2.7), + gosa (>= 2.7.4+reloaded2-12~), Conflicts: gosa-plugin-mail, Description: Simple plugin to manage user mail addresses in GOsa² diff -Nru gosa-plugin-mailaddress-0.99.5/debian/patches/0001_php-7-compat-fix-parent-constructor-calls.patch gosa-plugin-mailaddress-0.99.5/debian/patches/0001_php-7-compat-fix-parent-constructor-calls.patch --- gosa-plugin-mailaddress-0.99.5/debian/patches/0001_php-7-compat-fix-parent-constructor-calls.patch 1970-01-01 01:00:00.000000000 +0100 +++ gosa-plugin-mailaddress-0.99.5/debian/patches/0001_php-7-compat-fix-parent-constructor-calls.patch 2017-07-28 10:51:19.000000000 +0200 @@ -0,0 +1,39 @@ +From eb5651ef45b776b1c2d87e2ac6d13365bb353456 Mon Sep 17 00:00:00 2001 +From: Mike Gabriel <[email protected]> +Date: Fri, 28 Jul 2017 10:30:48 +0200 +Subject: [PATCH] PHP 7 compatibility: Fix parent constructor calls. + + Fixes gosa-project/gosa-plugin-mailaddress#1. + + Thanks to Vincent Danjean for spotting this and notifying us. +--- + admin/groups/mailaddress/class_groupMail.inc | 2 +- + personal/mailaddress/class_mailAccount.inc | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/admin/groups/mailaddress/class_groupMail.inc b/admin/groups/mailaddress/class_groupMail.inc +index c291de9..e477fc4 100644 +--- a/admin/groups/mailaddress/class_groupMail.inc ++++ b/admin/groups/mailaddress/class_groupMail.inc +@@ -70,7 +70,7 @@ class mailgroup extends plugin { + var $cn=""; + + function __construct (&$config,$dn=NULL,$base_object=NULL) { +- plugin::plugin ($config,$dn); ++ plugin::__construct ($config,$dn); + + /* Get attributes from parent object + */ +diff --git a/personal/mailaddress/class_mailAccount.inc b/personal/mailaddress/class_mailAccount.inc +index 398b1de..0efaea1 100644 +--- a/personal/mailaddress/class_mailAccount.inc ++++ b/personal/mailaddress/class_mailAccount.inc +@@ -62,7 +62,7 @@ class mailAccount extends plugin { + /*! \brief Initialize the mailAccount + */ + function __construct (&$config,$dn=NULL) { +- plugin::plugin ($config,$dn); ++ plugin::__construct ($config,$dn); + + /* Get attributes from parent object + */ diff -Nru gosa-plugin-mailaddress-0.99.5/debian/patches/README gosa-plugin-mailaddress-0.99.5/debian/patches/README --- gosa-plugin-mailaddress-0.99.5/debian/patches/README 1970-01-01 01:00:00.000000000 +0100 +++ gosa-plugin-mailaddress-0.99.5/debian/patches/README 2017-07-28 10:51:19.000000000 +0200 @@ -0,0 +1,3 @@ +0xxx: Grabbed from upstream development. +1xxx: Possibly relevant for upstream adoption. +2xxx: Only relevant for official Debian release. diff -Nru gosa-plugin-mailaddress-0.99.5/debian/patches/series gosa-plugin-mailaddress-0.99.5/debian/patches/series --- gosa-plugin-mailaddress-0.99.5/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ gosa-plugin-mailaddress-0.99.5/debian/patches/series 2017-07-28 10:51:19.000000000 +0200 @@ -0,0 +1 @@ +0001_php-7-compat-fix-parent-constructor-calls.patch
