[oe-commits] org.oe.dev merge of '305437fef3e07f06f422c525af6d258fe65bd133'

[jeremy_laine commit]

merge of '305437fef3e07f06f422c525af6d258fe65bd133'
     and '374794f574689cc1c361cad389b3b85f1ab2132d'

Author: jeremy_laine at openembedded.org
Branch: org.openembedded.dev
Revision: f121ff59ddc88918fdbf4ca28a76373ee9ac4fb6
ViewMTN: http://monotone.openembedded.org/revision/info/f121ff59ddc88918fdbf4ca28a76373ee9ac4fb6
Files:
1
packages/lighttpd/lighttpd/mod_redirect.c.patch
packages/lighttpd/lighttpd_1.4.18.bb
packages/freesmartphone/gsmd2_git.bb
conf/distro/include/fso-autorev.inc
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r305437fef3e07f06f422c525af6d258fe65bd133 -rf121ff59ddc88918fdbf4ca28a76373ee9ac4fb6
#
#
#
# add_file "packages/lighttpd/lighttpd/mod_redirect.c.patch"
#  content [72125cb3f78b258d8cc10312b081efda99dc6566]
# 
# patch "packages/lighttpd/lighttpd_1.4.18.bb"
#  from [632e100a9bf487c1c13ab8a725b547925ad9d3b4]
#    to [87bdba70a8b53a9b74d557c0e814401db916a0b8]
#
============================================================
--- packages/lighttpd/lighttpd/mod_redirect.c.patch	72125cb3f78b258d8cc10312b081efda99dc6566
+++ packages/lighttpd/lighttpd/mod_redirect.c.patch	72125cb3f78b258d8cc10312b081efda99dc6566
@@ -0,0 +1,56 @@
+Backport support for url.redirect-code directive from 1.5 branch.
+
+diff -urN lighttpd-1.4.18.orig/src/mod_redirect.c lighttpd-1.4.18/src/mod_redirect.c
+--- lighttpd-1.4.18.orig/src/mod_redirect.c	2007-04-10 09:52:58.000000000 +0200
++++ lighttpd-1.4.18/src/mod_redirect.c	2008-06-11 17:38:50.000000000 +0200
+@@ -16,6 +16,8 @@
+ typedef struct {
+ 	pcre_keyvalue_buffer *redirect;
+ 	data_config *context; /* to which apply me */
++
++	unsigned short redirect_code;
+ } plugin_config;
+ 
+ typedef struct {
+@@ -72,6 +74,7 @@
+ 
+ 	config_values_t cv[] = {
+ 		{ "url.redirect",               NULL, T_CONFIG_LOCAL, T_CONFIG_SCOPE_CONNECTION }, /* 0 */
++		{ "url.redirect-code",          NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 1 */
+ 		{ NULL,                         NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
+ 	};
+ 
+@@ -90,6 +93,7 @@
+ 		s->redirect   = pcre_keyvalue_buffer_init();
+ 
+ 		cv[0].destination = s->redirect;
++		cv[1].destination = &(s->redirect_code);
+ 
+ 		p->config_storage[i] = s;
+ 		ca = ((data_config *)srv->config_context->data[i])->value;
+@@ -140,6 +144,7 @@
+ 	plugin_config *s = p->config_storage[0];
+ 
+ 	p->conf.redirect = s->redirect;
++	p->conf.redirect_code = s->redirect_code;
+ 	p->conf.context = NULL;
+ 
+ 	/* skip the first, the global context */
+@@ -157,6 +162,8 @@
+ 			if (0 == strcmp(du->key->ptr, "url.redirect")) {
+ 				p->conf.redirect = s->redirect;
+ 				p->conf.context = dc;
++			} else if (0 == strcmp(du->key->ptr, "url.redirect-code")) {
++				p->conf.redirect_code = s->redirect_code;
+ 			}
+ 		}
+ 	}
+@@ -250,7 +257,7 @@
+ 
+ 			response_header_insert(srv, con, CONST_STR_LEN("Location"), CONST_BUF_LEN(p->location));
+ 
+-			con->http_status = 301;
++			con->http_status = p->conf.redirect_code > 99 && p->conf.redirect_code < 1000 ? p->conf.redirect_code : 301;
+ 			con->file_finished = 1;
+ 
+ 			return HANDLER_FINISHED;
============================================================
--- packages/lighttpd/lighttpd_1.4.18.bb	632e100a9bf487c1c13ab8a725b547925ad9d3b4
+++ packages/lighttpd/lighttpd_1.4.18.bb	87bdba70a8b53a9b74d557c0e814401db916a0b8
@@ -2,10 +2,11 @@ DEPENDS = "libpcre"
 SECTION = "net"
 LICENSE = "BSD"
 DEPENDS = "libpcre"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \
 	   file://configure.in.patch;patch=1 \
+	   file://mod_redirect.c.patch;patch=1 \
 	   file://src-server.c.patch;patch=1 \
 	   file://index.html \
 	   file://lighttpd.conf \


#
# mt diff -r374794f574689cc1c361cad389b3b85f1ab2132d -rf121ff59ddc88918fdbf4ca28a76373ee9ac4fb6
#
#
#
# add_file "packages/freesmartphone/gsmd2_git.bb"
#  content [eb494ab0a34eb1eb05405be07913484edac19752]
# 
# patch "conf/distro/include/fso-autorev.inc"
#  from [39ab82da931646c6f9b45c00429bd9e1d0439ee3]
#    to [e1b0456452cc19ca7b0be9d08342f5254aeb8618]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [1f6914f14515fa52e709def13a58783aba358e1b]
#    to [799e5b3094242ccaceadb5218b1047ca5c1aa204]
#
============================================================
--- packages/freesmartphone/gsmd2_git.bb	eb494ab0a34eb1eb05405be07913484edac19752
+++ packages/freesmartphone/gsmd2_git.bb	eb494ab0a34eb1eb05405be07913484edac19752
@@ -0,0 +1,14 @@
+DESCRIPTION = "GSM 07.07 phone server"
+HOMEPAGE = "http://www.freesmartphone.org/mediawiki/index.php/Implementations/gsm0710muxd"
+AUTHOR = "Ixonos"
+SECTION = "console/network"
+DEPENDS = "dbus dbus-glib"
+RDEPENDS = "gsm0710muxd"
+LICENSE = "GPL"
+PV = "0.0.0+gitr${SRCREV}"
+PR = "r0"
+
+SRC_URI = "${FREESMARTPHONE_GIT}/gsmd2.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+inherit autotools
============================================================
--- conf/distro/include/fso-autorev.inc	39ab82da931646c6f9b45c00429bd9e1d0439ee3
+++ conf/distro/include/fso-autorev.inc	e1b0456452cc19ca7b0be9d08342f5254aeb8618
@@ -1,4 +1,5 @@ SRCREV_pn-gsm0710muxd = "${AUTOREV}"
 SRCREV_pn-gsm0710muxd = "${AUTOREV}"
+SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-pygsm = "${AUTOREV}"
 SRCREV_pn-mickeyterm = "${AUTOREV}"
 SRCREV_pn-pyneod = "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	1f6914f14515fa52e709def13a58783aba358e1b
+++ conf/distro/include/sane-srcrevs.inc	799e5b3094242ccaceadb5218b1047ca5c1aa204
@@ -42,6 +42,7 @@ SRCREV_pn-gsm0710muxd ?= "6fecc78198dd82
 SRCREV_pn-gnuradio ?= "6377"
 SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gsm0710muxd ?= "6fecc78198dd821bbe29efd096bd8fecd855179d"
+SRCREV_pn-gsmd2 ?= "963f34df8fa3ff4b301079dcf86e9acea6b6fe0f"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"