From sugi ¡÷ users.sourceforge.jp Thu Aug 3 18:02:50 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Thu, 3 Aug 2006 18:02:50 +0900 Subject: [Slashdotjp-dev 588] CVS update: slashjp/Slash/Custom/Bulkmail Message-ID: <20060803090250.DEBA72AC093@users.sourceforge.jp> Index: slashjp/Slash/Custom/Bulkmail/Bulkmail.pm diff -u slashjp/Slash/Custom/Bulkmail/Bulkmail.pm:1.3 slashjp/Slash/Custom/Bulkmail/Bulkmail.pm:1.4 --- slashjp/Slash/Custom/Bulkmail/Bulkmail.pm:1.3 Mon Jul 24 17:43:57 2006 +++ slashjp/Slash/Custom/Bulkmail/Bulkmail.pm Thu Aug 3 18:02:50 2006 @@ -9,6 +9,7 @@ use Socket; use Carp 'cluck'; use 5.004; +use Slash::Utility::Environment; use strict; @@ -1182,6 +1183,7 @@ sub build_envelope { my $self = shift || undef; my $email = shift || undef; + my $constants = getCurrentStatic(); #print map {"EMAIL HASH KEYS: ($_): " . $email->{$_} . "\n"} keys %$email; $email = ref $email eq "HASH" ? $email->{"BULK_EMAIL"} : $email; #print "CONNECTING\n"; From sugi ¡÷ users.sourceforge.jp Thu Aug 3 18:03:06 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Thu, 3 Aug 2006 18:03:06 +0900 Subject: [Slashdotjp-dev 589] CVS update: slashjp/plugins/Journal Message-ID: <20060803090306.1CE9F2AC093@users.sourceforge.jp> Index: slashjp/plugins/Journal/journal.pl diff -u slashjp/plugins/Journal/journal.pl:1.14 slashjp/plugins/Journal/journal.pl:1.15 --- slashjp/plugins/Journal/journal.pl:1.14 Mon Jul 24 17:48:13 2006 +++ slashjp/plugins/Journal/journal.pl Thu Aug 3 18:03:05 2006 @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: journal.pl,v 1.14 2006/07/24 08:48:13 sugi Exp $ +# $Id: journal.pl,v 1.15 2006/08/03 09:03:05 sugi Exp $ use strict; use Slash 2.003; # require Slash 2.3.x @@ -13,7 +13,7 @@ use Slash::XML; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.14 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.15 $ ' =~ /\$Revision:\s+([^\s]+)/; sub main { my $journal = getObject('Slash::Journal'); @@ -265,7 +265,7 @@ $link = '/journal/friends/'; } else { $title = getData('rss_title', { nickname => $juser->{nickname} }); - $des = getData('rss_desc', { nickname => $juser->{nickname} }); + $desc = getData('rss_desc', { nickname => $juser->{nickname} }); $link = '/journal/'; } From sugi ¡÷ users.sourceforge.jp Fri Aug 4 19:14:34 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Fri, 4 Aug 2006 19:14:34 +0900 Subject: [Slashdotjp-dev 590] CVS update: slashjp/plugins/Journal Message-ID: <20060804101434.2C5092AC727@users.sourceforge.jp> Index: slashjp/plugins/Journal/journal.pl diff -u slashjp/plugins/Journal/journal.pl:1.15 slashjp/plugins/Journal/journal.pl:1.16 --- slashjp/plugins/Journal/journal.pl:1.15 Thu Aug 3 18:03:05 2006 +++ slashjp/plugins/Journal/journal.pl Fri Aug 4 19:14:33 2006 @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: journal.pl,v 1.15 2006/08/03 09:03:05 sugi Exp $ +# $Id: journal.pl,v 1.16 2006/08/04 10:14:33 sugi Exp $ use strict; use Slash 2.003; # require Slash 2.3.x @@ -13,7 +13,7 @@ use Slash::XML; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.15 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.16 $ ' =~ /\$Revision:\s+([^\s]+)/; sub main { my $journal = getObject('Slash::Journal'); @@ -449,6 +449,7 @@ ); unless ($articles && @$articles) { + _printHead('userhead', $head_data, 1) or return; print getData('noentries_found'); if ($user_change && %$user_change) { my $slashdb = getCurrentDB(); From sugi ¡÷ users.sourceforge.jp Wed Aug 9 18:52:11 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 9 Aug 2006 18:52:11 +0900 Subject: [Slashdotjp-dev 591] CVS update: slashjp/debian Message-ID: <20060809095211.3ED912AC0A9@users.sourceforge.jp> From sugi ¡÷ users.sourceforge.jp Wed Aug 9 18:52:40 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 9 Aug 2006 18:52:40 +0900 Subject: [Slashdotjp-dev 592] CVS update: slashjp/debian/append-patches Message-ID: <20060809095240.C254A2AC22F@users.sourceforge.jp> From sugi ¡÷ users.sourceforge.jp Wed Aug 9 18:53:31 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 9 Aug 2006 18:53:31 +0900 Subject: [Slashdotjp-dev 593] CVS update: slashjp/plugins/Login Message-ID: <20060809095331.1AA7C2AC045@users.sourceforge.jp> Index: slashjp/plugins/Login/login.pl diff -u slashjp/plugins/Login/login.pl:1.5 slashjp/plugins/Login/login.pl:1.6 --- slashjp/plugins/Login/login.pl:1.5 Fri Jul 14 16:43:54 2006 +++ slashjp/plugins/Login/login.pl Wed Aug 9 18:53:30 2006 @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: login.pl,v 1.5 2006/07/14 07:43:54 sugi Exp $ +# $Id: login.pl,v 1.6 2006/08/09 09:53:30 sugi Exp $ use strict; use Slash 2.003; @@ -13,7 +13,7 @@ use Slash::LDAPDB; use vars qw($VERSION); -($VERSION) = ' $Revision: 1.5 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.6 $ ' =~ /\$Revision:\s+([^\s]+)/; sub main { my $slashdb = getCurrentDB(); @@ -97,7 +97,7 @@ } elsif ($constants->{ldap_enable} && (!defined($ldap) || !$ldap->bind())) { push @note, getData('ldap_conn_fail'); $error = 1; - } elsif ($constants->{ldap_enable} && $ldap->getUser($matchname) && !$ldap->authUser($matchname, $form->{peerpasswd}) { + } elsif ($constants->{ldap_enable} && $ldap->getUser($matchname) && !$ldap->authUser($matchname, $form->{peerpasswd})) { push @note, getData('ldap_peer_pass_fail'); $error = 1; } elsif ($matchname ne '' && $form->{newusernick} ne '') { From sugi ¡÷ users.sourceforge.jp Wed Aug 9 18:54:03 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 9 Aug 2006 18:54:03 +0900 Subject: [Slashdotjp-dev 594] CVS update: slashjp/debian Message-ID: <20060809095403.C6FF72AC0A9@users.sourceforge.jp> Index: slashjp/debian/changelog diff -u /dev/null slashjp/debian/changelog:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/changelog Wed Aug 9 18:54:03 2006 @@ -0,0 +1,12 @@ +slash (2.5.0.119-1) unstable; urgency=low + + * catchup upstream CVS. + + -- Tatsuki Sugiura Wed, 9 Aug 2006 16:44:50 +0900 + +slash (2.5.0.94-1) unstable; urgency=low + + * Initial release. + + -- Tatsuki Sugiura Tue, 9 May 2006 16:15:50 +0900 + Index: slashjp/debian/command-wrapper diff -u /dev/null slashjp/debian/command-wrapper:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/command-wrapper Wed Aug 9 18:54:03 2006 @@ -0,0 +1,6 @@ +#!/bin/bash + +myname=`basename $0` +myname=${myname#slash-} + +exec /usr/share/slash/bin/$myname "$@" Index: slashjp/debian/compat diff -u /dev/null slashjp/debian/compat:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/compat Wed Aug 9 18:54:03 2006 @@ -0,0 +1 @@ +4 Index: slashjp/debian/control diff -u /dev/null slashjp/debian/control:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/control Wed Aug 9 18:54:03 2006 @@ -0,0 +1,34 @@ +Source: slash +Section: web +Priority: extra +Maintainer: Tatsuki Sugiura +Build-Depends: debhelper (>= 4.0.0), cdbs, libperl-dev, apache-dev, libapache-mod-perl, libcompress-zlib-perl, libdbix-password-perl, libsoap-lite-perl +Standards-Version: 3.6.2 + +Package: slash-common +Architecture: any +Depends: perl, perl-modules, libcompress-zlib-perl, libxml-parser-perl, libdbix-password-perl (>= 1.8-5), libnet-perl, libtimedate-perl, libapache-dbilogger-perl, libhtml-parser-perl, libhtml-format-perl, libxml-rss-perl, libimage-size-perl, libemail-valid-perl, libtemplate-perl, libmail-sendmail-perl, libsoap-lite-perl, liblingua-stem-perl, libhtml-template-perl, libmime-types-perl, libparallel-useragent-perl, libhtml-popuptreeselect-perl, libnet-ldap-perl, libjcode-pm-perl, ${shlibs:Depends}, ${misc:Depends} +Description: The code that runs Slashdot - common files + Slash -- Slashdot Like Automated Storytelling Homepage -- is an architecture + to put together web sites. It comes with functionality for posting articles, + conducting polls, having discussions, and can be extended in innumerable ways. + Slash uses the combination apache+perl+mysql. + +Package: slash-backend +Architecture: any +Depends: adduser, mysql-server-4.1, slash-common, libschedule-cron-perl, ${shlibs:Depends}, ${misc:Depends} +Description: The code that runs Slashdot - Backend server + Slash -- Slashdot Like Automated Storytelling Homepage -- is an architecture + to put together web sites. It comes with functionality for posting articles, + conducting polls, having discussions, and can be extended in innumerable ways. + Slash uses the combination apache+perl+mysql. + +Package: slash-frontend +Architecture: any +Depends: slash-common, libapache-mod-perl, libapache-request-perl, libgd-graph-perl, apache, ${shlibs:Depends}, ${misc:Depends} +Recommends: libgd-graph-perl +Description: The code that runs Slashdot - Frontend server settings + Slash -- Slashdot Like Automated Storytelling Homepage -- is an architecture + to put together web sites. It comes with functionality for posting articles, + conducting polls, having discussions, and can be extended in innumerable ways. + Slash uses the combination apache+perl+mysql. Index: slashjp/debian/copyright diff -u /dev/null slashjp/debian/copyright:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/copyright Wed Aug 9 18:54:03 2006 @@ -0,0 +1,48 @@ +This package was debianized by Tatsuki Sugiura on +Tue, 9 May 2006 16:15:50 +0900. + +It was downloaded from CVS, see http://slashcode.com/ for details. + +Copyright Holder: + +These are the authors of Slash. + + Rob Malda malda ¡÷ slashdot.org + Jonathon Pater pater ¡÷ slashdot.org + Patrick Galbraith patg ¡÷ patg.net + Chris Nandor pudge ¡÷ ostg.com + Brian Aker brian ¡÷ tangent.org + Cliff Wood cliff ¡÷ slashdot.org + Jamie McCarthy jamie ¡÷ mccarthy.vg + Tim Vroom vroom ¡÷ slashdot.org + +Special thanks to some of the outstanding contributors to Slash, +who have helped with various kinds of feedback, all of it invaluable. +(Our apologies if we left you out; please send Chris a message to +rectify it.) + + Dave Aiello dave_aiello ¡÷ ctdata.com + Daniel "Yazz" Atlas yazz ¡÷ ostg.com + Alessio Bragadini alessio ¡÷ albourne.com + Atif Ghaffar atif ¡÷ developer.ch + Dave Olszewski dave.olszewski ¡÷ ostg.com + Nathan Vonnahme nathan ¡÷ thethirdsector.com + Bernard de Rubinat bernard ¡÷ netgames.org + Steinar H. Gunderson sgunderson ¡÷ bigfoot.com + Jesse Hirsh jesse ¡÷ openflows.org + Blake Day blake ¡÷ artistrystudios.net + Eric Dannewitz ericdano ¡÷ jazz-sax.com + Adam Khan ask ¡÷ engaging.net + David Tseng david ¡÷ morrissey-solo.com + The Cunctator cunctator ¡÷ kband.com + Adam Khan ask ¡÷ engaging.net + con conductor ¡÷ certindex.com + Shane Zatezalo shane ¡÷ lottadot.com + Alvaro del Castillo acs ¡÷ barrapunto.com + Stephen Clouse thebrain ¡÷ warpcore.org + chromatic chromatic ¡÷ rmci.net + Dan Stahlke dans ¡÷ infoinsights.com + +License: GPL2 +In Debian, see /usr/share/common-licenses/GPL2 for details + Index: slashjp/debian/dirs diff -u /dev/null slashjp/debian/dirs:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/dirs Wed Aug 9 18:54:03 2006 @@ -0,0 +1,2 @@ +usr/bin +usr/sbin Index: slashjp/debian/rules diff -u /dev/null slashjp/debian/rules:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/rules Wed Aug 9 18:54:03 2006 @@ -0,0 +1,72 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk + +DEB_DH_INSTALL_SOURCEDIR := debian/tmp +LOCAL_PERL_MAKEFLAGS = "DESTDIR=$(DEB_DESTDIR)" +DEB_INSTALL_EXAMPLES_slash-backend = $(DEB_DESTDIR)/usr/share/slash/httpd +DEB_DH_INSTALLINIT_ARGS = --init-script=slash +DEB_DH_COMPRESS_ARGS = -Xutils/ + +clean:: + -$(MAKE) clean + -$(MAKE) -C Slash distclean + -for d in plugins/* tagboxes/*; do $(MAKE) -C $$d distclean; done + find . -name Makefile.old | xargs -r rm -f + + +common-build-arch:: + cd Slash && perl Makefile.PL + $(MAKE) -C Slash + set -e; for d in plugins/* tagboxes/*; do \ + (cd $$d && \ + if test -f Makefile.PL; then \ + perl Makefile.PL; \ + $(MAKE); \ + $(MAKE) test; \ + fi \ + ) \ + done + +common-install-arch:: + $(MAKE) -C Slash install_vendor DESTDIR=$(DEB_DESTDIR) + for d in plugins/* tagboxes/*; do \ + test -f $$d/Makefile.PL \ + && $(MAKE) -C $$d install_vendor DESTDIR=$(DEB_DESTDIR); \ + done + $(MAKE) install -o plugins -o slash install -o tagboxes \ + SLASH_PREFIX=$(DEB_DESTDIR)/usr/share/slash \ + USER=nobody GROUP=nogroup + find $(DEB_DESTDIR)/usr/share/slash/plugins \ + $(DEB_DESTDIR)/usr/share/slash/tagboxes \ + -name Makefile.old -o -name Makefile.PL \ + -o -name test.pl -o -name t | xargs -r rm -fr + find $(DEB_DESTDIR)/usr/lib/perl5 -name \*.so | xargs -r strip --remove-section=.comment --remove-section=.note --strip-unneeded + + # apply local patch + for f in $(CURDIR)/debian/append-patches/*; do \ + (cd $(DEB_DESTDIR); patch -p1 < $$f) || exit; \ + done + + # fix perm... + find $(DEB_DESTDIR)/usr/share/slash/plugins \ + $(DEB_DESTDIR)/usr/share/slash/tagboxes \ + $(DEB_DESTDIR)/usr/share/slash/themes \ + -type f -a -not -name \*.pl | xargs -r chmod -x + for f in Blob/blobLoader Messages/populate_message_log_stats.plx \ + PollBooth/rebuildAutoPoll Zoo/rebuildPeople \ + Zoo/rebuildPerson ; do \ + chmod +x $(DEB_DESTDIR)/usr/share/slash/plugins/$$f; \ + done + chmod +x $(DEB_DESTDIR)/usr/share/perl5/Slash/block_proxy_net.pl + +install/slash-backend:: + mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/var/lib/slash/site + mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/var/lib/slash/httpd + install -m 755 $(CURDIR)/debian/command-wrapper \ + $(CURDIR)/debian/$(cdbs_curpkg)/usr/bin/slash-command-wrapper + mkdir -p $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/$(cdbs_curpkg) + cp -a $(CURDIR)/utils $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/$(cdbs_curpkg) + for f in `find $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/$(cdbs_curpkg)/utils -type f`; do \ + perl -i -npe '$$.==1 and m|#!(.*/)?perl( .*)?$$| and $$_="#!/usr/bin/perl$2\n"' $$f; \ + done Index: slashjp/debian/slash-backend.dirs diff -u /dev/null slashjp/debian/slash-backend.dirs:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-backend.dirs Wed Aug 9 18:54:03 2006 @@ -0,0 +1,2 @@ +usr/bin +usr/sbin Index: slashjp/debian/slash-backend.init.d diff -u /dev/null slashjp/debian/slash-backend.init.d:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-backend.init.d Wed Aug 9 18:54:03 2006 @@ -0,0 +1,191 @@ +#!/bin/sh +# This code is a part of Slash, and is released under the GPL. +# Copyright 1997-2005 by Open Source Technology Group. See README +# and COPYING for more information, or see http://slashcode.com/. +# $Id: slash-backend.init.d,v 1.1 2006/08/09 09:54:03 sugi Exp $ + +# /etc/init.d/slash +# +# written by Yazz Atlas for the Slashteam... +# with assists from: +# Jamie McCarthy +# Cliff Wood +# ... and a cast of several. + +PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin/X11:/usr/X11R6/bin"; + +# Slash home +PROGNAME="slashd"; +DATADIR="/usr/share/slash"; +SLASHD="$DATADIR/sbin/$PROGNAME"; +SLASHSITE="$DATADIR/slash.sites"; + +# To figure out where things are... +TZ="GMT"; +export TZ; + +WHICH_CAT=`which cat`; +WHICH_CUT=`which cut`; +WHICH_PS=`which ps`; +WHICH_GREP=`which grep`; +WHICH_UNAME=`which uname`; +WHICH_AWK=`which awk`; + +# if you use sudo, create a file called mysudo in $DATADIR, containing +# your sudo line, like "sudo -u slashdot" +# or "sudo -u foo --shell='/bin/sh'" +MYSUDO=`cat $DATADIR/mysudo 2>/dev/null` + +# This prolly ain't 100% accurate, but it should be good enough. +OS=`$WHICH_UNAME | $WHICH_AWK '{print $1}'`; + +if [ ! -f $SLASHSITE ] ; then + echo "NOT Starting $PROGNAME: No $SLASHSITE"; + exit 0; +fi + +GRAB_CONFIG=`$WHICH_CAT $SLASHSITE | $WHICH_CUT -d"#" -f1`; + +start_slashd () { + # There are differing syntaxes of "su" between OSes + # and even between different distributions of the same + # OS. If you have an OS that isn't listed here (or is + # a different case of one listed here [ie Red Hat Linux, + # Debian Linux]) please add in the necessary logic and + # send in a patch. Thanks! + + # if you aren't using GMT for internal dates, please change + # the appropriate lines, below. But why wouldn't you? + + if [ "$MYSUDO" ] ; then + TZ=GMT $MYSUDO $SLASHD $VIRTUAL_USER_NAME & + elif [ "$OS" = "FreeBSD" ] ; then + TZ=GMT su $USERNAME -c "$SLASHD $VIRTUAL_USER_NAME" & + elif [ "$OS" = "Linux" ] ; then + su --shell="/bin/sh" - $USERNAME -c "TZ=GMT $SLASHD $VIRTUAL_USER_NAME" & + else + su - $USERNAME -c "TZ=GMT $SLASHD $VIRTUAL_USER_NAME" & + fi +} + +break_parts () { + # This is used over and over to break apart the need + # variables. + + VIRTUAL_USER_NAME=`echo $server_name | $WHICH_CUT -d":" -f1`; + USERNAME=`echo $server_name | $WHICH_CUT -d":" -f2`; + SITENAME=`echo $server_name | $WHICH_CUT -d":" -f3`; + RUNNINGPID="$DATADIR/site/$SITENAME/logs/$PROGNAME.pid"; +} + +stop_slashd () { + # This will restart and remove any left over PID files + # since they can't help anyone. Oh wait, they are useful + # to verify is slashd is really running. The keepalive + # choice looks for thoses PID files to see if slashd + # is hanging about. + + if [ -f $RUNNINGPID ] ; then + echo -n "Stopping $PROGNAME $VIRTUAL_USER_NAME: "; + if ! $MYSUDO kill `$WHICH_CAT $RUNNINGPID` ; then + echo -n "...using kill -9 to make sure ..."; + sleep 3; + $MYSUDO kill -9 `$WHICH_CAT $RUNNINGPID`; + $MYSUDO rm -f $RUNNINGPID; + fi + echo "ok."; + else + echo "$PROGNAME $VIRTUAL_USER_NAME has no PID file"; + fi +} + +check_variable () { + # Just want to print things out so I can see what we are + # getting. + + echo "VIRTUAL_USER_NAME=$VIRTUAL_USER_NAME"; + echo "USERNAME=$USERNAME"; + echo "SITENAME=$SITENAME"; + echo "RUNNINGPID=${RUNNINGPID}"; + echo "PID=`cat ${RUNNINGPID}`"; +} + + +# OK now that we set thing above it just matter of calling them in the right +# order. I broke thing up in to functions since I was tired of retyping the +# same things over and over. + +if [ -z "`echo $GRAB_CONFIG | $WHICH_GREP :`" ] ; then + echo "NOT Starting/stopping $PROGNAME: No sites in $SLASHSITE"; + exit 0; +fi + +case "$1" in + start) + for server_name in $GRAB_CONFIG; do + break_parts; + echo -n "Starting $PROGNAME $VIRTUAL_USER_NAME: "; + start_slashd; + echo "ok PID = $!"; + done + ;; + + stop) + for server_name in $GRAB_CONFIG; do + break_parts; + stop_slashd; + done + ;; + + keepalive) + for server_name in $GRAB_CONFIG; do + break_parts; + if [ ! -f $RUNNINGPID ] ;then + echo -n "Restarting $PROGNAME $VIRTUAL_USER_NAME, no PID file: "; + start_slashd; + echo "ok PID = $!"; + else + # OK, this might not work on every platform since the "ps" + # is different on alot of OSes. + # Once people submit fixes I will pull this into a similar + # check like the one for "su". + if ! $WHICH_PS wh -p `$WHICH_CAT $RUNNINGPID` | $WHICH_GREP $PROGNAME > /dev/null ; then + echo -n "Restarting $PROGNAME $VIRTUAL_USER_NAME, no valid PID file: "; + rm -f $RUNNINGPID; + start_slashd; + echo "ok PID = $!"; + fi + fi + done + ;; + + restart) + $0 stop; + echo -n "Sleeping 10 seconds to be clean: "; + sleep 10; + echo "ok."; + $0 start; + ;; + + checkvars) + echo "The contents of $SLASHSITE:"; + for server_name in $GRAB_CONFIG; do + echo " $server_name"; + done + for server_name in $GRAB_CONFIG; do + echo ""; + break_parts; + check_variable; + done + echo ""; + ;; + + *) + echo "Debian Usage: /etc/init.d/$0 {start|stop|restart|keepalive|checkvars}"; + echo "Redhat Usage: /etc/rc.d/init.d/$0 {start|stop|restart|keepalive|checkvars}"; + echo "Other Usage: /usr/local/sbin/$0 {start|stop|restart|keepalive|checkvars}"; + exit 1; + ;; +esac + +exit 0; Index: slashjp/debian/slash-backend.install diff -u /dev/null slashjp/debian/slash-backend.install:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-backend.install Wed Aug 9 18:54:03 2006 @@ -0,0 +1,2 @@ +usr/share/slash/bin +usr/share/slash/sbin Index: slashjp/debian/slash-backend.links diff -u /dev/null slashjp/debian/slash-backend.links:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-backend.links Wed Aug 9 18:54:03 2006 @@ -0,0 +1,14 @@ +usr/share/slash/bin/backup-blocks usr/bin/slash-backup-blocks +usr/share/slash/bin/bitchslap usr/bin/slash-bitchslap +usr/share/slash/bin/chkuser usr/bin/slash-chkuser +usr/share/slash/bin/mechmonkey usr/bin/slash-mechmonkey +usr/share/slash/bin/modslap usr/bin/slash-modslap +usr/share/slash/bin/reload_armor usr/bin/slash-reload_armor +usr/share/slash/bin/slashmon usr/bin/slash-slashmon +usr/share/slash/bin/symlink-tool usr/bin/slash-symlink-tool +usr/share/slash/bin/template-check usr/bin/slash-template-check +usr/share/slash/bin/template-tool usr/bin/slash-template-tool +usr/bin/slash-command-wrapper usr/bin/slash-runtask +usr/bin/slash-command-wrapper usr/bin/slash-install-slashsite +usr/bin/slash-command-wrapper usr/bin/slash-install-theme +usr/bin/slash-command-wrapper usr/bin/slash-install-plugin Index: slashjp/debian/slash-backend.logrotate diff -u /dev/null slashjp/debian/slash-backend.logrotate:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-backend.logrotate Wed Aug 9 18:54:03 2006 @@ -0,0 +1,12 @@ +/var/lib/slash/site/*/logs/*.log { + weekly + missingok + rotate 12 + compress + delaycompress + notifempty + sharedscripts + postrotate + /etc/init.d/slash restart > /dev/null + endscript +} Index: slashjp/debian/slash-backend.postinst diff -u /dev/null slashjp/debian/slash-backend.postinst:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-backend.postinst Wed Aug 9 18:54:03 2006 @@ -0,0 +1,46 @@ +#! /bin/sh +# postinst script for slash +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + id slash >/dev/null 2>&1 || adduser --system --no-create-home --group --disabled-password --disabled-login slash + test -f /var/lib/slash/slash.sites || touch /var/lib/slash/slash.sites + test -f /var/lib/slash/httpd/slash.conf || cp -a /usr/share/doc/slash-backend/examples/httpd/slash.conf /var/lib/slash/httpd/ + chown slash:slash /var/lib/slash/slash.sites /var/lib/slash/site + chown -R slash:slash /var/lib/slash/httpd + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + Index: slashjp/debian/slash-common.docs diff -u /dev/null slashjp/debian/slash-common.docs:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-common.docs Wed Aug 9 18:54:03 2006 @@ -0,0 +1,3 @@ +README +INSTALL +docs Index: slashjp/debian/slash-common.install diff -u /dev/null slashjp/debian/slash-common.install:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-common.install Wed Aug 9 18:54:03 2006 @@ -0,0 +1,7 @@ +usr/lib/perl5 +usr/share/man +usr/share/perl5 +usr/share/slash/plugins +usr/share/slash/tagboxes +usr/share/slash/sql +usr/share/slash/themes Index: slashjp/debian/slash-common.links diff -u /dev/null slashjp/debian/slash-common.links:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-common.links Wed Aug 9 18:54:03 2006 @@ -0,0 +1,3 @@ +var/lib/slash/slash.sites usr/share/slash/slash.sites +var/lib/slash/site usr/share/slash/site +var/lib/slash/httpd usr/share/slash/httpd Index: slashjp/debian/slash-frontend.README.Debian diff -u /dev/null slashjp/debian/slash-frontend.README.Debian:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-frontend.README.Debian Wed Aug 9 18:54:03 2006 @@ -0,0 +1,4 @@ +README for slash-frontend + +If you don't run frontend and backend in semae server, +you need to mount /var/lib/slash from backend via NFS. Index: slashjp/debian/slash-frontend.links diff -u /dev/null slashjp/debian/slash-frontend.links:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-frontend.links Wed Aug 9 18:54:03 2006 @@ -0,0 +1 @@ +var/lib/slash/httpd/slash.conf etc/apache/conf.d/slash.conf Index: slashjp/debian/slash-frontend.postinst diff -u /dev/null slashjp/debian/slash-frontend.postinst:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/slash-frontend.postinst Wed Aug 9 18:54:03 2006 @@ -0,0 +1,42 @@ +#! /bin/sh +# postinst script for slash +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# + +case "$1" in + configure) + id slash >/dev/null 2>&1 || adduser --system --no-create-home --group --disabled-password slash + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 + + From sugi ¡÷ users.sourceforge.jp Wed Aug 9 18:54:03 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 9 Aug 2006 18:54:03 +0900 Subject: [Slashdotjp-dev 595] CVS update: slashjp/debian/append-patches Message-ID: <20060809095403.E69F82AC22F@users.sourceforge.jp> Index: slashjp/debian/append-patches/10_install-slashsite-pathfix diff -u /dev/null slashjp/debian/append-patches/10_install-slashsite-pathfix:1.1 --- /dev/null Wed Aug 9 18:54:03 2006 +++ slashjp/debian/append-patches/10_install-slashsite-pathfix Wed Aug 9 18:54:03 2006 @@ -0,0 +1,35 @@ +--- tmp/usr/share/slash/bin/install-slashsite 2006-04-28 10:45:51.000000000 +0900 ++++ tmp.orig/usr/share/slash/bin/install-slashsite 2006-05-10 12:45:18.154644890 +0900 +@@ -30,13 +30,13 @@ + usage() if !$opts{'u'} and ($opts{'h'} or !keys %opts); + # if invoked with both -u and -h, call usage() later, after we load Slash::Install + version() if $opts{'v'}; + + $| = 1; + +-my $prefix_site = "$SLASH_PREFIX/site"; ++my $prefix_site = -l "$SLASH_PREFIX/site" ? readlink("$SLASH_PREFIX/site") : "$SLASH_PREFIX/site"; + my( $owner, $owner_id, $group, $group_id, $password, + $sitename, $username, $realname, $email, $dbh, @create, $sql, + @sql, $hostname, $hostname_f, $host_noport, $httpd, %slash_sites, + $driver, $theme, $symlink, $include + ); + +@@ -516,14 +516,15 @@ + + + + ServerAdmin $email + DocumentRoot $prefix_site/$sitename/htdocs + ServerName $host_noport +- ErrorLog logs/${sitename}_error_log +- CustomLog logs/${sitename}_access_log common ++ # You need to create log directory to separate the server logfile ++ #ErrorLog /var/log/apache/${sitename}/error.log ++ #CustomLog /var/log/apache/${sitename}/access.log combined + + PerlSetupEnv On + PerlSetEnv TZ GMT + $include + SlashVirtualUser $opts{'u'} + From sugi ¡÷ users.sourceforge.jp Mon Aug 28 19:00:45 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Mon, 28 Aug 2006 19:00:45 +0900 Subject: [Slashdotjp-dev 596] CVS update: slashjp/Slash Message-ID: <20060828100045.EEA802AC019@users.sourceforge.jp> Index: slashjp/Slash/Slash.pm diff -u slashjp/Slash/Slash.pm:1.9 slashjp/Slash/Slash.pm:1.10 --- slashjp/Slash/Slash.pm:1.9 Thu Jul 13 10:12:26 2006 +++ slashjp/Slash/Slash.pm Mon Aug 28 19:00:45 2006 @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Slash.pm,v 1.9 2006/07/13 01:12:26 sugi Exp $ +# $Id: Slash.pm,v 1.10 2006/08/28 10:00:45 sugi Exp $ package Slash; @@ -375,7 +375,8 @@ } # And, the poster-was-a-subscriber bonus - if ($user->{subscriber_bonus} && $C->{subscriber_bonus} eq 'yes') { + if ($user->{subscriber_bonus} && defined($C->{subscriber_bonus}) + && $C->{subscriber_bonus} eq 'yes') { $hr->{subscriber_bonus} = $user->{subscriber_bonus}; } From sugi ¡÷ users.sourceforge.jp Mon Aug 28 19:00:46 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Mon, 28 Aug 2006 19:00:46 +0900 Subject: [Slashdotjp-dev 597] CVS update: slashjp/Slash/Utility/Environment Message-ID: <20060828100046.1FE5D2AC319@users.sourceforge.jp> Index: slashjp/Slash/Utility/Environment/Environment.pm diff -u slashjp/Slash/Utility/Environment/Environment.pm:1.14 slashjp/Slash/Utility/Environment/Environment.pm:1.15 --- slashjp/Slash/Utility/Environment/Environment.pm:1.14 Fri Jul 14 10:54:25 2006 +++ slashjp/Slash/Utility/Environment/Environment.pm Mon Aug 28 19:00:45 2006 @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Environment.pm,v 1.14 2006/07/14 01:54:25 sugi Exp $ +# $Id: Environment.pm,v 1.15 2006/08/28 10:00:45 sugi Exp $ package Slash::Utility::Environment; @@ -35,7 +35,7 @@ use base 'Exporter'; use vars qw($VERSION @EXPORT); -($VERSION) = ' $Revision: 1.14 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.15 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw( dbAvailable @@ -1907,7 +1907,7 @@ $special{$key}->($data); } else { for my $ri (@regints) { - $data = fixint($data) if /$ri/; + $data = fixint($data) if $ri =~ $key; } # convert input to internal character encoding @@ -3410,4 +3410,4 @@ =head1 VERSION -$Id: Environment.pm,v 1.14 2006/07/14 01:54:25 sugi Exp $ +$Id: Environment.pm,v 1.15 2006/08/28 10:00:45 sugi Exp $ From sugi ¡÷ users.sourceforge.jp Wed Aug 30 17:54:09 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 30 Aug 2006 17:54:09 +0900 Subject: [Slashdotjp-dev 598] CVS update: slashjp/Slash/DB/MySQL Message-ID: <20060830085409.B25A62AC220@users.sourceforge.jp> Index: slashjp/Slash/DB/MySQL/MySQL.pm diff -u slashjp/Slash/DB/MySQL/MySQL.pm:1.12 slashjp/Slash/DB/MySQL/MySQL.pm:1.13 --- slashjp/Slash/DB/MySQL/MySQL.pm:1.12 Fri Jul 14 14:39:43 2006 +++ slashjp/Slash/DB/MySQL/MySQL.pm Wed Aug 30 17:54:09 2006 @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: MySQL.pm,v 1.12 2006/07/14 05:39:43 sugi Exp $ +# $Id: MySQL.pm,v 1.13 2006/08/30 08:54:09 sugi Exp $ package Slash::DB::MySQL; use strict; @@ -21,7 +21,7 @@ use Encode; use Slash::LDAPDB; -($VERSION) = ' $Revision: 1.12 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.13 $ ' =~ /\$Revision:\s+([^\s]+)/; # Fry: How can I live my life if I can't tell good from evil? @@ -10973,6 +10973,8 @@ $page ||= 'misc'; } unless ($skin) { + # TODO: backported light mode. we should delete in future. + $skin = "light" if $user->{light}; $skin ||= getCurrentSkin('name'); $skin ||= 'default'; } From sugi ¡÷ users.sourceforge.jp Wed Aug 30 17:54:09 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 30 Aug 2006 17:54:09 +0900 Subject: [Slashdotjp-dev 599] CVS update: slashjp/Slash/Display Message-ID: <20060830085409.E13F82AC376@users.sourceforge.jp> Index: slashjp/Slash/Display/Display.pm diff -u slashjp/Slash/Display/Display.pm:1.5 slashjp/Slash/Display/Display.pm:1.6 --- slashjp/Slash/Display/Display.pm:1.5 Fri Jul 14 10:54:25 2006 +++ slashjp/Slash/Display/Display.pm Wed Aug 30 17:54:09 2006 @@ -1,7 +1,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: Display.pm,v 1.5 2006/07/14 01:54:25 sugi Exp $ +# $Id: Display.pm,v 1.6 2006/08/30 08:54:09 sugi Exp $ package Slash::Display; @@ -50,7 +50,7 @@ use base 'Exporter'; use vars qw($VERSION @EXPORT @EXPORT_OK $CONTEXT %FILTERS $TEMPNAME); -($VERSION) = ' $Revision: 1.5 $ ' =~ /\$Revision:\s+([^\s]+)/; +($VERSION) = ' $Revision: 1.6 $ ' =~ /\$Revision:\s+([^\s]+)/; @EXPORT = qw(slashDisplay slashDisplayName); @EXPORT_OK = qw(get_template); my(%objects); @@ -265,6 +265,9 @@ if ($opt->{Skin} && $opt->{Skin} eq 'NONE') { $user->{currentSkin} = 'default'; + } elsif ($user->{light}) { + # TODO: backported light mode. we should delete in future. + $user->{currentSkin} = 'light'; } elsif ($opt->{Skin}) { $user->{currentSkin} = $opt->{Skin}; } From sugi ¡÷ users.sourceforge.jp Wed Aug 30 17:54:10 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 30 Aug 2006 17:54:10 +0900 Subject: [Slashdotjp-dev 600] CVS update: slashjp/themes/slashcode/htdocs Message-ID: <20060830085410.1060F2AC377@users.sourceforge.jp> Index: slashjp/themes/slashcode/htdocs/users.pl diff -u slashjp/themes/slashcode/htdocs/users.pl:1.11 slashjp/themes/slashcode/htdocs/users.pl:1.12 --- slashjp/themes/slashcode/htdocs/users.pl:1.11 Thu Jul 13 10:12:27 2006 +++ slashjp/themes/slashcode/htdocs/users.pl Wed Aug 30 17:54:09 2006 @@ -2,7 +2,7 @@ # This code is a part of Slash, and is released under the GPL. # Copyright 1997-2005 by Open Source Technology Group. See README # and COPYING for more information, or see http://slashcode.com/. -# $Id: users.pl,v 1.11 2006/07/13 01:12:27 sugi Exp $ +# $Id: users.pl,v 1.12 2006/08/30 08:54:09 sugi Exp $ use strict; use Digest::MD5 'md5_hex'; @@ -2024,6 +2024,7 @@ my $lb_check = $user_edit->{lowbandwidth} ? $constants->{markup_checked_attribute} : ''; my $sd_check = $user_edit->{simpledesign} ? $constants->{markup_checked_attribute} : ''; + my $l_check = $user_edit->{light} ? $constants->{markup_checked_attribute} : ''; # TODO: backported light mode. should be deleted in future. my $i_check = $user_edit->{noicons} ? $constants->{markup_checked_attribute} : ''; my $w_check = $user_edit->{willing} ? $constants->{markup_checked_attribute} : ''; @@ -2034,6 +2035,7 @@ admin_block => $admin_block, user_edit => $user_edit, tzformat_select => $tzformat_select, + l_check => $l_check, # TODO: backported light mode. should be deleted in future. i_check => $i_check, w_check => $w_check, lb_check => $lb_check, @@ -2927,10 +2929,11 @@ slashboxes => checkList($slashboxes, 1024), - maxstories => 30, # XXXSKIN fix this later + maxstories => (($form->{maxstories} > 0 && $form->{maxstories} <= 90) ? $form->{maxstories} : 30), noboxes => ($form->{useslashboxes} ? 0 : 1), lowbandwidth => ($form->{lowbandwidth} ? 1 : 0), simpledesign => ($form->{simpledesign} ? 1 : 0), + light => ($form->{light} ? 1 : 0), # TODO: backported light mode. should be deleted in future. noicons => ($form->{noicons} ? 1 : 0), willing => ($form->{willing} ? 1 : 0), }; From sugi ¡÷ users.sourceforge.jp Wed Aug 30 19:57:08 2006 From: sugi ¡÷ users.sourceforge.jp (Tatsuki SUGIURA) Date: Wed, 30 Aug 2006 19:57:08 +0900 Subject: [Slashdotjp-dev 601] CVS update: slashjp/debian Message-ID: <20060830105708.4F2AD2AC05E@users.sourceforge.jp> Index: slashjp/debian/control diff -u slashjp/debian/control:1.1 slashjp/debian/control:1.2 --- slashjp/debian/control:1.1 Wed Aug 9 18:54:03 2006 +++ slashjp/debian/control Wed Aug 30 19:57:08 2006 @@ -26,7 +26,6 @@ Package: slash-frontend Architecture: any Depends: slash-common, libapache-mod-perl, libapache-request-perl, libgd-graph-perl, apache, ${shlibs:Depends}, ${misc:Depends} -Recommends: libgd-graph-perl Description: The code that runs Slashdot - Frontend server settings Slash -- Slashdot Like Automated Storytelling Homepage -- is an architecture to put together web sites. It comes with functionality for posting articles, Index: slashjp/debian/rules diff -u slashjp/debian/rules:1.1 slashjp/debian/rules:1.2 --- slashjp/debian/rules:1.1 Wed Aug 9 18:54:03 2006 +++ slashjp/debian/rules Wed Aug 30 19:57:08 2006 @@ -54,7 +54,7 @@ $(DEB_DESTDIR)/usr/share/slash/themes \ -type f -a -not -name \*.pl | xargs -r chmod -x for f in Blob/blobLoader Messages/populate_message_log_stats.plx \ - PollBooth/rebuildAutoPoll Zoo/rebuildPeople \ + PollBooth/rebuildAutoPoll Zoo/rebuildPeople Tags/tagtimer \ Zoo/rebuildPerson ; do \ chmod +x $(DEB_DESTDIR)/usr/share/slash/plugins/$$f; \ done