From b76270bf9e6dd375e495fec92140a79a79415d27 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 19 May 2010 08:58:23 +0000 Subject: Slackware 13.1 Wed May 19 08:58:23 UTC 2010 Slackware 13.1 x86_64 stable is released! Lots of thanks are due -- see the RELEASE_NOTES and the rest of the ChangeLog for credits. The ISOs are on their way to replication, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. We are taking pre-orders now at store.slackware.com, and offering a discount if you sign up for a subscription. Consider picking up a copy to help support the project. Thanks again to the Slackware community for testing, contributing, and generally holding us to a high level of quality. :-) Enjoy! --- source/ap/cdrtools/cdrtools.SlackBuild | 79 ++++++++++++++++++++-------------- source/ap/cdrtools/doinst.sh | 7 ++- 2 files changed, 49 insertions(+), 37 deletions(-) (limited to 'source/ap/cdrtools') diff --git a/source/ap/cdrtools/cdrtools.SlackBuild b/source/ap/cdrtools/cdrtools.SlackBuild index 49aa08c0..b72c8a13 100755 --- a/source/ap/cdrtools/cdrtools.SlackBuild +++ b/source/ap/cdrtools/cdrtools.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,12 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=2.01.01a57 +VERSION=${VERSION:-$(echo cdrtools-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-1} + ZISOFSTOOLS=1.0.8 -ARCH=${ARCH:-x86_64} NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-3} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} @@ -46,21 +55,29 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -INS_BASE=/usr make -e $NUMJOBS || exit 1 +make -e $NUMJOBS INS_BASE=/usr || exit 1 # Without this second run, cdda2wav is skipped... -INS_BASE=/usr make -e || exit 1 -INS_BASE=$PKG/usr make -e install || exit 1 +make -e INS_BASE=/usr || exit 1 +make -e install INS_BASE=/usr DEST_DIR=$PKG || exit 1 + +# I don't know why this couldn't be "/etc/cdrtools" or something, but since +# getty uses it already I'm not going to argue the point. +mv $PKG/etc/default/cdrecord $PKG/etc/default/cdrecord.new + +# These don't need to be in the package, IMHO. +rm -rf $PKG/usr/include \ + $PKG/usr/lib/profiled \ + $PKG/usr/lib/*.a \ + $PKG/usr/man/man5 + +# Next big hole? ;) (don't ship rscsi) +rm -r $PKG/usr/sbin +rm -f $PKG/etc/default/rscsi $PKG/usr/man/man1/rscsi.1 # Remove dupes: rm -rf $PKG/usr/share/doc rmdir $PKG/usr/share -# I don't know why this couldn't be "/etc/cdrtools" or something, but since -# getty uses it already I'm not going to argue the point. -mkdir -p $PKG/etc/default -cat cdrecord/cdrecord.dfl > $PKG/etc/default/cdrecord.new -cat rscsi/rscsi.dfl > $PKG/etc/default/rscsi.new - mkdir -p $PKG/usr/doc/cdrtools-$VERSION cp -a \ ABOUT AN-* BUILD CDDL* COMPILE CONTRIBUTING COPYING* Changelog \ @@ -68,7 +85,6 @@ cp -a \ $PKG/usr/doc/cdrtools-$VERSION chown -R root:root $PKG/usr/doc/cdrtools-$VERSION/* find $PKG/usr/doc/cdrtools-$VERSION -type f -exec chmod 644 {} \; - ( cd mkisofs mkdir -p $PKG/usr/doc/cdrtools-$VERSION/mkisofs @@ -87,23 +103,11 @@ find $PKG/usr/doc/cdrtools-$VERSION -type f -exec chmod 644 {} \; chown root:root $PKG/usr/doc/cdrtools-$VERSION/cdda2wav/* chmod 644 $PKG/usr/doc/cdrtools-$VERSION/cdda2wav/* ) - -# These don't need to be in the package, IMHO. -rm -rf $PKG/usr/include $PKG/usr/man/man5 $PKG/usr/man/man1/cdda2ogg.1 $PKG/usr/lib/profiled $PKG/usr/lib/*.a - -# Fix permissions: -cd $PKG -find . -type d -exec chmod 755 {} \; -chown root:root -R $PKG -find $PKG/usr/man -type f -exec chmod 644 {} \; -find $PKG/usr/man -type f -exec gzip -9 {} \; -chmod 755 $PKG/usr/bin/* - -( cd $PKG/usr/bin ; ln -sf mkisofs mkhybrid ) - -# Next big hole? ;) -rm -r $PKG/usr/sbin -rm -f $PKG/usr/doc/cdrtools-$VERSION/README.rscsi +# The entire ChangeLog is excessive for most users: +cat $PKG/usr/doc/cdrtools-$VERSION/Changelog | head -n 1000 > $PKG/usr/doc/cdrtools-$VERSION/CL +mv $PKG/usr/doc/cdrtools-$VERSION/CL $PKG/usr/doc/cdrtools-$VERSION/Changelog +cat $PKG/usr/doc/cdrtools-$VERSION/mkisofs/ChangeLog | head -n 1000 > $PKG/usr/doc/cdrtools-$VERSION/mkisofs/CL +mv $PKG/usr/doc/cdrtools-$VERSION/mkisofs/CL $PKG/usr/doc/cdrtools-$VERSION/mkisofs/ChangeLog mkdir -p $PKG/install zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh @@ -120,16 +124,25 @@ find . \ -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -./configure --prefix=/usr +CFLAGS="-O2" ./configure --prefix=/usr --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 cat mkzftree > $PKG/usr/bin/mkzftree -chmod 755 $PKG/usr/bin/mkzftree +chmod 0755 $PKG/usr/bin/mkzftree cat mkzftree.1 | gzip -9c > $PKG/usr/man/man1/mkzftree.1.gz mkdir -p $PKG/usr/doc/zisofs-tools-$ZISOFSTOOLS cp -a \ CHANGES COPYING INSTALL README zisofs.magic \ $PKG/usr/doc/zisofs-tools-$ZISOFSTOOLS +# Fix permissions: +cd $PKG +find . -type d -exec chmod 755 {} \; +chown root:root -R $PKG +find $PKG/usr/man -type f -exec chmod 644 {} \; +find $PKG/usr/man -type f -exec gzip -9 {} \; +find $PKG/usr/doc/cdrtools-$VERSION -type f -exec chmod 0644 {} \; +chmod 0755 $PKG/usr/bin/* + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/source/ap/cdrtools/doinst.sh b/source/ap/cdrtools/doinst.sh index 78d62faa..8d3d5627 100644 --- a/source/ap/cdrtools/doinst.sh +++ b/source/ap/cdrtools/doinst.sh @@ -1,14 +1,13 @@ -#!/bin/sh config() { NEW="$1" - OLD="`dirname $NEW`/`basename $NEW .new`" + OLD="$(dirname $NEW)/$(basename $NEW .new)" # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD - elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy rm $NEW fi # Otherwise, we leave the .new copy for the admin to consider... } config etc/default/cdrecord.new -config etc/default/rscsi.new + -- cgit v1.2.3