[vhffs-dev] [1521] OK, it was (not) the last time I commited without testing

[subversion@xxxxxxxxxxxxx]

Revision: 1521
Author:   beuss
Date:     2009-08-27 23:36:46 +0200 (Thu, 27 Aug 2009)
Log Message:
-----------
OK, it was (not) the last time I commited without testing

Added Paths:
-----------
    trunk/vhffs-packages/patches/lighttpd/1.4.23.patch
    trunk/vhffs-packages/patches/lighttpd/10-partialcontentabuse.conf
    trunk/vhffs-packages/patches/lighttpd/lenny.patch

Removed Paths:
-------------
    trunk/vhffs-packages/patches/lighttpd/partialcontentabuse-debian.patch
    trunk/vhffs-packages/patches/lighttpd/partialcontentabuse.patch

Added: trunk/vhffs-packages/patches/lighttpd/1.4.23.patch
===================================================================
--- trunk/vhffs-packages/patches/lighttpd/1.4.23.patch	                        (rev 0)
+++ trunk/vhffs-packages/patches/lighttpd/1.4.23.patch	2009-08-27 21:36:46 UTC (rev 1521)
@@ -0,0 +1,37 @@
+diff -uNr lighttpd-1.4.23/configure.ac lighttpd-1.4.23/configure.ac
+--- lighttpd-1.4.23/configure.ac	2009-06-07 19:13:05.000000000 +0000
++++ lighttpd-1.4.23/configure.ac	2009-08-27 21:21:09.000000000 +0000
+@@ -570,6 +570,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 -uNr lighttpd-1.4.23/src/Makefile.am lighttpd-1.4.23/src/Makefile.am
+--- lighttpd-1.4.23/src/Makefile.am	2009-06-16 13:45:42.000000000 +0000
++++ lighttpd-1.4.23/src/Makefile.am	2009-08-27 21:22:22.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 -uNr lighttpd-1.4.23/src/SConscript lighttpd-1.4.23/src/SConscript
+--- lighttpd-1.4.23/src/SConscript	2009-04-09 15:45:55.000000000 +0000
++++ lighttpd-1.4.23/src/SConscript	2009-08-27 21:14:28.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'])


Property changes on: trunk/vhffs-packages/patches/lighttpd/1.4.23.patch
___________________________________________________________________
Added: svn:mergeinfo
   + 

Added: trunk/vhffs-packages/patches/lighttpd/10-partialcontentabuse.conf
===================================================================
--- trunk/vhffs-packages/patches/lighttpd/10-partialcontentabuse.conf	                        (rev 0)
+++ trunk/vhffs-packages/patches/lighttpd/10-partialcontentabuse.conf	2009-08-27 21:36:46 UTC (rev 1521)
@@ -0,0 +1,3 @@
+## Disallow parallel connection for the same file download.
+
+server.modules  += ( "mod_partialcontentabuse" )

Added: trunk/vhffs-packages/patches/lighttpd/lenny.patch
===================================================================
--- trunk/vhffs-packages/patches/lighttpd/lenny.patch	                        (rev 0)
+++ trunk/vhffs-packages/patches/lighttpd/lenny.patch	2009-08-27 21:36:46 UTC (rev 1521)
@@ -0,0 +1,24 @@
+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
+@@ -87,6 +87,15 @@
+  or at a later stage, when the doc-root is known and the physical-path is 
+  already setup
+ 
++Package: lighttpd-mod-partialcontentabuse
++Homepage: http://www.vhffs.org
++Architecture: any
++Depends: lighttpd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
++Description: Forbid multiple connections for the same file download on lighttpd.
++ mod_partialcontentabuse returns a 403 error if the same client opens multiple
++ concurrent connections to download a single file.
++
++
+ 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
+@@ -0,0 +1 @@
++debian/tmp/usr/lib/lighttpd/mod_partialcontentabuse.so

Deleted: trunk/vhffs-packages/patches/lighttpd/partialcontentabuse-debian.patch
===================================================================
--- trunk/vhffs-packages/patches/lighttpd/partialcontentabuse-debian.patch	2009-08-27 20:59:07 UTC (rev 1520)
+++ trunk/vhffs-packages/patches/lighttpd/partialcontentabuse-debian.patch	2009-08-27 21:36:46 UTC (rev 1521)
@@ -1,19 +0,0 @@
-diff -urN lighttpd-1.4.23/debian/control lighttpd.patched/lighttpd-1.4.23/debian/control
---- lighttpd-1.4.23/debian/control	2009-08-27 20:44:30.000000000 +0000
-+++ lighttpd.patched/lighttpd-1.4.23/debian/control	2009-08-27 20:37:55.000000000 +0000
-@@ -87,6 +87,15 @@
-  or at a later stage, when the doc-root is known and the physical-path is 
-  already setup
- 
-+Package: lighttpd-mod-partialcontentabuse
-+Homepage: http://www.vhffs.org
-+Architecture: any
-+Depends: lighttpd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-+Description: Forbid multiple connections for the same file download on lighttpd.
-+ mod_partialcontentabuse returns a 403 error if the same client opens multiple
-+ concurrent connections to download a single file.
-+
-+
- Package: lighttpd-mod-webdav
- Homepage: http://www.lighttpd.net
- Architecture: any

Deleted: trunk/vhffs-packages/patches/lighttpd/partialcontentabuse.patch
===================================================================
--- trunk/vhffs-packages/patches/lighttpd/partialcontentabuse.patch	2009-08-27 20:59:07 UTC (rev 1520)
+++ trunk/vhffs-packages/patches/lighttpd/partialcontentabuse.patch	2009-08-27 21:36:46 UTC (rev 1521)
@@ -1,15 +0,0 @@
-diff -urN lighttpd-1.4.23/src/Makefile.am lighttpd.patched/lighttpd-1.4.23/src/Makefile.am
---- lighttpd-1.4.23/src/Makefile.am	2009-06-16 13:45:42.000000000 +0000
-+++ lighttpd.patched/lighttpd-1.4.23/src/Makefile.am	2009-08-27 20:33:53.000000000 +0000
-@@ -95,6 +95,11 @@
- common_libadd =
- endif
- 
-+lib_LTLIBRARIES += mod_partialcontentabuse.la
-+mod_flv_streaming_la_SOURCES = mod_partialcontentabuse.c
-+mod_flv_streaming_la_LDFLAGS = -module -export-dynamic -avoid-version -no-undefined
-+mod_flv_streaming_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