From cc243f27588cf3b5a93fd665a16761cde85049b0 Mon Sep 17 00:00:00 2001 From: rhatto Date: Fri, 9 Oct 2009 20:11:13 +0000 Subject: gnome-common: updating to 2.26 (thanks x-doctor) git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2259 370017ae-e619-0410-ac65-c121f96126d4 --- gnome/base/gnome-common/Manifest | 23 ++++++ gnome/base/gnome-common/gnome-common.SlackBuild | 101 ++++++++++++++++++++---- 2 files changed, 109 insertions(+), 15 deletions(-) create mode 100644 gnome/base/gnome-common/Manifest diff --git a/gnome/base/gnome-common/Manifest b/gnome/base/gnome-common/Manifest new file mode 100644 index 00000000..c1701abc --- /dev/null +++ b/gnome/base/gnome-common/Manifest @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + +DIST gnome-common-2.26.0.tar.bz2 69278 MD5 196daa38cb21d91da1d6ec085f1e158b RMD160 788a1c6b008ad47714a5c73cdfc49d24a8d9d175 SHA1 4e3517d674a015d9b3acfefd806b933bac08f645 SHA256 f6233ee73886c5ac31890c1a9b9f216e5f14558467dea7b0a61ef3c4cf51d84d SHA512 3809590207dfea357f3c2bf1d9298372526245e2bcbfbc0784b6f5b532814f8d397cc628e88dd5e5dab634697485a037066cfd477507b46b453354d0828ff706 +MKBUILD gnome-common.mkbuild 4113 MD5 3794fd7abe5cf44ad63887058c05bedb RMD160 87ced628f97f3526746727ad4aeffdc3622f6436 SHA1 9f301bab7e771bf0be810d304b22f9340f575e82 SHA256 1ad2b86d16fae06c9ea50f1f18bc336c43ea36189aa30f8af4e1b9ec454ca2a1 SHA512 24b4cb77dd4213a1c745ae26e4dd6c8709044aafffec547a93bb2b432019ffc047ad806a9899497c771b4f1713144055ddcd8ecac998f1523822bf4a0e97fbd3 +SLACKBUILD gnome-common.SlackBuild 7349 MD5 46b08e25dd9558cbb5cf8ac84927bafc RMD160 64d389371d62748e6527c7a8cd9f72cb8de3c564 SHA1 0f3ab27f8a561801b3ce7f8d831a6f6093fd12be SHA256 fb3020ef3c0dfb4b3f2342a2537ca4c571b4d2e58dad65399c1ae5dd2faefa69 SHA512 7b1c0c2db075cdfe90aa69cb070b8f1bc7421f34d859b33d9a19a4ccbe2dc40b81bfe6e30e224211c7a008989ad01aa2ee7c6cd57d6700e262700d90ab1c8261 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQIcBAEBCAAGBQJKz5hNAAoJEEHL93ESzgeiZHAP/R59B4J5n61J8aaa19euc3oO +bYiXj+WQsoO+Trde4bP8833JlV9IIQ1nUhSpQj9yUpXuoZZRYYtlqu7ZA7mrsEMg +1GmrIlP9eB3alS64lYe9wyeINZZ5bPfcyAx2mv4tE2ErMk+5JeYmGisp9J5/IMH0 +KD4+gFH748gLcwAX1OLU+1GbbyxUXe2CFEm6bzWgRV4kSjjYICbbOAaEZ5acWOe1 +yZ1CXgRAZkDw+BDXqR2hMuK4+d0znekfRxBVqvAbWFeiFtFC8CIMe8Ir2WthfOGv +KpdScYQONQzpMmSdJhF+OVX9TdsOAnRisWj1fhOlmFR5woMiONV6dEDwo1iG85W5 +JCTHRUtp9DKUV5edw0c0X0OVYfCjsfp/IKUnHtCgT9QLMkCVVFPGpPu4ab8UJ6Lp +nWTTcCYXrUzIcJFGgjBOTCajCpMC74tXCVDOojBOUQ/7lYJjTm/Q2dAWS0ET14+A +z1QFwzZeeZhbThrItoGFfGpGqDUhkqfZYlA/3C90EbVMNnzTTEfzQMRZuRA4Vjij +95/2qPCD58QYvWA0xCYYok7vNEqbW/YVtPvU0WZRUYaMfhcD6yi22jBhtiBp8IVM +Hngn4jOZF66aIIa6LehJxnUFwc/kGPSobHFKsggJKlGrB77FxjY4UALPBjJZxE5A +W+OsjcseQRF7eEIIORsB +=f+kR +-----END PGP SIGNATURE----- diff --git a/gnome/base/gnome-common/gnome-common.SlackBuild b/gnome/base/gnome-common/gnome-common.SlackBuild index 2296305d..b26ec59c 100644 --- a/gnome/base/gnome-common/gnome-common.SlackBuild +++ b/gnome/base/gnome-common/gnome-common.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 gnome-common, by Your name # requires: -# tested: gnome-common-2.20.0 +# tested: gnome-common-2.26.0 +# model: generic.mkSlackBuild $Rev: 808 $ # # Look for slackbuildrc @@ -31,13 +32,14 @@ CWD="$(pwd)" SRC_NAME="gnome-common" PKG_NAME="gnome-common" ARCH=${ARCH:=i486} -SRC_VERSION=${VERSION:=2.20.0} +SRC_VERSION=${VERSION:=2.26.0} PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')" BUILD=${BUILD:=1initials} SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME TMP=${TMP:=/tmp} PKG=${PKG:=$TMP/package-$PKG_NAME} REPOS=${REPOS:=$TMP} +SLACKBUILD_PATH=${SLACKBUILD_PATH:="gnome/base/gnome-common"} 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,16 +81,82 @@ mkdir -p "$PKG_WORK" || exit $ERROR_MKDIR # Dowload source if necessary SRC="$SRC_NAME-$VERSION.tar.bz2" -URL="http://ftp.gnome.org/pub/gnome/sources/gnome-common/2.20/$SRC" +URL="http://ftp.gnome.org/pub/gnome/sources/gnome-common/2.26/$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" # Configure @@ -110,7 +180,7 @@ make install DESTDIR="$PKG" || exit $ERROR_INSTALL ) # Install documentation -DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING readme.*" +DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*" mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR for doc in $DOCS; do if [ -f "$doc" ]; then @@ -122,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 ':'. @@ -144,9 +214,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 -- cgit v1.2.3