[oe-commits] org.oe.dev merge of '9831ee83165ae726c1641da5b4f8f00b78674b85'

[mwester commit]

merge of '9831ee83165ae726c1641da5b4f8f00b78674b85'
     and 'dc80ff7ef30fb0e742800d3342ca5811d15194dc'

Author: mwester at openembedded.org
Branch: org.openembedded.dev
Revision: f0144e2c5085d88cf1861c146d6e33c2653a222e
ViewMTN: http://monotone.openembedded.org/revision/info/f0144e2c5085d88cf1861c146d6e33c2653a222e
Files:
1
packages/fetchmail/fetchmail-6.3.8
packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch
packages/fetchmail/fetchmail_6.3.8.bb
packages/meta/slugos-packages.bb
packages/xorg-proto/xextproto_7.0.3.bb
Diffs:

#
# mt diff -r9831ee83165ae726c1641da5b4f8f00b78674b85 -rf0144e2c5085d88cf1861c146d6e33c2653a222e
#
#
#
# add_dir "packages/fetchmail/fetchmail-6.3.8"
# 
# add_file "packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch"
#  content [43420cf3d87053e2d4e56ae314920ae659928942]
# 
# add_file "packages/fetchmail/fetchmail_6.3.8.bb"
#  content [6a789128113572f654ad3969d3db1e5b310ec06f]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [b232bd82ca02284c159702832aeb2b433fca3c4b]
#    to [28581128f0072432d1d45dbfc5a38389fb81eab2]
#
============================================================
--- packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch	43420cf3d87053e2d4e56ae314920ae659928942
+++ packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch	43420cf3d87053e2d4e56ae314920ae659928942
@@ -0,0 +1,11 @@
+--- fetchmail-6.3.8-orig/sink.c
++++ fetchmail-6.3.8/sink.c
+@@ -262,7 +262,7 @@
+     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
+ 
+     /* don't bounce in reply to undeliverable bounces */
+-    if (!msg->return_path[0] ||
++    if (!msg || !msg->return_path[0] ||
+ 	strcmp(msg->return_path, "<>") == 0 ||
+ 	strcasecmp(msg->return_path, md1) == 0 ||
+ 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)
============================================================
--- packages/fetchmail/fetchmail_6.3.8.bb	6a789128113572f654ad3969d3db1e5b310ec06f
+++ packages/fetchmail/fetchmail_6.3.8.bb	6a789128113572f654ad3969d3db1e5b310ec06f
@@ -0,0 +1,20 @@
+DESCRIPTION = "Fetchmail is a free, full-featured, robust, \
+well-documented remote-mail retrieval and forwarding utility \
+intended to be used over on-demand TCP/IP links \
+(such as SLIP or PPP connections)."
+SECTION = "console/network"
+
+LICENSE = "GPL"
+
+PR = "r2"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
+	   file://CVE-2007-4565.patch;patch=1 \
+	   "
+
+inherit autotools gettext
+
+FILES_${PN} = "${bindir}/fetchmail"
+PACKAGES += "${PN}conf"
+FILES_${PN}conf = "${libdir}/python2.5/site-packages/fetchmailconf.py* ${bindir}/fetchmailconf"
+rdepends_${PN}conf = "${PN}"
============================================================
--- packages/meta/slugos-packages.bb	b232bd82ca02284c159702832aeb2b433fca3c4b
+++ packages/meta/slugos-packages.bb	28581128f0072432d1d45dbfc5a38389fb81eab2
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r56"
+PR = "r57"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -81,6 +81,7 @@ SLUGOS_PACKAGES = "\
 	expat \
 	ez-ipupdate \
 	fconfig \
+	fetchmail \
 	file \
 	findutils \
 	fis \
@@ -256,7 +257,6 @@ SLUGOS_BROKEN_PACKAGES = "\
 	ctorrent \
 	dsniff \
 	eciadsl \
-	fetchmail \
 	gspcav1 \
 	linphone \
 	lirc-modules lirc \


#
# mt diff -rdc80ff7ef30fb0e742800d3342ca5811d15194dc -rf0144e2c5085d88cf1861c146d6e33c2653a222e
#
#
#
# add_file "packages/xorg-proto/xextproto_7.0.3.bb"
#  content [a2700c4f70667f3d8d5d1a838644f2a4bf6a2416]
#
============================================================
--- packages/xorg-proto/xextproto_7.0.3.bb	a2700c4f70667f3d8d5d1a838644f2a4bf6a2416
+++ packages/xorg-proto/xextproto_7.0.3.bb	a2700c4f70667f3d8d5d1a838644f2a4bf6a2416
@@ -0,0 +1,3 @@
+require xorg-proto-common.inc
+
+PE = "1"