Changeset 4970 for branches/Release01x00/core/tools/pkg
- Timestamp:
- 09/17/09 23:24:49 (4 years ago)
- Location:
- branches/Release01x00/core/tools/pkg
- Files:
-
- 15 edited
- 4 copied
-
. (modified) (1 prop)
-
build_deb.sh (modified) (2 diffs)
-
debian/LocalSite.cfg (modified) (3 diffs)
-
debian/NEWS.Debian (modified) (1 diff)
-
debian/ShorterUrl.conf (copied) (copied from trunk/core/tools/pkg/debian/ShorterUrl.conf)
-
debian/apache.conf (modified) (3 diffs)
-
debian/changelog (modified) (1 diff)
-
debian/conffile (modified) (1 diff)
-
debian/control (modified) (1 diff)
-
debian/mod_perl_startup.pl (modified) (1 diff)
-
debian/patches/00_More_Extensions_warning.dpatch (copied) (copied from trunk/core/tools/pkg/debian/patches/00_More_Extensions_warning.dpatch)
-
debian/patches/00list (modified) (1 diff)
-
debian/patches/01_configure_logo.dpatch (copied) (copied from trunk/core/tools/pkg/debian/patches/01_configure_logo.dpatch)
-
debian/patches/Item1830-fix-validation-nonce.dpatch (copied) (copied from trunk/core/tools/pkg/debian/patches/Item1830-fix-validation-nonce.dpatch)
-
debian/postinst (modified) (8 diffs)
-
debian/postrm (modified) (1 diff)
-
debian/rules (modified) (1 diff)
-
debian/templates (modified) (1 diff)
-
readme.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/Release01x00/core/tools/pkg
-
Property
svn:mergeinfo
set to
/trunk/core/tools/pkg merged eligible
-
Property
svn:mergeinfo
set to
-
branches/Release01x00/core/tools/pkg/build_deb.sh
r1853 r4970 5 5 exit -1; 6 6 fi 7 if [ ! -e Foswiki-1.0. 0.tgz ]; then8 echo 'need Foswiki-1.0. 0.tgz file to build'7 if [ ! -e Foswiki-1.0.6.tgz ]; then 8 echo 'need Foswiki-1.0.6.tgz file to build' 9 9 exit -1; 10 10 fi … … 12 12 mkdir /tmp/build_deb 13 13 cp -r debian /tmp/build_deb/ 14 cp Foswiki-1.0. 0.tgz /tmp/build_deb/foswiki_1.0.0.orig.tar.gz14 cp Foswiki-1.0.6.tgz /tmp/build_deb/foswiki_1.0.6.orig.tar.gz 15 15 16 16 cd /tmp/build_deb 17 tar zxvf /tmp/build_deb/foswiki_1.0. 0.orig.tar.gz17 tar zxvf /tmp/build_deb/foswiki_1.0.6.orig.tar.gz 18 18 19 19 #add * to allow for -beta, -auto etc 20 mv /tmp/build_deb/Foswiki-1.0. 0*/ /tmp/build_deb/foswiki-1.0.0/21 cd /tmp/build_deb/foswiki-1.0. 020 mv /tmp/build_deb/Foswiki-1.0.6*/ /tmp/build_deb/foswiki-1.0.6/ 21 cd /tmp/build_deb/foswiki-1.0.6 22 22 23 23 mv ../debian . -
branches/Release01x00/core/tools/pkg/debian/LocalSite.cfg
r1896 r4970 1 1 $Foswiki::cfg{DataDir} = '/var/lib/foswiki/data'; 2 $Foswiki::cfg{LogDir} = '/var/lib/foswiki/log';3 2 $Foswiki::cfg{Site}{Lang} = 'en'; 4 3 $Foswiki::cfg{LocalesDir} = '/var/lib/foswiki/locale'; 5 4 $Foswiki::cfg{ScriptUrlPath} = '/cgi-bin/foswiki'; 6 5 $Foswiki::cfg{DefaultUrlHost} = 'http://your.domain.com'; 6 $Foswiki::cfg{PermittedRedirectHostUrls} = 'http://localhost'; 7 7 $Foswiki::cfg{Site}{FullLang} = 'en-us'; 8 8 $Foswiki::cfg{PubUrlPath} = '/foswiki/pub'; … … 10 10 $Foswiki::cfg{TemplateDir} = '/var/lib/foswiki/templates'; 11 11 $Foswiki::cfg{Site}{CharSet} = 'iso-8859-15'; 12 $Foswiki::cfg{LoginManager} = 'Foswiki::LoginManager:: ApacheLogin';12 $Foswiki::cfg{LoginManager} = 'Foswiki::LoginManager::TemplateLogin'; 13 13 $Foswiki::cfg{Plugins}{WysiwygPlugin}{Enabled} = 1; 14 14 $Foswiki::cfg{RCS}{WorkAreaDir} = '/var/lib/foswiki/working/work_area'; … … 18 18 $Foswiki::cfg{Register}{EnableNewUserRegistration} = 1; 19 19 $Foswiki::cfg{EnableEmail} = 0; 20 $Foswiki::cfg{WebMasterEmail} = 'WEBMASTEREMAIL'; 21 $Foswiki::cfg{Password} = 'PASSWORD'; 20 22 23 $Foswiki::cfg{LogDir} = '/var/log/foswiki'; 24 $Foswiki::cfg{ConfigurationLogName} = '$Foswiki::cfg{LogDir}/configurationlog.txt'; 25 $Foswiki::cfg{DebugFileName} = '$Foswiki::cfg{LogDir}/debug.txt'; 26 $Foswiki::cfg{WarningFileName} = '$Foswiki::cfg{LogDir}/warn%DATE%.txt'; 27 $Foswiki::cfg{LogFileName} = '$Foswiki::cfg{LogDir}/log%DATE%.txt'; 21 28 1; -
branches/Release01x00/core/tools/pkg/debian/NEWS.Debian
r1852 r4970 1 foswiki (1.0. 0-1) unstable; urgency=low1 foswiki (1.0.5-1) unstable; urgency=high 2 2 3 3 In order to improve the package's security, Foswiki configuration -
branches/Release01x00/core/tools/pkg/debian/apache.conf
r1895 r4970 16 16 # BrowserMatchNoCase ^$ blockAccess 17 17 18 BrowserMatchNoCase ^Accoona blockAccess19 BrowserMatchNoCase ^ActiveAgent blockAccess20 BrowserMatchNoCase ^Attache blockAccess21 BrowserMatchNoCase BecomeBot blockAccess22 BrowserMatchNoCase ^bot blockAccess23 BrowserMatchNoCase Charlotte/ blockAccess24 BrowserMatchNoCase ^ConveraCrawler blockAccess25 BrowserMatchNoCase ^CrownPeak-HttpAgent blockAccess26 BrowserMatchNoCase ^EmailCollector blockAccess27 BrowserMatchNoCase ^EmailSiphon blockAccess28 BrowserMatchNoCase ^e-SocietyRobot blockAccess29 BrowserMatchNoCase ^Exabot blockAccess30 BrowserMatchNoCase ^FAST blockAccess31 BrowserMatchNoCase ^FDM blockAccess32 BrowserMatchNoCase ^GetRight/6.0a blockAccess33 BrowserMatchNoCase ^GetWebPics blockAccess34 BrowserMatchNoCase ^Gigabot blockAccess35 BrowserMatchNoCase ^gonzo1 blockAccess36 BrowserMatchNoCase ^Google\sSpider blockAccess37 BrowserMatchNoCase ^ichiro blockAccess38 BrowserMatchNoCase ^ie_crawler blockAccess39 BrowserMatchNoCase ^iGetter blockAccess40 BrowserMatchNoCase ^IRLbot blockAccess41 BrowserMatchNoCase Jakarta blockAccess42 BrowserMatchNoCase ^Java blockAccess43 BrowserMatchNoCase ^KrakSpider blockAccess44 BrowserMatchNoCase ^larbin blockAccess45 BrowserMatchNoCase ^LeechGet blockAccess46 BrowserMatchNoCase ^LinkWalker blockAccess47 BrowserMatchNoCase ^Lsearch blockAccess48 BrowserMatchNoCase ^Microsoft blockAccess49 BrowserMatchNoCase ^MJ12bot blockAccess50 BrowserMatchNoCase MSIECrawler blockAccess51 BrowserMatchNoCase ^MSRBOT blockAccess52 BrowserMatchNoCase ^noxtrumbot blockAccess53 BrowserMatchNoCase ^NutchCVS blockAccess54 BrowserMatchNoCase ^RealDownload blockAccess55 BrowserMatchNoCase ^Rome blockAccess56 BrowserMatchNoCase ^Roverbot blockAccess57 BrowserMatchNoCase ^schibstedsokbot blockAccess58 BrowserMatchNoCase ^Seekbot blockAccess59 BrowserMatchNoCase ^SiteSnagger blockAccess60 BrowserMatchNoCase ^SiteSucker blockAccess61 BrowserMatchNoCase ^Snapbot blockAccess62 BrowserMatchNoCase ^sogou blockAccess63 BrowserMatchNoCase ^SpiderKU blockAccess64 BrowserMatchNoCase ^SpiderMan blockAccess65 BrowserMatchNoCase ^Squid blockAccess66 BrowserMatchNoCase ^Teleport blockAccess67 BrowserMatchNoCase ^User-Agent\: blockAccess68 BrowserMatchNoCase VoilaBot blockAccess69 BrowserMatchNoCase ^voyager blockAccess70 BrowserMatchNoCase ^W3C blockAccess71 BrowserMatchNoCase ^w3search blockAccess72 BrowserMatchNoCase ^Web\sDownloader blockAccess73 BrowserMatchNoCase ^WebCopier blockAccess74 BrowserMatchNoCase ^WebDevil blockAccess75 BrowserMatchNoCase ^WebSec blockAccess76 BrowserMatchNoCase ^WebVac blockAccess77 BrowserMatchNoCase ^Webwhacker blockAccess78 BrowserMatchNoCase ^Webzip blockAccess79 BrowserMatchNoCase ^Wells blockAccess80 BrowserMatchNoCase ^WhoWhere blockAccess81 BrowserMatchNoCase www\.netforex\.org blockAccess82 BrowserMatchNoCase ^WX_mail blockAccess83 BrowserMatchNoCase ^yacybot blockAccess84 BrowserMatchNoCase ^ZIBB blockAccess85 BrowserMatchNoCase ^$ blockAccess86 87 18 RedirectMatch /foswiki/?$ /cgi-bin/foswiki/view$1 88 19 RedirectMatch /foswiki(/([A-Z].*)?)?$ /cgi-bin/foswiki/view$1 89 20 90 #RewriteEngine on 91 #RewriteRule ^/foswiki$ /cgi-bin/foswiki/view 92 #RewriteRule ^/foswiki/$ /cgi-bin/foswiki/view 93 94 #RewriteRule ^configure$ /bin/configure 95 #RewriteRule ^([A-Z].*) /bin/view/$1 [PT] [L] 96 97 21 #see /etc/foswiki/ShorterUrl.conf to activate ShorterUrls 98 22 99 23 # The ScriptAlias defines the bin directory as a directory where CGI … … 134 58 ErrorDocument 401 /cgi-bin/foswiki/view/System/UserRegistration 135 59 136 # Limit access to configure to specific IP addresses and or users.137 60 # Make sure configure is not open to the general public. 138 61 # It exposes system details that can help attackers. 139 62 <FilesMatch "^(configure)$"> 140 63 SetHandler cgi-script 141 Order Deny,Allow142 Deny from all143 Allow from 127.0.0.1144 64 Require user %CONFIGUSER% 145 65 </FilesMatch> … … 148 68 # that makes Apache ask the browser to authenticate. It is correct that 149 69 # scripts such as view are not authenticated. 150 <FilesMatch "(attach|edit|manage|rename|save|upload|mail|logon|rest|.*auth).*">151 require valid-user152 </FilesMatch>70 #<FilesMatch "(attach|edit|manage|rename|save|upload|mail|logon|rest|.*auth).*"> 71 # require valid-user 72 #</FilesMatch> 153 73 154 74 </Directory> -
branches/Release01x00/core/tools/pkg/debian/changelog
r1852 r4970 1 foswiki (1.0.6-3) unstable; urgency=high 2 3 * fix bad URL generation when logging on from / and using ShorterUrls Item1766 4 * fix for problems with validation - Item1830 5 6 -- Sven Dowideit <SvenDowideit@fosiki.com> Sat, 11 Sep 2009 09:53:40 +0100 7 8 foswiki (1.0.6-2) unstable; urgency=high 9 10 * fix fresh installation :/ 11 12 -- Sven Dowideit <SvenDowideit@fosiki.com> Sat, 18 Jun 2009 09:53:40 +0100 13 14 foswiki (1.0.6-1) unstable; urgency=high 15 16 * package now upgrades distributed topics and attachments, by looking for 17 ,v files and skipping those. (no merging) 18 * Upgrade to foswiki 1.0.6 - resolves Security Alert CVE-2009-1434 19 This version introduces a major enhancement in security against Cross-Site Request Forgery 20 * point configure logos to /var/www/foswiki/logos 21 22 -- Sven Dowideit <SvenDowideit@fosiki.com> Sun, 5 Jul 2009 09:53:40 +0100 23 24 foswiki (1.0.5-2) unstable; urgency=low 25 26 * Item1601: make /usr/lib/cgi-bin/foswiki/LocalLib.cfg a config file 27 28 -- Sven Dowideit <SvenDowideit@fosiki.com> Sun, 26 Apr 2009 09:53:40 +0100 29 30 foswiki (1.0.5-1) unstable; urgency=high 31 32 * upgrade to foswiki 1.0.5 33 34 -- Sven Dowideit <SvenDowideit@fosiki.com> Sun, 26 Apr 2009 09:53:40 +0100 35 36 foswiki (1.0.4-2) unstable; urgency=low 37 38 * add a ShorterUrl.conf that can be 'just linked' 39 40 -- Sven Dowideit <SvenDowideit@fosiki.com> Fri, 20 Mar 2009 09:53:40 +0100 41 42 foswiki (1.0.4-1) unstable; urgency=low 43 44 * upgrade to foswiki 1.0.4 45 * added Warning to configure Extension installer to _not_ use it 46 * switched to TemplateLogin - its much more useful 47 * set configure password from the debconf too 48 49 -- Sven Dowideit <SvenDowideit@fosiki.com> Fri, 20 Mar 2009 09:53:40 +0100 50 1 51 foswiki (1.0.0-1) unstable; urgency=low 2 52 -
branches/Release01x00/core/tools/pkg/debian/conffile
r1852 r4970 2 2 /etc/foswiki/LocalLib.cfg 3 3 /etc/foswiki/apache.conf 4 /etc/foswiki/ShorterUrl.conf 5 /usr/lib/cgi-bin/foswiki/LocalLib.cfg -
branches/Release01x00/core/tools/pkg/debian/control
r3819 r4970 9 9 Architecture: all 10 10 Depends: ${perl:Depends}, libnet-perl, libmime-base64-perl, rcs (>= 5.7), apache | apache2 | apache2.2, debconf (>= 0.5) | debconf-2.0, libalgorithm-diff-perl, liberror-perl, libdigest-sha1-perl, libtext-diff-perl, liblocale-maketext-lexicon-perl, libcgi-session-perl, liburi-perl, libhtml-parser-perl 11 Suggests: libunicode-maputf8-perl, libapache-mod-perl, libapache2-mod-perl2 11 Suggests: libunicode-maputf8-perl, libapache-mod-perl, libapache2-mod-perl2, libapache2-mod-auth-plain 12 12 Description: A Web Based Collaboration Platform 13 13 Foswiki is a modern CGI-based implementation of the Wiki collaboration platform -
branches/Release01x00/core/tools/pkg/debian/mod_perl_startup.pl
r1852 r4970 1 1 #!/usr/bin/perl 2 3 use strict; 2 4 3 5 $ENV{MOD_PERL} =~ /mod_perl/ or die "mod_perl_startup called, but mod_perl not used!"; -
branches/Release01x00/core/tools/pkg/debian/patches/00list
r1897 r4970 1 1 2 #http://foswiki.org/Support/KnownIssuesOfFoswiki01x00 3 Item597-CPAN-modules-with-number 2 #http://foswiki.org/Tasks/Item8011 3 00_More_Extensions_warning 4 5 01_configure_logo 6 Item1830-fix-validation-nonce -
branches/Release01x00/core/tools/pkg/debian/postinst
r1896 r4970 32 32 db_get foswiki/samplefiles 33 33 if [ "$RET" = true ]; then 34 #check for the existance of _any_ of the default webs 35 #TODO: later this will be replaced by the upgrade script 36 if [ ! -e /var/lib/foswiki/data/Main/WebHome.txt ]; then 37 if [ ! -e /var/lib/foswiki/data/System/WebHome.txt ]; then 38 if [ ! -e /var/lib/foswiki/data/Sandbox/WebHome.txt ]; then 39 if [ ! -e /var/lib/foswiki/data/Trash/WebHome.txt ]; then 40 if [ ! -e /var/lib/foswiki/data/_default/WebHome.txt ]; then 41 # only extract if they say so and there's no home there 42 # and even then, fail on overwrite so we don't stomp. 43 tar -zxk -C / -f /usr/share/foswiki/foswiki-data.tar.gz 44 # clean up the .mailnotify timestamps. 45 webs="Main Sandbox System Trash _default"; 46 for web in $webs; do 47 date +%s > /var/lib/foswiki/data/$web/.mailnotify 48 done 49 if [ ! -e /var/lib/foswiki/pub/wikiHome.gif ]; then 50 tar -zxk -C / -f /usr/share/foswiki/foswiki-pub.tar.gz 51 fi 52 fi 53 fi 54 fi 55 fi 56 fi 34 #upgrade topics - because we don't ship ,v files, I can use find&sed to make a list of all files that have no ,v, 35 #and then exclude them from the un-tar 36 37 echo 38 echo Upgrading distriuted topics and attachments - skipping files changed via the Foswiki 39 echo see /var/log/foswiki/exclude-topics.lst and /var/log/foswiki/exclude-attachments.lst 40 echo 41 42 find /var/lib/foswiki/data -name '*,v' | sed 's/^\///g' | sed 's/,v$//g' > /var/log/foswiki/exclude-topics.lst 43 44 tar -zx -C / --exclude-from=/var/log/foswiki/exclude-topics.lst -f /usr/share/foswiki/foswiki-data.tar.gz 45 46 find /var/lib/foswiki/pub -name '*,v' | sed 's/^\///g' | sed 's/,v$//g' > /var/log/foswiki/exclude-attachments.lst 47 tar -zx -C / --exclude-from=/var/log/foswiki/exclude-attachments.lst -f /usr/share/foswiki/foswiki-pub.tar.gz 48 49 # clean up the .mailnotify timestamps. 50 webs="Main Sandbox System Trash _default"; 51 for web in $webs; do 52 date +%s > /var/lib/foswiki/data/$web/.mailnotify 53 done 57 54 fi 58 55 … … 67 64 68 65 db_get foswiki/wikiwebmaster 69 # do rcs checkout first? 70 #TODO: these settings should move to Main.SitePreferences 71 if [ ! -e /var/lib/foswiki/data/System/DefaultPreferences.txt ]; then 72 perl -pi~ -e '$U=q{'"$RET"'}; s/^(.*\*\s*Set\s*WIKIWEBMASTER\s*=\s*).*(\r?\n)$/\1$U\2/;' /var/lib/foswiki/data/System/DefaultPreferences.txt 73 #force default to use sendmail by setting SMTPMAILHOST to blank 74 perl -pi~ -e 's/^(\s*\*\s*Set\s*SMTPMAILHOST\s*=\s*).*(\r\n)$/$1$2/;' /var/lib/foswiki/data/System/DefaultPreferences.txt 75 fi 66 perl -pi~ -e '$U=q{'"$RET"'}; s{WEBMASTEREMAIL}{$U}g;' /etc/foswiki/LocalSite.cfg 76 67 77 68 # user + password authorized to run configure script … … 98 89 # done 99 90 91 #note that only apache2 really seems to exist in Etch etc, but the others I've left for historical reasons 100 92 servers="apache apache-perl apache-ssl apache2" 101 93 for server in $servers; do 94 if [ `which $server` ]; then 102 95 if [ -e /etc/$server/conf.d ]; then 103 96 includefile=/etc/foswiki/apache.conf … … 108 101 ln -s $includefile /etc/$server/conf.d/foswiki.conf 109 102 if [ $server = "apache2" ]; then 110 a2enmod authn_file103 a2enmod authn_file || a2enmod auth_plain || true 111 104 a2enmod rewrite 112 105 else … … 114 107 apache-modconf $server enable rewrite 115 108 fi 109 fi 116 110 fi 117 111 done … … 141 135 $HTPASSWDCMD -b /var/lib/foswiki/data/.htpasswd "$configuser" "$configpassword" 142 136 chown $WIKI_OWNER.www-data /var/lib/foswiki/data/.htpasswd 137 #add the same password into the LocalLib.cfg 138 passwordhash=`grep "$configuser" /var/lib/foswiki/data/.htpasswd | sed "s/$configuser://"` 139 perl -pi~ -e '$U=q{'"$passwordhash"'}; s{PASSWORD}{$U}g;' /etc/foswiki/LocalSite.cfg 143 140 fi 144 141 fi … … 165 162 #and for some reason create a session 166 163 #use 1777 to prevent third parties replacing the file with a doctored one 167 #put into /tmp/foswiki so that the open dir can't be used by others to fill up /var, thus crashing all logging168 if [ ! -e /tmp/foswiki ]; then169 mkdir /tmp/foswiki170 fi171 chmod 1777 /tmp/foswiki172 chown $WIKI_OWNER.www-data /tmp/foswiki173 164 174 165 if [ ! -e /var/lib/foswiki/log ]; then … … 195 186 if [ -e /etc/init.d/$server ]; then 196 187 echo reloading $server config 197 /etc/init.d/$server reload 188 if which invoke-rc.d >/dev/null 2>&1 ; then 189 invoke-rc.d $server reload 190 else 191 /etc/init.d/$server reload 192 fi 198 193 fi 199 194 done -
branches/Release01x00/core/tools/pkg/debian/postrm
r1852 r4970 33 33 for server in $servers; do 34 34 if [ -e /etc/init.d/$server ]; then 35 /etc/init.d/$server reload 35 if which invoke-rc.d >/dev/null 2>&1 ; then 36 invoke-rc.d $server reload 37 else 38 /etc/init.d/$server reload 39 fi 36 40 fi 37 41 done -
branches/Release01x00/core/tools/pkg/debian/rules
r1909 r4970 103 103 104 104 cp -p debian/apache.conf debian/foswiki/etc/foswiki/ 105 cp -p debian/ShorterUrl.conf debian/foswiki/etc/foswiki/ 105 106 #move LocalSite.cfg to /etc/foswiki 106 107 cp debian/LocalSite.cfg debian/foswiki/etc/foswiki/LocalSite.cfg -
branches/Release01x00/core/tools/pkg/debian/templates
r1854 r4970 18 18 Type: boolean 19 19 Default: true 20 _Description: Perform install o f default wiki Topic Set?20 _Description: Perform install or upgrade of default wiki Topic Set? 21 21 Foswiki includes a complete "starter kit" which includes user 22 22 registration pages, documentation, and tutorials. 23 23 . 24 Accept this option unless you want to use an existing Foswiki data set 25 (for instance, one left over from a previous installation). 24 Deselect this option ONLY if you know what will break, and know how to 25 update the distributed files manually. Upgrading will only update 26 topics that have not been modified through the wiki. 27 (it looks for rcs history files, and skips those files). 26 28 . 27 If data/Main/WebHome.txt is present, the starter kit will not be 28 unpacked. The starter kit files can be found in 29 The starter kit files can be found in 29 30 /usr/share/foswiki/foswiki-data.tar.gz (and foswiki-pub.tar.gz) if you 30 31 want to install it manually or compare the topics with the new -
branches/Release01x00/core/tools/pkg/readme.txt
r1340 r4970 7 7 * contains the source for the debian foswiki package. this is made using a release tarball, and these files. 8 8 * as of 2003 it is maintained by SvenDowideit (sponsered by Ardo van Rangelrooij <ardo@debian.org>) 9 * from http://matrixhasu.altervista.org/index.php?view=use_dpatch 10 * diff -u source-tree-original/the-file source-tree/the-file | \ 11 dpatch patch-template -p "<number>_<short_description>" \ 12 "<what the patch does>" > path/to/debian/patches/<number>_<short_description>.dpatch
Note: See TracChangeset
for help on using the changeset viewer.
