From da54a35be17ef4846797cdd824fba3f8e7443216 Mon Sep 17 00:00:00 2001 From: rhatto Date: Sun, 20 Sep 2009 15:05:35 +0000 Subject: gwhere: adding gwhere; avahi: updating; arno-iptables-firewall: adding arno-iptables-firewall; glib2: updating; orbit: updating; afterstep: updating git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2243 370017ae-e619-0410-ac65-c121f96126d4 --- x11/wm/afterstep/AfterStep.SlackBuild | 82 ++++++++++++++++++++++++++++++++--- x11/wm/afterstep/Manifest | 23 ++++++++++ 2 files changed, 99 insertions(+), 6 deletions(-) create mode 100644 x11/wm/afterstep/Manifest (limited to 'x11/wm') diff --git a/x11/wm/afterstep/AfterStep.SlackBuild b/x11/wm/afterstep/AfterStep.SlackBuild index 7f3f7dd5..00f9766a 100644 --- a/x11/wm/afterstep/AfterStep.SlackBuild +++ b/x11/wm/afterstep/AfterStep.SlackBuild @@ -16,7 +16,8 @@ # # slackbuild for AfterStep, by Rudson R. Alves # requires: -# tested: AfterStep-2.2.8 +# tested: AfterStep-2.2.9 +# model: generic.mkSlackBuild $Rev: 808 $ # # Look for slackbuildrc @@ -31,13 +32,14 @@ CWD="$(pwd)" SRC_NAME="AfterStep" PKG_NAME="AfterStep" ARCH=${ARCH:=i486} -SRC_VERSION=${VERSION:=2.2.8} +SRC_VERSION=${VERSION:=2.2.9} PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')" BUILD=${BUILD:=1srv} SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} +SLACKBUILD_PATH=${SLACKBUILD_PATH:="x11/wm/afterstep"} PREFIX=${PREFIX:=/usr} PKG_WORK="$TMP/$SRC_NAME" CONF_OPTIONS=${CONF_OPTIONS:=""} @@ -47,9 +49,9 @@ NUMJOBS=${NUMJOBS:="-j4"} 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 @@ -145,9 +214,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 diff --git a/x11/wm/afterstep/Manifest b/x11/wm/afterstep/Manifest new file mode 100644 index 00000000..a65c0b94 --- /dev/null +++ b/x11/wm/afterstep/Manifest @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +DIST AfterStep-2.2.9.tar.bz2 6094706 MD5 59d739b2416ac18201027d7cc0888c20 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148 SHA512 1191d918785d3e57f1921b1df21639eeae3298fb5f0f6e23a551f47afc5f0e0c945bae17b1ab8ba908ab0bd8476f5d358051593ff977c442783f94bd2e655ea5 +MKBUILD afterstep.mkbuild 4601 MD5 159b5c3a35d173f792933f4bce2586b7 RMD160 cd3266c9543049482ad22369443bce05e946add1 SHA1 daef1e6091cc0b352db40cb5d7c7ba2b9c9c99f0 SHA256 83d73f46093f979205293474c5ae359f2c47c49204dda38e3d19bbfac34969d3 SHA512 a1706521c3e73bbc3b168a261d89bb777c316c31f14997d8e03363917d6b4c179940ce2d53529b2583ab1d5145c2dd4adfca548c8fe80a3de1145fb136bc768c +SLACKBUILD AfterStep.SlackBuild 7241 MD5 134d7279e0ec1e5adbab0e05cc4b0195 RMD160 ba49ea32d855b0c013fc55348db1567a225bf920 SHA1 30b48d5895886e95c45055d88d9f540ba4354748 SHA256 dfc7f9875875543eabe1e3121d3b4a1d3355f1cd6b67a82a3f34536be9eb750b SHA512 bb95045f3e4c72e33a900bf5d2409c58af1159e2d1810d9d479c64428ce7ae4eb39bf9ed27b726a066780c1aa91f86c3424ab85160e7464360a879688e4d2f13 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQIcBAEBCAAGBQJKtjjPAAoJEEHL93ESzgeikcoQAJWv4n+FcY342s7jIb+8ueqm +nbpukomLTWV+zrTBIyTPzMATuBRK1IHddRZCQEuxKpmGBYKiPsrlgHeo6GSwxhW7 +1ASiibzSVGDvnkJaikTkHi3D5Zk6b5tI3f2ssiZ3NAqMJZzjTkJbeMD1hxjoArw2 +pMkAKLzfcnZefKX/DciVvzFs+SyXUesIGi1/CPcIh2BMgfmbZ1/cp45WKUo2b9/o +JKwY6D0wyTEwRoftGyNB7S+7L93biJQqRFPAfO/s3P5WgVJgd5QoEBWXTS5KCWMW +7oY4J74iX8YC4qTkZ1OasiEO7r57UjaQcT8xGS6mnmO8N/XdhtNKht64N0cpAF/j +B24DsZ1HOzWUJTqibPExsa2rKgVRkbaD+TRFewAP948nJRGHn+ichRdoCf45u8bZ +Kk2NbesveC/ydePN4NgBWBnaR6IR06msdtGTiQIAkztDYQaZg1dmVunpukkl7Gl/ +3YDejivHoMj7SyUriiWgOccCTRI+Prij7afGNFr5ngyGfKKvI8n+eDyqe8Y53fYX +JFYn1tcm7quQmWXN5Gdy33MWkvsxJPWiDlQGQhg53xl/9iktiTJvd7PQLXiVcdpw +sxFt7Yng5Jdh9C15akSXkk0KmnG6JIZWraT2B2STga5c27jkEUBasSLHzekG4JFz +ipKtnQNg8GEWPjqre6fV +=Rl7+ +-----END PGP SIGNATURE----- -- cgit v1.2.3