aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>2006-12-05 23:23:21 +0000
committerrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>2006-12-05 23:23:21 +0000
commite79f5510e82ab22138416a6af3e53798cec40b1a (patch)
tree7017073586f582cb6dd4704d3272030cfd12484b /net
parent690bfb6921adc239b3780c350946bb656a4c9638 (diff)
downloadslackbuilds-e79f5510e82ab22138416a6af3e53798cec40b1a.tar.gz
slackbuilds-e79f5510e82ab22138416a6af3e53798cec40b1a.tar.bz2
updated postfix, openldap and cyrus-sasl
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@889 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'net')
-rwxr-xr-xnet/nds/openldap/openldap-client.SlackBuild38
-rwxr-xr-xnet/nds/openldap/openldap.SlackBuild38
2 files changed, 50 insertions, 26 deletions
diff --git a/net/nds/openldap/openldap-client.SlackBuild b/net/nds/openldap/openldap-client.SlackBuild
index b2e49184..5d5d0751 100755
--- a/net/nds/openldap/openldap-client.SlackBuild
+++ b/net/nds/openldap/openldap-client.SlackBuild
@@ -3,6 +3,18 @@
# slackbuild script for openldap-client
#
+if [ -s "slack-required" ]; then
+ echo Recomended and required packages for building openldap-client are:
+ cat slack-required | sed -e 's/^/\t/'
+ if [ "$INTERACT" != "no" ]; then
+ echo If you dont have those installed, press Ctrl-C. Otherwise, hit ENTER.
+ read crap
+# else
+# echo Sleeping 3 seconds...
+# sleep 3
+ fi
+fi
+
CWD="`pwd`"
if [ -f ~/.slackbuildrc ]; then
@@ -14,12 +26,18 @@ fi
# default settings
PACKAGE="openldap-client"
ARCH=${ARCH:=i486}
-VERSION=${VERSION:=2.3.24}
+VERSION=${VERSION:=2.3.27}
BUILD=${BUILD:=2rha}
SRC_DIR=${SRC:=$CWD}
TMP=${TMP:=/tmp}
REPOS=${REPOS:=$TMP}
+# ------- error codes for createpkg --------------
+ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33
+ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36
+ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39
+ERROR_PATCH=40
+
if [ "$ARCH" == "x86_64" ]; then
LIBDIR=/usr/lib64
else
@@ -34,17 +52,11 @@ SRC="openldap-$VERSION.$PACKAGE_EXT"
#URL="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$SRC"
URL="http://public.planetmirror.com/pub/openldap/openldap-release/$SRC"
-if [ "$PACKAGE_EXT" == "bz2" ]; then
- tarflag="j"
-else
- tarflag="z"
-fi
-
SRC_DIR="$SRC_DIR/openldap"
mkdir -p $SRC_DIR
if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
- wget "$URL" -O "$SRC_DIR/$SRC"
+ wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
fi
if [ "$ARCH" == "x86_64" ]; then
@@ -58,16 +70,16 @@ rm -rf $TMP
mkdir -p $TMP
cd $TMP
-tar xvf$tarflag $SRC_DIR/$SRC
+tar xvf $SRC_DIR/$SRC || exit $ERROR_TAR
mv openldap-$VERSION $PACKAGE-$VERSION
cd $PACKAGE-$VERSION
./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR --without-kerberos \
- --without-cyrus-sasl --without-tls --without-threads --disable-slapd --disable-slurpd
+ --without-cyrus-sasl --without-tls --without-threads --disable-slapd --disable-slurpd || exit $ERROR_CONF
make depend
-make || exit 32
-make DESTDIR=$TMP/package-$PACKAGE install
+make || exit $ERROR_MAKE
+make DESTDIR=$TMP/package-$PACKAGE install || exit $ERROR_INSTALL
CWD="`pwd`"
@@ -115,7 +127,7 @@ for file in ANNOUNCEMENT CHANGES COPYRIGHT INSTALL LICENSE README; do
cp $CWD/$file* usr/doc/$PACKAGE-$VERSION/
done
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
if [ "$CLEANUP" == "yes" ]; then
rm -rf $TMP
diff --git a/net/nds/openldap/openldap.SlackBuild b/net/nds/openldap/openldap.SlackBuild
index 1cb6ee6c..39cbe00b 100755
--- a/net/nds/openldap/openldap.SlackBuild
+++ b/net/nds/openldap/openldap.SlackBuild
@@ -4,6 +4,18 @@
# by rhatto at riseup.net
#
+if [ -s "slack-required" ]; then
+ echo Recomended and required packages for building openldap are:
+ cat slack-required | sed -e 's/^/\t/'
+ if [ "$INTERACT" != "no" ]; then
+ echo If you dont have those installed, press Ctrl-C. Otherwise, hit ENTER.
+ read crap
+# else
+# echo Sleeping 3 seconds...
+# sleep 3
+ fi
+fi
+
CWD="`pwd`"
if [ -f ~/.slackbuildrc ]; then
@@ -15,12 +27,18 @@ fi
# default settings
PACKAGE="openldap"
ARCH=${ARCH:=i486}
-VERSION=${VERSION:=2.3.24}
+VERSION=${VERSION:=2.3.27}
BUILD=${BUILD:=1rha}
SRC_DIR=${SRC:=$CWD}
TMP=${TMP:=/tmp}
REPOS=${REPOS:=$TMP}
+# ------- error codes for createpkg --------------
+ERROR_WGET=31; ERROR_MAKE=32; ERROR_INSTALL=33
+ERROR_MD5=34; ERROR_CONF=35; ERROR_HELP=36
+ERROR_TAR=37; ERROR_MKPKG=38; ERROR_GPG=39
+ERROR_PATCH=40
+
if [ "$ARCH" == "x86_64" ]; then
LIBDIR=/usr/lib64
else
@@ -35,17 +53,11 @@ SRC="$PACKAGE-$VERSION.$PACKAGE_EXT"
#URL="ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/$SRC"
URL="http://public.planetmirror.com/pub/openldap/openldap-release/$SRC"
-if [ "$PACKAGE_EXT" == "bz2" ]; then
- tarflag="j"
-else
- tarflag="z"
-fi
-
SRC_DIR="$SRC_DIR/$PACKAGE"
mkdir -p $SRC_DIR
if [ "$RTOOL" == "wget" ] && [ ! -f "$SRC_DIR/$SRC" ]; then
- wget "$URL" -O "$SRC_DIR/$SRC"
+ wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
fi
if [ "$ARCH" == "x86_64" ]; then
@@ -59,7 +71,7 @@ rm -rf $TMP
mkdir -p $TMP
cd $TMP
-tar xvf$tarflag $SRC_DIR/$SRC
+tar xvf $SRC_DIR/$SRC
cd $PACKAGE-$VERSION
# otherwise will not work
@@ -70,10 +82,10 @@ fi
ln -sf /usr/include/db4/db.h /usr/include/db.h
-./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR
+./configure --prefix=/usr --sysconfdir=/etc --libdir=$LIBDIR || exit $ERROR_CONF
make depend
-make || exit 32
-make DESTDIR=$TMP/package-$PACKAGE install
+make || exit $ERROR_MAKE
+make DESTDIR=$TMP/package-$PACKAGE install || exit $ERROR_INSTALL
# fix your system
if [ ! -f "$DBINC" ]; then
@@ -127,7 +139,7 @@ done
echo '( if [ ! -f "etc/openldap/ldap.conf" ]; then mv etc/openldap/ldap.conf.new etc/openldap/ldap.conf; fi )' > install/doinst.sh
echo '( if [ ! -f "etc/openldap/slapd.conf" ]; then mv etc/openldap/slapd.conf.new etc/openldap/slapd.conf; fi )' >> install/doinst.sh
-makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz
+makepkg -c y -l y $REPOS/$PACKAGE-$VERSION-$ARCH-$BUILD.tgz || exit $ERROR_MKPKG
if [ "$CLEANUP" == "yes" ]; then
rm -rf $TMP