Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into org.openembedded.dev

8 files changed, 282 insertions, 0 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 32a0630e96..e6f5cbf050 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -18038,6 +18038,10 @@ sha256=0ea976722c993c87dede8eb6348e6feb059e3851bbef2de824bf18ac97cdb565
 md5=6c974df7a5a5b1579f72115e6b045bda
 sha256=0ea976722c993c87dede8eb6348e6feb059e3851bbef2de824bf18ac97cdb565
 
+[http://downloads.sourceforge.net/net-snmp/net-snmp-5.4.2.1.tar.gz]
+md5=984932520143f0c8bf7b7ce1fc9e1da1
+sha256=11a8baf167f7bfff60d2590e050991400a3a082923dbcdbf85e0e0ce46eb247c
+
 [http://download.berlios.de/net-tools/net-tools-1.60.tar.bz2]
 md5=888774accab40217dde927e21979c165
 sha256=7ae4dd6d44d6715f18e10559ffd270511b6e55a8900ca54fbebafe0ae6cf7d7b
@@ -23054,6 +23058,10 @@ sha256=dcb0c10965430862721b675e2f9f6a30819880e03124b5e9403bfce2c7f3b69a
 md5=4809dcf89e504d4039ed01c9f61c68d5
 sha256=3da4fccc40c7c8ad51dba5bc7ac29a3a53905d5f2de0761353214d7e359d4bfd
 
+[http://www.klake.org/~jt/sscep/sscep.tgz]
+md5=89ba368c8455c324d208e5f5965f8f8f
+sha256=e622c344f72c6d95e15db834efbf777392778b2854e58a5d8f5d20b668cf2a9b
+
 [http://downloads.sourceforge.net/fuse/sshfs-fuse-1.3.tar.gz]
 md5=40fe4a353d03b80f8b37e4b0cc6159d3
 sha256=f80f713105fc0747197b6e5d2440cd77205cb1febe25b7b4fe08809ab67ace26
@@ -24714,6 +24722,10 @@ sha256=dbc5d6921136711f08c197284ec67dc77232559e2e31429f8a30a1a102bd07f7
 md5=042c5243ce0253341fe920a8a863e37b
 sha256=6d2ae5d70609df7d2c2b518eca0624c4a59328b277ed114b9e5b57dd030e6e94
 
+[http://www.draisberghof.de/usb_modeswitch/usb_modeswitch-1.0.2.tar.bz2]
+md5=4f896ed631f9be0338df9c5a2145ef82
+sha256=f1b9388f4507185a4ac30bae3383d9e9bbb95075a14dd188c904cacdd8cf4e66
+
 [http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r0.patch]
 md5=c8193bc27642fa446d702cfdb9464c2a
 sha256=2101f292449cbacc277aecc5c649de895d501057f299e8e48a7ec50cfb0a200d
diff --git a/recipes/net-snmp/net-snmp-5.4.2.1/configure-tail.patch b/recipes/net-snmp/net-snmp-5.4.2.1/configure-tail.patch
new file mode 100644
index 0000000000..89f9309535
--- /dev/null
+++ b/recipes/net-snmp/net-snmp-5.4.2.1/configure-tail.patch
@@ -0,0 +1,99 @@
+diff -urN net-snmp-5.4.1-orig/acinclude.m4 net-snmp-5.4.1-patched/acinclude.m4
+--- net-snmp-5.4.1-orig/acinclude.m4	2006-08-15 05:25:49.000000000 +0200
++++ net-snmp-5.4.1-patched/acinclude.m4	2007-08-14 13:22:13.000000000 +0200
+@@ -39,7 +39,7 @@
+ dnl
+ AC_DEFUN([AC_PROMPT_USER],
+ [
+-MSG_CHECK=`echo "$2" | tail -1`
++MSG_CHECK=`echo "$2" | tail -n 1`
+ AC_CACHE_CHECK($MSG_CHECK, ac_cv_user_prompt_$1,
+ [echo "" >&AC_FD_MSG
+ AC_PROMPT_USER_NO_DEFINE($1,[$2],$3)
+diff -urN net-snmp-5.4.1-orig/configure net-snmp-5.4.1-patched/configure
+--- net-snmp-5.4.1-orig/configure	2007-07-27 19:04:19.000000000 +0200
++++ net-snmp-5.4.1-patched/configure	2007-08-14 13:22:13.000000000 +0200
+@@ -26417,7 +26417,7 @@
+ 	# hpux make (at least) doesn't like a trailing \ on the last
+ 	# line even when the next line contains nothing but
+ 	# whitespace.
+-	lasttoken=`tail -1 mk/$i.mk | awk '{print $1}'`
++	lasttoken=`tail -n 1 mk/$i.mk | awk '{print $1}'`
+ 	sed "s#$lasttoken \\\\#$lasttoken#" < mk/$i.mk > mk/$i.mk.tmp
+ 	mv mk/$i.mk.tmp mk/$i.mk
+ 
+@@ -48793,7 +48793,7 @@
+ 
+ ME=`$WHOAMI`
+ if test -f /etc/resolv.conf; then
+-  LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
++  LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n 1 | awk '{print $NF}'`
+ else
+   LOC="@no.where"
+ fi
+@@ -48819,7 +48819,7 @@
+    Providing the --with-default-snmp-version=\"x\" parameter to ./configure
+ will avoid this prompt.
+ 
+-Default version of SNMP to use" | tail -1`
++Default version of SNMP to use" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_DEFAULT_SNMP_VERSION+set}" = set; then
+@@ -48903,7 +48903,7 @@
+   Providing the --with-sys-contact=\"contact\" parameter to ./configure
+ will avoid this prompt.
+ 
+-System Contact Information" | tail -1`
++System Contact Information" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_SYS_CONTACT+set}" = set; then
+@@ -48967,7 +48967,7 @@
+   Providing the --with-sys-location=\"location\" parameter to ./configure
+ will avoid this prompt.
+ 
+-System Location" | tail -1`
++System Location" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_SYS_LOC+set}" = set; then
+@@ -49037,7 +49037,7 @@
+   Providing the --with-logfile=\"path\" parameter to ./configure
+ will avoid this prompt.
+ 
+-Location to write logfile" | tail -1`
++Location to write logfile" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_LOGFILE+set}" = set; then
+@@ -49114,7 +49114,7 @@
+   Providing the --with-persistent-directory=\"path\" parameter to
+ ./configure will avoid this prompt.
+ 
+-Location to write persistent information" | tail -1`
++Location to write persistent information" | tail -n 1`
+ echo "$as_me:$LINENO: checking $MSG_CHECK" >&5
+ echo $ECHO_N "checking $MSG_CHECK... $ECHO_C" >&6
+ if test "${ac_cv_user_prompt_NETSNMP_PERSISTENT_DIRECTORY+set}" = set; then
+diff -urN net-snmp-5.4.1-orig/configure.in net-snmp-5.4.1-patched/configure.in
+--- net-snmp-5.4.1-orig/configure.in	2007-07-27 19:02:00.000000000 +0200
++++ net-snmp-5.4.1-patched/configure.in	2007-08-14 13:22:13.000000000 +0200
+@@ -2465,7 +2465,7 @@
+ 	# hpux make (at least) doesn't like a trailing \ on the last
+ 	# line even when the next line contains nothing but
+ 	# whitespace.
+-	lasttoken=`tail -1 mk/$i.mk | awk '{print $1}'`
++	lasttoken=`tail -n 1 mk/$i.mk | awk '{print $1}'`
+ 	sed "s#$lasttoken \\\\#$lasttoken#" < mk/$i.mk > mk/$i.mk.tmp
+ 	mv mk/$i.mk.tmp mk/$i.mk
+ 
+@@ -4575,7 +4575,7 @@
+ 
+ ME=`$WHOAMI`
+ if test -f /etc/resolv.conf; then
+-  LOC=`cat /etc/resolv.conf | grep '^domain' | tail -1 | awk '{print $NF}'`
++  LOC=`cat /etc/resolv.conf | grep '^domain' | tail -n 1 | awk '{print $NF}'`
+ else
+   LOC="@no.where"
+ fi
diff --git a/recipes/net-snmp/net-snmp_5.4.2.1.bb b/recipes/net-snmp/net-snmp_5.4.2.1.bb
new file mode 100644
index 0000000000..3c51a5fa3c
--- /dev/null
+++ b/recipes/net-snmp/net-snmp_5.4.2.1.bb
@@ -0,0 +1,26 @@
+require net-snmp.inc
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/net-snmp/net-snmp-${PV}.tar.gz \
+        file://configure-tail.patch;patch=1 \
+        file://init \
+        file://snmpd.conf \
+        file://snmptrapd.conf"
+
+EXTRA_OECONF = "--enable-shared --disable-manuals --with-defaults \
+                --disable-embedded-perl --with-perl-modules=no"
+EXTRA_OEMAKE = "INSTALL_PREFIX=${D}"
+
+do_configure_prepend() {
+        gnu-configize -f
+        # We better change sources and re-autoconf here, but
+        # required autoconf is too new for us.
+        sed -e '/echo.*\".*\\\\.*\"/s/echo/echo -e/g' \
+            -e 's/tail -1/tail -n 1/g'                \
+            -i configure
+
+        #The tarball for v5.4.2.1 is missing config.sub
+        cp ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S}
+}
+
+PARALLEL_MAKE = ""
+CCACHE = ""
diff --git a/recipes/sscep/files/ca_segfault.patch b/recipes/sscep/files/ca_segfault.patch
new file mode 100644
index 0000000000..1a438b9be1
--- /dev/null
+++ b/recipes/sscep/files/ca_segfault.patch
@@ -0,0 +1,10 @@
+--- a/sscep.c	2009-07-10 11:43:14.000000000 -0400
++++ b/sscep.c	2009-07-10 10:53:37.000000000 -0400
+@@ -469,6 +469,7 @@
+ 				pname, c_char);
+ 			(void)fclose(fp);
+ 			pkistatus = SCEP_PKISTATUS_SUCCESS;
++			scep_t.pki_status = SCEP_PKISTATUS_SUCCESS;
+ 			break;
+ 
+ 		case SCEP_OPERATION_GETCERT:
diff --git a/recipes/sscep/files/httphost.patch b/recipes/sscep/files/httphost.patch
new file mode 100644
index 0000000000..313df16309
--- /dev/null
+++ b/recipes/sscep/files/httphost.patch
@@ -0,0 +1,66 @@
+commit cb3827e31b14e4830bdfd309c12f5510e0402d8d
+Author: michael <michael@ea9f5d8b-f83d-0410-bf23-ec2180cbb196>
+Date:   Mon Jun 25 21:52:51 2007 +0000
+
+    20040325.1: add HTTP Host: header to work behind Hughes satellite autoproxy
+    
+    
+    git-svn-id: file:///usr/local/httpd/SourceForge/home/users/michael/svn/svnrepos/os/packages/sscep/trunk@37 ea9f5d8b-f83d-0410-bf23-ec2180cbb196
+
+diff --git a/sscep.c b/sscep.c
+index 6ec2a4d..6eefdc9 100644
+--- a/sscep.c
++++ b/sscep.c
+@@ -16,6 +16,7 @@ main(int argc, char **argv) {
+ 	int			c, host_port = 80, count = 1;
+ 	char			*host_name, *p, *dir_name = NULL;
+ 	char			http_string[16384];
++	char			http_host[256];
+ 	struct http_reply	reply;
+ 	unsigned int		n;
+ 	unsigned char		md[EVP_MAX_MD_SIZE];
+@@ -250,6 +251,9 @@ main(int argc, char **argv) {
+ 	if (p_flag) {
+ 		host_name = strdup(p_char);
+ 		dir_name = url_char;
++
++		/* I won't bother with the Host: header for proxy mode. */
++		http_host[0] = '\0';
+ 	}
+ 
+ 	/* Break down the URL */
+@@ -289,6 +293,12 @@ main(int argc, char **argv) {
+ 				host_port);
+ 		exit (SCEP_PKISTATUS_ERROR);
+ 	}
++	if (!p_flag) {
++		if (snprintf(http_host, sizeof(http_host), "Host: %s:%d\r\n",
++			     host_name, host_port) >= sizeof(http_host)) {
++			http_host[0] = '\0';
++		}
++	}
+ 	if (v_flag) {
+ 		fprintf(stdout, "%s: hostname: %s\n", pname, host_name);
+ 		fprintf(stdout, "%s: directory: %s\n", pname, dir_name);
+@@ -349,8 +359,8 @@ main(int argc, char **argv) {
+ 			/* Forge the HTTP message */
+ 			snprintf(http_string, sizeof(http_string),
+ 			 "GET %s%s?operation=GetCACert&message=%s "
+-			 "HTTP/1.0\r\n\r\n", p_flag ? "" : "/", dir_name,
+-					i_char); 
++			 "HTTP/1.0\r\n%s\r\n", p_flag ? "" : "/",
++					dir_name, i_char, http_host);
+ 			printf("%s: requesting CA certificate\n", pname);
+ 			if (d_flag)
+ 				fprintf(stdout, "%s: scep msg: %s", pname,
+@@ -549,8 +559,8 @@ not_enroll:
+ 			snprintf(http_string, sizeof(http_string),
+ 				"GET %s%s?operation="
+ 				"PKIOperation&message="
+-				"%s HTTP/1.0\r\n\r\n",
+-				p_flag ? "" : "/", dir_name, p);
++				"%s HTTP/1.0\r\n%s\r\n",
++				p_flag ? "" : "/", dir_name, p, http_host);
+ 
+ 			free(p);
+ 			p = NULL;
diff --git a/recipes/sscep/files/memleak.patch b/recipes/sscep/files/memleak.patch
new file mode 100644
index 0000000000..59256a49c8
--- /dev/null
+++ b/recipes/sscep/files/memleak.patch
@@ -0,0 +1,25 @@
+commit ec9b27537400def0bee1ebbbdd69f2cf5486a99a
+Author: michael <michael@ea9f5d8b-f83d-0410-bf23-ec2180cbb196>
+Date:   Mon May 9 16:10:54 2005 +0000
+
+    Maybe fix a memory leak
+    
+    
+    git-svn-id: file:///usr/local/httpd/SourceForge/home/users/michael/svn/svnrepos/os/packages/sscep/trunk@15 ea9f5d8b-f83d-0410-bf23-ec2180cbb196
+
+diff --git a/sscep.c b/sscep.c
+index 637f1f0..b8f3289 100644
+--- a/sscep.c
++++ b/sscep.c
+@@ -539,7 +539,10 @@ not_enroll:
+ 				"GET %s%s?operation="
+ 				"PKIOperation&message="
+ 				"%s HTTP/1.0\r\n\r\n",
+-				p_flag ? "" : "/", dir_name, p); 
++				p_flag ? "" : "/", dir_name, p);
++
++			free(p);
++			p = NULL;
+ 
+ 			if (d_flag)
+ 				fprintf(stdout, "%s: scep msg: %s",
diff --git a/recipes/sscep/sscep_0.0.20081211.bb b/recipes/sscep/sscep_0.0.20081211.bb
new file mode 100644
index 0000000000..7791e23546
--- /dev/null
+++ b/recipes/sscep/sscep_0.0.20081211.bb
@@ -0,0 +1,21 @@
+DESCRIPTION = "Simple SCEP Client for Unix"
+SECTION = "console/utils"
+LICENSE = "BSD"
+
+SRC_URI = " \
+	http://www.klake.org/~jt/sscep/sscep.tgz \
+	file://memleak.patch;patch=1 \
+	file://httphost.patch;patch=1 \
+	file://ca_segfault.patch;patch=1 \
+"
+
+S = "${WORKDIR}/${PN}"
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 sscep ${D}${bindir}/sscep
+}
diff --git a/recipes/usb-modeswitch/usb-modeswitch_1.0.2.bb b/recipes/usb-modeswitch/usb-modeswitch_1.0.2.bb
new file mode 100644
index 0000000000..3919106a95
--- /dev/null
+++ b/recipes/usb-modeswitch/usb-modeswitch_1.0.2.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "A mode switching tool for controlling 'flip flop' (multiple device) USB gear"
+SECTION = "base"
+PRIORITY = "required"
+LICENSE = "GPLv2"
+DEPENDS = "virtual/libusb0"
+
+SRC_URI = "http://www.draisberghof.de/usb_modeswitch/usb_modeswitch-${PV}.tar.bz2"
+
+S = "${WORKDIR}/usb_modeswitch-${PV}"
+
+PACKAGES = "${PN}"
+FILES_${PN} = "${bindir} ${sysconfdir}"
+
+do_compile() {
+	oe_runmake
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -d ${D}${sysconfdir}
+	install -m 0755 ${S}/usb_modeswitch ${D}${bindir}/usb_modeswitch
+	install -m 0644 ${S}/usb_modeswitch.conf ${D}${sysconfdir}/usb_modeswitch.conf
+}