Package: acidbase Version: 1.4.4-3 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu lucid ubuntu-patch
*** /tmp/tmpb4SIDV In Ubuntu, we've applied the attached patch to achieve the following: * debian/patches/13_add_missing_function.dpatch: Add missing ProtocolFieldCriteria::ProtocolFieldCriteria() function to work properly with php 5.3. (LP: #561556) We thought you might be interested in doing the same. -- System Information: Debian Release: squeeze/sid APT prefers lucid-updates APT policy: (500, 'lucid-updates'), (500, 'lucid-security'), (500, 'lucid') Architecture: amd64 (x86_64) Kernel: Linux 2.6.32-19-generic (SMP w/2 CPU cores) Locale: LANG=en_CA.utf8, LC_CTYPE=en_CA.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -u acidbase-1.4.4/debian/changelog acidbase-1.4.4/debian/changelog diff -u acidbase-1.4.4/debian/patches/00list acidbase-1.4.4/debian/patches/00list --- acidbase-1.4.4/debian/patches/00list +++ acidbase-1.4.4/debian/patches/00list @@ -5,0 +6 @@ +13_add_missing_function only in patch2: unchanged: --- acidbase-1.4.4.orig/debian/patches/13_add_missing_function.dpatch +++ acidbase-1.4.4/debian/patches/13_add_missing_function.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +# Description: Add missing ProtocolFieldCriteria::ProtocolFieldCriteria() +# function to work properly with php 5.3 +# Origin: upstream, http://secureideas.cvs.sourceforge.net/viewvc/secureideas/base-php4/includes/base_state_citems.inc.php?r1=1.36&r2=1.37 +# Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/acidbase/+bug/561556 + +...@dpatch@ +diff -urNad acidbase-1.4.4~/includes/base_state_citems.inc.php acidbase-1.4.4/includes/base_state_citems.inc.php +--- acidbase-1.4.4~/includes/base_state_citems.inc.php 2009-09-05 11:58:07.000000000 -0400 ++++ acidbase-1.4.4/includes/base_state_citems.inc.php 2010-04-12 10:59:14.000000000 -0400 +@@ -293,6 +293,17 @@ + + class ProtocolFieldCriteria extends MultipleElementCriteria + { ++ function ProtocolFieldCriteria(&$db, &$cs, $export_name, $element_cnt, $field_list = Array() ) ++ { ++ $tdb =& $db; ++ $cs =& $cs; ++ ++ $this->MultipleElementCriteria($tdb, $cs, $export_name, $element_cnt, $field_list); ++ ++ } ++ ++ ++ + function SanitizeElement($i) + { + // Make a copy of the element array