libfreebob: removing number of jobs configuration; libdvdread: fixing URL

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2184 370017ae-e619-0410-ac65-c121f96126d4

2 files changed, 109 insertions, 20 deletions

diff --git a/media/libs/libdvdcss/Manifest b/media/libs/libdvdcss/Manifest
new file mode 100644
index 00000000..36f1233f
--- /dev/null
+++ b/media/libs/libdvdcss/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libdvdcss-1.2.10.tar.bz2 308373 MD5 ebd5370b79ac5a83e5c61b24a214cf74 RMD160 e896a7f3d482c2ce9dadf86fddc31804e7d8215d SHA1 7c933d011e34c218048d48f0c1a8b4ff56798dcd SHA256 2394a75013ab66b592d8c91d53529ede392bc9faee37fe279bd29b455eff2220 SHA512 06a9d4d8a5450c59ae6de35e8efa962111fc96a5d55cdd9133d04a6676c9317944bc7e130d81f84ce7f45ae60b23da56eb653e6022413f3eb0b6366a6190733c
+DIST libdvdcss-1.2.9.tar.bz2 283329 MD5 553383d898826c285afb2ee453b07868 RMD160 5939a195f977544c25ea07e4d1f4b3ac4065212a SHA1 6c834633f58521d8ad09775f625cc723e30f2549 SHA256 b31e6afb88c9c37f9c299381bfed4663579cc8ce3d24a275b96d6b13f708b5e4 SHA512 a8571e58e0bf0460f7c15f1672849cbbe7858501cf822fd153d955481fc26401f28323846707381f76f5d131d392a7c3db0c11395840f56e197c2f2dc79fd657
+MKBUILD libdvdcss.mkbuild 3950 MD5 c524e865d2fac0be1a4ceb7f08a5c625 RMD160 f82591be19a65cfc517663166f91421d2399294b SHA1 4e29b7722688613fcaa6fd4d41fab055e91bee26 SHA256 ee1d15dc1983e1ddc353d071d5cb82063ab020c1f01ff5626de1f72ffc55f0dd SHA512 7ce1236d34a19f09d584907260f62334d1cf687f4d93b8e14e548a310b971feda42bb0f623da7e752126ed79e96cf897fcd54254061993af7b39e6fa75caf7b5
+SLACKBUILD libdvdcss.SlackBuild 7031 MD5 084caf9c0910f8ddba1f6fa048e51847 RMD160 fded207a6d64c7d3710711a376f42181cf6c6df4 SHA1 528c2560d7539eeb2e55581801d996ea443ec9a2 SHA256 ecbcda3d250a934a9a071242625ee6273e634ba17ce23fca8ec3afb7170b9cc3 SHA512 0a67d4133a38ae795371738b669e668815121f73130144e697205cd8c1eebb44b64a893247b78c8bd5c4c48a82fb6789a035efc031e6fcc283750896c06795f1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/GqaAAoJEEHL93ESzgei/iwP/RHqjhnal2/9yBlRaT4Oe3er
+9+Ng33gKo0ldoAMOc9nNwpj6zYGJBqarCZ000zarmhgJfwRQE5y7eoaTnGCrsQmr
+ogQcUPisApn22w4y922fu5cHb/6L78XdSovwqPhla3q5ub1CcQXVGZTXIw8vMlUc
+qNVYAZGTACv0BDBON1GqvIXGO5Mw7s3KjzfbCXKoJmWCNsvY2K4Z2e2sshr8/hD0
+4Dwr6fD5S6aCWFgwjha0FrPQ7zwr0h52yztjzn5TfukOHyiLB0yPu1WwDyG/h3Hs
+GIeVGwgnX4PecMWCN6mzpVD8OZXUnhEjm3PfR0IsqBra1wMrb3JxMfKNcXTDjsZJ
+WNX7nWQ+nQwQszpRDfGAICiHqjQpPzlWA64dDajb1vMaqvvcQsNGdgetVYSX1Jok
+IrW0l3NGoecF2ZwMsfHNns5rGEg61V9rs0h3l0dK6aVpIdxSnSSnp4xOgDaV+e0j
+6IJp6sptLL2n6KDea4FGuXbjYKoaaEOqFEHd4lzbhY0zzp1ubHeRD186Ymsgr0IX
+Mbkwvc+3iMWoqhkBEWJpxAU5QE2CICC/hbqAiBoHbs9lbjH4WaLyX6z/LxLRVVu9
+aoJvGUDuSYQgaCNWdMVYnm37lyf+KkI3YtB5EfvUJD4NsIbnJi6Yo3EchfWOUUdS
+3Geu6zqrQu4JpcDWCMER
+=WBj8
+-----END PGP SIGNATURE-----
diff --git a/media/libs/libdvdcss/libdvdcss.SlackBuild b/media/libs/libdvdcss/libdvdcss.SlackBuild
index e855b5f3..7caea994 100755
--- a/media/libs/libdvdcss/libdvdcss.SlackBuild
+++ b/media/libs/libdvdcss/libdvdcss.SlackBuild
@@ -10,13 +10,14 @@
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 #  Public License for more details.
 #
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
+#  You should have received a copy of the GNU General Public License along
+#  with this program; if not, write to the Free Software Foundation, Inc.,
+#  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libdvdcss, by Rudson R. Alves
 # requires:  
-# tested: libdvdcss-1.2.9
+# tested: libdvdcss-1.2.10
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="libdvdcss"
 PKG_NAME="libdvdcss"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=1.2.9}
+SRC_VERSION=${VERSION:=1.2.10}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 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/libdvdcss"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,16 +49,17 @@ NUMJOBS=${NUMJOBS:="-j7"}
 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
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -64,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
@@ -77,24 +81,84 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.bz2"
-URL="http://download.videolan.org/pub/libdvdcss/1.2.9/$SRC"
+URL="http://download.videolan.org/pub/libdvdcss/1.2.10/$SRC"
 
 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
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
-# Slackware 12.0 TeX set
-for i in `grep -lr 'é' *`; do 
-    sed 's/é/e/g' $i > $i.new
-    mv $i.new $i
-done
-
 # Configure
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
@@ -128,9 +192,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -149,9 +213,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