aboutsummaryrefslogtreecommitdiff
path: root/media
diff options
context:
space:
mode:
authorrafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4>2009-04-23 17:24:52 +0000
committerrafael2k <rafael2k@370017ae-e619-0410-ac65-c121f96126d4>2009-04-23 17:24:52 +0000
commit6b1208b64aee322595d4109ad431f1136306be7e (patch)
tree0d304f0f180db4df1f5b4f2e910ab23aea4929b9 /media
parent22790c8092ee8d789e6c1ced3adab337de482a31 (diff)
downloadslackbuilds-6b1208b64aee322595d4109ad431f1136306be7e.tar.gz
slackbuilds-6b1208b64aee322595d4109ad431f1136306be7e.tar.bz2
libgc fix
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2152 370017ae-e619-0410-ac65-c121f96126d4
Diffstat (limited to 'media')
-rw-r--r--media/libs/libgc/Manifest5
-rwxr-xr-xmedia/libs/libgc/libgc.SlackBuild22
2 files changed, 20 insertions, 7 deletions
diff --git a/media/libs/libgc/Manifest b/media/libs/libgc/Manifest
index 47480c98..4526a712 100644
--- a/media/libs/libgc/Manifest
+++ b/media/libs/libgc/Manifest
@@ -1,3 +1,4 @@
+DIST gc6.8.tar.gz 756879 MD5 418d38bd9c66398386a372ec0435250e RMD160 6e894e7a51683a9342fd738baa6f1a2861e27400 SHA1 6d5def5ba5d29292ba9c76f04df3ec06d3ab3278 SHA256 448f8e4c6ee8c80eac059cf1c9379d20c388bcb900fc0796cd2a44d1dcbbae69 SHA512 69a9554d2d213392512d4ce41ec8c4993557e65c2b3dc4f568ac18695421cc08b7677c25f9a0ce03e94fb5e68a298fcac7ed09fb90007a2c998ff6ef78d3c651
DIST libgc6.8.tar.gz 756879 MD5 418d38bd9c66398386a372ec0435250e SHA1 6d5def5ba5d29292ba9c76f04df3ec06d3ab3278 SHA256 448f8e4c6ee8c80eac059cf1c9379d20c388bcb900fc0796cd2a44d1dcbbae69 SHA512 69a9554d2d213392512d4ce41ec8c4993557e65c2b3dc4f568ac18695421cc08b7677c25f9a0ce03e94fb5e68a298fcac7ed09fb90007a2c998ff6ef78d3c651 RMD160 6e894e7a51683a9342fd738baa6f1a2861e27400
-MKBUILD libgc.mkbuild 3221 MD5 92165892b7598bf57cca7b0305ff07de SHA1 1f1d253edee7c58e898622d163ef6e162487acb8 SHA256 099facfd91993ac9e2cb306201ff3d3ae72bd69076a6bb740e2d6d7dfc766624 SHA512 93a94e33fa6af03d0f9253379f5fc10b318ca3f7b976993dac6c04a6dace0f49d5f9058daff7556aebeb3bfeb81c77d92d0681c2bdb226c338a03cc5a8473d2d RMD160 d239381e488025c657742b06c3fd37b3880c7acf
-SLACKBUILD libgc.SlackBuild 6852 MD5 09b6fe6a716a109064338fc67b413863 SHA1 3ae61291844243a11fc4ae6abf25b2008f372725 SHA256 95a9830a41d898695b9ffb081a1bbc8037d0dc2999013db685d2dde6780b9c79 SHA512 545ea498ff4ee58151320c2e16c2e890d316b4c16dc601b95b5907a7aec159af21726a8511ff62396651189deb23341fb6f2f5dd0db99cc1f9e67f25b0444c97 RMD160 9f0358962e2d22bd481084ca28d47e87c00e3c54
+MKBUILD libgc.mkbuild 3218 MD5 15ccfa31c6f7b7343c286f6f16bab79b RMD160 7cc7ea076e01593809a23d5731b35d7fed51d9cc SHA1 c9aa84e3621a16d2046eac2c1184fffa94c0dedd SHA256 7adbad4df36dbd8665d8ae88d58cb94390265bc22d46d529d9aebebd2af8bbc9 SHA512 c568f4c33ca3493d9819f4c8e5724e73e75022a6ba44fb0937c5c1747dc8a0aea35376cc4efa96f8e2bde072a12c788fcc8cc56a0a7298eb5429409d31917763
+SLACKBUILD libgc.SlackBuild 7245 MD5 2f5087e583761ae5ca09e854e366a3dd RMD160 975fb5f0b50ede8f26e205716439e803e45cfed8 SHA1 5860bed849e6e44cef0d40e1b061163133afe79b SHA256 5f402ca0460276b0bc3b277811f3ce5fbcec5c0bee26eeb8e3ed6b7345a43b2a SHA512 80ae84f23dfdd2613fb5a0d9b84c888b5ae856c7b2c4a39ff5cf9fc827fdd81d9b7457e7415f6cdade5f4a4ad0d694ea84189abbe11b18e0ef4358b380bc6b6a
diff --git a/media/libs/libgc/libgc.SlackBuild b/media/libs/libgc/libgc.SlackBuild
index de737558..cc3f3b6b 100755
--- a/media/libs/libgc/libgc.SlackBuild
+++ b/media/libs/libgc/libgc.SlackBuild
@@ -17,6 +17,7 @@
# slackbuild for libgc, by Silvio Rhatto
# requires:
# tested: libgc-6.8
+# model: generic.mkSlackBuild $Rev: 805 $
#
# Look for slackbuildrc
@@ -28,7 +29,7 @@ fi
# Set variables
CWD="$(pwd)"
-SRC_NAME="libgc"
+SRC_NAME="gc"
PKG_NAME="libgc"
ARCH=${ARCH:=i486}
SRC_VERSION=${VERSION:=6.8}
@@ -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:="media/libs/libgc"}
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
@@ -88,6 +90,15 @@ 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
@@ -120,7 +131,7 @@ if [ -e "$CWD/Manifest" ]; then
fi
# Check source code integrity
- for ALGO in md5 sha1 sha256 sha512 rmd160; do
+ for ALGO in md5 rmd160 sha1 sha256 sha512; do
if [ $ALGO = "rmd160" ]; then
ALGO_SRC="`openssl rmd160 $MANIFEST_FILE | awk '{ print $2 }'`"
else
@@ -203,7 +214,8 @@ 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" ] || [ "$1" = "--cleanup" ]; then