flx/init-thttpd: Move patch here

Package-Manager: portage-2.2.28

4 files changed, 71 insertions, 3 deletions

diff --git a/flx/init-thttpd/Manifest b/flx/init-thttpd/Manifest
index ef22298d..2018b20e 100644
--- a/flx/init-thttpd/Manifest
+++ b/flx/init-thttpd/Manifest
@@ -1,2 +1,4 @@
-EBUILD init-thttpd-2.25b.ebuild 333 SHA256 84b675f870e54dab747e98349897ae648cf8af6fbc83cdc36029e93a99e5734e WHIRLPOOL 05eb778dbb74a4121d938be82636652fa7bfa0e17ff593abf90ac9aa543c3911afbd16f46a8f6662bd5c12a7ad4d52c2d12d17e5f9917853c2d0c15757f6e898
+AUX 2.25b-Handle-CGI-pattern.patch 1019 SHA256 4e8b8b50955f45b17bf3cb42784861db4e5429394ac9a3f60d1f721f1e72bc71 WHIRLPOOL 9218982f0f9560e3a1f73dea2ed6ba0793484e9f5352f3c5277867228b29991ef01bd7341d63fd1c311ac95e4d0b0ec7566b0a0d5e482288c84b81a0914dff83
+AUX 2.25b-Handle-listening-on-more-than-one-address.patch 1234 SHA256 ade664b9fe6dc7aebc696d87b0e0428883bcc5b32451e7d752b0f830f2da2cea WHIRLPOOL 98e6db1e3854841a0fb581b820ac1ddd26006e995df0d5910a371e5ffec596c875ca8f0e7c4d255c48275a3da22748c490b74e497b368dd0b3d9471ec52fbcac
+EBUILD init-thttpd-2.25b.ebuild 415 SHA256 035290e7664da9b30e57e4e0228401ad84259393036d1f1a375617e7488556b0 WHIRLPOOL 6180c4fbd6564aa18430776735baa997986654b3303c7a12b09b3264aed2726a5aafd466731abaa758c88b2512c51d5df1891897e37726e9c0c749f902b62acc
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/flx/init-thttpd/files/2.25b-Handle-CGI-pattern.patch b/flx/init-thttpd/files/2.25b-Handle-CGI-pattern.patch
new file mode 100644
index 00000000..1f832db3
--- /dev/null
+++ b/flx/init-thttpd/files/2.25b-Handle-CGI-pattern.patch
@@ -0,0 +1,29 @@
+From c9a1ee2bc62555d3104a55bd69ce403e66d99973 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Wed, 1 Feb 2012 21:09:23 +0100
+Subject: [PATCH 2/2] Handle CGI pattern
+
+---
+ add-ons/thttpd | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/add-ons/thttpd b/add-ons/thttpd
+index dbbb1e8..f60956a 100644
+--- a/add-ons/thttpd
++++ b/add-ons/thttpd
+@@ -11,6 +11,7 @@ option	user	standard_option
+ option	address	multiple_option
+ option	logfile	standard_option
+ option	charset	standard_option iso-8859-1
++option	cgi	multiple_option
+ option	bin	reserved_option	/usr/sbin/thttpd
+ 
+ # assign default values to options and variables before parsing the cfg file
+@@ -20,6 +21,7 @@ function fct_begin_section {
+ 	     ${opt_docroot:+-d $opt_docroot} ${opt_chroot:+-r} ${opt_symlink:+-s}
+ 	     ${opt_user:+-u $opt_user} ${opt_address:+${opt_address[@]/#/-h }}
+ 	     ${opt_logfile:+-l $opt_logfile} ${opt_charset:+-T $opt_charset}
++	     ${opt_cgi:+-c ${opt_cgi[@]}}
+ 	     ${pidfile:+-i $pidfile}'
+ }
+ 
diff --git a/flx/init-thttpd/files/2.25b-Handle-listening-on-more-than-one-address.patch b/flx/init-thttpd/files/2.25b-Handle-listening-on-more-than-one-address.patch
new file mode 100644
index 00000000..0bba391f
--- /dev/null
+++ b/flx/init-thttpd/files/2.25b-Handle-listening-on-more-than-one-address.patch
@@ -0,0 +1,31 @@
+From 2144242ac81250c708c6b2637c135b3cc8633f59 Mon Sep 17 00:00:00 2001
+From: Bertrand Jacquin <bertrand@jacquin.bzh>
+Date: Wed, 1 Feb 2012 21:08:55 +0100
+Subject: [PATCH 1/2] Handle listening on more than one address
+
+---
+ add-ons/thttpd | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/add-ons/thttpd b/add-ons/thttpd
+index 463dda3..dbbb1e8 100644
+--- a/add-ons/thttpd
++++ b/add-ons/thttpd
+@@ -8,7 +8,7 @@ option	docroot	standard_option /var/www
+ option	chroot	boolean_option	1
+ option	symlink	boolean_option	1
+ option	user	standard_option
+-option	address	standard_option
++option	address	multiple_option
+ option	logfile	standard_option
+ option	charset	standard_option iso-8859-1
+ option	bin	reserved_option	/usr/sbin/thttpd
+@@ -18,7 +18,7 @@ function fct_begin_section {
+     pidfile="/var/run/thttpd${2:+-$2}.pid"
+     cmdline='$bin ${opt_config:+-C $opt_config} ${opt_port:+-p $opt_port}
+ 	     ${opt_docroot:+-d $opt_docroot} ${opt_chroot:+-r} ${opt_symlink:+-s}
+-	     ${opt_user:+-u $opt_user} ${opt_address:+-h $opt_address}
++	     ${opt_user:+-u $opt_user} ${opt_address:+${opt_address[@]/#/-h }}
+ 	     ${opt_logfile:+-l $opt_logfile} ${opt_charset:+-T $opt_charset}
+ 	     ${pidfile:+-i $pidfile}'
+ }
diff --git a/flx/init-thttpd/init-thttpd-2.25b.ebuild b/flx/init-thttpd/init-thttpd-2.25b.ebuild
index a9d84bcf..f575ef18 100644
--- a/flx/init-thttpd/init-thttpd-2.25b.ebuild
+++ b/flx/init-thttpd/init-thttpd-2.25b.ebuild
@@ -5,9 +5,15 @@
 EAPI=6
 inherit flx-init-scripts
 
-EGIT_REPO_URI="http://master.formilux.org/git/people/beber/pkg/thttpd.git"
 EGIT_BRANCH="2-flx0"
-#EGIT_COMMIT="v2.25b-flx0.1	"
+EGIT_COMMIT="v2.25b-flx0.1"
 
 KEYWORDS="amd64 x86"
 RDEPEND=">=www-servers/thttpd-${PV}"
+
+src_prepare () {
+	default
+
+	epatch "${FILESDIR}/${PV}-Handle-listening-on-more-than-one-address.patch"
+	epatch "${FILESDIR}/${PV}-Handle-CGI-pattern.patch"
+}