]> gitweb.fluxo.info Git - slackbuilds.git/commitdiff
expat: adding patches/expat
authorrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Wed, 26 Aug 2009 19:55:10 +0000 (19:55 +0000)
committerrhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Wed, 26 Aug 2009 19:55:10 +0000 (19:55 +0000)
git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2236 370017ae-e619-0410-ac65-c121f96126d4

patches/expat/Manifest [new file with mode: 0644]
patches/expat/expat-2.0.1.diff [new file with mode: 0644]
patches/expat/expat.SlackBuild [new file with mode: 0644]

diff --git a/patches/expat/Manifest b/patches/expat/Manifest
new file mode 100644 (file)
index 0000000..83837cd
--- /dev/null
@@ -0,0 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST expat-2.0.1.tar.gz 446456 MD5 ee8b492592568805593f81f8cdf2a04c RMD160 d31bcb152adaff9e358968be1ea901e1b4ed3b2f SHA1 663548c37b996082db1f2f2c32af060d7aa15c2d SHA256 847660b4df86e707c9150e33cd8c25bc5cd828f708c7418e765e3e983a2e5e93 SHA512 934a2999923eda9296f838a4846daac4bdd47929ec6e81f8104d5a54adc0dae348c8fc38f07eb61ad30fa27fc8b76e2549550b94fb90ea14851492eab9a332e2
+MKBUILD expat.mkbuild 4927 MD5 e05c42c414258a8dcc7c03189eb39069 RMD160 ce7927aa6fe6728faa7f5481ae59c29e66a19de8 SHA1 6a1c6a0d0ca1384f95b7a816624b420237c71d45 SHA256 2c05c2c609fa1bf607198f1ec8b3dc45d779e424c215083b2531e69b9326cacc SHA512 5bf1027f8f65fa733f471334fc410958118806ecc49579108e744068885700187c15d4c62434a80d2d803d5690c28e61a80fc34b224197074bfefcfb4cfa9e76
+PATCH expat-2.0.1.diff 970 MD5 42f03f74d9c0e67e4706b41cc76aed75 RMD160 a3e17e3b5c848295603f667d4bbb4050bc079c26 SHA1 248389819f88175b6da3f40a7982e0f96d5a7d51 SHA256 e6502ac6f178f71f497cfd8f55be70e161ab820b4a4fa5ee8786307c332806dd SHA512 25416e3bbd2b94236cbc5831b8aaa98575d236a19874e708a3770bfbad5f50ca34976c413e7d4bedc3a265c76d3d20398477bfa9f4828983ea75a93561b0591b
+SLACKBUILD expat.SlackBuild 7850 MD5 84fd346687e8da149175a23a119ca536 RMD160 03541ed7e12a24e2a17d6a2e49e2bd128f2e2125 SHA1 d9548dca28cee2f357d4d6f938f7cdf6933a3033 SHA256 de25c9ee7c97c36c076f9a7d3c92cab212aeadbf1f07042c90137d85f7dd2078 SHA512 3141ddd5fdd2c75e1fba172a5a8c9fbe09193cb7e9d0c8c3e50d80cdb8e6405eab31df6b3c5d2f69f50d4e0c6be3f6ece254d33cbe0d93433356396e214a709d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iQIcBAEBCAAGBQJKlZLgAAoJEEHL93ESzgeigzgP/RYqSFw04KdemWI+A0yela6j
+fCJO7+uHWEt8BIeX3tF++TwNk61aum5i+1oIKCP27aalIwDJZIWSXcnZWPalfOYC
+jQEV9HNZt75RxJ7aCB79yK9m3u1iFBUEBAE3BwJUjcd9xqw8uFhaM3FRzkis2zPd
+QYZc0fEZsxj/ubsBi82fYhbr7V9GyUXqK3yx3jMRQ01XZD8V5YFtMgKMxlikiS7I
+XtbPzEjkn8yuqNCQ68/J+ifdNdbf0C+AmDghzsa5zncq15n+3Eo/MfMGP0gX0mGZ
+RYTgIeRXupUzpvp3CBv/WMkPqccTAYyDvGfb/ujLlsc6UEVPVom4wtlS3v+Bn7QU
+MDXLPFcFlDr7HiJNcUNDhBPPwpC1UKbTbHor5JGYxtREwhsf1SSE7m3ldo2MEwgY
+gWjJWBU9AIrwSxdD2vmiYf4tLggoqYRpSwDsvfIGq/JuIdK8YI2ktZ2MQIMyDphB
+HABTOY9QHcOXTZoX90+UjseM50qB08hwX2hBP7r/5dTLbipHrlW8k0Tdu8h79PI2
+/IsbhEzHNqj3q5DNqC0Zswizb353hiOYEqBvUkCeBcIEr6QaMcxZTP4kjIdr8kUW
+riHapm2xN8v61t7g9cNivf8BVveQBEHFCSwyECKcK/IsF1YbzaU7wqG7iKwn5kck
+/2tMYPHTHh4E7n86qZlZ
+=zNj9
+-----END PGP SIGNATURE-----
diff --git a/patches/expat/expat-2.0.1.diff b/patches/expat/expat-2.0.1.diff
new file mode 100644 (file)
index 0000000..bb40f0a
--- /dev/null
@@ -0,0 +1,24 @@
+diff -Naur expat-2.0.1.orig/lib/xmlparse.c expat-2.0.1/lib/xmlparse.c
+--- expat-2.0.1.orig/lib/xmlparse.c    2007-05-07 23:25:35.000000000 -0300
++++ expat-2.0.1/lib/xmlparse.c 2009-08-26 16:50:55.000000000 -0300
+@@ -2563,6 +2563,8 @@
+                               (int)(dataPtr - (ICHAR *)dataBuf));
+               if (s == next)
+                 break;
++              if (ps_parsing == XML_FINISHED || ps_parsing == XML_SUSPENDED)
++                break;
+               *eventPP = s;
+             }
+           }
+diff -Naur expat-2.0.1.orig/lib/xmltok_impl.c expat-2.0.1/lib/xmltok_impl.c
+--- expat-2.0.1.orig/lib/xmltok_impl.c 2006-11-26 15:34:46.000000000 -0200
++++ expat-2.0.1/lib/xmltok_impl.c      2009-08-26 16:50:57.000000000 -0300
+@@ -1744,7 +1744,7 @@
+                        const char *end,
+                        POSITION *pos)
+ {
+-  while (ptr != end) {
++  while (ptr < end) {
+     switch (BYTE_TYPE(enc, ptr)) {
+ #define LEAD_CASE(n) \
+     case BT_LEAD ## n: \
diff --git a/patches/expat/expat.SlackBuild b/patches/expat/expat.SlackBuild
new file mode 100644 (file)
index 0000000..455aa9e
--- /dev/null
@@ -0,0 +1,248 @@
+#!/bin/bash
+#
+#  expat.SlackBuild is free software; you can redistribute
+#  it and/or modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of the License,
+#  or any later version.
+#
+#  expat.SlackBuild is distributed in the hope that it will
+#  be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  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
+#
+# slackbuild for expat, by Silvio Rhatto
+# requires:  
+# tested: expat-2.0.1
+# model: generic.mkSlackBuild $Rev: 805 $
+#
+
+# Look for slackbuildrc
+if [ -f ~/.slackbuildrc ]; then
+  source ~/.slackbuildrc
+elif [ -f /etc/slackbuildrc ]; then
+  source /etc/slackbuildrc
+fi
+
+# Set variables
+CWD="$(pwd)"
+SRC_NAME="expat"
+PKG_NAME="expat"
+ARCH=${ARCH:=i486}
+SRC_VERSION=${VERSION:=2.0.1}
+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:="patches/expat"}
+PREFIX=${PREFIX:=/usr}
+PKG_WORK="$TMP/$SRC_NAME"
+CONF_OPTIONS=${CONF_OPTIONS:=""}
+NUMJOBS=${NUMJOBS:=""}
+
+# Set system libraries' path and optmization flags based on $ARCH
+LIBDIR="$PREFIX/lib"
+
+if [ "$ARCH" = "i386" ]; then
+  SLKCFLAGS="-O2 -march=i386 -mtune=i686"
+elif [ "$ARCH" = "i486" ]; then
+  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 -fPIC"
+  LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
+fi
+
+# Set error codes (used by createpkg)
+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
+rm -rf "$PKG" 2> /dev/null
+
+# Create directories if necessary
+mkdir -p "$SRC_DIR" || exit $ERROR_MKDIR
+mkdir -p "$PKG" || exit $ERROR_MKDIR
+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://downloads.sourceforge.net/project/expat/expat/2.0.1/$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
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
+cd "$PKG_SRC"
+
+# Patch source
+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
+    patch -Np1 < "$CWD/patches/$patch" || exit $ERROR_PATCH
+  elif [ -f "$CWD/$patch.gz" ]; then
+    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
+  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
+      bzip2 -dc $SRC_DIR/$patch | patch -Np1 || exit $ERROR_PATCH
+    else
+      patch -Np1 < "$SRC_DIR/$patch" || exit $ERROR_PATCH
+    fi
+  fi
+done
+
+# Configure
+CFLAGS="$SLKCFLAGS" \
+  CXXFLAGS="$SLKCFLAGS" \
+  ./configure \
+  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
+
+# Compile
+make $NUMJOBS || exit $ERROR_MAKE
+
+# Install
+make install DESTDIR="$PKG" || exit $ERROR_INSTALL
+
+# Strip binaries
+( cd "$PKG"
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
+
+# Install documentation
+DOCS="COPYING Changes README"
+mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
+for doc in $DOCS; do
+  if [ -f "$doc" ]; then
+    cp -a $doc "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION"
+  fi
+done
+
+# Add package description (slack-desc)
+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
+# 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
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler--------------------------------------------------------|
+expat: expat
+expat:
+expat: This is Expat, a C library for parsing XML, written by James Clark.
+expat: Expat is a stream-oriented XML parser used by Python, GNOME, Xft2,
+expat: and other things.
+expat:
+expat:
+expat:
+expat:
+expat:
+expat:
+EODESC
+
+# Build the package
+cd "$PKG"
+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
+  rm -rf "$PKG_WORK" "$PKG"
+fi