aboutsummaryrefslogtreecommitdiff
path: root/dev/python/foolscap
diff options
context:
space:
mode:
Diffstat (limited to 'dev/python/foolscap')
-rw-r--r--dev/python/foolscap/Manifest23
-rwxr-xr-xdev/python/foolscap/foolscap.SlackBuild78
2 files changed, 97 insertions, 4 deletions
diff --git a/dev/python/foolscap/Manifest b/dev/python/foolscap/Manifest
new file mode 100644
index 00000000..8a4a2118
--- /dev/null
+++ b/dev/python/foolscap/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST foolscap-0.3.2.tar.gz 440853 MD5 635b9b6967504f3a03b8b05be4ca06a5 RMD160 62dd90dc62901f30d7cc10d63a5b6363e5ebc3e6 SHA1 0da3e394f2e1a0e774f9073793ac15de2ce93425 SHA256 800eebc2703e3ce37bb2652a486ba8b614810088f3746c1bfabb53ab4c7d78f2 SHA512 1e566ecb4deff2ccbdb77ea0b2a8b31e091609f0b5f440f0446823d31922f87799c5dcb0405768c51471e108077ccf172098ea9a2940e09b4f46cf7a5acf38f6
+MKBUILD foolscap.mkbuild 2775 MD5 ac0088a8c86e5e70beb0fe6c5ac14a14 RMD160 b0ccd32b10fc27a75cb4d987cfb2f176d9e2de6a SHA1 6d98b57776af53f08ceb56cd2b92674ba820396c SHA256 ce99241dcaeac535bd1e6f653f80b9b42a0da9ffebbba7baac4cac98efef76f0 SHA512 d8533bbdd8302c772e916937b40400aa7865b6b0546eb9fd942dfd9b74addb73ad558ac1b0291ac2aaf604fa0c5555854a109c0fd800032b0e674df8f9d746da
+SLACKBUILD foolscap.SlackBuild 8278 MD5 3bbd199d1ca7a7016b0b847f7b88bc87 RMD160 51c9950a4da0cc3d55c60a64f090c950e8ec44f2 SHA1 de9c126eff9be0192086d65327cb38f9636169c2 SHA256 cfaa4a06613c4876f6665c71f320a183b0f951de2af0d354b53091bfcf9b771c SHA512 41d1fca329c2edfb5a20017dffd420f23e1543c40269c098973ff9825ea11385051b92a28df68f5aab624a268347e18184db7d4af9df503a83bcb3000cd2b3a5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ+wvZAAoJEEHL93ESzgei5i4P/0LOU51bw+KCrOCBM+/tzK0d
+75jJRl/KaAV2RMAGf7rJWB0zl/LYVUWnWnpkYQsfMdiXFD0QRVH3E0LIaziZWmsB
+u560KpZuZUX7NXwX4fDpMygEkwRIRKc2oWOk12HxBqcIokfy71WC+qM/JsKqw/yr
+dgmBe+FPulK7L7Oo7hV9Ra36fcCzY7hnN5TEkuJcAicta8/wsNZjI6T8WMWkgRom
+9wANDV+iMQDYIWZ5rXfj4se98d/f9hjCEq1KkTP5A3ekiDsi5M43NDrmyNmFcE41
+Ll8Hz7H9pFrkHgeg8vmQr9BZFqa6eUohtdJcWetRHlSBPSn+hNKOchvnXf3y3RYr
+FwqAOyQxVrVD8c4phZLEf5g38wUmuxve0kLo7q6pYWwxAWcH4HXfqqfpAT1oW/hG
+jjY0RgFUgb/LjBLFeTZgO4UvkBgNwnFtFraTollLd9PgHDn/3VmA+xqzaJh64XBr
+K7GCbJI01VR9LDyUeu9i0IUJwmHx6NWqvuTg+SZJBJf9cY9F2AkpNE0rJb3HmJjF
+IeQglI8nGXYr61AHVBqgEVYNjPeB+8KRwmkZBxWp8t6cMZzxhRnr7Yh4iWK8CCOX
+dme5K6CtWYMd8G8LnCIYXr+PYOyLCKMaCJfNIaXIEyJDjNmFYTIIPnkNRGhNCHm6
+8YHQx3LacaptDtemKO0N
+=UlZ8
+-----END PGP SIGNATURE-----
diff --git a/dev/python/foolscap/foolscap.SlackBuild b/dev/python/foolscap/foolscap.SlackBuild
index b8f9e821..1c944944 100755
--- a/dev/python/foolscap/foolscap.SlackBuild
+++ b/dev/python/foolscap/foolscap.SlackBuild
@@ -17,6 +17,7 @@
# slackbuild for foolscap, by Silvio Rhatto
# requires:
# tested: foolscap-0.3.2
+# model: generic.mkSlackBuild $Rev: 805 $
#
# Look for slackbuildrc
@@ -38,6 +39,7 @@ SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
TMP=${TMP:=/tmp}
PKG=${PKG:=$TMP/package-$PKG_NAME}
REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="dev/python/foolscap"}
PREFIX=${PREFIX:=/usr}
PKG_WORK="$TMP/$SRC_NAME"
CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -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
@@ -128,6 +131,72 @@ echo Checking $SRC_DIR/$SRC with gpg using $SRC_DIR/$SIGNATURE...
gpg --verify "$SRC_DIR/$SIGNATURE" "$SRC_DIR/$SRC" || exit $ERROR_GPG
echo Success.
+# 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
@@ -180,9 +249,10 @@ EODESC
# 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" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
rm -rf "$PKG_WORK" "$PKG"
fi