From 76951e173341ef628fe1cb89a4a4c7c65b1093aa Mon Sep 17 00:00:00 2001 From: rhatto Date: Thu, 22 Jan 2009 21:31:59 +0000 Subject: djvu: adding Manifest git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@2093 370017ae-e619-0410-ac65-c121f96126d4 --- app/text/djvu/Manifest | 23 ++++++++++ app/text/djvu/djvu.SlackBuild | 97 +++++++++++++++++++++++++++++++++++++------ 2 files changed, 107 insertions(+), 13 deletions(-) create mode 100644 app/text/djvu/Manifest (limited to 'app') diff --git a/app/text/djvu/Manifest b/app/text/djvu/Manifest new file mode 100644 index 00000000..831c6e86 --- /dev/null +++ b/app/text/djvu/Manifest @@ -0,0 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +DIST djvulibre-3.5.20.tar.gz 2416958 MD5 c94091de014b3aaf037d3d0f398d36c2 RMD160 fb755064912586585656b9701b7d98bd3019c67b SHA1 88ec94512f3f7845b42c2585f75e07a9cf147380 SHA256 d937528e10c16831d8df31893ee24da8ec2bfd9e9170671c482a1b1abfc5efc3 SHA512 e6266a16c91c8b705191b1189c2660a02d78639c4060e0f587be5588e050e5890afaf184530b081a25581f5e32f8f9a2b097088fe7bebf3ba9ba4e900bd7b32e +MKBUILD djvu.mkbuild 3452 MD5 3e3a36f1d5ddbb045741fbd968f24a28 RMD160 4eede092eea17888f5d5f207852ca2ca8280ba4c SHA1 988b44d19a654868fa0a4fde8b2e6c0e1630b62d SHA256 13af00d284a46fb92060b8629e9c5c928aea27a520a7d85c3192159a196540cc SHA512 e7f317e81c876c5bb633d314f62d4c9e79bcf28fe06dc20b356e0a2c7f00e14d5ad5bb4448944047ef707e63d7976382843d13d52812ba29cc5c1d6bd65b1850 +SLACKBUILD djvu.SlackBuild 7178 MD5 046e7bef15242c9d9988952985f4f9fc RMD160 7d08f531d83d559c9e6135abd8cad8c818a5bffc SHA1 33071f8a96251b790d842d0ae4d2e35f2fe8c949 SHA256 598e6637bd47693fd12ddad52d197d0f9a38d22404c7284fa20527226eb6e259 SHA512 ac076129df02316e865e6a455a901ac87926379f49590b57be92e81075c834afc28eea2c701ba56482e65f1ccc093d621c91dfd8087a1e0632286d64ee579116 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.9 (GNU/Linux) + +iQIcBAEBAgAGBQJJeOQ3AAoJEEHL93ESzgeiu9IP/AseB4GLxsHZGvoCBMVnSs8W +iyaWh/nVZoV1nIEXfF61PHn3vAhLns4F/RN01kOkGt/vgMNLsl22gSz3cQMi6FMR +GStpdMsysnO1FzbJvv2w3IqnDA3B4CGxBuh7jPLcUOLp9hbOmyFy9/6PMrtSTuCb +XwoTZt8yZaBucAIyWx2Kyuf4KyyT2cVFausA6mcxe1MTB9+w9jhbNySege5/JkeF +K9sA3kJXQ7qY34UXb10DM/d6+mXzXb7oWFHA/IyTBv2i8dKgslbpzftQ0MthEIbk +NSAgjPyAuIfA1I1RGQQG29m0ehb7Pfy1uRUN2OvC9TPZfSK1l+JJWErPcGa5Fc7+ +Wn0s7qswq+mHZpuYTdAY1fzNDXMvMZn9m0aT/2XxbGRFgkE+UGjMT/Ju+Ed3Smid +fimpgqv/Z/kSjKS2j/Lp+USTZJhDoq8S1hmXLulDPa5vvKKgZeobGgafX73BreL+ +T/zNmQP1Zd5evS1TVICD1qNqvox2XTkRFGwzMCXZWLYnmRvTiawsukBjzWokpAk3 +cknF26dG7qghwIIemPNaHbcfhwgP6e89TtRewTiQ8kNwKq1ilu6f8OqWb2qaOAbG +9sK0hYg/khX5r+eHDsKywrLdPyYZZ6O7uwsdQTNfpETd4vMaK1pWN0/6jhlSaXnr +8fYUA6a+1c5qPiupLYGN +=Uw5K +-----END PGP SIGNATURE----- diff --git a/app/text/djvu/djvu.SlackBuild b/app/text/djvu/djvu.SlackBuild index c3526bb8..5857e517 100755 --- a/app/text/djvu/djvu.SlackBuild +++ b/app/text/djvu/djvu.SlackBuild @@ -10,12 +10,12 @@ # 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 djvu, by Silvio Rhatto -# requires: +# requires: # tested: djvu-3.5.20 # @@ -47,16 +47,17 @@ 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 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 +65,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 @@ -83,11 +85,76 @@ 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=`ls -l | awk '/^d/ { print $8 }'` +PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`" cd "$PKG_SRC" # Configure @@ -113,15 +180,19 @@ make install DESTDIR="$PKG" || exit $ERROR_INSTALL # Install documentation DOCS="COPYING COPYRIGHT INSTALL NEWS README README_packagers README_qt4 TODO" mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR -cp -a $DOCS "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" +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 +# 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,6 +215,6 @@ cd "$PKG" makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG # Delete source and build directories if requested -if [ "$CLEANUP" == "yes" ]; then - rm -rf "$PKG_SRC" "$PKG" +if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then + rm -rf "$PKG_WORK" "$PKG" fi -- cgit v1.2.3