aboutsummaryrefslogtreecommitdiff
path: root/net/im/silc-toolkit
diff options
context:
space:
mode:
Diffstat (limited to 'net/im/silc-toolkit')
-rw-r--r--net/im/silc-toolkit/Manifest24
-rwxr-xr-xnet/im/silc-toolkit/silc-toolkit.SlackBuild82
2 files changed, 100 insertions, 6 deletions
diff --git a/net/im/silc-toolkit/Manifest b/net/im/silc-toolkit/Manifest
new file mode 100644
index 00000000..dd77d11b
--- /dev/null
+++ b/net/im/silc-toolkit/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST silc-toolkit-1.1.10.tar.bz2 1830280 MD5 f742b64064c40a2d22520549746cf2b4 RMD160 9a505420569e8595eaee684c2e4bde7e4570654d SHA1 0bd4b1b410424733687fd2ad33c1b09cbbf8673f SHA256 a76cc364813b2d09dee7a9e99fda77db71b5bf752297176eb8de4fb0466eed76 SHA512 b23b956a79cff6b0471d0fe3b7b57a473272416deaf8546b66987247bef2ee1fc3a8d3db03165a8c3d7f012549f02834d70e3473704e5b39f647a025f4e6befc
+MKBUILD silc-toolkit.mkbuild 3247 MD5 e49fda7e826bdc318a2feb38227a3757 RMD160 bc41bf8e98800113c321a16ed55ddfa966e4f387 SHA1 9af0a454dcd8e0e7c8704288f5385afc3b3f1110 SHA256 84c4cdc2566fdac9e571587b3d398ed6da84c13c7b5b3c2539a79d40739f9948 SHA512 827c5d8fa060b56076281689a71fd5225f4c21fa616f78e3835f7fd47a53ebc3e2a72874045ec5138d5e6398e11d1a4a0b4ac70e76a637e4412245a822cdc2fe
+SLACK-REQUIRED slack-required 85 MD5 8da5376864b7cdc9ea7d5548a87806cb RMD160 c8a17704fc536a2c6384dcc58277db2e008f17ed SHA1 4434771f6e04e1f4f91723a897b4b394207cb62c SHA256 d358836cd2baa5d32f0f9bde6ef648c67694ee417c941397fa0b59001aca0fd6 SHA512 578a3d533866848ff737d329dee358030e3434ae3e7e01dc9a5c9b9684632d5a78a432d102d7ac3b9a47b733cd1a8799ea046e6e20e504de472a973969d69724
+SLACKBUILD silc-toolkit.SlackBuild 7574 MD5 7f3a417dbe0a3e97ca3a96afd5595a0d RMD160 4b4e41d60a8091ba03f38697b58a2b15486b8d4d SHA1 1bc21bec3fd063924f027a352ce078ef323a6ab6 SHA256 0f4fcf9d15fa3bb5d26c5b8c74bf677e35b5ab73e80d034a1e835e067ec629ea SHA512 4d78b747117725c15b41c33b320377f803d6ad7e1fdfa515404f315a305c3274ca0cc7e17e45a68ac305ffc8dfd60d013000da70aaae2bef7dfe984fae002e7c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKpZf0AAoJEEHL93ESzgei+UoP/1hjHJBo5Zk6stGJDtmzft4d
+yFdlnkV8oBuouF+Zg7c38bm5qTSWTZGfvTZ4WMETNiIZ4DdHWAQJj0EdhJFLiZsl
+Gq0W8RhkcxRNYfoU/GZeElGP9I6WF00OastOfwGXToY4IX/wEWGGG4GCDMgq0FG/
+USf3+LhtHQznPE/eZG/C46rIoGH3jC+t3flUmc+dU4hJbLwdJGGdsPltzywFFeD3
+JBGpp5M+RuzqtneyHm0gSKkb/YtbDrpV/CTYWNdHjSiadL8g7KP3xk1R6nkDm7Rn
+y45En4IXRO1J1H+jJjLXelMAiu4nPhW02bw0MH3pLFVA9A/pkiYU1uZbwcA6RgwI
+MpvDrYFjRq4f6WueGYjhz8VGXTWFauiTtyygJVdB6CWykYpNIjk+KCNh0npJcGSa
+WsykyWGLd0vezbYI4KyDtBRzrgd2vv8NgGUC0MI+lbNlbqfaaA6IkJqQUCn5Nxmd
+8YpGcAjJiuIMueUVACYqOEHdm3wAl8NmFq0q2m042P16oBhNiDNswfG2mjetWwS/
+EG5ySEgq61ElDYzEQaO9mt2kXmQ+H0XZ93vUPx9cIKz0SUhaUNx/OEKqmj15ZJXN
+Bt0U8B7NOu8DxdA2NIEHFdZwQhmURAU/zEvtk48H6q/zD/4ob51yvhdfwQ1803fS
+z1nNvExAPUsKoYSijboW
+=2+nC
+-----END PGP SIGNATURE-----
diff --git a/net/im/silc-toolkit/silc-toolkit.SlackBuild b/net/im/silc-toolkit/silc-toolkit.SlackBuild
index e6e1971c..c4280ea0 100755
--- a/net/im/silc-toolkit/silc-toolkit.SlackBuild
+++ b/net/im/silc-toolkit/silc-toolkit.SlackBuild
@@ -15,8 +15,9 @@
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
#
# slackbuild for silc-toolkit, by Silvio Rhatto
-# requires: libiconv
-# tested: silc-toolkit-1.1.8
+# requires:
+# tested: silc-toolkit-1.1.10
+# model: generic.mkSlackBuild $Rev: 808 $
#
# Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
SRC_NAME="silc-toolkit"
PKG_NAME="silc-toolkit"
ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.1.8}
+SRC_VERSION=${VERSION:=1.1.10}
PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
BUILD=${BUILD:=1rha}
SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="net/im/silc-toolkit"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
CONF_OPTIONS=${CONF_OPTIONS:="--docdir=/usr/doc/$PKG_NAME-$PKG_VERSION"}
@@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:=""}
LIBDIR="$PREFIX/lib"
if [ "$ARCH" = "i386" ]; then
- SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i386 -mtune=i686"
elif [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mcpu=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686"
elif [ "$ARCH" = "s390" ]; then
@@ -65,6 +67,7 @@ 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; ERROR_VCS=41; ERROR_MKDIR=42
+ERROR_MANIFEST=43;
# Clean up any leftovers of previous builds
rm -rf "$PKG_WORK" 2> /dev/null
@@ -84,6 +87,72 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
fi
+# Check Manifest file
+if [ -e "$CWD/Manifest" ]; then
+
+ # Manifest signature checking
+ if grep -q -- "-----BEGIN PGP SIGNED MESSAGE-----" $CWD/Manifest; then
+ echo "Checking Manifest signature..."
+ gpg --verify $CWD/Manifest
+ if [ "$?" != "0" ]; then
+ exit $ERROR_MANIFEST
+ fi
+ fi
+
+ MANIFEST_LINES="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | wc -l`"
+
+ for ((MANIFEST_COUNT=1; MANIFEST_COUNT <= $MANIFEST_LINES; MANIFEST_COUNT++)); do
+
+ MANIFEST_LINE="`grep -E -v "^(MKBUILD|SLACKBUILD)" $CWD/Manifest | head -n $MANIFEST_COUNT | tail -n 1`"
+ MANIFEST_FILE="`echo $MANIFEST_LINE | awk '{ print $2 }'`"
+ MANIFEST_FILE_TYPE="`echo $MANIFEST_LINE | awk '{ print $1 }'`"
+
+ if [ -e "$SRC_DIR/$MANIFEST_FILE" ]; then
+ MANIFEST_FILE="$SRC_DIR/$MANIFEST_FILE"
+ else
+ MANIFEST_FILE="`find $CWD -name $MANIFEST_FILE`"
+ fi
+
+ if [ ! -e "$MANIFEST_FILE" ] || [ -d "$MANIFEST_FILE" ]; then
+ continue
+ fi
+
+ echo "Checking Manifest for $MANIFEST_FILE_TYPE $MANIFEST_FILE integrity..."
+
+ SIZE_SRC="`wc -c $MANIFEST_FILE | awk '{ print $1 }'`"
+ SIZE_MANIFEST="`echo $MANIFEST_LINE | awk '{ print $3 }'`"
+
+ # Check source code size
+ if [ "$SIZE_SRC" != "$SIZE_MANIFEST" ]; then
+ echo "SIZE Manifest: $SIZE_MANIFEST; SIZE $SRC: $SIZE_SRC"
+ exit $ERROR_MANIFEST
+ else
+ echo "Size match."
+ fi
+
+ # Check source code integrity
+ for ALGO in md5 rmd160 sha1 sha256 sha512; do
+ if [ $ALGO = "rmd160" ]; then
+ ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
+ else
+ ALGO_SRC="`"$ALGO"sum $MANIFEST_FILE | awk '{ print $1 }'`"
+ fi
+ ALGO="`echo $ALGO | tr '[:lower:]' '[:upper:]'`"
+ ALGO_MANIFEST=$(echo $MANIFEST_LINE | sed "s/.* $ALGO //" | awk '{ print $1 }')
+ if [ "$ALGO_SRC" != "$ALGO_MANIFEST" ]; then
+ echo "$ALGO Manifest: $ALGO_MANIFEST; $ALGO $SRC: $ALGO_SRC"
+ exit $ERROR_MANIFEST
+ else
+ echo "$ALGO match."
+ fi
+ done
+
+ done
+
+else
+ exit $ERROR_MANIFEST
+fi
+
# Untar
cd "$PKG_WORK"
tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -151,7 +220,8 @@ fi
# Build the package
cd "$PKG"
-makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
+mkdir -p $REPOS/$SLACKBUILD_PATH
+makepkg -l y -c n "$REPOS/$SLACKBUILD_PATH/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
# Delete source and build directories if requested
if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then