Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (f7bb5d4b003581707080dd10a115a9f5e1b16aba)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (f7bb5d4b003581707080dd10a115a9f5e1b16aba)
  • Date: Sun, 27 Mar 2011 15:56:09 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT sourcemage.org>:

devel/expect/BUILD | 18 -----
devel/expect/DETAILS | 8 +-
devel/expect/HISTORY | 5 +
devel/expect/PRE_BUILD | 3
devel/tcl/BUILD | 10 ++-
devel/tcl/HISTORY | 3
mail/courier-authlib/DEPENDS | 38 +++++------
mail/courier-authlib/DETAILS | 2
mail/courier-authlib/HISTORY | 5 +
mail/courier-authlib/init.d/courier-authlib | 54 ----------------
mail/courier-authlib/init.d/courier_authlib | 25 +++++++
mail/courier/DETAILS | 2
mail/courier/HISTORY | 4 +
mail/courier/init.d/courier | 26 ++++++++
mail/courier/init.d/courier-imap | 61 ------------------
mail/courier/init.d/courier-imap-ssl | 59 ------------------
mail/courier/init.d/courier-mta | 91
----------------------------
mail/courier/init.d/courier-mta-ssl | 73 ----------------------
mail/courier/init.d/courier-pop | 78 ------------------------
mail/courier/init.d/courier-pop-ssl | 65 --------------------
mail/courier/init.d/courier_esmtp | 25 +++++++
mail/courier/init.d/courier_esmtp_ssl | 25 +++++++
mail/courier/init.d/courier_imap | 25 +++++++
mail/courier/init.d/courier_imap_ssl | 25 +++++++
mail/courier/init.d/courier_pop | 25 +++++++
mail/courier/init.d/courier_pop_ssl | 25 +++++++
shell-term-fm/bash/HISTORY | 3
shell-term-fm/bash/INSTALL | 8 +-
28 files changed, 261 insertions(+), 530 deletions(-)

New commits:
commit a9c62c45e7e657047d92d10d7c5ba7d95da78714
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

courier: version 0.65.3

commit c02e87f0392983d384584998ab8d9b55f437acf0
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

courier-authlib: version 0.63.0

commit fc343c57dfcf3cd2c141dc473e235f51d2723e47
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

expect: version 5.45

Removed unnecessary tcl hacking after fixing tcl in commit
e6477dbb951c58684de3f6bc66afcfa8f4d0c40d

commit e6477dbb951c58684de3f6bc66afcfa8f4d0c40d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

tcl: make tclConfig.sh not refer to non-existent sources

commit a652b0bc60c9625ee300bca66533a9816046213d
Author: Remko van der Vossen <wich AT sourcemage.org>
Commit: Remko van der Vossen <wich AT sourcemage.org>

bash: only install info pages when texinfo is installed

diff --git a/devel/expect/BUILD b/devel/expect/BUILD
index f9a43ca..cae61d1 100755
--- a/devel/expect/BUILD
+++ b/devel/expect/BUILD
@@ -1,16 +1,2 @@
-local TCLVERSION="$(echo 'puts [set tcl_version]' | tclsh)" &&
-local TCLHDIR="${INSTALL_ROOT}/usr/lib/tcl${TCLVERSION}/include" &&
-
-OPTS="--with-tcl=${INSTALL_ROOT}/usr/lib \
- --with-tclinclude=${TCLHDIR} \
- ${OPTS}" &&
-OPTS="--enable-shared $OPTS" &&
-
-CFLAGS="${CFLAGS} -I${TCLHDIR}/generic -I${TCLHDIR}/unix" &&
-
-message "${MESSAGE_COLOR}running configure${DEFAULT_COLOR}" &&
-default_build_configure &&
-message "${MESSAGE_COLOR}running make${DEFAULT_COLOR}" &&
-make_single &&
-default_build_make TCLHDIRDASHI="-I${TCLHDIR}/generic -I${TCLHDIR}/unix" &&
-make_normal
+OPTS="--with-tcl=${INSTALL_ROOT}/usr/lib --enable-shared $OPTS" &&
+default_build
diff --git a/devel/expect/DETAILS b/devel/expect/DETAILS
index 93bb0fe..159dcd8 100755
--- a/devel/expect/DETAILS
+++ b/devel/expect/DETAILS
@@ -1,9 +1,9 @@
SPELL=expect
- VERSION=5.44.1.15
- SOURCE=$SPELL-$VERSION.tar.gz
- SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ VERSION=5.45
+ SOURCE=$SPELL$VERSION.tar.gz
+ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL$VERSION
SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
-
SOURCE_HASH=sha512:c932bd040527c99dce153603d18ce0239a55788fad3ff875acabc2ec06c710d08b723daa333ba9fd4b0c6976491bc400285c5c76cb82285a1405c06e6453c286
+
SOURCE_HASH=sha512:be991c68241e607b3a689eae7e7966056dbfb577e857331d54a4911bd178c1816425217603b43918ad1b6d2e966271a0f01e79d7028a22e223562d59d10c8c51
WEB_SITE=http://expect.nist.gov
ENTERED=20020307
LICENSE[0]=UNKNOWN
diff --git a/devel/expect/HISTORY b/devel/expect/HISTORY
index 0a06715..f5e7a84 100644
--- a/devel/expect/HISTORY
+++ b/devel/expect/HISTORY
@@ -1,3 +1,8 @@
+2011-03-27 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: stable version 5.45
+ * PRE_BUILD: remove unneeded seds
+ * BUILD: removed tcl hacking, unneeded after commit
e6477dbb951c58684de3f6bc66afcfa8f4d0c40d
+
2010-10-10 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 5.44.1.15
* PRE_BUILD: patches are not needed anymore
diff --git a/devel/expect/PRE_BUILD b/devel/expect/PRE_BUILD
index 80f4ce9..0ca724b 100755
--- a/devel/expect/PRE_BUILD
+++ b/devel/expect/PRE_BUILD
@@ -5,9 +5,6 @@ cd ${SOURCE_DIRECTORY} &&
sedit '/^install:/s/install-libraries //' Makefile.in
&&
sedit 's/^SCRIPTS_MANPAGES = /_&/' Makefile.in
&&
sedit 's:/usr/local/bin:/usr/bin:' expect.man
&&
-sedit 's:/usr/local/bin:/usr/bin:' expectk.man
&&
-sedit 's/^#include "tcl.h"/#include "tclInt.h"/' exp_inter.c
&&
-sedit 's/^#include "tcl.h"/#include "tclInt.h"/' exp_command.c
&&
sedit 's/^\(#include <stdio\.h>\)/\1\n#include "expect_cf.h"/' Dbg.c
&&
sedit 's:AC_CONFIG_SUBDIRS(testsuite)::' configure.in
&&

diff --git a/devel/tcl/BUILD b/devel/tcl/BUILD
index 1aadc73..22fc377 100755
--- a/devel/tcl/BUILD
+++ b/devel/tcl/BUILD
@@ -1,5 +1,11 @@
cd $SOURCE_DIRECTORY/unix &&
OPTS="$OPTS --enable-threads" &&
default_build &&
-mv ../doc/{,Tcl_}Thread.3
-#sed -i 's/ Thread.3/ Tcl_Thread.3/' mkLinks
+mv ../doc/{,Tcl_}Thread.3 &&
+sed -i \
+ -e
"s,^TCL_BUILD_LIB_SPEC='-L.*/unix,TCL_BUILD_LIB_SPEC='-L${TRACK_ROOT}/usr/lib,"
\
+ -e
"s,^TCL_SRC_DIR='.*',TCL_SRC_DIR='${TRACK_ROOT}/usr/lib/$SPELL${VERSION%.*}/include',"
\
+ -e
"s,^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix,TCL_BUILD_STUB_LIB_SPEC='-L${TRACK_ROOT}/usr/lib,"
\
+ -e
"s,^TCL_BUILD_STUB_LIB_PATH='.*/unix,TCL_BUILD_STUB_LIB_PATH='${TRACK_ROOT}/usr/lib,"
\
+ -e
"s,^TCL_LIB_FILE='libtcl${VERSION%.*}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${VERSION%.*}\$\{TCL_DBGX\}.so\","
\
+ tclConfig.sh
diff --git a/devel/tcl/HISTORY b/devel/tcl/HISTORY
index 13a7aa0..21c79f1 100644
--- a/devel/tcl/HISTORY
+++ b/devel/tcl/HISTORY
@@ -1,3 +1,6 @@
+2011-03-27 Remko van der Vossen <wich AT sourcemage.org>
+ * BUILD: Fix up tclConfig.sh
+
2010-09-12 George Sherwood <gsherwood AT sourcemage.org>
* DETAILS: Updated stable to 8.5.9

diff --git a/mail/courier-authlib/DEPENDS b/mail/courier-authlib/DEPENDS
index 1441668..a02829e 100755
--- a/mail/courier-authlib/DEPENDS
+++ b/mail/courier-authlib/DEPENDS
@@ -7,28 +7,28 @@ case ${CAUTHLIB_AUTHDB} in
;;
esac

-optional_depends expect \
- "" \
- "--without-authpwd --without-authshadow" \
- "to be able to change system login passwords" &&
+optional_depends expect \
+ "" \
+ "" \
+ "to be able to authenticate against system login
passwords" &&

-optional_depends linux-pam \
- "" \
- "--without-authpam" \
- "to use PAM for authentication" &&
+optional_depends linux-pam \
+ "" \
+ "--without-authpam" \
+ "to use PAM for authentication" &&

-optional_depends openldap \
- "" \
- "--without-authldap" \
- "to use OpenLDAP for authentication" &&
+optional_depends openldap \
+ "" \
+ "--without-authldap" \
+ "to use OpenLDAP for authentication" &&

-optional_depends MYSQL \
- "" \
- "--without-authmysql" \
- "to use a MySQL database for authentication" &&
+optional_depends MYSQL \
+ "" \
+ "--without-authmysql" \
+ "to use a MySQL database for authentication" &&

-optional_depends postgresql \
- "" \
- "--without-authpgsql" \
+optional_depends postgresql \
+ "" \
+ "--without-authpgsql" \
"to use a PostgrsSQL database for authentication"

diff --git a/mail/courier-authlib/DETAILS b/mail/courier-authlib/DETAILS
index 657a4dd..f2f4ff5 100755
--- a/mail/courier-authlib/DETAILS
+++ b/mail/courier-authlib/DETAILS
@@ -1,5 +1,5 @@
SPELL=courier-authlib
- VERSION=0.59.3
+ VERSION=0.63.0
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE2_IGNORE=signature
diff --git a/mail/courier-authlib/HISTORY b/mail/courier-authlib/HISTORY
index 03dc512..cd92b86 100644
--- a/mail/courier-authlib/HISTORY
+++ b/mail/courier-authlib/HISTORY
@@ -1,3 +1,8 @@
+2011-03-27 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: version 0.63.0
+ * DEPENDS: removed non-existent configure flags
+ * init.d/courier_authlib: simplified and use smgl_init (working NEEDS)
+
2010-06-15 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: added SOURCE2_IGNORE for signature

diff --git a/mail/courier-authlib/init.d/courier-authlib
b/mail/courier-authlib/init.d/courier-authlib
deleted file mode 100755
index 4789a8f..0000000
--- a/mail/courier-authlib/init.d/courier-authlib
+++ /dev/null
@@ -1,54 +0,0 @@
-#! /bin/bash
-#
-# chkconfig: 2345 15 85
-# description: Authlib - Courier authentication library.
-#
-#
-
-RUNLEVEL=3
-NEEDS="+network +remotefs"
-. /etc/init.d/smgl_functions
-
-prefix="/usr"
-exec_prefix="/usr"
-sysconfdir="/etc"
-sbindir="/usr/sbin"
-
-if test ! -f /etc/courier/authlib/authdaemonrc
-then
- echo "/etc/courier/authlib/authdaemonrc does not exist, forgot make
install-configure?"
- exit 1
-fi
-
-case "$1" in
-start)
- cd /
- # Start daemons.
- touch /var/lock/subsys/courier-authlib
-
- echo -n "Starting Courier authentication services:"
-
- $sbindir/authdaemond start
-
- echo " authdaemond"
- ;;
-stop)
- echo -n "Stopping Courier authentication services:"
-
- $sbindir/authdaemond stop
-
- echo " authdaemond"
- ;;
-restart)
- $0 stop
- $0 start
- ;;
-reload)
- echo -n "Starting Courier authentication services:"
-
- $sbindir/authdaemond restart
-
- echo " authdaemond"
- ;;
-esac
-exit 0
diff --git a/mail/courier-authlib/init.d/courier_authlib
b/mail/courier-authlib/init.d/courier_authlib
new file mode 100755
index 0000000..01923c3
--- /dev/null
+++ b/mail/courier-authlib/init.d/courier_authlib
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="+network +remote_fs"
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ /usr/sbin/authdaemond start
+ evaluate_retval
+}
+
+stop()
+{
+ /usr/sbin/authdaemond stop
+ evaluate_retval
+}
+
+restart()
+{
+ /usr/sbin/authdaemond restart
+ evaluate_retval
+}
diff --git a/mail/courier/DETAILS b/mail/courier/DETAILS
index 59e7879..c0bee0e 100755
--- a/mail/courier/DETAILS
+++ b/mail/courier/DETAILS
@@ -1,5 +1,5 @@
SPELL=courier
- VERSION=0.55.1
+ VERSION=0.65.3
SOURCE=${SPELL}-${VERSION}.tar.bz2
SOURCE2=${SOURCE}.sig
SOURCE2_IGNORE=signature
diff --git a/mail/courier/HISTORY b/mail/courier/HISTORY
index 8971a6e..8bbee30 100644
--- a/mail/courier/HISTORY
+++ b/mail/courier/HISTORY
@@ -1,3 +1,7 @@
+2011-03-27 Remko van der Vossen <wich AT sourcemage.org>
+ * DETAILS: version 0.65.3
+ * init.d/*: simplified and use smgl_init (working NEEDS)
+
2010-06-15 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: added SOURCE2_IGNORE for signature

diff --git a/mail/courier/init.d/courier b/mail/courier/init.d/courier
new file mode 100755
index 0000000..bd75f91
--- /dev/null
+++ b/mail/courier/init.d/courier
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+PROVIDES="mta"
+NEEDS="+network +remote_fs courier_authlib"
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ /usr/sbin/courier start
+ evaluate_retval
+}
+
+stop()
+{
+ /usr/sbin/courier stop
+ evaluate_retval
+}
+
+restart()
+{
+ /usr/sbin/courier restart
+ evaluate_retval
+}
diff --git a/mail/courier/init.d/courier-imap
b/mail/courier/init.d/courier-imap
deleted file mode 100755
index 259380e..0000000
--- a/mail/courier/init.d/courier-imap
+++ /dev/null
@@ -1,61 +0,0 @@
-#! /bin/bash
-# $Id: imapd.rc.in,v 1.24 2005/07/02 02:11:16 mrsam Exp $
-#
-# Copyright 1998 - 2005 Double Precision, Inc.
-# See COPYING for distribution information.
-
-
-RUNLEVEL=3
-NEEDS="+network +remotefs"
-
-. /etc/init.d/smgl_functions
-
-prefix=/usr
-exec_prefix=/usr
-sbindir=${exec_prefix}/sbin
-sysconfdir=/etc/courier
-
-if test ! -f /etc/courier/imapd
-then
- echo "/etc/courier/imapd does not exist, forgot make
install-configure?"
- exit 1
-fi
-
-if test ! -f /etc/courier/imapd-ssl
-then
- echo "/etc/courier/imapd-ssl does not exist, forgot make
install-configure?"
- exit 1
-fi
-
-. /etc/courier/imapd-ssl
-. /etc/courier/imapd
-
-case $1 in
-start)
- umask $IMAP_UMASK
- ulimit -v $IMAP_ULIMITD
- /bin/env -i /bin/sh -c " set -a ; \
- prefix=/usr ; \
- exec_prefix=/usr ; \
- sbindir=${exec_prefix}/sbin ; \
- bindir=/usr/bin ; \
- . /etc/courier/imapd ; \
- . /etc/courier/imapd-ssl ; \
- IMAP_STARTTLS=$IMAPDSTARTTLS ; \
- PROXY_HOSTNAME=$PROXY_HOSTNAME ; \
- TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
- /usr/sbin/courierlogger -pid=$PIDFILE -start $LOGGEROPTS \
- ${exec_prefix}/sbin/couriertcpd -address=$ADDRESS \
- -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
- $TCPDOPTS \
- $PORT ${exec_prefix}/libexec/courier/imaplogin \
- /usr/bin/imapd ${MAILDIRPATH}"
- ;;
-stop)
- /usr/sbin/courierlogger -pid=$PIDFILE -stop
- ;;
-restart)
- /usr/sbin/courierlogger -pid=$PIDFILE -restart
- ;;
-esac
-exit 0
diff --git a/mail/courier/init.d/courier-imap-ssl
b/mail/courier/init.d/courier-imap-ssl
deleted file mode 100755
index 84fdb4c..0000000
--- a/mail/courier/init.d/courier-imap-ssl
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/bash
-# $Id: imapd-ssl.rc.in,v 1.22 2005/07/02 22:53:19 mrsam Exp $
-#
-# Copyright 1998 - 2005 Double Precision, Inc.
-# See COPYING for distribution information.
-
-
-RUNLEVEL=3
-NEEDS="+network +remotefs"
-
-. /etc/init.d/smgl_functions
-
-prefix=/usr
-exec_prefix=/usr
-sbindir=${exec_prefix}/sbin
-bindir=/usr/bin
-sysconfdir=/etc/courier
-
-if test ! -f /etc/courier/imapd
-then
- echo "/etc/courier/imapd does not exist, forgot make
install-configure?"
- exit 1
-fi
-
-if test ! -f /etc/courier/imapd-ssl
-then
- echo "/etc/courier/imapd-ssl does not exist, forgot make
install-configure?"
- exit 1
-fi
-
-. /etc/courier/imapd
-. /etc/courier/imapd-ssl
-
-case $1 in
-start)
- umask $IMAP_UMASK
- ulimit -v $IMAP_ULIMITD
- /bin/env -i /bin/sh -c " set -a ;
- prefix=/usr ; \
- exec_prefix=/usr ; \
- sbindir=${exec_prefix}/sbin ; \
- bindir=/usr/bin ; \
- . /etc/courier/imapd ; \
- . /etc/courier/imapd-ssl ; \
- PROXY_HOSTNAME=$PROXY_HOSTNAME ; \
- IMAP_TLS=1; \
- /usr/sbin/courierlogger -pid=$SSLPIDFILE -start
$SSLLOGGEROPTS \
- ${exec_prefix}/sbin/couriertcpd -address=$SSLADDRESS \
- -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
- $TCPDOPTS \
- $SSLPORT $COURIERTLS -server -tcpd \
- ${exec_prefix}/libexec/courier/imaplogin \
- /usr/bin/imapd ${MAILDIRPATH}"
- ;;
-stop)
- /usr/sbin/courierlogger -pid=$SSLPIDFILE -stop
- ;;
-esac
-exit 0
diff --git a/mail/courier/init.d/courier-mta b/mail/courier/init.d/courier-mta
deleted file mode 100755
index 9b16c5e..0000000
--- a/mail/courier/init.d/courier-mta
+++ /dev/null
@@ -1,91 +0,0 @@
-#! /bin/bash
-#
-# $Id: esmtpd.in,v 1.18 2005/02/16 23:42:13 mrsam Exp $
-#
-# Copyright 1998 - 2005 Double Precision, Inc. See COPYING for
-# distribution information.
-#
-# This is a simple script to start/stop the smtp port daemon, courieresmtpd.
-#
-# Argument "start" starts the daemon.
-# Argument "stop" stops the daemon (just the listening daemon).
-# Argument "restart" rereads the smtpaccess.dat file.
-
-RUNLEVEL=3
-NEEDS="+network +remotefs"
-
-. /etc/init.d/smgl_functions
-
-prefix="/usr"
-exec_prefix="/usr"
-sysconfdir="/etc/courier"
-sbindir="/usr/sbin"
-
-cd ${prefix} || exit 1
-#case `basename $0` in
-#esmtpd)
-# configfiles="${sysconfdir}/esmtpd"
-# . ${sysconfdir}/esmtpd
-# ;;
-#esmtpd-msa)
-# configfiles="${sysconfdir}/esmtpd ${sysconfdir}/esmtpd-msa"
-# . ${sysconfdir}/esmtpd
-# . ${sysconfdir}/esmtpd-msa
-# ;;
-#*)
-# echo "Must be invoked as esmtpd or esmtpd-msa" >&2
-# exit 1
-# ;;
-#esac
-
-case $1 in
-start)
- ;;
-stop)
- ${sbindir}/couriertcpd -pid=$PIDFILE -stop
- exit 0
- ;;
-restart)
- ${sbindir}/couriertcpd -pid=$PIDFILE -restart
- exit 0
- ;;
-*)
- exit 0
- ;;
-esac
-
-if test "${ACCESSFILE}" != ""
-then
- if test ! -f "$ACCESSFILE.dat"
- then
- ACCESSFILE=""
- else
- ACCESSFILE="-access=${ACCESSFILE}.dat"
- fi
-fi
-
-if test "$ADDRESS" != ""
-then
- ADDRESS="-address=$ADDRESS"
-fi
-
-TCPDOPTS="$TCPDOPTS -user=$MAILUSER -group=$MAILGROUP $ADDRESS $BLACKLISTS
$ACCESSFILE -maxprocs=$MAXDAEMONS -maxperc=$MAXPERC -maxperip=$MAXPERIP
-pid=$PIDFILE"
-
-(
- builtin echo prefix=${prefix}
- builtin echo exec_prefix=${exec_prefix}
- builtin echo sysconfdir=${sysconfdir}
- builtin echo sbindir=${sbindir}
-
- builtin echo set -a
- for f in $configfiles
- do
- builtin echo . $f
- done
-
- builtin echo "ulimit -d $ULIMIT"
- builtin echo ${sbindir}/couriertcpd $TCPDOPTS $PORT \
- ${sbindir}/courieresmtpd'>/dev/null 2>&1 </dev/null'
-
-) | /bin/env -i /bin/sh
-exit 0
diff --git a/mail/courier/init.d/courier-mta-ssl
b/mail/courier/init.d/courier-mta-ssl
deleted file mode 100755
index 1268166..0000000
--- a/mail/courier/init.d/courier-mta-ssl
+++ /dev/null
@@ -1,73 +0,0 @@
-#! /bin/bash
-#
-# $Id: esmtpd-ssl.in,v 1.7 2005/02/16 23:42:13 mrsam Exp $
-#
-# Copyright 1998 - 2005 Double Precision, Inc. See COPYING for
-# distribution information.
-#
-# This is a simple script to start/stop the smtp port daemon, courieresmtpd.
-#
-# Argument "start" starts the daemon.
-# Argument "stop" stops the daemon (just the listening daemon).
-# Argument "restart" rereads the smtpaccess.dat file.
-
-RUNLEVEL=3
-NEEDS="+network +remotefs"
-
-. /etc/init.d/smgl_functions
-
-prefix="/usr"
-exec_prefix="/usr"
-sysconfdir="/etc/courier"
-sbindir="/usr/sbin"
-libexecdir="${exec_prefix}/libexec"
-
-. ${sysconfdir}/esmtpd
-. ${sysconfdir}/esmtpd-ssl
-
-export PATH
-export SHELL
-
-case $1 in
-start)
- ;;
-stop)
- ${sbindir}/couriertcpd -pid=$SSLPIDFILE -stop
- exit 0
- ;;
-restart)
- ${sbindir}/couriertcpd -pid=$SSLPIDFILE -restart
- exit 0
- ;;
-*)
- exit 0
- ;;
-esac
-
-cd ${prefix}
-
-if test "$ACCESSFILE" != ""
-then
- if test ! -f "${ACCESSFILE}.dat"
- then
- ACCESSFILE=""
- else
- ACCESSFILE="-access=${ACCESSFILE}.dat"
- fi
-fi
-
-ulimit -d "$ULIMIT"
-/bin/env -i /bin/sh -c " set -a ; . ${sysconfdir}/esmtpd ; \
- . ${sysconfdir}/esmtpd-ssl ; \
- ESMTP_TLS=1; export ESMTP_TLS; \
- ${sbindir}/couriertcpd \
- -stderrlogger=/usr/sbin/courierlogger \
- -stderrloggername=esmtpd-ssl \
- -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
- -maxperc=$MAXPERC \
- -pid=$SSLPIDFILE $TCPDOPTS \
- -user=$MAILUSER -group=$MAILGROUP \
- $BLACKLISTS $ACCESSFILE \
- -address=$SSLADDRESS $SSLPORT \
- $COURIERTLS -server -tcpd \
- ${sbindir}/courieresmtpd"
diff --git a/mail/courier/init.d/courier-pop b/mail/courier/init.d/courier-pop
deleted file mode 100755
index 1aff5cf..0000000
--- a/mail/courier/init.d/courier-pop
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/bash
-# $Id: pop3d.in,v 1.19 2005/07/02 02:11:16 mrsam Exp $
-#
-# Copyright 1998 - 2005 Double Precision, Inc. See COPYING for
-# distribution information.
-#
-# Sample script to start Courier's pop3 daemon.
-#
-# This script should work for most systems. Authenticate via the PAM
library,
-# /etc/shadow, or fallback to /etc/passwd
-#
-# You must run this as root, and as a daemon process.
-#
-
-RUNLEVEL=3
-NEEDS="+network +remotefs"
-
-. /etc/init.d/smgl_functions
-
-prefix="/usr"
-exec_prefix="/usr"
-sysconfdir="/etc/courier"
-sbindir="${exec_prefix}/sbin"
-bindir="/usr/bin"
-libexecdir="${exec_prefix}/libexec"
-
-if test ! -f ${sysconfdir}/pop3d
-then
- echo "${sysconfdir}/pop3d does not exist, forgot make
install-configure?"
- exit 1
-fi
-
-if test ! -f ${sysconfdir}/pop3d-ssl
-then
- echo "${sysconfdir}/pop3d-ssl does not exist, forgot make
install-configure?"
- exit 1
-fi
-
-. ${sysconfdir}/pop3d-ssl
-. ${sysconfdir}/pop3d
-
-export PATH
-export SHELL
-
-case "$1" in
-start)
- ;;
-stop)
- /usr/sbin/courierlogger -pid=$PIDFILE -stop
- exit 0
- ;;
-restart)
- /usr/sbin/courierlogger -pid=$PIDFILE -restart
- exit 0
- ;;
-*)
- exit 0
- ;;
-esac
-
-cd /usr
-
-/bin/env -i /bin/sh -c " set -a; \
- prefix=/usr ; \
- exec_prefix=/usr ; \
- sbindir=${exec_prefix}/sbin ; \
- bindir=/usr/bin ; \
- libexecdir=${exec_prefix}/libexec ; \
- . /etc/courier/pop3d ; \
- . /etc/courier/pop3d-ssl ; \
- TLS_PROTOCOL=$TLS_STARTTLS_PROTOCOL ; \
- PROXY_HOSTNAME=$PROXY_HOSTNAME ; \
- /usr/sbin/courierlogger -pid=$PIDFILE -start $LOGGEROPTS \
- ${exec_prefix}/sbin/couriertcpd -address=$ADDRESS \
- -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
- $TCPDOPTS \
- $PORT ${exec_prefix}/libexec/courier/courierpop3login \
- ${exec_prefix}/libexec/courier/courierpop3d
${MAILDIRPATH}"
diff --git a/mail/courier/init.d/courier-pop-ssl
b/mail/courier/init.d/courier-pop-ssl
deleted file mode 100755
index 03c0974..0000000
--- a/mail/courier/init.d/courier-pop-ssl
+++ /dev/null
@@ -1,65 +0,0 @@
-#! /bin/bash
-# $Id: pop3d-ssl.in,v 1.16 2005/07/02 23:24:34 mrsam Exp $
-#
-# Copyright 1998 - 2005 Double Precision, Inc.
-# See COPYING for distribution information.
-
-
-RUNLEVEL=3
-NEEDS="+network +remotefs"
-
-. /etc/init.d/smgl_functions
-
-prefix=/usr
-exec_prefix=/usr
-libexecdir=${exec_prefix}/libexec
-sbindir=${exec_prefix}/sbin
-bindir="/usr/bin"
-sysconfdir="/etc/courier"
-
-if test ! -f ${sysconfdir}/pop3d
-then
- echo "${sysconfdir}/pop3d does not exist, forgot make
install-configure?"
- exit 1
-fi
-
-if test ! -f ${sysconfdir}/pop3d-ssl
-then
- echo "${sysconfdir}/pop3d-ssl does not exist, forgot make
install-configure?"
- exit 1
-fi
-
-. /etc/courier/pop3d
-. /etc/courier/pop3d-ssl
-
-case $1 in
-start)
- exec /bin/env -i PATH="$PATH" SHELL="$SHELL" \
- /bin/sh -c " set -a ; \
- prefix=/usr ; \
- exec_prefix=/usr ; \
- sbindir=${exec_prefix}/sbin ; \
- bindir=/usr/bin ; \
- libexecdir=${exec_prefix}/libexec ; \
- . /etc/courier/pop3d ; \
- . /etc/courier/pop3d-ssl ; \
- PROXY_HOSTNAME=$PROXY_HOSTNAME; \
- POP3_TLS=1; \
- POP3_STARTTLS=NO; \
- POP3_TLS_REQUIRED=0; \
- /usr/sbin/courierlogger -pid=$SSLPIDFILE -start
$SSLLOGGEROPTS \
- ${exec_prefix}/sbin/couriertcpd -address=$SSLADDRESS \
- -maxprocs=$MAXDAEMONS -maxperip=$MAXPERIP \
- $TCPDOPTS \
- $SSLPORT $COURIERTLS -server -tcpd \
- $libexecdir/courier/courierpop3login \
- $libexecdir/courier/courierpop3d
${MAILDIRPATH}"
- ;;
-stop)
- /usr/sbin/courierlogger -pid=$SSLPIDFILE -stop
- ;;
-restart)
- /usr/sbin/courierlogger -pid=$SSLPIDFILE -restart
- ;;
-esac
-exit 0
diff --git a/mail/courier/init.d/courier_esmtp
b/mail/courier/init.d/courier_esmtp
new file mode 100755
index 0000000..b400522
--- /dev/null
+++ b/mail/courier/init.d/courier_esmtp
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="courier"
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ /usr/sbin/esmtpd start
+ evaluate_retval
+}
+
+stop()
+{
+ /usr/sbin/esmtpd stop
+ evaluate_retval
+}
+
+restart()
+{
+ /usr/sbin/esmtpd restart
+ evaluate_retval
+}
diff --git a/mail/courier/init.d/courier_esmtp_ssl
b/mail/courier/init.d/courier_esmtp_ssl
new file mode 100755
index 0000000..ac26b2c
--- /dev/null
+++ b/mail/courier/init.d/courier_esmtp_ssl
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="courier"
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ /usr/sbin/esmtpd-ssl start
+ evaluate_retval
+}
+
+stop()
+{
+ /usr/sbin/esmtpd-ssl stop
+ evaluate_retval
+}
+
+restart()
+{
+ /usr/sbin/esmtpd-ssl restart
+ evaluate_retval
+}
diff --git a/mail/courier/init.d/courier_imap
b/mail/courier/init.d/courier_imap
new file mode 100755
index 0000000..5d05be9
--- /dev/null
+++ b/mail/courier/init.d/courier_imap
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="courier"
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ /usr/sbin/imapd start
+ evaluate_retval
+}
+
+stop()
+{
+ /usr/sbin/imapd stop
+ evaluate_retval
+}
+
+restart()
+{
+ /usr/sbin/imapd restart
+ evaluate_retval
+}
diff --git a/mail/courier/init.d/courier_imap_ssl
b/mail/courier/init.d/courier_imap_ssl
new file mode 100755
index 0000000..6893b51
--- /dev/null
+++ b/mail/courier/init.d/courier_imap_ssl
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="courier"
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ /usr/sbin/imapd-ssl start
+ evaluate_retval
+}
+
+stop()
+{
+ /usr/sbin/imapd-ssl stop
+ evaluate_retval
+}
+
+restart()
+{
+ /usr/sbin/imapd-ssl restart
+ evaluate_retval
+}
diff --git a/mail/courier/init.d/courier_pop b/mail/courier/init.d/courier_pop
new file mode 100755
index 0000000..664dfa5
--- /dev/null
+++ b/mail/courier/init.d/courier_pop
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="courier"
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ /usr/sbin/pop3d start
+ evaluate_retval
+}
+
+stop()
+{
+ /usr/sbin/pop3d stop
+ evaluate_retval
+}
+
+restart()
+{
+ /usr/sbin/pop3d restart
+ evaluate_retval
+}
diff --git a/mail/courier/init.d/courier_pop_ssl
b/mail/courier/init.d/courier_pop_ssl
new file mode 100755
index 0000000..cdafe96
--- /dev/null
+++ b/mail/courier/init.d/courier_pop_ssl
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+PROGRAM=/bin/false
+RUNLEVEL=3
+NEEDS="courier"
+
+. /etc/init.d/smgl_init
+
+start()
+{
+ /usr/sbin/pop3d-ssl start
+ evaluate_retval
+}
+
+stop()
+{
+ /usr/sbin/pop3d-ssl stop
+ evaluate_retval
+}
+
+restart()
+{
+ /usr/sbin/pop3d-ssl restart
+ evaluate_retval
+}
diff --git a/shell-term-fm/bash/HISTORY b/shell-term-fm/bash/HISTORY
index b73a907..b866f7b 100644
--- a/shell-term-fm/bash/HISTORY
+++ b/shell-term-fm/bash/HISTORY
@@ -1,3 +1,6 @@
+2011-03-27 Remko van der Vossen <wich AT sourcemage.org>
+ * INSTALL: test for presence of texinfo before installing info pages
+
2011-02-15 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 4.2
* PRE_BUILD, patches/*: removed 4.1 patches
diff --git a/shell-term-fm/bash/INSTALL b/shell-term-fm/bash/INSTALL
index 0c83df8..aecd53c 100755
--- a/shell-term-fm/bash/INSTALL
+++ b/shell-term-fm/bash/INSTALL
@@ -26,9 +26,11 @@ for MANPAGE in `ls *.1`; do
cp $MANPAGE.gz ${INSTALL_ROOT}/usr/share/man/man1
done &&

-cp bashref.info ${INSTALL_ROOT}/usr/share/info/bash.info &&
-install-info --info-dir=${INSTALL_ROOT}/usr/share/info \
- ${INSTALL_ROOT}/usr/share/info/bash.info &&
+if spell_ok texinfo; then
+ cp bashref.info ${INSTALL_ROOT}/usr/share/info/bash.info &&
+ install-info --info-dir=${INSTALL_ROOT}/usr/share/info \
+ ${INSTALL_ROOT}/usr/share/info/bash.info
+fi &&

#
# Install login setup scripts (Bug #9473) here instead of in FINAL



  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (f7bb5d4b003581707080dd10a115a9f5e1b16aba), Remko van der Vossen, 03/27/2011

Archive powered by MHonArc 2.6.24.

Top of Page