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

diff --git a/media/libs/libdvdcss/Manifest b/media/libs/libdvdcss/Manifest
new file mode 100644 (file)
index 0000000..36f1233
--- /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 e855b5f39d96aa654536825a89df9597c67dbd34..7caea994b4d994476b86fb0b844a299e831bf00a 100755 (executable)
--- 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

diff --git a/media/libs/libdvdread/Manifest b/media/libs/libdvdread/Manifest
new file mode 100644 (file)
index 0000000..61bdc8b
--- /dev/null
+++ b/media/libs/libdvdread/Manifest
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libdvdread-0.9.7.tar.gz 389113 MD5 078788c9241ae16763529e1235502337 RMD160 7233064f35d86a27202ca1bef165f6972e20b3e8 SHA1 b2c2ede36cff9d56205747d3740c50fd32669e21 SHA256 e01f70cba5cfbc577b853ae69d73f00db7161e1704dc2359c4377aac4232a184 SHA512 7df91ec55957b8af8af87da71914661b1c332a0de90194e6315d4775aa588c4f0b349e55e947d09ff2db1423a1c524c2b885a054add8c56d5c758b28ce6beb28
+MKBUILD libdvdread.mkbuild 3933 MD5 3290401ca26b2b6d4eef7929ae312c04 RMD160 48ad4ddc23957f9e2f0016ca3c5b299ae9b10069 SHA1 88de14bc39bf9afc08ed36f953a340c566876666 SHA256 58b5838da799d2b233da11cb7e1d087ab897c47ae3dd7178a626cf7565350422 SHA512 0ad54417f09ceb2d29acdfd342599332bc2e30807dd8b4566afde076ef69d37c46321af33c5dfc38ca1d5e3c0d162c7bd90e87b32e3fbc5740a88748f5bb9060
+SLACK-REQUIRED slack-required 84 MD5 6cead2bf4a48fda0fb092196eaf11e0d RMD160 bf387b2d2e3c127f47bf6e3ad8198fe38b173916 SHA1 1dc3f922f0102dd85c0159625cc0d455749d2b38 SHA256 3c03ecec4c0e7762e4794c93df2683aff109449da48dec8b5c52ed6bd5bb8fe0 SHA512 3d360ba6f1789d493b5b72a7c69b0a91271b3b1d77d6b5bc914a18dafcaad301de5c4bc021a07e9485793a6a42450cb693bbcbd3aa8629637e3c9e03bfcceb77
+SLACKBUILD libdvdread.SlackBuild 7375 MD5 d5da4aa37faf146c7d68f8d3ff444282 RMD160 48dd21a663ec70ce9a17cc4a4b37a68b780c2ca5 SHA1 b85f0c6f5f78bd8feb7ee03a77e2b2342ba69f7a SHA256 61c97bb3b21e22f8a84e246b362ca090440d836f07a76dff12d832b8ea77d990 SHA512 606b5a1eedb33584d8624ec7597766cbd5c4b74aced8207be6475abf5aceaa2f4951a3e1b8990b4a3206c4c6ce324c584c7b05a540d1106d49cb928b3b006dbb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/GnnAAoJEEHL93ESzgeiEnsP/2yH8d8pa7g8qKOXvn9xwf5G
+Wa+/rz+RxydSkLA7YVMaMG3KvC/z/Lu5y7D6CDKX9oKLlQF4TFNdI4jDQhgfnKPl
+ph/PQ0LhjIlnObk7iw1jFZsA3ly7Rh8dCHETVez3bG2qcXuBvdOmFb/nFG7PlzY1
+a7Wk/QegOU9MZZmlsH9q7xcEkAEME8ezZQwA8DPNQPZe6WzWxyoG4cCtqnF/Rbix
+KvOZnHCfIqezo2b2pwPEZVX65ldmAGAQl5fsgVUnKa71ETU2wbbkgGypa9nMSSWh
+/apPTOpdjVT6yN1/a14JTc8KrtSj4QAvv5SYHtrs9BZq/hQO/LbCYuAGIwLhqVcj
+iQxD72MlsuQYaha8/jsUtYXPef7CmOqa7r7yWB2iORBV3fv2RwS50IYOtsZTKewd
+hl+I5Spu2Sy2G8ZEZuNfdcrJTamfOSwMFs52ecKWoxBykyyGcgTxZoWZgKYsa3WF
+uya3UJEpU1pWVQVMP0aefbU4rU+P5FkMChdcn16GvLVprLfstuQu2gsFq+o+kkmw
+YXTZvmmXvOfa2e+iZIxnTwIvh4Hf5o78xeXW2xXi5baMMzWykM3jDAZ3IOecFuth
+dlQZ8HjFIgGEg2KEMvz/U5WRRILMaC3MhDszl1jODHV7zuPGJ0kU0gDh5AfDcpRA
+XFpU0g6Vju1H57b5ikl9
+=+mYx
+-----END PGP SIGNATURE-----

diff --git a/media/libs/libdvdread/libdvdread.SlackBuild b/media/libs/libdvdread/libdvdread.SlackBuild
index 2ae740cb82ae13752ab58655c4c1f94e20e113d8..8e407bca4617b869d001aeeb657237a990def6bb 100755 (executable)
--- a/media/libs/libdvdread/libdvdread.SlackBuild
+++ b/media/libs/libdvdread/libdvdread.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libdvdread, by Rudson R. Alves
-# requires: libdvdcss 
+# requires:  
 # tested: libdvdread-0.9.7
+# 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:="media/libs/libdvdread"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:=""}
@@ -47,9 +49,9 @@ 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
@@ -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
@@ -78,12 +81,78 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
 SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="http://freshmeat.net/redir/libdvdread/17926/url_tgz/$SRC"
+URL="http://www.dtek.chalmers.se/groups/dvd/dist/$SRC"
 
 if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -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
@@ -150,7 +219,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

diff --git a/sys/libs/libfreebob/Manifest b/sys/libs/libfreebob/Manifest
new file mode 100644 (file)
index 0000000..5c98fe4
--- /dev/null
+++ b/sys/libs/libfreebob/Manifest
@@ -0,0 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST libfreebob-1.0.11.tar.gz 483687 MD5 e49eed0084b9e793e7a0713aa99c196c RMD160 f9d4293cc3599d74f214cc2ac0ca986cc2934c18 SHA1 cde4a90e2e23f1ba4ed4b665d1663520fef85980 SHA256 1f95f2c038bcba51806051b5849016bd8aeb92351933f68f7e2e3dae827c14ec SHA512 59afecb6f67c1623748dddbf35e14fb07dc5c97803972206d603f67381eb5c942d359fa0f6847352362c99ed48b34c9e9e9d21f5802a21fbdd1d7bbfd7283e58
+MKBUILD libfreebob.mkbuild 4683 MD5 75657a1877f616180ceb5393e5996b52 RMD160 8a06692300cea856d6f9f3262f8cc704107e40ba SHA1 568c791d37cb739e5a8873bbb2512a9be32a3f0c SHA256 9889c751604b16c79afb1bbea45dfd6f9c99d88cb6f3d6faa118872ba37c01c9 SHA512 921c7a35ad8f0ce838bdffa22c7c63e0e06717b033707f8c554e3c2da4aa81e1d5802174257b27e200d6a2c4e2688a31361a3d1bc38208035419cd78c708e0b2
+PATCH libfreebob-1.0.11.diff 457 MD5 46892e8a638f389595eb9c4af31d348f RMD160 217dc5447466fc6bc5b6e42cda3c8a5827517210 SHA1 d248cdcd03b07c2e9a30508736cb06f2d1093ffd SHA256 146e41b3f00b85be55bb3ec38bbe6124de7e94e48a4bc1c2288c412056ae2f0a SHA512 033302ff3c5ff8259910d3e48b1fe642cec0d0b53b1ab23efc616e5ffea68b1bb452317ddc260a102baaed7d90d95e5223b3d301cf9e675b4408dca41fec19e9
+SLACK-REQUIRED slack-required 213 MD5 b8b158f8e3d77f2f8553385fe92a2777 RMD160 3730668e8be787e7ef9049f87686bb70bcca01a0 SHA1 6017b7af0ad54e192f4bead9385edf669d0b3c95 SHA256 6a77656c4a2ac422b53b2b12786f8adba6110f7455f8b6b4ae86395a4cee34ea SHA512 6ab6273285e17617f484347a83ac601a0d401c6032b107cd863866d078927627c6272a3f42de6f41e7ac3c7a8a0fcc6d5bfca16ee64b30cea72af7dcd995b60f
+SLACKBUILD libfreebob.SlackBuild 8482 MD5 786cb1d68a6ecdc210bda9320b14cfae RMD160 0c28f419f15a3ae702e05741ae2b012e224ede69 SHA1 ab988a7fbf45be8340037e01d8631b69d173561d SHA256 745f98ba49661e613f4247e715a52688036e70ffd2a13b4169445cfdaf687994 SHA512 c11ab5cd0d6df7d749205920ce38cda30aa306520f79ff18d7dab0b319c0bba4e9fed982a3b5e01b172a3c5b8e2bb6a74dd6cab456490c39153d2f5fddc21777
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ/HIpAAoJEEHL93ESzgeil9kP/378II6p0uwZSxexzLv0cq1n
+lVY1BzGvp1aXu53/hyAzPSKbZOIGjesZYWl62EwuFdQ72+71hjil7bNU9P3nWkd/
+6b7Jch+JOSFsT92YjcA8ptXzRa+Shgxmy66XILIaHTNCIlflJJ9q9THdNcPfmHWH
+4O07bio5VjQSpi0OhvfIT5Ig2kFi3iCFzui9w+zfKquj5DU2Y7dlWQbxeGCBiomw
+pp1EvlhOWHRYLNvVOh6MYvVMXimRYy1OoZFpWrYoBJ0jnhr5Zw8RIUcA+87r4n4z
+eJ8hpHDE8SwoYYL/YcRe2gtKCLm7P4bpBjgkdTVdM6XCbClf6QryzybVc7kqQ560
+K5l9d9EbQzx0wgmScUzWntC61epZ+rLvthx5wj3Kpi35EOhJbyS/HXfBXOEbWojG
+LovSbjDG2Ujt2G/AW9wPd1eQIca5HJH6e0jLjFq4h83ghWXPYw/Ax3d9NxOf9d3T
+Zih0nlpdQ41LJhnK3AnHi+Bp/Xpr7LM+c/mwuZsj2a9estoUV/kAEFwSCnumKzUE
+RWqsCPP2lkq4GWmIkcbz9VZhmCv7rbG/KNzBf3tUsX9R03BNspmF3DOk5/EipiMX
+EyuUMOg017HJBkYP8ktauFdX7WxemV3K2DIzImbEA8+CXBBWW/HekaMwQdXLTWhy
+RC6yVZr6h95tEDRTIe0x
+=VJEV
+-----END PGP SIGNATURE-----

diff --git a/sys/libs/libfreebob/libfreebob.SlackBuild b/sys/libs/libfreebob/libfreebob.SlackBuild
index b110cfe8e5abcdf9133b885966bd00c170e0626f..32b232e68753d58d1b059dd1e2794d6c6c7dd625 100755 (executable)
--- a/sys/libs/libfreebob/libfreebob.SlackBuild
+++ b/sys/libs/libfreebob/libfreebob.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for libfreebob, by Rudson R. Alves
-# requires: cxxlibs gcc glibc-solibs alsa-lib libavc1394 libiec61883 libraw1394 libxml2 
+# requires:  
 # tested: libfreebob-1.0.11
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -33,23 +34,24 @@ PKG_NAME="libfreebob"
 ARCH=${ARCH:=i486}
 SRC_VERSION=${VERSION:=1.0.11}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
-BUILD=${BUILD:=2rra}
+BUILD=${BUILD:=3rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="sys/libs/libfreebob"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--program-prefix= --program-suffix= --build=$ARCH-slackware-linux"}
-NUMJOBS=${NUMJOBS:="-j7"}
+NUMJOBS=${NUMJOBS:=""}
 
 # Set system libraries' path and optmization flags based on $ARCH
 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" ] || ! gunzip -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
@@ -91,10 +160,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Patch source
-patches="
+patches=" [[PATCH URLS]]
          $PKG_NAME.diff $PKG_NAME-$PKG_VERSION.diff
          $PKG_NAME-$PKG_VERSION-$ARCH.diff $PKG_NAME-$ARCH.diff"
 for patch in $patches; do
+  patch="`basename $patch`"
   if [ -f "$CWD/$patch" ]; then
     patch -Np1 < "$CWD/$patch" || exit $ERROR_PATCH
   elif [ -f "$CWD/patches/$patch" ]; then
@@ -103,15 +173,7 @@ for patch in $patches; do
     gzip -dc "$CWD/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
   elif [ -f "$CWD/patches/$patch.gz" ]; then
     gzip -dc "$CWD/patches/$patch.gz" | patch -Np1 || exit $ERROR_PATCH
-  fi
-done
-
-if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
-  for patch_url in [[PATCH URLS]]; do
-    patch="`basename $patch_url`"
-    if [ ! -s "$SRC_DIR/$patch" ]; then
-      wget "$patch_url" -O "$SRC_DIR/$patch" || exit $ERROR_WGET
-    fi
+  elif [ -f "$SRC_DIR/$patch" ]; then
     if [ "`basename $patch .gz`" != "$patch" ]; then
       gzip -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
     elif [ "`basename $patch .bz2`" != "$patch" ]; then
@@ -119,8 +181,8 @@ if echo [[PATCH URLS]] | grep -q -v "PATCH URLS"; then
     else
       patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
     fi
-  done
-fi
+  fi
+done
 
 # Configure
 CFLAGS="$SLKCFLAGS" \
@@ -183,7 +245,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