r12676 - in /desktop/unstable/bug-buddy/debian: changelog control control.in patches/01_email-rfc3696.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Fri Sep 21 19:23:35 2007
New Revision: 12676

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12676
Log:
* Depend on gnome-desktop-data 2.20.0-2 for gnome-version.
  Closes: #438339.
* 01_email-rfc3696.patch: Patch from Ben Finney to allow all valid 
  emails per RFC 3696. Closes: #433888.

Added:
    desktop/unstable/bug-buddy/debian/patches/01_email-rfc3696.patch
Modified:
    desktop/unstable/bug-buddy/debian/changelog
    desktop/unstable/bug-buddy/debian/control
    desktop/unstable/bug-buddy/debian/control.in

Modified: desktop/unstable/bug-buddy/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/changelog?rev=12676&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/changelog (original)
+++ desktop/unstable/bug-buddy/debian/changelog Fri Sep 21 19:23:35 2007
@@ -9,8 +9,12 @@
   * Build-depend on libelf-dev.
   * Remove menu entry, it's useless.
   * Clean the mess installed in the GTK+ modules directory.
-
- -- Josselin Mouette <joss at debian.org>  Fri, 21 Sep 2007 20:20:07 +0200
+  * Depend on gnome-desktop-data 2.20.0-2 for gnome-version.
+    Closes: #438339.
+  * 01_email-rfc3696.patch: Patch from Ben Finney to allow all valid 
+    emails per RFC 3696. Closes: #433888.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 21 Sep 2007 21:11:33 +0200
 
 bug-buddy (2.18.1-2) unstable; urgency=low
 

Modified: desktop/unstable/bug-buddy/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/control?rev=12676&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/control (original)
+++ desktop/unstable/bug-buddy/debian/control Fri Sep 21 19:23:35 2007
@@ -30,7 +30,8 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          gdb,
-         scrollkeeper
+         scrollkeeper,
+         gnome-desktop-data (>= 2.20.0-2)
 Description: GNOME Desktop Environment bug reporting tool
  The goal of bug-buddy is to make reporting bugs very simple and easy for users,
  while making the reports themselves more useful and informative for developers.

Modified: desktop/unstable/bug-buddy/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/control.in?rev=12676&op=diff
==============================================================================
--- desktop/unstable/bug-buddy/debian/control.in (original)
+++ desktop/unstable/bug-buddy/debian/control.in Fri Sep 21 19:23:35 2007
@@ -30,7 +30,8 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          gdb,
-         scrollkeeper
+         scrollkeeper,
+         gnome-desktop-data (>= 2.20.0-2)
 Description: GNOME Desktop Environment bug reporting tool
  The goal of bug-buddy is to make reporting bugs very simple and easy for users,
  while making the reports themselves more useful and informative for developers.

Added: desktop/unstable/bug-buddy/debian/patches/01_email-rfc3696.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/bug-buddy/debian/patches/01_email-rfc3696.patch?rev=12676&op=file
==============================================================================
--- desktop/unstable/bug-buddy/debian/patches/01_email-rfc3696.patch (added)
+++ desktop/unstable/bug-buddy/debian/patches/01_email-rfc3696.patch Fri Sep 21 19:23:35 2007
@@ -1,0 +1,59 @@
+diff -ruN bug-buddy-2.18.1/src/bug-buddy.c bug-buddy-2.18.1-email-rfc3696/src/bug-buddy.c
+--- bug-buddy-2.18.1/src/bug-buddy.c	2007-02-19 04:25:18.000000000 +1100
++++ bug-buddy-2.18.1-email-rfc3696/src/bug-buddy.c	2007-07-19 15:15:49.000000000 +1000
+@@ -825,12 +825,9 @@
+ 		return FALSE;
+ 
+ 	for (character = local_part; *character; character++) {
+-		/* If character is alphanumeric it is valid. */
+-		if (g_ascii_isalnum (*character))
+-			continue;
+-
+-		/* If character is "-", "_" or "." it is valid. */
+-		if (*character == '-' || *character == '_' || *character == '.')
++		/* RFC 3696 says *any* printable ASCII character can
++		 * appear in local-part, subject to quoting rules. */
++		if (g_ascii_isprint (*character))
+ 			continue;
+ 
+ 		/* Not valid character, not valid local part. */
+@@ -905,21 +902,30 @@
+ {
+ 	char *local_part;
+ 	char *domain;
+-	char **parts;
++	char *address_reversed;
++	char **parts_reversed;
+ 	gboolean is_valid;
+ 
+-	parts = g_strsplit (address, "@", 2);
++	/* Split on the *last* '@' character:
++	 * First reverse the address, then split, then reverse each
++	 * part back to normal */
++	address_reversed = g_strreverse (address);
++	parts_reversed = g_strsplit (address_reversed, "@", 2);
++	domain = g_strreverse (parts_reversed[0]);
++	local_part = g_strreverse (parts_reversed[1]);
++	g_strfreev (parts_reversed);
++	g_strfreev (address_reversed);
+ 
+ 	/* Check we have the 2 parts */
+-	if (!(local_part = parts[0]) || !(domain = parts[1])) {
+-		g_strfreev (parts);
+-		return FALSE;
++	if (!(local_part) || !(domain)) {
++		/* We don't have both parts, address can't be valid */
++		is_valid = FALSE;
++	} else {
++		/* Check each part is valid */
++		is_valid = email_local_part_is_valid (local_part)
++			&& email_domain_is_valid (domain);
+ 	}
+ 
+-	is_valid = email_local_part_is_valid (local_part)
+-		&& email_domain_is_valid (domain);
+-
+-	g_strfreev (parts);
+ 	return is_valid;
+ }
+