| [vhffs-dev] [svn] commit: r62 - in trunk: ./ debian/ vhffs-backend/src/pgsql/ vhffs-backend/tools/ vhffs-doc/ vhffs-doc/config/exim4-mx1/ vhffs-robots/src/ vhffs-shells/ vhffs-tools/mans/ vhffs-tools/src/ |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
- To: vhffs-dev@xxxxxxxxx
- Subject: [vhffs-dev] [svn] commit: r62 - in trunk: ./ debian/ vhffs-backend/src/pgsql/ vhffs-backend/tools/ vhffs-doc/ vhffs-doc/config/exim4-mx1/ vhffs-robots/src/ vhffs-shells/ vhffs-tools/mans/ vhffs-tools/src/
- From: vhffs-dev@xxxxxxxxx
- Date: Sun Jul 24 22:29:55 2005 +00
Author: soda
Date: Mon Jul 25 00:29:52 2005
New Revision: 62
Log:
Work around debian packaging (start debconf work)
Tuxshell now supports syslogd and subversion
Improve installation process
Added:
trunk/debian/apache-panel.conf
trunk/debian/vhffs-backend.postinst
trunk/debian/vhffs-backend.postrm
trunk/debian/vhffs-backend.templates
trunk/debian/vhffs-configfile.postinst
trunk/debian/vhffs-configfile.templates
trunk/debian/vhffs-doc.dirs
trunk/debian/vhffs-listengine.dirs
trunk/debian/vhffs-panel.postinst
trunk/debian/vhffs-panel.postrm
trunk/debian/vhffs-panel.templates
trunk/debian/vhffs-tools.dirs
trunk/debian/vhffs-tuxshell.manpages
trunk/debian/vhffs-tuxshell.postinst
trunk/debian/vhffs-tuxshell.postrm
trunk/vhffs-backend/tools/
trunk/vhffs-backend/tools/vhffs-initdb (with props)
trunk/vhffs-backend/tools/vhffs-migratedb (with props)
trunk/vhffs-doc/HOWTO-Robots
- copied, changed from r61, trunk/vhffs-robots/src/crontab
trunk/vhffs-shells/tuxshell.1
trunk/vhffs-tools/mans/
trunk/vhffs-tools/mans/blankmysql.1
trunk/vhffs-tools/src/vhffs-initdb
- copied, changed from r61, trunk/vhffs-backend/src/pgsql/add_tables.sh
trunk/vhffs-tools/src/vhffs-migratedb
- copied unchanged from r61, trunk/vhffs-backend/src/pgsql/migrate_db.sh
Removed:
trunk/vhffs-backend/src/pgsql/add_tables.sh
trunk/vhffs-backend/src/pgsql/migrate_db.sh
trunk/vhffs-robots/src/all.sh
trunk/vhffs-robots/src/crontab
Modified:
trunk/Makefile
trunk/debian/changelog
trunk/debian/control
trunk/debian/rules
trunk/debian/vhffs-backend.dirs
trunk/debian/vhffs-panel.dirs
trunk/make_release2
trunk/vhffs-backend/src/pgsql/create_shadow_view.sql
trunk/vhffs-doc/config/exim4-mx1/host
trunk/vhffs-shells/tuxshell.c
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Mon Jul 25 00:29:52 2005
@@ -32,7 +32,6 @@
else
cp -r vhffs-api/src/Vhffs/* "${DESTDIR}/${APIDIR}/"
find "${DESTDIR}/${APIDIR}/" -type f | xargs chmod 644
- find "${DESTDIR}/${TEMPLATESDIR}/" -type f | xargs chown root:root
fi
echo "done"
@@ -48,8 +47,8 @@
cp -r vhffs-panel/* "${DESTDIR}/${PANELDIR}/"
rm -fr "${DESTDIR}/${PANELDIR}/templates"
- find "${DESTDIR}/${TEMPLATESDIR}/" -type f | xargs chmod 755
- find "${DESTDIR}/${TEMPLATESDIR}/" -type f | xargs chown root:root
+ find "${DESTDIR}/${PANELDIR}/" -type f | xargs chmod 755
+ find "${DESTDIR}/${PANELDIR}/themes" -type f | xargs chmod 644
fi
echo "done"
@@ -63,19 +62,20 @@
else
cp -r vhffs-panel/templates/* "${DESTDIR}/${TEMPLATESDIR}/"
find "${DESTDIR}/${TEMPLATESDIR}/" -type f | xargs chmod 644
- find "${DESTDIR}/${TEMPLATESDIR}/" -type f | xargs chown root:root
fi
echo "done"
echo -n "Install VHFFS backend files ... "
rm -rf "${DESTDIR}/${BACKENDDIR}" 1>/dev/null 2>&1
- mkdir -p "${DESTDIR}/${BACKENDDIR}"
+ mkdir -p "${DESTDIR}/${BACKENDDIR}/tools"
if [ ! -d "${CURRENTDIR}/vhffs-backend/src/pgsql" ]; then
echo "vhffs-backend module not found in sources"
else
- cp -r vhffs-backend/src/pgsql/* "${DESTDIR}/${BACKENDDIR}/"
+ cp -r vhffs-backend/src/pgsql/*.sql "${DESTDIR}/${BACKENDDIR}/"
+ cp -r vhffs-backend/tools/* "${DESTDIR}/${BACKENDDIR}/tools/"
find "${DESTDIR}/${BACKENDDIR}/" -type f | xargs chmod 644
- find "${DESTDIR}/${BACKENDDIR}/" -type f | xargs chown root:root
+ r
+ find "${DESTDIR}/${BACKENDDIR}/tools" -type f | xargs chmod 755
fi
echo "done"
@@ -89,7 +89,6 @@
else
cp -r vhffs-doc/* "${DESTDIR}/${DOCDIR}/"
find "${DESTDIR}/${DOCDIR}/" -type f | xargs chmod 644
- find "${DESTDIR}/${DOCDIR}/" -type f | xargs chown root:root
fi
echo "done"
@@ -118,7 +117,6 @@
else
cp -r vhffs-intl/result/* "${DESTDIR}/${INTLDIR}/"
find "${DESTDIR}/${INTLDIR}/" -type f | xargs chmod 644
- find "${DESTDIR}/${INTLDIR}/" -type f | xargs chown root:root
echo "done"
fi
@@ -171,11 +169,14 @@
else
if [ ! -d "${DESTDIR}/bin/" ]; then
mkdir -p "${DESTDIR}/bin/"
+ mkdir -p "${DESTDIR}/usr/share/man/man1"
fi
cd "${CURRENTDIR}/vhffs-shells"
make clean 1>/dev/null 2>/dev/null
make 1>/dev/null 2>/dev/null
cp tuxshell "${DESTDIR}/bin/"
+ cp tuxshell.1 "${DESTDIR}/usr/share/man/man1/"
+ gzip "${DESTDIR}/usr/share/man/man1/tuxshell.1"
echo "/bin/tuxshell" >> "${DESTDIR}/etc/shells"
fi
Modified: trunk/debian/changelog
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Mon Jul 25 00:29:52 2005
@@ -1,4 +1,4 @@
-vhffs (4.0-1) unstable; urgency=low
+vhffs (4.0rc6-1) unstable; urgency=low
* Initial Release
Modified: trunk/debian/control
==============================================================================
--- trunk/debian/control (original)
+++ trunk/debian/control Mon Jul 25 00:29:52 2005
@@ -2,6 +2,7 @@
Section: x11
Priority: optional
Maintainer: Julien Delange <julien@xxxxxxxxx>
+Build-Depends: debhelper(>= 4.0.0)
Build-Depends-Indep: debhelper(>= 4.0.0)
Standards-Version: 3.6.1.0
@@ -9,7 +10,7 @@
Section: perl
Architecture: all
Recommends: vhffs-panel
-Depends: ${perl:Depends} libcrypt-passwdmd5-perl, libmime-lite-perl, libconfig-general-perl, liblocale-gettext-perl
+Depends: ${perl:Depends} libcrypt-passwdmd5-perl, libmime-lite-perl, libconfig-general-perl, liblocale-gettext-perl, vhffs-configfile
Description: main API of VHFFS
VHFFS API is requested by any VHFFS composant. So, it must
be installed in order to run VHFFS.
@@ -17,34 +18,36 @@
Package: vhffs-robots
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, vhffs-api , vhffs-configfile
Description: robots for VHFFS
VHFFS robots are used to create VHFFS object on
your VHFFS system.
+
Package: vhffs-panel
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, liblocale-gettext-perl, libhtml-template-perl, libcgi-session-perl, libxml-rss-perl, libxml-parser
+Depends: ${shlibs:Depends}, ${misc:Depends}, liblocale-gettext-perl, libhtml-template-perl, libcgi-session-perl, libxml-rss-perl, libxml-parser, vhffs-api, vhffs-intl , vhffs-configfile
Description: panel of VHFFS
This is the panel of VHFFS, a web GUI to control VHFFS
+
+
+Package: vhffs-listengine
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, liblocale-gettext-perl, libhtml-template-perl, vhffs-api , vhffs-configfile
+Description: mailing-list manager for vhffs
+ Listengine is the program who handles lists on vhffs
-Package: vhffs-tuxshell
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: shell for VHFFS
- Tuxshell is a shell for VHFFS in order to provide a CVS server
- without a complete ssh account
+
Package: vhffs-backend
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: postgresql , vhffs-configfile , vhffs-api
Description: backend for VHFFS
This is the backend files for VHFFS. It is used to
create the main database of VHFFS.
Package: vhffs-intl
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
Description: internationalisation for VHFFS
This is the internationalisation files for VHFFS.
It is used with the panel, in order to provide visible
@@ -53,8 +56,27 @@
Package: vhffs-configfile
Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
Description: configuration file for VHFFS
This is the main configuration file for VHFFS.
+Package: vhffs-doc
+Section: doc
+Architecture: all
+Description: documentation for vhffs
+ Contains documentation for VHFFS
+
+Package: vhffs-tuxshell
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: shell for VHFFS
+ Tuxshell is a shell for VHFFS in order to provide a CVS server
+ without a complete ssh account
+
+
+Package: vhffs-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: tools for VHFFS
+ Some tools to manage VHFFS platform
+
Modified: trunk/debian/rules
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Mon Jul 25 00:29:52 2005
@@ -16,6 +16,9 @@
INTLDIR = $(CURDIR)/debian/vhffs-intl/
CONFIGDIR = $(CURDIR)/debian/vhffs-configfile/
SHELLDIR = $(CURDIR)/debian/vhffs-tuxshell/
+DOCDIR = $(CURDIR)/debian/vhffs-doc/
+LEDIR = $(CURDIR)/debian/vhffs-listengine/
+TOOLSDIR = $(CURDIR)/debian/vhffs-tools/
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
@@ -51,32 +54,91 @@
dh_clean -k
dh_installdirs
- # Add here commands to install the package into debian/gngeogui.
DESTDIR=$(CURDIR)/debian/tmp/ sh Makefile
- #Install API
- cp -r $(INSTDIR)/usr/lib/perl5/Vhffs $(APIDIR)/usr/share/perl5/
+ ###########################################
+ #API
+ ###########################################
+ install -m 644 $(INSTDIR)/usr/share/perl5/Vhffs/*.pm $(APIDIR)/usr/share/perl5/Vhffs
+ install -m 644 $(INSTDIR)/usr/share/perl5/Vhffs/Robots/*.pm $(APIDIR)/usr/share/perl5/Vhffs/Robots
+ install -m 644 $(INSTDIR)/usr/share/perl5/Vhffs/Services/*.pm $(APIDIR)/usr/share/perl5/Vhffs/Services
- #Install Robots
- cp -r $(INSTDIR)/usr/lib/vhffs/bots/* $(ROBOTSDIR)/usr/lib/vhffs/bots/ 2>/dev/null
- chmod 755 $(ROBOTSDIR)/usr/lib/vhffs/bots/*
+ ###########################################
+ #Robots packaging
+ ###########################################
+ install -m 755 $(INSTDIR)/usr/lib/vhffs/bots/* $(ROBOTSDIR)/usr/lib/vhffs/bots/
- #Install Panel
+ ###########################################
+ #Panel
+ ###########################################
+ #Install perl scripts (CGI)
cp -r $(INSTDIR)/usr/share/vhffs/panel/* $(PANELDIR)/usr/share/vhffs/panel/
+ find $(PANELDIR)/usr/share/vhffs/panel -type f | xargs chmod 755
+ find $(PANELDIR)/usr/share/vhffs/panel/themes -type f | xargs chmod 644
+ find $(PANELDIR)/usr/share/vhffs/panel/help -type f | xargs chmod 644
+ find $(PANELDIR)/usr/share/vhffs/panel -type d | xargs chmod 755
+ chmod 644 $(PANELDIR)/usr/share/vhffs/panel/favicon.ico
+
+ #Install templates
cp -r $(INSTDIR)/usr/share/vhffs/templates/* $(PANELDIR)/usr/share/vhffs/templates/
+ find $(PANELDIR)/usr/share/vhffs/templates -type f | xargs chmod 644
+ find $(PANELDIR)/usr/share/vhffs/templates -type d | xargs chmod 755
- #Install Backend
- cp -r $(INSTDIR)/usr/share/vhffs/backend/* $(BACKENDDIR)/usr/share/vhffs/backend/pgsql/files/
+ #Install apache configfile in /etc/vhffs/
+ install -m 644 debian/apache-panel.conf $(PANELDIR)/etc/vhffs/
+ ###########################################
+ #Install backend
+ ###########################################
+ install -m 644 $(INSTDIR)/usr/share/vhffs/backend/*.sql $(BACKENDDIR)/usr/share/vhffs/backend/pgsql/files/
+ install -m 755 $(INSTDIR)/usr/share/vhffs/backend/tools/* $(BACKENDDIR)/usr/share/vhffs/backend/tools/
+ sed -i -e "s/SCRIPTDIR=.*/SCRIPTDIR=\"\/usr\/share\/vhffs\/backend\/pgsql\/files\/\"/g" $(BACKENDDIR)/usr/share/vhffs/backend/tools/vhffs-initdb
+
+ ###########################################
#Install internationalisation
- cp -r $(INSTDIR)/usr/share/vhffs/intl/* $(INTLDIR)/usr/share/vhffs/intl/
+ ###########################################
+ #English/American, no .mo file
+ install -d -m 755 $(INTLDIR)/usr/share/vhffs/intl/en_US
+ install -d -m 755 $(INTLDIR)/usr/share/vhffs/intl/en_US/LC_MESSAGES
- #Install config file
- cp -r $(INSTDIR)/etc/vhffs/vhffs.conf $(CONFIGDIR)/etc/vhffs/
+ #French traduction
+ install -d -m 755 $(INTLDIR)/usr/share/vhffs/intl/fr_FR
+ install -d -m 755 $(INTLDIR)/usr/share/vhffs/intl/fr_FR/LC_MESSAGES
+ install -m 644 $(INSTDIR)/usr/share/vhffs/intl/fr_FR/LC_MESSAGES/vhffs.mo $(INTLDIR)/usr/share/vhffs/intl/fr_FR/LC_MESSAGES/vhffs.mo
+ #Spanish
+ install -d -m 755 $(INTLDIR)/usr/share/vhffs/intl/es_ES
+ install -d -m 755 $(INTLDIR)/usr/share/vhffs/intl/es_ES/LC_MESSAGES
+ install -m 644 $(INSTDIR)/usr/share/vhffs/intl/es_ES/LC_MESSAGES/vhffs.mo $(INTLDIR)/usr/share/vhffs/intl/es_ES/LC_MESSAGES/vhffs.mo
- cd $(CURDIR)/vhffs-shells && make
- cp $(CURDIR)/vhffs-shells/tuxshell $(SHELLDIR)/bin/
+ ###########################################
+ #Install vhffs.conf | config file
+ ###########################################
+ install -m 644 $(INSTDIR)/etc/vhffs/vhffs.conf $(CONFIGDIR)/etc/vhffs/
+
+ ###########################################
+ #Install vhffs shell (tuxshell)
+ ###########################################
+ install -m 755 $(INSTDIR)/bin/tuxshell $(SHELLDIR)/bin/tuxshell
+
+ ###########################################
+ #Package vhffs doc
+ ###########################################
+ cp -pr $(INSTDIR)/usr/share/doc/vhffs/* $(DOCDIR)/usr/share/doc/vhffs/
+ rm -f $(DOCDIR)/usr/share/doc/vhffs/LICENCE
+
+ ###########################################
+ #Package vhffs tools
+ ###########################################
+ cp -pr $(INSTDIR)/usr/bin/* $(TOOLSDIR)/usr/bin/
+
+ ###########################################
+ #Package listengine
+ ###########################################
+ install -m 755 $(INSTDIR)/usr/lib/vhffs/listengine/listengine $(LEDIR)/usr/lib/vhffs/listengine/listengine
+ install -m 755 $(INSTDIR)/usr/share/vhffs/listengine/archives/web/archives.pl $(LEDIR)/usr/share/vhffs/listengine/archives/web/archives.pl
+ install -m 755 $(INSTDIR)/usr/share/vhffs/listengine/archives/web/show_msg.pl $(LEDIR)/usr/share/vhffs/listengine/archives/web/show_msg.pl
+ install -m 644 $(INSTDIR)/usr/share/vhffs/listengine/archives/templates/* $(LEDIR)/usr/share/vhffs/listengine/archives/templates
# Build architecture-independent files here.
binary-indep: build install
@@ -108,7 +170,7 @@
# dh_python
# dh_makeshlibs
dh_installdeb
-# dh_shlibdeps
+ dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
Modified: trunk/debian/vhffs-backend.dirs
==============================================================================
--- trunk/debian/vhffs-backend.dirs (original)
+++ trunk/debian/vhffs-backend.dirs Mon Jul 25 00:29:52 2005
@@ -1,4 +1,6 @@
+usr/bin
usr/share/vhffs
usr/share/vhffs/backend
usr/share/vhffs/backend/pgsql
+usr/share/vhffs/backend/tools
usr/share/vhffs/backend/pgsql/files/
Modified: trunk/debian/vhffs-panel.dirs
==============================================================================
--- trunk/debian/vhffs-panel.dirs (original)
+++ trunk/debian/vhffs-panel.dirs Mon Jul 25 00:29:52 2005
@@ -1,3 +1,4 @@
usr/share/vhffs/panel
usr/share/vhffs/templates
usr/share/vhffs/themes
+etc/vhffs
Modified: trunk/make_release2
==============================================================================
--- trunk/make_release2 (original)
+++ trunk/make_release2 Mon Jul 25 00:29:52 2005
@@ -82,7 +82,7 @@
{
my $work = shift;
my $tmp = shift;
- my $output_file = $tmp."/vhffs".$VERSION.".tgz";
+ my $output_file = $tmp."/vhffs-".$VERSION.".tar.gz";
my $files;
foreach( @files_to_package )
{
@@ -132,6 +132,7 @@
my $workdir = create_workdir();
print( $workdir );
+unlink( $sourcesdir ."/debian/files") if( -f $sourcesdir."/debian/files");
treat_dir( $sourcesdir , $workdir );
tar_distro( $workdir , $tmpdir );
Modified: trunk/vhffs-backend/src/pgsql/create_shadow_view.sql
==============================================================================
--- trunk/vhffs-backend/src/pgsql/create_shadow_view.sql (original)
+++ trunk/vhffs-backend/src/pgsql/create_shadow_view.sql Mon Jul 25 00:29:52 2005
@@ -1,3 +1,3 @@
CREATE VIEW vhffs_shadow AS
-SELECT uid, gid, username, shell, '*' AS passwd, '0' as newtok , '0' as expired , homedir
+SELECT uid, gid, username, shell, passwd, '0' as newtok , '0' as expired , homedir
FROM vhffs_users;
Modified: trunk/vhffs-doc/config/exim4-mx1/host
==============================================================================
--- trunk/vhffs-doc/config/exim4-mx1/host (original)
+++ trunk/vhffs-doc/config/exim4-mx1/host Mon Jul 25 00:29:52 2005
@@ -1,0 +1,1 @@
+#empty file
Modified: trunk/vhffs-shells/tuxshell.c
==============================================================================
--- trunk/vhffs-shells/tuxshell.c (original)
+++ trunk/vhffs-shells/tuxshell.c Mon Jul 25 00:29:52 2005
@@ -1,6 +1,7 @@
/* graplite - General execution wRAPper LITE!
* Copyright (C) 1999 Lion Templin <lion@xxxxxxxxxxx>
* Copyright (C) 2002 Igor Genibel <igor@xxxxxxxxxxxxx>
+ * Copyright (C) 2005 Julien Delange <sod@xxxxxxxxxxxxx>
*
* FILE: graplite.c
* VERSION : 0.1+tuxfamily (2002-04-17)
@@ -31,6 +32,7 @@
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
+#include <syslog.h>
/* grap is a wrapper designed to verify commands before passing them to system()
or just reporting the accepted command. grap will report an error if the
@@ -76,11 +78,11 @@
#define MAXSTRLEN 256 /* maximum single string length
(no max on final command) */
/* Define what strings are acceptable in <option> */
-char *options[] = { "-c", "-e", NULL };
+char *options[] = { "-c" , "-e" , NULL };
/* Define what strings are acceptable in <command>
define an optional execution path CMD_PATH if desired */
-char *commands[] = { "cvs", "server", NULL };
+char *commands[] = { "cvs" , "svnserve" , NULL };
#define MAXARGS 256
@@ -104,12 +106,18 @@
int i, j, flag;
char *buf;
char *args[MAXARGS];
-
+ int ok = 0;
+
+ openlog("Tuxshell" , LOG_NOWAIT | LOG_NDELAY , LOG_AUTHPRIV );
if(argc != 3) {
/* printf("FATAL: %s bailed because not enough options.\n", argv[0]); */
+ syslog( LOG_INFO , "try open a login shell");
+ closelog();
deny();
}
+
+
/* process the initial option (see options array) */
@@ -118,7 +126,8 @@
while((options[++i] != NULL) && strcmp(options[i], argv[OPTION_ARGC]));
if(options[i] == NULL) {
/* printf("FATAL: %s bailed because options didn't qualify.\n", argv[0]); */
-
+ syslog( LOG_INFO , "option %s is not allowed" , argv[OPTION_ARGC]);
+ closelog();
deny();
}
@@ -146,15 +155,26 @@
}
/* check the command to insure it's in the acceptance list */
+ i = 0;
+ while((commands[i] != NULL))
+ {
+ if( strcmp( commands[i] , args[CMD_POS] ) == 0 )
+ {
+ ok = 1;
+ }
+ i++;
+ }
- i = -1;
- while((commands[++i] != NULL) && !strcmp(commands[i], args[CMD_POS+i]));
- if(commands[i] != NULL) {
+ if( ok == 0)
+ {
/* printf("FATAL: %s bailed because command didn't qualify.\n", args[CMD_POS]); */
-
+ syslog( LOG_WARNING , "NOT allow command %s" , args[CMD_POS] );
+ closelog();
deny();
}
+ syslog( LOG_INFO , "allow command %s" , args[CMD_POS] );
+ closelog();
/* ok, the command is clear, exec() it */