merge of 'a2a88493748857f520eccb0e35d7277af6762e61'

     and 'fad527d227dd0598909d19a70f175bd576271455'

8 files changed, 172 insertions, 6 deletions

diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass
index 958ab91fa6..edef2805d4 100644
--- a/classes/sanity.bbclass
+++ b/classes/sanity.bbclass
@@ -86,7 +86,7 @@ def check_sanity(e):
 	if not check_app_exists('${BUILD_PREFIX}g++', e.data):
 		missing = missing + "C++ Compiler (${BUILD_PREFIX}g++),"
 
-	required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk"
+	required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk shasum md5sum"
 
 	for util in required_utilities.split():
 		if not check_app_exists( util, e.data ):
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 81b92ad069..f73fc47571 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1,3 +1,11 @@
-[file-native-4.20-ftp://ftp.astron.com/pub/file/file-4.20.tar.gz]
+[ftp://ftp.astron.com/pub/file/file-4.20.tar.gz]
 md5=402bdb26356791bd5d277099adacc006
 sha256=c0810fb3ddb6cb73c9ff045965e542af6e3eaa7f2995b3037181766d26d5e6e7
+
+[http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.tar.gz]
+md5=28d0e78d736748e67f25ad99456f10c3
+sha256=9bccf1240ce9317510eb860e7fcd387be2ddc73adc14451d679a6a7358383772
+
+[http://www2.autistici.org/bakunin/libnxml/libnxml-0.16.tar.gz]
+md5=85b6a42a9e17a23c01b2f2ed0ece0563
+sha256=6154872089834b0ffd34e92612d07e2d1ccec572698bd861da752eeeaab7ca78
diff --git a/packages/libmrss/files/.mtn2git_empty b/packages/libmrss/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/libmrss/files/.mtn2git_empty
diff --git a/packages/libmrss/files/atom-changes.patch b/packages/libmrss/files/atom-changes.patch
new file mode 100644
index 0000000000..42f74d00f2
--- /dev/null
+++ b/packages/libmrss/files/atom-changes.patch
@@ -0,0 +1,17 @@
+Make sure to always set a pubDate
+
+Index: libmrss-0.17/src/mrss_parser.c
+===================================================================
+--- libmrss-0.17.orig/src/mrss_parser.c	2007-03-22 19:40:54.000000000 +0100
++++ libmrss-0.17/src/mrss_parser.c	2007-03-22 19:44:15.000000000 +0100
+@@ -270,6 +270,10 @@
+ 		   && data->version == MRSS_VERSION_ATOM_1_0)
+ 	    item->pubDate =
+ 	      __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
++	  else if (!strcmp(cur->value, "updated" ) && !item->pubDate
++		  && data->version == MRSS_VERSION_ATOM_1_0)
++	    item->pubDate =
++         __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
+ 
+ 	  /* issued -> pubDate (Atom 0.3) */
+ 	  else if (!strcmp (cur->value, "issued") && !item->pubDate)
diff --git a/packages/libmrss/files/bump-version.patch b/packages/libmrss/files/bump-version.patch
new file mode 100644
index 0000000000..2eeb6931c8
--- /dev/null
+++ b/packages/libmrss/files/bump-version.patch
@@ -0,0 +1,16 @@
+Bump the version info, specially as I changed the struct in a binary
+incompatible way.
+
+Index: libmrss-0.17/src/Makefile.am
+===================================================================
+--- libmrss-0.17.orig/src/Makefile.am	2007-04-01 16:43:58.000000000 +0200
++++ libmrss-0.17/src/Makefile.am	2007-04-01 16:44:10.000000000 +0200
+@@ -10,7 +10,7 @@
+ 	mrss_options.c \
+ 	mrss_search.c
+ 
+-libmrss_la_LDFLAGS = -version-info 0:16:0
++libmrss_la_LDFLAGS = -version-info 0:17:0
+ 
+ EXTRA_DIST = mrss.h mrss_internal.h
+ 
diff --git a/packages/libmrss/files/fix_atom_date_locale.patch b/packages/libmrss/files/fix_atom_date_locale.patch
new file mode 100644
index 0000000000..4d46033d10
--- /dev/null
+++ b/packages/libmrss/files/fix_atom_date_locale.patch
@@ -0,0 +1,122 @@
+The Atom date formating code tries to create a RFC822 date. This date
+requires to use the C locale for the date (for weekday-names and month-names).
+
+This patch uses new POSIX functionality to create a C locale and strftime_l
+to create a right RFC822 date.
+
+Index: libmrss-0.17/src/mrss.h
+===================================================================
+--- libmrss-0.17.orig/src/mrss.h	2007-04-01 00:29:06.000000000 +0200
++++ libmrss-0.17/src/mrss.h	2007-04-01 01:22:25.000000000 +0200
+@@ -364,6 +364,9 @@
+   mrss_element_t element;
+   int allocated;
+ 
++  /** For internal use only: */
++  void* c_locale;
++
+   /* Data: */
+ 
+   char *file;
+Index: libmrss-0.17/src/mrss_free.c
+===================================================================
+--- libmrss-0.17.orig/src/mrss_free.c	2007-04-01 00:32:56.000000000 +0200
++++ libmrss-0.17/src/mrss_free.c	2007-04-01 15:45:44.000000000 +0200
+@@ -22,9 +22,14 @@
+ # error Use configure; make; make install
+ #endif
+ 
++#define _GNU_SOURCE
++
+ #include "mrss.h"
+ #include "mrss_internal.h"
+ 
++#include <locale.h>
++
++
+ static void __mrss_free_channel (mrss_t * mrss);
+ static void __mrss_free_category (mrss_category_t * category);
+ static void __mrss_free_hour (mrss_hour_t * hour);
+@@ -202,6 +207,9 @@
+       __mrss_free_item ((mrss_item_t *) old);
+     }
+ 
++  if (mrss->c_locale)
++    freelocale (mrss->c_locale);
++
+   if (mrss->allocated)
+     free (mrss);
+ }
+Index: libmrss-0.17/src/mrss_parser.c
+===================================================================
+--- libmrss-0.17.orig/src/mrss_parser.c	2007-03-30 01:07:56.000000000 +0200
++++ libmrss-0.17/src/mrss_parser.c	2007-04-01 16:40:57.000000000 +0200
+@@ -22,9 +22,13 @@
+ # error Use configure; make; make install
+ #endif
+ 
++#define _GNU_SOURCE
++
+ #include "mrss.h"
+ #include "mrss_internal.h"
+ 
++#include <locale.h>
++
+ static void
+ __mrss_parse_tag_insert (mrss_tag_t ** where, mrss_tag_t * what)
+ {
+@@ -133,7 +137,7 @@
+ }
+ 
+ static char *
+-__mrss_atom_prepare_date (char *datestr)
++__mrss_atom_prepare_date (mrss_t *data, char *datestr)
+ {
+   char *ret = NULL;
+   if (datestr)
+@@ -150,8 +154,14 @@
+ 	  stm.tm_year -= 1900;
+ 	  char datebuf[256];
+ 	  free (datestr);
+-	  strftime (datebuf, sizeof (datebuf), "%a, %d %b %Y %H:%M:%S %z",
+-		    &stm);
++
++      if (!data->c_locale) {
++        printf( "Creating the locale\n" );
++         data->c_locale = newlocale(LC_ALL_MASK,"C",NULL);
++      }
++
++	  strftime_l (datebuf, sizeof (datebuf), "%a, %d %b %Y %H:%M:%S %z",
++		    &stm, data->c_locale);
+ 	  ret = strdup (datebuf);
+ 	}
+     }
+@@ -269,16 +279,16 @@
+ 	  else if (!strcmp (cur->value, "published") && !item->pubDate
+ 		   && data->version == MRSS_VERSION_ATOM_1_0)
+ 	    item->pubDate =
+-	      __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
++	      __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL));
+ 	  else if (!strcmp(cur->value, "updated" ) && !item->pubDate
+ 		  && data->version == MRSS_VERSION_ATOM_1_0)
+ 	    item->pubDate =
+-         __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
++         __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL));
+ 
+ 	  /* issued -> pubDate (Atom 0.3) */
+ 	  else if (!strcmp (cur->value, "issued") && !item->pubDate)
+ 	    item->pubDate =
+-	      __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
++	      __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL));
+ 
+ 	  /* id -> guid */
+ 	  else if (!strcmp (cur->value, "id") && !item->guid
+@@ -701,7 +711,7 @@
+ 	  /* updated -> lastBuildDate */
+ 	  else if (!strcmp (cur->value, "updated"))
+ 	    data->lastBuildDate =
+-	      __mrss_atom_prepare_date (nxmle_get_string (cur, NULL));
++	      __mrss_atom_prepare_date (data, nxmle_get_string (cur, NULL));
+ 
+ 	  /* author -> managingeditor */
+ 	  else if (!strcmp (cur->value, "author"))
diff --git a/packages/libmrss/libmrss_0.17.bb b/packages/libmrss/libmrss_0.17.bb
index c2170fa09a..4d03985f9e 100644
--- a/packages/libmrss/libmrss_0.17.bb
+++ b/packages/libmrss/libmrss_0.17.bb
@@ -1,12 +1,15 @@
 DESCRIPTION = "mRSS is a C library for parsing, writing and creating RSS (0.91, 0.92, 1.0, 2.0) files or streams"
 LICENSE = "LGPL"
-HOMEPAGE = "http://www2.autistici.org/bakunin//codes.php"
+HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php"
 
 DEPENDS = "libnxml curl"
 
 inherit autotools pkgconfig
 
-SRC_URI = "http://www2.autistici.org/bakunin//libmrss/libmrss-${PV}.tar.gz;md5sum=28d0e78d736748e67f25ad99456f10c3"
+SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \
+           file://atom-changes.patch;patch=1                              \
+           file://fix_atom_date_locale.patch;patch=1                      \
+           file://bump-version.patch;patch=1 "
 
 do_stage() {
     autotools_stage_all
diff --git a/packages/libnxml/libnxml_0.16.bb b/packages/libnxml/libnxml_0.16.bb
index c798ff3405..6f836d226d 100644
--- a/packages/libnxml/libnxml_0.16.bb
+++ b/packages/libnxml/libnxml_0.16.bb
@@ -1,4 +1,4 @@
-HOMEPAGE = "http://www2.autistici.org/bakunin//codes.php"
+HOMEPAGE = "http://www2.autistici.org/bakunin/codes.php"
 DESCRIPTION = "nXML is a C library for parsing, writing and creating XML 1.0 and 1.1 files or streams. It supports utf-8, utf-16be and utf-16le, ucs-4 (1234, 4321, 2143, 2312)"
 LICENSE = "LGPL"
 
@@ -6,7 +6,7 @@ DEPENDS = "curl"
 
 inherit autotools pkgconfig
 
-SRC_URI = "http://www2.autistici.org/bakunin//libnxml/libnxml-${PV}.tar.gz;md5sum=85b6a42a9e17a23c01b2f2ed0ece0563"
+SRC_URI = "http://www2.autistici.org/bakunin/libnxml/libnxml-${PV}.tar.gz"
 
 
 do_stage() {