[oe-commits] org.oe.dev merge of '76f8829bf251437359713bbc14c5fc611c381a32'

[rwhitby commit]

merge of '76f8829bf251437359713bbc14c5fc611c381a32'
     and 'f3f7bae5d2c6ed92a3c654cac5ab93877664a736'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 80ee64e09db344dd5a70a48ac03865ded7f9eb09
ViewMTN: http://monotone.openembedded.org/revision.psp?id=80ee64e09db344dd5a70a48ac03865ded7f9eb09
Files:
1
packages/libmrss/files
packages/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch
packages/autofs/autofs-4.1.4/autofs-additional-distros.patch
packages/libmrss/files/atom-right-date.patch
packages/autofs/autofs_4.1.4.bb
packages/libmrss/libmrss_0.17.1.bb
packages/meta/slugos-packages.bb
Diffs:

#
# mt diff -r76f8829bf251437359713bbc14c5fc611c381a32 -r80ee64e09db344dd5a70a48ac03865ded7f9eb09
#
# 
# no changes
# 


#
# mt diff -rf3f7bae5d2c6ed92a3c654cac5ab93877664a736 -r80ee64e09db344dd5a70a48ac03865ded7f9eb09
#
# 
# 
# add_dir "packages/libmrss/files"
# 
# add_file "packages/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch"
#  content [5070e7236e1a2aa5fb95155f727c15f57101f898]
# 
# add_file "packages/autofs/autofs-4.1.4/autofs-additional-distros.patch"
#  content [de13e6445a3f363848852124d3f39c09c71e0919]
# 
# add_file "packages/libmrss/files/atom-right-date.patch"
#  content [135b32dae7990d29538d40306d8052ac8d486706]
# 
# patch "packages/autofs/autofs_4.1.4.bb"
#  from [95c14e9b4061cabd8e0071b1df19b7e1f41828cd]
#    to [a424c6e4fee37df1589d0181c14420a3bc3267c2]
# 
# patch "packages/libmrss/libmrss_0.17.1.bb"
#  from [78173a9665597356a3476b6b1eabd4cfdc76cfd8]
#    to [5c7d3aa50814294c5a2d7e36e3c33112b79c8dbd]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [728a70128d71b4be7513509e242d31cbb914c6ad]
#    to [17945a027e80de4d6c5f734175f99298ef499727]
# 
============================================================
--- packages/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch	5070e7236e1a2aa5fb95155f727c15f57101f898
+++ packages/autofs/autofs-4.1.4/auto.net-sort-option-fix.patch	5070e7236e1a2aa5fb95155f727c15f57101f898
@@ -0,0 +1,11 @@
+--- autofs-4.1.4/samples/auto.net~	2005-04-05 08:02:09.000000000 -0500
++++ autofs-4.1.4/samples/auto.net	2007-04-07 14:41:19.000000000 -0500
+@@ -37,7 +37,7 @@
+ # Newer distributions get this right
+ SHOWMOUNT="$SMNT --no-headers -e $key"
+ 
+-$SHOWMOUNT | LC_ALL=C sort +0 | \
++$SHOWMOUNT | LC_ALL=C sort | \
+ 	awk -v key="$key" -v opts="$opts" -- '
+ 	BEGIN	{ ORS=""; first=1 }
+ 		{ if (first) { print opts; first=0 }; print " \\\n\t" $1, key ":" $1 }
============================================================
--- packages/autofs/autofs-4.1.4/autofs-additional-distros.patch	de13e6445a3f363848852124d3f39c09c71e0919
+++ packages/autofs/autofs-4.1.4/autofs-additional-distros.patch	de13e6445a3f363848852124d3f39c09c71e0919
@@ -0,0 +1,12 @@
+--- autofs-4.1.4/samples/rc.autofs.in~	2005-04-11 06:30:54.000000000 -0500
++++ autofs-4.1.4/samples/rc.autofs.in	2007-04-07 13:18:44.000000000 -0500
+@@ -43,6 +43,9 @@
+ 	system=debian
+ elif [ -f /etc/redhat-release ]; then
+ 	system=redhat
++elif [ -f /etc/issue ] && grep -q "^SlugOS" /etc/issue ; then
++	# SlugOS behaves like Debian, at least for autofs purposes.
++	system=debian
+ else
+ 	echo "$0: Unknown system, please port and contact autofs at linux.kernel.org" 1>&2
+ 	exit 1
============================================================
--- packages/libmrss/files/atom-right-date.patch	135b32dae7990d29538d40306d8052ac8d486706
+++ packages/libmrss/files/atom-right-date.patch	135b32dae7990d29538d40306d8052ac8d486706
@@ -0,0 +1,15 @@
+tm_mon goes from 0-11 written dates from 1-12. It is too late to consider security
+here. The worst that can happen is that tm_mon == 0 gets negative but I assume
+glibc to do range checking.
+Index: libmrss-0.17.1/src/mrss_parser.c
+===================================================================
+--- libmrss-0.17.1.orig/src/mrss_parser.c	2007-04-08 02:42:23.000000000 +0200
++++ libmrss-0.17.1/src/mrss_parser.c	2007-04-08 02:43:37.000000000 +0200
+@@ -150,6 +150,7 @@
+     {
+       char datebuf[256];
+       stm.tm_year -= 1900;
++      stm.tm_mon  -= 1;
+ 
+       if (!data->c_locale
+ 	  && !(data->c_locale = newlocale (LC_ALL_MASK, "C", NULL)))
============================================================
--- packages/autofs/autofs_4.1.4.bb	95c14e9b4061cabd8e0071b1df19b7e1f41828cd
+++ packages/autofs/autofs_4.1.4.bb	a424c6e4fee37df1589d0181c14420a3bc3267c2
@@ -1,14 +1,18 @@ LICENSE = "GPL"
 DESCRIPTION = "Kernel based automounter for linux."
 SECTION = "base"
 LICENSE = "GPL"
 
+PR = "r1"
+
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-${PV}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-misc-fixes.patch;patch=1 \
            ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-multi-parse-fix.patch;patch=1 \
            ${KERNELORG_MIRROR}/pub/linux/daemons/autofs/v4/autofs-4.1.4-non-replicated-ping.patch;patch=1 \
            file://cross.patch;patch=1 \
            file://Makefile.rules-cross.patch;patch=1 \
-	   file://install.patch;patch=1"
+	   file://install.patch;patch=1 \
+	   file://auto.net-sort-option-fix.patch;patch=1 \
+	   file://autofs-additional-distros.patch;patch=1"
 
 inherit autotools
 
============================================================
--- packages/libmrss/libmrss_0.17.1.bb	78173a9665597356a3476b6b1eabd4cfdc76cfd8
+++ packages/libmrss/libmrss_0.17.1.bb	5c7d3aa50814294c5a2d7e36e3c33112b79c8dbd
@@ -1,13 +1,14 @@ DEPENDS = "libnxml curl"
 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"
 
 DEPENDS = "libnxml curl"
-PR      = "r0"
+PR      = "r1"
 
 inherit autotools pkgconfig
 
-SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz"
+SRC_URI = "http://www2.autistici.org/bakunin/libmrss/libmrss-${PV}.tar.gz \
+           file://atom-right-date.patch;patch=1                           "
 
 do_stage() {
     autotools_stage_all
============================================================
--- packages/meta/slugos-packages.bb	728a70128d71b4be7513509e242d31cbb914c6ad
+++ packages/meta/slugos-packages.bb	17945a027e80de4d6c5f734175f99298ef499727
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r32"
+PR = "r33"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -27,6 +27,7 @@ SLUGOS_PACKAGES = "\
 	audiofile \
 	aumix \
 	autoconf \
+	autofs \
 	automake \
 	bash \
 	beep \
@@ -124,6 +125,7 @@ SLUGOS_PACKAGES = "\
 	ncftp \
 	ncurses \
 	netcat \
+	nfs-utils \
 	nmap \
 	ntfs-3g \
 	ntp \