-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hello, __ Please CC me, I am not subscribed! __ in the last time I took care about some bugs in otrs2 as qa uploads. Now I have fixed most bugs also in the lenny version, they are also RC bugs. If it is okay, I would upload it. I attached the debdiff. Here is the ddiffstat: me@gnu:~/build/otrs2$ diff -Naur otrs2-2.2.7.orig/ otrs2-2.2.7|diffstat changelog | 17 +++++++++++++++++ control | 2 +- patches/emailsyntax.diff | 15 +++++++++++++++ patches/remove-maxrequestsperchild.diff | 21 +++++++++++++++++++++ patches/series | 2 ++ postinst | 4 +++- 6 files changed, 59 insertions(+), 2 deletions(-) Here is the changelog: me@gnu:~/build/otrs2$ head otrs2-2.2.7/debian/changelog -n 16 otrs2 (2.2.7-2lenny2) stable-proposed-updates; urgency=low * QA upload. * Add remove-maxrequestsperchild.diff patch, which removes the MaxRequestsPerChild Apache options from the config files. Closes: #548073 * Add emailsyntax.diff patch, which removes all valid domains from the email address syntax check. Closes: #541309 * Only execute a2enmod, if it is available on the system. Thanks for the patch to Hilmar Preusse <hille42@web.de>. Closes: #524315 * Recommend postgresql-8.3 instead of the non-existing postgresql-8.2. Closes: #535004 -- Patrick Matthäi <pmatthaei@debian.org> Thu, 05 Nov 2009 18:36:56 +0100 - -- /* Mit freundlichem Gruß / With kind regards, Patrick Matthäi GNU/Linux Debian Developer E-Mail: pmatthaei@debian.org patrick@linux-dev.org Comment: Always if we think we are right, we were maybe wrong. */ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkrzElAACgkQ2XA5inpabMdJyQCZAQPqFYOceKdo6KaAe5z1jv7H NkEAn05BYfNPpyWSYajkk0dvks/AdnBw =lZhp -----END PGP SIGNATURE-----
diff -Naur otrs2-2.2.7.orig/debian/changelog otrs2-2.2.7/debian/changelog --- otrs2-2.2.7.orig/debian/changelog 2009-11-05 18:54:43.000000000 +0100 +++ otrs2-2.2.7/debian/changelog 2009-11-05 18:58:12.000000000 +0100 @@ -1,3 +1,20 @@ +otrs2 (2.2.7-2lenny2) stable-proposed-updates; urgency=low + + * QA upload. + * Add remove-maxrequestsperchild.diff patch, which removes the + MaxRequestsPerChild Apache options from the config files. + Closes: #548073 + * Add emailsyntax.diff patch, which removes all valid domains from the email + address syntax check. + Closes: #541309 + * Only execute a2enmod, if it is available on the system. Thanks for the + patch to Hilmar Preusse <hille42@web.de>. + Closes: #524315 + * Recommend postgresql-8.3 instead of the non-existing postgresql-8.2. + Closes: #535004 + + -- Patrick Matthäi <pmatthaei@debian.org> Thu, 05 Nov 2009 18:36:56 +0100 + otrs2 (2.2.7-2lenny1) testing-proposed-updates; urgency=low * Do not load the module Apache2::Reload if it is not installed. diff -Naur otrs2-2.2.7.orig/debian/control otrs2-2.2.7/debian/control --- otrs2-2.2.7.orig/debian/control 2009-11-05 18:54:43.000000000 +0100 +++ otrs2-2.2.7/debian/control 2009-11-05 18:44:34.000000000 +0100 @@ -15,7 +15,7 @@ libcrypt-passwdmd5-perl, libdate-pcalc-perl, libemail-valid-perl, libio-stringy-perl, libmime-perl, libmailtools-perl, adduser, ucf, debconf, dbconfig-common (>= 1.8.24), libtext-diff-perl, libxml-parser-perl -Recommends: libapache2-mod-perl2, postgresql-8.2 | mysql-server, +Recommends: libapache2-mod-perl2, postgresql-8.3 | mysql-server, libdbd-pg-perl | libdbd-mysql-perl, libgd-text-perl, libgd-graph-perl, procmail | maildrop, aspell | ispell Suggests: otrs2-doc-en | otrs2-doc-de, libnet-ldap-perl diff -Naur otrs2-2.2.7.orig/debian/patches/emailsyntax.diff otrs2-2.2.7/debian/patches/emailsyntax.diff --- otrs2-2.2.7.orig/debian/patches/emailsyntax.diff 1970-01-01 01:00:00.000000000 +0100 +++ otrs2-2.2.7/debian/patches/emailsyntax.diff 2009-11-05 18:38:03.000000000 +0100 @@ -0,0 +1,15 @@ +# Remove "*@me.xy{z}" from invalid email addresses, this domain is realy used and valid. +# Closes: #541309 + +diff -Naur otrs-2.3.4.orig/Kernel/Config/Defaults.pm otrs-2.3.4/Kernel/Config/Defaults.pm +--- otrs-2.3.4.orig/Kernel/Config/Defaults.pm 2009-10-12 12:44:27.000000000 +0200 ++++ otrs-2.3.4/Kernel/Config/Defaults.pm 2009-10-12 12:46:19.000000000 +0200 +@@ -240,7 +240,7 @@ + + # CheckEmailInvalidAddress + # (regexp of invalid email addresses) +- $Self->{CheckEmailInvalidAddress} = '@(aa|aaa|aaaa|aaaaa|abc|any|anywhere|anonymous|bar|demo|example|foo|hello|hallo|me|nospam|nowhere|null|some|somewhere|test|teste.|there|user|xx|xxx|xxxx)\.(..|...)$'; ++ $Self->{CheckEmailInvalidAddress} = '@(example)\.(..|...)$'; + + # --------------------------------------------------- # + # LogModule # diff -Naur otrs2-2.2.7.orig/debian/patches/remove-maxrequestsperchild.diff otrs2-2.2.7/debian/patches/remove-maxrequestsperchild.diff --- otrs2-2.2.7.orig/debian/patches/remove-maxrequestsperchild.diff 1970-01-01 01:00:00.000000000 +0100 +++ otrs2-2.2.7/debian/patches/remove-maxrequestsperchild.diff 2009-11-05 18:37:29.000000000 +0100 @@ -0,0 +1,21 @@ +# Remove the MaxRequestsPerChild options, this should not be changed by otrs2. + +diff -Naur otrs2-2.3.4.orig/scripts/apache2-httpd.include.conf otrs2-2.3.4/scripts/apache2-httpd.include.conf +--- otrs2-2.3.4.orig/scripts/apache2-httpd.include.conf 2009-11-01 12:19:45.000000000 +0100 ++++ otrs2-2.3.4/scripts/apache2-httpd.include.conf 2009-11-01 12:21:42.000000000 +0100 +@@ -45,6 +45,3 @@ + Allow from all + </Directory> + +-# MaxRequestsPerChild (so no apache child will be to big!) +-MaxRequestsPerChild 400 +- +diff -Naur otrs2-2.3.4.orig/scripts/apache2-httpd-new.include.conf otrs2-2.3.4/scripts/apache2-httpd-new.include.conf +--- otrs2-2.3.4.orig/scripts/apache2-httpd-new.include.conf 2009-11-01 12:19:45.000000000 +0100 ++++ otrs2-2.3.4/scripts/apache2-httpd-new.include.conf 2009-11-01 12:22:05.000000000 +0100 +@@ -54,5 +54,3 @@ + Allow from all + </Directory> + +-# MaxRequestsPerChild (so no apache child will be to big!) +-MaxRequestsPerChild 400 diff -Naur otrs2-2.2.7.orig/debian/patches/series otrs2-2.2.7/debian/patches/series --- otrs2-2.2.7.orig/debian/patches/series 2009-11-05 18:54:43.000000000 +0100 +++ otrs2-2.2.7/debian/patches/series 2009-11-05 18:38:19.000000000 +0100 @@ -7,3 +7,5 @@ apache.diff no-installer.diff #permissions.diff +remove-maxrequestsperchild.diff +emailsyntax.diff diff -Naur otrs2-2.2.7.orig/debian/postinst otrs2-2.2.7/debian/postinst --- otrs2-2.2.7.orig/debian/postinst 2009-11-05 18:54:43.000000000 +0100 +++ otrs2-2.2.7/debian/postinst 2009-11-05 18:41:48.000000000 +0100 @@ -58,7 +58,9 @@ setup_cron ucf --three-way --debconf-ok $OTRSHOME/.fetchmailrc.dist /etc/otrs/fetchmailrc chmod 600 /etc/otrs/fetchmailrc - setup_apache + if [ -x /usr/sbin/a2enmod ]; then + setup_apache + fi $OTRSHOME/bin/SetPermissions.sh $OTRSHOME otrs www-data www-data www-data ;;
Attachment:
otrs_lenny.diff.sig
Description: Binary data