monkeysphere: updating dependencies; syslog-ng: updating; cyrus-sasl: updating

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

2 files changed, 116 insertions, 22 deletions

diff --git a/app/admin/syslog-ng/Manifest b/app/admin/syslog-ng/Manifest
new file mode 100644
index 00000000..d5f9106d
--- /dev/null
+++ b/app/admin/syslog-ng/Manifest
@@ -0,0 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST syslog-ng-2.0.10.tar.gz 403808 MD5 3f96ccf13dda0b9e150e511bcffde795 RMD160 eaa0965e1c06be217265c8710cc8375843ce9f64 SHA1 c627548a4f2a85d6734935496a4ad3f378911761 SHA256 f9155bcab40b572807796348d3ee8fbef3b5ff9aad213f74a09b321ac1d5b4ef SHA512 0ab731156bb05d21e3dea8beff99e6a1bd455a3f8de7091aed75047028fcb60a89904b01398f302a7fde43bbf6f51e321d8bc7e19c76de74c4cd787476d6542e
+DIST syslog-ng_2.0.9.orig.tar.gz 214536 MD5 15b8f421fb3481e3bc660052f67a531f RMD160 2e05e36f0c84e494fb04bfd8b7e6d402e9df1bf4 SHA1 59f16fea6618312e1cf120e88b2c3351f72ef411 SHA256 c931c53324955db14831bdf33202503a04ddd7026355823a7a748bcf20e20d77 SHA512 b5b116b9fbd5d29336192c06d5f1e1b764a28135372217dceee6a1d1094bddd9028e2db4467d3ac2ad089f1e86c8b6a4a31d9a6085c1d1fb8250b4876203f5c8
+MISC rc.syslog-ng.new 639 MD5 1b9cda799bbab89661a411a7a389d9e1 RMD160 07d27200fe242a657c0842a124973d9e270c54b1 SHA1 c4b07ef3bd40de89b0cd18953f1a218d65db5efd SHA256 026dc6e5632b8fbad217d664ec91c6544ef28d3840f6e51c7b0d2d5b1c0c9572 SHA512 b4cb127ae50c97d2ebe0b11cc50ef14ad62a9ee83b39f1ae2a4392a61c598ae888bc0af161707649a30256fc0cb078ee0b9e2420834382e629820fd8f3134406
+MISC syslog-ng 233 MD5 48f9af0a64e2e42e3cb9b53c90b5b8d5 RMD160 aedbb1aafb71cad3c2dd71f23cb6519035780d06 SHA1 cc0f7adf385de11fda9240499806d53f2906f64d SHA256 9801bab49def11845019def522c4c5770ec73b34acd1ab2d724bcf3eb11517bd SHA512 b0a77412747d45f026828b810b917552e4cf5f7f91db8139d82e82bea8ad9cbd10c3d099e6c8c7d78f22e1eb144059a2927e1ce77ff1c7b6093935b690410228
+MISC syslog-ng.conf.new 6658 MD5 fc48d64845ea2b7233402793558d57ea RMD160 bab78e7415eeabcab1d4660cad3fbb2fc8fe4775 SHA1 cff159df088876130de8f9751d8270ed958d0a05 SHA256 ae0476283aa7b541518f701216fd6a64ea4a9595b9a7a881606919244d77f7e8 SHA512 baa22ad6a08da743c2697a8bddbc561da0590781e280fabbcec8c28be8d280f04f61a944e917ebdea9316ac433a5c2f747c90db46488e52d3d3310fcfc469ad6
+MKBUILD syslog-ng.mkbuild 3973 MD5 1836ce1803ed998f02694e85d95fa625 RMD160 6a8ceca169c8fe8d29966b336fcdc02d8725c2ca SHA1 b9bc0909aeee50b0d00c44e3008dd806eb768803 SHA256 b338ead713daaeefefed064fc33be0e5b8c37e006ed4da579c943b52fbce1a8b SHA512 8af6689f0fa2663301f5d71f697faf31ff7aeacbcd471b25e3ab21f21a9cdfa915145110e97b85a1816ca0732a9b4cbc31fdc630075fcbc4f9a3632bfb952fa2
+PATCH syslog-ng-anon-2.0.6.diff 10236 MD5 83ace2bab7e2db6dee44c608a0402073 RMD160 8b904dced4ec3ed87d510f1e68c8daabfdfa5403 SHA1 3f9b5424f17e14821cd218337a1d29748cd79da0 SHA256 427812a457f9c0c17d9f13c5743fa1ff4686112fe44e3255a2edbed1f6705f57 SHA512 0cccaf86fe89ec4a04a4caa629b63d0a29216284d4bfb1edc6e1f68c6981a483aa4aa1b98862686e8dde96eeb8b62db79b82d40631bd02072aadade3748daa16
+PATCH syslog-ng_2.0.9-4.1.diff.gz 35566 MD5 49a9555fd5b3ccb0f8f226892badb3f3 RMD160 7a6c7ce264eda32d8a0c5105196a2ec989248f3c SHA1 263388113ee86e2bcba59d08db9568a85f2781bf SHA256 4bb15f68c161e1abdf459ca05b332f1cc211d211cc98dbec65685a1ddb1e03ed SHA512 986daebe31d8c41976ed7dc0cf2989f01481ae78a60261bef8e86e3da0d920a1c58adf7d1957d18af657fef7bb2cb96f1f821c635d3debf74775bfe71e43df91
+SLACK-REQUIRED slack-required 82 MD5 0894d658ab0ea8963f72420e9f0aded6 RMD160 70e7fd3ad756406405e31513fa6d30c1e4a3f159 SHA1 292f72711a74657f9be2c75154cd4043784214c6 SHA256 179876f1f4b2b96cea242d888f501a2588d0e89fd40d1fb583c525618f4a42bd SHA512 c532bbb93ea466296eef3d7ebc6fe0df08116283cf1bdabdde89d72539164fbf098c2ec0c4ea2a39f1ae999b8790247d42089794c11af4401d9a3388a2c75803
+SLACKBUILD syslog-ng.SlackBuild 9840 MD5 55f0692dca4a2f3c0e54bb499f4bf878 RMD160 1c9ae89730ec53e3b2d20510d1a70b2d29c7df6a SHA1 0a7bed774a2280489c2e09e1e340c4461b9ca414 SHA256 c28f9d04887b0450a5649133dd7fa54cfd70324710a50849e29aafd5e87f355f SHA512 8c232e4e6cc788756743a5af0b05ee256ea56d87c80f1ef758a2bbea65afc368e4e85a062079a1ee8d71adfb9b8ef3b9e860f40803e13b1036c4e7ccbae35565
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKWpz3AAoJEEHL93ESzgeiRKkP/3wZJlmzjsHageNj8iQByIUt
+Q0nPV9Eend5rwfCdh6MAqB7ZJyxtaGZJTEql4P6vSoIRxnf+C68tuKQakJRgv6bz
+TRNF8c+shmci6A1QOdUKKZubutF/ksLvflFOU6YhHKR5dr+qUGP2eQ7Vu7wpUNcN
+ySDtWW2WFdO+5QL7EW2VFsS77aKn6fUzH6c05afXGGJDknoxN8UYM9sRt1j2yZCg
+kxuR6X/ACWDlA8iU9EcQU1ybTXs4JPF5wzJK1he4kXw1S4TlZ6nhwfRfFClRhKPt
+LqikeOb64cCzmxhMawUZP/BexaJu7Indvs+iXNAYPZm4lr+ggHR9fpLDws8Dkn8O
+4bsHWhblQiDK4Da7ELacSAAKyeLEJ3bgRES79pu7exIMCeJNE+uy1czGo0cjB1e8
+Tqwrm/LZpMJ+L04bhrJLH2NQyFedIAeZX6Dk2M0RXVpl/d1USo0rZ1iieHiz/7pm
+PGGpC7D52Wm31oRmQ5kITmQAJ2rCld/rj2uHaMC3CiaM8GMTH3Yozj2qInKn2eFq
+S8S7G0UOvJcwmUckXqKmB6svpn62xBtVkB4OMXBSb++mApUMz89yDZNteh9zug1l
+mWLS9Y+EgHYj2+KFClPoISj0wf2DetYxQXP4S8VWQWEFFKFoOZ814fu9dmFNV96a
+0hGNYZKqVPoc/oMQu7hI
+=m2rA
+-----END PGP SIGNATURE-----
diff --git a/app/admin/syslog-ng/syslog-ng.SlackBuild b/app/admin/syslog-ng/syslog-ng.SlackBuild
index 43eed53f..a46c6b27 100755
--- a/app/admin/syslog-ng/syslog-ng.SlackBuild
+++ b/app/admin/syslog-ng/syslog-ng.SlackBuild
@@ -15,8 +15,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 # slackbuild for syslog-ng, by Silvio Rhatto
-# requires: eventlog 
-# tested: syslog-ng-2.0.6
+# requires:  
+# tested: syslog-ng-2.0.9
+# model: generic.mkSlackBuild $Rev: 805 $
 #
 
 # Look for slackbuildrc
@@ -31,13 +32,14 @@ CWD="$(pwd)"
 SRC_NAME="syslog-ng"
 PKG_NAME="syslog-ng"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=2.0.6}
+SRC_VERSION=${VERSION:=2.0.9}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rha}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
 TMP=${TMP:=/tmp}
 PKG=${PKG:=$TMP/package-$PKG_NAME}
 REPOS=${REPOS:=$TMP}
+SLACKBUILD_PATH=${SLACKBUILD_PATH:="app/admin/syslog-ng"}
 PREFIX=${PREFIX:=/usr}
 PKG_WORK="$TMP/$SRC_NAME"
 CONF_OPTIONS=${CONF_OPTIONS:="--sysconfdir=/etc --enable-dynamic-linking"}
@@ -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
@@ -77,13 +80,79 @@ mkdir -p "$REPOS" || exit $ERROR_MKDIR
 mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR
 
 # Dowload source if necessary
-SRC="$SRC_NAME-$VERSION.tar.gz"
-URL="http://www.balabit.com/downloads/files/syslog-ng/sources/stable/src/$SRC"
+SRC="$SRC_NAME"_"$VERSION.orig.tar.gz"
+URL="http://ftp.de.debian.org/debian/pool/main/s/syslog-ng/$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
@@ -91,10 +160,11 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Patch source
-patches="syslog-ng-anon-2.0.6.diff
+patches=" http://ftp.de.debian.org/debian/pool/main/s/syslog-ng/syslog-ng_2.0.9-4.1.diff.gz
          $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,14 +181,15 @@ 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
+./autogen.sh
 CFLAGS="$SLKCFLAGS" \
   CXXFLAGS="$SLKCFLAGS" \
-  ./configure \
-  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
+    ./configure \
+      --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
 
 # Compile
 make $NUMJOBS || exit $ERROR_MAKE
@@ -243,7 +306,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