summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--network/ssmtp/README3
-rw-r--r--network/ssmtp/doinst.sh1
-rw-r--r--network/ssmtp/ssmtp.SlackBuild24
3 files changed, 15 insertions, 13 deletions
diff --git a/network/ssmtp/README b/network/ssmtp/README
index 716a836eda..515b0d4d46 100644
--- a/network/ssmtp/README
+++ b/network/ssmtp/README
@@ -3,3 +3,6 @@ departmental mailhub from which they pick up their mail (via pop, imap, rsmtp,
pop_fetch, NFS... or the like). This program accepts mail and sends it to the
mailhub, optionally replacing the domain in the From: line with a different
one.
+
+NOTE:
+After installing, please run /usr/sbin/generate_config /etc/ssmtp/ssmtp.conf
diff --git a/network/ssmtp/doinst.sh b/network/ssmtp/doinst.sh
index c6d8a19d37..a96179b56e 100644
--- a/network/ssmtp/doinst.sh
+++ b/network/ssmtp/doinst.sh
@@ -1,4 +1,3 @@
-/usr/doc/ssmtp-2.64/generate_config /etc/ssmtp/ssmtp.conf
if [ ! -e /usr/sbin/sendmail ];then
ln -s ssmtp /usr/sbin/sendmail
else
diff --git a/network/ssmtp/ssmtp.SlackBuild b/network/ssmtp/ssmtp.SlackBuild
index 331937983a..528a75876c 100644
--- a/network/ssmtp/ssmtp.SlackBuild
+++ b/network/ssmtp/ssmtp.SlackBuild
@@ -24,13 +24,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=ssmtp
-VERSION=2.64
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-2.64}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ];then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ];then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -65,10 +65,10 @@ tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.bz2
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
for diff in "${CWD}"/patches/*.diff.gz;do
gzip -dc "${diff}" |patch -p0
@@ -91,11 +91,11 @@ strip --strip-unneeded $PKG/usr/sbin/ssmtp
gzip -9 $PKG/usr/man/man8/ssmtp.8 $PKG/usr/man/man5/ssmtp.conf.5
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp generate_config README INSTALL COPYING COPYRIGHT TLS \
- $PKG/usr/doc/$PRGNAM-$VERSION/
+cp README INSTALL COPYING COPYRIGHT TLS $PKG/usr/doc/$PRGNAM-$VERSION/
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
find $PKG/usr/doc -type f -exec chmod 0644 {} \;
-chmod 755 $PKG/usr/doc/$PRGNAM-$VERSION/generate_config
+cp generate_config $PKG/usr/sbin
+chmod 755 $PKG/usr/sbin/generate_config
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc