[vhffs-dev] [1542] updated lighttpd patch for lighttpd 1.4.25-2 sid package

[subversion@xxxxxxxxxxxxx]

Revision: 1542
Author:   gradator
Date:     2010-01-25 19:33:31 +0100 (Mon, 25 Jan 2010)
Log Message:
-----------
updated lighttpd patch for lighttpd 1.4.25-2 sid package

Modified Paths:
--------------
    trunk/vhffs-packages/patches/lighttpd/lenny.patch

Added Paths:
-----------
    trunk/vhffs-packages/patches/lighttpd/1.4.25.patch

Added: trunk/vhffs-packages/patches/lighttpd/1.4.25.patch
===================================================================
--- trunk/vhffs-packages/patches/lighttpd/1.4.25.patch	                        (rev 0)
+++ trunk/vhffs-packages/patches/lighttpd/1.4.25.patch	2010-01-25 18:33:31 UTC (rev 1542)
@@ -0,0 +1,37 @@
+diff -Nru lighttpd-1.4.25-a/configure.ac lighttpd-1.4.25-b/configure.ac
+--- lighttpd-1.4.25-a/configure.ac	2009-11-21 15:11:50.000000000 +0000
++++ lighttpd-1.4.25-b/configure.ac	2010-01-22 17:46:37.000000000 +0000
+@@ -578,6 +578,7 @@
+ 
+ do_build="mod_cgi mod_fastcgi mod_extforward mod_proxy mod_evhost mod_simple_vhost mod_access mod_alias mod_setenv mod_usertrack mod_auth mod_status mod_accesslog"
+ do_build="$do_build mod_rrdtool mod_secdownload mod_expire mod_compress mod_dirlisting mod_indexfile mod_userdir mod_webdav mod_staticfile mod_scgi mod_flv_streaming"
++do_build="$do_build mod_partialcontentabuse"
+ 
+ plugins="mod_rewrite mod_redirect mod_ssi mod_trigger_b4_dl"
+ features="regex-conditionals"
+diff -Nru lighttpd-1.4.25-a/src/Makefile.am lighttpd-1.4.25-b/src/Makefile.am
+--- lighttpd-1.4.25-a/src/Makefile.am	2009-11-07 17:42:30.000000000 +0000
++++ lighttpd-1.4.25-b/src/Makefile.am	2010-01-22 17:46:37.000000000 +0000
+@@ -95,6 +95,11 @@
+ common_libadd =
+ endif
+ 
++lib_LTLIBRARIES += mod_partialcontentabuse.la
++mod_partialcontentabuse_la_SOURCES = mod_partialcontentabuse.c
++mod_partialcontentabuse_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
++mod_partialcontentabuse_la_LIBADD = $(common_libadd)
++
+ lib_LTLIBRARIES += mod_flv_streaming.la
+ mod_flv_streaming_la_SOURCES = mod_flv_streaming.c
+ mod_flv_streaming_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
+diff -Nru lighttpd-1.4.25-a/src/SConscript lighttpd-1.4.25-b/src/SConscript
+--- lighttpd-1.4.25-a/src/SConscript	2009-09-01 18:34:54.000000000 +0000
++++ lighttpd-1.4.25-b/src/SConscript	2010-01-22 17:46:37.000000000 +0000
+@@ -75,6 +75,7 @@
+ 	'mod_ssi' : { 'src' : [ 'mod_ssi_exprparser.c', 'mod_ssi_expr.c', 'mod_ssi.c' ], 'lib' : [ env['LIBPCRE'] ] },
+ 	'mod_flv_streaming' : { 'src' : [ 'mod_flv_streaming.c' ] },
+ 	'mod_magnet' : { 'src' : [ 'mod_magnet.c', 'mod_magnet_cache.c' ], 'lib' : [ env['LIBLUA'] ] },
++	'mod_partialcontentabuse' : { 'src' : [ 'mod_partialcontentabuse.c' ] },
+ }
+ 
+ staticenv = env.Copy(CPPFLAGS=[ env['CPPFLAGS'], '-DLIGHTTPD_STATIC', '-DOPENSSL_NO_KRB5'])

Modified: trunk/vhffs-packages/patches/lighttpd/lenny.patch
===================================================================
--- trunk/vhffs-packages/patches/lighttpd/lenny.patch	2010-01-20 22:12:24 UTC (rev 1541)
+++ trunk/vhffs-packages/patches/lighttpd/lenny.patch	2010-01-25 18:33:31 UTC (rev 1542)
@@ -1,6 +1,6 @@
-diff -uNr lighttpd-1.4.23/debian/control lighttpd-1.4.23/debian/control
---- lighttpd-1.4.23/debian/control	2009-08-27 20:44:30.000000000 +0000
-+++ lighttpd-1.4.23/debian/control	2009-08-27 20:37:55.000000000 +0000
+diff -Nru lighttpd-1.4.25-a/debian/control lighttpd-1.4.25-b/debian/control
+--- lighttpd-1.4.25-a/debian/control	2010-01-22 17:45:56.000000000 +0000
++++ lighttpd-1.4.25-b/debian/control	2010-01-22 17:48:20.000000000 +0000
 @@ -87,6 +87,15 @@
   or at a later stage, when the doc-root is known and the physical-path is 
   already setup
@@ -17,8 +17,8 @@
  Package: lighttpd-mod-webdav
  Homepage: http://www.lighttpd.net
  Architecture: any
-diff -uNr lighttpd-1.4.23/debian/lighttpd-mod-partialcontentabuse.install lighttpd-1.4.23/debian/lighttpd-mod-partialcontentabuse.install
---- lighttpd-1.4.23/debian/lighttpd-mod-partialcontentabuse.install	1970-01-01 00:00:00.000000000 +0000
-+++ lighttpd-1.4.23/debian/lighttpd-mod-partialcontentabuse.install	2009-08-27 21:08:19.000000000 +0000
+diff -Nru lighttpd-1.4.25-a/debian/lighttpd-mod-partialcontentabuse.install lighttpd-1.4.25-b/debian/lighttpd-mod-partialcontentabuse.install
+--- lighttpd-1.4.25-a/debian/lighttpd-mod-partialcontentabuse.install	1970-01-01 00:00:00.000000000 +0000
++++ lighttpd-1.4.25-b/debian/lighttpd-mod-partialcontentabuse.install	2010-01-22 17:48:20.000000000 +0000
 @@ -0,0 +1 @@
 +debian/tmp/usr/lib/lighttpd/mod_partialcontentabuse.so