cryptsetup-luks: updating url

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

diff --git a/sys/fs/cryptsetup-luks/Manifest b/sys/fs/cryptsetup-luks/Manifest
new file mode 100644 (file)
index 0000000..710f894
--- /dev/null
+++ b/sys/fs/cryptsetup-luks/Manifest
@@ -0,0 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST cryptsetup-1.0.6.tar.bz2 405713 MD5 00d452eb7a76e39f5749545d48934a10 RMD160 7ec056cf80fd25a782d3f6cc345858cf4ea988ec SHA1 dd45ad6a29c2e9af83c2c1525b02d7af88ab7212 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd SHA512 deed2c603bfba3b26eb1cab65d880eb9fd69dc4aabc9e8fa2bf78de0879ecd5ddb03c4c6bd9c0ec166d2d5e87a13bb370e6e46d50f5dd246522e81bf75380e1b
+MKBUILD cryptsetup-luks.mkbuild 3190 MD5 525a097ae3b12e8faa3643f9e70348ab RMD160 182edc4523c0e8014be5adde252604f95fcc8077 SHA1 0d09bb13542719f746fe43c7ce7a89da264fb474 SHA256 a351e6d8c92755b6c3ee5609594a03446d5b2b923d7e232e50989caeb29e4887 SHA512 e0e59632d6a033e437158a2e33d77100a8fb71eb508afa64cf2a714c9dae62574900f70aadca0978583e2c1cb79b7d07e42a1acf5e34d5b3b9146d12e8446c29
+SLACKBUILD cryptsetup-luks.SlackBuild 5501 MD5 237aa3ec31ba0a2602287109f71178a8 RMD160 283032916b3109bf593609a80a3237473770f484 SHA1 91dd450b2cf43368d6a4043b591e42d2fac40154 SHA256 4ec44fde46af465594be0dccd8006219630db22dca71da114410326c80e745fd SHA512 24b7b1e69bf1aee1d9053cecc4e70432e000bfbddcca5caa3f2bb68cc09e7c4df97ba7e32ce35958648d6e0e45d41bc0ccbb9382f272e80f910c560f322b288b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBAgAGBQJJ2TrRAAoJEEHL93ESzgeimDMP/AhJ/bmacE2iNx84fR/OuIsB
+VrVEIxPn2782Qg9jsWVUEK8/2nccmBeVgaM36G5z0NPyKhIKyLviFb6OxN+nUN1e
+4fvtPraQtEOZh1kJJOdMXwg+fcgJDQMF3nVxpHwWlxy1ymGan4AEmHj5JljhSDnQ
+7l82bKTmY9gAwJswSd3nujLbOjKBwtmzCSLjjM9nsaQY9j3n7uchLMwEfihxCZe/
+1OBSPKAh14QL9Hv/8h/l44rJKELyD6vbz/iiyUXNkeaP4d4XqLLmrifs7zbvvmjz
+iiBzVRuxqi7yr2pmiQ3iEg5aumI4+UGLCa1E+O0R7nuAsyyKRh6LSvyug1Rwcg9a
+BkHaxlUdXXk5e0GKbGhni8myfFUVDXKWsKCm1eXv80+gVgAARGTa7WW2ufjLXcTI
+koLrg5z1UajdfzaGo/vKXLkt5doeiBhnJSVNuOmYdwA2FolaGPX1v4nJ/QPcXisX
+cEXIeyLNwO1u1I2syiAvGXditt0AfcyWmKnZLgvLAdZUCLwnamv6SLrs+x71FPF3
+BXA9s6A+RV/uicwzHrCpyQGSyomrfaN3xrbvqhOsxenfb8LlmdNww83f9fk2QDFT
+8UyyursNtTgtgxBXj+Yz22a2mfva5c1wMpAJUVRMB97uL8xW18lKuPW5lXFKQrx3
+p1i5o1EPK1NWhbnl+kFK
+=UIjr
+-----END PGP SIGNATURE-----

diff --git a/sys/fs/cryptsetup-luks/cryptsetup-luks.SlackBuild b/sys/fs/cryptsetup-luks/cryptsetup-luks.SlackBuild
index 920a9b4312583192c51dc3bdf3f90e95c583a2fe..d5b06cf5fa101e09b0da2ae8a0f150563cfaf005 100755 (executable)
--- a/sys/fs/cryptsetup-luks/cryptsetup-luks.SlackBuild
+++ b/sys/fs/cryptsetup-luks/cryptsetup-luks.SlackBuild
@@ -17,6 +17,7 @@
 # slackbuild for cryptsetup-luks, by Silvio Rhatto
 # requires:  
 # tested: cryptsetup-luks-1.0.6
+# 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:="sys/fs/cryptsetup-luks"}
 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
@@ -145,9 +148,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