[evolvis-commits] r11908: Some work on cvs plugin↵
mirabilos at evolvis.org
mirabilos at evolvis.org
Thu Feb 24 18:28:36 CET 2011
Author: mirabilos
Date: 2011-02-24 18:28:36 +0100 (Thu, 24 Feb 2011)
New Revision: 11908
Added:
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/cvs-pserver
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/cvssh.pl
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/install-cvs.debian.sh
Removed:
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/cvs-pserver
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/cvssh.pl
trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/install-cvs.sh
Modified:
trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
trunk/gforge_base/evolvisforge-5.1/gforge/debian/control
trunk/gforge_base/evolvisforge-5.1/gforge/debian/rules
Log:
Some work on cvs plugin
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-24 17:28:35 UTC (rev 11907)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/changelog 2011-02-24 17:28:36 UTC (rev 11908)
@@ -1,4 +1,4 @@
-gforge (4.5.14-25+952) unstable; urgency=low
+gforge (4.5.14-25+953) unstable; urgency=low
* Merged Branch_4_5 into trunk after svn conversion
essentially debian and deb-specific dir, setup and install-apache.sh too
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/control
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/control 2011-02-24 17:28:35 UTC (rev 11907)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/control 2011-02-24 17:28:36 UTC (rev 11908)
@@ -37,7 +37,7 @@
Package: gforge-plugins
Architecture: all
-Depends: gforge-common, php4-cli, python
+Depends: gforge-common, php4-cli, python, python-subversion
Conflicts: sourceforge, gforge-plugin-scmcvs, gforge-plugin-scmsvn, gforge-plugin-scmccase
Description: collaborative development tool - plugins
GForge provides many tools to help collaboration in a
Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/rules
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/rules 2011-02-24 17:28:35 UTC (rev 11907)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/rules 2011-02-24 17:28:36 UTC (rev 11908)
@@ -65,11 +65,13 @@
# gforge-plugins
cp -r plugins $(CURDIR)/debian/gforge-plugins/usr/share/gforge/
- cp -r $(CURDIR)/debian/gforge-plugins/usr/share/gforge/plugins/*/etc/* $(CURDIR)/debian/gforge-plugins/etc/gforge/
+ cp -r $(CURDIR)/debian/gforge-plugins/usr/share/gforge/plugins/*/etc/* $(CURDIR)/debian/gforge-plugins/usr/share/gforge/etc/
rm -rf $(CURDIR)/debian/gforge-plugins/usr/share/gforge/plugins/*/etc/*
rm -rf $(CURDIR)/debian/gforge-plugins/usr/share/gforge/plugins/*/debian
ln -s /var/lib/gforge/www/plugins $(CURDIR)/debian/gforge-plugins/usr/share/gforge/www
chown www-data:www-data $(CURDIR)/debian/gforge-plugins/var/lib/gforge/www/plugins
+ chmod 755 $(CURDIR)/debian/gforge-plugins/usr/share/gforge/plugins/*/sbin/*
+ chmod 755 $(CURDIR)/debian/gforge-plugins/usr/share/gforge/plugins/*/bin/*
# mediawiki plugin
cp -r $(CURDIR)/debian/gforge-plugins/usr/share/gforge/plugins/mediawiki/usr $(CURDIR)/debian/gforge-plugins/
rm -rf $(CURDIR)/debian/gforge-plugins/usr/share/gforge/plugins/mediawiki/usr
@@ -78,6 +80,8 @@
mv $(CURDIR)/debian/gforge-plugins/usr/share/mediawiki1.7/LocalSettings.php \
$(CURDIR)/debian/gforge-plugins/usr/share/mediawiki1.7/LocalSettings.php.gforge_example
mv $(CURDIR)/debian/gforge-plugins/usr/share/gforge/plugins/mediawiki/README $(CURDIR)/debian/gforge-plugins/usr/share/doc/gforge-plugins/README.mediawiki
+ # scmcvs plugin
+
# gforge-common
install -m 644 etc/httpd.d/[0-9][0-9]* $(CURDIR)/debian/gforge-common/usr/share/gforge/etc/httpd.d/
Deleted: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/cvs-pserver
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/cvs-pserver 2011-02-24 17:28:35 UTC (rev 11907)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/cvs-pserver 2011-02-24 17:28:36 UTC (rev 11908)
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-# $Debian: cvs/debian/cvs-pserver,v 1.1 2001/04/20 16:00:54 epg Exp $
-
-CHROOTDIR=/var/lib/gforge/chroot
-CVSROOT=cvsroot # without leading "/"!
-
-# Execute pserver
-cd $CHROOTDIR
-CVS_PSERV_REPOS=$(ls -d $CVSROOT/*)
-allow_root_opts="--allow-root=/$(echo $CVS_PSERV_REPOS | sed 's: : --allow-root=/:g')"
-
-exec /usr/sbin/chroot $CHROOTDIR /usr/bin/cvs ${allow_root_opts} pserver
-
-# End of file.
Deleted: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/cvssh.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/cvssh.pl 2011-02-24 17:28:35 UTC (rev 11907)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/cvssh.pl 2011-02-24 17:28:36 UTC (rev 11908)
@@ -1,50 +0,0 @@
-#! /usr/bin/perl -w
-#
-# $Id$
-#
-# "Shell" for a restricted account, limiting the available commands
-# Roland Mas, debian-sf (Sourceforge for Debian)
-#
-# Inspired from the grap.c file in Sourceforge 2.5
-
-use strict ;
-use vars qw/ @allowed_options @allowed_commands $errmsg @cmd / ;
-use subs qw/ &reject / ;
-no locale ;
-
- at allowed_options = ('-c', '-e') ;
- at allowed_commands = ('cvs') ;
-
-# Clean up our environment
-delete @ENV{qw(IFS CDPATH ENV BASH_ENV PATH)};
-
-if ($#ARGV != 1) {
- if ($#ARGV < 1) {
- $errmsg = "Not enough arguments." ;
- } else {
- $errmsg = "Too many arguments." ;
- }
- &reject ;
-}
-
-if (scalar (grep { $_ eq $ARGV[0] } @allowed_options) == 0) {
- $errmsg = "Option not allowed." ;
- &reject ;
-}
-
- at cmd = split (/ +/, $ARGV[1]) ;
-
-if (scalar (grep { $_ eq $cmd[0] } @allowed_commands) == 0) {
- $errmsg = "Command not allowed." ;
- &reject ;
-}
-
-exec @cmd ;
-
-sub reject {
- print "This is a restricted account.\n" .
- "You cannot execute anything here.\n" .
- # $errmsg . "\n" .
- "Goodbye.\n" ;
- exit 1 ;
-}
Deleted: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/install-cvs.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/install-cvs.sh 2011-02-24 17:28:35 UTC (rev 11907)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/bin/install-cvs.sh 2011-02-24 17:28:36 UTC (rev 11908)
@@ -1,38 +0,0 @@
-#! /bin/sh
-#
-# $Id$
-#
-# Configure CVS for Sourceforge
-# Christian Bayle, Roland Mas, debian-sf (Sourceforge for Debian)
-
-set -e
-
-if [ $(id -u) != 0 ] ; then
- echo "You must be root to run this, please enter passwd"
- exec su -c "$0 $1"
-fi
-
-case "$1" in
- configure)
- echo "Modifying inetd for cvs server"
- echo "CVS usual config is changed for gforge one"
- # First, dedupe the commented lines
- update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/lib/gforge/bin/cvs-pserver"
- update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/lib/gforge/plugins/scmcvs/bin/cvs-pserver"
- update-inetd --comment-chars "#SF_WAS_HERE#" --enable cvspserver
- # Then, insinuate ourselves
- update-inetd --comment-chars "#SF_WAS_HERE#" --disable cvspserver
- update-inetd --add "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/lib/gforge/plugins/scmcvs/bin/cvs-pserver"
- ;;
-
- purge)
- echo "Purging inetd for cvs server"
- # echo "You should dpkg-reconfigure cvs to use std install"
- update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/lib/gforge/plugins/scmcvs/bin/cvs-pserver"
- update-inetd --comment-chars "#SF_WAS_HERE#" --enable cvspserver
- ;;
-
- *)
- echo "Usage: $0 {configure|purge}"
- exit 1
-esac
Added: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/cvs-pserver
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/cvs-pserver (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/cvs-pserver 2011-02-24 17:28:36 UTC (rev 11908)
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+# $Debian: cvs/debian/cvs-pserver,v 1.1 2001/04/20 16:00:54 epg Exp $
+
+CHROOTDIR=/var/lib/gforge/chroot
+CVSROOT=cvsroot # without leading "/"!
+
+# Execute pserver
+cd $CHROOTDIR
+CVS_PSERV_REPOS=$(ls -d $CVSROOT/*)
+allow_root_opts="--allow-root=/$(echo $CVS_PSERV_REPOS | sed 's: : --allow-root=/:g')"
+
+exec /usr/sbin/chroot $CHROOTDIR /usr/bin/cvs ${allow_root_opts} pserver
+
+# End of file.
Added: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/cvssh.pl
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/cvssh.pl (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/cvssh.pl 2011-02-24 17:28:36 UTC (rev 11908)
@@ -0,0 +1,50 @@
+#! /usr/bin/perl -w
+#
+# $Id$
+#
+# "Shell" for a restricted account, limiting the available commands
+# Roland Mas, debian-sf (Sourceforge for Debian)
+#
+# Inspired from the grap.c file in Sourceforge 2.5
+
+use strict ;
+use vars qw/ @allowed_options @allowed_commands $errmsg @cmd / ;
+use subs qw/ &reject / ;
+no locale ;
+
+ at allowed_options = ('-c', '-e') ;
+ at allowed_commands = ('cvs') ;
+
+# Clean up our environment
+delete @ENV{qw(IFS CDPATH ENV BASH_ENV PATH)};
+
+if ($#ARGV != 1) {
+ if ($#ARGV < 1) {
+ $errmsg = "Not enough arguments." ;
+ } else {
+ $errmsg = "Too many arguments." ;
+ }
+ &reject ;
+}
+
+if (scalar (grep { $_ eq $ARGV[0] } @allowed_options) == 0) {
+ $errmsg = "Option not allowed." ;
+ &reject ;
+}
+
+ at cmd = split (/ +/, $ARGV[1]) ;
+
+if (scalar (grep { $_ eq $cmd[0] } @allowed_commands) == 0) {
+ $errmsg = "Command not allowed." ;
+ &reject ;
+}
+
+exec @cmd ;
+
+sub reject {
+ print "This is a restricted account.\n" .
+ "You cannot execute anything here.\n" .
+ # $errmsg . "\n" .
+ "Goodbye.\n" ;
+ exit 1 ;
+}
Property changes on: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/cvssh.pl
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/install-cvs.debian.sh
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/install-cvs.debian.sh (rev 0)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/install-cvs.debian.sh 2011-02-24 17:28:36 UTC (rev 11908)
@@ -0,0 +1,39 @@
+#! /bin/sh
+#
+# $Id: install-cvs.sh,v 1.3 2004/07/21 22:00:26 cbayle Exp $
+#
+# Configure CVS for Sourceforge
+# Christian Bayle, Roland Mas, debian-sf (Sourceforge for Debian)
+
+set -e
+
+if [ $(id -u) != 0 ] ; then
+ echo "You must be root to run this, please enter passwd"
+ exec su -c "$0 $1"
+fi
+
+case "$1" in
+ configure)
+ echo "Modifying inetd for cvs server"
+ echo "CVS usual config is changed for gforge one"
+ # First, dedupe the commented lines
+ update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/lib/gforge/bin/cvs-pserver"
+ update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/lib/gforge/plugins/scmcvs/bin/cvs-pserver"
+ update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/share/gforge/plugins/scmcvs/bin/cvs-pserver"
+ update-inetd --comment-chars "#SF_WAS_HERE#" --enable cvspserver
+ # Then, insinuate ourselves
+ update-inetd --comment-chars "#SF_WAS_HERE#" --disable cvspserver
+ update-inetd --add "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/share/gforge/plugins/scmcvs/sbin/cvs-pserver"
+ ;;
+
+ purge)
+ echo "Purging inetd for cvs server"
+ # echo "You should dpkg-reconfigure cvs to use std install"
+ update-inetd --remove "cvspserver stream tcp nowait.400 root /usr/sbin/tcpd /usr/share/gforge/plugins/scmcvs/sbin/cvs-pserver"
+ update-inetd --comment-chars "#SF_WAS_HERE#" --enable cvspserver
+ ;;
+
+ *)
+ echo "Usage: $0 {configure|purge}"
+ exit 1
+esac
Property changes on: trunk/gforge_base/evolvisforge-5.1/gforge/plugins/scmcvs/sbin/install-cvs.debian.sh
___________________________________________________________________
Added: svn:executable
+ *
More information about the evolvis-commits
mailing list