[csw-devel] SF.net SVN: gar:[5216] csw/mgar/pkg/vsftpd/trunk

chninkel at users.sourceforge.net chninkel at users.sourceforge.net
Tue Jun 9 22:45:56 CEST 2009


Revision: 5216
          http://gar.svn.sourceforge.net/gar/?rev=5216&view=rev
Author:   chninkel
Date:     2009-06-09 20:45:56 +0000 (Tue, 09 Jun 2009)

Log Message:
-----------
vsftpd: updated to 2.1.2

Modified Paths:
--------------
    csw/mgar/pkg/vsftpd/trunk/Makefile
    csw/mgar/pkg/vsftpd/trunk/checksums
    csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype
    csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW
    csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd

Removed Paths:
-------------
    csw/mgar/pkg/vsftpd/trunk/files/inetd.conf
    csw/mgar/pkg/vsftpd/trunk/files/svc-cswvsftpd
    csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec

Modified: csw/mgar/pkg/vsftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/Makefile	2009-06-09 19:57:49 UTC (rev 5215)
+++ csw/mgar/pkg/vsftpd/trunk/Makefile	2009-06-09 20:45:56 UTC (rev 5216)
@@ -13,7 +13,7 @@
 ###### Package information #######
 
 GARNAME = vsftpd
-GARVERSION = 2.1.1
+GARVERSION = 2.1.2
 CATEGORIES = server
 
 DESCRIPTION = A very secure and fast FTP server.
@@ -48,7 +48,7 @@
 DISTFILES += changelog.CSW README.CSW
 DISTFILES += vsftpd.conf vsftpd.userlist
 DISTFILES += cswvsftpd 
-DISTFILES += cswusergroup
+DISTFILES += cswusergroup 
 
 # build options are set by modifying 
 # builddefs.h, so we patch it to enable
@@ -118,6 +118,7 @@
 
 merge-init-file:
 	ginstall -D "$(WORKDIR_FIRSTMOD)/cswvsftpd" "$(PKGROOT)/etc/init.d/cswvsftpd"
+	ginstall -D "$(WORKDIR_FIRSTMOD)/cswvsftpd.xml" "$(PKGROOT)/var/opt/csw/svc/manifest/network/cswvsftpd.xml"
 
 merge-config-files:
 	ginstall -D "$(WORKDIR_FIRSTMOD)/vsftpd.conf" "$(PKGROOT)$(sysconfdir)/vsftpd/vsftpd.conf.CSW"

Modified: csw/mgar/pkg/vsftpd/trunk/checksums
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/checksums	2009-06-09 19:57:49 UTC (rev 5215)
+++ csw/mgar/pkg/vsftpd/trunk/checksums	2009-06-09 20:45:56 UTC (rev 5216)
@@ -1,14 +1,14 @@
 a2f5b70fe49839b0463c9d90af0f11dd  download/CSWvsftpd.preinstall
-2cc88ffd0b8be226f3977b9105701159  download/CSWvsftpd.prototype
+bdd1564a14f058eb1925b78c01139a8f  download/CSWvsftpd.prototype
 eeaf77528b2da0c7730323838f30b7ef  download/README.CSW
 281c51282cabd9475cceef363bbc699b  download/build_options.patch
-dfb43f73fcf859af22510af9600a954e  download/changelog.CSW
+88a03399191d47a90e4e3480571f6add  download/changelog.CSW
 54c1c39c6bfa8747a4457f135fd5bca1  download/csw_build_system.patch
 a9e994d2b57999b76a0e03503745c01a  download/csw_paths.patch
 98e1d831801985daf5ce2ed01fbc0efd  download/cswusergroup
-8a11892757760e07534a4a455f051e84  download/cswvsftpd
+630e59a947e2fde13beab3185d77d913  download/cswvsftpd
 73e59f9ada47d3d20199f7c97849fb13  download/destdir.patch
 a9a65f55cbfd01f9d72d1de25e67148d  download/set_priv_sep_user.patch
-b1fab0e6212738f9f3572e067c419778  download/vsftpd-2.1.1.tar.gz
+6a8c8579d50adf0d0fc07226c03bfb52  download/vsftpd-2.1.2.tar.gz
 f6ce22a6959b93e500a4ae800295c2ee  download/vsftpd.conf
 60c736802e2ce00c531953b01e4a26f6  download/vsftpd.userlist

Modified: csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype	2009-06-09 19:57:49 UTC (rev 5215)
+++ csw/mgar/pkg/vsftpd/trunk/files/CSWvsftpd.prototype	2009-06-09 20:45:56 UTC (rev 5216)
@@ -58,3 +58,4 @@
 f none /opt/csw/share/man/man8/vsftpd.8 0644 root bin
 d none /opt/csw/var/empty/vsftpd 0700 root sys
 d none /opt/csw/var/ftp 0755 root sys
+f none /var/opt/csw/svc/manifest/network/cswvsftpd.xml 0644 root sys

Modified: csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2009-06-09 19:57:49 UTC (rev 5215)
+++ csw/mgar/pkg/vsftpd/trunk/files/changelog.CSW	2009-06-09 20:45:56 UTC (rev 5216)
@@ -1,3 +1,9 @@
+vsftpd (2.1.2,REV=2009.06.09) unstable
+
+  * New upstream version.
+
+ -- Yann Rouillard <yann at opencsw.org>  Tue, 09 Jun 2009 22:44:34 +0200
+
 vsftpd (2.1.1,REV=2009.05.28) unstable
 
   * New upstream version.

Modified: csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd	2009-06-09 19:57:49 UTC (rev 5215)
+++ csw/mgar/pkg/vsftpd/trunk/files/cswvsftpd	2009-06-09 20:45:56 UTC (rev 5216)
@@ -5,9 +5,12 @@
 # Adapted by Yann Rouillard <yann at blastwave.org>
 #
 
-# chkconfig stuff
-# chkconfig: 3 85 15
-# description: a very secure and fast GPL'd FTP server
+# RC_KNUM 15  
+# RC_SNUM 85   
+# RC_KLEV 0,1,2,S   
+# RC_SLEV 3         
+# MANIFEST /var/opt/csw/svc/manifest/network/cswvsftpd.xml
+
  
 ################################
 # Variable intialization #

Deleted: csw/mgar/pkg/vsftpd/trunk/files/inetd.conf
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/inetd.conf	2009-06-09 19:57:49 UTC (rev 5215)
+++ csw/mgar/pkg/vsftpd/trunk/files/inetd.conf	2009-06-09 20:45:56 UTC (rev 5216)
@@ -1 +0,0 @@
-#ftp	stream	tcp	nowait	root	/opt/csw/sbin/vsftpd	vsftpd

Deleted: csw/mgar/pkg/vsftpd/trunk/files/svc-cswvsftpd
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/svc-cswvsftpd	2009-06-09 19:57:49 UTC (rev 5215)
+++ csw/mgar/pkg/vsftpd/trunk/files/svc-cswvsftpd	2009-06-09 20:45:56 UTC (rev 5216)
@@ -1,189 +0,0 @@
-#!/bin/sh
-# /etc/init.d/vsftpd
-#
-# Originally written by Nicolas LEMIRE <nicolas.lemire at jouy.inra.fr>
-# Adapted by Yann Rouillard <yann at blastwave.org>
-#
-
-# treat unset variable as error
-set -u
-# exit immediately on error line
-set -e
-
-. /lib/svc/share/smf_include.sh
-
-################################
-# Variable intialization #
-################################
-PROGNAME=vsftpd
-BINPATH=/opt/csw/sbin
-PIDFILE=/var/run/vsftpd.pid
-INIT_FILE=/etc/init.d/vsftpd
-CONF_DIR=/opt/csw/etc/vsftpd
-CONF_FILE=$CONF_DIR/vsftpd.conf
-OPTIONS=""
-
-
-####################
-# Useful functions #
-####################
-
-#
-# Check vsftpd config file, i.e. it tests if:
-# - it is correctly set up to work with this init script (listen=yes and background=no)
-# - ftp user exists if anonymous access is configured
-#
-check_config_file()
-{
-	if [ ! -f ${CONF_FILE} ]; then
-		echo "vsftpd: ERROR: configuration file $CONF_FILE doesn't exist." >&2
-		exit $SMF_EXIT_ERR_CONFIG;
-	fi	
-
-    if /usr/bin/egrep -i "^ *listen(_ipv6)? *= *yes" ${CONF_FILE} > /dev/null; then
-	if /usr/bin/egrep -i "^ *background *= *yes" ${CONF_FILE} > /dev/null; then
-	    echo "vsftpd: ERROR: this script doesn't work with background option enabled in $CONF_FILE." >&2
-	    exit $SMF_EXIT_ERR_CONFIG
-	fi
-
-	# As the csw package default configuration is anonymous access only and doesn't automatically create the ftp user,
-	# we warn the user if it didn't create this user.
-	if /usr/bin/egrep -i "^ *anonymous_enable *= *yes" ${CONF_FILE} > /dev/null; then
-	    FTP_USER=`/usr/bin/awk -F= '$0 ~ /^ *ftp_username *=/ { print $2; exit }' ${CONF_FILE}`
-	    FTP_USER=${FTP_USER:-ftp}
-	    getent passwd $FTP_USER >/dev/null || {
-		echo "vsftpd: WARNING: You should create the user $FTP_USER for anonymous ftp access to work."
-	    	exit $SMF_EXIT_MON_DEGRADE
-	    }
-	fi
-
-	return 0
-    fi
-    exit $SMF_EXIT_ERR_CONFIG
-}
-
-
-#
-# check if a program is running by looking at its pid file
-# check_proc pid_file program_command
-#
-check_proc()
-{
-    if [ -f $1 ]; then
-	_PID=`cat $1 | head -1`
-	if [ -n "$_PID" ]; then
-	    _COMMAND=`ps -p $_PID -o comm | tail -1`
-	    [ "x$_COMMAND" = "x$2" ] && return 0
-	fi
-	return 2
-    else
-	return 3
-    fi
-}
-
-
-
-start()
-{
-    if check_proc $PIDFILE $BINPATH/$PROGNAME; then
-	echo "$PROGNAME is already running."
-    else
-	rm -f $PIDFILE
-	echo "Starting $PROGNAME: \c"
-	$BINPATH/$PROGNAME $OPTIONS $CONF_FILE &
-	echo $! > $PIDFILE
-	# We can't rely on exit code for backgrounded job
-	# so we have to test if the process is really running
-	if check_proc $PIDFILE $BINPATH/$PROGNAME; then
-	    echo "OK."
-	else
-	    echo "Failed."
-	    rm -f $PIDFILE
-	fi
-    fi
-}
-
-
-stop()
-{
-    if check_proc $PIDFILE $BINPATH/$PROGNAME; then
-	echo "Stopping $PROGNAME: \c"
-	kill -15 `cat $PIDFILE | head -1`
-	rm -f $PIDFILE
-	echo "OK."
-    else
-	rm -f $PIDFILE
-	echo "$PROGNAME is not running."
-    fi
-}
-
-
-restart()
-{
-    stop
-    start
-}
-
-
-reload()
-{
-    if check_proc $PIDFILE $BINPATH/$PROGNAME; then
-	echo "Reloading $PROGNAME: \c"
-	kill -1 `cat $PIDFILE | head -1`
-	echo "OK."
-    else
-	echo "$PROGNAME is not running."
-    fi
-}
-
-
-status()
-{
-
-    check_proc $PIDFILE $BINPATH/$PROGNAME
-    RET=$?
-
-    if [ "$RET" -eq 0 ]; then
-	echo "$PROGNAME is running."
-    else
-	echo "$PROGNAME is not running."
-    fi
-
-    return $RET
-}
-
-
-[ -x ${BINPATH}/${PROGNAME} ] || exit 5
-[ -r ${CONF_FILE} ] || exit 5
-
-
-# We don't do anything if vsftpd is not configured
-# or is configured in inetd mode
-check_config_file
-
-case "$1" in
-  start) start ;;
-  stop) stop ;;
-  restart) restart ;;
-  reload) reload ;;
-  status) status ;;
-  *)
-    echo "Usage: $INIT_FILE {start|stop|restart|reload|status}"
-    exit 1
-    ;;
-esac
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

Deleted: csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec
===================================================================
--- csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec	2009-06-09 19:57:49 UTC (rev 5215)
+++ csw/mgar/pkg/vsftpd/trunk/files/vsftpd_dyngspec.fakespec	2009-06-09 20:45:56 UTC (rev 5216)
@@ -1,3 +0,0 @@
-%include        url file://%{PKGLIB}/csw_dyngspec.gspec
-%var		SERVICE_CONF_FILES /opt/csw/etc/vsftpd/vsftpd.conf
-%include        url file://%{PKGLIB}/smf_enabled.gspec


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list