From ff9bc2cd09433e6371e56d2d70bb7a03fe5111e5 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Mon, 26 Jan 2009 18:44:21 +0100
Subject: [PATCH] release preparations
Ignore-this: 7c662f92b5b2a94faf57c4c716dada3a
darcs-hash:20090126174421-7ad00-ce2c5ec1353f774e7bbeaf358117f68e7df2a32b.gz
---
conf/msg | 2 +-
conf/wordblock.conf | 14 ++++++++++++--
install.php | 2 +-
3 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/conf/msg b/conf/msg
index 6f29a321f..3133eaaa2 100644
--- a/conf/msg
+++ b/conf/msg
@@ -1,4 +1,4 @@
-14
+15
The first line of this file contains a number, indicating
which notification messages should not be displayed. This
is the only information sent to dokuwiki.org when the
diff --git a/conf/wordblock.conf b/conf/wordblock.conf
index 1c005b10b..da7143257 100644
--- a/conf/wordblock.conf
+++ b/conf/wordblock.conf
@@ -2,7 +2,7 @@
# it is available from http://blacklist.chongqed.org/
# You can use each line below as a regular expression
# that can be tested against URLs on your wiki.
-# The last spammer was added on 2008-03-06 13:56:50
+# The last spammer was added on 2008-09-11 10:14:51
https?:\/\/([^\/]*\.)?-com-boob-sex-sexy\.travel-ag\.od\.ua
https?:\/\/([^\/]*\.)?0--sex\.com
@@ -786,6 +786,7 @@ https?:\/\/([^\/]*\.)?bedspread-king\.keckins\.be
https?:\/\/([^\/]*\.)?begcrucial\.justfree\.com
https?:\/\/([^\/]*\.)?beginninghouse\.com
https?:\/\/([^\/]*\.)?begot\.info
+https?:\/\/([^\/]*\.)?beijing-door\.cn
https?:\/\/([^\/]*\.)?beijingimpression\.com
https?:\/\/([^\/]*\.)?bekahboo3\.blogspot\.com
https?:\/\/([^\/]*\.)?beldam\.dns1\.us
@@ -1709,6 +1710,7 @@ https?:\/\/([^\/]*\.)?chilton-b82sebrrue\.blogspot\.com
https?:\/\/([^\/]*\.)?chimp-cu4gvwsceg\.blogspot\.com
https?:\/\/([^\/]*\.)?china--magnet\.com
https?:\/\/([^\/]*\.)?china-dwcuzqft6\.blogspot\.com
+https?:\/\/([^\/]*\.)?china-made-door\.com\.cn
https?:\/\/([^\/]*\.)?china01\.52blog\.net
https?:\/\/([^\/]*\.)?china02\.52blog\.net
https?:\/\/([^\/]*\.)?china1\.52blog\.net
@@ -3453,6 +3455,7 @@ https?:\/\/([^\/]*\.)?health-insurance-save\.com
https?:\/\/([^\/]*\.)?health-jack\.com
https?:\/\/([^\/]*\.)?healthinsurance-x\.com
https?:\/\/([^\/]*\.)?healthprocare\.info
+https?:\/\/([^\/]*\.)?hebei-railings\.cn
https?:\/\/([^\/]*\.)?hecarabi\.info
https?:\/\/([^\/]*\.)?hefo-adrianna\.blogspot\.com
https?:\/\/([^\/]*\.)?hek-tshirthell-com\.blogspot\.com
@@ -3818,6 +3821,7 @@ https?:\/\/([^\/]*\.)?itchy-skin\.nm\.ru
https?:\/\/([^\/]*\.)?itchy_skin\.chat\.ru
https?:\/\/([^\/]*\.)?itcweb\.ecsu\.edu
https?:\/\/([^\/]*\.)?itdk0\.myfreewebhost\.org
+https?:\/\/([^\/]*\.)?item4u\.com
https?:\/\/([^\/]*\.)?itgeecna\.forumzen\.com
https?:\/\/([^\/]*\.)?itp\.nyu\.edu
https?:\/\/([^\/]*\.)?itpvewa\.myfreewebhost\.org
@@ -5386,6 +5390,7 @@ https?:\/\/([^\/]*\.)?pharmacy05\.com
https?:\/\/([^\/]*\.)?pharmacybuy1\.angelcities\.com
https?:\/\/([^\/]*\.)?pharmaduk\.xshorturl\.com
https?:\/\/([^\/]*\.)?phendimetrazine\.1\.p2l\.info
+https?:\/\/([^\/]*\.)?phendimetrazinenx\.u\.yuku\.com
https?:\/\/([^\/]*\.)?phentermine--mine\.blogspot\.com
https?:\/\/([^\/]*\.)?phentermine-911\.bee\.pl
https?:\/\/([^\/]*\.)?phentermine-911\.coz\.in
@@ -5992,6 +5997,7 @@ https?:\/\/([^\/]*\.)?safety_product\.chat\.ru
https?:\/\/([^\/]*\.)?sahezzz\.blogspot\.com
https?:\/\/([^\/]*\.)?saibon\.com\.cn
https?:\/\/([^\/]*\.)?sakura-watanuki\.blogspot\.com
+https?:\/\/([^\/]*\.)?salewroughtiron\.cn
https?:\/\/([^\/]*\.)?sample-porn-clip-newst1x\.blogspot\.com
https?:\/\/([^\/]*\.)?sample-porn-clip-zoneapa\.blogspot\.com
https?:\/\/([^\/]*\.)?samsung-ringtonedta\.blogspot\.com
@@ -6276,6 +6282,8 @@ https?:\/\/([^\/]*\.)?smutgremlins-com-w6d7m6ji\.blogspot\.com
https?:\/\/([^\/]*\.)?smutmaestro\.net
https?:\/\/([^\/]*\.)?snafusurfer\.net
https?:\/\/([^\/]*\.)?snakesworld-com-bye\.blogspot\.com
+https?:\/\/([^\/]*\.)?sneakercool\.com
+https?:\/\/([^\/]*\.)?sneakernice\.com
https?:\/\/([^\/]*\.)?sneck\.info
https?:\/\/([^\/]*\.)?snkfbl1\.myfreewebhost\.org
https?:\/\/([^\/]*\.)?snmcq\.szm\.sk
@@ -6949,6 +6957,7 @@ https?:\/\/([^\/]*\.)?tramadol\.skocz\.net
https?:\/\/([^\/]*\.)?tramadol\.su\.pl
https?:\/\/([^\/]*\.)?tramadol\.weboficial\.com
https?:\/\/([^\/]*\.)?tramadol7\.php5\.cz
+https?:\/\/([^\/]*\.)?tramadolnx\.u\.yuku\.com
https?:\/\/([^\/]*\.)?tramadolonline\.ovp\.pl
https?:\/\/([^\/]*\.)?tramadolonlinez\.blogsome\.com
https?:\/\/([^\/]*\.)?tramadolq\.bloggingmylife\.com
@@ -7210,6 +7219,7 @@ https?:\/\/([^\/]*\.)?valium\.47\.pl
https?:\/\/([^\/]*\.)?valium\.goodpharm\.info
https?:\/\/([^\/]*\.)?valium\.skocz\.net
https?:\/\/([^\/]*\.)?valium\.su\.pl
+https?:\/\/([^\/]*\.)?valiumnx\.u\.yuku\.com
https?:\/\/([^\/]*\.)?valiums\.eu\.tf
https?:\/\/([^\/]*\.)?valleyswap\.info
https?:\/\/([^\/]*\.)?valtrex\.1\.p2l\.info
@@ -7544,7 +7554,6 @@ https?:\/\/([^\/]*\.)?www\.hcs\.harvard\.edu
https?:\/\/([^\/]*\.)?www\.health-livening\.com
https?:\/\/([^\/]*\.)?www\.imperial\.edu
https?:\/\/([^\/]*\.)?www\.isis\.vanderbilt\.edu
-https?:\/\/([^\/]*\.)?www\.jhu\.edu
https?:\/\/([^\/]*\.)?www\.leal-alfa\.upc\.edu
https?:\/\/([^\/]*\.)?www\.ns\.ui\.edu
https?:\/\/([^\/]*\.)?www\.oswego\.edu
@@ -7621,6 +7630,7 @@ https?:\/\/([^\/]*\.)?xanax\.esguay\.com
https?:\/\/([^\/]*\.)?xanax\.goodpharm\.info
https?:\/\/([^\/]*\.)?xanax\.skocz\.net
https?:\/\/([^\/]*\.)?xanax\.su\.pl
+https?:\/\/([^\/]*\.)?xanaxnx\.u\.yuku\.com
https?:\/\/([^\/]*\.)?xawcj\.myfreewebhost\.org
https?:\/\/([^\/]*\.)?xboct13\.blogspot\.com
https?:\/\/([^\/]*\.)?xbyzkngo-teensite\.blogspot\.com
diff --git a/install.php b/install.php
index 999f7c72c..b27a1a6ee 100644
--- a/install.php
+++ b/install.php
@@ -44,7 +44,7 @@ $dokuwiki_hash = array(
'2007-05-24' => 'd80f2740c84c4a6a791fd3c7a353536f',
'2007-06-26' => 'b3ca19c7a654823144119980be73cd77',
'2008-05-04' => '1e5c42eac3219d9e21927c39e3240aad',
- 'devel' => 'e848931c42085af285aabec85df1ac89',
+ 'rc2009-01-26' => 'ec8c04210732a14fdfce0f7f6eead865',
);
--
GitLab