diff options
Diffstat (limited to 'source/l')
341 files changed, 12511 insertions, 4255 deletions
diff --git a/source/l/ConsoleKit/ConsoleKit.SlackBuild b/source/l/ConsoleKit/ConsoleKit.SlackBuild index a1f7ae50a..b3d7869d6 100755 --- a/source/l/ConsoleKit/ConsoleKit.SlackBuild +++ b/source/l/ConsoleKit/ConsoleKit.SlackBuild @@ -24,8 +24,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=ConsoleKit -VERSION=${VERSION:-0.4.3} +PKGNAM=ConsoleKit +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j6} @@ -40,7 +40,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -59,9 +59,9 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1 -cd $PRGNAM-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -73,6 +73,11 @@ find . \ # Clean up at_console compat files, bug #257761 zcat $CWD/consolekit-0.2.10-cleanup_console_tags.patch.gz | patch -p1 || exit 1 +# ck-history: don't truncate --frequent output to 8 chars +# GDM screenscrapes the output and so we need the full username. +# https://bugzilla.gnome.org/show_bug.cgi?id=650330 +zcat $CWD/ck-history-don-t-truncate-frequent-output-to-8-chars.patch.gz | patch -p1 || exit 1 + # Revert "Only set sessions to be is-local=true if set by a trusted party" # http://cgit.freedesktop.org/ConsoleKit/commit/?id=4f88228f31a63c026c424a92827f26ad7535275c # Here are the bug reports: @@ -92,7 +97,7 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --with-pid-file=/var/run/ConsoleKit/pid \ --enable-docbook-docs \ --enable-pam-module=no \ @@ -119,18 +124,38 @@ chmod 0755 $PKG/etc/rc.d/rc.consolekit.new find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION + AUTHORS COPYING HACKING INSTALL NEWS README TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/ConsoleKit/ck-history-don-t-truncate-frequent-output-to-8-chars.patch b/source/l/ConsoleKit/ck-history-don-t-truncate-frequent-output-to-8-chars.patch new file mode 100644 index 000000000..89b11d086 --- /dev/null +++ b/source/l/ConsoleKit/ck-history-don-t-truncate-frequent-output-to-8-chars.patch @@ -0,0 +1,28 @@ +From 803cbdfbd78b66b17ead45b1584d65a258e785bf Mon Sep 17 00:00:00 2001 +From: Ray Strode <rstrode@redhat.com> +Date: Tue, 24 May 2011 20:58:10 -0400 +Subject: [PATCH] ck-history: don't truncate --frequent output to 8 chars + +GDM screenscrapes the output and so we need the full username. + +https://bugzilla.gnome.org/show_bug.cgi?id=650330 +--- + tools/ck-history.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/ck-history.c b/tools/ck-history.c +index d02caaa..85d9e6f 100644 +--- a/tools/ck-history.c ++++ b/tools/ck-history.c +@@ -804,7 +804,7 @@ generate_report_frequent (int uid, + data = user_counts->data; + + username = get_user_name_for_uid (data->uid); +- g_print ("%-8.8s %u\n", username, data->count); ++ g_print ("%-8s %u\n", username, data->count); + g_free (data); + user_counts = g_list_delete_link (user_counts, user_counts); + g_free (username); +-- +1.7.9.4 + diff --git a/source/l/GConf/GConf.SlackBuild b/source/l/GConf/GConf.SlackBuild new file mode 100755 index 000000000..2e1b1b5db --- /dev/null +++ b/source/l/GConf/GConf.SlackBuild @@ -0,0 +1,129 @@ +#!/bin/sh + +# Slackware build script for GConf + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=GConf +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j6} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# This should be fixed in 3.2.6, I hope - it's a bug exposed by glib-2.32 +sed -i '/INTROSPECTION_SCANNER_ARGS/s#$# -lgmodule-2.0#' gconf/Makefile.in + +# --disable-orbit means we use DBUS for IPC +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --with-gtk=2.0 \ + --disable-static \ + --enable-debug=no \ + --disable-orbit \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mv $PKG/etc/gconf/2/path $PKG/etc/gconf/2/path.new +mv $PKG/etc/gconf/2/evoldap.conf $PKG/etc/gconf/2/evoldap.conf.new + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a AUTHORS COPYING* NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz | sed "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX}," > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/hal/doinst.sh b/source/l/GConf/doinst.sh index a1c86cf41..e5ec93800 100644 --- a/source/l/hal/doinst.sh +++ b/source/l/GConf/doinst.sh @@ -11,13 +11,10 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -# Keep same perms on rc.hald.new: -if [ -e etc/rc.d/rc.hald ]; then - cp -a etc/rc.d/rc.hald etc/rc.d/rc.hald.new.incoming - cat etc/rc.d/rc.hald.new > etc/rc.d/rc.hald.new.incoming - mv etc/rc.d/rc.hald.new.incoming etc/rc.d/rc.hald.new -fi +config etc/gconf/2/path.new +config etc/gconf/2/evoldap.conf.new -config etc/rc.d/rc.hald.new -config etc/dbus-1/system.d/hal.conf.new +if [ -x /usr/bin/gio-querymodules ]; then + chroot . /usr/bin/gio-querymodules @LIBDIR@/gio/modules/ >/dev/null 2>&1 +fi diff --git a/source/l/GConf/slack-desc b/source/l/GConf/slack-desc new file mode 100644 index 000000000..7994adc8f --- /dev/null +++ b/source/l/GConf/slack-desc @@ -0,0 +1,19 @@ +# 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-------------------------------------------------------| +GConf: GConf (GNOME configuration library) +GConf: +GConf: GConf is a configuration database system designed for the GNOME project +GConf: and applications based on GTK+. It is conceptually similar to the +GConf: Windows registry. +GConf: +GConf: For information, see: http://projects.gnome.org/gconf/ +GConf: +GConf: +GConf: +GConf: diff --git a/source/l/M2Crypto/M2Crypto.SlackBuild b/source/l/M2Crypto/M2Crypto.SlackBuild index 583b12f18..40b710c39 100755 --- a/source/l/M2Crypto/M2Crypto.SlackBuild +++ b/source/l/M2Crypto/M2Crypto.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=M2Crypto VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/PyQt/PyQt.SlackBuild b/source/l/PyQt/PyQt.SlackBuild index 9fa6d065b..eb21945a2 100755 --- a/source/l/PyQt/PyQt.SlackBuild +++ b/source/l/PyQt/PyQt.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for PyQt # Copyright 2008 Aleksandar Samardzic <asamardzic@gmail.com> -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,23 +26,27 @@ # Modified by Robby Workman <rworkman@slackware.com> # Modified by Eric Hameleers <alien@slackware.com> -VERSION=${VERSION:-4.8.1} -BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} +PKGNAM=PyQt +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-3} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-PyQt +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -50,6 +54,8 @@ elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" else SLKCFLAGS="-O2" fi @@ -57,12 +63,12 @@ fi rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf PyQt-x11-gpl-$VERSION -tar xvf $CWD/PyQt-x11-gpl-$VERSION.tar.?z* || exit 1 -cd PyQt-x11-gpl-$VERSION || exit 1 +rm -rf $PKGNAM-x11-gpl-$VERSION +tar xvf $CWD/$PKGNAM-x11-gpl-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-x11-gpl-$VERSION || exit 1 # Fix phonon detection: -zcat $CWD/PyQt.phonon.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/$PKGNAM.phonon.diff.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ @@ -85,14 +91,14 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/PyQt-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT README THANKS doc/* \ - $PKG/usr/doc/PyQt-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/PyQt-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz diff --git a/source/l/PyQt/PyQt.info b/source/l/PyQt/PyQt.info deleted file mode 100644 index f127e6d9c..000000000 --- a/source/l/PyQt/PyQt.info +++ /dev/null @@ -1,2 +0,0 @@ -HOMEPAGE="http://www.riverbankcomputing.co.uk/software/pyqt/" -DOWNLOAD="http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-4.5.4.tar.gz" diff --git a/source/l/PyQt/slack-desc b/source/l/PyQt/slack-desc index 4e01c51ac..f713c87c3 100644 --- a/source/l/PyQt/slack-desc +++ b/source/l/PyQt/slack-desc @@ -11,9 +11,9 @@ PyQt: PyQt: PyQt is a set of Python bindings for Trolltech's Qt application PyQt: framework and runs on all platforms supported by Qt. PyQt: +PyQt: Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/ PyQt: PyQt: PyQt: PyQt: -PyQt: Homepage: http://www.riverbankcomputing.co.uk/software/PyQt/ PyQt: diff --git a/source/l/QScintilla/QScintilla.SlackBuild b/source/l/QScintilla/QScintilla.SlackBuild index b36235872..4f24655e0 100755 --- a/source/l/QScintilla/QScintilla.SlackBuild +++ b/source/l/QScintilla/QScintilla.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for QScintilla # Copyright 2008 Robby Workman <rworkman@slackware.com> Northport, AL, USA -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,39 +24,50 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=QScintilla -VERSION=${VERSION:-$(echo ${PKGNAM}-gpl-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-3} + +NUMJOBS=${NUMJOBS:--j7} CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-QScintilla +PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf QScintilla-gpl-$VERSION -tar xvf $CWD/QScintilla-gpl-$VERSION.tar.?z* || exit 1 -cd QScintilla-gpl-$VERSION || exit 1 +rm -rf $PKGNAM-gpl-$VERSION +tar xvf $CWD/$PKGNAM-gpl-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-gpl-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -66,7 +77,7 @@ find . \ cd Qt4 qmake -o Makefile qscintilla.pro - make + make $NUMJOBS make install INSTALL_ROOT=$PKG # Yes, we'll spam the dev environment so we can build the other parts. make install @@ -74,27 +85,34 @@ cd - cd designer-Qt4 qmake -o Makefile designer.pro - make + make $NUMJOBS make install INSTALL_ROOT=$PKG cd - cd Python python configure.py -p 4 - make + make $NUMJOBS make install DESTDIR=$PKG cd - +# Link the shared libraries into /usr/lib${LIBDIRSUFFIX}: +( cd $PKG/usr/lib${LIBDIRSUFFIX} + for file in qt/lib/*.so* ; do + ln -sf $file . + done +) + find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/QScintilla-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ *GPL* COPYING* NEWS OPENSOURCE-NOTICE.TXT README* doc/html-Qt4 doc/Scintilla \ - $PKG/usr/doc/QScintilla-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/QScintilla-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/akonadi/akonadi.SlackBuild b/source/l/akonadi/akonadi.SlackBuild index ebaa32acd..fe36ea406 100755 --- a/source/l/akonadi/akonadi.SlackBuild +++ b/source/l/akonadi/akonadi.SlackBuild @@ -26,24 +26,22 @@ PKGNAM=akonadi VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -53,16 +51,23 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -71,6 +76,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# If we do not specify the correct QT_PLUGINS_DIR, then the application +# decides on using $QT4DIR/qt4/plugins instead. mkdir -p build cd build cmake \ @@ -80,7 +87,9 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ - -DINSTALL_QSQLITE_IN_QT_PREFIX=ON \ + -DMAN_INSTALL_DIR=/usr/man \ + -DINSTALL_QSQLITE_IN_QT_PREFIX:BOOL=ON \ + -DQT_PLUGINS_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins \ .. make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/akonadi/slack-desc b/source/l/akonadi/slack-desc index a120cebf0..d0c26bb62 100644 --- a/source/l/akonadi/slack-desc +++ b/source/l/akonadi/slack-desc @@ -13,7 +13,7 @@ akonadi: and meta data providing concurrent read, write, and query access. akonadi: It will provide a unique desktop wide object identification and akonadi: retrieval. akonadi: +akonadi: Homepage: http://www.kdepim.org/akonadi/ akonadi: akonadi: -akonadi: Homepage: http://www.kdepim.org/akonadi/ akonadi: diff --git a/source/l/alsa-lib/alsa-lib.SlackBuild b/source/l/alsa-lib/alsa-lib.SlackBuild index f15c96310..b93a905dd 100755 --- a/source/l/alsa-lib/alsa-lib.SlackBuild +++ b/source/l/alsa-lib/alsa-lib.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is diff --git a/source/l/alsa-oss/alsa-oss.SlackBuild b/source/l/alsa-oss/alsa-oss.SlackBuild index ccfe38682..b6073ebcc 100755 --- a/source/l/alsa-oss/alsa-oss.SlackBuild +++ b/source/l/alsa-oss/alsa-oss.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -59,7 +59,7 @@ fi cd $TMP rm -rf alsa-oss-$VERSION -tar xjvf $CWD/alsa-oss-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/alsa-oss-$VERSION.tar.?z* || exit 1 cd alsa-oss-$VERSION chown -R root:root . find . \ diff --git a/source/l/apr-util/apr-util.SlackBuild b/source/l/apr-util/apr-util.SlackBuild index b25d55c46..7faff6dfe 100755 --- a/source/l/apr-util/apr-util.SlackBuild +++ b/source/l/apr-util/apr-util.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=${VERSION:-$(echo apr-util-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -90,7 +90,7 @@ CFLAGS="$SLKCFLAGS" \ --with-ldap \ --disable-static \ --without-sqlite2 \ - $ARCH-slackware-linux + --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 make dox || exit 1 diff --git a/source/l/apr-util/apr-util.url b/source/l/apr-util/apr-util.url new file mode 100644 index 000000000..264a63c01 --- /dev/null +++ b/source/l/apr-util/apr-util.url @@ -0,0 +1,2 @@ +http://www.apache.org/dist/apr/apr-util-1.3.11.tar.bz2 +http://www.apache.org/dist/apr/apr-util-1.3.11.tar.bz2.asc diff --git a/source/l/apr/apr.SlackBuild b/source/l/apr/apr.SlackBuild index 2463b5a29..193f602b9 100755 --- a/source/l/apr/apr.SlackBuild +++ b/source/l/apr/apr.SlackBuild @@ -22,7 +22,7 @@ VERSION=${VERSION:-$(echo apr-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -62,9 +62,6 @@ rm -rf apr-$VERSION tar xvf $CWD/apr-$VERSION.tar.bz2 || exit 1 cd apr-$VERSION -# Patch to fix aliasing issue exposed by gcc-4.5.1: -zcat $CWD/apr.apr_ring.h.gcc45.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/apr/apr.apr_ring.h.gcc45.diff b/source/l/apr/apr.apr_ring.h.gcc45.diff deleted file mode 100644 index c298cf4e8..000000000 --- a/source/l/apr/apr.apr_ring.h.gcc45.diff +++ /dev/null @@ -1,13 +0,0 @@ ---- ./include/apr_ring.h.orig 2008-06-01 19:12:00.000000000 -0500 -+++ ./include/apr_ring.h 2011-02-12 13:17:41.000000000 -0600 -@@ -90,8 +90,8 @@ - */ - #define APR_RING_HEAD(head, elem) \ - struct head { \ -- struct elem *next; \ -- struct elem *prev; \ -+ struct elem * volatile next; \ -+ struct elem * volatile prev; \ - } - - /** diff --git a/source/l/apr/apr.url b/source/l/apr/apr.url new file mode 100644 index 000000000..1ff6c6775 --- /dev/null +++ b/source/l/apr/apr.url @@ -0,0 +1,2 @@ +http://www.apache.org/dist/apr/apr-1.4.6.tar.bz2 +http://www.apache.org/dist/apr/apr-1.4.6.tar.bz2.asc diff --git a/source/l/atk/atk.SlackBuild b/source/l/atk/atk.SlackBuild index f6d41da66..e06714662 100755 --- a/source/l/atk/atk.SlackBuild +++ b/source/l/atk/atk.SlackBuild @@ -59,7 +59,7 @@ rm -rf $PKG mkdir -p $TMP $PKG/usr cd $TMP rm -rf atk-$VERSION -tar xvf $CWD/atk-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/atk-$VERSION.tar.xz || exit 1 cd atk-$VERSION chown -R root:root . find . \ @@ -82,13 +82,34 @@ make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -#gzip -9 $PKG/usr/man/man?/* +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/atk-$VERSION cp -a \ AUTHORS COPYING* NEWS README* TODO \ $PKG/usr/doc/atk-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/attica/attica.SlackBuild b/source/l/attica/attica.SlackBuild index 3c12a7d5e..9b9868557 100755 --- a/source/l/attica/attica.SlackBuild +++ b/source/l/attica/attica.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2009, 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,24 +22,24 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-0.1.4} +PKGNAM=attica +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-attica - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -49,17 +49,24 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf attica-$VERSION -tar xvf $CWD/attica-$VERSION.tar.?z* || exit 1 -cd attica-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -87,13 +94,13 @@ cd - find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/attica-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a AUTHORS* COPYING* README* \ - $PKG/usr/doc/attica-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/attica-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/attica/slack-desc b/source/l/attica/slack-desc index 40e293f5b..18aedb8eb 100644 --- a/source/l/attica/slack-desc +++ b/source/l/attica/slack-desc @@ -13,7 +13,7 @@ attica: specification for the Open Collaboration Services API version 1.4. attica: It grants easy access to the services such as querying information attica: about persons and contents. attica: +attica: Homepage: http://www.kde.org attica: attica: -attica: Homepage: http://www.kde.org attica: diff --git a/source/l/babl/babl.SlackBuild b/source/l/babl/babl.SlackBuild index 3f5e6c5d0..5f87a9512 100755 --- a/source/l/babl/babl.SlackBuild +++ b/source/l/babl/babl.SlackBuild @@ -70,15 +70,16 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# I'm not sure about --enable-sse CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --docdir=/usr/doc/babl-$VERSION \ - --enable-mmx \ - --disable-sse \ --build=$ARCH-slackware-linux + # Trust defaults: + #--enable-mmx \ + #--disable-sse \ + #--enable-introspection \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG @@ -91,6 +92,14 @@ cp -a \ AUTHORS COPYING* INSTALL NEWS README* TODO \ $PKG/usr/doc/babl-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild index 3f38c9851..006c18971 100755 --- a/source/l/boost/boost.SlackBuild +++ b/source/l/boost/boost.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2007, 2008 Eric Hameleers, Eindhoven, NL -# Copyright 2007-2008 Heinz Wiesinger +# Copyright 2007, 2008, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2007-2008, 2012 Heinz Wiesinger, Amsterdam, NL # Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -24,28 +24,29 @@ # bjam-build system mostly taken from SlackBuild by Eric Hameleers # Script modified by Robby Workman - no copyright claims or added terms +# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port. + PKGNAM=boost VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d _)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} + +ICU=${ICU:-no} +PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone +NUMJOBS=${NUMJOBS:-" -j7 "} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-boost - -ICU=${ICU:-no} -PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -55,11 +56,18 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-boost + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -84,28 +92,19 @@ PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]') PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION" # First build bjam, the boost build system: -cd tools/build/v2/engine/src +cd tools/build/v2/engine CFLAGS="$SLKCFLAGS -fno-strict-aliasing" CC=gcc ./build.sh cc cd - -BJAM=$(find tools/build/v2/engine/src/ -name bjam -a -type f) +BJAM=$(find tools/build/v2/engine/ -name bjam -a -type f) # Create build subdirectory mkdir obj -# Change the build options from 'minimal' to what we want, since adding -# "-sBUILD=<optimization>speed <inlining>full <threading>single/multi -# <link>shared <runtime-link>shared" to $BJAM command no longer seems to work. -FLAGS="<threading>multi <threading>single <optimization>speed <inlining>full" -sed -i "s/ <threading>multi/ $FLAGS/" Jamroot -# Disable static libraries ( the only software that *requires* the static libs, -# is Microsoft's CW compiler (CW or Comega is an experimental language which -# extends C# ) -sed -i "s/<link>shared <link>static/<link>shared/" Jamroot - # Next, we build boost using bjam $BJAM \ release \ + $NUMJOBS \ "-sNO_COMPRESSION=0" \ "-sZLIB_INCLUDE=/usr/include" \ "-sZLIB_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \ @@ -113,12 +112,16 @@ $BJAM \ "-sBZIP2_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \ "-sEXPAT_INCLUDE=/usr/include" \ "-sEXPAT_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \ - --toolset=gcc \ --layout=system \ --builddir=obj \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --build-type=minimal \ + toolset=gcc \ + variant=release \ + link=shared \ + threading=multi \ + runtime-link=shared \ $PYTHON_FLAGS \ stage @@ -129,12 +132,16 @@ $BJAM \ release \ "-sEXPAT_INCLUDE=/usr/include" \ "-sEXPAT_LIBPATH=/usr/lib${LIBDIRSUFFIX}" \ - --toolset=gcc \ --layout=system \ --builddir=obj \ --prefix=$PKG/usr \ --libdir=$PKG/usr/lib${LIBDIRSUFFIX} \ --build-type=minimal \ + toolset=gcc \ + variant=release \ + link=shared \ + threading=multi \ + runtime-link=shared \ $PYTHON_FLAGS \ install diff --git a/source/l/chmlib/slack-desc b/source/l/chmlib/slack-desc index 9ec72723e..8d84d6343 100644 --- a/source/l/chmlib/slack-desc +++ b/source/l/chmlib/slack-desc @@ -11,7 +11,7 @@ chmlib: chmlib: chmlib is a small library designed for accessing MS ITSS files. chmlib: The ITSS file format is used for Microsoft Html Help files (.chm), chmlib: which have been the predominant medium for software documentation -chmlib: from Microsoft during the past several years, having superceded +chmlib: from Microsoft during the past several years, having superseded chmlib: the previously used .hlp file format. chmlib: chmlib: Homepage: http://www.jedrea.com/chmlib/ diff --git a/source/l/clucene/clucene.SlackBuild b/source/l/clucene/clucene.SlackBuild index e72989fa4..8600cccff 100755 --- a/source/l/clucene/clucene.SlackBuild +++ b/source/l/clucene/clucene.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007 Heinz Wiesinger <hmwiesinger@gmx.at> -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,6 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Robby Workman <rworkman@slackware.com> +# Modified by Eric Hameleers <alien@slackware.com> # No added terms or copyright claims @@ -29,22 +30,20 @@ PKGNAM=clucene VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:--j7} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-clucene - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -54,17 +53,28 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-clucene + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf clucene-core-$VERSION -tar xvf $CWD/clucene-core-$VERSION.tar.?z* || exit 1 -cd clucene-core-$VERSION || exit 1 +rm -rf clucene-src-$VERSION +tar xvf $CWD/clucene-src-$VERSION.tar.?z* || exit 1 +cd clucene-src-$VERSION || exit 1 + +# Fix the pkgconfig file by adding required shared library. +cat $CWD/clucene.pkgconfig.patch | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -72,25 +82,27 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --build=$ARCH-slackware-linux - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd .. find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/usr/doc/clucene-$VERSION cp -a \ - APACHE.license AUTHORS COPYING* HACKING INSTALL \ + APACHE.license AUTHORS COPYING* ChangeLog INSTALL \ LGPL.license NEWS README* REQUESTS \ $PKG/usr/doc/clucene-$VERSION diff --git a/source/l/clucene/clucene.info b/source/l/clucene/clucene.info deleted file mode 100644 index 52478e81b..000000000 --- a/source/l/clucene/clucene.info +++ /dev/null @@ -1,5 +0,0 @@ -PRGNAM="clucene" -VERSION="0.9.20" -HOMEPAGE="http://clucene.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/clucene/clucene-core-0.9.20.tar.bz2" -MD5SUM="da62da5d23b17fec67f0175481a603b8" diff --git a/source/l/clucene/clucene.pkgconfig.patch b/source/l/clucene/clucene.pkgconfig.patch new file mode 100644 index 000000000..61444799c --- /dev/null +++ b/source/l/clucene/clucene.pkgconfig.patch @@ -0,0 +1,24 @@ +From 7be4a19b76d98260cf95040a47935f854a4ba7a4 Mon Sep 17 00:00:00 2001 +From: Valentin Rusu <kde@rusu.info> +Date: Sat, 17 Dec 2011 13:47:58 +0100 +Subject: [PATCH] Fix .pc file by adding clucene-shared library + +--- + src/core/libclucene-core.pc.cmake | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/core/libclucene-core.pc.cmake b/src/core/libclucene-core.pc.cmake +index 0152b25..d421e70 100644 +--- a/src/core/libclucene-core.pc.cmake ++++ b/src/core/libclucene-core.pc.cmake +@@ -6,6 +6,6 @@ includedir=${prefix}/include:${prefix}/include/CLucene/ext + Name: libclucene + Description: CLucene - a C++ search engine, ported from the popular Apache Lucene + Version: @CLUCENE_VERSION_MAJOR@.@CLUCENE_VERSION_MINOR@.@CLUCENE_VERSION_REVISION@.@CLUCENE_VERSION_PATCH@ +-Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core ++Libs: -L${prefix}/@LIB_DESTINATION@/ -lclucene-core -lclucene-shared + Cflags: -I${prefix}/include -I${prefix}/include/CLucene/ext + ~ +-- +1.7.8 + diff --git a/source/l/clucene/slack-desc b/source/l/clucene/slack-desc index 5d1d1a277..4d20e0ad5 100644 --- a/source/l/clucene/slack-desc +++ b/source/l/clucene/slack-desc @@ -1,3 +1,10 @@ +# 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----------------------------------------------------| clucene: clucene (Text-Search Engine) clucene: diff --git a/source/l/db44/db44.SlackBuild b/source/l/db44/db44.SlackBuild index 7d5c49c28..58aa279ac 100755 --- a/source/l/db44/db44.SlackBuild +++ b/source/l/db44/db44.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=4.4.20 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -117,6 +117,14 @@ EOF ln -sf db44 db4 ) +# Rename binaries to avoid overlap: +( cd $PKG/usr/bin + mv berkeley_db_svc berkeley_db44_svc + for file in db_* ; do + mv $file db44_`echo $file | cut -f 2- -d _` + done +) + # Put libdb-4.4.so into /lib${LIBDIRSUFFIX} since it might be needed # before /usr is mounted (eg, nsswitch.conf can be set up to # use databases instead of flat files) diff --git a/source/l/db48/db48.SlackBuild b/source/l/db48/db48.SlackBuild new file mode 100755 index 000000000..2a6c29eb1 --- /dev/null +++ b/source/l/db48/db48.SlackBuild @@ -0,0 +1,143 @@ +#!/bin/sh + +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=db48 +VERSION=4.8.30 +BUILD=${BUILD:-2} + +NUMJOBS=${NUMJOBS:--j7} + +# 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} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf db-$VERSION +tar xvf $CWD/db-$VERSION.tar.xz +cd db-$VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +rm -rf build-dir +mkdir build-dir +cd build-dir +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +../dist/configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --enable-shared \ + --enable-cxx \ + --enable-compat185 \ + --disable-test \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make -i install DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Remove WAY TOO LARGE (and misplaced) docs: +# This can be fixed with "docdir=/usr/doc/$PKGNAM-$VERSION" passed to make +# but there's not really a good reason to do that given they'll be removed +rm -rf $PKG/usr/docs +mkdir -p $PKG/usr/doc/db-$VERSION +cp -a \ + ../LICENSE ../README \ + $PKG/usr/doc/db-$VERSION +cat << EOF > $PKG/usr/doc/db-$VERSION/README-DOCS + + For a ton of additional documentation (too large to include + here) on writing source code that uses libdb$PKGNAM, please see + the original source tarball db-$VERSION.tar.xz, which can be found + on Oracle's web site: + + http://www.oracle.com/technetwork/products/berkeleydb/overview/index.html + +EOF + +# Move include files: +( cd $PKG/usr/include + mkdir $PKGNAM + mv *.h $PKGNAM + for file in $PKGNAM/* ; do + ln -sf $file . + done +) + +# Put libdb-4.8.so into /lib${LIBDIRSUFFIX} since it might be needed +# before /usr is mounted (eg, nsswitch.conf can be set up to +# use databases instead of flat files) +mkdir -p $PKG/lib${LIBDIRSUFFIX} +mv $PKG/usr/lib${LIBDIRSUFFIX}/libdb-4.8.so $PKG/lib${LIBDIRSUFFIX}/libdb-4.8.so +( cd $PKG/usr/lib${LIBDIRSUFFIX} + ln -sf /lib${LIBDIRSUFFIX}/libdb-4.8.so . +) + +# Some things might look for these libraries by other names. +( cd $PKG/usr/lib${LIBDIRSUFFIX} + ln -sf libdb-4.8.a libdb-4.a + ln -sf libdb-4.8.a libdb4.a + ln -sf libdb-4.8.a libdb.a + ln -sf libdb_cxx-4.8.a libdb_cxx-4.a + ln -sf libdb_cxx-4.8.a libdb_cxx.a + ln -sf libdb-4.8.so libdb4.so + ln -sf libdb-4.8.so libdb.so +) + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/db48/slack-desc b/source/l/db48/slack-desc new file mode 100644 index 000000000..e792b8606 --- /dev/null +++ b/source/l/db48/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +db48: db4 (Berkeley database library version 4.8.x) +db48: +db48: The Berkeley Database (Berkeley DB) library provides embedded database +db48: support for both traditional and client/server applications. +db48: +db48: This package should be installed if compatibility is needed with +db48: databases created with the Berkeley DB version 4.8.x. +db48: +db48: +db48: +db48: diff --git a/source/l/dbus-glib/dbus-glib.SlackBuild b/source/l/dbus-glib/dbus-glib.SlackBuild index e0c7d35b1..e4dd8b56c 100755 --- a/source/l/dbus-glib/dbus-glib.SlackBuild +++ b/source/l/dbus-glib/dbus-glib.SlackBuild @@ -87,7 +87,20 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -gzip -9 $PKG/usr/man/man?/*.? +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ @@ -97,6 +110,14 @@ cp -a \ ln -s ../../share/gtk-doc/html/dbus-glib/ html ) +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/dbus-python/dbus-python.SlackBuild b/source/l/dbus-python/dbus-python.SlackBuild index a9ff5e5b7..4b3b374b8 100755 --- a/source/l/dbus-python/dbus-python.SlackBuild +++ b/source/l/dbus-python/dbus-python.SlackBuild @@ -23,8 +23,8 @@ # http://dbus.freedesktop.org/releases/dbus-python/ -PRGNAM=dbus-python -VERSION=${VERSION:-0.83.1} +PKGNAM=dbus-python +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -41,7 +41,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -60,9 +60,9 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1 -cd $PRGNAM-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -77,7 +77,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --enable-shared=yes \ --enable-static=no \ --build=$ARCH-slackware-linux \ @@ -90,14 +90,22 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* INSTALL NEWS README* \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/desktop-file-utils/desktop-file-utils.SlackBuild b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild index 8beccbd5b..ef558c653 100755 --- a/source/l/desktop-file-utils/desktop-file-utils.SlackBuild +++ b/source/l/desktop-file-utils/desktop-file-utils.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=desktop-file-utils VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/source/l/djvulibre/djvulibre.SlackBuild b/source/l/djvulibre/djvulibre.SlackBuild index 373bcc040..9d2f6762c 100755 --- a/source/l/djvulibre/djvulibre.SlackBuild +++ b/source/l/djvulibre/djvulibre.SlackBuild @@ -57,9 +57,9 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 -rm -rf $PKGNAM-$VERSION +rm -rf $PKGNAM-$VERSION || rm -rf $PKGNAM-$(echo $VERSION | rev | cut -f 2- -d . | rev) tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 +cd $PKGNAM-$VERSION || cd $PKGNAM-$(echo $VERSION | rev | cut -f 2- -d . | rev) || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -85,6 +85,7 @@ CXXFLAGS="$SLKCFLAGS" \ --with-qt=/usr/lib${LIBDIRSUFFIX}/qt \ --build=$ARCH-slackware-linux +make clean || exit 1 make depend || exit 1 make || exit 1 # This isn't fully compatible with threaded make make install DESTDIR=$PKG || exit 1 diff --git a/source/l/ebook-tools/ebook-tools.SlackBuild b/source/l/ebook-tools/ebook-tools.SlackBuild index 690d71def..162693f9e 100755 --- a/source/l/ebook-tools/ebook-tools.SlackBuild +++ b/source/l/ebook-tools/ebook-tools.SlackBuild @@ -23,24 +23,20 @@ PKGNAM=ebook-tools -VERSION=${VERSION:-0.1.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-${PKGNAM} -rm -rf $PKG -mkdir -p $TMP $PKG - # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -53,11 +49,20 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-${PKGNAM} +rm -rf $PKG +mkdir -p $TMP $PKG + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 diff --git a/source/l/ebook-tools/ebook-tools.paths.diff b/source/l/ebook-tools/ebook-tools.paths.diff index 3752b1069..7f857b036 100644 --- a/source/l/ebook-tools/ebook-tools.paths.diff +++ b/source/l/ebook-tools/ebook-tools.paths.diff @@ -1,12 +1,10 @@ -diff -ur ebook-tools-0.1.1/src/libepub/CMakeLists.txt ebook-tools-0.1.1.rmhardcoded/src/libepub/CMakeLists.txt ---- ebook-tools-0.1.1/src/libepub/CMakeLists.txt 2008-06-07 20:20:14.000000000 +0100 -+++ ebook-tools-0.1.1.rmhardcoded/src/libepub/CMakeLists.txt 2008-12-15 02:59:58.621077025 +0000 +--- ebook-tools-0.2.1/src/libepub/CMakeLists.txt.orig 2010-09-13 21:31:53.000000000 +0200 ++++ ebook-tools-0.2.1/src/libepub/CMakeLists.txt 2010-12-09 14:11:39.751653250 +0100 @@ -4,5 +4,5 @@ - set_target_properties (epub PROPERTIES VERSION 0.1.1 SOVERSION 0) + set_target_properties (epub PROPERTIES VERSION 0.2.1 SOVERSION 0) -install ( TARGETS epub RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib ) --install ( FILES epub.h epub_shared.h DESTINATION include ) +-install ( FILES epub.h epub_shared.h epub_version.h DESTINATION include ) +install ( TARGETS epub RUNTIME DESTINATION bin LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR} ) -+install ( FILES epub.h epub_shared.h DESTINATION ${INCLUDE_INSTALL_DIR} ) - ++install ( FILES epub.h epub_shared.h epub_version.h DESTINATION ${INCLUDE_INSTALL_DIR} ) diff --git a/source/l/ebook-tools/slack-desc b/source/l/ebook-tools/slack-desc index abb2ef883..374d507b4 100644 --- a/source/l/ebook-tools/slack-desc +++ b/source/l/ebook-tools/slack-desc @@ -10,10 +10,10 @@ ebook-tools: ebook-tools (access and convert various ebook file formats) ebook-tools: ebook-tools: Tools for accessing and converting various ebook file formats. ebook-tools: +ebook-tools: Home page: http://sourceforge.net/projects/ebook-tools/ ebook-tools: ebook-tools: ebook-tools: ebook-tools: ebook-tools: -ebook-tools: Home page: http://sourceforge.net/projects/ebook-tools/ ebook-tools: diff --git a/source/l/exiv2/exiv2.SlackBuild b/source/l/exiv2/exiv2.SlackBuild index 6d910a09e..6131dc022 100755 --- a/source/l/exiv2/exiv2.SlackBuild +++ b/source/l/exiv2/exiv2.SlackBuild @@ -95,16 +95,16 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ mkdir -p $PKG/usr/doc/exiv2-$VERSION cp -a \ - COPYING* README \ - doc/{templates,COPYING-XMPSDK,README-XMP,cmd.txt,cmdxmp.txt} \ + COPYING* README* \ + doc/{COPYING-XMPSDK,README-XMP,cmd.txt,cmdxmp.txt} \ $PKG/usr/doc/exiv2-$VERSION # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then +if [ -r doc/ChangeLog ]; then DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog + cat doc/ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r doc/ChangeLog $DOCSDIR/ChangeLog fi mkdir -p $PKG/install diff --git a/source/l/fftw/slack-desc b/source/l/fftw/slack-desc index 22a1130c2..f1fcfe34f 100644 --- a/source/l/fftw/slack-desc +++ b/source/l/fftw/slack-desc @@ -12,7 +12,7 @@ fftw: FFTW is a free collection of fast C routines for computing the fftw: Discrete Fourier Transform in one or more dimensions. It includes fftw: complex, real, symmetric, and parallel transforms, and can handle fftw: arbitrary array sizes efficiently. FFTW is typically faster than -fftw: other publically-available FFT implementations, and is even +fftw: other publicly-available FFT implementations, and is even fftw: competitive with vendor-tuned libraries. fftw: fftw: Homepage: http://www.fftw.org/ diff --git a/source/l/freetype/freetype.SlackBuild b/source/l/freetype/freetype.SlackBuild index 33b75a970..127351170 100755 --- a/source/l/freetype/freetype.SlackBuild +++ b/source/l/freetype/freetype.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=freetype -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -59,7 +59,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf freetype-$VERSION -tar xvf $CWD/freetype-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/freetype-$VERSION.tar.xz || exit 1 cd freetype-$VERSION chown -R root:root . diff --git a/source/l/fribidi/fribidi.SlackBuild b/source/l/fribidi/fribidi.SlackBuild index 5c8cd086d..0d42095a6 100755 --- a/source/l/fribidi/fribidi.SlackBuild +++ b/source/l/fribidi/fribidi.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=fribidi VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -61,6 +61,9 @@ cd $TMP rm -rf fribidi-$VERSION tar xvf $CWD/fribidi-$VERSION.tar.?z* || exit 1 cd fribidi-$VERSION + +zcat $CWD/fribidi.glib.h.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . -perm 777 -exec chmod 755 {} \; find . -perm 775 -exec chmod 755 {} \; @@ -69,14 +72,35 @@ chown -R root:root . CFLAGS="$SLKCFLAGS" \ ./configure --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --disable-static \ --with-pic make $NUMJOBS || exit 1 make install DESTDIR=$PKG + ( 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 ) -strip -g $PKG/usr/lib/libfribidi.a + +# Remove any zero length man pages: +find $PKG/usr/man/ -type f -empty -delete + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + mkdir -p $PKG/usr/doc/fribidi-$VERSION cp -a \ AUTHORS COPYING* NEWS README* THANKS TODO \ diff --git a/source/l/fribidi/fribidi.glib.h.diff b/source/l/fribidi/fribidi.glib.h.diff new file mode 100644 index 000000000..34caeb69b --- /dev/null +++ b/source/l/fribidi/fribidi.glib.h.diff @@ -0,0 +1,76 @@ +diff -u -r fribidi-0.19.2.orig/charset/fribidi-char-sets.c fribidi-0.19.2/charset/fribidi-char-sets.c +--- fribidi-0.19.2.orig/charset/fribidi-char-sets.c 2006-01-30 21:23:12.000000000 -0600 ++++ fribidi-0.19.2/charset/fribidi-char-sets.c 2012-07-17 23:14:53.602120679 -0500 +@@ -114,7 +114,7 @@ + }; + + #if FRIBIDI_USE_GLIB+0 +-# include <glib/gstrfuncs.h> ++# include <glib.h> + # define fribidi_strcasecmp g_ascii_strcasecmp + #else /* !FRIBIDI_USE_GLIB */ + static char +diff -u -r fribidi-0.19.2.orig/lib/common.h fribidi-0.19.2/lib/common.h +--- fribidi-0.19.2.orig/lib/common.h 2008-04-08 16:38:23.000000000 -0500 ++++ fribidi-0.19.2/lib/common.h 2012-07-17 23:15:14.106120553 -0500 +@@ -57,7 +57,7 @@ + # define SIZEOF_VOID_P GLIB_SIZEOF_VOID_P + # endif /* !SIZEOF_VOID_P */ + # ifndef __FRIBIDI_DOC +-# include <glib/gmem.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # ifndef fribidi_malloc + # define fribidi_malloc g_try_malloc +@@ -65,12 +65,12 @@ + # endif /* !fribidi_malloc */ + # ifndef fribidi_assert + # ifndef __FRIBIDI_DOC +-# include <glib/gmessages.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define fribidi_assert g_assert + # endif /* !fribidi_assert */ + # ifndef __FRIBIDI_DOC +-# include <glib/gmacros.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # ifndef FRIBIDI_BEGIN_STMT + # define FRIBIDI_BEGIN_STMT G_STMT_START { +diff -u -r fribidi-0.19.2.orig/lib/fribidi-common.h fribidi-0.19.2/lib/fribidi-common.h +--- fribidi-0.19.2.orig/lib/fribidi-common.h 2007-04-05 11:13:24.000000000 -0500 ++++ fribidi-0.19.2/lib/fribidi-common.h 2012-07-17 23:15:30.546121341 -0500 +@@ -62,7 +62,7 @@ + + #if FRIBIDI_USE_GLIB+0 + # ifndef __FRIBIDI_DOC +-# include <glib/gmacros.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define FRIBIDI_BEGIN_DECLS G_BEGIN_DECLS + # define FRIBIDI_END_DECLS G_END_DECLS +diff -u -r fribidi-0.19.2.orig/lib/fribidi-types.h fribidi-0.19.2/lib/fribidi-types.h +--- fribidi-0.19.2.orig/lib/fribidi-types.h 2006-01-30 21:23:13.000000000 -0600 ++++ fribidi-0.19.2/lib/fribidi-types.h 2012-07-17 23:16:00.010122775 -0500 +@@ -40,8 +40,7 @@ + + #if FRIBIDI_USE_GLIB+0 + # ifndef __FRIBIDI_DOC +-# include <glib/gtypes.h> +-# include <glib/gunicode.h> ++# include <glib.h> + # endif /* !__FRIBIDI_DOC */ + # define FRIBIDI_INT8_LOCAL gint8 + # define FRIBIDI_INT16_LOCAL gint16 +diff -u -r fribidi-0.19.2.orig/lib/mem.h fribidi-0.19.2/lib/mem.h +--- fribidi-0.19.2.orig/lib/mem.h 2006-01-30 21:23:13.000000000 -0600 ++++ fribidi-0.19.2/lib/mem.h 2012-07-17 23:15:43.522121977 -0500 +@@ -42,7 +42,7 @@ + #if FRIBIDI_USE_GLIB+0 + + #ifndef __FRIBIDI_DOC +-# include <glib/gmem.h> ++# include <glib.h> + #endif /* !__FRIBIDI_DOC */ + + #define FriBidiMemChunk GMemChunk diff --git a/source/l/gamin/fix-double-lock-in-inotify-helper-c.patch b/source/l/gamin/fix-double-lock-in-inotify-helper-c.patch new file mode 100644 index 000000000..8d2ef2d3f --- /dev/null +++ b/source/l/gamin/fix-double-lock-in-inotify-helper-c.patch @@ -0,0 +1,21 @@ +diff -rupN gamin-0.1.10/server/inotify-helper.c gamin-0.1.10-new/server/inotify-helper.c +--- gamin-0.1.10/server/inotify-helper.c 2008-11-12 21:45:28.000000000 +0100 ++++ gamin-0.1.10-new/server/inotify-helper.c 2012-02-02 23:11:47.247757385 +0100 +@@ -127,9 +127,6 @@ ih_sub_add (ih_sub_t * sub) + gboolean + ih_sub_cancel (ih_sub_t * sub) + { +- G_LOCK(inotify_lock); +- +- + if (!sub->cancelled) + { + IH_W("cancelling %s\n", sub->pathname); +@@ -140,7 +137,6 @@ ih_sub_cancel (ih_sub_t * sub) + sub_list = g_list_remove (sub_list, sub); + } + +- G_UNLOCK(inotify_lock); + return TRUE; + } + diff --git a/source/l/gamin/gamin.SlackBuild b/source/l/gamin/gamin.SlackBuild index 9eb379190..fb51e9254 100755 --- a/source/l/gamin/gamin.SlackBuild +++ b/source/l/gamin/gamin.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=gamin VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -62,7 +62,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -70,6 +70,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# https://bugzilla.redhat.com/show_bug.cgi?id=786170 +zcat $CWD/fix-double-lock-in-inotify-helper-c.patch.gz | patch -p1 --verbose || exit 1 + +# Fix a build error with newer toolchain +zcat $CWD/no_g_const_return.patch.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/gamin/no_g_const_return.patch b/source/l/gamin/no_g_const_return.patch new file mode 100644 index 000000000..f8430a79b --- /dev/null +++ b/source/l/gamin/no_g_const_return.patch @@ -0,0 +1,44 @@ +--- ./server/gam_node.h.orig 2007-07-04 15:36:49.000000000 +0200 ++++ ./server/gam_node.h 2011-08-26 01:49:59.504423790 +0200 +@@ -58,7 +58,7 @@ + void gam_node_set_is_dir (GamNode *node, + gboolean is_dir); + +-G_CONST_RETURN char *gam_node_get_path (GamNode *node); ++const char *gam_node_get_path (GamNode *node); + + GList *gam_node_get_subscriptions (GamNode *node); + +--- ./server/gam_subscription.h.orig 2007-07-04 15:36:49.000000000 +0200 ++++ ./server/gam_subscription.h 2011-08-26 01:49:59.504423790 +0200 +@@ -21,7 +21,7 @@ + + int gam_subscription_get_reqno (GamSubscription *sub); + +-G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); ++const char *gam_subscription_get_path (GamSubscription *sub); + + GamListener *gam_subscription_get_listener (GamSubscription *sub); + +--- ./server/gam_node.c.orig 2007-07-04 15:36:49.000000000 +0200 ++++ ./server/gam_node.c 2011-08-26 01:49:59.504423790 +0200 +@@ -122,7 +122,7 @@ + * it has finished with the string. If it must keep it longer, it + * should makes its own copy. The returned string must not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_node_get_path(GamNode * node) + { + g_assert(node); +--- ./server/gam_subscription.c.orig 2007-07-04 15:36:49.000000000 +0200 ++++ ./server/gam_subscription.c 2011-08-26 01:49:59.504423790 +0200 +@@ -141,7 +141,7 @@ + * @param sub the GamSubscription + * @returns The path being monitored. It should not be freed. + */ +-G_CONST_RETURN char * ++const char * + gam_subscription_get_path(GamSubscription * sub) + { + if (sub == NULL) diff --git a/source/l/gcr/doinst.sh b/source/l/gcr/doinst.sh new file mode 100644 index 000000000..e9e235924 --- /dev/null +++ b/source/l/gcr/doinst.sh @@ -0,0 +1,20 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x usr/bin/gtk-update-icon-cache ]; then + chroot . /usr/bin/gtk-update-icon-cache /usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + +if [ -e usr/share/glib-2.0/schemas ]; then + if [ -x /usr/bin/glib-compile-schemas ]; then + /usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas >/dev/null 2>&1 + fi +fi + diff --git a/source/l/gcr/gcr.SlackBuild b/source/l/gcr/gcr.SlackBuild new file mode 100755 index 000000000..f46e43aa7 --- /dev/null +++ b/source/l/gcr/gcr.SlackBuild @@ -0,0 +1,112 @@ +#!/bin/sh + +# Slackware build script for gcr + +# Copyright 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=gcr +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-schemas-compile \ + --disable-update-mime \ + --disable-update-icon-cache \ + --disable-debug \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* HACKING INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/gcr/slack-desc b/source/l/gcr/slack-desc new file mode 100644 index 000000000..2cddcf476 --- /dev/null +++ b/source/l/gcr/slack-desc @@ -0,0 +1,19 @@ +# 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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +gcr: gcr (crypto library and ui for gnome-keyring) +gcr: +gcr: GCR is a library for displaying certificates and crypto UI accessing +gcr: key stores. It also provides the viewer for crypto files on the GNOME +gcr: desktop. +gcr: +gcr: GCK is a library for accessing PKCS#11 modules like smart cards, in a +gcr: (G)object oriented way. +gcr: +gcr: +gcr: diff --git a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild index 3978a04b9..4f4c1f440 100755 --- a/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild +++ b/source/l/gdk-pixbuf2/gdk-pixbuf2.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gdk-pixbuf -# Copyright 2010 Robby Workman, Northport, Alabama, USA +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA # Copyright 2010, 2011 Patrick Volkerding, Sebeka, Minnesota, USA # All rights reserved. # @@ -25,7 +25,7 @@ PKGNAM=gdk-pixbuf VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -83,7 +83,8 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-introspection \ + --enable-introspection \ + --with-x11 \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -115,14 +116,34 @@ chmod 0755 $PKG/usr/bin/update-gdk-pixbuf-loaders find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* INSTALL NEWS README* \ $PKG/usr/doc/$PKGNAM-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh diff --git a/source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders b/source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders index b19d3680f..5848db838 100644 --- a/source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders +++ b/source/l/gdk-pixbuf2/update-gdk-pixbuf-loaders @@ -21,6 +21,10 @@ case "$host" in /usr/bin/gdk-pixbuf-query-loaders-64 --update-cache # Check for x86_64 multilib: if ls -d /etc/gtk-2.0/i?86* 1> /dev/null 2> /dev/null ; then + for d in $(ls -d /etc/pango/i?86*); do + mlhost=$(basename $d) + break + done if [ -x /usr/bin/gdk-pixbuf-query-loaders-32 ]; then if [ "$1" = "--verbose" ]; then echo "Updating gdk-pixbuf.loaders for ${mlhost}:" diff --git a/source/l/gegl/gegl.SlackBuild b/source/l/gegl/gegl.SlackBuild index d0d299111..5cf8e63b3 100755 --- a/source/l/gegl/gegl.SlackBuild +++ b/source/l/gegl/gegl.SlackBuild @@ -68,7 +68,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# I'm not sure about --enable-sse CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -76,10 +75,12 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/gegl-$VERSION \ --enable-gtk-doc \ --disable-docs \ - --enable-mmx \ - --disable-sse \ --build=$ARCH-slackware-linux || exit 1 +# Trust defaults: +# --enable-mmx \ +# --disable-sse \ + make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/gegl/slack-desc b/source/l/gegl/slack-desc index 0d7e598b7..75eea8ad7 100644 --- a/source/l/gegl/slack-desc +++ b/source/l/gegl/slack-desc @@ -11,7 +11,7 @@ gegl: gegl: GEGL (Generic Graphics Library) is a graph based image processing gegl: framework. gegl: -gegl: GEGL provides infratructure to do demand based cached non destructive +gegl: GEGL provides infrastructure to do demand based cached non destructive gegl: image editing on larger than RAM buffers. Through babl it provides gegl: support for a wide range of color models and pixel storage formats for gegl: input and output. diff --git a/source/l/glade3/glade3.SlackBuild b/source/l/glade3/glade3.SlackBuild new file mode 100755 index 000000000..02af4f3d4 --- /dev/null +++ b/source/l/glade3/glade3.SlackBuild @@ -0,0 +1,108 @@ +#!/bin/sh + +# Slackware build script for glade3 + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=glade3 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-scrollkeeper \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/glade3/slack-desc b/source/l/glade3/slack-desc new file mode 100644 index 000000000..f31e2ebe5 --- /dev/null +++ b/source/l/glade3/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +glade3: glade3 (Glade UI Designer version 3) +glade3: +glade3: Glade is a RAD tool to enable quick and easy development of user +glade3: interfaces for the GTK+ toolkit and the GNOME desktop environment. +glade3: The user interfaces designed in Glade are saved as XML, and by using +glade3: the GtkBuilder GTK+ object these can be loaded by applications +glade3: dynamically as needed. +glade3: +glade3: Homepage: http://glade.gnome.org/ +glade3: +glade3: diff --git a/source/l/glib-networking/doinst.sh b/source/l/glib-networking/doinst.sh new file mode 100644 index 000000000..f5c4850f7 --- /dev/null +++ b/source/l/glib-networking/doinst.sh @@ -0,0 +1,4 @@ +if [ -x /usr/bin/gio-querymodules ]; then + chroot . /usr/bin/gio-querymodules @LIBDIR@/gio/modules/ >/dev/null 2>&1 +fi + diff --git a/source/l/glib-networking/glib-networking.SlackBuild b/source/l/glib-networking/glib-networking.SlackBuild new file mode 100755 index 000000000..7281774e0 --- /dev/null +++ b/source/l/glib-networking/glib-networking.SlackBuild @@ -0,0 +1,121 @@ +#!/bin/sh + +# Slackware build script for glib-networking + +# Copyright 2011, 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=glib-networking +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j6} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --enable-static=no \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz | sed "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX}," > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/glib-networking/slack-desc b/source/l/glib-networking/slack-desc new file mode 100644 index 000000000..d06e69254 --- /dev/null +++ b/source/l/glib-networking/slack-desc @@ -0,0 +1,19 @@ +# 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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +glib-networking: glib-networking (network-related giomodules for glib) +glib-networking: +glib-networking: This package contains network-related giomodules for glib. +glib-networking: +glib-networking: +glib-networking: +glib-networking: +glib-networking: +glib-networking: +glib-networking: +glib-networking: diff --git a/source/l/glib2/doinst.sh b/source/l/glib2/doinst.sh index 95b61fff3..a14f9606c 100644 --- a/source/l/glib2/doinst.sh +++ b/source/l/glib2/doinst.sh @@ -26,6 +26,7 @@ for file in etc/profile.d/libglib2.csh.new etc/profile.d/libglib2.sh.new ; do config $file done -# Try to run this. If it fails, no biggie. +# Try to run these. If they fail, no biggie. chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/ 1> /dev/null 2> /dev/null +chroot . /usr/bin/gio-querymodules @LIBDIR@/gio/modules/ 1> /dev/null 2> /dev/null diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild index 2cf57f5e3..09e453e6d 100755 --- a/source/l/glib2/glib2.SlackBuild +++ b/source/l/glib2/glib2.SlackBuild @@ -90,10 +90,20 @@ mv $PKG/etc/profile.d/libglib2.sh $PKG/etc/profile.d/libglib2.sh.new find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/glib-$VERSION cp -a \ @@ -111,7 +121,7 @@ fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +zcat $CWD/doinst.sh.gz | sed "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX}," > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n --prepend $TMP/glib2-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/glibc/doinst.sh-glibc b/source/l/glibc/doinst.sh-glibc index 427723c2c..1b3e03e3e 100644 --- a/source/l/glibc/doinst.sh-glibc +++ b/source/l/glibc/doinst.sh-glibc @@ -111,43 +111,43 @@ rm -f etc/profile.d/glibc.sh.new # In case there's no ldconfig, make the links manually: if [ ! -x /sbin/ldconfig ]; then ( cd lib ; rm -rf libnss_nis.so.2 ) -( cd lib ; ln -sf libnss_nis-2.13.so libnss_nis.so.2 ) +( cd lib ; ln -sf libnss_nis-2.15.so libnss_nis.so.2 ) ( cd lib ; rm -rf libm.so.6 ) -( cd lib ; ln -sf libm-2.13.so libm.so.6 ) +( cd lib ; ln -sf libm-2.15.so libm.so.6 ) ( cd lib ; rm -rf libnss_files.so.2 ) -( cd lib ; ln -sf libnss_files-2.13.so libnss_files.so.2 ) +( cd lib ; ln -sf libnss_files-2.15.so libnss_files.so.2 ) ( cd lib ; rm -rf libresolv.so.2 ) -( cd lib ; ln -sf libresolv-2.13.so libresolv.so.2 ) +( cd lib ; ln -sf libresolv-2.15.so libresolv.so.2 ) ( cd lib ; rm -rf libnsl.so.1 ) -( cd lib ; ln -sf libnsl-2.13.so libnsl.so.1 ) +( cd lib ; ln -sf libnsl-2.15.so libnsl.so.1 ) ( cd lib ; rm -rf libutil.so.1 ) -( cd lib ; ln -sf libutil-2.13.so libutil.so.1 ) +( cd lib ; ln -sf libutil-2.15.so libutil.so.1 ) ( cd lib ; rm -rf libnss_compat.so.2 ) -( cd lib ; ln -sf libnss_compat-2.13.so libnss_compat.so.2 ) +( cd lib ; ln -sf libnss_compat-2.15.so libnss_compat.so.2 ) ( cd lib ; rm -rf libthread_db.so.1 ) ( cd lib ; ln -sf libthread_db-1.0.so libthread_db.so.1 ) ( cd lib ; rm -rf libnss_hesiod.so.2 ) -( cd lib ; ln -sf libnss_hesiod-2.13.so libnss_hesiod.so.2 ) +( cd lib ; ln -sf libnss_hesiod-2.15.so libnss_hesiod.so.2 ) ( cd lib ; rm -rf libanl.so.1 ) -( cd lib ; ln -sf libanl-2.13.so libanl.so.1 ) +( cd lib ; ln -sf libanl-2.15.so libanl.so.1 ) ( cd lib ; rm -rf libcrypt.so.1 ) -( cd lib ; ln -sf libcrypt-2.13.so libcrypt.so.1 ) +( cd lib ; ln -sf libcrypt-2.15.so libcrypt.so.1 ) ( cd lib ; rm -rf libBrokenLocale.so.1 ) -( cd lib ; ln -sf libBrokenLocale-2.13.so libBrokenLocale.so.1 ) +( cd lib ; ln -sf libBrokenLocale-2.15.so libBrokenLocale.so.1 ) ( cd lib ; rm -rf ld-linux.so.2 ) -( cd lib ; ln -sf ld-2.13.so ld-linux.so.2 ) +( cd lib ; ln -sf ld-2.15.so ld-linux.so.2 ) ( cd lib ; rm -rf libdl.so.2 ) -( cd lib ; ln -sf libdl-2.13.so libdl.so.2 ) +( cd lib ; ln -sf libdl-2.15.so libdl.so.2 ) ( cd lib ; rm -rf libnss_dns.so.2 ) -( cd lib ; ln -sf libnss_dns-2.13.so libnss_dns.so.2 ) +( cd lib ; ln -sf libnss_dns-2.15.so libnss_dns.so.2 ) ( cd lib ; rm -rf libpthread.so.0 ) -( cd lib ; ln -sf libpthread-2.13.so libpthread.so.0 ) +( cd lib ; ln -sf libpthread-2.15.so libpthread.so.0 ) ( cd lib ; rm -rf libnss_nisplus.so.2 ) -( cd lib ; ln -sf libnss_nisplus-2.13.so libnss_nisplus.so.2 ) +( cd lib ; ln -sf libnss_nisplus-2.15.so libnss_nisplus.so.2 ) ( cd lib ; rm -rf libc.so.6 ) -( cd lib ; ln -sf libc-2.13.so libc.so.6 ) +( cd lib ; ln -sf libc-2.15.so libc.so.6 ) ( cd lib ; rm -rf librt.so.1 ) -( cd lib ; ln -sf librt-2.13.so librt.so.1 ) +( cd lib ; ln -sf librt-2.15.so librt.so.1 ) fi # More links: diff --git a/source/l/glibc/doinst.sh-glibc-solibs b/source/l/glibc/doinst.sh-glibc-solibs index adcb4131c..f6e41a96d 100644 --- a/source/l/glibc/doinst.sh-glibc-solibs +++ b/source/l/glibc/doinst.sh-glibc-solibs @@ -91,41 +91,41 @@ rm -f etc/profile.d/glibc.sh.new # In case there's no ldconfig, make the links manually: if [ ! -x /sbin/ldconfig ]; then ( cd lib ; rm -rf libnss_nis.so.2 ) -( cd lib ; ln -sf libnss_nis-2.13.so libnss_nis.so.2 ) +( cd lib ; ln -sf libnss_nis-2.15.so libnss_nis.so.2 ) ( cd lib ; rm -rf libm.so.6 ) -( cd lib ; ln -sf libm-2.13.so libm.so.6 ) +( cd lib ; ln -sf libm-2.15.so libm.so.6 ) ( cd lib ; rm -rf libnss_files.so.2 ) -( cd lib ; ln -sf libnss_files-2.13.so libnss_files.so.2 ) +( cd lib ; ln -sf libnss_files-2.15.so libnss_files.so.2 ) ( cd lib ; rm -rf libresolv.so.2 ) -( cd lib ; ln -sf libresolv-2.13.so libresolv.so.2 ) +( cd lib ; ln -sf libresolv-2.15.so libresolv.so.2 ) ( cd lib ; rm -rf libnsl.so.1 ) -( cd lib ; ln -sf libnsl-2.13.so libnsl.so.1 ) +( cd lib ; ln -sf libnsl-2.15.so libnsl.so.1 ) ( cd lib ; rm -rf libutil.so.1 ) -( cd lib ; ln -sf libutil-2.13.so libutil.so.1 ) +( cd lib ; ln -sf libutil-2.15.so libutil.so.1 ) ( cd lib ; rm -rf libnss_compat.so.2 ) -( cd lib ; ln -sf libnss_compat-2.13.so libnss_compat.so.2 ) +( cd lib ; ln -sf libnss_compat-2.15.so libnss_compat.so.2 ) ( cd lib ; rm -rf libthread_db.so.1 ) ( cd lib ; ln -sf libthread_db-1.0.so libthread_db.so.1 ) ( cd lib ; rm -rf libnss_hesiod.so.2 ) -( cd lib ; ln -sf libnss_hesiod-2.13.so libnss_hesiod.so.2 ) +( cd lib ; ln -sf libnss_hesiod-2.15.so libnss_hesiod.so.2 ) ( cd lib ; rm -rf libanl.so.1 ) -( cd lib ; ln -sf libanl-2.13.so libanl.so.1 ) +( cd lib ; ln -sf libanl-2.15.so libanl.so.1 ) ( cd lib ; rm -rf libcrypt.so.1 ) -( cd lib ; ln -sf libcrypt-2.13.so libcrypt.so.1 ) +( cd lib ; ln -sf libcrypt-2.15.so libcrypt.so.1 ) ( cd lib ; rm -rf libBrokenLocale.so.1 ) -( cd lib ; ln -sf libBrokenLocale-2.13.so libBrokenLocale.so.1 ) +( cd lib ; ln -sf libBrokenLocale-2.15.so libBrokenLocale.so.1 ) ( cd lib ; rm -rf ld-linux.so.2 ) -( cd lib ; ln -sf ld-2.13.so ld-linux.so.2 ) +( cd lib ; ln -sf ld-2.15.so ld-linux.so.2 ) ( cd lib ; rm -rf libdl.so.2 ) -( cd lib ; ln -sf libdl-2.13.so libdl.so.2 ) +( cd lib ; ln -sf libdl-2.15.so libdl.so.2 ) ( cd lib ; rm -rf libnss_dns.so.2 ) -( cd lib ; ln -sf libnss_dns-2.13.so libnss_dns.so.2 ) +( cd lib ; ln -sf libnss_dns-2.15.so libnss_dns.so.2 ) ( cd lib ; rm -rf libpthread.so.0 ) -( cd lib ; ln -sf libpthread-2.13.so libpthread.so.0 ) +( cd lib ; ln -sf libpthread-2.15.so libpthread.so.0 ) ( cd lib ; rm -rf libnss_nisplus.so.2 ) -( cd lib ; ln -sf libnss_nisplus-2.13.so libnss_nisplus.so.2 ) +( cd lib ; ln -sf libnss_nisplus-2.15.so libnss_nisplus.so.2 ) ( cd lib ; rm -rf libc.so.6 ) -( cd lib ; ln -sf libc-2.13.so libc.so.6 ) +( cd lib ; ln -sf libc-2.15.so libc.so.6 ) ( cd lib ; rm -rf librt.so.1 ) -( cd lib ; ln -sf librt-2.13.so librt.so.1 ) +( cd lib ; ln -sf librt-2.15.so librt.so.1 ) fi diff --git a/source/l/glibc/glibc-2.14-reexport-rpc-interface.patch b/source/l/glibc/glibc-2.14-reexport-rpc-interface.patch new file mode 100644 index 000000000..a0a381624 --- /dev/null +++ b/source/l/glibc/glibc-2.14-reexport-rpc-interface.patch @@ -0,0 +1,26 @@ +diff --git a/include/libc-symbols.h b/include/libc-symbols.h +index 67e1ca2..5e7cca5 100644 +--- a/include/libc-symbols.h ++++ b/include/libc-symbols.h +@@ -635,7 +635,7 @@ for linking") + # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs) + # define libc_hidden_def(name) hidden_def (name) + # define libc_hidden_weak(name) hidden_weak (name) +-# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version) ++# define libc_hidden_nolink(name, version) hidden_def (name) + # define libc_hidden_ver(local, name) hidden_ver (local, name) + # define libc_hidden_data_def(name) hidden_data_def (name) + # define libc_hidden_data_weak(name) hidden_data_weak (name) +diff --git a/sunrpc/Makefile b/sunrpc/Makefile +index 5134ce9..40c73d1 100644 +--- a/sunrpc/Makefile ++++ b/sunrpc/Makefile +@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \ + des_crypt.h) + headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \ + $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h +-headers = rpc/netdb.h ++headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc) + install-others = $(inst_sysconfdir)/rpc + generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \ + $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
\ No newline at end of file diff --git a/source/l/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/source/l/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch new file mode 100644 index 000000000..554b9e56c --- /dev/null +++ b/source/l/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch @@ -0,0 +1,27 @@ +From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001 +From: Andreas Schwab <schwab@redhat.com> +Date: Tue, 17 May 2011 17:42:30 +0200 +Subject: [PATCH] Reinstall NIS RPC headers + +--- + nis/Makefile | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/nis/Makefile b/nis/Makefile +index b5c9609..d2934d9 100644 +--- a/nis/Makefile ++++ b/nis/Makefile +@@ -23,9 +23,9 @@ subdir := nis + + aux := nis_hash + ++headers := $(wildcard rpcsvc/*.[hx]) + distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \ +- nisplus-parser.h nis_xdr.h nss \ +- $(wildcard rpcsvc/*.[hx]) ++ nisplus-parser.h nis_xdr.h nss + + # These are the databases available for the nis (and perhaps later nisplus) + # service. This must be a superset of the services in nss. +-- +1.7.5.4 diff --git a/source/l/glibc/glibc-2.14.1-fixes-1.patch b/source/l/glibc/glibc-2.14.1-fixes-1.patch new file mode 100644 index 000000000..b2b87f12f --- /dev/null +++ b/source/l/glibc/glibc-2.14.1-fixes-1.patch @@ -0,0 +1,159 @@ +Submitted By: Matt Burgess <matthew_at_linuxfromscratch_dot_org> +Date: 2011-10-07 +Initial Package Version: 2.14.1 +Upstream Status: From upstream +Origin: Matt Burgess +Description: Fixes Firefox crashes and a bug when programs link to + SDL. + +diff -Naur glibc-2.14.1.orig/elf/dl-close.c glibc-2.14.1/elf/dl-close.c +--- glibc-2.14.1.orig/elf/dl-close.c 2011-10-07 09:48:55.000000000 +0000 ++++ glibc-2.14.1/elf/dl-close.c 2011-10-07 19:43:10.346411120 +0000 +@@ -119,17 +119,8 @@ + if (map->l_direct_opencount > 0 || map->l_type != lt_loaded + || dl_close_state != not_pending) + { +- if (map->l_direct_opencount == 0) +- { +- if (map->l_type == lt_loaded) +- dl_close_state = rerun; +- else if (map->l_type == lt_library) +- { +- struct link_map **oldp = map->l_initfini; +- map->l_initfini = map->l_orig_initfini; +- _dl_scope_free (oldp); +- } +- } ++ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded) ++ dl_close_state = rerun; + + /* There are still references to this object. Do nothing more. */ + if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)) +diff -Naur glibc-2.14.1.orig/elf/dl-deps.c glibc-2.14.1/elf/dl-deps.c +--- glibc-2.14.1.orig/elf/dl-deps.c 2011-10-07 09:48:55.000000000 +0000 ++++ glibc-2.14.1/elf/dl-deps.c 2011-10-07 19:43:10.348432639 +0000 +@@ -478,6 +478,7 @@ + nneeded * sizeof needed[0]); + atomic_write_barrier (); + l->l_initfini = l_initfini; ++ l->l_free_initfini = 1; + } + + /* If we have no auxiliary objects just go on to the next map. */ +@@ -678,6 +679,7 @@ + l_initfini[nlist] = NULL; + atomic_write_barrier (); + map->l_initfini = l_initfini; ++ map->l_free_initfini = 1; + if (l_reldeps != NULL) + { + atomic_write_barrier (); +@@ -686,7 +688,7 @@ + _dl_scope_free (old_l_reldeps); + } + if (old_l_initfini != NULL) +- map->l_orig_initfini = old_l_initfini; ++ _dl_scope_free (old_l_initfini); + + if (errno_reason) + _dl_signal_error (errno_reason == -1 ? 0 : errno_reason, objname, +diff -Naur glibc-2.14.1.orig/elf/dl-libc.c glibc-2.14.1/elf/dl-libc.c +--- glibc-2.14.1.orig/elf/dl-libc.c 2011-10-07 09:48:55.000000000 +0000 ++++ glibc-2.14.1/elf/dl-libc.c 2011-10-07 19:43:10.352411141 +0000 +@@ -279,6 +279,10 @@ + if (! old->dont_free) + free (old); + } ++ ++ /* Free the initfini dependency list. */ ++ if (l->l_free_initfini) ++ free (l->l_initfini); + } + + if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0 +diff -Naur glibc-2.14.1.orig/elf/rtld.c glibc-2.14.1/elf/rtld.c +--- glibc-2.14.1.orig/elf/rtld.c 2011-10-07 09:48:55.000000000 +0000 ++++ glibc-2.14.1/elf/rtld.c 2011-10-07 19:43:10.355406263 +0000 +@@ -2263,6 +2263,7 @@ + lnp->dont_free = 1; + lnp = lnp->next; + } ++ l->l_free_initfini = 0; + + if (l != &GL(dl_rtld_map)) + _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0, +diff -Naur glibc-2.14.1.orig/include/link.h glibc-2.14.1/include/link.h +--- glibc-2.14.1.orig/include/link.h 2011-10-07 09:48:55.000000000 +0000 ++++ glibc-2.14.1/include/link.h 2011-10-07 19:43:10.357462703 +0000 +@@ -192,6 +192,9 @@ + during LD_TRACE_PRELINKING=1 + contains any DT_SYMBOLIC + libraries. */ ++ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be ++ freed, ie. not allocated with ++ the dummy malloc in ld.so. */ + + /* Collected information about own RPATH directories. */ + struct r_search_path_struct l_rpath_dirs; +@@ -240,9 +243,6 @@ + + /* List of object in order of the init and fini calls. */ + struct link_map **l_initfini; +- /* The init and fini list generated at startup, saved when the +- object is also loaded dynamically. */ +- struct link_map **l_orig_initfini; + + /* List of the dependencies introduced through symbol binding. */ + struct link_map_reldeps +diff -Naur glibc-2.14.1.orig/resolv/res_query.c glibc-2.14.1/resolv/res_query.c +--- glibc-2.14.1.orig/resolv/res_query.c 2011-10-07 09:48:55.000000000 +0000 ++++ glibc-2.14.1/resolv/res_query.c 2011-10-07 19:43:10.361412711 +0000 +@@ -122,6 +122,7 @@ + int *resplen2) + { + HEADER *hp = (HEADER *) answer; ++ HEADER *hp2; + int n, use_malloc = 0; + u_int oflags = statp->_flags; + +@@ -239,26 +240,25 @@ + /* __libc_res_nsend might have reallocated the buffer. */ + hp = (HEADER *) *answerp; + +- /* We simplify the following tests by assigning HP to HP2. It +- is easy to verify that this is the same as ignoring all +- tests of HP2. */ +- HEADER *hp2 = answerp2 ? (HEADER *) *answerp2 : hp; +- +- if (n < (int) sizeof (HEADER) && answerp2 != NULL +- && *resplen2 > (int) sizeof (HEADER)) ++ /* We simplify the following tests by assigning HP to HP2 or ++ vice versa. It is easy to verify that this is the same as ++ ignoring all tests of HP or HP2. */ ++ if (answerp2 == NULL || *resplen2 < (int) sizeof (HEADER)) + { +- /* Special case of partial answer. */ +- assert (hp != hp2); +- hp = hp2; ++ hp2 = hp; + } +- else if (answerp2 != NULL && *resplen2 < (int) sizeof (HEADER) +- && n > (int) sizeof (HEADER)) ++ else + { +- /* Special case of partial answer. */ +- assert (hp != hp2); +- hp2 = hp; ++ hp2 = (HEADER *) *answerp2; ++ if (n < (int) sizeof (HEADER)) ++ { ++ hp = hp2; ++ } + } + ++ /* Make sure both hp and hp2 are defined */ ++ assert((hp != NULL) && (hp2 != NULL)); ++ + if ((hp->rcode != NOERROR || ntohs(hp->ancount) == 0) + && (hp2->rcode != NOERROR || ntohs(hp2->ancount) == 0)) { + #ifdef DEBUG diff --git a/source/l/glibc/glibc-2.15-revert-c5a0802a.diff b/source/l/glibc/glibc-2.15-revert-c5a0802a.diff new file mode 100644 index 000000000..b53581b37 --- /dev/null +++ b/source/l/glibc/glibc-2.15-revert-c5a0802a.diff @@ -0,0 +1,226 @@ +diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000 ++++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000 +@@ -137,7 +137,6 @@ __pthread_cond_wait: + cmpl $PI_BIT, %eax + jne 18f + +-90: + movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx + movl %ebp, %edx + xorl %esi, %esi +@@ -151,9 +150,6 @@ __pthread_cond_wait: + sete 16(%esp) + je 19f + +- cmpl $-EAGAIN, %eax +- je 91f +- + /* Normal and PI futexes dont mix. Use normal futex functions only + if the kernel does not support the PI futex functions. */ + cmpl $-ENOSYS, %eax +@@ -398,78 +394,6 @@ __pthread_cond_wait: + #endif + call __lll_unlock_wake + jmp 11b +- +-91: +-.LcleanupSTART2: +- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to +- call it again. */ +- +- /* Get internal lock. */ +- movl $1, %edx +- xorl %eax, %eax +- LOCK +-#if cond_lock == 0 +- cmpxchgl %edx, (%ebx) +-#else +- cmpxchgl %edx, cond_lock(%ebx) +-#endif +- jz 92f +- +-#if cond_lock == 0 +- movl %ebx, %edx +-#else +- leal cond_lock(%ebx), %edx +-#endif +-#if (LLL_SHARED-LLL_PRIVATE) > 255 +- xorl %ecx, %ecx +-#endif +- cmpl $-1, dep_mutex(%ebx) +- setne %cl +- subl $1, %ecx +- andl $(LLL_SHARED-LLL_PRIVATE), %ecx +-#if LLL_PRIVATE != 0 +- addl $LLL_PRIVATE, %ecx +-#endif +- call __lll_lock_wait +- +-92: +- /* Increment the cond_futex value again, so it can be used as a new +- expected value. */ +- addl $1, cond_futex(%ebx) +- movl cond_futex(%ebx), %ebp +- +- /* Unlock. */ +- LOCK +-#if cond_lock == 0 +- subl $1, (%ebx) +-#else +- subl $1, cond_lock(%ebx) +-#endif +- je 93f +-#if cond_lock == 0 +- movl %ebx, %eax +-#else +- leal cond_lock(%ebx), %eax +-#endif +-#if (LLL_SHARED-LLL_PRIVATE) > 255 +- xorl %ecx, %ecx +-#endif +- cmpl $-1, dep_mutex(%ebx) +- setne %cl +- subl $1, %ecx +- andl $(LLL_SHARED-LLL_PRIVATE), %ecx +-#if LLL_PRIVATE != 0 +- addl $LLL_PRIVATE, %ecx +-#endif +- call __lll_unlock_wake +- +-93: +- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ +- xorl %ecx, %ecx +- movl dep_mutex(%ebx), %edi +- jmp 90b +-.LcleanupEND2: +- + .size __pthread_cond_wait, .-__pthread_cond_wait + versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, + GLIBC_2_3_2) +@@ -642,10 +566,6 @@ __condvar_w_cleanup: + .long .LcleanupEND-.Lsub_cond_futex + .long __condvar_w_cleanup-.LSTARTCODE + .uleb128 0 +- .long .LcleanupSTART2-.LSTARTCODE +- .long .LcleanupEND2-.LcleanupSTART2 +- .long __condvar_w_cleanup-.LSTARTCODE +- .uleb128 0 + .long .LcallUR-.LSTARTCODE + .long .LENDCODE-.LcallUR + .long 0 +Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig +diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S +--- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:04:12.941212837 +0000 ++++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:05:05.155229737 +0000 +@@ -23,7 +23,6 @@ + #include <lowlevelcond.h> + #include <tcb-offsets.h> + #include <pthread-pi-defines.h> +-#include <pthread-errnos.h> + + #include <kernel-features.h> + +@@ -137,14 +136,11 @@ __pthread_cond_wait: + cmpl $PI_BIT, %eax + jne 61f + +-90: + movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi + movl $SYS_futex, %eax + syscall + + movl $1, %r8d +- cmpq $-EAGAIN, %rax +- je 91f + #ifdef __ASSUME_REQUEUE_PI + jmp 62f + #else +@@ -331,70 +327,6 @@ __pthread_cond_wait: + + 13: movq %r10, %rax + jmp 14b +- +-91: +-.LcleanupSTART2: +- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to +- call it again. */ +- movq 8(%rsp), %rdi +- +- /* Get internal lock. */ +- movl $1, %esi +- xorl %eax, %eax +- LOCK +-#if cond_lock == 0 +- cmpxchgl %esi, (%rdi) +-#else +- cmpxchgl %esi, cond_lock(%rdi) +-#endif +- jz 92f +- +-#if cond_lock != 0 +- addq $cond_lock, %rdi +-#endif +- cmpq $-1, dep_mutex-cond_lock(%rdi) +- movl $LLL_PRIVATE, %eax +- movl $LLL_SHARED, %esi +- cmovne %eax, %esi +- callq __lll_lock_wait +-#if cond_lock != 0 +- subq $cond_lock, %rdi +-#endif +-92: +- /* Increment the cond_futex value again, so it can be used as a new +- expected value. */ +- incl cond_futex(%rdi) +- movl cond_futex(%rdi), %edx +- +- /* Release internal lock. */ +- LOCK +-#if cond_lock == 0 +- decl (%rdi) +-#else +- decl cond_lock(%rdi) +-#endif +- jz 93f +- +-#if cond_lock != 0 +- addq $cond_lock, %rdi +-#endif +- cmpq $-1, dep_mutex-cond_lock(%rdi) +- movl $LLL_PRIVATE, %eax +- movl $LLL_SHARED, %esi +- cmovne %eax, %esi +- /* The call preserves %rdx. */ +- callq __lll_unlock_wake +-#if cond_lock != 0 +- subq $cond_lock, %rdi +-#endif +-93: +- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */ +- xorq %r10, %r10 +- movq dep_mutex(%rdi), %r8 +- leaq cond_futex(%rdi), %rdi +- jmp 90b +-.LcleanupEND2: +- + .size __pthread_cond_wait, .-__pthread_cond_wait + versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait, + GLIBC_2_3_2) +@@ -547,15 +479,11 @@ __condvar_cleanup1: + .uleb128 .LcleanupSTART-.LSTARTCODE + .uleb128 .LcleanupEND-.LcleanupSTART + .uleb128 __condvar_cleanup1-.LSTARTCODE +- .uleb128 0 +- .uleb128 .LcleanupSTART2-.LSTARTCODE +- .uleb128 .LcleanupEND2-.LcleanupSTART2 +- .uleb128 __condvar_cleanup1-.LSTARTCODE +- .uleb128 0 ++ .uleb128 0 + .uleb128 .LcallUR-.LSTARTCODE + .uleb128 .LENDCODE-.LcallUR + .uleb128 0 +- .uleb128 0 ++ .uleb128 0 + .Lcstend: + diff --git a/source/l/glibc/glibc-2.15.nscd-race-fix.diff b/source/l/glibc/glibc-2.15.nscd-race-fix.diff new file mode 100644 index 000000000..f1323570f --- /dev/null +++ b/source/l/glibc/glibc-2.15.nscd-race-fix.diff @@ -0,0 +1,47 @@ +--- c/nscd/nscd_gethst_r.c 2012-01-01 05:16:32.000000000 -0700 ++++ c/nscd/nscd_gethst_r.c 2012-03-28 10:45:51.546600822 -0600 +@@ -101,9 +101,27 @@ libc_freeres_fn (hst_map_free) + uint32_t + __nscd_get_nl_timestamp (void) + { ++ uint32_t retval; + if (__nss_not_use_nscd_hosts != 0) + return 0; + ++ int cnt = 0; ++ /* __nscd_get_mapping can change hst_map_handle.mapped to NO_MAPPING. ++ However, __nscd_get_mapping assumes the prior value was not NO_MAPPING. ++ Thus we have to acquire the lock to prevent this thread from changing ++ hst_map_handle.mapped to NO_MAPPING while another thread is inside ++ __nscd_get_mapping. */ ++ while (__builtin_expect ++ (atomic_compare_and_exchange_val_acq (&__hst_map_handle.lock, ++ 1, 0) != 0, 0)) ++ { ++ // XXX Best number of rounds? ++ if (__builtin_expect (++cnt > 5, 0)) ++ return 0; ++ ++ atomic_delay (); ++ } ++ + struct mapped_database *map = __hst_map_handle.mapped; + + if (map == NULL +@@ -113,9 +131,14 @@ __nscd_get_nl_timestamp (void) + map = __nscd_get_mapping (GETFDHST, "hosts", &__hst_map_handle.mapped); + + if (map == NO_MAPPING) +- return 0; ++ retval = 0; ++ else ++ retval = map->head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]; ++ ++ /* Release the lock. */ ++ __hst_map_handle.lock = 0; + +- return map->head->extra_data[NSCD_HST_IDX_CONF_TIMESTAMP]; ++ return retval; + } + + diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild index d3f21ae54..0ab9e7143 100755 --- a/source/l/glibc/glibc.SlackBuild +++ b/source/l/glibc/glibc.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,9 @@ ## build glibc-$VERSION for Slackware -VERSION=${VERSION:-2.13} +VERSION=${VERSION:-2.15} CHECKOUT=${CHECKOUT:-""} -BUILD=${BUILD:-4} +BUILD=${BUILD:-7} ## Included in glibc now: ## glibc-libidn version @@ -134,6 +134,13 @@ fix_doinst() { # This is a patch function to put all glibc patches in the build script # up near the top. apply_patches() { + # Reexport the RPC interfaces that were removed in glibc-2.14. + # Sure, it's crufy code, but stuff needs it, so rather than pull the + # rug out from under you, we'll just humbly recommend that you consider + # transitioning away from it... :-) + zcat $CWD/glibc-2.14-reexport-rpc-interface.patch.gz | patch -p1 --verbose || exit 1 + # Add back the NIS and RPC headers: + zcat $CWD/glibc-2.14-reinstall-nis-rpc-headers.patch.gz | patch -p1 --verbose || exit 1 # Use old-style locale directories rather than a single (and strangely # formatted) /usr/lib/locale/locale-archive file: zcat $CWD/glibc.locale.no-archive.diff.gz | patch -p1 --verbose || exit 1 @@ -165,7 +172,17 @@ apply_patches() { # Avoid the Intel optimized asm routines for now because they break # the flash player. We'll phase this in when it's safer to do so. zcat $CWD/glibc.disable.broken.optimized.memcpy.diff.gz | patch -p1 --verbose || exit 1 - # Update the timezone information. + # Upstream fixes to avert Firefox crashes: (still applies to 2.15... probably better not to drop it) + zcat $CWD/glibc-2.14.1-fixes-1.patch.gz | patch -p1 --verbose || exit 1 + # Upstream patch to fix relocation sorting related crashes: + zcat $CWD/glibc.git-6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4.diff.gz | patch -p1 --verbose || exit 1 + # Upstream patch to fix crashes when nscd is not running: + zcat $CWD/glibc-2.15.nscd-race-fix.diff.gz | patch -p1 --verbose || exit 1 + # Revert a patch that went into 2.15 that causes NPTL related crashes: + zcat $CWD/glibc-2.15-revert-c5a0802a.diff.gz | patch -p1 --verbose || exit 1 + # Patch integer overflows in strtod*() functions: + zcat $CWD/glibc.strtod.CVE-2012-3480.diff.gz | patch -p1 --verbose || exit 1 + # Update the timezone information: ( cd timezone tar xzf $CWD/tzdata?????.tar.gz chown root:root * @@ -175,6 +192,8 @@ apply_patches() { mkdir tzcode cd tzcode tar xzf $CWD/tzcode?????.tar.gz + # A partial build is needed here to update TZVERSION in version.h: + make -i chown -R root:root . chmod 644 * cp -a *.c *.h .. @@ -256,7 +275,7 @@ CFLAGS="-g $OPTIMIZ" \ ../configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-kernel=2.6.18 \ + --enable-kernel=2.6.32 \ --with-headers=/usr/include \ --enable-add-ons=libidn,nptl \ --enable-profile \ @@ -358,6 +377,9 @@ rm $PKG/etc/ld.so.cache ################################## # glibc-zoneinfo. We will start with an easy one to avoid breaking a sweat. ;-) +cd $CWD +ZONE_VERSIONS="$(echo tzcode* | cut -f1 -d . | cut -b7-11)_$(echo tzdata* | cut -f1 -d . | cut -b7-11)" +echo $ZONE_VERSIONS cd $PZONE # Install some scripts to help select a timezone: mkdir -p $PZONE/var/log/setup @@ -379,7 +401,7 @@ mkdir -p $PZONE/etc # This is already hard-coded into doinst.sh (like it'll be there anyway ;-): rm -f etc/localtime # Wrap it up: -makepkg -l y -c n $TMP/glibc-zoneinfo-$VERSION-noarch-$BUILD.txz +makepkg -l y -c n $TMP/glibc-zoneinfo-$ZONE_VERSIONS-noarch-$BUILD.txz # glibc-profile: cd $PPROFILE diff --git a/source/l/glibc/glibc.git-6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4.diff b/source/l/glibc/glibc.git-6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4.diff new file mode 100644 index 000000000..e9b3ba400 --- /dev/null +++ b/source/l/glibc/glibc.git-6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4.diff @@ -0,0 +1,322 @@ +From 6ee65ed6ddbf04402fad0bec6aa9c73b9d982ae4 Mon Sep 17 00:00:00 2001 +From: Ulrich Drepper <drepper@gmail.com> +Date: Fri, 27 Jan 2012 15:05:19 -0500 +Subject: [PATCH] Sort objects before relocations + +--- + ChangeLog | 11 ++++ + Makeconfig | 6 ++ + NEWS | 4 +- + elf/Makefile | 15 +++++- + elf/dl-open.c | 128 ++++++++++++++++++++++++++++++++++++------------ + elf/tst-relsort1.c | 19 +++++++ + elf/tst-relsort1mod1.c | 7 +++ + elf/tst-relsort1mod2.c | 7 +++ + 8 files changed, 160 insertions(+), 37 deletions(-) + create mode 100644 elf/tst-relsort1.c + create mode 100644 elf/tst-relsort1mod1.c + create mode 100644 elf/tst-relsort1mod2.c + +#diff --git a/ChangeLog b/ChangeLog +#index 24c9550..2efe17a 100644 +#--- a/ChangeLog +#+++ b/ChangeLog +#@@ -1,3 +1,14 @@ +#+2012-01-27 Ulrich Drepper <drepper@gmail.com> +#+ +#+ [BZ #13618] +#+ * elf/dl-open.c (dl_open_worker): Sort objects by dependency before +#+ relocation. +#+ * Makeconfig (libm): Define. +#+ * elf/Makefile: Add rules to build and run tst-relsort1. +#+ * elf/tst-relsort1.c: New file. +#+ * elf/tst-relsort1mod1.c: New file. +#+ * elf/tst-relsort1mod2.c: New file. +#+ + 2012-01-26 Joseph Myers <joseph@codesourcery.com> + + * crypt/md5.h: Remove __STDC__ conditionals. +diff --git a/Makeconfig b/Makeconfig +index 2db2821..68547b2 100644 +--- a/Makeconfig ++++ b/Makeconfig +@@ -900,6 +900,12 @@ else + libdl = $(common-objpfx)dlfcn/libdl.a + endif + ++ifeq ($(build-shared),yes) ++libm = $(common-objpfx)math/libm.so$(libm.so-version) ++else ++libm = $(common-objpfx)math/libm.a ++endif ++ + # These are the subdirectories containing the library source. The order + # is more or less arbitrary. The sorting step will take care of the + # dependencies. +#diff --git a/NEWS b/NEWS +#index 42e09c1..3b502b7 100644 +#--- a/NEWS +#+++ b/NEWS +#@@ -1,4 +1,4 @@ +#-GNU C Library NEWS -- history of user-visible changes. 2012-1-26 +#+GNU C Library NEWS -- history of user-visible changes. 2012-1-27 + #Copyright (C) 1992-2009, 2010, 2011, 2012 Free Software Foundation, Inc. + #See the end for copying conditions. +# +#@@ -10,7 +10,7 @@ Version 2.16 + #* The following bugs are resolved with this release: +# + #13525, 13526, 13527, 13528, 13529, 13531, 13532, 13533, 13547, 13530, +#- 13551, 13552, 13553, 13555, 13559, 13583 +#+ 13551, 13552, 13553, 13555, 13559, 13583, 13618 +# + #* ISO C11 support: +# +diff --git a/elf/Makefile b/elf/Makefile +index 052e763..3f1772a 100644 +--- a/elf/Makefile ++++ b/elf/Makefile +@@ -124,7 +124,8 @@ distribute := rtld-Rules \ + tst-initordera1.c tst-initordera2.c tst-initorderb1.c \ + tst-initorderb2.c tst-initordera3.c tst-initordera4.c \ + tst-initorder.c \ +- tst-initorder2.c ++ tst-initorder2.c \ ++ tst-relsort1.c tst-relsort1mod1.c tst-relsort1mod2.c + + CFLAGS-dl-runtime.c = -fexceptions -fasynchronous-unwind-tables + CFLAGS-dl-lookup.c = -fexceptions -fasynchronous-unwind-tables +@@ -227,7 +228,7 @@ tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \ + tst-audit1 tst-audit2 \ + tst-stackguard1 tst-addr1 tst-thrlock \ + tst-unique1 tst-unique2 tst-unique3 tst-unique4 \ +- tst-initorder tst-initorder2 ++ tst-initorder tst-initorder2 tst-relsort1 + # reldep9 + test-srcs = tst-pathopt + selinux-enabled := $(shell cat /selinux/enforce 2> /dev/null) +@@ -290,7 +291,9 @@ modules-names = testobj1 testobj2 testobj3 testobj4 testobj5 testobj6 \ + tst-initordera1 tst-initorderb1 \ + tst-initordera2 tst-initorderb2 \ + tst-initordera3 tst-initordera4 \ +- tst-initorder2a tst-initorder2b tst-initorder2c tst-initorder2d ++ tst-initorder2a tst-initorder2b tst-initorder2c \ ++ tst-initorder2d \ ++ tst-relsort1mod1 tst-relsort1mod2 + ifeq (yes,$(have-initfini-array)) + modules-names += tst-array2dep tst-array5dep + endif +@@ -1195,3 +1198,9 @@ CFLAGS-tst-auditmod6b.c += $(AVX-CFLAGS) + CFLAGS-tst-auditmod6c.c += $(AVX-CFLAGS) + CFLAGS-tst-auditmod7b.c += $(AVX-CFLAGS) + endif ++ ++$(objpfx)tst-relsort1: $(libdl) ++$(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so ++$(objpfx)tst-relsort1mod2.so: $(libm) ++$(objpfx)tst-relsort1.out: $(objpfx)tst-relsort1mod1.so \ ++ $(objpfx)tst-relsort1mod2.so +diff --git a/elf/dl-open.c b/elf/dl-open.c +index a0b5c50..a56bdc1 100644 +--- a/elf/dl-open.c ++++ b/elf/dl-open.c +@@ -1,5 +1,5 @@ + /* Load a shared object at runtime, relocate it, and run its initializer. +- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc. ++ Copyright (C) 1996-2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or +@@ -302,45 +302,109 @@ dl_open_worker (void *a) + if (GLRO(dl_lazy)) + reloc_mode |= mode & RTLD_LAZY; + +- /* Relocate the objects loaded. We do this in reverse order so that copy +- relocs of earlier objects overwrite the data written by later objects. */ +- ++ /* Sort the objects by dependency for the relocation process. This ++ allows IFUNC relocations to work and it also means copy ++ relocation of dependencies are if necessary overwritten. */ ++ size_t nmaps = 0; + struct link_map *l = new; +- while (l->l_next) +- l = l->l_next; +- while (1) ++ do ++ { ++ if (! l->l_real->l_relocated) ++ ++nmaps; ++ l = l->l_next; ++ } ++ while (l != NULL); ++ struct link_map *maps[nmaps]; ++ nmaps = 0; ++ l = new; ++ do + { + if (! l->l_real->l_relocated) ++ maps[nmaps++] = l; ++ l = l->l_next; ++ } ++ while (l != NULL); ++ if (nmaps > 1) ++ { ++ char seen[nmaps]; ++ memset (seen, '\0', nmaps); ++ size_t i = 0; ++ while (1) + { +-#ifdef SHARED +- if (__builtin_expect (GLRO(dl_profile) != NULL, 0)) ++ ++seen[i]; ++ struct link_map *thisp = maps[i]; ++ ++ /* Find the last object in the list for which the current one is ++ a dependency and move the current object behind the object ++ with the dependency. */ ++ size_t k = nmaps - 1; ++ while (k > i) + { +- /* If this here is the shared object which we want to profile +- make sure the profile is started. We can find out whether +- this is necessary or not by observing the `_dl_profile_map' +- variable. If was NULL but is not NULL afterwars we must +- start the profiling. */ +- struct link_map *old_profile_map = GL(dl_profile_map); ++ struct link_map **runp = maps[k]->l_initfini; ++ if (runp != NULL) ++ /* Look through the dependencies of the object. */ ++ while (*runp != NULL) ++ if (__builtin_expect (*runp++ == thisp, 0)) ++ { ++ /* Move the current object to the back past the last ++ object with it as the dependency. */ ++ memmove (&maps[i], &maps[i + 1], ++ (k - i) * sizeof (maps[0])); ++ maps[k] = thisp; ++ ++ if (seen[i + 1] > 1) ++ { ++ ++i; ++ goto next_clear; ++ } ++ ++ char this_seen = seen[i]; ++ memmove (&seen[i], &seen[i + 1], ++ (k - i) * sizeof (seen[0])); ++ seen[k] = this_seen; ++ ++ goto next; ++ } ++ ++ --k; ++ } + +- _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1); ++ if (++i == nmaps) ++ break; ++ next_clear: ++ memset (&seen[i], 0, (nmaps - i) * sizeof (seen[0])); ++ next:; ++ } ++ } + +- if (old_profile_map == NULL && GL(dl_profile_map) != NULL) +- { +- /* We must prepare the profiling. */ +- _dl_start_profile (); ++ for (size_t i = nmaps; i-- > 0; ) ++ { ++ l = maps[i]; + +- /* Prevent unloading the object. */ +- GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE; +- } ++#ifdef SHARED ++ if (__builtin_expect (GLRO(dl_profile) != NULL, 0)) ++ { ++ /* If this here is the shared object which we want to profile ++ make sure the profile is started. We can find out whether ++ this is necessary or not by observing the `_dl_profile_map' ++ variable. If it was NULL but is not NULL afterwars we must ++ start the profiling. */ ++ struct link_map *old_profile_map = GL(dl_profile_map); ++ ++ _dl_relocate_object (l, l->l_scope, reloc_mode | RTLD_LAZY, 1); ++ ++ if (old_profile_map == NULL && GL(dl_profile_map) != NULL) ++ { ++ /* We must prepare the profiling. */ ++ _dl_start_profile (); ++ ++ /* Prevent unloading the object. */ ++ GL(dl_profile_map)->l_flags_1 |= DF_1_NODELETE; + } +- else +-#endif +- _dl_relocate_object (l, l->l_scope, reloc_mode, 0); + } +- +- if (l == new) +- break; +- l = l->l_prev; ++ else ++#endif ++ _dl_relocate_object (l, l->l_scope, reloc_mode, 0); + } + + /* If the file is not loaded now as a dependency, add the search +diff --git a/elf/tst-relsort1.c b/elf/tst-relsort1.c +new file mode 100644 +index 0000000..972100c +--- /dev/null ++++ b/elf/tst-relsort1.c +@@ -0,0 +1,19 @@ ++#include <dlfcn.h> ++#include <stdio.h> ++ ++ ++static int ++do_test () ++{ ++ const char lib[] = "$ORIGIN/tst-relsort1mod1.so"; ++ void *h = dlopen (lib, RTLD_NOW); ++ if (h == NULL) ++ { ++ puts (dlerror ()); ++ return 1; ++ } ++ return 0; ++} ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +diff --git a/elf/tst-relsort1mod1.c b/elf/tst-relsort1mod1.c +new file mode 100644 +index 0000000..9e4a943 +--- /dev/null ++++ b/elf/tst-relsort1mod1.c +@@ -0,0 +1,7 @@ ++extern int foo (double); ++ ++int ++bar (void) ++{ ++ return foo (1.2); ++} +diff --git a/elf/tst-relsort1mod2.c b/elf/tst-relsort1mod2.c +new file mode 100644 +index 0000000..a2c3e55 +--- /dev/null ++++ b/elf/tst-relsort1mod2.c +@@ -0,0 +1,7 @@ ++#include <math.h> ++ ++int ++foo (double d) ++{ ++ return floor (d) != 0.0; ++} +-- +1.7.3.4 + diff --git a/source/l/glibc/glibc.strtod.CVE-2012-3480.diff b/source/l/glibc/glibc.strtod.CVE-2012-3480.diff new file mode 100644 index 000000000..7a7bdeb7d --- /dev/null +++ b/source/l/glibc/glibc.strtod.CVE-2012-3480.diff @@ -0,0 +1,407 @@ +From 8a780f7f68a1cd4c575bb17973a9e18826b05ef9 Mon Sep 17 00:00:00 2001 +From: Joseph Myers <joseph@codesourcery.com> +Date: Mon, 27 Aug 2012 15:59:24 +0000 +Subject: [PATCH 1/1] Fix strtod integer/buffer overflow (bug 14459). + (cherry picked from commit d6e70f4368533224e66d10b7f2126b899a3fd5e4) + +Conflicts: + + ChangeLog + NEWS + stdlib/Makefile +--- + ChangeLog | 17 +++++ + NEWS | 2 +- + stdlib/Makefile | 2 +- + stdlib/strtod_l.c | 142 ++++++++++++++++++++++++++++++++--------- + stdlib/tst-strtod-overflow.c | 48 ++++++++++++++ + 5 files changed, 178 insertions(+), 33 deletions(-) + create mode 100644 stdlib/tst-strtod-overflow.c + +diff --git a/stdlib/Makefile b/stdlib/Makefile +index 04c6ac5..b55f573 100644 +--- a/stdlib/Makefile ++++ b/stdlib/Makefile +@@ -71,7 +71,7 @@ tests := tst-strtol tst-strtod testmb testrand testsort testdiv \ + tst-atof1 tst-atof2 tst-strtod2 tst-strtod3 tst-rand48-2 \ + tst-makecontext tst-strtod4 tst-strtod5 tst-qsort2 \ + tst-makecontext2 tst-strtod6 tst-unsetenv1 \ +- tst-makecontext3 bug-getcontext ++ tst-makecontext3 bug-getcontext tst-strtod-overflow + + include ../Makeconfig + +diff --git a/stdlib/strtod_l.c b/stdlib/strtod_l.c +index f24d4de..0deaebf 100644 +--- a/stdlib/strtod_l.c ++++ b/stdlib/strtod_l.c +@@ -62,6 +62,7 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **, + #include <math.h> + #include <stdlib.h> + #include <string.h> ++#include <stdint.h> + + /* The gmp headers need some configuration frobs. */ + #define HAVE_ALLOCA 1 +@@ -74,7 +75,6 @@ extern unsigned long long int ____strtoull_l_internal (const char *, char **, + #include "longlong.h" + #include "fpioconst.h" + +-#define NDEBUG 1 + #include <assert.h> + + +@@ -176,19 +176,19 @@ extern const mp_limb_t _tens_in_limb[MAX_DIG_PER_LIMB + 1]; + /* Return a floating point number of the needed type according to the given + multi-precision number after possible rounding. */ + static FLOAT +-round_and_return (mp_limb_t *retval, int exponent, int negative, ++round_and_return (mp_limb_t *retval, intmax_t exponent, int negative, + mp_limb_t round_limb, mp_size_t round_bit, int more_bits) + { + if (exponent < MIN_EXP - 1) + { +- mp_size_t shift = MIN_EXP - 1 - exponent; +- +- if (shift > MANT_DIG) ++ if (exponent < MIN_EXP - 1 - MANT_DIG) + { + __set_errno (ERANGE); + return 0.0; + } + ++ mp_size_t shift = MIN_EXP - 1 - exponent; ++ + more_bits |= (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0; + if (shift == MANT_DIG) + /* This is a special case to handle the very seldom case where +@@ -235,6 +235,9 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, + __set_errno (ERANGE); + } + ++ if (exponent > MAX_EXP) ++ goto overflow; ++ + if ((round_limb & (((mp_limb_t) 1) << round_bit)) != 0 + && (more_bits || (retval[0] & 1) != 0 + || (round_limb & ((((mp_limb_t) 1) << round_bit) - 1)) != 0)) +@@ -260,6 +263,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, + } + + if (exponent > MAX_EXP) ++ overflow: + return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL; + + return MPN2FLOAT (retval, exponent, negative); +@@ -273,7 +277,7 @@ round_and_return (mp_limb_t *retval, int exponent, int negative, + factor for the resulting number (see code) multiply by it. */ + static const STRING_TYPE * + str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, +- int *exponent ++ intmax_t *exponent + #ifndef USE_WIDE_CHAR + , const char *decimal, size_t decimal_len, const char *thousands + #endif +@@ -303,6 +307,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, + cy += __mpn_add_1 (n, n, *nsize, low); + if (cy != 0) + { ++ assert (*nsize < MPNSIZE); + n[*nsize] = cy; + ++(*nsize); + } +@@ -337,7 +342,7 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, + } + while (--digcnt > 0); + +- if (*exponent > 0 && cnt + *exponent <= MAX_DIG_PER_LIMB) ++ if (*exponent > 0 && *exponent <= MAX_DIG_PER_LIMB - cnt) + { + low *= _tens_in_limb[*exponent]; + start = _tens_in_limb[cnt + *exponent]; +@@ -357,7 +362,10 @@ str_to_mpn (const STRING_TYPE *str, int digcnt, mp_limb_t *n, mp_size_t *nsize, + cy = __mpn_mul_1 (n, n, *nsize, start); + cy += __mpn_add_1 (n, n, *nsize, low); + if (cy != 0) +- n[(*nsize)++] = cy; ++ { ++ assert (*nsize < MPNSIZE); ++ n[(*nsize)++] = cy; ++ } + } + + return str; +@@ -415,7 +423,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + { + int negative; /* The sign of the number. */ + MPN_VAR (num); /* MP representation of the number. */ +- int exponent; /* Exponent of the number. */ ++ intmax_t exponent; /* Exponent of the number. */ + + /* Numbers starting `0X' or `0x' have to be processed with base 16. */ + int base = 10; +@@ -437,7 +445,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + /* Points at the character following the integer and fractional digits. */ + const STRING_TYPE *expp; + /* Total number of digit and number of digits in integer part. */ +- int dig_no, int_no, lead_zero; ++ size_t dig_no, int_no, lead_zero; + /* Contains the last character read. */ + CHAR_TYPE c; + +@@ -769,7 +777,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + are all or any is really a fractional digit will be decided + later. */ + int_no = dig_no; +- lead_zero = int_no == 0 ? -1 : 0; ++ lead_zero = int_no == 0 ? (size_t) -1 : 0; + + /* Read the fractional digits. A special case are the 'american + style' numbers like `16.' i.e. with decimal point but without +@@ -791,12 +799,13 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + (base == 16 && ({ CHAR_TYPE lo = TOLOWER (c); + lo >= L_('a') && lo <= L_('f'); }))) + { +- if (c != L_('0') && lead_zero == -1) ++ if (c != L_('0') && lead_zero == (size_t) -1) + lead_zero = dig_no - int_no; + ++dig_no; + c = *++cp; + } + } ++ assert (dig_no <= (uintmax_t) INTMAX_MAX); + + /* Remember start of exponent (if any). */ + expp = cp; +@@ -819,24 +828,80 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + + if (c >= L_('0') && c <= L_('9')) + { +- int exp_limit; ++ intmax_t exp_limit; + + /* Get the exponent limit. */ + if (base == 16) +- exp_limit = (exp_negative ? +- -MIN_EXP + MANT_DIG + 4 * int_no : +- MAX_EXP - 4 * int_no + 4 * lead_zero + 3); ++ { ++ if (exp_negative) ++ { ++ assert (int_no <= (uintmax_t) (INTMAX_MAX ++ + MIN_EXP - MANT_DIG) / 4); ++ exp_limit = -MIN_EXP + MANT_DIG + 4 * (intmax_t) int_no; ++ } ++ else ++ { ++ if (int_no) ++ { ++ assert (lead_zero == 0 ++ && int_no <= (uintmax_t) INTMAX_MAX / 4); ++ exp_limit = MAX_EXP - 4 * (intmax_t) int_no + 3; ++ } ++ else if (lead_zero == (size_t) -1) ++ { ++ /* The number is zero and this limit is ++ arbitrary. */ ++ exp_limit = MAX_EXP + 3; ++ } ++ else ++ { ++ assert (lead_zero ++ <= (uintmax_t) (INTMAX_MAX - MAX_EXP - 3) / 4); ++ exp_limit = (MAX_EXP ++ + 4 * (intmax_t) lead_zero ++ + 3); ++ } ++ } ++ } + else +- exp_limit = (exp_negative ? +- -MIN_10_EXP + MANT_DIG + int_no : +- MAX_10_EXP - int_no + lead_zero + 1); ++ { ++ if (exp_negative) ++ { ++ assert (int_no ++ <= (uintmax_t) (INTMAX_MAX + MIN_10_EXP - MANT_DIG)); ++ exp_limit = -MIN_10_EXP + MANT_DIG + (intmax_t) int_no; ++ } ++ else ++ { ++ if (int_no) ++ { ++ assert (lead_zero == 0 ++ && int_no <= (uintmax_t) INTMAX_MAX); ++ exp_limit = MAX_10_EXP - (intmax_t) int_no + 1; ++ } ++ else if (lead_zero == (size_t) -1) ++ { ++ /* The number is zero and this limit is ++ arbitrary. */ ++ exp_limit = MAX_10_EXP + 1; ++ } ++ else ++ { ++ assert (lead_zero ++ <= (uintmax_t) (INTMAX_MAX - MAX_10_EXP - 1)); ++ exp_limit = MAX_10_EXP + (intmax_t) lead_zero + 1; ++ } ++ } ++ } ++ ++ if (exp_limit < 0) ++ exp_limit = 0; + + do + { +- exponent *= 10; +- exponent += c - L_('0'); +- +- if (__builtin_expect (exponent > exp_limit, 0)) ++ if (__builtin_expect ((exponent > exp_limit / 10 ++ || (exponent == exp_limit / 10 ++ && c - L_('0') > exp_limit % 10)), 0)) + /* The exponent is too large/small to represent a valid + number. */ + { +@@ -845,7 +910,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + /* We have to take care for special situation: a joker + might have written "0.0e100000" which is in fact + zero. */ +- if (lead_zero == -1) ++ if (lead_zero == (size_t) -1) + result = negative ? -0.0 : 0.0; + else + { +@@ -864,6 +929,9 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + /* NOTREACHED */ + } + ++ exponent *= 10; ++ exponent += c - L_('0'); ++ + c = *++cp; + } + while (c >= L_('0') && c <= L_('9')); +@@ -932,7 +1000,14 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + } + #endif + startp += lead_zero + decimal_len; +- exponent -= base == 16 ? 4 * lead_zero : lead_zero; ++ assert (lead_zero <= (base == 16 ++ ? (uintmax_t) INTMAX_MAX / 4 ++ : (uintmax_t) INTMAX_MAX)); ++ assert (lead_zero <= (base == 16 ++ ? ((uintmax_t) exponent ++ - (uintmax_t) INTMAX_MIN) / 4 ++ : ((uintmax_t) exponent - (uintmax_t) INTMAX_MIN))); ++ exponent -= base == 16 ? 4 * (intmax_t) lead_zero : (intmax_t) lead_zero; + dig_no -= lead_zero; + } + +@@ -974,7 +1049,10 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + } + + /* Adjust the exponent for the bits we are shifting in. */ +- exponent += bits - 1 + (int_no - 1) * 4; ++ assert (int_no <= (uintmax_t) (exponent < 0 ++ ? (INTMAX_MAX - bits + 1) / 4 ++ : (INTMAX_MAX - exponent - bits + 1) / 4)); ++ exponent += bits - 1 + ((intmax_t) int_no - 1) * 4; + + while (--dig_no > 0 && idx >= 0) + { +@@ -1014,13 +1092,15 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + really integer digits or belong to the fractional part; i.e. we normalize + 123e-2 to 1.23. */ + { +- register int incr = (exponent < 0 ? MAX (-int_no, exponent) +- : MIN (dig_no - int_no, exponent)); ++ register intmax_t incr = (exponent < 0 ++ ? MAX (-(intmax_t) int_no, exponent) ++ : MIN ((intmax_t) dig_no - (intmax_t) int_no, ++ exponent)); + int_no += incr; + exponent -= incr; + } + +- if (__builtin_expect (int_no + exponent > MAX_10_EXP + 1, 0)) ++ if (__builtin_expect (exponent > MAX_10_EXP + 1 - (intmax_t) int_no, 0)) + { + __set_errno (ERANGE); + return negative ? -FLOAT_HUGE_VAL : FLOAT_HUGE_VAL; +@@ -1205,7 +1285,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + digits we should have enough bits for the result. The remaining + decimal digits give us the information that more bits are following. + This can be used while rounding. (Two added as a safety margin.) */ +- if (dig_no - int_no > (MANT_DIG - bits + 2) / 3 + 2) ++ if ((intmax_t) dig_no > (intmax_t) int_no + (MANT_DIG - bits + 2) / 3 + 2) + { + dig_no = int_no + (MANT_DIG - bits + 2) / 3 + 2; + more_bits = 1; +@@ -1213,7 +1293,7 @@ ____STRTOF_INTERNAL (nptr, endptr, group, loc) + else + more_bits = 0; + +- neg_exp = dig_no - int_no - exponent; ++ neg_exp = (intmax_t) dig_no - (intmax_t) int_no - exponent; + + /* Construct the denominator. */ + densize = 0; +diff --git a/stdlib/tst-strtod-overflow.c b/stdlib/tst-strtod-overflow.c +new file mode 100644 +index 0000000..668d55b +--- /dev/null ++++ b/stdlib/tst-strtod-overflow.c +@@ -0,0 +1,48 @@ ++/* Test for integer/buffer overflow in strtod. ++ Copyright (C) 2012 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, see ++ <http://www.gnu.org/licenses/>. */ ++ ++#include <stdio.h> ++#include <stdlib.h> ++#include <string.h> ++ ++#define EXPONENT "e-2147483649" ++#define SIZE 214748364 ++ ++static int ++do_test (void) ++{ ++ char *p = malloc (1 + SIZE + sizeof (EXPONENT)); ++ if (p == NULL) ++ { ++ puts ("malloc failed, cannot test for overflow"); ++ return 0; ++ } ++ p[0] = '1'; ++ memset (p + 1, '0', SIZE); ++ memcpy (p + 1 + SIZE, EXPONENT, sizeof (EXPONENT)); ++ double d = strtod (p, NULL); ++ if (d != 0) ++ { ++ printf ("strtod returned wrong value: %a\n", d); ++ return 1; ++ } ++ return 0; ++} ++ ++#define TEST_FUNCTION do_test () ++#include "../test-skeleton.c" +-- +1.7.3.4 diff --git a/source/l/glibc/slack-desc.glibc-zoneinfo b/source/l/glibc/slack-desc.glibc-zoneinfo index 24dfd0e9f..69420f78d 100644 --- a/source/l/glibc/slack-desc.glibc-zoneinfo +++ b/source/l/glibc/slack-desc.glibc-zoneinfo @@ -12,7 +12,7 @@ glibc-zoneinfo: This package allows you to configure your time zone. glibc-zoneinfo: glibc-zoneinfo: This timezone database comes from the tzdata and tzcode packages by glibc-zoneinfo: Arthur David Olson et.al. The latest version and more information -glibc-zoneinfo: may be found at ftp://elsie.nci.nih.gov/pub/ +glibc-zoneinfo: may be found at: http://www.iana.org/time-zones glibc-zoneinfo: glibc-zoneinfo: Use the timeconfig utility to set your local time zone. glibc-zoneinfo: diff --git a/source/l/glibc/slack-desc.glibc-zoneinfo.olson b/source/l/glibc/slack-desc.glibc-zoneinfo.olson new file mode 100644 index 000000000..24dfd0e9f --- /dev/null +++ b/source/l/glibc/slack-desc.glibc-zoneinfo.olson @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +glibc-zoneinfo: glibc-zoneinfo (timezone database) +glibc-zoneinfo: +glibc-zoneinfo: This package allows you to configure your time zone. +glibc-zoneinfo: +glibc-zoneinfo: This timezone database comes from the tzdata and tzcode packages by +glibc-zoneinfo: Arthur David Olson et.al. The latest version and more information +glibc-zoneinfo: may be found at ftp://elsie.nci.nih.gov/pub/ +glibc-zoneinfo: +glibc-zoneinfo: Use the timeconfig utility to set your local time zone. +glibc-zoneinfo: +glibc-zoneinfo: diff --git a/source/l/glibc/timezone-scripts/timeconfig b/source/l/glibc/timezone-scripts/timeconfig index 33dc89d46..56e786c38 100644 --- a/source/l/glibc/timezone-scripts/timeconfig +++ b/source/l/glibc/timezone-scripts/timeconfig @@ -165,6 +165,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "Africa/Gaborone" " " \ "Africa/Harare" " " \ "Africa/Johannesburg" " " \ +"Africa/Juba" " " \ "Africa/Kampala" " " \ "Africa/Khartoum" " " \ "Africa/Kigali" " " \ @@ -215,6 +216,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "America/Atikokan" " " \ "America/Atka" " " \ "America/Bahia" " " \ +"America/Bahia_Banderas" " " \ "America/Barbados" " " \ "America/Belem" " " \ "America/Belize" " " \ @@ -278,19 +280,23 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "America/Kentucky/Louisville" " " \ "America/Kentucky/Monticello" " " \ "America/Knox_IN" " " \ +"America/Kralendijk" " " \ "America/La_Paz" " " \ "America/Lima" " " \ "America/Los_Angeles" " " \ "America/Louisville" " " \ +"America/Lower_Princes" " " \ "America/Maceio" " " \ "America/Managua" " " \ "America/Manaus" " " \ "America/Marigot" " " \ "America/Martinique" " " \ +"America/Matamoros" " " \ "America/Mazatlan" " " \ "America/Mendoza" " " \ "America/Menominee" " " \ "America/Merida" " " \ +"America/Metlakatla" " " \ "America/Mexico_City" " " \ "America/Miquelon" " " \ "America/Moncton" " " \ @@ -303,8 +309,10 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "America/Nipigon" " " \ "America/Nome" " " \ "America/Noronha" " " \ +"America/North_Dakota/Beulah" " " \ "America/North_Dakota/Center" " " \ "America/North_Dakota/New_Salem" " " \ +"America/Ojinaga" " " \ "America/Panama" " " \ "America/Pangnirtung" " " \ "America/Paramaribo" " " \ @@ -321,12 +329,14 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "America/Resolute" " " \ "America/Rio_Branco" " " \ "America/Rosario" " " \ +"America/Santa_Isabel" " " \ "America/Santarem" " " \ "America/Santiago" " " \ "America/Santo_Domingo" " " \ "America/Sao_Paulo" " " \ "America/Scoresbysund" " " \ "America/Shiprock" " " \ +"America/Sitka" " " \ "America/St_Barthelemy" " " \ "America/St_Johns" " " \ "America/St_Kitts" " " \ @@ -349,6 +359,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "Antarctica/Casey" " " \ "Antarctica/Davis" " " \ "Antarctica/DumontDUrville" " " \ +"Antarctica/Macquarie" " " \ "Antarctica/Mawson" " " \ "Antarctica/McMurdo" " " \ "Antarctica/Palmer" " " \ @@ -385,6 +396,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "Asia/Dushanbe" " " \ "Asia/Gaza" " " \ "Asia/Harbin" " " \ +"Asia/Hebron" " " \ "Asia/Ho_Chi_Minh" " " \ "Asia/Hong_Kong" " " \ "Asia/Hovd" " " \ @@ -411,6 +423,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "Asia/Manila" " " \ "Asia/Muscat" " " \ "Asia/Nicosia" " " \ +"Asia/Novokuznetsk" " " \ "Asia/Novosibirsk" " " \ "Asia/Omsk" " " \ "Asia/Oral" " " \ @@ -643,6 +656,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "Pacific/Apia" " " \ "Pacific/Auckland" " " \ "Pacific/Chatham" " " \ +"Pacific/Chuuk" " " \ "Pacific/Easter" " " \ "Pacific/Efate" " " \ "Pacific/Enderbury" " " \ @@ -668,6 +682,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "Pacific/Pago_Pago" " " \ "Pacific/Palau" " " \ "Pacific/Pitcairn" " " \ +"Pacific/Pohnpei" " " \ "Pacific/Ponape" " " \ "Pacific/Port_Moresby" " " \ "Pacific/Rarotonga" " " \ @@ -718,6 +733,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "posix/Africa/Gaborone" " " \ "posix/Africa/Harare" " " \ "posix/Africa/Johannesburg" " " \ +"posix/Africa/Juba" " " \ "posix/Africa/Kampala" " " \ "posix/Africa/Khartoum" " " \ "posix/Africa/Kigali" " " \ @@ -768,6 +784,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "posix/America/Atikokan" " " \ "posix/America/Atka" " " \ "posix/America/Bahia" " " \ +"posix/America/Bahia_Banderas" " " \ "posix/America/Barbados" " " \ "posix/America/Belem" " " \ "posix/America/Belize" " " \ @@ -831,19 +848,23 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "posix/America/Kentucky/Louisville" " " \ "posix/America/Kentucky/Monticello" " " \ "posix/America/Knox_IN" " " \ +"posix/America/Kralendijk" " " \ "posix/America/La_Paz" " " \ "posix/America/Lima" " " \ "posix/America/Los_Angeles" " " \ "posix/America/Louisville" " " \ +"posix/America/Lower_Princes" " " \ "posix/America/Maceio" " " \ "posix/America/Managua" " " \ "posix/America/Manaus" " " \ "posix/America/Marigot" " " \ "posix/America/Martinique" " " \ +"posix/America/Matamoros" " " \ "posix/America/Mazatlan" " " \ "posix/America/Mendoza" " " \ "posix/America/Menominee" " " \ "posix/America/Merida" " " \ +"posix/America/Metlakatla" " " \ "posix/America/Mexico_City" " " \ "posix/America/Miquelon" " " \ "posix/America/Moncton" " " \ @@ -856,8 +877,10 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "posix/America/Nipigon" " " \ "posix/America/Nome" " " \ "posix/America/Noronha" " " \ +"posix/America/North_Dakota/Beulah" " " \ "posix/America/North_Dakota/Center" " " \ "posix/America/North_Dakota/New_Salem" " " \ +"posix/America/Ojinaga" " " \ "posix/America/Panama" " " \ "posix/America/Pangnirtung" " " \ "posix/America/Paramaribo" " " \ @@ -874,12 +897,14 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "posix/America/Resolute" " " \ "posix/America/Rio_Branco" " " \ "posix/America/Rosario" " " \ +"posix/America/Santa_Isabel" " " \ "posix/America/Santarem" " " \ "posix/America/Santiago" " " \ "posix/America/Santo_Domingo" " " \ "posix/America/Sao_Paulo" " " \ "posix/America/Scoresbysund" " " \ "posix/America/Shiprock" " " \ +"posix/America/Sitka" " " \ "posix/America/St_Barthelemy" " " \ "posix/America/St_Johns" " " \ "posix/America/St_Kitts" " " \ @@ -902,6 +927,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "posix/Antarctica/Casey" " " \ "posix/Antarctica/Davis" " " \ "posix/Antarctica/DumontDUrville" " " \ +"posix/Antarctica/Macquarie" " " \ "posix/Antarctica/Mawson" " " \ "posix/Antarctica/McMurdo" " " \ "posix/Antarctica/Palmer" " " \ @@ -938,6 +964,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "posix/Asia/Dushanbe" " " \ "posix/Asia/Gaza" " " \ "posix/Asia/Harbin" " " \ +"posix/Asia/Hebron" " " \ "posix/Asia/Ho_Chi_Minh" " " \ "posix/Asia/Hong_Kong" " " \ "posix/Asia/Hovd" " " \ @@ -964,6 +991,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "posix/Asia/Manila" " " \ "posix/Asia/Muscat" " " \ "posix/Asia/Nicosia" " " \ +"posix/Asia/Novokuznetsk" " " \ "posix/Asia/Novosibirsk" " " \ "posix/Asia/Omsk" " " \ "posix/Asia/Oral" " " \ @@ -1196,6 +1224,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "posix/Pacific/Apia" " " \ "posix/Pacific/Auckland" " " \ "posix/Pacific/Chatham" " " \ +"posix/Pacific/Chuuk" " " \ "posix/Pacific/Easter" " " \ "posix/Pacific/Efate" " " \ "posix/Pacific/Enderbury" " " \ @@ -1221,6 +1250,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "posix/Pacific/Pago_Pago" " " \ "posix/Pacific/Palau" " " \ "posix/Pacific/Pitcairn" " " \ +"posix/Pacific/Pohnpei" " " \ "posix/Pacific/Ponape" " " \ "posix/Pacific/Port_Moresby" " " \ "posix/Pacific/Rarotonga" " " \ @@ -1284,6 +1314,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "right/Africa/Gaborone" " " \ "right/Africa/Harare" " " \ "right/Africa/Johannesburg" " " \ +"right/Africa/Juba" " " \ "right/Africa/Kampala" " " \ "right/Africa/Khartoum" " " \ "right/Africa/Kigali" " " \ @@ -1334,6 +1365,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "right/America/Atikokan" " " \ "right/America/Atka" " " \ "right/America/Bahia" " " \ +"right/America/Bahia_Banderas" " " \ "right/America/Barbados" " " \ "right/America/Belem" " " \ "right/America/Belize" " " \ @@ -1397,19 +1429,23 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "right/America/Kentucky/Louisville" " " \ "right/America/Kentucky/Monticello" " " \ "right/America/Knox_IN" " " \ +"right/America/Kralendijk" " " \ "right/America/La_Paz" " " \ "right/America/Lima" " " \ "right/America/Los_Angeles" " " \ "right/America/Louisville" " " \ +"right/America/Lower_Princes" " " \ "right/America/Maceio" " " \ "right/America/Managua" " " \ "right/America/Manaus" " " \ "right/America/Marigot" " " \ "right/America/Martinique" " " \ +"right/America/Matamoros" " " \ "right/America/Mazatlan" " " \ "right/America/Mendoza" " " \ "right/America/Menominee" " " \ "right/America/Merida" " " \ +"right/America/Metlakatla" " " \ "right/America/Mexico_City" " " \ "right/America/Miquelon" " " \ "right/America/Moncton" " " \ @@ -1422,8 +1458,10 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "right/America/Nipigon" " " \ "right/America/Nome" " " \ "right/America/Noronha" " " \ +"right/America/North_Dakota/Beulah" " " \ "right/America/North_Dakota/Center" " " \ "right/America/North_Dakota/New_Salem" " " \ +"right/America/Ojinaga" " " \ "right/America/Panama" " " \ "right/America/Pangnirtung" " " \ "right/America/Paramaribo" " " \ @@ -1440,12 +1478,14 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "right/America/Resolute" " " \ "right/America/Rio_Branco" " " \ "right/America/Rosario" " " \ +"right/America/Santa_Isabel" " " \ "right/America/Santarem" " " \ "right/America/Santiago" " " \ "right/America/Santo_Domingo" " " \ "right/America/Sao_Paulo" " " \ "right/America/Scoresbysund" " " \ "right/America/Shiprock" " " \ +"right/America/Sitka" " " \ "right/America/St_Barthelemy" " " \ "right/America/St_Johns" " " \ "right/America/St_Kitts" " " \ @@ -1468,6 +1508,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "right/Antarctica/Casey" " " \ "right/Antarctica/Davis" " " \ "right/Antarctica/DumontDUrville" " " \ +"right/Antarctica/Macquarie" " " \ "right/Antarctica/Mawson" " " \ "right/Antarctica/McMurdo" " " \ "right/Antarctica/Palmer" " " \ @@ -1504,6 +1545,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "right/Asia/Dushanbe" " " \ "right/Asia/Gaza" " " \ "right/Asia/Harbin" " " \ +"right/Asia/Hebron" " " \ "right/Asia/Ho_Chi_Minh" " " \ "right/Asia/Hong_Kong" " " \ "right/Asia/Hovd" " " \ @@ -1530,6 +1572,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "right/Asia/Manila" " " \ "right/Asia/Muscat" " " \ "right/Asia/Nicosia" " " \ +"right/Asia/Novokuznetsk" " " \ "right/Asia/Novosibirsk" " " \ "right/Asia/Omsk" " " \ "right/Asia/Oral" " " \ @@ -1762,6 +1805,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "right/Pacific/Apia" " " \ "right/Pacific/Auckland" " " \ "right/Pacific/Chatham" " " \ +"right/Pacific/Chuuk" " " \ "right/Pacific/Easter" " " \ "right/Pacific/Efate" " " \ "right/Pacific/Enderbury" " " \ @@ -1787,6 +1831,7 @@ if [ "$COLOR" = "on" -o -r $TMP/SeTcolor -o "$T_PX" = "/" ]; then "right/Pacific/Pago_Pago" " " \ "right/Pacific/Palau" " " \ "right/Pacific/Pitcairn" " " \ +"right/Pacific/Pohnpei" " " \ "right/Pacific/Ponape" " " \ "right/Pacific/Port_Moresby" " " \ "right/Pacific/Rarotonga" " " \ @@ -1889,6 +1934,7 @@ Africa/Freetown Africa/Gaborone Africa/Harare Africa/Johannesburg +Africa/Juba Africa/Kampala Africa/Khartoum Africa/Kigali @@ -1939,6 +1985,7 @@ America/Asuncion America/Atikokan America/Atka America/Bahia +America/Bahia_Banderas America/Barbados America/Belem America/Belize @@ -2002,19 +2049,23 @@ America/Juneau America/Kentucky/Louisville America/Kentucky/Monticello America/Knox_IN +America/Kralendijk America/La_Paz America/Lima America/Los_Angeles America/Louisville +America/Lower_Princes America/Maceio America/Managua America/Manaus America/Marigot America/Martinique +America/Matamoros America/Mazatlan America/Mendoza America/Menominee America/Merida +America/Metlakatla America/Mexico_City America/Miquelon America/Moncton @@ -2027,8 +2078,10 @@ America/New_York America/Nipigon America/Nome America/Noronha +America/North_Dakota/Beulah America/North_Dakota/Center America/North_Dakota/New_Salem +America/Ojinaga America/Panama America/Pangnirtung America/Paramaribo @@ -2045,12 +2098,14 @@ America/Regina America/Resolute America/Rio_Branco America/Rosario +America/Santa_Isabel America/Santarem America/Santiago America/Santo_Domingo America/Sao_Paulo America/Scoresbysund America/Shiprock +America/Sitka America/St_Barthelemy America/St_Johns America/St_Kitts @@ -2073,6 +2128,7 @@ America/Yellowknife Antarctica/Casey Antarctica/Davis Antarctica/DumontDUrville +Antarctica/Macquarie Antarctica/Mawson Antarctica/McMurdo Antarctica/Palmer @@ -2109,6 +2165,7 @@ Asia/Dubai Asia/Dushanbe Asia/Gaza Asia/Harbin +Asia/Hebron Asia/Ho_Chi_Minh Asia/Hong_Kong Asia/Hovd @@ -2135,6 +2192,7 @@ Asia/Makassar Asia/Manila Asia/Muscat Asia/Nicosia +Asia/Novokuznetsk Asia/Novosibirsk Asia/Omsk Asia/Oral @@ -2367,6 +2425,7 @@ PST8PDT Pacific/Apia Pacific/Auckland Pacific/Chatham +Pacific/Chuuk Pacific/Easter Pacific/Efate Pacific/Enderbury @@ -2392,6 +2451,7 @@ Pacific/Noumea Pacific/Pago_Pago Pacific/Palau Pacific/Pitcairn +Pacific/Pohnpei Pacific/Ponape Pacific/Port_Moresby Pacific/Rarotonga @@ -2442,6 +2502,7 @@ posix/Africa/Freetown posix/Africa/Gaborone posix/Africa/Harare posix/Africa/Johannesburg +posix/Africa/Juba posix/Africa/Kampala posix/Africa/Khartoum posix/Africa/Kigali @@ -2492,6 +2553,7 @@ posix/America/Asuncion posix/America/Atikokan posix/America/Atka posix/America/Bahia +posix/America/Bahia_Banderas posix/America/Barbados posix/America/Belem posix/America/Belize @@ -2555,19 +2617,23 @@ posix/America/Juneau posix/America/Kentucky/Louisville posix/America/Kentucky/Monticello posix/America/Knox_IN +posix/America/Kralendijk posix/America/La_Paz posix/America/Lima posix/America/Los_Angeles posix/America/Louisville +posix/America/Lower_Princes posix/America/Maceio posix/America/Managua posix/America/Manaus posix/America/Marigot posix/America/Martinique +posix/America/Matamoros posix/America/Mazatlan posix/America/Mendoza posix/America/Menominee posix/America/Merida +posix/America/Metlakatla posix/America/Mexico_City posix/America/Miquelon posix/America/Moncton @@ -2580,8 +2646,10 @@ posix/America/New_York posix/America/Nipigon posix/America/Nome posix/America/Noronha +posix/America/North_Dakota/Beulah posix/America/North_Dakota/Center posix/America/North_Dakota/New_Salem +posix/America/Ojinaga posix/America/Panama posix/America/Pangnirtung posix/America/Paramaribo @@ -2598,12 +2666,14 @@ posix/America/Regina posix/America/Resolute posix/America/Rio_Branco posix/America/Rosario +posix/America/Santa_Isabel posix/America/Santarem posix/America/Santiago posix/America/Santo_Domingo posix/America/Sao_Paulo posix/America/Scoresbysund posix/America/Shiprock +posix/America/Sitka posix/America/St_Barthelemy posix/America/St_Johns posix/America/St_Kitts @@ -2626,6 +2696,7 @@ posix/America/Yellowknife posix/Antarctica/Casey posix/Antarctica/Davis posix/Antarctica/DumontDUrville +posix/Antarctica/Macquarie posix/Antarctica/Mawson posix/Antarctica/McMurdo posix/Antarctica/Palmer @@ -2662,6 +2733,7 @@ posix/Asia/Dubai posix/Asia/Dushanbe posix/Asia/Gaza posix/Asia/Harbin +posix/Asia/Hebron posix/Asia/Ho_Chi_Minh posix/Asia/Hong_Kong posix/Asia/Hovd @@ -2688,6 +2760,7 @@ posix/Asia/Makassar posix/Asia/Manila posix/Asia/Muscat posix/Asia/Nicosia +posix/Asia/Novokuznetsk posix/Asia/Novosibirsk posix/Asia/Omsk posix/Asia/Oral @@ -2920,6 +2993,7 @@ posix/PST8PDT posix/Pacific/Apia posix/Pacific/Auckland posix/Pacific/Chatham +posix/Pacific/Chuuk posix/Pacific/Easter posix/Pacific/Efate posix/Pacific/Enderbury @@ -2945,6 +3019,7 @@ posix/Pacific/Noumea posix/Pacific/Pago_Pago posix/Pacific/Palau posix/Pacific/Pitcairn +posix/Pacific/Pohnpei posix/Pacific/Ponape posix/Pacific/Port_Moresby posix/Pacific/Rarotonga @@ -3008,6 +3083,7 @@ right/Africa/Freetown right/Africa/Gaborone right/Africa/Harare right/Africa/Johannesburg +right/Africa/Juba right/Africa/Kampala right/Africa/Khartoum right/Africa/Kigali @@ -3058,6 +3134,7 @@ right/America/Asuncion right/America/Atikokan right/America/Atka right/America/Bahia +right/America/Bahia_Banderas right/America/Barbados right/America/Belem right/America/Belize @@ -3121,19 +3198,23 @@ right/America/Juneau right/America/Kentucky/Louisville right/America/Kentucky/Monticello right/America/Knox_IN +right/America/Kralendijk right/America/La_Paz right/America/Lima right/America/Los_Angeles right/America/Louisville +right/America/Lower_Princes right/America/Maceio right/America/Managua right/America/Manaus right/America/Marigot right/America/Martinique +right/America/Matamoros right/America/Mazatlan right/America/Mendoza right/America/Menominee right/America/Merida +right/America/Metlakatla right/America/Mexico_City right/America/Miquelon right/America/Moncton @@ -3146,8 +3227,10 @@ right/America/New_York right/America/Nipigon right/America/Nome right/America/Noronha +right/America/North_Dakota/Beulah right/America/North_Dakota/Center right/America/North_Dakota/New_Salem +right/America/Ojinaga right/America/Panama right/America/Pangnirtung right/America/Paramaribo @@ -3164,12 +3247,14 @@ right/America/Regina right/America/Resolute right/America/Rio_Branco right/America/Rosario +right/America/Santa_Isabel right/America/Santarem right/America/Santiago right/America/Santo_Domingo right/America/Sao_Paulo right/America/Scoresbysund right/America/Shiprock +right/America/Sitka right/America/St_Barthelemy right/America/St_Johns right/America/St_Kitts @@ -3192,6 +3277,7 @@ right/America/Yellowknife right/Antarctica/Casey right/Antarctica/Davis right/Antarctica/DumontDUrville +right/Antarctica/Macquarie right/Antarctica/Mawson right/Antarctica/McMurdo right/Antarctica/Palmer @@ -3228,6 +3314,7 @@ right/Asia/Dubai right/Asia/Dushanbe right/Asia/Gaza right/Asia/Harbin +right/Asia/Hebron right/Asia/Ho_Chi_Minh right/Asia/Hong_Kong right/Asia/Hovd @@ -3254,6 +3341,7 @@ right/Asia/Makassar right/Asia/Manila right/Asia/Muscat right/Asia/Nicosia +right/Asia/Novokuznetsk right/Asia/Novosibirsk right/Asia/Omsk right/Asia/Oral @@ -3486,6 +3574,7 @@ right/PST8PDT right/Pacific/Apia right/Pacific/Auckland right/Pacific/Chatham +right/Pacific/Chuuk right/Pacific/Easter right/Pacific/Efate right/Pacific/Enderbury @@ -3511,6 +3600,7 @@ right/Pacific/Noumea right/Pacific/Pago_Pago right/Pacific/Palau right/Pacific/Pitcairn +right/Pacific/Pohnpei right/Pacific/Ponape right/Pacific/Port_Moresby right/Pacific/Rarotonga diff --git a/source/l/gmp/gmp.SlackBuild b/source/l/gmp/gmp.SlackBuild index 8fd35296d..d8a7ffd92 100755 --- a/source/l/gmp/gmp.SlackBuild +++ b/source/l/gmp/gmp.SlackBuild @@ -20,17 +20,20 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2011 by Eric Hameleers <alien at slackware.com> for ARM port. -VERSION=${VERSION:-$(echo gmp-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo gmp-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -51,11 +54,22 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + cd $TMP rm -rf gmp-$VERSION -tar xvf $CWD/gmp-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/gmp-$VERSION.tar.xz || exit 1 cd gmp-$VERSION chown -R root:root . find . \ @@ -64,6 +78,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# End of preparations +if echo "$*" | grep -qw -- --prep ; then + exit 0 +fi + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -72,8 +91,7 @@ CFLAGS="$SLKCFLAGS" \ --with-gnu-ld \ --enable-cxx \ --enable-mpbsd \ - --enable-mpfr \ - --build=$ARCH-slackware-linux-gnu + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/gnome-icon-theme/gnome-icon-theme.SlackBuild b/source/l/gnome-icon-theme/gnome-icon-theme.SlackBuild index a200d1cf7..477bc8232 100755 --- a/source/l/gnome-icon-theme/gnome-icon-theme.SlackBuild +++ b/source/l/gnome-icon-theme/gnome-icon-theme.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,10 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-$(echo gnome-icon-theme-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=3.4.0 # main package version +SYMVERS=3.4.0 # gnome-icon-theme-symbolic version +EXTRAVERS=3.4.0 # gnome-icon-theme-extras version + BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -50,40 +53,39 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf gnome-icon-theme-$VERSION -tar xvf $CWD/gnome-icon-theme-$VERSION.tar.?z* || exit 1 -cd gnome-icon-theme-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Use the "old" /usr/lib/pkgconfig instead of the /usr/share/pkgconfig -zcat $CWD/gnome-icon-theme.pkgconfig.path.diff.gz | patch -p1 --verbose || exit 1 - -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --enable-icon-mapping \ - --localstatedir=/var/lib || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -mkdir -p $PKG/usr/doc/gnome-icon-theme-$VERSION -cp -a \ - AUTHORS COPYING* NEWS README* TODO \ - $PKG/usr/doc/gnome-icon-theme-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi +for ICONPKG in gnome-icon-theme-$VERSION gnome-icon-theme-symbolic-$SYMVERS gnome-icon-theme-extras-$EXTRAVERS ; do + tar xvf $CWD/$ICONPKG.tar.?z* || exit 1 + cd $ICONPKG || exit 1 + chown -R root:root . + find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -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 \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --enable-icon-mapping \ + --localstatedir=/var/lib || exit 1 + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 + mkdir -p $PKG/usr/doc/$ICONPKG + cp -a \ + AUTHORS COPYING* NEWS README* TODO \ + $PKG/usr/doc/$ICONPKG + if [ -r ChangeLog ]; then + cat ChangeLog | head -n 1000 > $PKG/usr/doc/$ICONPKG/ChangeLog + touch -r ChangeLog $PKG/usr/doc/$ICONPKG/ChangeLog + fi + cd .. +done + +# It's a bad idea to ship these in the packages. If they aren't kept +# updated, there will be missing icons. Let the user create them if +# they care to. +find $PKG -name icon-theme.cache -exec rm "{}" \; mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff b/source/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff deleted file mode 100644 index af072cd83..000000000 --- a/source/l/gnome-icon-theme/gnome-icon-theme.pkgconfig.path.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./Makefile.in.orig 2010-08-04 17:51:09.000000000 -0500 -+++ ./Makefile.in 2010-11-06 14:00:00.000000000 -0500 -@@ -229,7 +229,7 @@ - theme_in_files = index.theme.in.in - theme_DATA = $(theme_in_files:.theme.in.in=.theme) - THEME_DIRS = $(shell SIZES="$(render_sizes)"; for size in $$SIZES; do for dir in `find $(srcdir)/$(SVGOUTDIR)/$$size/* -type d`; do printf "$$dir,"; done; done; echo "scalable/actions,scalable/apps,scalable/devices,scalable/emblems,scalable/mimetypes,scalable/places,scalable/status") --pkgconfigdir = $(datadir)/pkgconfig -+pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = gnome-icon-theme.pc - EXTRA_DIST = \ - gnome-icon-theme.pc.in \ diff --git a/source/l/gnome-keyring/doinst.sh b/source/l/gnome-keyring/doinst.sh new file mode 100644 index 000000000..c64347e97 --- /dev/null +++ b/source/l/gnome-keyring/doinst.sh @@ -0,0 +1 @@ +chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/ 2>/dev/null diff --git a/source/l/gnome-keyring/gnome-keyring.SlackBuild b/source/l/gnome-keyring/gnome-keyring.SlackBuild new file mode 100755 index 000000000..81bc47aba --- /dev/null +++ b/source/l/gnome-keyring/gnome-keyring.SlackBuild @@ -0,0 +1,117 @@ +#!/bin/sh + +# Slackware build script for gnome-keyring + +# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=gnome-keyring +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +# Fix improper passphrase caching. +# http://www.openwall.com/lists/oss-security/2012/08/09/2 +zcat $CWD/gpg-agent-Hook-up-the-TTL-cache-option.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/schema-Update-description-for-gpg-cache-method.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/secret-store-Mark-a-secret-item-as-used-when-acces.patch.gz | patch -p1 --verbose || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --disable-static \ + --enable-shared \ + --enable-nls \ + --disable-debug \ + --enable-ssh-agent \ + --with-root-certs=/etc/ssl/certs \ + --with-pam-dir=/lib/security \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +mkdir -p $PKG/etc/gconf/gconf.xml.defaults + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS README* COPYING* HACKING INSTALL NEWS \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -p -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/gnome-keyring/gpg-agent-Hook-up-the-TTL-cache-option.patch b/source/l/gnome-keyring/gpg-agent-Hook-up-the-TTL-cache-option.patch new file mode 100644 index 000000000..c1298f759 --- /dev/null +++ b/source/l/gnome-keyring/gpg-agent-Hook-up-the-TTL-cache-option.patch @@ -0,0 +1,98 @@ +From 7b65bf04737167fae6b0204d6524215550fcc079 Mon Sep 17 00:00:00 2001 +From: Stef Walter <stefw@gnome.org> +Date: Wed, 8 Aug 2012 06:06:58 +0200 +Subject: [PATCH] gpg-agent: Hook up the TTL cache option + + * So that when the gsettings gpg-cache-method is 'idle' or 'timeout' + we use gpg-cache-ttl to control how long the passphrase is cached + for. + * This is a regression from 3.3.x + +https://bugzilla.gnome.org/show_bug.cgi?id=681081 +--- + daemon/gpg-agent/gkd-gpg-agent-ops.c | 40 ++++++++++++++++++++++-------------- + 1 file changed, 25 insertions(+), 15 deletions(-) + +diff --git a/daemon/gpg-agent/gkd-gpg-agent-ops.c b/daemon/gpg-agent/gkd-gpg-agent-ops.c +index a1a21ff..e1c188d 100644 +--- a/daemon/gpg-agent/gkd-gpg-agent-ops.c ++++ b/daemon/gpg-agent/gkd-gpg-agent-ops.c +@@ -323,17 +323,6 @@ load_unlock_options (GcrPrompt *prompt) + g_free (method); + } + +-static void +-save_unlock_options (GcrPrompt *prompt) +-{ +- GSettings *settings; +- +- settings = gkd_gpg_agent_settings (); +- +- if (gcr_prompt_get_choice_chosen (prompt)) +- g_settings_set_string (settings, "gpg-cache-method", GCR_UNLOCK_OPTION_ALWAYS); +-} +- + static GcrPrompt * + open_password_prompt (GckSession *session, + const gchar *keyid, +@@ -406,11 +395,14 @@ do_get_password (GckSession *session, const gchar *keyid, const gchar *errmsg, + const gchar *prompt_text, const gchar *description, gboolean confirm) + { + GckBuilder builder = GCK_BUILDER_INIT; ++ GSettings *settings; + GckAttributes *attrs; + gchar *password = NULL; + GcrPrompt *prompt; + gboolean chosen; + GError *error = NULL; ++ gint lifetime; ++ gchar *method; + + g_assert (GCK_IS_SESSION (session)); + +@@ -431,21 +423,39 @@ do_get_password (GckSession *session, const gchar *keyid, const gchar *errmsg, + } + + if (password != NULL && keyid != NULL) { ++ settings = gkd_gpg_agent_settings (); + + /* Load up the save options */ + chosen = gcr_prompt_get_choice_chosen (prompt); + +- if (chosen) ++ if (chosen) { ++ g_settings_set_string (settings, "gpg-cache-method", GCR_UNLOCK_OPTION_ALWAYS); + gck_builder_add_string (&builder, CKA_G_COLLECTION, "login"); +- else ++ ++ } else { ++ method = g_settings_get_string (settings, "gpg-cache-method"); ++ lifetime = g_settings_get_int (settings, "gpg-cache-ttl"); ++ ++ if (g_strcmp0 (method, GCR_UNLOCK_OPTION_IDLE) == 0) { ++ gck_builder_add_boolean (&builder, CKA_GNOME_TRANSIENT, TRUE); ++ gck_builder_add_ulong (&builder, CKA_G_DESTRUCT_IDLE, lifetime); ++ ++ } else if (g_strcmp0 (method, GCR_UNLOCK_OPTION_TIMEOUT) == 0) { ++ gck_builder_add_boolean (&builder, CKA_GNOME_TRANSIENT, TRUE); ++ gck_builder_add_ulong (&builder, CKA_G_DESTRUCT_AFTER, lifetime); ++ ++ } else if (g_strcmp0 (method, GCR_UNLOCK_OPTION_SESSION)){ ++ g_message ("Unsupported gpg-cache-method setting: %s", method); ++ } ++ + gck_builder_add_string (&builder, CKA_G_COLLECTION, "session"); ++ g_free (method); ++ } + + /* Now actually save the password */ + attrs = gck_attributes_ref_sink (gck_builder_end (&builder)); + do_save_password (session, keyid, description, password, attrs); + gck_attributes_unref (attrs); +- +- save_unlock_options (prompt); + } + + g_clear_object (&prompt); +-- +1.7.11.2
\ No newline at end of file diff --git a/source/l/gnome-keyring/schema-Update-description-for-gpg-cache-method.patch b/source/l/gnome-keyring/schema-Update-description-for-gpg-cache-method.patch new file mode 100644 index 000000000..12b6fb2d1 --- /dev/null +++ b/source/l/gnome-keyring/schema-Update-description-for-gpg-cache-method.patch @@ -0,0 +1,30 @@ +From 6387fb065d5ea16c777a0aee05b22c3cc6a0f73c Mon Sep 17 00:00:00 2001 +From: Stef Walter <stefw@gnome.org> +Date: Wed, 8 Aug 2012 06:06:24 +0200 +Subject: [PATCH] schema: Update description for gpg-cache-method + + * Document the various method strings that can be present here + +https://bugzilla.gnome.org/show_bug.cgi?id=681081 +--- + schema/org.gnome.crypto.cache.gschema.xml | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/schema/org.gnome.crypto.cache.gschema.xml b/schema/org.gnome.crypto.cache.gschema.xml +index 9a431eb..4547399 100644 +--- a/schema/org.gnome.crypto.cache.gschema.xml ++++ b/schema/org.gnome.crypto.cache.gschema.xml +@@ -3,7 +3,10 @@ + <key name="gpg-cache-method" type="s"> + <default>'session'</default> + <summary>Cache Method</summary> +- <description>The method to use for caching passphrases typed into the GPG agent.</description> ++ <description>The method to use for caching passphrases typed into the GPG agent. ++ Should be one of: 'always' caches permanently, 'session' caches until session end, ++ 'idle' caches until the not used for gpg-cache-ttl seconds, 'timeout' caches until ++ gpg-cache-ttl seconds.</description> + </key> + <key name="gpg-cache-ttl" type="i"> + <default>300</default> +-- +1.7.11.2
\ No newline at end of file diff --git a/source/l/gnome-keyring/secret-store-Mark-a-secret-item-as-used-when-acces.patch b/source/l/gnome-keyring/secret-store-Mark-a-secret-item-as-used-when-acces.patch new file mode 100644 index 000000000..1785b0cd2 --- /dev/null +++ b/source/l/gnome-keyring/secret-store-Mark-a-secret-item-as-used-when-acces.patch @@ -0,0 +1,26 @@ +From d96c49f0bf1710b69a354f4bdebf6b53bf5cb0bc Mon Sep 17 00:00:00 2001 +From: Stef Walter <stefw@gnome.org> +Date: Wed, 8 Aug 2012 15:08:22 +0200 +Subject: [PATCH] secret-store: Mark a secret item as 'used' when accessed + + * This makes the gpg-agent idle feature work correctly + +https://bugzilla.gnome.org/show_bug.cgi?id=681081 +--- + pkcs11/secret-store/gkm-secret-item.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pkcs11/secret-store/gkm-secret-item.c b/pkcs11/secret-store/gkm-secret-item.c +index 35698da..d7cbdb3 100644 +--- a/pkcs11/secret-store/gkm-secret-item.c ++++ b/pkcs11/secret-store/gkm-secret-item.c +@@ -224,6 +224,7 @@ gkm_secret_item_real_get_attribute (GkmObject *base, GkmSession *session, CK_ATT + identifier = gkm_secret_object_get_identifier (GKM_SECRET_OBJECT (self)); + secret = gkm_secret_data_get_raw (sdata, identifier, &n_secret); + rv = gkm_attribute_set_data (attr, secret, n_secret); ++ gkm_object_mark_used (base); + g_object_unref (sdata); + return rv; + +-- +1.7.11.2
\ No newline at end of file diff --git a/source/l/gnome-keyring/slack-desc b/source/l/gnome-keyring/slack-desc new file mode 100644 index 000000000..33e06ef94 --- /dev/null +++ b/source/l/gnome-keyring/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +gnome-keyring: GNOME Keyring (a tool to handle security credentials) +gnome-keyring: +gnome-keyring: GNOME Keyring is a program designed to take care of the user's +gnome-keyring: security credentials, such as user names and passwords, in an +gnome-keyring: easy to access manner. The keyring is implemented as a daemon +gnome-keyring: and uses the process name gnome-keyring-daemon. +gnome-keyring: +gnome-keyring: +gnome-keyring: +gnome-keyring: +gnome-keyring: diff --git a/source/l/gobject-introspection/gobject-introspection.SlackBuild b/source/l/gobject-introspection/gobject-introspection.SlackBuild new file mode 100755 index 000000000..7dcd4fda0 --- /dev/null +++ b/source/l/gobject-introspection/gobject-introspection.SlackBuild @@ -0,0 +1,132 @@ +#!/bin/sh + +# Slackware build script for gobject-introspection + +# Copyright 2009 Andrew Psaltis <ampsaltis@gmail.com> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS:wOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=gobject-introspection +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz +cd $PKGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --libdir=/usr/lib$LIBDIRSUFFIX \ + --mandir=/usr/man \ + --disable-static \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS CONTRIBUTORS COPYING* NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/gobject-introspection/slack-desc b/source/l/gobject-introspection/slack-desc new file mode 100644 index 000000000..ca41d8c88 --- /dev/null +++ b/source/l/gobject-introspection/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +gobject-introspection: gobject-introspection (GObject interface introspection library) +gobject-introspection: +gobject-introspection: GObject Introspection is a project for providing machine readable +gobject-introspection: introspection data of the API of C libraries. This introspection data +gobject-introspection: can be used for automatic code generation for bindings, API +gobject-introspection: verification, and documentation generation. +gobject-introspection: +gobject-introspection: For more information, check out: +gobject-introspection: http://live.gnome.org/GObjectIntrospection +gobject-introspection: +gobject-introspection: diff --git a/source/l/grantlee/grantlee.SlackBuild b/source/l/grantlee/grantlee.SlackBuild new file mode 100755 index 000000000..f44290597 --- /dev/null +++ b/source/l/grantlee/grantlee.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Copyright 2010, 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=grantlee +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir -p build +cd build + QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \ + PATH=$QTDIR/bin:$PATH \ + cmake \ + $KDE_OPT_ARGS \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd - + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a AUTHORS CHANGELOG COPYING* GOALS README \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/hal-info/slack-desc b/source/l/grantlee/slack-desc index 0de313531..445d14191 100644 --- a/source/l/hal-info/slack-desc +++ b/source/l/grantlee/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':'. |-----handy-ruler-------------------------------------------------------| -hal-info: hal-info (device information for HAL) -hal-info: -hal-info: The hal-info package contains device information for HAL, a Hardware -hal-info: Abstraction Layer. -hal-info: -hal-info: For more info, see: http://www.freedesktop.org/Software/hal -hal-info: -hal-info: -hal-info: -hal-info: -hal-info: +grantlee: grantlee (string template engine) +grantlee: +grantlee: Grantlee is a plugin based String Template system written using the +grantlee: Qt framework. The goals of the project are to make it easier for +grantlee: application developers to separate the structure of documents from +grantlee: the data they contain, opening the door for theming. +grantlee: +grantlee: Homepage: http://gitorious.org/grantlee/ +grantlee: +grantlee: +grantlee: diff --git a/source/l/gsettings-desktop-schemas/doinst.sh b/source/l/gsettings-desktop-schemas/doinst.sh new file mode 100644 index 000000000..2890b5be6 --- /dev/null +++ b/source/l/gsettings-desktop-schemas/doinst.sh @@ -0,0 +1 @@ +chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/ 1> /dev/null 2> /dev/null diff --git a/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild new file mode 100755 index 000000000..e85ea1cec --- /dev/null +++ b/source/l/gsettings-desktop-schemas/gsettings-desktop-schemas.SlackBuild @@ -0,0 +1,106 @@ +#!/bin/sh + +# Slackware build script for gsettings-desktop-schemas + +# Copyright 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=gsettings-desktop-schemas +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux || exit 1 + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* HACKING MAINTAINERS NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/gsettings-desktop-schemas/slack-desc b/source/l/gsettings-desktop-schemas/slack-desc new file mode 100644 index 000000000..4d0d3b953 --- /dev/null +++ b/source/l/gsettings-desktop-schemas/slack-desc @@ -0,0 +1,19 @@ +# 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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +gsettings-desktop-schemas: gsettings-desktop-schemas (GSettings schemas) +gsettings-desktop-schemas: +gsettings-desktop-schemas: gsettings-desktop-schemas contains a collection of GSettings schemas +gsettings-desktop-schemas: for settings shared by various components of a desktop. +gsettings-desktop-schemas: +gsettings-desktop-schemas: +gsettings-desktop-schemas: +gsettings-desktop-schemas: +gsettings-desktop-schemas: +gsettings-desktop-schemas: +gsettings-desktop-schemas: diff --git a/source/l/gst-plugins-base/gst-plugins-base.SlackBuild b/source/l/gst-plugins-base/gst-plugins-base.SlackBuild index e6e3c84cc..4081e96d6 100755 --- a/source/l/gst-plugins-base/gst-plugins-base.SlackBuild +++ b/source/l/gst-plugins-base/gst-plugins-base.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=gst-plugins-base VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -92,10 +92,20 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ diff --git a/source/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff b/source/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff deleted file mode 100644 index 7c896090a..000000000 --- a/source/l/gst-plugins-good/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./sys/v4l2/gstv4l2object.c.orig 2011-03-08 07:56:07.000000000 -0600 -+++ ./sys/v4l2/gstv4l2object.c 2011-04-15 22:19:11.802999999 -0500 -@@ -2019,7 +2019,7 @@ - /* ideally we would differentiate between types of interlaced video - * but there is not sufficient information in the caps.. - */ -- field = V4L2_FIELD_SEQ_TB; -+ field = V4L2_FIELD_INTERLACED; - } else { - GST_DEBUG_OBJECT (v4l2object->element, "progressive video"); - field = V4L2_FIELD_NONE; diff --git a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild index 112ebe0b9..0db2baa85 100755 --- a/source/l/gst-plugins-good/gst-plugins-good.SlackBuild +++ b/source/l/gst-plugins-good/gst-plugins-good.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=gst-plugins-good VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -68,8 +68,6 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION -zcat $CWD/gst-plugins-good.6b86b56abd8a28b9e94cee679e3d86367a9a0ab3.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -112,7 +110,7 @@ fi mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING* INSTALL NEWS README* RELEASE REQUIREMENTS \ + AUTHORS COPYING* INSTALL NEWS README* RELEASE REQUIREMENTS \ $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history diff --git a/source/l/gstreamer/gstreamer.SlackBuild b/source/l/gstreamer/gstreamer.SlackBuild index 293b90fa0..83d959cb2 100755 --- a/source/l/gstreamer/gstreamer.SlackBuild +++ b/source/l/gstreamer/gstreamer.SlackBuild @@ -100,14 +100,24 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING* INSTALL MAINTAINERS NEWS README* RELEASE TODO \ + AUTHORS COPYING* INSTALL MAINTAINERS NEWS README* RELEASE TODO \ $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history diff --git a/source/l/gtk+2/gtk+2.SlackBuild b/source/l/gtk+2/gtk+2.SlackBuild index efda2839f..9fff68c45 100755 --- a/source/l/gtk+2/gtk+2.SlackBuild +++ b/source/l/gtk+2/gtk+2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=${VERSION:-$(echo gtk+-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -99,7 +99,7 @@ CFLAGS="$SLKCFLAGS -DHOST='"'"${ARCH}-slackware-linux"'"'" \ --mandir=/usr/man \ --with-xinput=yes \ --enable-xkb \ - --disable-introspection \ + --enable-introspection \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -116,13 +116,6 @@ make install \ DESTDIR=$PKG \ || exit 1 -# You'll probably need to install the newly made package right away to -# fix the result of this next line, but we had to clear this. Sorry. -rm -rf /etc/gtk-2.0 -# I'm spamming your root partition because /etc/gtk-2.0 won't install to $DESTDIR... -make install -cp -a /etc/gtk-2.0/* $PKG/etc/gtk-2.0/ || exit 1 -rm -rf $PKG/etc/gtk-2.0/$host mkdir -p $PKG/etc/gtk-2.0/$host mv $PKG/etc/gtk-2.0/gtk.immodules $PKG/etc/gtk-2.0/$host/ diff --git a/source/l/gtk+3/doinst.sh b/source/l/gtk+3/doinst.sh new file mode 100644 index 000000000..90d1085fe --- /dev/null +++ b/source/l/gtk+3/doinst.sh @@ -0,0 +1,28 @@ +config() { + NEW="$1" + 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 + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/gtk-3.0/gtkrc.new +config etc/gtk-3.0/im-multipress.conf.new +rm -f etc/gtk-3.0/gtkrc.new + +chroot . rm -f /usr/share/icons/*/icon-theme.cache 1> /dev/null 2> /dev/null + +# Run this if we are on an installed system. Otherwise it will be +# handled on first boot. +if [ -x /usr/bin/update-gtk-immodules-3.0 ]; then + /usr/bin/update-gtk-immodules-3.0 +fi + +# In case this is the first run installing the standalone gdk-pixbuf, +# we will run this a second time to fix machines that will not reboot. +chroot . /usr/bin/update-gdk-pixbuf-loaders 1> /dev/null 2> /dev/null + diff --git a/source/l/gtk+3/gtk+3.SlackBuild b/source/l/gtk+3/gtk+3.SlackBuild new file mode 100755 index 000000000..c4e972eb5 --- /dev/null +++ b/source/l/gtk+3/gtk+3.SlackBuild @@ -0,0 +1,188 @@ +#!/bin/sh + +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +VERSION=${VERSION:-$(echo gtk+-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +# 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} +PKG=$TMP/package-gtk3 + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG/usr +cd $TMP +rm -rf gtk+-$VERSION +tar xvf $CWD/gtk+-$VERSION.tar.?z* || exit 1 +cd gtk+-$VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Use /etc/gtk-3.0/$ARCH-slackware-linux instead of /etc/gtk-3.0/ for gtk.immodules +zcat $CWD/use_host_triplet_for_gtk_immodules.diff.gz | patch -p1 --verbose || exit 1 + +# Regenerate ./configure: +libtoolize --copy --force +autoreconf -vif + +# Autoconf changes linux to linux-gnu. +# Our host is $ARCH-slackware-linux not $ARCH-slackware-linux-gnu: +sed -i -e 's#linux|linux-gnu|#linux|linux|#' config.sub + +CFLAGS="$SLKCFLAGS -DHOST='"'"${ARCH}-slackware-linux"'"'" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --enable-xkb \ + --build=$ARCH-slackware-linux \ + --host=$ARCH-slackware-linux \ + --target=$ARCH-slackware-linux +# --enable-gtk-doc-html=no \ + +# See modules/input/Makefile.am +make \ + imconffiledir=/etc/gtk-3.0/$ARCH-slackware-linux \ + $NUMJOBS || make || exit 1 + +# Check the host value that is passed to the compile to the one in this script: +host="$ARCH-slackware-linux" +# Best I can tell, it doesn't matter if they match. Since gtk+3-3.2.0, both +# build_triplet and host_triplet have "-gnu" appended to them, but neither of +# those seem to actually be used anywhere. Commenting out unless I find out +# that I'm wrong later... :-) --rworkman +#compile_host=$(grep 'host_triplet =' gtk/Makefile | sed -e "s/.* = //") +#if [ "x$compile_host" != "x$host" ]; then +# echo "Host mismatch: compile='$compile_host', SlackBuild='$host'" && exit 1 +#fi + +make install \ + imconffiledir=/etc/gtk-3.0/$ARCH-slackware-linux \ + RUN_QUERY_IMMODULES_TEST=false RUN_QUERY_LOADER_TEST=false \ + DESTDIR=$PKG \ + || exit 1 + +# You'll probably need to install the newly made package right away to +# fix the result of this next line, but we had to clear this. Sorry. +rm -rf /etc/gtk-3.0 +# I'm spamming your root partition because /etc/gtk-3.0 won't install to $DESTDIR... +make install imconffiledir=/etc/gtk-3.0/$ARCH-slackware-linux +cp -a /etc/gtk-3.0 $PKG/etc || exit 1 +mv $PKG/etc/gtk-3.0/$host/im-multipress.conf $PKG/etc/gtk-3.0/im-multipress.conf.new +rm -f $PKG/etc/gtk-3.0/$host/* +if [ -r $PKG/etc/gtk-3.0/gtk.immodules ]; then + mv $PKG/etc/gtk-3.0/gtk.immodules $PKG/etc/gtk-3.0/$host/ +fi + +# Install a "starter" gtkrc +echo 'gtk-theme-name="GTK+"' > $PKG/etc/gtk-3.0/gtkrc.new + +# We need to have separate 32-bit and 64-bit binaries +# for places where we have two copies of the GTK+ package installed. +# (we might have x86_64 and i486 packages on the same system, for example.) +case "$host" in + s390x*|x86_64*) + mv $PKG/usr/bin/gtk-query-immodules-3.0{,-64} + ( cd $PKG/usr/bin + ln -sf gtk-query-immodules-3.0-64 gtk-query-immodules-3.0 + ) + ;; + *) + mv $PKG/usr/bin/gtk-query-immodules-3.0{,-32} + ( cd $PKG/usr/bin + ln -sf gtk-query-immodules-3.0-32 gtk-query-immodules-3.0 + ) + ;; +esac + +# Install wrappers for the binaries: +cp $CWD/update-gtk-immodules-3.0 $PKG/usr/bin/update-gtk-immodules-3.0 +chmod 0755 $PKG/usr/bin/update-* + +find $PKG | xargs file | egrep "executable|shared object" | grep "ELF" | \ + cut -d: -f1 | xargs strip --strip-unneeded 2>/dev/null + +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.* + ) + done + ) +fi + +# Copy extra documentation into package. +mkdir -p $PKG/usr/doc/gtk+3-$VERSION +cp -a \ + AUTHORS COPYING NEWS README \ + $PKG/usr/doc/gtk+3-$VERSION +( cd $PKG/usr/doc/gtk+3-$VERSION + ln -s /usr/share/gtk-doc/html/gail-libgail-util . + ln -s /usr/share/gtk-doc/html/gdk . + ln -s /usr/share/gtk-doc/html/gtk . +) +find $PKG/usr/doc/gtk+3-$VERSION/ -type f -exec chmod 644 {} \; +chown -R root:root $PKG/usr/doc/gtk+3-$VERSION + +mkdir -p $PKG/install +zcat $CWD/doinst.sh > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -p -l y -c n $TMP/gtk+3-${VERSION}-$ARCH-${BUILD}.txz diff --git a/source/l/gtk+3/slack-desc b/source/l/gtk+3/slack-desc new file mode 100644 index 000000000..47816927c --- /dev/null +++ b/source/l/gtk+3/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +gtk+3: GTK+ version 3 (multi-platform GUI toolkit) +gtk+3: +gtk+3: This is GTK+, a multi-platform toolkit for creating graphical user +gtk+3: interfaces. Offering a complete set of widgets, GTK+ is suitable for +gtk+3: projects ranging from small one-off projects to complete application +gtk+3: suites. +gtk+3: +gtk+3: +gtk+3: +gtk+3: +gtk+3: diff --git a/source/l/gtk+3/update-gtk-immodules-3.0 b/source/l/gtk+3/update-gtk-immodules-3.0 new file mode 100644 index 000000000..06a705648 --- /dev/null +++ b/source/l/gtk+3/update-gtk-immodules-3.0 @@ -0,0 +1,86 @@ +#! /bin/sh +# Updates the immodules in /etc/gtk-3.0/$host + +umask 022 + +# Get the machine type from uname: +host=$(uname -m)-slackware-linux + +# Fix $host for arm arch: +case "$host" in + arm*) host=arm-slackware-linux-gnueabi ;; +esac + +# Deriving /etc/gtk-3.0/$host location +# +# We have had problems in the past with build systems +# changing host from i386 to i686 and appending/dropping +# the -gnu suffix, so try to match up the $host we got +# with whats actually there. +if [ ! -d /etc/gtk-3.0/$host ]; then + case "$host" in + i?86*) + for d in $(ls -d /etc/gtk-3.0/i?86*); do + host=$(basename $d) + break + done + ;; + esac +fi + +FILE=/etc/gtk-3.0/$host/gtk.immodules + +case "$host" in + s390x*|x86_64*) + if [ -x /usr/bin/gtk-query-immodules-3.0-64 ]; then + if [ "$1" = "--verbose" ]; then + echo "Updating gtk.immodules for ${host}:" + echo " /usr/bin/gtk-query-immodules-3.0-64 \\" + echo " > $FILE" + fi + /usr/bin/gtk-query-immodules-3.0-64 > $FILE + # Check for x86_64 multilib: + if ls -d /etc/gtk-3.0/i?86* 1> /dev/null 2> /dev/null ; then + for d in $(ls -d /etc/gtk-3.0/i?86*); do + mlhost=$(basename $d) + break + done + if [ -r /etc/gtk-3.0/$mlhost/gtk.immodules -a \ + -x /usr/bin/gtk-query-immodules-3.0-32 ]; then + FILE=/etc/gtk-3.0/$mlhost/gtk.immodules + if [ "$1" = "--verbose" ]; then + echo "Updating gtk.immodules for ${mlhost}:" + echo " /usr/bin/gtk-query-immodules-3.0-32 \\" + echo " > $FILE" + fi + /usr/bin/gtk-query-immodules-3.0-32 > $FILE + fi + fi + else + if [ "$1" = "--verbose" ]; then + echo "Updating gtk.immodules for ${host}:" + echo " /usr/bin/gtk-query-immodules-3.0 \\" + echo " > $FILE" + fi + /usr/bin/gtk-query-immodules-3.0 > $FILE + fi + ;; + *) + if [ -x /usr/bin/gtk-query-immodules-3.0-32 ]; then + if [ "$1" = "--verbose" ]; then + echo "Updating gtk.immodules for ${host}:" + echo " /usr/bin/gtk-query-immodules-3.0-32 \\" + echo " > $FILE" + fi + /usr/bin/gtk-query-immodules-3.0-32 > $FILE + else + if [ "$1" = "--verbose" ]; then + echo "Updating gtk.immodules for ${host}:" + echo " /usr/bin/gtk-query-immodules-3.0 \\" + echo " > $FILE" + fi + /usr/bin/gtk-query-immodules-3.0 > $FILE + fi + ;; +esac + diff --git a/source/l/gtk+3/use_host_triplet_for_gtk_immodules.diff b/source/l/gtk+3/use_host_triplet_for_gtk_immodules.diff new file mode 100644 index 000000000..92a8a121c --- /dev/null +++ b/source/l/gtk+3/use_host_triplet_for_gtk_immodules.diff @@ -0,0 +1,11 @@ +diff -Nur gtk+-3.0.12.orig//gtk/Makefile.am gtk+-3.0.12/gtk/Makefile.am +--- gtk+-3.0.12.orig//gtk/Makefile.am 2011-07-27 20:34:32.000000000 -0500 ++++ gtk+-3.0.12/gtk/Makefile.am 2011-08-03 20:35:55.780035282 -0500 +@@ -37,6 +37,7 @@ + -DGTK_LIBDIR=\"$(libdir)\" \ + -DGTK_DATADIR=\"$(datadir)\" \ + -DGTK_DATA_PREFIX=\"$(prefix)\" \ ++ -DHOST=\"$(host_triplet)\" \ + -DGTK_SYSCONFDIR=\"$(sysconfdir)\" \ + -DGTK_VERSION=\"$(GTK_VERSION)\" \ + -DGTK_BINARY_VERSION=\"$(GTK_BINARY_VERSION)\" \ diff --git a/source/l/gvfs/doinst.sh b/source/l/gvfs/doinst.sh new file mode 100644 index 000000000..697dafc5b --- /dev/null +++ b/source/l/gvfs/doinst.sh @@ -0,0 +1,4 @@ +# Try to run these. If they fail, no biggie. +chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/ 1> /dev/null 2> /dev/null +chroot . /usr/bin/gio-querymodules @LIBDIR@/gio/modules/ 1> /dev/null 2> /dev/null + diff --git a/source/l/gvfs/gvfs.SlackBuild b/source/l/gvfs/gvfs.SlackBuild new file mode 100755 index 000000000..47bdfce0f --- /dev/null +++ b/source/l/gvfs/gvfs.SlackBuild @@ -0,0 +1,132 @@ +#!/bin/sh + +# Copyright 2009-2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=gvfs +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +NUMJOBS=${NUMJOBS:--j6} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + *) export ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --enable-gtk-doc \ + --disable-hal \ + --build=$ARCH-$PKGNAM-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't set AutoMount to true for network volumes. Doing so leads to long +# delays in Thunar. Users may click the network button in Thunar to mount +# them instead. +sed -i -e "s/AutoMount=true/AutoMount=false/g" $PKG/usr/share/gvfs/mounts/network.mount + +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +mkdir -p $PKG/etc/bash_completion.d/ +mv $PKG/etc/profile.d/gvfs-bash-completion.sh \ + $PKG/etc/bash_completion.d/gvfs + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL MAINTAINERS NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz | sed "s,@LIBDIR@,/usr/lib${LIBDIRSUFFIX}," > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/gvfs/slack-desc b/source/l/gvfs/slack-desc new file mode 100644 index 000000000..8d8cd0459 --- /dev/null +++ b/source/l/gvfs/slack-desc @@ -0,0 +1,19 @@ +# 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--------------------------------------------------------| +gvfs: gvfs (glib virtual filesystems) +gvfs: +gvfs: gvfs is a userspace virtual filesystem designed to work with the I/O +gvfs: abstractions of libgio (a library included in the glib2 package). +gvfs: It installs several modules that are automatically used by applications +gvfs: that use the libgio API. There is also fuse support that allows +gvfs: applications not using gio to access the gvfs filesystems. +gvfs: +gvfs: +gvfs: +gvfs: diff --git a/source/l/hal-info/patches/quirk-LG_X110-keyboard.patch b/source/l/hal-info/patches/quirk-LG_X110-keyboard.patch deleted file mode 100644 index 330b86999..000000000 --- a/source/l/hal-info/patches/quirk-LG_X110-keyboard.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 1a3c7c28d028c0952404d6d45b58138849c09ff1 -Author: Ozan Çağlayan <ozan@pardus.org.tr> -Date: Wed Dec 23 10:13:26 2009 +0200 - - Add keymap quirks for LG X110 - - The patch adds keyboard quirks for LG X110 (An MSI Wind clone) which has - the following DMI informations: - - system.hardware.primary_video.product = 10158 (0x27ae) (int) - system.hardware.primary_video.vendor = 32902 (0x8086) (int) - system.hardware.product = 'X110-L.A7M3F3' (string) - system.hardware.serial = '812MSVJ025279' (string) - system.hardware.uuid = '00000000-0000-0000-0000-002185569235' (string) - system.hardware.vendor = 'LG Electronics' (string) - system.hardware.version = 'Ver.001' (string) - - Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> - -diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi -index c4e527e..39d71ed 100644 ---- a/fdi/information/10freedesktop/30-keymap-misc.fdi -+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi -@@ -103,6 +103,22 @@ - </match> - </match> - -+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix="LG"> -+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="X110"> -+ <append key="input.keymap.data" type="strlist">e020:mute</append> <!-- Fn-F9 Sound On/Off --> -+ <append key="input.keymap.data" type="strlist">e02e:volumedown</append> <!-- Fn-Left Volume down --> -+ <append key="input.keymap.data" type="strlist">e02f:search</append> <!-- Fn-F3 Search --> -+ <append key="input.keymap.data" type="strlist">e030:volumeup</append> <!-- Fn-Right Volume up --> -+ <append key="input.keymap.data" type="strlist">e031:battery</append> <!-- Fn-F10 Info --> -+ <append key="input.keymap.data" type="strlist">e033:suspend</append> <!-- Fn-F12 Hibernate --> -+ <append key="input.keymap.data" type="strlist">e05f:sleep</append> <!-- Fn-F4 Sleep --> -+ <append key="input.keymap.data" type="strlist">e064:f22</append> <!-- Fn-F5 Touchpad disable --> -+ <append key="input.keymap.data" type="strlist">e076:wlan</append> <!-- Fn-F6 satellite dish1 --> -+ <append key="input.keymap.data" type="strlist">e077:brightnessdown</append> <!-- Fn-Down Brightness down --> -+ <append key="input.keymap.data" type="strlist">e078:brightnessup</append> <!-- Fn-Up Brightness up --> -+ </match> -+ </match> -+ - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" string="MEDIONNB"> - <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="A555"> - <append key="input.keymap.data" type="strlist">63:www</append> <!-- N button --> diff --git a/source/l/hal-info/patches/quirk-acer_aspire_hotkey.patch b/source/l/hal-info/patches/quirk-acer_aspire_hotkey.patch deleted file mode 100644 index 390fc7fe8..000000000 --- a/source/l/hal-info/patches/quirk-acer_aspire_hotkey.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 16e1c1921e089a4b53940b6b265fc72446d28254 -Author: Keng-Yu Lin <keng-yu.lin@canonical.com> -Date: Wed Sep 16 15:08:05 2009 +0800 - - Add hotkey quirk for Acer Aspire One (AO531h/AO751h) - - To prevent the brightness adjustment OSD from showing when disabling the bluetooth. - - Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> - -diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi -index a2cf8d8..4511bff 100644 ---- a/fdi/information/10freedesktop/30-keymap-acer.fdi -+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi -@@ -61,6 +61,10 @@ - <append key="input.keymap.data" type="strlist">e012:prog2</append> - <append key="input.keymap.data" type="strlist">e059:bluetooth</append> <!-- Bluetooth (toggle) on-to-off --> - </match> -+ <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="AO751h;AO531h"> -+ <remove key="input.keymap.data" type="strlist">e059:brightnessup</remove> -+ <append key="input.keymap.data" type="strlist">e059:bluetooth</append> <!-- Bluetooth (toggle) on-to-off --> -+ </match> - </match> - </match> - </device> diff --git a/source/l/hal/hal.SlackBuild b/source/l/hal/hal.SlackBuild deleted file mode 100755 index 57d9e3bc6..000000000 --- a/source/l/hal/hal.SlackBuild +++ /dev/null @@ -1,177 +0,0 @@ -#!/bin/sh - -# Copyright 2007 Ole Andre Rodlie <olear@slackforge.net> -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PKGNAM=hal -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} - -NUMJOBS=${NUMJOBS:--j7} - -# 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} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP || exit 1 -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# Restore the DontZap defaults from lore -zcat $CWD/patches/10-keymap.fdi-restore_zap.diff.gz | patch -p1 --verbose || exit 1 - -# Oops, a freebsd-specific commit wasn't :-) -zcat $CWD/patches/fix_libusb_detection.diff.gz | patch -p1 --verbose || exit 1 - -# Fix a segfault -- http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562068 -zcat $CWD/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff.gz | patch -p1 --verbose || exit 1 - -# Increase PATH_HAL_MAX to 4096 to avoid crashes -# https://bugs.freedesktop.org/show_bug.cgi?id=25888 -zcat $CWD/patches/increase_HAL_PATH_MAX_to_4096.diff.gz | patch -p1 --verbose || exit 1 - -# Handle input.touchpad explicitly (needed due to kernel changes) -zcat $CWD/patches/handle_input.touchpad_explicitly.diff.gz | patch -p1 --verbose || exit 1 - -# Fix incorrect arguments to ioperm() -zcat $CWD/patches/fix_ioperm_arguments.patch.gz | patch -p1 --verbose || exit 1 - -# Fix segfaults from not calling dbus_error_init() early enough -zcat $CWD/patches/fix_segfault-dbus_error_init.patch.gz | patch -p1 --verbose || exit 1 - -# Ignore internal DM devices with new DM udev rules -# https://bugzilla.redhat.com/show_bug.cgi?id=613909 -# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286 -zcat $CWD/patches/ignore_internal_dm_devices.diff.gz | patch -p1 --verbose || exit 1 - -# Fix build with automake 1.11.1 -zcat $CWD/patches/fix-build-with-automake-1.11.1.patch | patch -p1 --verbose || exit 1 - -# Fix segfault in hald/linux/device.c -zcat $CWD/patches/fix-hal-segfault.patch | patch -p1 --verbose || exit 1 - -autoconf -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --libexecdir=/usr/libexec \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --with-udev-prefix=/lib \ - --disable-static \ - --enable-docbook-docs \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --with-pid-file=/var/run/hald/pid \ - --enable-parted \ - --disable-policy-kit \ - --enable-console-kit \ - --disable-acl-management \ - --enable-umount-helper \ - --enable-sonypic \ - --build=$ARCH-slackware-linux \ - || exit 1 -# These were merged into the 2.6.22 kernels -# --enable-acpi-ibm --enable-acpi-toshiba -# Use these instead of the corresponding --disable lines for PolicyKit support -# --enable-policy-kit \ -# --enable-console-kit \ -# --enable-acl-management \ - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) - -# Install init script for hal -mkdir -p $PKG/etc/rc.d -zcat $CWD/rc.hald.gz > $PKG/etc/rc.d/rc.hald.new -# Make HAL run by default: -chmod 0755 $PKG/etc/rc.d/rc.hald.new - -# /* remove everything between the C-style comments if using PK -# Make the HAL access controls suitable for us -# Big thanks to Richard Hughes for feedback on this :-) -# First, move the one installed by the system to the docs directory -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -mv $PKG/etc/dbus-1/system.d/hal.conf \ - $PKG/usr/doc/$PKGNAM-$VERSION/hal.conf.orig -# end removal */ -# Don't clobber an existing config file in case custom changes have been made -zcat $CWD/hal.conf.gz > $PKG/etc/dbus-1/system.d/hal.conf.new - -# Install docs (directory was created above) -cp -a \ - AUTHORS COPYING* HACKING INSTALL NEWS README* \ - $PKG/usr/doc/$PKGNAM-$VERSION -( cd $PKG/usr/doc/$PKGNAM-$VERSION - ln -s ../../share/gtk-doc/html/libhal libhal - ln -s ../../share/gtk-doc/html/libhal-storage libhal-storage -) - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/source/l/hal/hal.conf b/source/l/hal/hal.conf deleted file mode 100644 index 03c75353b..000000000 --- a/source/l/hal/hal.conf +++ /dev/null @@ -1,69 +0,0 @@ -<!DOCTYPE busconfig PUBLIC - "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" - "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> -<busconfig> - - <!-- Only root or user haldaemon can own the HAL service --> - <policy user="haldaemon"> - <allow own="org.freedesktop.Hal"/> - </policy> - <policy user="root"> - <allow own="org.freedesktop.Hal"/> - </policy> - - <policy context="default"> - <!-- Allow anyone to invoke methods on the Introspectable interface --> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.DBus.Introspectable"/> - <!-- Allow anyone to invoke methods on the Properties interface --> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.DBus.Properties" /> - <!-- Allow anyone to invoke methods on the Manager interface --> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Manager"/> - <!-- Allow anyone to invoke methods on the Device interface --> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device"/> - </policy> - - <!-- Allow members of 'power' group to do power management stuff --> - <policy group="power"> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.CPUFreq"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.LaptopPanel"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.KeyboardBacklight"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.LightSensor"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.DockStation"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.Leds"/> - </policy> - - <!-- Allow members of 'plugdev' group to mount/unmount volumes --> - <policy group="plugdev"> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.Storage"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.Storage.Removable"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.Volume"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/> - </policy> - - <!-- Allow members of netdev group to en/disable wake-on-lan in NICs - and to turn radios on and off --> - <policy group="netdev"> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.KillSwitch"/> - <allow send_destination="org.freedesktop.Hal" - send_interface="org.freedesktop.Hal.Device.WakeOnLan"/> - </policy> - -</busconfig> - diff --git a/source/l/hal/patches/10-keymap.fdi-restore_zap.diff b/source/l/hal/patches/10-keymap.fdi-restore_zap.diff deleted file mode 100644 index 12e21ba79..000000000 --- a/source/l/hal/patches/10-keymap.fdi-restore_zap.diff +++ /dev/null @@ -1,67 +0,0 @@ -We're going to make it clearer to users that they should NOT edit - this file (as installed to /usr/share/hal/fdi/... and also let - them know where to copy it and how to edit that copy for an - alternate keymap and such... --rworkman @ 20091211 - -diff -Nur hal-0.5.11.orig/fdi/policy/10osvendor/10-keymap.fdi hal-0.5.11/fdi/policy/10osvendor/10-keymap.fdi ---- hal-0.5.11.orig/fdi/policy/10osvendor/10-keymap.fdi 2008-05-07 18:21:16.000000000 -0500 -+++ hal-0.5.11/fdi/policy/10osvendor/10-keymap.fdi 2009-07-21 00:06:11.779152226 -0500 -@@ -1,4 +1,8 @@ - <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> -+ -+<!-- DO NOT EDIT THIS FILE - IT WILL BE OVERWRITTEN ON UPGRADES. -+ SEE THE "READ THIS" NOTE BELOW FOR INSTRUCTIONS --> -+ - <deviceinfo version="0.2"> - <device> - <match key="info.capabilities" contains="input.keymap"> -@@ -6,18 +10,41 @@ - </match> - - <match key="info.capabilities" contains="input.keys"> -- <merge key="input.xkb.rules" type="string">base</merge> - -- <!-- If we're using Linux, we use evdev by default (falling back to -- keyboard otherwise). --> -- <merge key="input.xkb.model" type="string">keyboard</merge> -- <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" -- string="Linux"> -- <merge key="input.xkb.model" type="string">evdev</merge> -- </match> -+ <!-- Restore Ctrl-Alt-Bksp Xserver Zapping --> -+ <merge key="input.xkb.options" type="string">terminate:ctrl_alt_bksp</merge> - -+ <!-- Edit (as needed) these four lines in the copied fdi file --> -+ <merge key="input.xkb.rules" type="string">base</merge> -+ <merge key="input.xkb.model" type="string">evdev</merge> - <merge key="input.xkb.layout" type="string">us</merge> - <merge key="input.xkb.variant" type="string" /> -+ - </match> - </device> - </deviceinfo> -+ -+<!-- READ THIS FOR CUSTOM KEYBOARD INFORMATION -+ -+ If you want to add a custom model/layout/variant to X, you will need to COPY -+ this file to /etc/hal/fdi/policy/ and edit that copy. After editing it to -+ suit, you will need to leave X, restart the HAL daemon, and start X again. -+ -+ Here's an example of the four lines from above: -+ <merge key="input.xkb.rules" type="string">base</merge> -+ <merge key="input.xkb.model" type="string">evdev</merge> -+ <merge key="input.xkb.layout" type="string">us</merge> -+ <merge key="input.xkb.variant" type="string">intl</merge> -+ -+ Many desktop environments, including KDE and Xfce, have their own methods to -+ configure keyboard layouts and such if you'd like to use them. -+ -+ If you prefer to use the "old" way of configuring keyboards (without HAL's -+ input device hotplugging), then you'll need to add the following lines to -+ the ServerFlags section of /etc/X11/xorg.conf: -+ Option "AllowEmptyInput" "false" -+ Option "AutoAddDevices" "false" -+ Option "AutoEnableDevices" "false" -+ You can now edit the Keyboard section of xorg.conf as usual. -+--> -+ diff --git a/source/l/hal/patches/fix-build-with-automake-1.11.1.patch b/source/l/hal/patches/fix-build-with-automake-1.11.1.patch deleted file mode 100644 index 13d1817ce..000000000 --- a/source/l/hal/patches/fix-build-with-automake-1.11.1.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ce8422fc8ec4881c5e54b651af3ef4ce2ca96847 Mon Sep 17 00:00:00 2001 -From: Bernhard Rosenkraenzer <bero@arklinux.org> -Date: Mon, 23 Aug 2010 14:50:40 +0200 -Subject: [PATCH] fix build with automake 1.11.1 - -Fixed build with automake 1.11.1: whitespace following trailing backslash. -fd.o#29085 ---- - policy/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/policy/Makefile.am b/policy/Makefile.am -index b506a08..503e9f3 100644 ---- a/policy/Makefile.am -+++ b/policy/Makefile.am -@@ -24,7 +24,7 @@ check: - then \ - echo ok; \ - else \ -- echo failed; \ -+ echo failed; \ - exit 1; \ - fi; \ - done; --- -1.7.3.2 - diff --git a/source/l/hal/patches/fix-hal-segfault.patch b/source/l/hal/patches/fix-hal-segfault.patch deleted file mode 100644 index 4e409e318..000000000 --- a/source/l/hal/patches/fix-hal-segfault.patch +++ /dev/null @@ -1,33 +0,0 @@ -From fc9571c07a81aba8a8fdaa8014d4034b6456d203 Mon Sep 17 00:00:00 2001 -From: Michael Schroeder <mls@novell.com> -Date: Mon, 23 Aug 2010 16:13:13 +0200 -Subject: [PATCH] fix hal segfault - -Fixed hal segfault. It crashes because strlen() gets called with a -NULL pointer (ppdev_compute_udi calls hal_util_get_last_element -with a NULL pointer). - -bnc#556485 ---- - hald/linux/device.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -diff --git a/hald/linux/device.c b/hald/linux/device.c -index 8570d46..401dc44 100644 ---- a/hald/linux/device.c -+++ b/hald/linux/device.c -@@ -2287,9 +2287,10 @@ ppdev_compute_udi (HalDevice *d) - gchar udi[256]; - const char *name; - -- name = hal_util_get_last_element( hal_device_property_get_string(d, "linux.device_file")); -+ name = hal_device_property_get_string (d, "linux.device_file"); - - if (name) { -+ name = hal_util_get_last_element (name); - hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/ppdev_%s", name); - } else { - hald_compute_udi (udi, sizeof (udi), "/org/freedesktop/Hal/devices/ppdev"); --- -1.7.3.2 - diff --git a/source/l/hal/patches/fix_ioperm_arguments.patch b/source/l/hal/patches/fix_ioperm_arguments.patch deleted file mode 100644 index 833e07566..000000000 --- a/source/l/hal/patches/fix_ioperm_arguments.patch +++ /dev/null @@ -1,40 +0,0 @@ -commit 597c1ffffd61a15a334ce42f2a569c59f0270bcb -Author: Dmitry Torokhov <dmitry.torokhov@gmail.com> -Date: Thu Feb 25 02:25:18 2010 -0800 - - Fix incorrect arguments to ioperm() call - - The second argument of ioperm() is not the last port to be accessed - but rather length of the port range [port, port + len). - - Signed-off-by: Dmitry Torokhov <dtor@mail.ru> - Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> - -diff --git a/hald/linux/addons/addon-imac-backlight.c b/hald/linux/addons/addon-imac-backlight.c -index e869192..54e4ea3 100644 ---- a/hald/linux/addons/addon-imac-backlight.c -+++ b/hald/linux/addons/addon-imac-backlight.c -@@ -158,7 +158,8 @@ main (int argc, char **argv) - goto out; - } - -- if (ioperm(0xB2, 0xB3, 1) < 0) -+ /* Allow access to ports 0xB2 and 0xB3 */ -+ if (ioperm(0xB2, 2, 1) < 0) - { - HAL_ERROR (("ioperm failed (you should be root).")); - exit(1); -diff --git a/hald/linux/addons/addon-macbookpro-backlight.c b/hald/linux/addons/addon-macbookpro-backlight.c -index 2a6fef6..c1bbbac 100644 ---- a/hald/linux/addons/addon-macbookpro-backlight.c -+++ b/hald/linux/addons/addon-macbookpro-backlight.c -@@ -507,7 +507,8 @@ main (int argc, char *argv[]) - state = INREG(0x7ae4); - OUTREG(0x7ae4, state); - -- if (ioperm (0x300, 0x304, 1) < 0) { -+ /* Allow access to porta 0x300 through 0x304 */ -+ if (ioperm (0x300, 5, 1) < 0) { - HAL_ERROR (("ioperm failed (you should be root).")); - exit(1); - } diff --git a/source/l/hal/patches/fix_libusb_detection.diff b/source/l/hal/patches/fix_libusb_detection.diff deleted file mode 100644 index 8a4637d48..000000000 --- a/source/l/hal/patches/fix_libusb_detection.diff +++ /dev/null @@ -1,65 +0,0 @@ -commit fce91df8ba7f305c624baf1f06961c040b088ecc -Author: Joe Marcus Clarke <marcus@FreeBSD.org> -Date: Mon Dec 7 19:05:27 2009 -0500 - - Fix libusb detection on Linux - - Adjust the FreeBSD libusb20 code so that it does not interfere with the - Linux libusb detection. - - Reported by: Robby Workman <rw@rlworkman.net> - -diff --git a/configure.in b/configure.in -index a8fda51..8363595 100644 ---- a/configure.in -+++ b/configure.in -@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then - fi - AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"]) - --USE_LIBUSB20=no --USE_LIBUSB=no --LIBUSB20_LIBS="" - AC_ARG_WITH([backend], - AS_HELP_STRING([--with-backend=<name>], - [backend to use (linux/solaris/freebsd/dummy)]), -@@ -510,21 +507,25 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin - AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris]) - AC_SUBST(HALD_BACKEND) - if test "x$HALD_BACKEND" = "xfreebsd"; then -- AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no]) --fi --if test "x$USE_LIBUSB20" = "xno"; then -- AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no]) --fi --AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"]) --AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"]) --if test "x$USE_LIBUSB20" = "xyes"; then -- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20]) -- LIBUSB20_LIBS="-lusb20" --elif test "x$USE_LIBUSB" = "xyes"; then -- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20]) -- LIBUSB20_LIBS="-lusb" -+ USE_BSDLIBUSB20=no -+ USE_BSDLIBUSB=no -+ LIBUSB20_LIBS="" -+ AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no]) -+ if test "x$USE_BSDLIBUSB20" = "xno"; then -+ AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no]) -+ fi -+ AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"]) -+ if test "x$USE_BSDLIBUSB20" = "xyes"; then -+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20]) -+ LIBUSB20_LIBS="-lusb20" -+ elif test "x$USE_BSDLIBUSB" = "xyes"; then -+ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20]) -+ LIBUSB20_LIBS="-lusb" -+ fi -+ AC_SUBST(LIBUSB20_LIBS) -+else -+ AM_CONDITIONAL([HAVE_LIBUSB20], [false]) - fi --AC_SUBST(LIBUSB20_LIBS) - - dnl DBUS API is subject to changes - AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change]) diff --git a/source/l/hal/patches/fix_segfault-dbus_error_init.patch b/source/l/hal/patches/fix_segfault-dbus_error_init.patch deleted file mode 100644 index f01eefca0..000000000 --- a/source/l/hal/patches/fix_segfault-dbus_error_init.patch +++ /dev/null @@ -1,179 +0,0 @@ -commit baa61a879985d63f549854518ef14efd40e62e8c -Author: Peter Jones <pjones@redhat.com> -Date: Wed Feb 24 11:19:28 2010 -0500 - - Make sure dbus_error_init() is called before LIBHAL_FREE_DBUS_ERROR() - - If dbus_error_init() is not called before LIBHAL_FREE_DBUS_ERROR() is - called on that error, then it is uninitialized and may segfault. This - means that dbus_error_init() must be called before any "goto out" if - "out:" calls LIBHAL_FREE_DBUS_ERROR(). - - Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> - -diff --git a/hald/linux/probing/probe-hiddev.c b/hald/linux/probing/probe-hiddev.c -index 45d2084..bffc040 100644 ---- a/hald/linux/probing/probe-hiddev.c -+++ b/hald/linux/probing/probe-hiddev.c -@@ -57,11 +57,12 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-ieee1394-unit.c b/hald/linux/probing/probe-ieee1394-unit.c -index 70b0f86..aaa92e2 100644 ---- a/hald/linux/probing/probe-ieee1394-unit.c -+++ b/hald/linux/probing/probe-ieee1394-unit.c -@@ -388,6 +388,8 @@ int main (int argc, char *argv[]) - - setup_logger (); - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; -@@ -396,7 +398,6 @@ int main (int argc, char *argv[]) - if (ieee1394_udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-net-bluetooth.c b/hald/linux/probing/probe-net-bluetooth.c -index 0b1b912..e911eea 100644 ---- a/hald/linux/probing/probe-net-bluetooth.c -+++ b/hald/linux/probing/probe-net-bluetooth.c -@@ -141,6 +141,8 @@ main (int argc, char *argv[]) - DBusMessage *reply = NULL; - DBusError error; - -+ dbus_error_init (&error); -+ - udi = getenv ("UDI"); - if (udi == NULL) - goto out; -@@ -151,8 +153,6 @@ main (int argc, char *argv[]) - - HAL_INFO (("Investigating '%s'", iface)); - -- dbus_error_init (&error); -- - if ((conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-printer.c b/hald/linux/probing/probe-printer.c -index 91ed7bc..7c6d1c6 100644 ---- a/hald/linux/probing/probe-printer.c -+++ b/hald/linux/probing/probe-printer.c -@@ -66,6 +66,8 @@ main (int argc, char *argv[]) - ret = 1; - - setup_logger (); -+ -+ dbus_error_init (&error); - - udi = getenv ("UDI"); - if (udi == NULL) { -@@ -73,7 +75,6 @@ main (int argc, char *argv[]) - goto out; - } - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) { - HAL_ERROR (("ctx init failed")); - goto out; -diff --git a/hald/linux/probing/probe-smbios.c b/hald/linux/probing/probe-smbios.c -index 0bc9689..15c0d4f 100644 ---- a/hald/linux/probing/probe-smbios.c -+++ b/hald/linux/probing/probe-smbios.c -@@ -129,6 +129,8 @@ main (int argc, char *argv[]) - ret = 1; - - setup_logger (); -+ -+ dbus_error_init (&error); - - udi = getenv ("UDI"); - if (udi == NULL) { -@@ -136,7 +138,6 @@ main (int argc, char *argv[]) - goto out; - } - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) { - HAL_ERROR (("ctx init failed")); - goto out; -diff --git a/hald/linux/probing/probe-storage.c b/hald/linux/probing/probe-storage.c -index 824a82e..dd524ca 100644 ---- a/hald/linux/probing/probe-storage.c -+++ b/hald/linux/probing/probe-storage.c -@@ -109,6 +109,8 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - if ((udi = getenv ("UDI")) == NULL) - goto out; - if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL) -@@ -127,7 +129,6 @@ main (int argc, char *argv[]) - else - only_check_for_fs = FALSE; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - -diff --git a/hald/linux/probing/probe-video4linux.c b/hald/linux/probing/probe-video4linux.c -index cf913c0..7bc13e8 100644 ---- a/hald/linux/probing/probe-video4linux.c -+++ b/hald/linux/probing/probe-video4linux.c -@@ -58,6 +58,8 @@ main (int argc, char *argv[]) - - setup_logger (); - -+ dbus_error_init (&error); -+ - device_file = getenv ("HAL_PROP_VIDEO4LINUX_DEVICE"); - if (device_file == NULL) - goto out; -@@ -66,7 +68,6 @@ main (int argc, char *argv[]) - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - ctx = libhal_ctx_init_direct (&error); - if (ctx == NULL) - goto out; -diff --git a/hald/linux/probing/probe-volume.c b/hald/linux/probing/probe-volume.c -index 0de1b91..7268fff 100644 ---- a/hald/linux/probing/probe-volume.c -+++ b/hald/linux/probing/probe-volume.c -@@ -318,6 +318,8 @@ main (int argc, char *argv[]) - /* assume failure */ - ret = 1; - -+ dbus_error_init (&error); -+ - if ((udi = getenv ("UDI")) == NULL) - goto out; - if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL) -@@ -346,7 +348,6 @@ main (int argc, char *argv[]) - - fsusage = getenv ("HAL_PROP_VOLUME_FSUSAGE"); - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - diff --git a/source/l/hal/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff b/source/l/hal/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff deleted file mode 100644 index b5bfdec65..000000000 --- a/source/l/hal/patches/fix_segfault_in_LIBHAL_FREE_DBUS_ERROR.diff +++ /dev/null @@ -1,51 +0,0 @@ -commit dcb2829b8eff61463b0869614ddb07b1c86cecaa -Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> -Date: Wed Dec 30 12:42:52 2009 +0100 - - linux/probe-input: don't use error prio init - - it may happen in the out: case that LIBHAL_FREE_DBUS_ERROR (&error) is - called before the error structure is initialized via - dbus_error_init (&error). This could lead to a segfault during startup - as seen in dmesg: - - |Intel AES-NI instructions are not detected. - |padlock: VIA PadLock not detected. - |hald-probe-inpu[1793]: segfault at 2 ip 00007f656fb68969 sp 00007fff39eeb950 error 4 in libc-2.10.2.so[7f656faf3000+14a000] - |hald-probe-inpu[1796]: segfault at 2 ip 00007fa2c3293969 sp 00007fffd92a5dd0 error 4 in libc-2.10.2.so[7fa2c321e000+14a000] - |hald-probe-inpu[1797]: segfault at 2 ip 00007f1d08ba2969 sp 00007fff34244e30 error 4 in libc-2.10.2.so[7f1d08b2d000+14a000] - |hald-probe-inpu[1799]: segfault at 2 ip 00007f35c0e3d969 sp 00007fffe5ec7ee0 error 4 in libc-2.10.2.so[7f35c0dc8000+14a000] - |hald-probe-inpu[1800]: segfault at 2 ip 00007f931c556969 sp 00007fffe1825b60 error 4 in libc-2.10.2.so[7f931c4e1000+14a000] - |hald-probe-inpu[1801]: segfault at 2 ip 00007f5156d9a969 sp 00007fff4e620af0 error 4 in libc-2.10.2.so[7f5156d25000+14a000] - |RPC: Registered udp transport module. - |RPC: Registered tcp transport module. - - What I run into seems to be reported as Debian #562068 [0]. This patch - makes the segfault go away on my machine. - - [0] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=562068 - - Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> - Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> - - -diff --git a/hald/linux/probing/probe-input.c b/hald/linux/probing/probe-input.c -index 94e9929..cad47d3 100644 ---- a/hald/linux/probing/probe-input.c -+++ b/hald/linux/probing/probe-input.c -@@ -70,6 +70,7 @@ main (int argc, char *argv[]) - fd = -1; - - setup_logger (); -+ dbus_error_init (&error); - - button_type = getenv ("HAL_PROP_BUTTON_TYPE"); - if (button_type == NULL) -@@ -96,7 +97,6 @@ main (int argc, char *argv[]) - if (udi == NULL) - goto out; - -- dbus_error_init (&error); - if ((ctx = libhal_ctx_init_direct (&error)) == NULL) - goto out; - diff --git a/source/l/hal/patches/handle_input.touchpad_explicitly.diff b/source/l/hal/patches/handle_input.touchpad_explicitly.diff deleted file mode 100644 index b1231d6de..000000000 --- a/source/l/hal/patches/handle_input.touchpad_explicitly.diff +++ /dev/null @@ -1,75 +0,0 @@ -commit 6dccf8e3ad181e8f56b1d2a994ec50a1953a1c2d -Author: Michael Witten <mfwitten@gmail.com> -Date: Tue Jan 5 18:53:17 2010 -0600 - - Policy: handle `input.touchpad' explicitly - - This commit essentially duplicates the policy for: - - <match key="info.capabilities" contains="input.mouse"> - - and then changes `input.mouse' to `input.touchpad'. This - is necessary because in Linus Torvalds's Linux repo: - - git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git - - the following commit: - - commit 7105d2ea73e1391b681d0e1212c42f561c64d429 - Author: Dmitry Torokhov <dmitry.torokhov@gmail.com> - Date: Fri Dec 11 23:54:54 2009 -0800 - - Input: ALPS - do not set REL_X/REL_Y capabilities on the touchpad - - Relative events are only reported via secondary device therefore device - associated with the touchpad should not advertise these capabilities. - - Signed-off-by: Dmitry Torokhov <dtor@mail.ru> - - so that HAL no longer adds: - - input.mouse - - to an ALPS touchpad's: - - info.capabilities - - so that HAL no longer marks the ALPS touchpad with: - - input.x11_driver = 'evdev' - - because the policy file: - - fdi/policy/10osvendor/10-x11-input.fdi - - doesn't define the policy for: - - <match key="info.capabilities" contains="input.touchpad"> - - which was previous unnecessary because everything used to - be caught by the policy for: - - <match key="info.capabilities" contains="input.mouse"> - - Signed-off-by: Michael Witten <mfwitten@gmail.com> - Signed-off-by: Martin Pitt <martin.pitt@ubuntu.com> - -diff --git a/fdi/policy/10osvendor/10-x11-input.fdi b/fdi/policy/10osvendor/10-x11-input.fdi -index cff8fc5..8bbe263 100644 ---- a/fdi/policy/10osvendor/10-x11-input.fdi -+++ b/fdi/policy/10osvendor/10-x11-input.fdi -@@ -16,6 +16,14 @@ - </match> - </match> - -+ <match key="info.capabilities" contains="input.touchpad"> -+ <merge key="input.x11_driver" type="string">mouse</merge> -+ <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" -+ string="Linux"> -+ <merge key="input.x11_driver" type="string">evdev</merge> -+ </match> -+ </match> -+ - <match key="info.capabilities" contains="input.tablet"> - <match key="/org/freedesktop/Hal/devices/computer:system.kernel.name" - string="Linux"> diff --git a/source/l/hal/patches/ignore_internal_dm_devices.diff b/source/l/hal/patches/ignore_internal_dm_devices.diff deleted file mode 100644 index 735a45f3d..000000000 --- a/source/l/hal/patches/ignore_internal_dm_devices.diff +++ /dev/null @@ -1,47 +0,0 @@ -From 6f16321da13f6a7cbd9c424ddba2e727e434fa25 Mon Sep 17 00:00:00 2001 -From: Milan Broz <mbroz@redhat.com> -Date: Tue, 13 Jul 2010 16:07:32 +0200 -Subject: [PATCH] HAL: Ignore internal DM devices with new DM udev rules - -With new device-mapper udev rules are /dev/mapper/* symlinks -to basic device name /dev/dm-X. -(Change requested by udev upstream.) - -This change breaks temporary-cryptsetup workaround inside hal. - -With new dm-udev rules (uncluded since device-mapper 1.02.39) -there is DM_UDEV_DISABLE_OTHER_RULES_FLAG variable -which controls that scan should be ignored for this device -(it is set for all internal devices, including temporary cryptsetup, -internal parts of lvm devices etc.) - -Ignore device if this flag is set. - -See bugs -https://bugzilla.redhat.com/show_bug.cgi?id=613909 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=586286 - -Signed-off-by: Milan Broz <mbroz@redhat.com> ---- - hald/linux/osspec.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/hald/linux/osspec.c b/hald/linux/osspec.c -index a8233fd..6d616bc 100644 ---- a/hald/linux/osspec.c -+++ b/hald/linux/osspec.c -@@ -215,6 +215,11 @@ hald_udev_data (GIOChannel *source, GIOCondition condition, gpointer user_data) - g_free (str); - } - g_free (dstr); -+ } else if (strncmp(key, "DM_UDEV_DISABLE_OTHER_RULES_FLAG=", 33) == 0) { -+ if (strtoul(&key[33], NULL, 10) == 1) { -+ HAL_INFO (("ignoring device requested by DM udev rules")); -+ goto invalid; -+ } - } - } - --- -1.7.3.2 - diff --git a/source/l/hal/patches/increase_HAL_PATH_MAX_to_4096.diff b/source/l/hal/patches/increase_HAL_PATH_MAX_to_4096.diff deleted file mode 100644 index b4c770aee..000000000 --- a/source/l/hal/patches/increase_HAL_PATH_MAX_to_4096.diff +++ /dev/null @@ -1,30 +0,0 @@ -commit a2c3dd5a04d79265772c09c4280606d5c2ed72c6 -Author: Martin Pitt <martin.pitt@ubuntu.com> -Date: Mon Jan 4 16:56:13 2010 +0100 - - Bump HAL_PATH_MAX to 4096 - - Some bits in the code use realpath() with destination paths of size - HAL_PATH_MAX. This potentially breaks on systems where PATH_MAX is bigger than - HAL_PATH_MAX (which was 512 until now). - - Since we can't use PATH_MAX directly (due to platforms like GNU/Hurd, which - apparently don't have it), just bump HAL_PATH_MAX to 4096 (as PATH_MAX is on - Linux), to avoid potential buffer overflows and also fix hal on Linux when - enabling FORTIFY in gcc. - - https://bugs.freedesktop.org/show_bug.cgi?id=25888 - -diff --git a/hald/util.h b/hald/util.h -index c2a1584..7883333 100644 ---- a/hald/util.h -+++ b/hald/util.h -@@ -38,7 +38,7 @@ - #endif - - #define HAL_NAME_MAX 256 --#define HAL_PATH_MAX 512 -+#define HAL_PATH_MAX 4096 - - gboolean hal_util_remove_trailing_slash (gchar *path); - diff --git a/source/l/hal/rc.hald b/source/l/hal/rc.hald deleted file mode 100644 index 7516de2b6..000000000 --- a/source/l/hal/rc.hald +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# Start/stop/restart the hal daemon: - -PIDFILE=/var/run/hald/pid - -hal_start() { - if [ -x /usr/sbin/hald ]; then - if ! ps axc | grep -q dbus-daemon ; then - if [ -r /etc/rc.d/rc.messagebus ]; then - sh /etc/rc.d/rc.messagebus start - sleep 1 - else - echo "FATAL: Can't start HAL daemon without dbus package." - sleep 5 - exit 1 - fi - fi - echo "Starting HAL daemon: /usr/sbin/hald --daemon=yes" - /usr/sbin/hald --daemon=yes - fi -} - -hal_stop() { - if [ -e "$PIDFILE" ]; then - kill $(cat $PIDFILE) - rm -f $PIDFILE - fi - # Just in case: - killall hald 1> /dev/null 2> /dev/null -} - -# See how we were called. -case "$1" in - start) - hal_start - ;; - stop) - hal_stop - ;; - restart) - hal_stop - sleep 1 - hal_start - ;; - *) - echo $"Usage: $0 {start|stop|restart}" - ;; -esac - diff --git a/source/l/hal/slack-desc b/source/l/hal/slack-desc deleted file mode 100644 index 0145a5df4..000000000 --- a/source/l/hal/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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------------------------------------------------------| -hal: hal (The HAL Hardware Abstraction Layer) -hal: -hal: HAL is a piece of software that provides a view of the various -hal: hardware attached to a system. HAL keeps detailed metadata for each -hal: piece of hardware and provides hooks so that system and desktop -hal: software can react to changes in the hardware configuration (such as -hal: the insertion of a DVD, or a USB flash memory stick). -hal: -hal: For more info, see: http://hal.freedesktop.org/ -hal: -hal: diff --git a/source/l/herqq/herqq.SlackBuild b/source/l/herqq/herqq.SlackBuild new file mode 100755 index 000000000..b55d06e92 --- /dev/null +++ b/source/l/herqq/herqq.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/sh + +# Copyright 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2011 Eric Hameleers, Eindhoven, NL +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=herqq +VERSION=${VERSION:-$(echo $PKGNAM-*.zip | rev | cut -f 2- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +unzip $CWD/$PKGNAM-$VERSION.zip || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +# Fix 64-bit installation path: +sed -i -e "s#PREFIX/lib#&${LIBDIRSUFFIX}#" $(find . -name "*.pro") + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +qmake PREFIX=/usr +make $NUMJOBS || make || exit 1 +make install INSTALL_ROOT=$PKG || exit 1 + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + hupnp/ChangeLog hupnp/LICENSE_LGPLv3.txt \ + $PKG/usr/doc/$PKGNAM-$VERSION + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/herqq/slack-desc b/source/l/herqq/slack-desc new file mode 100644 index 000000000..1b580c37f --- /dev/null +++ b/source/l/herqq/slack-desc @@ -0,0 +1,19 @@ +# 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-----------------------------------------------------| +herqq: herqq (UPnP library) +herqq: +herqq: Herqq UPnP (HUPnP) is a software library for building UPnP devices +herqq: and control points conforming to the UPnP Device Architecture +herqq: version 1.1. It is designed to be simple to use and robust in +herqq: operation. It is built using C++ and the Qt Framework. +herqq: +herqq: Homepage: http://www.herqq.org/ +herqq: +herqq: +herqq: diff --git a/source/l/hicolor-icon-theme/doinst.sh b/source/l/hicolor-icon-theme/doinst.sh index 46e76c00a..5d59cebbe 100644 --- a/source/l/hicolor-icon-theme/doinst.sh +++ b/source/l/hicolor-icon-theme/doinst.sh @@ -19,7 +19,9 @@ rm -f usr/share/icons/icon-theme.cache # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then # ONLY run this if there's already a cache!!! + if [ -x /usr/bin/gtk-update-icon-cache ]; then + chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + fi fi fi diff --git a/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild b/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild index 0a5aecaac..9bb514864 100755 --- a/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild +++ b/source/l/hicolor-icon-theme/hicolor-icon-theme.SlackBuild @@ -23,7 +23,7 @@ VERSION=${VERSION:-0.12} ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/source/l/hicolor-icon-theme/setup.08.gtk-update-icon-cache b/source/l/hicolor-icon-theme/setup.08.gtk-update-icon-cache index a1b220b73..dfad89c96 100644 --- a/source/l/hicolor-icon-theme/setup.08.gtk-update-icon-cache +++ b/source/l/hicolor-icon-theme/setup.08.gtk-update-icon-cache @@ -7,8 +7,10 @@ # Update hicolor theme cache: if [ -d usr/share/icons/hicolor ]; then - if [ -x /usr/bin/gtk-update-icon-cache ]; then - chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then # ONLY run this is there's already a cache!!! + if [ -x /usr/bin/gtk-update-icon-cache ]; then + chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + fi fi fi diff --git a/source/l/hunspell/hunspell.SlackBuild b/source/l/hunspell/hunspell.SlackBuild index 78ca6fef8..93bb2895b 100755 --- a/source/l/hunspell/hunspell.SlackBuild +++ b/source/l/hunspell/hunspell.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=hunspell -VERSION=${VERSION:-1.2.9} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -35,12 +35,14 @@ rm -rf $PKG mkdir -p $TMP $PKG # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -53,11 +55,19 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + cd $TMP rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 @@ -83,7 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --with-ui \ --with-readline \ - --build=$ARCH-slackware-linux \ + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/hunspell/slack-desc b/source/l/hunspell/slack-desc index b3a4761b6..eb8f24401 100644 --- a/source/l/hunspell/slack-desc +++ b/source/l/hunspell/slack-desc @@ -11,9 +11,9 @@ hunspell: hunspell: Hunspell is a spell checker and morphological analyzer library hunspell: and program designed for languages with rich morphology hunspell: and complex word compounding or character encoding. -hunspell: Hunspell interfaces: Ispell-like terminal interface using Curses -hunspell: library, Ispell pipe interface, OpenOffice.org UNO module. -hunspell: +hunspell: Hunspell interfaces: Ispell-like terminal interface using ncurses +hunspell: library, Ispell pipe interface, and OpenOffice.org UNO module. hunspell: hunspell: Home page: http://hunspell.sourceforge.net/ hunspell: +hunspell: diff --git a/source/l/icon-naming-utils/slack-desc b/source/l/icon-naming-utils/slack-desc index c4fb3cb2c..5c5161594 100644 --- a/source/l/icon-naming-utils/slack-desc +++ b/source/l/icon-naming-utils/slack-desc @@ -5,12 +5,12 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------| + |-----handy-ruler------------------------------------------------------| icon-naming-utils: icon-naming-utils (generate icon files for your DE) icon-naming-utils: -icon-naming-utils: It is a script for maintaining backwards compatibility -icon-naming-utils: with current desktop icon themes, while migrating to -icon-naming-utils: the names specified in the Icon Naming Specification. +icon-naming-utils: It is a script for maintaining backwards compatibility with current +icon-naming-utils: desktop icon themes, while migrating to the names specified in the +icon-naming-utils: Icon Naming Specification. icon-naming-utils: icon-naming-utils: Homepage: http://tango.freedesktop.org icon-naming-utils: diff --git a/source/l/icu4c/icu4c.SlackBuild b/source/l/icu4c/icu4c.SlackBuild new file mode 100755 index 000000000..215e9510c --- /dev/null +++ b/source/l/icu4c/icu4c.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/sh + +# Slackware build script for icu4c + +# Copyright 2007-2012 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=icu4c +SRCVER=${SRCVER:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 2- -d . | cut -f 2 -d - | rev)} +VERSION=$(echo $SRCVER | tr _ .) +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-icu4c + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf icu +tar xvf $CWD/icu4c-$SRCVER-src.tar.xz || exit 1 +cd icu || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ + -o -perm 400 \) -exec chmod 644 {} \; + +cd source/ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + ./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --enable-shared \ + --disable-static \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --build=$ARCH-slackware-linux || exit 1 + + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd - + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; + +mkdir -p $PKG/usr/doc/icu4c-$VERSION +cp -a \ + license.html readme.html unicode-license.txt $PKG/usr/doc/icu4c-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/icu4c-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/icu4c/slack-desc b/source/l/icu4c/slack-desc new file mode 100644 index 000000000..2d0beefda --- /dev/null +++ b/source/l/icu4c/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +icu4c: icu4c (International Components for Unicode) +icu4c: +icu4c: The International Components for Unicode (ICU) libraries provide +icu4c: robust and full-featured Unicode services on a wide variety of +icu4c: platforms. +icu4c: +icu4c: Homepage: http://www.icu-project.org/ +icu4c: +icu4c: +icu4c: +icu4c: diff --git a/source/l/ilmbase/slack-desc b/source/l/ilmbase/slack-desc index 4d5931128..ca56c31a2 100644 --- a/source/l/ilmbase/slack-desc +++ b/source/l/ilmbase/slack-desc @@ -12,7 +12,7 @@ ilmbase: ilmbase currently includes: ilmbase: ilmbase: IlmThread - a thread abstraction library ilmbase: Imath - a math function library -ilmbase: Iex - an excpetion-handling library +ilmbase: Iex - an exception-handling library ilmbase: Half - Ilm's 16 bit floating point format library ilmbase: ilmbase: Homepage: http://www.openexr.org/ diff --git a/source/l/jasper/slack-desc b/source/l/jasper/slack-desc index a489f75ea..c79751af3 100644 --- a/source/l/jasper/slack-desc +++ b/source/l/jasper/slack-desc @@ -12,7 +12,8 @@ jasper: The JasPer Project is an open-source initiative to provide a free jasper: software-based reference implementation of the codec specified in the jasper: JPEG-2000 Part-1 standard (i.e., ISO/IEC 15444-1).jasper: jasper: +jasper: jasper home: http://www.ece.uvic.ca/~mdadams/jasper/ +jasper: jasper: jasper: -jasper: jasper home: http://www.ece.uvic.ca/~mdadams/jasper/ jasper: diff --git a/source/l/jre b/source/l/jre deleted file mode 120000 index 275d98ff6..000000000 --- a/source/l/jre +++ /dev/null @@ -1 +0,0 @@ -../local/jre
\ No newline at end of file diff --git a/source/l/js185/js185-destdir.patch b/source/l/js185/js185-destdir.patch new file mode 100644 index 000000000..87b7b53b3 --- /dev/null +++ b/source/l/js185/js185-destdir.patch @@ -0,0 +1,15 @@ +#https://bugzilla.mozilla.org/show_bug.cgi?id=628723 + +--- Makefile.in.old 2011-04-10 04:21:19.918608008 -0700 ++++ Makefile.in 2011-04-10 04:21:58.088607992 -0700 +@@ -888,8 +888,8 @@ + ifeq (,$(HOST_BIN_SUFFIX)) + mv -f $(SHLIB_ANY_VER) $(SHLIB_EXACT_VER) + @[ ! -h $(SHLIB_ABI_VER) ] || rm -f $(SHLIB_ABI_VER) +- ln -s $(SHLIB_EXACT_VER) $(SHLIB_ABI_VER) +- ln -s $(SHLIB_ABI_VER) $(SHLIB_ANY_VER) ++ ln -s $(notdir $(SHLIB_EXACT_VER)) $(SHLIB_ABI_VER) ++ ln -s $(notdir $(SHLIB_ABI_VER)) $(SHLIB_ANY_VER) + endif + endif + ifneq (,$(IMPORT_LIBRARY)) diff --git a/source/l/js185/js185.SlackBuild b/source/l/js185/js185.SlackBuild new file mode 100755 index 000000000..515133886 --- /dev/null +++ b/source/l/js185/js185.SlackBuild @@ -0,0 +1,120 @@ +#!/bin/sh + +# Slackware build script for SpiderMonkey + +# Copyright 2011 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=js185 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +TARNAME=js +TARVERS=1.8.5 + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $TARNAME-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $TARNAME-$TARVERS || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +cd js/src + +patch -p0 < $CWD/js185-destdir.patch || exit 1 + +CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --build=$ARCH-slackware-linux \ + --enable-optimize="-O2" \ + --enable-threadsafe \ + --with-system-nspr \ + --with-nspr-prefix=/usr || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Oops, Makefile missed this: +cp -a shell/js $PKG/usr/bin + +# No need for this: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp ../../README README.html $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/js185/slack-desc b/source/l/js185/slack-desc new file mode 100644 index 000000000..ac323dafd --- /dev/null +++ b/source/l/js185/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +js185: js185 (SpiderMonkey - Mozilla's JavaScript Engine) +js185: +js185: SpiderMonkey is Mozilla's JavaScript engine written in C/C++. +js185: It is used in various Mozilla products (including Firefox) and is +js185: available under MPL/GPL/LGPL tri-license. +js185: +js185: Homepage: http://www.mozilla.org/js/spidermonkey +js185: +js185: +js185: +js185: diff --git a/source/l/keybinder/keybinder.SlackBuild b/source/l/keybinder/keybinder.SlackBuild new file mode 100755 index 000000000..7e1da3b0c --- /dev/null +++ b/source/l/keybinder/keybinder.SlackBuild @@ -0,0 +1,109 @@ +#!/bin/sh + +# Slackware build script for keybinder + +# Copyright 2011 Robby Workman, Northport, Alabama, USA +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=keybinder +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --disable-python \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* examples \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/keybinder/slack-desc b/source/l/keybinder/slack-desc new file mode 100644 index 000000000..9eb080261 --- /dev/null +++ b/source/l/keybinder/slack-desc @@ -0,0 +1,19 @@ +# 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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +keybinder: keybinder (keyboard shortcut library) +keybinder: +keybinder: keybinder is a library for registering global keyboard shortcuts. +keybinder: Keybinder works with GTK-based applications using the X Window System. +keybinder: +keybinder: Homepage: http://kaizer.se/wiki/keybinder/ +keybinder: +keybinder: +keybinder: +keybinder: +keybinder: diff --git a/source/l/keyutils/keyutils.SlackBuild b/source/l/keyutils/keyutils.SlackBuild new file mode 100755 index 000000000..969b53cd3 --- /dev/null +++ b/source/l/keyutils/keyutils.SlackBuild @@ -0,0 +1,134 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=keyutils +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# 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 +) + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + COPYING* LICENSE* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# Relocate man pages: +mv $PKG/usr/share/man $PKG/usr + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/keyutils/slack-desc b/source/l/keyutils/slack-desc new file mode 100644 index 000000000..2091c5548 --- /dev/null +++ b/source/l/keyutils/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +keyutils: keyutils (Kernel key management utilities) +keyutils: +keyutils: This package contains tools and a wrapper library to control the +keyutils: Linux kernel key management facility and to provide a mechanism by +keyutils: which the kernel can call back to user space to get a key +keyutils: instantiated. +keyutils: +keyutils: Homepage: http://people.redhat.com/~dhowells/keyutils/ +keyutils: +keyutils: +keyutils: diff --git a/source/l/lcms/lcms.SlackBuild b/source/l/lcms/lcms.SlackBuild index 19efaa314..a7d6f6fe3 100755 --- a/source/l/lcms/lcms.SlackBuild +++ b/source/l/lcms/lcms.SlackBuild @@ -22,7 +22,7 @@ VERSION=${VERSION:-$(echo lcms-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/lcms2/lcms2.SlackBuild b/source/l/lcms2/lcms2.SlackBuild new file mode 100755 index 000000000..e695b74b1 --- /dev/null +++ b/source/l/lcms2/lcms2.SlackBuild @@ -0,0 +1,119 @@ +#!/bin/sh + +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified 2012 by Eric Hameleers <alien at slackware.com> + + +PKGNAM=lcms2 +VERSION=${VERSION:-2.3} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --enable-static=no \ + --build=$TARGET + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +gzip -9 $PKG/usr/man/man?/*.? + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING INSTALL NEWS README* doc \ + $PKG/usr/doc/$PKGNAM-$VERSION +find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 644 {} \; + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/lcms2/slack-desc b/source/l/lcms2/slack-desc new file mode 100644 index 000000000..f283160a2 --- /dev/null +++ b/source/l/lcms2/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +lcms2: lcms2 (little cms engine, version 2) +lcms2: +lcms2: Little cms is a small, speed optimized color management engine. +lcms2: +lcms2: lcms was written by Marti Maria <marti@littlecms.com>. +lcms2: +lcms2: +lcms2: +lcms2: +lcms2: +lcms2: diff --git a/source/l/libarchive/libarchive.info b/source/l/libarchive/libarchive.info deleted file mode 100644 index 53405885b..000000000 --- a/source/l/libarchive/libarchive.info +++ /dev/null @@ -1,2 +0,0 @@ -HOMEPAGE="http://people.freebsd.org/~kientzle/libarchive/" -DOWNLOAD="http://people.freebsd.org/~kientzle/libarchive/src/libarchive-2.5.5.tar.gz" diff --git a/source/l/libatasmart/README b/source/l/libatasmart/README new file mode 100644 index 000000000..f926bea0c --- /dev/null +++ b/source/l/libatasmart/README @@ -0,0 +1,2 @@ +libatasmart is a lean, small and clean implementation of an +ATA S.M.A.R.T. reading and parsing library. diff --git a/source/l/libatasmart/libatasmart.SlackBuild b/source/l/libatasmart/libatasmart.SlackBuild new file mode 100755 index 000000000..a9bc056c9 --- /dev/null +++ b/source/l/libatasmart/libatasmart.SlackBuild @@ -0,0 +1,112 @@ +#!/bin/sh + +# Slackware build script for libatasmart + +# Copyright 2010 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +# Modified 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL + +PKGNAM=libatasmart +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --build=$TARGET || exit 1 + +# Sure, ignore --docdir +make $NUMJOBS docdir=/usr/doc/$PKGNAM-$VERSION || make docdir=/usr/doc/$PKGNAM-$VERSION || exit 1 +make install docdir=/usr/doc/$PKGNAM-$VERSION DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + LGPL README \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/libatasmart/libatasmart.info b/source/l/libatasmart/libatasmart.info new file mode 100644 index 000000000..39e1f559f --- /dev/null +++ b/source/l/libatasmart/libatasmart.info @@ -0,0 +1 @@ +http://0pointer.de/public/ diff --git a/source/l/libatasmart/slack-desc b/source/l/libatasmart/slack-desc new file mode 100644 index 000000000..44a160949 --- /dev/null +++ b/source/l/libatasmart/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +libatasmart: libatasmart (ATA S.M.A.R.T. library) +libatasmart: +libatasmart: libatasmart is a lean, small and clean implementation of an ATA +libatasmart: S.M.A.R.T. ((Self-Monitoring, Analysis and Reporting Technology) +libatasmart: reading and parsing library. S.M.A.R.T. is a system used by hard +libatasmart: drives to monitor factors that may impact drive reliability in the +libatasmart: hope of predicting a drive failure before it occurs. +libatasmart: +libatasmart: Homepage: http://0pointer.de/blog/projects/being-smart.html +libatasmart: +libatasmart: diff --git a/source/l/wv2/wv2.SlackBuild b/source/l/libbluedevil/libbluedevil.SlackBuild index 79d04b50a..402e1c903 100755 --- a/source/l/wv2/wv2.SlackBuild +++ b/source/l/libbluedevil/libbluedevil.SlackBuild @@ -1,6 +1,7 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2011, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,21 +21,25 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=0.4.2 + +PKGNAM=libbluedevil +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:-" -j7 "} - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -44,6 +49,9 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -51,48 +59,51 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-wv2 +PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf wv2-$VERSION -tar xvf $CWD/wv2-$VERSION.tar.?z* || exit 1 -cd wv2-$VERSION +rm -rf ${PKGNAM}-${VERSION} +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 +cd ${PKGNAM}-$VERSION || exit 1 + +# Make sure ownerships and permissions are sane: chown -R root:root . find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; -mkdir -p build +# Build and install: +mkdir build cd build cmake \ - $KDE_OPT_ARGS \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ - -DSYSCONF_INSTALL_DIR=/etc \ + -DSYSCONF_INSTALL_DIR=/etc/kde \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DBUILD_tests:BOOL=OFF \ .. - make $NUMJOBS || exit 1 - make install DESTDIR=$PKG || exit 1 + make $NUMJOBS VERBOSE=1 || make || exit 1 + make install DESTDIR=$PKG || exit 1 cd - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/wv2-$VERSION +# Add a documentation directory: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING.LIB README RELEASE THANKS TODO \ - $PKG/usr/doc/wv2-$VERSION + AUTHORS COPYING* HACKING README* $PKG/usr/doc/$PKGNAM-$VERSION || true mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/wv2-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libbluedevil/slack-desc b/source/l/libbluedevil/slack-desc new file mode 100644 index 000000000..b1aef4b1d --- /dev/null +++ b/source/l/libbluedevil/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +libbluedevil: libbluedevil (Qt wrapper for bluez) +libbluedevil: +libbluedevil: This is a Qt-based library for handling Bluetooth functionality. +libbluedevil: +libbluedevil: Homepage: http://ereslibre.es/ +libbluedevil: +libbluedevil: +libbluedevil: +libbluedevil: +libbluedevil: +libbluedevil: diff --git a/source/l/libcaca/libcaca.SlackBuild b/source/l/libcaca/libcaca.SlackBuild index 5c386be4e..709c61c00 100755 --- a/source/l/libcaca/libcaca.SlackBuild +++ b/source/l/libcaca/libcaca.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=libcaca VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -80,6 +80,7 @@ CFLAGS="$SLKCFLAGS" \ --program-prefix= \ --program-suffix= \ --disable-imlib2 \ + --disable-ruby \ --enable-slang \ --enable-ncurses \ --enable-x11 \ diff --git a/source/l/raptor/raptor.SlackBuild b/source/l/libcanberra/libcanberra.SlackBuild index 1c57b5d09..38f8f86fd 100755 --- a/source/l/raptor/raptor.SlackBuild +++ b/source/l/libcanberra/libcanberra.SlackBuild @@ -1,7 +1,8 @@ #!/bin/sh -# Copyright 2007 Heinz Wiesinger <hmwiesinger@gmx.at> -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Slackware build script for libcanberra + +# Copyright 2010,2011,2012 Robby Workman, Northport, Alabama, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,34 +22,30 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified by Robby Workman <rworkman@slackware.com> -# No added terms or copyright claims - -VERSION=${VERSION:-$(echo raptor-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +PKGNAM=libcanberra +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -# 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 -NUMJOBS=${NUMJOBS:--j6} +NUMJOBS=${NUMJOBS:-" -j7 "} CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-raptor +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" @@ -61,9 +58,9 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf raptor-$VERSION -tar xvf $CWD/raptor-$VERSION.tar.xz || exit 1 -cd raptor-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -79,33 +76,28 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ --disable-static \ - --build=$ARCH-slackware-linux + --disable-oss \ + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done -) +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/doc/raptor-$VERSION -cp -a \ - AUTHORS COPYING* INSTALL* LICENSE* NEWS* \ - NOTICE README* RELEASE.html \ - $PKG/usr/doc/raptor-$VERSION -( cd $PKG/usr/doc/raptor-$VERSION - ln -s /usr/share/gtk-doc/html/raptor html -) +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a COPYING* LGPL README* $PKG/usr/doc/$PKGNAM-$VERSION +( cd $PKG/usr/doc/$PKGNAM-$VERSION ; ln -s ../../share/gtk-doc/html/libcanberra html ) # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog touch -r ChangeLog $DOCSDIR/ChangeLog fi @@ -114,5 +106,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/raptor-$VERSION-$ARCH-$BUILD.txz - +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libcanberra/libcanberra.url b/source/l/libcanberra/libcanberra.url new file mode 100644 index 000000000..6dc05d62e --- /dev/null +++ b/source/l/libcanberra/libcanberra.url @@ -0,0 +1 @@ +http://0pointer.de/lennart/projects/libcanberra/ diff --git a/source/l/libcanberra/slack-desc b/source/l/libcanberra/slack-desc new file mode 100644 index 000000000..7c954b7c6 --- /dev/null +++ b/source/l/libcanberra/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +libcanberra: libcanberra (XDG Sound Theme and Name Spec implementation) +libcanberra: +libcanberra: libcanberra is an implementation of the XDG Sound Theme and Name +libcanberra: Specifications, for generating event sounds on free desktops. +libcanberra: It comes with several backends for several audio systems and is +libcanberra: designed to be portable. +libcanberra: +libcanberra: Homepage: http://0pointer.de/lennart/projects/libcanberra/ +libcanberra: +libcanberra: +libcanberra: diff --git a/source/l/libcap/libcap-2.20.tar.sign b/source/l/libcap/libcap-2.22.tar.bz2.sign index 21c507225..31eaad16a 100644 --- a/source/l/libcap/libcap-2.20.tar.sign +++ b/source/l/libcap/libcap-2.22.tar.bz2.sign @@ -2,7 +2,7 @@ Version: GnuPG v1.4.11 (GNU/Linux) Comment: See http://www.kernel.org/signature.html for info -iD8DBQBNNtZOyGugalF9Dw4RAhNYAJ4hyECyyIeN/d8WBPq8xeosRuO5egCfQFdk -SykdiTKqeb+JHeiCSI9GYTk= -=Rz1c +iD8DBQBOLVY5yGugalF9Dw4RApFNAJwKUXnGMy+1QbBXJJAY9nCIPEVO5ACfcdWO +vSlbjNX9WvZ99amrBhK6sag= +=v2dJ -----END PGP SIGNATURE----- diff --git a/source/l/libcap/libcap.SlackBuild b/source/l/libcap/libcap.SlackBuild index 57cfc5844..796da7784 100755 --- a/source/l/libcap/libcap.SlackBuild +++ b/source/l/libcap/libcap.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=libcap -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -64,7 +64,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 cd $PKGNAM-$VERSION || exit 1 zcat $CWD/libcap.capability.h.fix.broken.includes.diff.gz | patch -p1 || exit 1 diff --git a/source/l/libcddb/libcddb.SlackBuild b/source/l/libcddb/libcddb.SlackBuild index 6891d13f6..6d5e1a7e5 100755 --- a/source/l/libcddb/libcddb.SlackBuild +++ b/source/l/libcddb/libcddb.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=libcddb VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libcdio/libcdio.SlackBuild b/source/l/libcdio/libcdio.SlackBuild index 9379591fb..3ca8e8aed 100755 --- a/source/l/libcdio/libcdio.SlackBuild +++ b/source/l/libcdio/libcdio.SlackBuild @@ -22,32 +22,42 @@ PKGNAM=libcdio -VERSION=${VERSION:-$(echo $(basename $(echo $PKGNAM-*.tar.bz2 | cut -f 2 -d -) .tar.bz2) | cut -f 2 -d -)} -ARCH=${ARCH:-x86_64} +VERSION=${VERSION:-$(echo $(basename $(echo $PKGNAM-*.tar.xz | cut -f 2 -d -) .tar.xz) | cut -f 2 -d -)} +BUILD=${BUILD:-1} + NUMJOBS=${NUMJOBS:-" -j7 "} -BUILD=${BUILD:-2} +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} -rm -rf $PKG -mkdir -p $TMP $PKG if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi +rm -rf $PKG +mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1 cd ${PKGNAM}-$VERSION # Make sure ownerships and permissions are sane: @@ -105,6 +115,14 @@ cp -a \ AUTHORS COPYING INSTALL MSVC NEWS README README.libcdio THANKS TODO \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/libcdio/libcdio.url b/source/l/libcdio/libcdio.url new file mode 100644 index 000000000..e28aefe43 --- /dev/null +++ b/source/l/libcdio/libcdio.url @@ -0,0 +1 @@ +http://ftp.gnu.org/gnu/libcdio/ diff --git a/source/l/libcroco/libcroco.SlackBuild b/source/l/libcroco/libcroco.SlackBuild new file mode 100755 index 000000000..4eed5c617 --- /dev/null +++ b/source/l/libcroco/libcroco.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/sh + +# Slackware build script for libcroco + +# Copyright 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=libcroco +VERSION=${VERSION:-0.6.5} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz +cd $PKGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* HACKING INSTALL NEWS README TODO docs/examples \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libcroco/libcroco.url b/source/l/libcroco/libcroco.url new file mode 100644 index 000000000..7c209ee98 --- /dev/null +++ b/source/l/libcroco/libcroco.url @@ -0,0 +1 @@ +http://ftp.gnome.org/pub/gnome/sources/libcroco/ diff --git a/source/l/libcroco/slack-desc b/source/l/libcroco/slack-desc new file mode 100644 index 000000000..eabe8cfd2 --- /dev/null +++ b/source/l/libcroco/slack-desc @@ -0,0 +1,19 @@ +# 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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +libcroco: libcroco (CSS2 parsing and manipulation library) +libcroco: +libcroco: Libcroco is a standalone CSS2 parsing and manipulation library. +libcroco: The parser provides a low level event driven SAC like API and a CSS +libcroco: object model like API. +libcroco: +libcroco: Libcroco provides a CSS2 selection engine and an experimental +libcroco: XML/CSS rendering engine. +libcroco: +libcroco: +libcroco: diff --git a/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild b/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild index 7e14ad03a..ccd77d037 100755 --- a/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild +++ b/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2010 Eric Hameleers, Eindhoven, The Netherlands -# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2011, 2012 Eric Hameleers, Eindhoven, The Netherlands +# Copyright 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -31,24 +31,22 @@ PKGNAM=libdbusmenu-qt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -63,6 +61,10 @@ else LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -99,6 +101,10 @@ cp -a \ COPYING NEWS README \ $PKG/usr/doc/$PKGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/doc +mv $PKG/usr/share/doc/dbusmenu-qt/* $PKG/usr/doc/$PKGNAM-$VERSION/doc +rm -rf $PKG/usr/share/doc + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/libdbusmenu-qt/slack-desc b/source/l/libdbusmenu-qt/slack-desc index 0a8aba0e2..6e72c25f0 100644 --- a/source/l/libdbusmenu-qt/slack-desc +++ b/source/l/libdbusmenu-qt/slack-desc @@ -12,8 +12,8 @@ libdbusmenu-qt: This library provides a Qt implementation of the DBusMenu protoc libdbusmenu-qt: The DBusMenu protocol makes it possible for applications to export libdbusmenu-qt: and import their menus over DBus. libdbusmenu-qt: +libdbusmenu-qt: Homepage: http://people.canonical.com/~agateau/dbusmenu/ libdbusmenu-qt: libdbusmenu-qt: libdbusmenu-qt: -libdbusmenu-qt: Homepage: http://people.canonical.com/~agateau/dbusmenu/ libdbusmenu-qt: diff --git a/source/l/libdvdread/libdvdread.SlackBuild b/source/l/libdvdread/libdvdread.SlackBuild index 5dbf618ed..84ddae08c 100755 --- a/source/l/libdvdread/libdvdread.SlackBuild +++ b/source/l/libdvdread/libdvdread.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ PKGNAM=libdvdread -VERSION=4.1.3 +VERSION=4.2.0 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/l/libexif/libexif.SlackBuild b/source/l/libexif/libexif.SlackBuild index 61b675cba..83e24c4ae 100755 --- a/source/l/libexif/libexif.SlackBuild +++ b/source/l/libexif/libexif.SlackBuild @@ -88,7 +88,7 @@ strip -g $PKG/usr/lib/*.a rm -rf $PKG/usr/share/doc mkdir -p $PKG/usr/doc/libexif-$VERSION cp -a \ - ABOUT-NLS AUTHORS COPYING* NEWS README* \ + AUTHORS COPYING* NEWS README* \ $PKG/usr/doc/libexif-$VERSION # If there's a ChangeLog, installing at least part of the recent history diff --git a/source/l/libffi/libffi.SlackBuild b/source/l/libffi/libffi.SlackBuild new file mode 100755 index 000000000..c1a2e848b --- /dev/null +++ b/source/l/libffi/libffi.SlackBuild @@ -0,0 +1,132 @@ +#!/bin/sh + +# Slackware build script for libffi + +# Copyright 2011,2012 Robby Workman, Northport, Alabama, USA +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=libffi +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --build=$ARCH-slackware-linux || exit 1 + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# 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 +) + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Compress info files, if any: +if [ -d $PKG/usr/info ]; then + ( cd $PKG/usr/info + rm -f dir + gzip -9 * + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a LICENSE README $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libffi/slack-desc b/source/l/libffi/slack-desc new file mode 100644 index 000000000..8e8dd435d --- /dev/null +++ b/source/l/libffi/slack-desc @@ -0,0 +1,19 @@ +# 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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +libffi: libffi (A Portable Foreign Function Interface Library) +libffi: +libffi: FFI stands for Foreign Function Interface. A foreign function +libffi: interface is the popular name for the interface that allows code +libffi: written in one language to call code written in another language. +libffi: The libffi library really only provides the lowest, machine dependent +libffi: layer of a fully featured foreign function interface. +libffi: +libffi: Homepage: http://sourceware.org/libffi/ +libffi: +libffi: diff --git a/source/l/libgnome-keyring/libgnome-keyring.SlackBuild b/source/l/libgnome-keyring/libgnome-keyring.SlackBuild new file mode 100755 index 000000000..b3e1820ec --- /dev/null +++ b/source/l/libgnome-keyring/libgnome-keyring.SlackBuild @@ -0,0 +1,107 @@ +#!/bin/sh + +# Slackware build script for libgnome-keyring + +# Copyright 2010-2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=libgnome-keyring +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* HACKING INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libgnome-keyring/slack-desc b/source/l/libgnome-keyring/slack-desc new file mode 100644 index 000000000..1d759e20c --- /dev/null +++ b/source/l/libgnome-keyring/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +libgnome-keyring: libgnome-keyring (gnome-keyring library) +libgnome-keyring: +libgnome-keyring: gnome-keyring is a program that keep password and other secrets +libgnome-keyring: for users. The library libgnome-keyring is used by applications +libgnome-keyring: to integrate with the gnome keyring system. +libgnome-keyring: +libgnome-keyring: +libgnome-keyring: +libgnome-keyring: +libgnome-keyring: +libgnome-keyring: diff --git a/source/l/libgphoto2/fix-usb_id-callout-for-udev-175.diff b/source/l/libgphoto2/fix-usb_id-callout-for-udev-175.diff new file mode 100644 index 000000000..fe65dabdb --- /dev/null +++ b/source/l/libgphoto2/fix-usb_id-callout-for-udev-175.diff @@ -0,0 +1,12 @@ +diff -Nur libgphoto2-2.4.11.orig/packaging/generic/print-camera-list.c libgphoto2-2.4.11/packaging/generic/print-camera-list.c +--- libgphoto2-2.4.11.orig/packaging/generic/print-camera-list.c 2011-04-06 16:42:09.000000000 -0500 ++++ libgphoto2-2.4.11/packaging/generic/print-camera-list.c 2011-12-10 20:31:37.621092267 -0600 +@@ -409,7 +409,7 @@ + "ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n" + "SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_usb_end\"\n" + "ENV{DEVTYPE}!=\"usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n" +- "ENV{ID_USB_INTERFACES}==\"\", IMPORT{program}=\"usb_id --export %%p\"\n" ++ "ENV{ID_USB_INTERFACES}==\"\", IMPORT{builtin}=\"usb_id\"\n" + /* ignore mass storage class having devices in mark-up */ + "ENV{ID_USB_INTERFACES}==\"*:08*:*\", GOTO=\"libgphoto2_usb_end\"\n" + /* shortcut the most common camera driver, ptp class, so we avoid parsing 1000 diff --git a/source/l/libgphoto2/libgphoto2.SlackBuild b/source/l/libgphoto2/libgphoto2.SlackBuild index ad1a0e7e2..989653a4c 100755 --- a/source/l/libgphoto2/libgphoto2.SlackBuild +++ b/source/l/libgphoto2/libgphoto2.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=libgphoto2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -72,6 +72,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# udev-175 bundles usb_id into the udevd binary +zcat $CWD/fix-usb_id-callout-for-udev-175.diff.gz | patch -p1 || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -111,8 +114,8 @@ LIBDIR=$PKG/usr/lib${LIBDIRSUFFIX} export LD_LIBRARY_PATH CAMLIBS LIBDIR # Generate udev rules mkdir -p $PKG/lib/udev/rules.d -$PKG/usr/bin/print-camera-list udev-rules mode 0660 owner root group plugdev \ - > $PKG/lib/udev/rules.d/90-libgphoto2.rules +$PKG/usr/bin/print-camera-list udev-rules version 136 mode 0660 owner root group plugdev \ + > $PKG/lib/udev/rules.d/40-libgphoto2.rules # Generate fdi files mkdir -p $PKG/usr/share/hal/fdi/information/20thirdparty $PKG/usr/bin/print-camera-list hal-fdi \ @@ -121,8 +124,20 @@ $PKG/usr/bin/print-camera-list hal-fdi-device \ > $PKG/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi unset LD_LIBRARY_PATH CAMLIBS LIBDIR # Unset these just in case -# Compress man pages -find $PKG/usr/man -type f -exec gzip -9 {} \; +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ diff --git a/source/l/libgphoto2/slack-desc b/source/l/libgphoto2/slack-desc index 9de29cbeb..dbc51e5c1 100644 --- a/source/l/libgphoto2/slack-desc +++ b/source/l/libgphoto2/slack-desc @@ -5,11 +5,11 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-------------------------------------------------| + |-----handy-ruler------------------------------------------------------| libgphoto2: libgphoto2 (Digital Camera Library) libgphoto2: -libgphoto2: libgphoto2 is a library that can be used by -libgphoto2: applications to access various digital cameras. +libgphoto2: libgphoto2 is a library that can be used by applications to access +libgphoto2: various digital cameras. libgphoto2: libgphoto2: Homepage: http://www.gphoto.org/ libgphoto2: diff --git a/source/l/libgpod/libgpod.SlackBuild b/source/l/libgpod/libgpod.SlackBuild index 4adbe6504..f40754951 100755 --- a/source/l/libgpod/libgpod.SlackBuild +++ b/source/l/libgpod/libgpod.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=libgpod VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libgsf/libgsf.SlackBuild b/source/l/libgsf/libgsf.SlackBuild index 4fd643119..7d955ec48 100755 --- a/source/l/libgsf/libgsf.SlackBuild +++ b/source/l/libgsf/libgsf.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=libgsf VERSION=${VERSION:-$(echo libgsf-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/source/l/libical/libical.info b/source/l/libical/libical.info deleted file mode 100644 index 500e53ebd..000000000 --- a/source/l/libical/libical.info +++ /dev/null @@ -1,8 +0,0 @@ -PRGNAM="libical" -VERSION="0.41" -HOMEPAGE="http://freeassociation.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/freeassociation/libical-0.41.tar.gz" -MD5SUM="981731f5618c7f1944e0262babdcc910" -MAINTAINER="ppr:kut" -EMAIL="pprkut@liwjatan.at" -APPROVED="dsomero" diff --git a/source/l/libical/slack-desc b/source/l/libical/slack-desc index 6b760123e..20ee79379 100644 --- a/source/l/libical/slack-desc +++ b/source/l/libical/slack-desc @@ -14,6 +14,6 @@ libical: 2447). It parses iCal components and provides C/C++/Python/Java APIs libical: for manipulating the component properties, parameters, and libical: subcomponents. libical: -libical: Homepage: http://freeassociation.sourceforge.net/ +libical: Homepage: http://sourceforge.net/projects/freeassociation/ libical: libical: diff --git a/source/l/libidn/libidn.SlackBuild b/source/l/libidn/libidn.SlackBuild index e272f2602..905b3e485 100755 --- a/source/l/libidn/libidn.SlackBuild +++ b/source/l/libidn/libidn.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=libidn VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libieee1284/libieee1284.SlackBuild b/source/l/libieee1284/libieee1284.SlackBuild index ec2cdf50c..ce601a85b 100755 --- a/source/l/libieee1284/libieee1284.SlackBuild +++ b/source/l/libieee1284/libieee1284.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=libieee1284 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libjpeg/libjpeg.SlackBuild b/source/l/libjpeg/libjpeg.SlackBuild index 9d43d22ea..a5d3783c7 100755 --- a/source/l/libjpeg/libjpeg.SlackBuild +++ b/source/l/libjpeg/libjpeg.SlackBuild @@ -58,7 +58,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf jpeg-8 +rm -rf jpeg-$(echo $VERSION | cut -f 2 -d v) tar xvf $CWD/jpegsrc.${VERSION}.tar.?z* || exit 1 cd jpeg-$(echo $VERSION | cut -f 2 -d v) diff --git a/source/l/liblastfm/liblastfm.SlackBuild b/source/l/liblastfm/liblastfm.SlackBuild index d87cf0daa..12da473e7 100755 --- a/source/l/liblastfm/liblastfm.SlackBuild +++ b/source/l/liblastfm/liblastfm.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh # Slackware build script for liblastfm @@ -50,6 +50,7 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP +rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . @@ -59,21 +60,16 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix for Ruby 1.9.1: -sed -i "s/require 'ftools'//g" admin/* - -./configure \ - --prefix /usr \ - --release +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR="lib${LIBDIRSUFFIX}" \ + -DBUILD_FINGERPRINT="ON" make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# For 64-bit, make sure that the libraries are in the proper directory: -if [ "$LIBDIRSUFFIX" = "64" ]; then - mv $PKG/usr/lib $PKG/usr/lib64 -fi - if [ -d $PKG/usr/man ]; then gzip -9 $PKG/usr/man/man?/* fi diff --git a/source/l/libmsn/libmsn.SlackBuild b/source/l/libmsn/libmsn.SlackBuild index 5de598ef2..2689d910c 100755 --- a/source/l/libmsn/libmsn.SlackBuild +++ b/source/l/libmsn/libmsn.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for libmsn -# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -23,21 +23,20 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=libmsn -VERSION=4.1 -BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -50,17 +49,27 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 cd $PKGNAM-$VERSION || exit 1 + +zcat $CWD/libmsn.gcc47.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/libmsn/libmsn.gcc47.diff b/source/l/libmsn/libmsn.gcc47.diff new file mode 100644 index 000000000..34df7005e --- /dev/null +++ b/source/l/libmsn/libmsn.gcc47.diff @@ -0,0 +1,10 @@ +--- ./msn/util.cpp.orig 2009-07-22 14:57:10.000000000 -0500 ++++ ./msn/util.cpp 2012-04-05 10:45:40.604000070 -0500 +@@ -30,6 +30,7 @@ + #include <openssl/rand.h> + #include <cstring> + #include <sys/timeb.h> ++#include <unistd.h> + #include "md5.h" + #include "libsiren/siren7.h" + diff --git a/source/l/libmsn/slack-desc b/source/l/libmsn/slack-desc index 8fe1410c5..b026146d3 100644 --- a/source/l/libmsn/slack-desc +++ b/source/l/libmsn/slack-desc @@ -11,9 +11,9 @@ libmsn: libmsn: Libmsn is a reusable, open-source, fully documented library for libmsn: connecting to Microsoft's MSN Messenger service. libmsn: +libmsn: Homepage: http://sourceforge.net/projects/libmsn/ libmsn: libmsn: libmsn: libmsn: -libmsn: Homepage: http://sourceforge.net/projects/libmsn/ libmsn: diff --git a/source/l/libmtp/libmtp.SlackBuild b/source/l/libmtp/libmtp.SlackBuild index c00fc5996..f7b90a3ff 100755 --- a/source/l/libmtp/libmtp.SlackBuild +++ b/source/l/libmtp/libmtp.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -84,13 +84,13 @@ CFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# Add udev rules: -mkdir -p $PKG/lib/udev/rules.d -sed -e 's/MODE="666"/GROUP="audio", MODE="0660"/' libmtp.rules \ - > $PKG/lib/udev/rules.d/90-libmtp.rules -# Add device information for HAL: -mkdir -p $PKG/usr/share/hal/fdi/information/20thirdparty/ -cat libmtp.fdi > $PKG/usr/share/hal/fdi/information/20thirdparty/10-libmtp.fdi +# Commented out, since the rules are added by the Makefile, and since +# there's no longer any match for MODE= +# +## Add udev rules: +#mkdir -p $PKG/lib/udev/rules.d +#sed -e 's/MODE="666"/GROUP="audio", MODE="0660"/' libmtp.rules \ +# > $PKG/lib/udev/rules.d/90-libmtp.rules # Guess someone didn't have enough to drink: ( cd $PKG/usr/bin @@ -129,13 +129,18 @@ if [ -d $PKG/usr/info ]; then ) fi -# Why even bother to support --docdir if you can't make it work? -mkdir -p $PKG/usr/doc -mv $PKG/usr/share/doc/${PKGNAM}-$VERSION $PKG/usr/doc -rmdir $PKG/usr/share/doc - -# We don't need these here -rm -f $PKG/usr/doc/${PKGNAM}-$VERSION/libmtp.{rules,sh,usermap} +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS COPYING ChangeLog INSTALL README* TODO \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/libnl3/doinst.sh b/source/l/libnl3/doinst.sh new file mode 100644 index 000000000..535c34989 --- /dev/null +++ b/source/l/libnl3/doinst.sh @@ -0,0 +1,16 @@ +config() { + NEW="$1" + 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 + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/libnl/classid.new +config etc/libnl/pktloc.new + diff --git a/source/l/libnl3/libnl3.SlackBuild b/source/l/libnl3/libnl3.SlackBuild new file mode 100755 index 000000000..3ac310f82 --- /dev/null +++ b/source/l/libnl3/libnl3.SlackBuild @@ -0,0 +1,126 @@ +#!/bin/sh + +# Slackware build script for libnl3 + +# Copyright 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=libnl +PKGNAME=libnl3 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-static \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't clobber config files +mv $PKG/etc/libnl/classid{,.new} +mv $PKG/etc/libnl/pktloc{,.new} + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a COPYING doc/README \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAME-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/libnl3/slack-desc b/source/l/libnl3/slack-desc new file mode 100644 index 000000000..75af03bf3 --- /dev/null +++ b/source/l/libnl3/slack-desc @@ -0,0 +1,19 @@ +# 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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +libnl3: libnl3 (Netlink Protocol Library Suite version 3) +libnl3: +libnl3: The libnl suite is a collection of libraries providing APIs to +libnl3: netlink protocol based Linux kernel interfaces. +libnl3: Netlink is a IPC mechanism primarily between the kernel and user +libnl3: space processes. It was designed to be a more flexible successor +libnl3: to ioctl to provide mainly networking related kernel configuration +libnl3: and monitoring interfaces. +libnl3: +libnl3: Homepage: http://www.infradead.org/~tgr/libnl/ +libnl3: diff --git a/source/l/libnotify/libnotify.SlackBuild b/source/l/libnotify/libnotify.SlackBuild index 84f4c5b3f..ffc249b3e 100755 --- a/source/l/libnotify/libnotify.SlackBuild +++ b/source/l/libnotify/libnotify.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PKGNAM=libnotify -VERSION=0.5.2 +VERSION=0.7.5 BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then @@ -81,9 +81,16 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING README $PKG/usr/doc/$PKGNAM-$VERSION +cp -a AUTHORS COPYING README $PKG/usr/doc/$PKGNAM-$VERSION ( cd $PKG/usr/doc/$PKGNAM-$VERSION ; ln -s ../../share/gtk-doc/html/libnotify html ) -cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/libpcap/libpcap.SlackBuild b/source/l/libpcap/libpcap.SlackBuild index 0460087a4..f886ee3c3 100755 --- a/source/l/libpcap/libpcap.SlackBuild +++ b/source/l/libpcap/libpcap.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -79,13 +79,6 @@ make install DESTDIR=$PKG || exit 1 strip --strip-debug libpcap.so.1.?.? -cp libpcap.so.?.?.? $PKG/usr/lib${LIBDIRSUFFIX} -( cd $PKG/usr/lib${LIBDIRSUFFIX} - ln -sf libpcap.so.1.?.? libpcap.so.1 - ln -sf libpcap.so.1 libpcap.so.0 - ln -sf libpcap.so.1 libpcap.so -) - mkdir -p $PKG/usr/doc/libpcap-$VERSION cp -a \ CHANGES CREDITS INSTALL.txt LICENSE README* TODO VERSION \ @@ -105,6 +98,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ ln -sf pcap_next_ex.3pcap pcap_next.3pcap ln -sf pcap_open_offline.3pcap pcap_fopen_offline.3pcap ln -sf pcap_setnonblock.3pcap pcap_getnonblock.3pcap + ln -sf pcap_findalldevs.3pcap pcap_freealldevs.3pcap + ln -sf pcap_free_tstamp_types.3pcap pcap_list_tstamp_types.3pcap + ln -sf pcap_free_datalinks.3pcap pcap_list_datalinks.3pcap ) # Compress and if needed symlink the man pages: diff --git a/source/l/libpng/libpng.SlackBuild b/source/l/libpng/libpng.SlackBuild index 1b82edd5b..d338e5c64 100755 --- a/source/l/libpng/libpng.SlackBuild +++ b/source/l/libpng/libpng.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION_OLD=1.2.44 -VERSION_NEW=1.4.5 +VERSION_OLD=1.2.50 +VERSION_NEW=1.4.12 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/l/libpng/libpng.url b/source/l/libpng/libpng.url new file mode 100644 index 000000000..f50d42755 --- /dev/null +++ b/source/l/libpng/libpng.url @@ -0,0 +1 @@ +ftp://ftp.simplesystems.org/pub/libpng/png/src/ diff --git a/source/l/libproxy/gcc47-include-unistd.h.diff b/source/l/libproxy/gcc47-include-unistd.h.diff new file mode 100644 index 000000000..fc08aeeae --- /dev/null +++ b/source/l/libproxy/gcc47-include-unistd.h.diff @@ -0,0 +1,22 @@ +diff -Nur libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp +--- libproxy-0.4.7.orig/libproxy/modules/config_sysconfig.cpp 2011-06-06 16:44:37.220019451 -0500 ++++ libproxy-0.4.7/libproxy/modules/config_sysconfig.cpp 2012-04-15 23:35:45.752467960 -0500 +@@ -18,6 +18,7 @@ + ******************************************************************************/ + + #include <sys/stat.h> ++#include <unistd.h> + #include <cstdlib> + #include <map> + #include <fstream> +diff -Nur libproxy-0.4.7.orig/libproxy/url.cpp libproxy-0.4.7/libproxy/url.cpp +--- libproxy-0.4.7.orig/libproxy/url.cpp 2011-06-06 16:44:37.216019447 -0500 ++++ libproxy-0.4.7/libproxy/url.cpp 2012-04-15 23:35:05.654783125 -0500 +@@ -27,6 +27,7 @@ + #define close _close + #endif + #include <fcntl.h> // For ::open() ++#include <unistd.h> //For close(), read() + #include <cstring> // For memcpy() + #include <sstream> // For int/string conversion (using stringstream) + #include <cstdio> // For sscanf() diff --git a/source/l/libproxy/libproxy.SlackBuild b/source/l/libproxy/libproxy.SlackBuild new file mode 100755 index 000000000..fecbceb8b --- /dev/null +++ b/source/l/libproxy/libproxy.SlackBuild @@ -0,0 +1,109 @@ +#!/bin/sh + +# Slackware build script for libproxy + +# Copyright 2009,2010,2011 Robby Workman Northport, AL, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=libproxy +VERSION=${VERSION:-0.4.7} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# 0.4.7 won't build against seamonkey's nss stuff, and the first commit in +# svn after that release disables its use in favor of nspr and js185 +zcat $CWD/only_link_mozjs185.diff.gz | patch -p0 --verbose || exit 1 + +# Include unistd.h for gcc-4.7.x: +zcat $CWD/gcc47-include-unistd.h.diff.gz | patch -p1 --verbose || exit 1 + +cmake . \ + -DCMAKE_C_FLAGS="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMODULE_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/libproxy/${VERSION}/modules \ + -DPERL_VENDORINSTALL=yes || exit 1 + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libproxy/libproxy.url b/source/l/libproxy/libproxy.url new file mode 100644 index 000000000..3897ae588 --- /dev/null +++ b/source/l/libproxy/libproxy.url @@ -0,0 +1 @@ +http://code.google.com/p/libproxy/ diff --git a/source/l/libproxy/only_link_mozjs185.diff b/source/l/libproxy/only_link_mozjs185.diff new file mode 100644 index 000000000..84016ac80 --- /dev/null +++ b/source/l/libproxy/only_link_mozjs185.diff @@ -0,0 +1,46 @@ +Index: libproxy/cmake/modules/pacrunner_mozjs.cmk +=================================================================== +--- libproxy/cmake/modules/pacrunner_mozjs.cmk (revision 814) ++++ libproxy/cmake/modules/pacrunner_mozjs.cmk (revision 815) +@@ -7,19 +7,15 @@ + include_directories("${MOZJS_INCLUDE_DIR}") + endif() + elseif(NOT APPLE) +- set(MOZJS_SEARCH_ORDER "mozilla-js;xulrunner-js;firefox-js;seamonkey-js" CACHE STRING "MozJS search order") + option(WITH_MOZJS "Search for MOZJS package" ON) + if (WITH_MOZJS) +- foreach(MOZJSLIB ${MOZJS_SEARCH_ORDER}) +- pkg_search_module(MOZJS ${MOZJSLIB}>=2.0b12) +- if(MOZJS_FOUND) +- include_directories(${MOZJS_INCLUDE_DIRS}) +- link_directories(${MOZJS_LIBRARY_DIRS}) +- break() +- else() +- set(MOZJS_FOUND 0) +- endif() +- endforeach() ++ pkg_search_module(MOZJS mozjs185>=1.8.5) ++ if(MOZJS_FOUND) ++ include_directories(${MOZJS_INCLUDE_DIRS}) ++ link_directories(${MOZJS_LIBRARY_DIRS}) ++ else() ++ set(MOZJS_FOUND 0) ++ endif() + else() + set(MOZJS_FOUND 0) + endif() +Index: NEWS +=================================================================== +--- NEWS (revision 814) ++++ NEWS (revision 815) +@@ -1,3 +1,10 @@ ++New in version 0.4.8 (not yet released) ++============================== ++* Only support standalone mozjs185 as mozilla js engine. ++ xulrunner being part of the now lightning fast moving firefox ++ is impossible to be tracked as a dependency and it is not ++ supported by Mozilla to be used in this scenario. ++ + New in version 0.4.7 + ============================== + * Support/require xulrunner 2.0+ diff --git a/source/l/libproxy/slack-desc b/source/l/libproxy/slack-desc new file mode 100644 index 000000000..05b109e09 --- /dev/null +++ b/source/l/libproxy/slack-desc @@ -0,0 +1,19 @@ +# 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-----------------------------------------------------| +libproxy: libproxy (proxy configuration library) +libproxy: +libproxy: libproxy exists to answer the question: Given a network resource, +libproxy: how do I reach it? It handles all the details, enabling you to get +libproxy: back to programming. Just ask libproxy what proxy to use: you get +libproxy: simple code and your users get correct, consistent behavior and +libproxy: broad infrastructure compatibility. +libproxy: +libproxy: Homepage: http://code.google.com/p/libproxy/ +libproxy: +libproxy: diff --git a/source/l/librsvg/librsvg.SlackBuild b/source/l/librsvg/librsvg.SlackBuild index ff765afe0..90d995a85 100755 --- a/source/l/librsvg/librsvg.SlackBuild +++ b/source/l/librsvg/librsvg.SlackBuild @@ -77,9 +77,7 @@ CFLAGS="$SLKCFLAGS" \ --localstatedir=/var/lib \ --mandir=/usr/man \ --enable-static=no \ - --with-svgz \ --build=$ARCH-slackware-linux -# --with-croco \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -87,8 +85,20 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/librsvg-$VERSION cp -a \ diff --git a/source/l/libsoup/libsoup.SlackBuild b/source/l/libsoup/libsoup.SlackBuild new file mode 100755 index 000000000..485883684 --- /dev/null +++ b/source/l/libsoup/libsoup.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/sh +# +# Slackware build script for libsoup +# +# Copyright 2009-2010 Erik W. Hanson, Minneapolis, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=libsoup +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +chmod -R u+w,go+r-w,a-s . + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var/lib \ + --disable-static \ + --with-gnome \ + --build=$ARCH-slackware-linux || exit 1 + +make $NUMJOBS || make || exit 1 +make install-strip DESTDIR=$PKG || exit 1 + +## NOTE: These _should_ go eventually, but for now it causes problems. +## Don't ship .la files: +#rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a COPYING* AUTHORS NEWS README* $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libsoup/slack-desc b/source/l/libsoup/slack-desc new file mode 100644 index 000000000..80cd6ef03 --- /dev/null +++ b/source/l/libsoup/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +libsoup: libsoup (an HTTP client/server library) +libsoup: +libsoup: Soup is an HTTP client/server library implementation in C. It uses +libsoup: GObjects and the glib main loop to integrate well with GTK+ +libsoup: applications, and has a synchronous API suitable for use in threaded +libsoup: applications. +libsoup: +libsoup: +libsoup: +libsoup: +libsoup: diff --git a/source/l/libspectre/libspectre.SlackBuild b/source/l/libspectre/libspectre.SlackBuild index 39668be39..70ae971bf 100755 --- a/source/l/libspectre/libspectre.SlackBuild +++ b/source/l/libspectre/libspectre.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,9 +21,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=libspectre -VERSION=${VERSION:-0.2.5} -BUILD=${BUILD:-2} +PKGNAM=libspectre +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -39,7 +39,7 @@ NUMJOBS=${NUMJOBS:--j6} CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -58,9 +58,9 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1 -cd $PRGNAM-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -101,14 +101,14 @@ if [ -d $PKG/usr/man ]; then ) fi -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING* INSTALL NEWS README* TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libssh/libssh.SlackBuild b/source/l/libssh/libssh.SlackBuild new file mode 100755 index 000000000..cc60f00a4 --- /dev/null +++ b/source/l/libssh/libssh.SlackBuild @@ -0,0 +1,113 @@ +#!/bin/sh + +# Copyright 2011, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=libssh +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:-" -j7 "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-${PKGNAM} +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf ${PKGNAM}-${VERSION} +tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 +cd ${PKGNAM}-$VERSION || exit 1 + +# Make sure ownerships and permissions are sane: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +# Build and install: +mkdir build +cd build + cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DWITH_GCRYPT=1 \ + -DWITH_SSH1=1 \ + -DWITH_PCAP=1 \ + -DWITH_SFTP=1 \ + -DWITH_SERVER=1 \ + -DWITH_STATIC_LIB=0 \ + .. + make $NUMJOBS VERBOSE=1 || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd - + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS BSD ChangeLog COPYING INSTALL README doc/{API*,libssh*.txt} \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/libssh/slack-desc b/source/l/libssh/slack-desc new file mode 100644 index 000000000..12a1c1922 --- /dev/null +++ b/source/l/libssh/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +libssh: libssh (library implementing ssh protocols) +libssh: +libssh: libssh is a mulitplatform C library implementing the SSHv2 and SSHv1 +libssh: protocol on client and server side. With libssh, you can remotely +libssh: execute programs, transfer files, and use a secure and transparent +libssh: tunnel for your remote applications. +libssh: +libssh: Homepage: http://www.libssh.org/ +libssh: +libssh: +libssh: diff --git a/source/l/libtasn1/libtasn1.SlackBuild b/source/l/libtasn1/libtasn1.SlackBuild new file mode 100755 index 000000000..d9fb3d810 --- /dev/null +++ b/source/l/libtasn1/libtasn1.SlackBuild @@ -0,0 +1,124 @@ +#!/bin/sh + +# Slackware build script for libtasn1 + +# Copyright 2010-2012 Robby Workman, Northport, Alabama, USA +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=libtasn1 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + *) export ARCH=$( uname -m ) ;; + esac +fi + +NUMJOBS=${NUMJOBS:--j6} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + --enable-shared \ + --disable-static \ + --build=$ARCH-slackware-linux || exit 1 + #--disable-gtk-doc \ + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Don't ship .la files: +rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +rm -f $PKG/usr/info/dir +gzip -9 $PKG/usr/info/* + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* NEWS README* THANKS \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/libtasn1/slack-desc b/source/l/libtasn1/slack-desc new file mode 100644 index 000000000..da00dacb8 --- /dev/null +++ b/source/l/libtasn1/slack-desc @@ -0,0 +1,19 @@ +# 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-----------------------------------------------------| +libtasn1: libtasn1 (ASN.1 library) +libtasn1: +libtasn1: Libtasn1 is the GNU ASN.1 library. Abstract Syntax Notation One +libtasn1: (ASN.1) is a standard and flexible notation that describes rules and +libtasn1: structures for representing, encoding, transmitting, and decoding +libtasn1: data in telecommunications and computer networking. +libtasn1: +libtasn1: Libtasn1 was written by Fabio Fiorina. +libtasn1: +libtasn1: +libtasn1: diff --git a/source/l/libtiff/libtiff-CVE-2011-0192.patch b/source/l/libtiff/libtiff-CVE-2011-0192.patch deleted file mode 100644 index 892f70e01..000000000 --- a/source/l/libtiff/libtiff-CVE-2011-0192.patch +++ /dev/null @@ -1,27 +0,0 @@ -Protect against a fax VL(n) codeword commanding a move left. Without -this, a malicious input file can generate an indefinitely large series -of runs without a0 ever reaching the right margin, thus overrunning -our buffer of run lengths. Per CVE-2011-0192. This is a modified -version of a patch proposed by Drew Yao of Apple Product Security. -It adds an unexpected() report, and disallows the equality case except -for the first run of a line, since emitting a run without increasing a0 -still allows buffer overrun. (We have to allow it for the first run to -cover the case of encoding a zero-length run at start of line using VL.) - - -diff -Naur tiff-3.9.4.orig/libtiff/tif_fax3.h tiff-3.9.4/libtiff/tif_fax3.h ---- tiff-3.9.4.orig/libtiff/tif_fax3.h 2010-06-08 14:50:42.000000000 -0400 -+++ tiff-3.9.4/libtiff/tif_fax3.h 2011-03-10 12:11:20.850839162 -0500 -@@ -478,6 +478,12 @@ - break; \ - case S_VL: \ - CHECK_b1; \ -+ if (b1 <= (int) (a0 + TabEnt->Param)) { \ -+ if (b1 < (int) (a0 + TabEnt->Param) || pa != thisrun) { \ -+ unexpected("VL", a0); \ -+ goto eol2d; \ -+ } \ -+ } \ - SETVALUE(b1 - a0 - TabEnt->Param); \ - b1 -= *--pb; \ - break; \ diff --git a/source/l/libtiff/libtiff-CVE-2011-1167.patch b/source/l/libtiff/libtiff-CVE-2011-1167.patch deleted file mode 100644 index d3fcf6f64..000000000 --- a/source/l/libtiff/libtiff-CVE-2011-1167.patch +++ /dev/null @@ -1,53 +0,0 @@ -Upstream patch for CVE-2011-1167, heap-based buffer overflow in thunder -decoder (ZDI-CAN-1004). - - -diff -Naur tiff-3.9.4.orig/libtiff/tif_thunder.c tiff-3.9.4/libtiff/tif_thunder.c ---- tiff-3.9.4.orig/libtiff/tif_thunder.c 2010-06-08 14:50:43.000000000 -0400 -+++ tiff-3.9.4/libtiff/tif_thunder.c 2011-03-18 12:17:13.635796403 -0400 -@@ -55,12 +55,32 @@ - static const int twobitdeltas[4] = { 0, 1, 0, -1 }; - static const int threebitdeltas[8] = { 0, 1, 2, 3, 0, -3, -2, -1 }; - --#define SETPIXEL(op, v) { \ -- lastpixel = (v) & 0xf; \ -- if (npixels++ & 1) \ -- *op++ |= lastpixel; \ -- else \ -+#define SETPIXEL(op, v) { \ -+ lastpixel = (v) & 0xf; \ -+ if ( npixels < maxpixels ) \ -+ { \ -+ if (npixels++ & 1) \ -+ *op++ |= lastpixel; \ -+ else \ - op[0] = (tidataval_t) (lastpixel << 4); \ -+ } \ -+} -+ -+static int -+ThunderSetupDecode(TIFF* tif) -+{ -+ static const char module[] = "ThunderSetupDecode"; -+ -+ if( tif->tif_dir.td_bitspersample != 4 ) -+ { -+ TIFFErrorExt(tif->tif_clientdata, module, -+ "Wrong bitspersample value (%d), Thunder decoder only supports 4bits per sample.", -+ (int) tif->tif_dir.td_bitspersample ); -+ return 0; -+ } -+ -+ -+ return (1); - } - - static int -@@ -151,6 +171,7 @@ - (void) scheme; - tif->tif_decoderow = ThunderDecodeRow; - tif->tif_decodestrip = ThunderDecodeRow; -+ tif->tif_setupdecode = ThunderSetupDecode; - return (1); - } - #endif /* THUNDER_SUPPORT */ diff --git a/source/l/libtiff/libtiff-CVE-2012-1173.patch b/source/l/libtiff/libtiff-CVE-2012-1173.patch new file mode 100644 index 000000000..0ada700b4 --- /dev/null +++ b/source/l/libtiff/libtiff-CVE-2012-1173.patch @@ -0,0 +1,71 @@ +This patch is submitted to upstream for CVE-2012-1173 + + +diff -Naur tiff-3.9.5.orig/libtiff/tif_getimage.c tiff-3.9.5/libtiff/tif_getimage.c +--- tiff-3.9.5.orig/libtiff/tif_getimage.c 2010-07-08 12:17:59.000000000 -0400 ++++ tiff-3.9.5/libtiff/tif_getimage.c 2012-03-14 14:49:25.796728783 -0400 +@@ -673,18 +673,24 @@ + unsigned char* p2; + unsigned char* pa; + tsize_t tilesize; ++ tsize_t bufsize; + int32 fromskew, toskew; + int alpha = img->alpha; + uint32 nrow; + int ret = 1, flip; + + tilesize = TIFFTileSize(tif); +- buf = (unsigned char*) _TIFFmalloc((alpha?4:3)*tilesize); ++ bufsize = TIFFSafeMultiply(tsize_t,alpha?4:3,tilesize); ++ if (bufsize == 0) { ++ TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtTileSeparate"); ++ return (0); ++ } ++ buf = (unsigned char*) _TIFFmalloc(bufsize); + if (buf == 0) { + TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "No space for tile buffer"); + return (0); + } +- _TIFFmemset(buf, 0, (alpha?4:3)*tilesize); ++ _TIFFmemset(buf, 0, bufsize); + p0 = buf; + p1 = p0 + tilesize; + p2 = p1 + tilesize; +@@ -880,17 +886,23 @@ + uint32 rowsperstrip, offset_row; + uint32 imagewidth = img->width; + tsize_t stripsize; ++ tsize_t bufsize; + int32 fromskew, toskew; + int alpha = img->alpha; + int ret = 1, flip; + + stripsize = TIFFStripSize(tif); +- p0 = buf = (unsigned char *)_TIFFmalloc((alpha?4:3)*stripsize); ++ bufsize = TIFFSafeMultiply(tsize_t,alpha?4:3,stripsize); ++ if (bufsize == 0) { ++ TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtStripSeparate"); ++ return (0); ++ } ++ p0 = buf = (unsigned char *)_TIFFmalloc(bufsize); + if (buf == 0) { + TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "No space for tile buffer"); + return (0); + } +- _TIFFmemset(buf, 0, (alpha?4:3)*stripsize); ++ _TIFFmemset(buf, 0, bufsize); + p1 = p0 + stripsize; + p2 = p1 + stripsize; + pa = (alpha?(p2+stripsize):NULL); +diff -Naur tiff-3.9.5.orig/libtiff/tiffiop.h tiff-3.9.5/libtiff/tiffiop.h +--- tiff-3.9.5.orig/libtiff/tiffiop.h 2011-03-28 09:43:43.000000000 -0400 ++++ tiff-3.9.5/libtiff/tiffiop.h 2012-03-14 14:49:25.797728754 -0400 +@@ -246,7 +246,7 @@ + #define TIFFroundup(x, y) (TIFFhowmany(x,y)*(y)) + + /* Safe multiply which returns zero if there is an integer overflow */ +-#define TIFFSafeMultiply(t,v,m) ((((t)m != (t)0) && (((t)((v*m)/m)) == (t)v)) ? (t)(v*m) : (t)0) ++#define TIFFSafeMultiply(t,v,m) ((((t)(m) != (t)0) && (((t)(((v)*(m))/(m))) == (t)(v))) ? (t)((v)*(m)) : (t)0) + + #define TIFFmax(A,B) ((A)>(B)?(A):(B)) + #define TIFFmin(A,B) ((A)<(B)?(A):(B)) diff --git a/source/l/libtiff/libtiff.SlackBuild b/source/l/libtiff/libtiff.SlackBuild index 33e871f35..91ec64fad 100755 --- a/source/l/libtiff/libtiff.SlackBuild +++ b/source/l/libtiff/libtiff.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-$(echo tiff-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=2 +BUILD=1 # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -63,8 +63,7 @@ rm -rf tiff-$VERSION tar xvf $CWD/tiff-$VERSION.tar.?z* || exit 1 cd tiff-$VERSION -zcat $CWD/libtiff-CVE-2011-0192.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/libtiff-CVE-2011-1167.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/libtiff-CVE-2012-1173.patch.gz | patch -p1 --verbose || exit 1 chown -R root:root . find . \ diff --git a/source/l/libusb-compat/libusb-compat.SlackBuild b/source/l/libusb-compat/libusb-compat.SlackBuild new file mode 100755 index 000000000..f0b2c0d98 --- /dev/null +++ b/source/l/libusb-compat/libusb-compat.SlackBuild @@ -0,0 +1,140 @@ +#!/bin/sh + +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=libusb-compat +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -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: +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --docdir=/usr/doc/libusb-$VERSION \ + --disable-static \ + --build=$ARCH-slackware-linux + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# 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 +) + +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + AUTHORS COPYING INSTALL LICENSE NEWS README \ + $PKG/usr/doc/${PKGNAM}-$VERSION + +# Compress and if needed symlink the man pages: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/libusb-compat/slack-desc b/source/l/libusb-compat/slack-desc new file mode 100644 index 000000000..5db3fa749 --- /dev/null +++ b/source/l/libusb-compat/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +libusb-compat: libusb-compat (Compatibility library for libusb-0.1 apps) +libusb-compat: +libusb-compat: A compatibility layer allowing applications written for libusb-0.1 to +libusb-compat: work with libusb-1.0. libusb-compat-0.1 attempts to retain as much +libusb-compat: ABI and API compatibility with libusb-0.1 as possible. +libusb-compat: +libusb-compat: Homepage: http://libusb.org +libusb-compat: +libusb-compat: +libusb-compat: +libusb-compat: diff --git a/source/l/libusb/libusb.SlackBuild b/source/l/libusb/libusb.SlackBuild index 26bc4b5d0..64b32c3d6 100755 --- a/source/l/libusb/libusb.SlackBuild +++ b/source/l/libusb/libusb.SlackBuild @@ -21,10 +21,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-1.0.8} # libusb version -USBCOMPAT=${USBCOMPAT:-0.1.3} # libusb-compat version +VERSION=${VERSION:-1.0.9} # libusb version -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j6} @@ -60,11 +59,9 @@ mkdir -p $TMP $PKG # First we'll do the main libusb stuff cd $TMP rm -rf libusb-$VERSION -tar xvf $CWD/libusb-$VERSION.tar.bz2 +tar xvf $CWD/libusb-$VERSION.tar.xz cd libusb-$VERSION -zcat $CWD/libusb.fix.debug.log.level.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -101,43 +98,6 @@ if [ -r ChangeLog ]; then touch -r ChangeLog $DOCSDIR/ChangeLog fi -# Now build the libusb-compat stuff -cd $TMP -rm -rf libusb-compat-$USBCOMPAT -tar xvf $CWD/libusb-compat-$USBCOMPAT.tar.bz2 -cd libusb-compat-$USBCOMPAT -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --docdir=/usr/doc/libusb-$VERSION \ - --disable-static \ - --build=$ARCH-slackware-linux - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/libusb-$VERSION/libusb-compat-$USBCOMPAT -cp -a \ - AUTHORS COPYING INSTALL LICENSE NEWS README \ - $PKG/usr/doc/libusb-$VERSION/libusb-compat-$USBCOMPAT - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/libusb-compat-$USBCOMPAT) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - # Now handle the package-wide stuff 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/l/libusb/libusb.fix.debug.log.level.diff b/source/l/libusb/libusb.fix.debug.log.level.diff deleted file mode 100644 index 59af816eb..000000000 --- a/source/l/libusb/libusb.fix.debug.log.level.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- ./libusb/os/linux_usbfs.c.orig 2010-04-22 16:14:46.000000000 -0500 -+++ ./libusb/os/linux_usbfs.c 2011-03-24 18:40:38.000000000 -0500 -@@ -1055,7 +1055,8 @@ - hpriv->fd = open(filename, O_RDWR); - if (hpriv->fd < 0) { - if (errno == EACCES) { -- fprintf(stderr, "libusb couldn't open USB device %s: " -+ usbi_err(HANDLE_CTX(handle), -+ "libusb couldn't open USB device %s: " - "Permission denied.\n" - "libusb requires write access to USB device nodes.\n", - filename); diff --git a/source/l/libusb/slack-desc b/source/l/libusb/slack-desc index e1a8b5dfd..68090cf63 100644 --- a/source/l/libusb/slack-desc +++ b/source/l/libusb/slack-desc @@ -9,11 +9,11 @@ libusb: libusb (USB library) libusb: libusb: This is libusb, a library which allows userspace application access -libusb: to USB devices. It is used to connect to USB devices like scanners. -libusb: http://libusb.org/wiki/Libusb1.0 +libusb: to USB devices. It is used to connect to USB devices like scanners +libusb: and printers. +libusb: +libusb: http://libusb.org libusb: -libusb: This package also contains libusb-compat for the "old" libusb users. -libusb: http://libusb.org/wiki/LibusbCompat0.1 libusb: libusb: libusb: diff --git a/source/l/libvisual/libvisual.SlackBuild b/source/l/libvisual/libvisual.SlackBuild index c99d5461e..0d749cdfc 100755 --- a/source/l/libvisual/libvisual.SlackBuild +++ b/source/l/libvisual/libvisual.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=libvisual VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -62,6 +62,8 @@ rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION +zcat $CWD/libvisual.glib.h.diff.gz | patch -p1 --verbose || exit 1 + # Make sure ownerships and permissions are sane: chown -R root:root . find . \ diff --git a/source/l/libvisual/libvisual.glib.h.diff b/source/l/libvisual/libvisual.glib.h.diff new file mode 100644 index 000000000..d0c738aac --- /dev/null +++ b/source/l/libvisual/libvisual.glib.h.diff @@ -0,0 +1,11 @@ +--- ./libvisual/lv_thread.h.orig 2005-09-18 17:14:47.000000000 -0500 ++++ ./libvisual/lv_thread.h 2012-07-17 23:05:48.818091848 -0500 +@@ -14,7 +14,7 @@ + #ifdef VISUAL_THREAD_MODEL_POSIX + #include <pthread.h> + #elif defined(VISUAL_THREAD_MODEL_GTHREAD2) /* !VISUAL_THREAD_MODEL_POSIX */ +-#include <glib/gthread.h> ++#include <glib.h> + #else /* !VISUAL_THREAD_MODEL_GTHREAD2 */ + + #endif diff --git a/source/l/libvncserver/libvncserver.SlackBuild b/source/l/libvncserver/libvncserver.SlackBuild index 87712a13f..7edc93fc0 100755 --- a/source/l/libvncserver/libvncserver.SlackBuild +++ b/source/l/libvncserver/libvncserver.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007 Heinz Wiesinger <hmwiesinger@gmx.at> -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,27 +22,26 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Robby Workman <rworkman at slackware.com> +# Modified by Eric Hameleers <alien at slackware.com> -VERSION=0.9.7 +VERSION=0.9.9 BUILD=${BUILD:-2} +NUMJOBS=${NUMJOBS:--j7} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-libvncserver - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -52,11 +51,23 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-libvncserver + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -79,14 +90,14 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --disable-static \ - --build=$ARCH-slackware-linux + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# Add SDLvncviewer -#install -D -m0755 ./client_examples/SDLvncviewer $PKG/usr/bin/SDLvncviewer -make install -C client_examples DESTDIR=$PKG || exit 1 +if [ -x client_examples/.libs/SDLvncviewer ]; then + cp -a client_examples/.libs/SDLvncviewer $PKG/usr/bin/SDLvncviewer +fi 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/l/libvorbis/libvorbis.SlackBuild b/source/l/libvorbis/libvorbis.SlackBuild index 9fae85d65..be5558758 100755 --- a/source/l/libvorbis/libvorbis.SlackBuild +++ b/source/l/libvorbis/libvorbis.SlackBuild @@ -86,6 +86,14 @@ cp -a \ AUTHORS COPYING HACKING README \ $PKG/usr/doc/libvorbis-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/libwnck/libwnck.SlackBuild b/source/l/libwnck/libwnck.SlackBuild index fba402933..bcaed3c65 100755 --- a/source/l/libwnck/libwnck.SlackBuild +++ b/source/l/libwnck/libwnck.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=libwnck VERSION=${VERSION:-$(echo libwnck-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/source/l/libwpd/libwpd.SlackBuild b/source/l/libwpd/libwpd.SlackBuild index b160bd81d..6b6611624 100755 --- a/source/l/libwpd/libwpd.SlackBuild +++ b/source/l/libwpd/libwpd.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=0.8.14 +VERSION=${VERSION:-$(echo libwpd-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: @@ -58,7 +58,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf libwpd-$VERSION -tar xvf $CWD/libwpd-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/libwpd-$VERSION.tar.?z* || exit 1 cd libwpd-$VERSION chown -R root:root . find . \ @@ -72,6 +72,7 @@ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ + --without-docs \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -85,9 +86,8 @@ cp -a \ CHANGES COPYING CREDITS HACKING INSTALL README TODO \ $PKG/usr/doc/libwpd-$VERSION -# Developers may find these docs in the source interesting, but most users won't: -rm -rf $PKG/usr/share/doc -rmdir $PKG/usr/share +# Remove empty folder: +rm -rf $PKG/usr/share mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/libxml2/libxml2-2.7.8.broken.versioning.diff b/source/l/libxml2/libxml2-2.7.8.broken.versioning.diff deleted file mode 100644 index c629d21ad..000000000 --- a/source/l/libxml2/libxml2-2.7.8.broken.versioning.diff +++ /dev/null @@ -1,23 +0,0 @@ -From 00819877651b87842ed878898ba17dba489820f0 Mon Sep 17 00:00:00 2001 -From: Daniel Veillard <veillard@redhat.com> -Date: Thu, 04 Nov 2010 20:53:14 +0000 -Subject: Reactivate the shared library versionning script - ---- -diff --git a/configure.in b/configure.in -index 59d0629..a1d2c89 100644 ---- a/configure.in -+++ b/configure.in -@@ -84,7 +84,7 @@ else - esac - fi - AC_SUBST(VERSION_SCRIPT_FLAGS) --AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -z "$VERSION_SCRIPT_FLAGS"]) -+AM_CONDITIONAL([USE_VERSION_SCRIPT], [test -n "$VERSION_SCRIPT_FLAGS"]) - - dnl - dnl We process the AC_ARG_WITH first so that later we can modify --- -cgit v0.8.3.1 - - diff --git a/source/l/libxml2/libxml2.SlackBuild b/source/l/libxml2/libxml2.SlackBuild index 23cce0623..bd1b759a1 100755 --- a/source/l/libxml2/libxml2.SlackBuild +++ b/source/l/libxml2/libxml2.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=libxml2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -68,10 +68,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/libxml2-2.7.8.broken.versioning.diff.gz | patch -p1 --verbose || exit 1 -# This is needed after the patch above: -autoreconf || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -104,8 +100,8 @@ cat $CWD/slack-desc > $PKG/install/slack-desc # Be sure to clobber any .pyc files that might have been generated so that # the new .py files will be used instead of the already compiled copies cat << EOF > $PKG/install/doinst.sh -rm -f /usr/lib${LIBDIRSUFFIX}/python26/site-packages/libxml2.pyc -rm -f /usr/lib${LIBDIRSUFFIX}/python26/site-packages/drv_libxml2.pyc +rm -f /usr/lib${LIBDIRSUFFIX}/python2.7/site-packages/libxml2.pyc +rm -f /usr/lib${LIBDIRSUFFIX}/python2.7/site-packages/drv_libxml2.pyc EOF cd $PKG diff --git a/source/l/libxslt/libxslt.SlackBuild b/source/l/libxslt/libxslt.SlackBuild index 225c40937..a365744e5 100755 --- a/source/l/libxslt/libxslt.SlackBuild +++ b/source/l/libxslt/libxslt.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ VERSION=1.1.26 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/libyaml/libyaml.SlackBuild b/source/l/libyaml/libyaml.SlackBuild new file mode 100755 index 000000000..4dad39be9 --- /dev/null +++ b/source/l/libyaml/libyaml.SlackBuild @@ -0,0 +1,114 @@ +#!/bin/sh + +# Copyright 2011 Vincent Batts, Vienna, VA, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=libyaml +SRCNAM=yaml +VERSION=$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +BUILD=${BUILD:-1} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + +NUMJOBS=${NUMJOBS:-" -j7 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --build=$ARCH-slackware-linux + +make $NUMJOBS || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + README LICENSE doc \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +#cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/libyaml/libyaml.url b/source/l/libyaml/libyaml.url new file mode 100644 index 000000000..0ee34d3f2 --- /dev/null +++ b/source/l/libyaml/libyaml.url @@ -0,0 +1 @@ +http://pyyaml.org/wiki/LibYAML diff --git a/source/l/libyaml/slack-desc b/source/l/libyaml/slack-desc new file mode 100644 index 000000000..8965634dd --- /dev/null +++ b/source/l/libyaml/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +libyaml: libyaml (YAML parser, written in C) +libyaml: +libyaml: YAML Ain't Markup Language. It is a human friendly data serialization +libyaml: standard for all programming languages. +libyaml: +libyaml: Homepage: http://pyyaml.org/wiki/LibYAML +libyaml: +libyaml: +libyaml: +libyaml: +libyaml: diff --git a/source/l/loudmouth/loudmouth-1.4.3-glib-compile-fix.patch b/source/l/loudmouth/loudmouth-1.4.3-glib-compile-fix.patch new file mode 100644 index 000000000..03d04e78a --- /dev/null +++ b/source/l/loudmouth/loudmouth-1.4.3-glib-compile-fix.patch @@ -0,0 +1,17 @@ +Fix compile against new glib. + +From: Daniel Drake <dsd@laptop.org> + +Index: loudmouth-1.4.3/loudmouth/lm-error.c +=================================================================== +--- loudmouth-1.4.3.orig/loudmouth/lm-error.c ++++ loudmouth-1.4.3/loudmouth/lm-error.c +@@ -19,7 +19,7 @@ + */ + + #include <config.h> +-#include <glib/gerror.h> ++#include <glib.h> + #include "lm-error.h" + + /** diff --git a/source/l/loudmouth/loudmouth.SlackBuild b/source/l/loudmouth/loudmouth.SlackBuild index 650bd1699..156a49a9e 100755 --- a/source/l/loudmouth/loudmouth.SlackBuild +++ b/source/l/loudmouth/loudmouth.SlackBuild @@ -1,5 +1,6 @@ #!/bin/sh # Copyright 2009 Eric Hameleers, Eindhoven, NL +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -23,7 +24,7 @@ PKGNAM=loudmouth VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:" -j4 "} @@ -71,6 +72,7 @@ zcat $CWD/loudmouth.gnutls.configure.ac.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/loudmouth.async_assertion.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/loudmouth.sasl-md5-digest-uri.diff.gz | patch -p1 --verbose || exit 1 zcat $CWD/loudmouth.stanzadrop.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/loudmouth-1.4.3-glib-compile-fix.patch.gz | patch -p1 --verbose || exit 1 # needed after the configure.ac gnutls patch autoreconf @@ -94,13 +96,18 @@ LDFLAGS="$SLKLDFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PKGNAM-$VERSION \ --with-ssl=gnutls \ - --enable-debug=no \ + --enable-debug=yes \ --enable-static=no \ --program-prefix= \ --program-suffix= \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux +## +## NOTE: For some reason --enable-debug=yes actually _disables_ verbose debug +## messages to the console. Don't mess with it! +## + # this generates a broken libtool, so use the system version: cp /usr/bin/libtool . diff --git a/source/l/lzo/.lzo.info b/source/l/lzo/.lzo.info deleted file mode 100644 index 27564cc0c..000000000 --- a/source/l/lzo/.lzo.info +++ /dev/null @@ -1,8 +0,0 @@ -PRGNAM=lzo -VERSION=2.0.2 -HOMEPAGE=http://www.oberhumer.com/opensource/lzo/ -DOWNLOAD=http://www.oberhumer.com/opensource/lzo/download/lzo-2.02.tar.gz -MD5SUM=6760e5819f4238328709bf93bf10071c -AUTHOR=Ricardson Williams -EMAIL=ricardsonwilliams@yahoo.com.br -APPROVED=Alan Hicks,robw810 diff --git a/source/l/media-player-info/media-player-info.SlackBuild b/source/l/media-player-info/media-player-info.SlackBuild new file mode 100755 index 000000000..eff9d1938 --- /dev/null +++ b/source/l/media-player-info/media-player-info.SlackBuild @@ -0,0 +1,80 @@ +#!/bin/sh + +# Slackware build script for media-player-info + +# Copyright 2010-2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=media-player-info +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -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 \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux || exit 1 + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.txz diff --git a/source/l/media-player-info/slack-desc b/source/l/media-player-info/slack-desc new file mode 100644 index 000000000..509b51beb --- /dev/null +++ b/source/l/media-player-info/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +media-player-info: media-player-info (media player capability data) +media-player-info: +media-player-info: media-player-info is a repository of data files describing media +media-player-info: player (mostly USB Mass Storage ones) capabilities. These files +media-player-info: contain information about the directory layout to use to add music +media-player-info: to these devices, about the supported file formats, +media-player-info: +media-player-info: +media-player-info: +media-player-info: +media-player-info: diff --git a/source/l/mozilla-nss/MPL-1.1.txt b/source/l/mozilla-nss/MPL-1.1.txt new file mode 100644 index 000000000..7714141d1 --- /dev/null +++ b/source/l/mozilla-nss/MPL-1.1.txt @@ -0,0 +1,470 @@ + MOZILLA PUBLIC LICENSE + Version 1.1 + + --------------- + +1. Definitions. + + 1.0.1. "Commercial Use" means distribution or otherwise making the + Covered Code available to a third party. + + 1.1. "Contributor" means each entity that creates or contributes to + the creation of Modifications. + + 1.2. "Contributor Version" means the combination of the Original + Code, prior Modifications used by a Contributor, and the Modifications + made by that particular Contributor. + + 1.3. "Covered Code" means the Original Code or Modifications or the + combination of the Original Code and Modifications, in each case + including portions thereof. + + 1.4. "Electronic Distribution Mechanism" means a mechanism generally + accepted in the software development community for the electronic + transfer of data. + + 1.5. "Executable" means Covered Code in any form other than Source + Code. + + 1.6. "Initial Developer" means the individual or entity identified + as the Initial Developer in the Source Code notice required by Exhibit + A. + + 1.7. "Larger Work" means a work which combines Covered Code or + portions thereof with code not governed by the terms of this License. + + 1.8. "License" means this document. + + 1.8.1. "Licensable" means having the right to grant, to the maximum + extent possible, whether at the time of the initial grant or + subsequently acquired, any and all of the rights conveyed herein. + + 1.9. "Modifications" means any addition to or deletion from the + substance or structure of either the Original Code or any previous + Modifications. When Covered Code is released as a series of files, a + Modification is: + A. Any addition to or deletion from the contents of a file + containing Original Code or previous Modifications. + + B. Any new file that contains any part of the Original Code or + previous Modifications. + + 1.10. "Original Code" means Source Code of computer software code + which is described in the Source Code notice required by Exhibit A as + Original Code, and which, at the time of its release under this + License is not already Covered Code governed by this License. + + 1.10.1. "Patent Claims" means any patent claim(s), now owned or + hereafter acquired, including without limitation, method, process, + and apparatus claims, in any patent Licensable by grantor. + + 1.11. "Source Code" means the preferred form of the Covered Code for + making modifications to it, including all modules it contains, plus + any associated interface definition files, scripts used to control + compilation and installation of an Executable, or source code + differential comparisons against either the Original Code or another + well known, available Covered Code of the Contributor's choice. The + Source Code can be in a compressed or archival form, provided the + appropriate decompression or de-archiving software is widely available + for no charge. + + 1.12. "You" (or "Your") means an individual or a legal entity + exercising rights under, and complying with all of the terms of, this + License or a future version of this License issued under Section 6.1. + For legal entities, "You" includes any entity which controls, is + controlled by, or is under common control with You. For purposes of + this definition, "control" means (a) the power, direct or indirect, + to cause the direction or management of such entity, whether by + contract or otherwise, or (b) ownership of more than fifty percent + (50%) of the outstanding shares or beneficial ownership of such + entity. + +2. Source Code License. + + 2.1. The Initial Developer Grant. + The Initial Developer hereby grants You a world-wide, royalty-free, + non-exclusive license, subject to third party intellectual property + claims: + (a) under intellectual property rights (other than patent or + trademark) Licensable by Initial Developer to use, reproduce, + modify, display, perform, sublicense and distribute the Original + Code (or portions thereof) with or without Modifications, and/or + as part of a Larger Work; and + + (b) under Patents Claims infringed by the making, using or + selling of Original Code, to make, have made, use, practice, + sell, and offer for sale, and/or otherwise dispose of the + Original Code (or portions thereof). + + (c) the licenses granted in this Section 2.1(a) and (b) are + effective on the date Initial Developer first distributes + Original Code under the terms of this License. + + (d) Notwithstanding Section 2.1(b) above, no patent license is + granted: 1) for code that You delete from the Original Code; 2) + separate from the Original Code; or 3) for infringements caused + by: i) the modification of the Original Code or ii) the + combination of the Original Code with other software or devices. + + 2.2. Contributor Grant. + Subject to third party intellectual property claims, each Contributor + hereby grants You a world-wide, royalty-free, non-exclusive license + + (a) under intellectual property rights (other than patent or + trademark) Licensable by Contributor, to use, reproduce, modify, + display, perform, sublicense and distribute the Modifications + created by such Contributor (or portions thereof) either on an + unmodified basis, with other Modifications, as Covered Code + and/or as part of a Larger Work; and + + (b) under Patent Claims infringed by the making, using, or + selling of Modifications made by that Contributor either alone + and/or in combination with its Contributor Version (or portions + of such combination), to make, use, sell, offer for sale, have + made, and/or otherwise dispose of: 1) Modifications made by that + Contributor (or portions thereof); and 2) the combination of + Modifications made by that Contributor with its Contributor + Version (or portions of such combination). + + (c) the licenses granted in Sections 2.2(a) and 2.2(b) are + effective on the date Contributor first makes Commercial Use of + the Covered Code. + + (d) Notwithstanding Section 2.2(b) above, no patent license is + granted: 1) for any code that Contributor has deleted from the + Contributor Version; 2) separate from the Contributor Version; + 3) for infringements caused by: i) third party modifications of + Contributor Version or ii) the combination of Modifications made + by that Contributor with other software (except as part of the + Contributor Version) or other devices; or 4) under Patent Claims + infringed by Covered Code in the absence of Modifications made by + that Contributor. + +3. Distribution Obligations. + + 3.1. Application of License. + The Modifications which You create or to which You contribute are + governed by the terms of this License, including without limitation + Section 2.2. The Source Code version of Covered Code may be + distributed only under the terms of this License or a future version + of this License released under Section 6.1, and You must include a + copy of this License with every copy of the Source Code You + distribute. You may not offer or impose any terms on any Source Code + version that alters or restricts the applicable version of this + License or the recipients' rights hereunder. However, You may include + an additional document offering the additional rights described in + Section 3.5. + + 3.2. Availability of Source Code. + Any Modification which You create or to which You contribute must be + made available in Source Code form under the terms of this License + either on the same media as an Executable version or via an accepted + Electronic Distribution Mechanism to anyone to whom you made an + Executable version available; and if made available via Electronic + Distribution Mechanism, must remain available for at least twelve (12) + months after the date it initially became available, or at least six + (6) months after a subsequent version of that particular Modification + has been made available to such recipients. You are responsible for + ensuring that the Source Code version remains available even if the + Electronic Distribution Mechanism is maintained by a third party. + + 3.3. Description of Modifications. + You must cause all Covered Code to which You contribute to contain a + file documenting the changes You made to create that Covered Code and + the date of any change. You must include a prominent statement that + the Modification is derived, directly or indirectly, from Original + Code provided by the Initial Developer and including the name of the + Initial Developer in (a) the Source Code, and (b) in any notice in an + Executable version or related documentation in which You describe the + origin or ownership of the Covered Code. + + 3.4. Intellectual Property Matters + (a) Third Party Claims. + If Contributor has knowledge that a license under a third party's + intellectual property rights is required to exercise the rights + granted by such Contributor under Sections 2.1 or 2.2, + Contributor must include a text file with the Source Code + distribution titled "LEGAL" which describes the claim and the + party making the claim in sufficient detail that a recipient will + know whom to contact. If Contributor obtains such knowledge after + the Modification is made available as described in Section 3.2, + Contributor shall promptly modify the LEGAL file in all copies + Contributor makes available thereafter and shall take other steps + (such as notifying appropriate mailing lists or newsgroups) + reasonably calculated to inform those who received the Covered + Code that new knowledge has been obtained. + + (b) Contributor APIs. + If Contributor's Modifications include an application programming + interface and Contributor has knowledge of patent licenses which + are reasonably necessary to implement that API, Contributor must + also include this information in the LEGAL file. + + (c) Representations. + Contributor represents that, except as disclosed pursuant to + Section 3.4(a) above, Contributor believes that Contributor's + Modifications are Contributor's original creation(s) and/or + Contributor has sufficient rights to grant the rights conveyed by + this License. + + 3.5. Required Notices. + You must duplicate the notice in Exhibit A in each file of the Source + Code. If it is not possible to put such notice in a particular Source + Code file due to its structure, then You must include such notice in a + location (such as a relevant directory) where a user would be likely + to look for such a notice. If You created one or more Modification(s) + You may add your name as a Contributor to the notice described in + Exhibit A. You must also duplicate this License in any documentation + for the Source Code where You describe recipients' rights or ownership + rights relating to Covered Code. You may choose to offer, and to + charge a fee for, warranty, support, indemnity or liability + obligations to one or more recipients of Covered Code. However, You + may do so only on Your own behalf, and not on behalf of the Initial + Developer or any Contributor. You must make it absolutely clear than + any such warranty, support, indemnity or liability obligation is + offered by You alone, and You hereby agree to indemnify the Initial + Developer and every Contributor for any liability incurred by the + Initial Developer or such Contributor as a result of warranty, + support, indemnity or liability terms You offer. + + 3.6. Distribution of Executable Versions. + You may distribute Covered Code in Executable form only if the + requirements of Section 3.1-3.5 have been met for that Covered Code, + and if You include a notice stating that the Source Code version of + the Covered Code is available under the terms of this License, + including a description of how and where You have fulfilled the + obligations of Section 3.2. The notice must be conspicuously included + in any notice in an Executable version, related documentation or + collateral in which You describe recipients' rights relating to the + Covered Code. You may distribute the Executable version of Covered + Code or ownership rights under a license of Your choice, which may + contain terms different from this License, provided that You are in + compliance with the terms of this License and that the license for the + Executable version does not attempt to limit or alter the recipient's + rights in the Source Code version from the rights set forth in this + License. If You distribute the Executable version under a different + license You must make it absolutely clear that any terms which differ + from this License are offered by You alone, not by the Initial + Developer or any Contributor. You hereby agree to indemnify the + Initial Developer and every Contributor for any liability incurred by + the Initial Developer or such Contributor as a result of any such + terms You offer. + + 3.7. Larger Works. + You may create a Larger Work by combining Covered Code with other code + not governed by the terms of this License and distribute the Larger + Work as a single product. In such a case, You must make sure the + requirements of this License are fulfilled for the Covered Code. + +4. Inability to Comply Due to Statute or Regulation. + + If it is impossible for You to comply with any of the terms of this + License with respect to some or all of the Covered Code due to + statute, judicial order, or regulation then You must: (a) comply with + the terms of this License to the maximum extent possible; and (b) + describe the limitations and the code they affect. Such description + must be included in the LEGAL file described in Section 3.4 and must + be included with all distributions of the Source Code. Except to the + extent prohibited by statute or regulation, such description must be + sufficiently detailed for a recipient of ordinary skill to be able to + understand it. + +5. Application of this License. + + This License applies to code to which the Initial Developer has + attached the notice in Exhibit A and to related Covered Code. + +6. Versions of the License. + + 6.1. New Versions. + Netscape Communications Corporation ("Netscape") may publish revised + and/or new versions of the License from time to time. Each version + will be given a distinguishing version number. + + 6.2. Effect of New Versions. + Once Covered Code has been published under a particular version of the + License, You may always continue to use it under the terms of that + version. You may also choose to use such Covered Code under the terms + of any subsequent version of the License published by Netscape. No one + other than Netscape has the right to modify the terms applicable to + Covered Code created under this License. + + 6.3. Derivative Works. + If You create or use a modified version of this License (which you may + only do in order to apply it to code which is not already Covered Code + governed by this License), You must (a) rename Your license so that + the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape", + "MPL", "NPL" or any confusingly similar phrase do not appear in your + license (except to note that your license differs from this License) + and (b) otherwise make it clear that Your version of the license + contains terms which differ from the Mozilla Public License and + Netscape Public License. (Filling in the name of the Initial + Developer, Original Code or Contributor in the notice described in + Exhibit A shall not of themselves be deemed to be modifications of + this License.) + +7. DISCLAIMER OF WARRANTY. + + COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, + WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF + DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. + THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE + IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT, + YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE + COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER + OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF + ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER. + +8. TERMINATION. + + 8.1. This License and the rights granted hereunder will terminate + automatically if You fail to comply with terms herein and fail to cure + such breach within 30 days of becoming aware of the breach. All + sublicenses to the Covered Code which are properly granted shall + survive any termination of this License. Provisions which, by their + nature, must remain in effect beyond the termination of this License + shall survive. + + 8.2. If You initiate litigation by asserting a patent infringement + claim (excluding declatory judgment actions) against Initial Developer + or a Contributor (the Initial Developer or Contributor against whom + You file such action is referred to as "Participant") alleging that: + + (a) such Participant's Contributor Version directly or indirectly + infringes any patent, then any and all rights granted by such + Participant to You under Sections 2.1 and/or 2.2 of this License + shall, upon 60 days notice from Participant terminate prospectively, + unless if within 60 days after receipt of notice You either: (i) + agree in writing to pay Participant a mutually agreeable reasonable + royalty for Your past and future use of Modifications made by such + Participant, or (ii) withdraw Your litigation claim with respect to + the Contributor Version against such Participant. If within 60 days + of notice, a reasonable royalty and payment arrangement are not + mutually agreed upon in writing by the parties or the litigation claim + is not withdrawn, the rights granted by Participant to You under + Sections 2.1 and/or 2.2 automatically terminate at the expiration of + the 60 day notice period specified above. + + (b) any software, hardware, or device, other than such Participant's + Contributor Version, directly or indirectly infringes any patent, then + any rights granted to You by such Participant under Sections 2.1(b) + and 2.2(b) are revoked effective as of the date You first made, used, + sold, distributed, or had made, Modifications made by that + Participant. + + 8.3. If You assert a patent infringement claim against Participant + alleging that such Participant's Contributor Version directly or + indirectly infringes any patent where such claim is resolved (such as + by license or settlement) prior to the initiation of patent + infringement litigation, then the reasonable value of the licenses + granted by such Participant under Sections 2.1 or 2.2 shall be taken + into account in determining the amount or value of any payment or + license. + + 8.4. In the event of termination under Sections 8.1 or 8.2 above, + all end user license agreements (excluding distributors and resellers) + which have been validly granted by You or any distributor hereunder + prior to termination shall survive termination. + +9. LIMITATION OF LIABILITY. + + UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT + (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL + DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, + OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR + ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY + CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, + WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER + COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN + INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF + LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY + RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW + PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE + EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO + THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU. + +10. U.S. GOVERNMENT END USERS. + + The Covered Code is a "commercial item," as that term is defined in + 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer + software" and "commercial computer software documentation," as such + terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 + C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), + all U.S. Government End Users acquire Covered Code with only those + rights set forth herein. + +11. MISCELLANEOUS. + + This License represents the complete agreement concerning subject + matter hereof. If any provision of this License is held to be + unenforceable, such provision shall be reformed only to the extent + necessary to make it enforceable. This License shall be governed by + California law provisions (except to the extent applicable law, if + any, provides otherwise), excluding its conflict-of-law provisions. + With respect to disputes in which at least one party is a citizen of, + or an entity chartered or registered to do business in the United + States of America, any litigation relating to this License shall be + subject to the jurisdiction of the Federal Courts of the Northern + District of California, with venue lying in Santa Clara County, + California, with the losing party responsible for costs, including + without limitation, court costs and reasonable attorneys' fees and + expenses. The application of the United Nations Convention on + Contracts for the International Sale of Goods is expressly excluded. + Any law or regulation which provides that the language of a contract + shall be construed against the drafter shall not apply to this + License. + +12. RESPONSIBILITY FOR CLAIMS. + + As between Initial Developer and the Contributors, each party is + responsible for claims and damages arising, directly or indirectly, + out of its utilization of rights under this License and You agree to + work with Initial Developer and Contributors to distribute such + responsibility on an equitable basis. Nothing herein is intended or + shall be deemed to constitute any admission of liability. + +13. MULTIPLE-LICENSED CODE. + + Initial Developer may designate portions of the Covered Code as + "Multiple-Licensed". "Multiple-Licensed" means that the Initial + Developer permits you to utilize portions of the Covered Code under + Your choice of the NPL or the alternative licenses, if any, specified + by the Initial Developer in the file described in Exhibit A. + +EXHIBIT A -Mozilla Public License. + + ``The contents of this file are subject to the Mozilla Public License + Version 1.1 (the "License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.mozilla.org/MPL/ + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + License for the specific language governing rights and limitations + under the License. + + The Original Code is ______________________________________. + + The Initial Developer of the Original Code is ________________________. + Portions created by ______________________ are Copyright (C) ______ + _______________________. All Rights Reserved. + + Contributor(s): ______________________________________. + + Alternatively, the contents of this file may be used under the terms + of the _____ license (the "[___] License"), in which case the + provisions of [______] License are applicable instead of those + above. If you wish to allow use of your version of this file only + under the terms of the [____] License and not to allow others to use + your version of this file under the MPL, indicate your decision by + deleting the provisions above and replace them with the notice and + other provisions required by the [___] License. If you do not delete + the provisions above, a recipient may use your version of this file + under either the MPL or the [___] License." + + [NOTE: The text of this Exhibit A may differ slightly from the text of + the notices in the Source Code files of the Original Code. You should + use the text of this Exhibit A rather than the text found in the + Original Code Source Code for Your Modifications.] + diff --git a/source/l/mozilla-nss/faq.html b/source/l/mozilla-nss/faq.html new file mode 100644 index 000000000..176fe8f88 --- /dev/null +++ b/source/l/mozilla-nss/faq.html @@ -0,0 +1,364 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> +<link rel="top" title="Home" href="http://www.mozilla.org/"> +<link rel="stylesheet" type="text/css" href="../../../../css/print.css" media="print"> +<link rel="stylesheet" type="text/css" href="../../../../css/base/content.css" media="all"> +<link rel="stylesheet" type="text/css" href="../../../../css/cavendish/content.css" title="Cavendish" media="screen"> +<link rel="stylesheet" type="text/css" href="../../../../css/base/template.css" media="screen"> +<link rel="stylesheet" type="text/css" href="../../../../css/cavendish/template.css" title="Cavendish" media="screen"> +<link rel="icon" href="../../../../images/mozilla-16.png" type="image/png"> + +<TITLE>NSS FAQ</TITLE> +<script src="../../../../__utm.js" type="text/javascript"></script> +</head> +<body id="www-mozilla-org" class="secondLevel sectionDevelopers"> +<div id="container"> +<p class="skipLink"><a href="#mainContent" accesskey="2">Skip to main content</a></p> +<div id="header"> +<h1><a href="/" title="Return to home page" accesskey="1">Mozilla</a></h1> +<ul> +<li id="menu_aboutus"><a href="../../../../about/" title="Learn more about Mozilla">About</a></li> +<li id="menu_foundation"><a href="../../../../foundation/" title="Information about the non-profit Mozilla Foundation">Foundation</a></li> +<li id="menu_contribute"><a href="../../../../contribute/" title="Find out how to get involved with Mozilla">Contribute</a></li> +<li id="menu_community"><a href="../../../../community/" title="List of community sites and other resources">Community</a></li> +<li id="menu_developers"><a href="../../../../developer/" title="Resources and links for developers">Developers</a></li> +<li id="menu_projects"><a href="../../../../projects/" title="Projects being created by the Mozilla community">Projects</a></li> +</ul> +<form id="searchbox_002443141534113389537:ysdmevkkknw" action="http://www.google.com/cse" title="mozilla.org Search"> +<div> +<label for="q" title="Search mozilla.org's sites">search mozilla:</label> +<input type="hidden" name="cx" value="002443141534113389537:ysdmevkkknw"> +<input type="hidden" name="cof" value="FORID:0"> +<input type="text" id="q" name="q" accesskey="s" size="30"> +<input type="submit" id="submit" value="Go"> +</div> +</form> +</div> +<hr class="hide"> +<div id="mBody"> +<div id="side"> + +<ul id="nav"> +<li><a title="Roadmap" href="../../../../roadmap.html"><strong> Roadmap</strong></a></li> +<li><a title="Projects" href="../../../../projects/"><strong> Projects</strong></a></li> +<li><a title="For developers" href="../../../../developer/"><strong> Coding</strong></a> +<ul> +<li><a title="Module Owners" href="../../../../owners.html"> Module Owners</a></li> +<li><a title="Hacking" href="../../../../hacking/"> Hacking</a></li> +<li><a title="Get the Source" href="http://developer.mozilla.org/en/docs/Download_Mozilla_Source_Code"> Get the Source</a></li> +<li><a title="Building Mozilla" href="http://developer.mozilla.org/en/docs/Build_Documentation"> Build It</a></li> +</ul> +</li> +<li><a title="Testing" href="http://quality.mozilla.org/"><strong> Testing</strong></a> +<ul> +<li><a title="Downloads of mozilla.org software releases" href="../../../../download.html"> Releases</a></li> +<li><a title="Latest mozilla builds for testers" href="../../../../developer/#builds"> Nightly Builds</a></li> +<li><a title="For testers to report bugs" href="https://bugzilla.mozilla.org/"> Report A Problem</a></li> +</ul> +</li> +<li><a title="Tools for mozilla developers" href="../../../../tools.html"><strong> Tools</strong></a> +<ul> +<li><a title="Bug tracking system for mozilla testers." href="https://bugzilla.mozilla.org/"> Bugzilla</a></li> +<li><a title="Latest status of mozilla builds" href="http://tinderbox.mozilla.org/showbuilds.cgi?tree=Firefox"> Tinderbox</a></li> +<li><a title="Latest checkins" href="http://bonsai.mozilla.org/cvsqueryform.cgi"> Bonsai</a></li> +<li><a title="Source cross reference" href="http://mxr.mozilla.org/"> MXR</a></li> +</ul> +</li> +<li><a title="Frequently Asked Questions." href="../../../../faq.html"><strong> FAQs</strong></a></li> +</ul> + +</div> +<hr class="hide"> +<div id="mainContent"> + + + + +<center> +<h2>NSS FAQ</h2> +<i><FONT SIZE="-1"> + +Newsgroup: +<A HREF="news://news.mozilla.org/mozilla.dev.tech.crypto">mozilla.dev.tech.crypto</A> + +</FONT></i> +</center> + +<p> +<hr> +<p> + +<a href="#Q1">General Questions</a> + +<ul> +<li> +<a href="#Q1.1">What is Network Security Services (NSS)?</a></li> +<li> +<a href="#Q1.2">What can I do with NSS? Is NSS appropriate for my application?</a></li> +<li> +<a href="#q1.2a">How does NSS compare to OpenSSL?</a></li> +<li> +<a href="#q1.3">How does NSS compare to SSLRef?</a></li> +<li> +<a href="#q1.4">What platforms and development environments are supported?</a></li> +<li> +<a href="#q1.5">What cryptography standards are supported?</a></li> +<li> +<a href="#q1.7">What is the relationship between NSS and PSM?</a></li> +<li> +<a href="#q1.7">Where can I get the source?</a></li> +<li> +<a href="#q1.8">How much does it cost?</a></li> +</ul> + +<a href="#Q2">Developer Questions</a> +<ul> +<li> +<a href="#q2.1">What hardware accelerators are supported?</a></li> +<li> +<a href="#q2.2">How do I integrate smart cards into my application using +NSS?</a></li> +<li> +<a href="#q2.3">How is NSS compatible with other Netscape products?</a></li> +<li> +<a href="#q2.4">Does NSS require Netscape Portable Runtime (NSPR)?</a></li> +<li> +<a href="#q2.5">Can I use NSS even if my application protocol isn't HTTP?</a></li> +<li> +<a href="#q2.6">How long does it take to integrate NSS into my application?</a></li> +<li> +<a href="#q2.6">How can I learn more about SSL?</a></li> +</ul> + +<a href="#Q3">Licensing Questions</a> +<ul> +<li> +<a href="#q3.1">How is NSS licensed?</a> +<li> +<a href="#q3.2">Is NSS available outside the United States?</a></li> +</ul> +<h2> + <a NAME="Q1"><hr WIDTH="100%"></a>General Questions</h2> +<a NAME="Q1.1"></a><H4>What is Network Security Services (NSS)?</h4> +<P>NSS is set of libraries, APIs, utilities, and documentation designed +to support cross-platform development of security-enabled client and +server applications. It provides a complete open-source implementation +of the crypto libraries used by Netscape and other companies in the +Netscape 6 browser, server products from iPlanet E-Commerce Solutions, the +Gateway Connected Touch Pad with Instant AOL, and other products. + +<p>For an +overview of NSS, see <a href="overview.html">Overview of NSS</a>. For detailed information +on the open-source NSS project, see <a href="index.html">NSS Project Page</a>. + +<br> +<a NAME="Q1.2"></a><H4>What can I do with NSS? Is NSS appropriate for +my application?</h4> +<P>If you want add support for SSL, S/MIME, or other Internet security standards +to your application, you can use Network Security Services (NSS) to do so. Because +NSS provides complete support for all versions of SSL and TLS, it is particularly well-suited +for applications that need to communicate with the many clients and servers +that already support the SSL protocol. +<p>The PKCS #11 interface included in NSS means that your application can +use <a href="#q2.1">hardware accelerators</a> on the server and <a href="#q2.2">smart +cards</a> for two-factor authentication. +<br> + + <a NAME="q1.2a"></a><H4>How does NSS compare to OpenSSL?</h4> + +<a href="http://www.openssl.org/">OpenSSL</a> is an open source project that implements server-side SSL, +TLS, and a general-purpose cryptography library. It does not support PKCS #11. It is based on +the SSLeay library developed by Eric A. Young and Tim J. Hudson. OpenSSL is widely used in +Apache servers and is licensed under an Apache-style licence. + +<p>NSS supports both server and client applications as well as PKCS #11 and S/MIME. To permit its use +in as many contexts as possible, +NSS is triple-licensed under the <a href="../../../../MPL/">Mozilla Public License</a>, the +<a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>, +and the <a href="http://www.gnu.org/copyleft/lesser.html">GNU Lesser General Public License</a>. +You may choose to use the code either under the terms of the MPL or the GPL or the LGPL. + +<a NAME="q1.3"></a><H4>How does NSS compare to SSLRef?</h4> +SSLRef was an early reference implementation of the SSL protocol. It contains +bugs that were never fixed, doesn't support TLS or or the +new 56-bit export cipher suites, and does not contain the fix to the +Bleichenbacher attack on PKCS#1. + +<p>Netscape no longer maintains SSLRef or makes it available. It was built as +an example of an SSL implementation, not for creating production applications. + +<p>NSS was designed from the ground up for use by commercial developers. +It provides a complete software development kit +that uses the same architecture used to support security features in many client +and server products from Netscape and other companies. + +<a NAME="q1.4"></a><H4>What platforms and development environments are supported?</h4> +<P>iPlanet E-Commerce Solutions has certified NSS 3.1 on 18 platforms, including AIX 4.3, HP-UX 11.0, +Red Hat Linux 6.0, Solaris (2.6 or later), Windows NT (4.0 or later), and +Windows 2000. Other contributors are in the process of certifying additional platforms. +The NSS 3.1 API requires C or C++ development environments. + +<p>For the latest NSS release notes and detailed platform information, see +<a href="release_notes_31.html">NSS 3.1 Release Notes</a>. + +<a NAME="q1.5"></a><H4>What cryptography standards does NSS support?</h4> +<P>NSS supports <a HREF="../../../docs/jargon.html#SSL">SSL v2 and v3</a>, + <a HREF="../../../../docs/jargon.html#TLS">TLS</a>, + <a HREF="../../../../docs/jargon.html#PKCS5">PKCS #5</a>, + <a HREF="../../../../docs/jargon.html#PKCS7">PKCS #7</a>, + <a HREF="../../../../docs/jargon.html#PKCS11">PKCS #11</a>, + <a HREF="../../../../docs/jargon.html#PKCS12">PKCS #12</a>, + <a HREF="../../../../docs/jargon.html#SMIME">S/MIME</a>, and + <a HREF="../../../../docs/jargon.html#X.509">X.509 v3</a> certificates. +For complete details, +see <a href="nss-3.11/nss-3.11-algorithms.html"> +Encryption Technologies</a>. + +<a NAME="q1.6"></a><H4>What is the relationship between NSS and PSM?</H4> + +Personal Security Manager (PSM) is built on top of NSS. It consists of libraries +and a daemon designed to support cross-platform development of security-enabled +client applications. The PSM binary provides a client module +that performs cryptographic operations on behalf of applications. +Netscape Personal Security Manager ships with Netscape 6 and the Gateway Connected Touch Pad with Instant AOL, +and is also available for use with Communicagotr 4.7x. + +<p>For more information about the PSM open-source project, see <a href="../psm">Personal Security Manager</a>. + +<a NAME="q1.7"></a><H4>Where can I get the source code?</H4> + +For instructions on how to check out and build the NSS 3.1 source code, see +<a href="buildnss_31.html">Build Instructions for NSS 3.1.</a> The source code may also +be downloaded as a tar file from +<a href="ftp://ftp.mozilla.org/pub/mozilla.org/security/">ftp://ftp.mozilla.org/pub/mozilla.org/security/</a>. + +<a NAME="q1.8"></a><H4>How much does it cost?</H4> + +NSS source code and binaries (when they become available) are completely free. No license fees, +no royalty fees, no subscription fees. + + +<a NAME="Q2"><h2> +<hr WIDTH="100%"></a>Developer Questions</h2> + +<a NAME="q2.1"></a><H4>What hardware accelerators are supported?</h4> +<P>NSS supports the PKCS #11 interface for hardware acceleration. Since leading accelerator vendors such as +Chrysalis-IT, nCipher, and Rainbow Technologies also support this interface, NSS-enabled applications +can support a wide variety of hardware accelerators. +<a NAME="q2.2"></a><H4>How do I integrate smart cards into my application using +NSS?</h4> +<P>NSS supports the PKCS #11 interface for smart card integration. Applications that use the PKCS #11 +interface provided by NSS will therefore support smart cards from leading vendors such as +ActiveCard, Litronic, and SecureID Technologies that also support the PKCS #11 interface. + +<a NAME="q2.3"></a><H4>How is NSS compatible with other Netscape products?</h4> +<P>NSS provides tight integration with other Netscape products in two ways. +First, by using NSS to implement SSL and TLS, you can support SSL communications +with all products from Netscape and all other vendors +that support SSL<FONT color="#CC0000"> and TLS.</FONT> Second, NSS makes it easy +to share certificates between Netscape client and server products +and your application. + +<a NAME="q2.4"></a><H4>Does NSS require Netscape Portable Runtime (NSPR)?</h4> +<P>To provide cross-platform support, NSS utilizes Netscape Portable Runtime +(NSPR) libraries as a portability interface and implementation that +provides consistent cross-platform semantics for network I/O and threading +models. You can use NSPR throughout your application or +only in the portion that calls into NSS. Netscape strongly recommends that +multithreaded applications use the NSPR or native OS threading model. (In +recent NSPR releases, the NSPR threading model is compatible with the native +threading model if the OS has native threads.) Alternatively, you can adapt +the open-source NSPR implementation to be compatible with your existing +application's threading models. More information about NSPR may be found at +<a href="http://www.mozilla.org/projects/nspr/">Netscape Portable Runtime</a>. +<br> + +<a NAME="q2.5"></a><H4>Can I use NSS even if my application protocol isn't +HTTP?</h4> +<P>Yes, SSL independent of application protocols. It works with common +Internet standard application protocols (HTTP, POP3, FTP, SMTP, etc.) as +well as custom application protocols using TCP/IP. + +<br> +<a NAME="q2.6"></a><H4>How long does it take to integrate NSS into my application?</h4> +<P>The integration effort depends on an number of factors, such as developer +skill set, application complexity, and the level of security required for +your application. NSS includes detailed documentation of the SSL API and +sample code that demonstrates basic SSL functionality (setting up an encrypted +session, server authentication, and client authentication) to help jump start the +integration process. However, there is little or no documentation currently +available for the rest of the NSS API. If your application requires sophisticated +certificate management, smart card support, or hardware acceleration, your +integration effort will be more extensive. + +<a NAME="q2.7"></a><H4> Where can I download the NSS tools?</h4> + +Currently, you must download the NSS source and build it to create binary files for the NSS tools. +For more information, see <A HREF="tools/">NSS Tools</A>. + + +<a NAME="q2.8"></a><H4>How can I learn more about SSL?</h4> + +NSS provides extensive documentation related to SSL, including high-level introductions, +detailed API documentation, sample code for simple client and server +applications, the original SSL 3.0 specification, and +information on debugging SSL applications. For details, see the +<a href="ssl/">SSL/TLS Project Page</a>. For information about the NSS tools, including those used +for debugging SSL applications, see <a href="http://www.mozilla.org/projects/security/pki/nss/tools/"> +NSS Security Tools</a>. + +<a NAME="Q3"><h2> +<hr WIDTH="100%"></a>Licensing Questions</h2> +<H4><a NAME="q3.1"></a>How is NSS licensed?</h4> +<P>NSS is triple-licensed under the <a href="../../../../MPL/">Mozilla Public License</a>, the +<a href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>, +and the <a href="http://www.gnu.org/copyleft/lesser.html">GNU Lesser General Public License</a>. +For more details, see the <a href="http://www.mozilla.org/crypto-faq.html#1-3">Mozilla Crypto FAQ</a>. + +<a NAME="q3.2"></a><H4>Is NSS available outside the United States?</h4> +<P>Yes; see +<a href="buildnss_31.html">Build Instructions for NSS 3.1.</a> and +<a href="ftp://ftp.mozilla.org/pub/mozilla.org/security/">ftp://ftp.mozilla.org/pub/mozilla.org/security/</a>. +However, NSS source code is subject to the U.S. Export +Administration Regulations and other U.S. law, and may not be exported or +re-exported to certain +countries (currently Cuba, Iran, Libya, North Korea, Sudan and Syria) or +to persons or entities prohibited from receiving U.S. exports (including +those (a) on the Bureau of Industry and Security Denied Parties List or +Entity List, (b) on the Office of Foreign Assets Control list of Specially +Designated Nationals and Blocked Persons, and (c) involved with missile +technology or nuclear, chemical or biological weapons). + +<p>For more information about U.S. export controls on encryption software, +see the <a href="http://www.mozilla.org/crypto-faq.html">Mozilla Crypto FAQ</a>. + + + + + +<hr class="hide"> +</div> +</div> +<div id="footer"> +<ul> +<li><a href="../../../../support/">Support Options</a></li> +<li><a href="../../../../security/">Security Center</a></li> +<li><a href="../../../../privacy-policy.html">Privacy Policy</a></li> +<li><a href="../../../../contact/">Contact Us</a></li> +</ul> +<p class="affiliates">International Affiliates: <a href="http://www.mozilla-europe.org/">Mozilla Europe</a> - <a +href="http://mozilla.jp/">Mozilla Japan</a> - <a href="http://www.mozillaonline.com/">Mozilla China</a></p> +<p class="copyright"> +Portions of this content are © 1998–2009 by individual mozilla.org contributors<br> +Content available under a Creative Commons <a href="http://www.mozilla.org/foundation/licensing/website-content.html">license</a></p> +<p> +<span>Last modified July 12, 2007</span> +<span><a href="http://bonsai-www.mozilla.org/cvslog.cgi?file=mozilla-org/html/projects/security/pki/nss/faq.html&rev=&root=/www/">Document History</a></span> +<span><a href="https://doctor.mozilla.org/?action=edit&file=mozilla-org/html/projects/security/pki/nss/faq.html">Edit this Page</a></span> <span>(or <a href="/contribute/writing/cvs">via CVS</a>)</span> +</p> +</div> +</div> +</body> +</html> diff --git a/source/l/mozilla-nss/gpl-2.0.txt b/source/l/mozilla-nss/gpl-2.0.txt new file mode 100644 index 000000000..d511905c1 --- /dev/null +++ b/source/l/mozilla-nss/gpl-2.0.txt @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program 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 + (at your option) any later version. + + This program 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., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/source/l/mozilla-nss/lgpl-2.1.txt b/source/l/mozilla-nss/lgpl-2.1.txt new file mode 100644 index 000000000..602bfc946 --- /dev/null +++ b/source/l/mozilla-nss/lgpl-2.1.txt @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control compilation +and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. + + <one line to give the library's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + <signature of Ty Coon>, 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild new file mode 100755 index 000000000..2bc38d082 --- /dev/null +++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild @@ -0,0 +1,178 @@ +#!/bin/sh +# Copyright 2005, 2006, 2008, 2009, 2010, 2012 Eric Hameleers, Eindhoven, NL +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# ----------------------------------------------------------------------------- + +PKGNAM=mozilla-nss +SRCNAM=nss +VERSION=${VERSION:-3.13.5} +NSPR=${NSPR:-4.9.1} +BUILD=${BUILD:-3} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + export USE_64=1 +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG + +cd $TMP +rm -rf nss-${VERSION} +rm -rf nspr-${NSPR} +tar xvf $CWD/nss-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/nspr-$NSPR.tar.?z* || exit 1 +cd nss-$VERSION + +# NSS needs NSPR: +ln -s ../../nspr-$NSPR/mozilla/nsprpub mozilla/nsprpub + +# Make sure ownerships and permissions are sane: +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +echo Building ... +export LDFLAGS="-lz" +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +export BUILD_OPT=1 +export NSDISTMODE="copy" +export NSS_USE_SYSTEM_SQLITE=1 +cd mozilla/security/nss + make nss_build_all export +cd - + +# Install all the needed stuff to the package dir: +mkdir -p $PKG/usr/{bin,lib${LIBDIRSUFFIX},include/{nss,nspr}} +cd mozilla/dist/$(uname -s)* + cp -pL bin/{certutil,cmsutil,crlutil,modutil,pk12util,shlibsign,signtool,signver,ssltap} $PKG/usr/bin/ + cp -pL lib/* $PKG/usr/lib${LIBDIRSUFFIX}/ + chmod 755 $PKG/usr/lib${LIBDIRSUFFIX}/*.so* + cp -rL include/* $PKG/usr/include/nspr/ + cp -rpL ../public/nss/*.h $PKG/usr/include/nss/ + # Remove some things we do not need: + rm -f $PKG/usr/bin/*.so + rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.a + rm -rf $PKG/usr/include/nspr/md + cp -L lib/libcrmf.a $PKG/usr/lib${LIBDIRSUFFIX}/ # yes, put this one back +cd - + +cd mozilla/security/nss/cmd/smimetools + cp -a smime $PKG/usr/bin/ + chmod 0755 $PKG/usr/bin/smime + sed -i -e 's#/usr/local/bin#/usr/bin#g' $PKG/usr/bin/smime +cd - + +# Install nspr-config: +cat mozilla/nsprpub/$(uname -s)*/config/nspr-config | sed -e "s,prefix=/usr/local,prefix=/usr,g" | sed -e "s,libdir=\${exec_prefix}/lib,libdir=\${exec_prefix}/lib${LIBDIRSUFFIX},g" > $PKG/usr/bin/nspr-config +chmod 755 $PKG/usr/bin/nspr-config + +# Install nss-config: +sed -e "s,@prefix@,/usr,g" \ + -e "s,@MOD_MAJOR_VERSION@,$(printf $VERSION | cut -d. -f1),g" \ + -e "s,@MOD_MINOR_VERSION@,$(printf $VERSION | cut -d. -f2),g" \ + -e "s,@MOD_PATCH_VERSION@,$(printf $VERSION | cut -d. -f3),g" \ + $CWD/nss-config.in > $PKG/usr/bin/nss-config +chmod 755 $PKG/usr/bin/nss-config + +# Provide pkg-config files: +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig +cat <<EOT > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/mozilla-nss.pc +prefix=/usr +exec_prefix=\${prefix} +libdir=/usr/lib${LIBDIRSUFFIX} +includedir=\${prefix}/include/nss + +Name: NSS +Description: Network Security Services +Version: $VERSION +Requires: nspr >= $NSPR sqlite3 +Libs: -L\${libdir} -lnss3 -lsmime3 -lssl3 -lsoftokn3 -lnssutil3 +Cflags: -I\${includedir} +EOT +cat <<EOT > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/mozilla-nspr.pc +prefix=/usr +exec_prefix=\${prefix} +libdir=/usr/lib${LIBDIRSUFFIX} +includedir=\${prefix}/include/nspr + +Name: NSPR +Description: The Netscape Portable Runtime +Version: $NSPR +Libs: -L\${libdir} -lplds4 -lplc4 -lnspr4 +Cflags: -I\${includedir} +EOT + +( cd $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig + ln -s mozilla-nspr.pc nspr.pc + ln -s mozilla-nss.pc nss.pc +) + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + $CWD/MPL-1.1.txt $CWD/gpl-2.0.txt $CWD/lgpl-2.1.txt \ + $CWD/faq.html \ + $PKG/usr/doc/$PKGNAM-$VERSION +chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +# Add a package description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz + diff --git a/source/l/mozilla-nss/nss-config.in b/source/l/mozilla-nss/nss-config.in new file mode 100644 index 000000000..f8f893e71 --- /dev/null +++ b/source/l/mozilla-nss/nss-config.in @@ -0,0 +1,145 @@ +#!/bin/sh + +prefix=@prefix@ + +major_version=@MOD_MAJOR_VERSION@ +minor_version=@MOD_MINOR_VERSION@ +patch_version=@MOD_PATCH_VERSION@ + +usage() +{ + cat <<EOF +Usage: nss-config [OPTIONS] [LIBRARIES] +Options: + [--prefix[=DIR]] + [--exec-prefix[=DIR]] + [--includedir[=DIR]] + [--libdir[=DIR]] + [--version] + [--libs] + [--cflags] +Dynamic Libraries: + nss + nssutil + ssl + smime +EOF + exit $1 +} + +if test $# -eq 0; then + usage 1 1>&2 +fi + +lib_ssl=yes +lib_smime=yes +lib_nss=yes +lib_nssutil=yes + +while test $# -gt 0; do + case "$1" in + -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; + *) optarg= ;; + esac + + case $1 in + --prefix=*) + prefix=$optarg + ;; + --prefix) + echo_prefix=yes + ;; + --exec-prefix=*) + exec_prefix=$optarg + ;; + --exec-prefix) + echo_exec_prefix=yes + ;; + --includedir=*) + includedir=$optarg + ;; + --includedir) + echo_includedir=yes + ;; + --libdir=*) + libdir=$optarg + ;; + --libdir) + echo_libdir=yes + ;; + --version) + echo ${major_version}.${minor_version}.${patch_version} + ;; + --cflags) + echo_cflags=yes + ;; + --libs) + echo_libs=yes + ;; + ssl) + lib_ssl=yes + ;; + smime) + lib_smime=yes + ;; + nss) + lib_nss=yes + ;; + nssutil) + lib_nssutil=yes + ;; + *) + usage 1 1>&2 + ;; + esac + shift +done + +# Set variables that may be dependent upon other variables +if test -z "$exec_prefix"; then + exec_prefix=`pkg-config --variable=exec_prefix nss` +fi +if test -z "$includedir"; then + includedir=`pkg-config --variable=includedir nss` +fi +if test -z "$libdir"; then + libdir=`pkg-config --variable=libdir nss` +fi + +if test "$echo_prefix" = "yes"; then + echo $prefix +fi + +if test "$echo_exec_prefix" = "yes"; then + echo $exec_prefix +fi + +if test "$echo_includedir" = "yes"; then + echo $includedir +fi + +if test "$echo_libdir" = "yes"; then + echo $libdir +fi + +if test "$echo_cflags" = "yes"; then + echo -I$includedir +fi + +if test "$echo_libs" = "yes"; then + libdirs="-Wl,-rpath-link,$libdir -L$libdir" + if test -n "$lib_ssl"; then + libdirs="$libdirs -lssl${major_version}" + fi + if test -n "$lib_smime"; then + libdirs="$libdirs -lsmime${major_version}" + fi + if test -n "$lib_nss"; then + libdirs="$libdirs -lnss${major_version}" + fi + if test -n "$lib_nssutil"; then + libdirs="$libdirs -lnssutil${major_version}" + fi + echo $libdirs +fi + diff --git a/source/l/mozilla-nss/slack-desc b/source/l/mozilla-nss/slack-desc new file mode 100644 index 000000000..7a23daaff --- /dev/null +++ b/source/l/mozilla-nss/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +mozilla-nss: mozilla-nss (Network Security Services) +mozilla-nss: +mozilla-nss: Network Security Services (NSS) is a set of libraries designed to +mozilla-nss: support cross-platform development of security-enabled client and +mozilla-nss: server applications. Applications built with NSS can support +mozilla-nss: SSL v2 and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, +mozilla-nss: X.509 v3 certificates, and other security standards. +mozilla-nss: +mozilla-nss: +mozilla-nss: Read http://www.mozilla.org/projects/security/pki/nss/overview.html +mozilla-nss: diff --git a/source/l/mpfr/mpfr.SlackBuild b/source/l/mpfr/mpfr.SlackBuild index a96001cd1..1e56ba3d3 100755 --- a/source/l/mpfr/mpfr.SlackBuild +++ b/source/l/mpfr/mpfr.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,23 +20,26 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2011 by Eric Hameleers <alien at slackware.com> for ARM port. PKGNAM=mpfr -VERSION=${VERSION:-$(echo mpfr-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo mpfr-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:-" -j7 "} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:-" -j7 "} - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -46,11 +49,19 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-mpfr @@ -65,7 +76,7 @@ fi cd $TMP rm -rf mpfr-$VERSION -tar xvf $CWD/mpfr-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/mpfr-$VERSION.tar.xz || exit 1 cd mpfr-$VERSION chown -R root:root . @@ -78,6 +89,11 @@ if [ ! -z "$(ls $CWD/patches/* 2> /dev/null)" ]; then done fi +# End of preparations +if echo "$*" | grep -qw -- --prep ; then + exit 0 +fi + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -86,7 +102,7 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/mpfr-$VERSION \ --enable-static=yes \ --enable-shared=yes \ - --build=$ARCH-slackware-linux + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/neon/neon.SlackBuild b/source/l/neon/neon.SlackBuild index 7725cce87..abba3b6e6 100755 --- a/source/l/neon/neon.SlackBuild +++ b/source/l/neon/neon.SlackBuild @@ -23,7 +23,7 @@ PKGNAM=neon VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/notify-python/libnotify07.patch b/source/l/notify-python/libnotify07.patch new file mode 100644 index 000000000..b7bf44b5e --- /dev/null +++ b/source/l/notify-python/libnotify07.patch @@ -0,0 +1,38 @@ +http://pkgs.fedoraproject.org/gitweb/?p=notify-python.git;a=blob_plain;f=libnotify07.patch;hb=HEAD + +diff -up notify-python-0.1.1/src/pynotify.defs.notify070 notify-python-0.1.1/src/pynotify.defs +--- notify-python-0.1.1/src/pynotify.defs.notify070 2010-11-02 17:11:14.928179237 -0400 ++++ notify-python-0.1.1/src/pynotify.defs 2010-11-02 17:11:51.153180231 -0400 +@@ -38,7 +38,6 @@ + '("const-gchar*" "summary") + '("const-gchar*" "message" (null-ok) (default "NULL")) + '("const-gchar*" "icon" (null-ok) (default "NULL")) +- '("GtkWidget*" "attach" (null-ok) (default "NULL")) + ) + ) + +@@ -53,24 +52,6 @@ + ) + ) + +-(define-method attach_to_widget +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_widget") +- (return-type "none") +- (parameters +- '("GtkWidget*" "attach") +- ) +-) +- +-(define-method attach_to_status_icon +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_status_icon") +- (return-type "none") +- (parameters +- '("GtkStatusIcon*" "attach") +- ) +-) +- + (define-method show + (of-object "NotifyNotification") + (c-name "notify_notification_show") diff --git a/source/l/notify-python/notify-python.SlackBuild b/source/l/notify-python/notify-python.SlackBuild index 97ce72183..9227d8d08 100755 --- a/source/l/notify-python/notify-python.SlackBuild +++ b/source/l/notify-python/notify-python.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=notify-python VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -67,6 +67,9 @@ chmod -R u+w,go+r-w,a-s . # Fix http://trac.galago-project.org/ticket/121 rm -f src/pynotify.c +# Fix build with libnotify-0.7 (thanks, Fedora) +zcat $CWD/libnotify07.patch.gz | patch -p1 || exit 1 + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/l/notify-python/slack-desc b/source/l/notify-python/slack-desc index 3d52503b4..e7718b42f 100644 --- a/source/l/notify-python/slack-desc +++ b/source/l/notify-python/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-------------------------------------------------------| + |-----handy-ruler------------------------------------------------------| notify-python: notify-python (Python bindings for libnotify) notify-python: notify-python: The notify-python package contains bindings to use libnotify with diff --git a/source/l/pango/pango.SlackBuild b/source/l/pango/pango.SlackBuild index fd5d8966e..39c2ccd1a 100755 --- a/source/l/pango/pango.SlackBuild +++ b/source/l/pango/pango.SlackBuild @@ -134,8 +134,20 @@ EOF find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/pango-$VERSION cp -a \ diff --git a/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild b/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild new file mode 100755 index 000000000..eced8a740 --- /dev/null +++ b/source/l/phonon-gstreamer/phonon-gstreamer.SlackBuild @@ -0,0 +1,122 @@ +#!/bin/sh +# Copyright 2011, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# ----------------------------------------------------------------------------- + + +PKGNAM=phonon-gstreamer +SRCNAM=phonon-backend-gstreamer +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:" -j7 "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +echo Building ... +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make $NUMJOBS + make DESTDIR=$PKG install +cd - + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING.LIB gstreamer/lgpl-* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Compress the man page(s): +if [ -d $PKG/usr/man ]; then + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ). +gz $i.gz ; rm $i ; done +fi + +# Strip binaries (if any): +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Add a package description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/phonon-gstreamer/slack-desc b/source/l/phonon-gstreamer/slack-desc new file mode 100644 index 000000000..ee2a434c8 --- /dev/null +++ b/source/l/phonon-gstreamer/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +phonon-gstreamer: phonon-gstreamer (gstreamer backend for phonon) +phonon-gstreamer: +phonon-gstreamer: This package provides an additional gstreamer backend for the phonon +phonon-gstreamer: multimedia framework used in KDE. +phonon-gstreamer: +phonon-gstreamer: For more information, visit: +phonon-gstreamer: https://projects.kde.org/projects/kdesupport/phonon/phonon-gstreamer +phonon-gstreamer: +phonon-gstreamer: +phonon-gstreamer: +phonon-gstreamer: diff --git a/source/l/phonon-mplayer/phonon-mplayer.SlackBuild b/source/l/phonon-mplayer/phonon-mplayer.SlackBuild index cb84b3cb5..38dff2545 100755 --- a/source/l/phonon-mplayer/phonon-mplayer.SlackBuild +++ b/source/l/phonon-mplayer/phonon-mplayer.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -26,22 +26,21 @@ PKGNAM=phonon-mplayer VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:" -j4 "} + +NUMJOBS=${NUMJOBS:" -j7 "} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -51,11 +50,18 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP diff --git a/source/l/phonon-xine/phonon-backend-xine-4.4.4.find.phonon.patch b/source/l/phonon-xine/phonon-backend-xine-4.4.4.find.phonon.patch new file mode 100644 index 000000000..0ce1023c9 --- /dev/null +++ b/source/l/phonon-xine/phonon-backend-xine-4.4.4.find.phonon.patch @@ -0,0 +1,186 @@ +From: Andras Mantia <amantia@kde.org> +Date: Thu, 10 Nov 2011 08:43:52 +0000 +Subject: Use the global FindPhonon.cmake that really finds Phonon. +X-Git-Url: http://quickgit.kde.org/?p=phonon-xine.git&a=commitdiff&h=8c7fab4e433b53ac2f00093f1f464e0178c2d3e1 +--- +Use the global FindPhonon.cmake that really finds Phonon. +--- + + +--- a/cmake/FindPhonon.cmake ++++ /dev/null +@@ -1,53 +0,0 @@ +-# Find Phonon +- +-# Copyright (c) 2010, Harald Sitter <sitter@kde.org> +-# +-# Redistribution and use is allowed according to the terms of the BSD license. +-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +- +-if (NOT PHONON_BUILDSYSTEM_DIR) +- find_program(PC_EXECUTABLE NAMES pkg-config +- PATH_SUFFIXES bin +- HINTS +- ${CMAKE_INSTALL_PREFIX} +- ONLY_CMAKE_FIND_ROOT_PATH +- ) +- +- if (NOT PC_EXECUTABLE) +- if (Phonon_FIND_REQUIRED) +- message(FATAL_ERROR "ERROR: Could not find pkg-config [required to find Phonon].") +- endif (Phonon_FIND_REQUIRED) +- endif (NOT PC_EXECUTABLE) +- +- if (PC_EXECUTABLE) +- execute_process(COMMAND "${PC_EXECUTABLE}" --variable=buildsystemdir phonon +- OUTPUT_VARIABLE _data_DIR +- ERROR_QUIET +- OUTPUT_STRIP_TRAILING_WHITESPACE) +- file(TO_CMAKE_PATH "${_data_DIR}" _data_DIR) +- find_path(PHONON_BUILDSYSTEM_DIR FindPhononInternal.cmake HINTS ${_data_DIR}) +- endif (PC_EXECUTABLE) +-endif (NOT PHONON_BUILDSYSTEM_DIR) +- +-if (PHONON_BUILDSYSTEM_DIR) +- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PHONON_BUILDSYSTEM_DIR}) +- +- if (Phonon_FIND_REQUIRED) +- set(_req REQUIRED) +- endif (Phonon_FIND_REQUIRED) +- if (PHONON_FIND_QUIETLY) +- set(_quiet QUIET) +- endif (PHONON_FIND_QUIETLY) +- +- find_package(PhononInternal ${_req} ${_quiet}) +-else (PHONON_BUILDSYSTEM_DIR) +- if (_data_DIR) +- if (Phonon_FIND_REQUIRED) +- message(FATAL_ERROR "ERROR: FindPhonon.cmake not found in ${_data_DIR}") +- endif (Phonon_FIND_REQUIRED) +- else (_data_DIR) +- if (Phonon_FIND_REQUIRED) +- message(FATAL_ERROR "ERROR: Either pkg-config can not find its phonon config, or you are not using a recent enough Phonon version.") +- endif (Phonon_FIND_REQUIRED) +- endif (_data_DIR) +-endif (PHONON_BUILDSYSTEM_DIR) + +--- /dev/null ++++ b/cmake/MacroEnsureVersion.cmake +@@ -0,0 +1,117 @@ ++# This file defines the following macros for developers to use in ensuring ++# that installed software is of the right version: ++# ++# MACRO_ENSURE_VERSION - test that a version number is greater than ++# or equal to some minimum ++# MACRO_ENSURE_VERSION_RANGE - test that a version number is greater than ++# or equal to some minimum and less than some ++# maximum ++# MACRO_ENSURE_VERSION2 - deprecated, do not use in new code ++# ++ ++# MACRO_ENSURE_VERSION ++# This macro compares version numbers of the form "x.y.z" or "x.y" ++# MACRO_ENSURE_VERSION( FOO_MIN_VERSION FOO_VERSION_FOUND FOO_VERSION_OK) ++# will set FOO_VERSION_OK to true if FOO_VERSION_FOUND >= FOO_MIN_VERSION ++# Leading and trailing text is ok, e.g. ++# MACRO_ENSURE_VERSION( "2.5.31" "flex 2.5.4a" VERSION_OK) ++# which means 2.5.31 is required and "flex 2.5.4a" is what was found on the system ++ ++# Copyright (c) 2006, David Faure, <faure@kde.org> ++# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org> ++# ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++ ++# MACRO_ENSURE_VERSION_RANGE ++# This macro ensures that a version number of the form ++# "x.y.z" or "x.y" falls within a range defined by ++# min_version <= found_version < max_version. ++# If this expression holds, FOO_VERSION_OK will be set TRUE ++# ++# Example: MACRO_ENSURE_VERSION_RANGE3( "0.1.0" ${FOOCODE_VERSION} "0.7.0" FOO_VERSION_OK ) ++# ++# This macro will break silently if any of x,y,z are greater than 100. ++# ++# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org> ++# ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++ ++# NORMALIZE_VERSION ++# Helper macro to convert version numbers of the form "x.y.z" ++# to an integer equal to 10^4 * x + 10^2 * y + z ++# ++# This macro will break silently if any of x,y,z are greater than 100. ++# ++# Copyright (c) 2006, David Faure, <faure@kde.org> ++# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org> ++# ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++ ++# CHECK_RANGE_INCLUSIVE_LOWER ++# Helper macro to check whether x <= y < z ++# ++# Copyright (c) 2007, Will Stephenson <wstephenson@kde.org> ++# ++# Redistribution and use is allowed according to the terms of the BSD license. ++# For details see the accompanying COPYING-CMAKE-SCRIPTS file. ++ ++ ++MACRO(NORMALIZE_VERSION _requested_version _normalized_version) ++ STRING(REGEX MATCH "[^0-9]*[0-9]+\\.[0-9]+\\.[0-9]+.*" _threePartMatch "${_requested_version}") ++ if (_threePartMatch) ++ # parse the parts of the version string ++ STRING(REGEX REPLACE "[^0-9]*([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" _major_vers "${_requested_version}") ++ STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.([0-9]+)\\.[0-9]+.*" "\\1" _minor_vers "${_requested_version}") ++ STRING(REGEX REPLACE "[^0-9]*[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" _patch_vers "${_requested_version}") ++ else (_threePartMatch) ++ STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" _major_vers "${_requested_version}") ++ STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" _minor_vers "${_requested_version}") ++ set(_patch_vers "0") ++ endif (_threePartMatch) ++ ++ # compute an overall version number which can be compared at once ++ MATH(EXPR ${_normalized_version} "${_major_vers}*10000 + ${_minor_vers}*100 + ${_patch_vers}") ++ENDMACRO(NORMALIZE_VERSION) ++ ++MACRO(MACRO_CHECK_RANGE_INCLUSIVE_LOWER _lower_limit _value _upper_limit _ok) ++ if (${_value} LESS ${_lower_limit}) ++ set( ${_ok} FALSE ) ++ elseif (${_value} EQUAL ${_lower_limit}) ++ set( ${_ok} TRUE ) ++ elseif (${_value} EQUAL ${_upper_limit}) ++ set( ${_ok} FALSE ) ++ elseif (${_value} GREATER ${_upper_limit}) ++ set( ${_ok} FALSE ) ++ else (${_value} LESS ${_lower_limit}) ++ set( ${_ok} TRUE ) ++ endif (${_value} LESS ${_lower_limit}) ++ENDMACRO(MACRO_CHECK_RANGE_INCLUSIVE_LOWER) ++ ++MACRO(MACRO_ENSURE_VERSION requested_version found_version var_too_old) ++ NORMALIZE_VERSION( ${requested_version} req_vers_num ) ++ NORMALIZE_VERSION( ${found_version} found_vers_num ) ++ ++ if (found_vers_num LESS req_vers_num) ++ set( ${var_too_old} FALSE ) ++ else (found_vers_num LESS req_vers_num) ++ set( ${var_too_old} TRUE ) ++ endif (found_vers_num LESS req_vers_num) ++ ++ENDMACRO(MACRO_ENSURE_VERSION) ++ ++MACRO(MACRO_ENSURE_VERSION2 requested_version2 found_version2 var_too_old2) ++ MACRO_ENSURE_VERSION( ${requested_version2} ${found_version2} ${var_too_old2}) ++ENDMACRO(MACRO_ENSURE_VERSION2) ++ ++MACRO(MACRO_ENSURE_VERSION_RANGE min_version found_version max_version var_ok) ++ NORMALIZE_VERSION( ${min_version} req_vers_num ) ++ NORMALIZE_VERSION( ${found_version} found_vers_num ) ++ NORMALIZE_VERSION( ${max_version} max_vers_num ) ++ ++ MACRO_CHECK_RANGE_INCLUSIVE_LOWER( ${req_vers_num} ${found_vers_num} ${max_vers_num} ${var_ok}) ++ENDMACRO(MACRO_ENSURE_VERSION_RANGE) ++ ++ diff --git a/source/l/phonon-xine/phonon-xine.SlackBuild b/source/l/phonon-xine/phonon-xine.SlackBuild new file mode 100755 index 000000000..2aff84356 --- /dev/null +++ b/source/l/phonon-xine/phonon-xine.SlackBuild @@ -0,0 +1,131 @@ +#!/bin/sh +# Copyright 2011, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF +# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT +# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# ----------------------------------------------------------------------------- + + +PKGNAM=phonon-xine +SRCNAM=phonon-backend-xine +VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:" -j7 "} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 +cd $SRCNAM-$VERSION || exit 1 + +# Use better phonon detection routine: +cat $CWD/phonon-backend-xine-4.4.4.find.phonon.patch | patch -p1 --verbose || exit 1 + +# Switch from oxygen to hicolor icons. This way they are visible, +# even when the current icon theme is not oxygen. +for res in 16 22 32 48 64 128 sc ; do + mv xine/ox${res}-app-phonon-xine.png xine/hi${res}-app-phonon-xine.png +done + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +echo Building ... +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make $NUMJOBS + make DESTDIR=$PKG install +cd - + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING.LIB xine/BUGS \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Compress the man page(s): +if [ -d $PKG/usr/man ]; then + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ). +gz $i.gz ; rm $i ; done +fi + +# Strip binaries (if any): +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Add a package description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/phonon-xine/slack-desc b/source/l/phonon-xine/slack-desc new file mode 100644 index 000000000..59ee7f0b6 --- /dev/null +++ b/source/l/phonon-xine/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +phonon-xine: phonon-xine (xine backend for phonon) +phonon-xine: +phonon-xine: This package provides an additional xine backend for the phonon +phonon-xine: multimedia framework used in KDE. +phonon-xine: +phonon-xine: For more information, visit: +phonon-xine: https://projects.kde.org/projects/kdesupport/phonon/phonon-xine +phonon-xine: +phonon-xine: +phonon-xine: +phonon-xine: diff --git a/source/l/phonon/phonon.SlackBuild b/source/l/phonon/phonon.SlackBuild index 79c9629f3..2b155060a 100755 --- a/source/l/phonon/phonon.SlackBuild +++ b/source/l/phonon/phonon.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008 Robby Workman, Northport, Alabama, USA -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,27 +21,27 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL + PKGNAM=phonon VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:--j7} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-phonon - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -51,16 +51,23 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-phonon + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -r phonon-$VERSION -tar xvf $CWD/phonon-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/phonon-$VERSION.tar.?z* || exit 1 cd phonon-$VERSION || exit 1 chown -R root:root . @@ -78,6 +85,9 @@ cd build -DCMAKE_INSTALL_PREFIX=/usr \ -DMAN_INSTALL_DIR=/usr/man \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \ + -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \ + -DWITH_QZeitgeist=BOOL:OFF \ .. make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/phonon/slack-desc b/source/l/phonon/slack-desc index a4fbd02ea..12acecb69 100644 --- a/source/l/phonon/slack-desc +++ b/source/l/phonon/slack-desc @@ -8,12 +8,12 @@ |-----handy-ruler------------------------------------------------------| phonon: phonon (multimedia framework for KDE4) phonon: -phonon: Phonon is the multimedia framework for KDE4. This package contains -phonon: the xine and gstreamer backends and support files for KDE. The -phonon: Phonon library itself is included with Qt. -phonon: -phonon: +phonon: Phonon is the multimedia API provided by Qt and is the standard +phonon: abstraction for handling multimedia streams within the KDE Software +phonon: Compilation. Phonon provides an API for multimedia using various +phonon: backends (gstreamer, mplayer, xine) to handle the lower level I/O. phonon: +phonon: Homepage: http://phonon.kde.org phonon: phonon: phonon: diff --git a/source/l/pil/pil.SlackBuild b/source/l/pil/pil.SlackBuild index 76e3b959b..79980dee1 100755 --- a/source/l/pil/pil.SlackBuild +++ b/source/l/pil/pil.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=pil ARCNAM=Imaging VERSION=${VERSION:-$(echo $ARCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/pilot-link/pilot-link.SlackBuild b/source/l/pilot-link/pilot-link.SlackBuild index 0d555da2a..8dbe13210 100755 --- a/source/l/pilot-link/pilot-link.SlackBuild +++ b/source/l/pilot-link/pilot-link.SlackBuild @@ -21,7 +21,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. VERSION=${VERSION:-0.12.5} -BUILD=${BUILD:-3} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/polkit-gnome/polkit-gnome.SlackBuild b/source/l/polkit-gnome/polkit-gnome.SlackBuild index 82937550a..00adeb0bc 100755 --- a/source/l/polkit-gnome/polkit-gnome.SlackBuild +++ b/source/l/polkit-gnome/polkit-gnome.SlackBuild @@ -80,7 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --enable-gtk-doc \ --disable-static \ - --disable-introspection \ + --enable-introspection \ --build=$ARCH-slackware-linux make $NUMJOBS || make || exit 1 @@ -98,6 +98,14 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a AUTHORS COPYING HACKING NEWS README TODO \ $PKG/usr/doc/$PKGNAM-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/polkit-qt-1/polkit-qt-1.SlackBuild b/source/l/polkit-qt-1/polkit-qt-1.SlackBuild new file mode 100755 index 000000000..92e218ea2 --- /dev/null +++ b/source/l/polkit-qt-1/polkit-qt-1.SlackBuild @@ -0,0 +1,113 @@ +#!/bin/sh + +# Copyright 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +PKGNAM=polkit-qt-1 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# Avoid a version number in .la files: +if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then + QTDIR=/usr/lib${LIBDIRSUFFIX}/qt +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG/usr +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + $KDE_OPT_ARGS \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make $NUMJOBS || make || exit 1 + make install DESTDIR=$PKG || exit 1 +cd - + +if [ -d $PKG/usr/man ]; then + gzip -9 $PKG/usr/man/man?/* +fi + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING* README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +find $PKG | xargs file | grep -e "executable" -e "shared object" \ + | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/polkit-qt-1/pull-polkit-qt-1 b/source/l/polkit-qt-1/pull-polkit-qt-1 new file mode 100644 index 000000000..42d648777 --- /dev/null +++ b/source/l/polkit-qt-1/pull-polkit-qt-1 @@ -0,0 +1,6 @@ +rm -rf polkit-qt-1 +git clone git://anongit.kde.org/polkit-qt-1 +( cd polkit-qt-1 && rm -rf .git* ) +mv polkit-qt-1 polkit-qt-1-$(date +%Y%m%d)git +tar cf polkit-qt-1-$(date +%Y%m%d)git.tar polkit-qt-1-$(date +%Y%m%d)git +xz -9 polkit-qt-1-$(date +%Y%m%d)git.tar diff --git a/source/l/polkit-qt-1/slack-desc b/source/l/polkit-qt-1/slack-desc new file mode 100644 index 000000000..ed2cf40c1 --- /dev/null +++ b/source/l/polkit-qt-1/slack-desc @@ -0,0 +1,19 @@ +# 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-----------------------------------------------------| +polkit-qt-1: polkit-qt-1 (Qt polkit API wrapper) +polkit-qt-1: +polkit-qt-1: polkit-qt-1 aims to make it easy for Qt developers to take advantage +polkit-qt-1: of the polkit API. It is a convenience wrapper around QAction and +polkit-qt-1: QAbstractButton that lets you integrate those two components +polkit-qt-1: easily with polkit. +polkit-qt-1: +polkit-qt-1: Homepage: http://techbase.kde.org/Polkit-Qt-1 +polkit-qt-1: +polkit-qt-1: +polkit-qt-1: diff --git a/source/l/polkit/10-org.freedesktop.NetworkManager.pkla b/source/l/polkit/10-org.freedesktop.NetworkManager.pkla new file mode 100644 index 000000000..b24916028 --- /dev/null +++ b/source/l/polkit/10-org.freedesktop.NetworkManager.pkla @@ -0,0 +1,6 @@ +[nm-applet] +Identity=unix-group:netdev +Action=org.freedesktop.NetworkManager.* +ResultAny=yes +ResultInactive=no +ResultActive=yes diff --git a/source/l/polkit/20-plugdev-group-mount-override.pkla b/source/l/polkit/20-plugdev-group-mount-override.pkla new file mode 100644 index 000000000..8149de672 --- /dev/null +++ b/source/l/polkit/20-plugdev-group-mount-override.pkla @@ -0,0 +1,6 @@ +[plugdev group mount override] +Identity=unix-group:plugdev +Action=org.freedesktop.udisks2.filesystem-*;org.freedesktop.udisks2.eject-* +ResultAny=yes +ResultInactive=yes +ResultActive=yes diff --git a/source/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch b/source/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch deleted file mode 100644 index 9431056bc..000000000 --- a/source/l/polkit/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch +++ /dev/null @@ -1,139 +0,0 @@ -From dd848a42a64a3b22a0cc60f6657b56ce9b6010ae Mon Sep 17 00:00:00 2001 -From: David Zeuthen <davidz@redhat.com> -Date: Thu, 31 Mar 2011 12:59:09 -0400 -Subject: [PATCH 1/4] PolkitUnixProcess: Clarify that the real uid is - returned, not the effective one - -On Linux, also switch to parsing /proc/<pid>/status instead of relying -on the st_uid returned by stat(2) to be the uid we want. - -This was pointed out by Neel Mehta <nmehta@google.com>. Thanks! - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- - src/polkit/polkitunixprocess.c | 66 ++++++++++++++++++++++++++++++---------- - 1 files changed, 50 insertions(+), 16 deletions(-) - -diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c -index d95a1d4..876da69 100644 ---- a/src/polkit/polkitunixprocess.c -+++ b/src/polkit/polkitunixprocess.c -@@ -24,9 +24,7 @@ - #endif - - #include <sys/types.h> --#ifndef HAVE_FREEBSD --#include <sys/stat.h> --#else -+#ifdef HAVE_FREEBSD - #include <sys/param.h> - #include <sys/sysctl.h> - #include <sys/user.h> -@@ -34,6 +32,7 @@ - #include <stdlib.h> - #include <string.h> - #include <errno.h> -+#include <stdio.h> - - #include "polkitunixprocess.h" - #include "polkitsubject.h" -@@ -208,6 +207,8 @@ polkit_unix_process_get_pid (PolkitUnixProcess *process) - * - * Gets the uid of the owner of @process. - * -+ * Note that this returns the real user-id (not the effective user-id) of @process. -+ * - * Returns: The UNIX user id of the owner for @process or 0 if @error is set. - **/ - gint -@@ -215,17 +216,21 @@ polkit_unix_process_get_owner (PolkitUnixProcess *process, - GError **error) - { - gint result; -+ gchar *contents; -+ gchar **lines; - #ifdef HAVE_FREEBSD - struct kinfo_proc p; - #else -- struct stat statbuf; -- char procbuf[32]; -+ gchar filename[64]; -+ guint n; - #endif - - g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); - g_return_val_if_fail (error == NULL || *error == NULL, 0); - - result = 0; -+ lines = NULL; -+ contents = NULL; - - #ifdef HAVE_FREEBSD - if (get_kinfo_proc (process->pid, &p) == 0) -@@ -241,23 +246,52 @@ polkit_unix_process_get_owner (PolkitUnixProcess *process, - - result = p.ki_uid; - #else -- g_snprintf (procbuf, sizeof procbuf, "/proc/%d", process->pid); -- if (stat (procbuf, &statbuf) != 0) -+ -+ /* see 'man proc' for layout of the status file -+ * -+ * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). -+ */ -+ g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); -+ if (!g_file_get_contents (filename, -+ &contents, -+ NULL, -+ error)) - { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "stat() failed for /proc/%d: %s", -- process->pid, -- g_strerror (errno)); - goto out; - } -+ lines = g_strsplit (contents, "\n", -1); -+ for (n = 0; lines != NULL && lines[n] != NULL; n++) -+ { -+ gint real_uid, effective_uid; -+ if (!g_str_has_prefix (lines[n], "Uid:")) -+ continue; -+ if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Unexpected line `%s' in file %s", -+ lines[n], -+ filename); -+ goto out; -+ } -+ else -+ { -+ result = real_uid; -+ goto out; -+ } -+ } - -- result = statbuf.st_uid; -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Didn't find any line starting with `Uid:' in file %s", -+ filename); - #endif - -- out: -- -+out: -+ g_strfreev (lines); -+ g_free (contents); - return result; - } - --- -1.7.4.4 - diff --git a/source/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch b/source/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch deleted file mode 100644 index 81a163c68..000000000 --- a/source/l/polkit/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch +++ /dev/null @@ -1,623 +0,0 @@ -From 129b6223a19e7fb2753f8cad7957ac5402394076 Mon Sep 17 00:00:00 2001 -From: David Zeuthen <davidz@redhat.com> -Date: Fri, 1 Apr 2011 12:09:45 -0400 -Subject: [PATCH 2/4] Make PolkitUnixProcess also record the uid of the - process - -This is needed to avoid possible TOCTTOU issues since a process can -change both its real uid and effective uid. - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- - docs/polkit/polkit-1-sections.txt | 7 +- - src/polkit/polkitsubject.c | 25 +++- - src/polkit/polkitunixprocess.c | 346 +++++++++++++++++++++++++------------ - src/polkit/polkitunixprocess.h | 18 ++- - 4 files changed, 278 insertions(+), 118 deletions(-) - -diff --git a/docs/polkit/polkit-1-sections.txt b/docs/polkit/polkit-1-sections.txt -index 12141e3..9f4fcf8 100644 ---- a/docs/polkit/polkit-1-sections.txt -+++ b/docs/polkit/polkit-1-sections.txt -@@ -145,10 +145,13 @@ POLKIT_UNIX_SESSION_GET_CLASS - PolkitUnixProcess - polkit_unix_process_new - polkit_unix_process_new_full -+polkit_unix_process_new_for_owner -+polkit_unix_process_set_pid - polkit_unix_process_get_pid -+polkit_unix_process_set_start_time - polkit_unix_process_get_start_time --polkit_unix_process_set_pid --polkit_unix_process_get_owner -+polkit_unix_process_set_uid -+polkit_unix_process_get_uid - <SUBSECTION Standard> - PolkitUnixProcessClass - POLKIT_UNIX_PROCESS -diff --git a/src/polkit/polkitsubject.c b/src/polkit/polkitsubject.c -index 577afec..d2c4c20 100644 ---- a/src/polkit/polkitsubject.c -+++ b/src/polkit/polkitsubject.c -@@ -238,13 +238,18 @@ polkit_subject_from_string (const gchar *str, - { - gint scanned_pid; - guint64 scanned_starttime; -- if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2) -+ gint scanned_uid; -+ if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT ":%d", &scanned_pid, &scanned_starttime, &scanned_uid) == 3) -+ { -+ subject = polkit_unix_process_new_for_owner (scanned_pid, scanned_starttime, scanned_uid); -+ } -+ else if (sscanf (str, "unix-process:%d:%" G_GUINT64_FORMAT, &scanned_pid, &scanned_starttime) == 2) - { - subject = polkit_unix_process_new_full (scanned_pid, scanned_starttime); - } - else if (sscanf (str, "unix-process:%d", &scanned_pid) == 1) - { -- subject = polkit_unix_process_new_full (scanned_pid, 0); -+ subject = polkit_unix_process_new (scanned_pid); - if (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) == 0) - { - g_object_unref (subject); -@@ -297,6 +302,8 @@ polkit_subject_to_gvariant (PolkitSubject *subject) - g_variant_new_uint32 (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)))); - g_variant_builder_add (&builder, "{sv}", "start-time", - g_variant_new_uint64 (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)))); -+ g_variant_builder_add (&builder, "{sv}", "uid", -+ g_variant_new_int32 (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)))); - } - else if (POLKIT_IS_UNIX_SESSION (subject)) - { -@@ -395,6 +402,7 @@ polkit_subject_new_for_gvariant (GVariant *variant, - GVariant *v; - guint32 pid; - guint64 start_time; -+ gint32 uid; - - v = lookup_asv (details_gvariant, "pid", G_VARIANT_TYPE_UINT32, error); - if (v == NULL) -@@ -414,7 +422,18 @@ polkit_subject_new_for_gvariant (GVariant *variant, - start_time = g_variant_get_uint64 (v); - g_variant_unref (v); - -- ret = polkit_unix_process_new_full (pid, start_time); -+ v = lookup_asv (details_gvariant, "uid", G_VARIANT_TYPE_INT32, error); -+ if (v != NULL) -+ { -+ uid = g_variant_get_int32 (v); -+ g_variant_unref (v); -+ } -+ else -+ { -+ uid = -1; -+ } -+ -+ ret = polkit_unix_process_new_for_owner (pid, start_time, uid); - } - else if (g_strcmp0 (kind, "unix-session") == 0) - { -diff --git a/src/polkit/polkitunixprocess.c b/src/polkit/polkitunixprocess.c -index 876da69..913be3a 100644 ---- a/src/polkit/polkitunixprocess.c -+++ b/src/polkit/polkitunixprocess.c -@@ -62,6 +62,7 @@ struct _PolkitUnixProcess - - gint pid; - guint64 start_time; -+ gint uid; - }; - - struct _PolkitUnixProcessClass -@@ -74,6 +75,7 @@ enum - PROP_0, - PROP_PID, - PROP_START_TIME, -+ PROP_UID - }; - - static void subject_iface_init (PolkitSubjectIface *subject_iface); -@@ -81,6 +83,9 @@ static void subject_iface_init (PolkitSubjectIface *subject_iface); - static guint64 get_start_time_for_pid (gint pid, - GError **error); - -+static gint _polkit_unix_process_get_owner (PolkitUnixProcess *process, -+ GError **error); -+ - #ifdef HAVE_FREEBSD - static gboolean get_kinfo_proc (gint pid, struct kinfo_proc *p); - #endif -@@ -92,6 +97,7 @@ G_DEFINE_TYPE_WITH_CODE (PolkitUnixProcess, polkit_unix_process, G_TYPE_OBJECT, - static void - polkit_unix_process_init (PolkitUnixProcess *unix_process) - { -+ unix_process->uid = -1; - } - - static void -@@ -108,6 +114,10 @@ polkit_unix_process_get_property (GObject *object, - g_value_set_int (value, unix_process->pid); - break; - -+ case PROP_UID: -+ g_value_set_int (value, unix_process->uid); -+ break; -+ - case PROP_START_TIME: - g_value_set_uint64 (value, unix_process->start_time); - break; -@@ -132,6 +142,14 @@ polkit_unix_process_set_property (GObject *object, - polkit_unix_process_set_pid (unix_process, g_value_get_int (value)); - break; - -+ case PROP_UID: -+ polkit_unix_process_set_uid (unix_process, g_value_get_int (value)); -+ break; -+ -+ case PROP_START_TIME: -+ polkit_unix_process_set_start_time (unix_process, g_value_get_uint64 (value)); -+ break; -+ - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; -@@ -139,12 +157,39 @@ polkit_unix_process_set_property (GObject *object, - } - - static void -+polkit_unix_process_constructed (GObject *object) -+{ -+ PolkitUnixProcess *process = POLKIT_UNIX_PROCESS (object); -+ -+ /* sets start_time and uid in case they are unset */ -+ -+ if (process->start_time == 0) -+ process->start_time = get_start_time_for_pid (process->pid, NULL); -+ -+ if (process->uid == -1) -+ { -+ GError *error; -+ error = NULL; -+ process->uid = _polkit_unix_process_get_owner (process, &error); -+ if (error != NULL) -+ { -+ process->uid = -1; -+ g_error_free (error); -+ } -+ } -+ -+ if (G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed != NULL) -+ G_OBJECT_CLASS (polkit_unix_process_parent_class)->constructed (object); -+} -+ -+static void - polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - { - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - - gobject_class->get_property = polkit_unix_process_get_property; - gobject_class->set_property = polkit_unix_process_set_property; -+ gobject_class->constructed = polkit_unix_process_constructed; - - /** - * PolkitUnixProcess:pid: -@@ -156,7 +201,7 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - g_param_spec_int ("pid", - "Process ID", - "The UNIX process ID", -- -1, -+ 0, - G_MAXINT, - 0, - G_PARAM_CONSTRUCT | -@@ -166,6 +211,27 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - G_PARAM_STATIC_NICK)); - - /** -+ * PolkitUnixProcess:uid: -+ * -+ * The UNIX user id of the process or -1 if unknown. -+ * -+ * Note that this is the real user-id, not the effective user-id. -+ */ -+ g_object_class_install_property (gobject_class, -+ PROP_UID, -+ g_param_spec_int ("uid", -+ "User ID", -+ "The UNIX user ID", -+ -1, -+ G_MAXINT, -+ -1, -+ G_PARAM_CONSTRUCT | -+ G_PARAM_READWRITE | -+ G_PARAM_STATIC_NAME | -+ G_PARAM_STATIC_BLURB | -+ G_PARAM_STATIC_NICK)); -+ -+ /** - * PolkitUnixProcess:start-time: - * - * The start time of the process. -@@ -178,7 +244,8 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - 0, - G_MAXUINT64, - 0, -- G_PARAM_READABLE | -+ G_PARAM_CONSTRUCT | -+ G_PARAM_READWRITE | - G_PARAM_STATIC_NAME | - G_PARAM_STATIC_BLURB | - G_PARAM_STATIC_NICK)); -@@ -186,113 +253,50 @@ polkit_unix_process_class_init (PolkitUnixProcessClass *klass) - } - - /** -- * polkit_unix_process_get_pid: -+ * polkit_unix_process_get_uid: - * @process: A #PolkitUnixProcess. - * -- * Gets the process id for @process. -+ * Gets the user id for @process. Note that this is the real user-id, -+ * not the effective user-id. - * -- * Returns: The process id for @process. -+ * Returns: The user id for @process or -1 if unknown. - */ - gint --polkit_unix_process_get_pid (PolkitUnixProcess *process) -+polkit_unix_process_get_uid (PolkitUnixProcess *process) - { -- g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); -- return process->pid; -+ g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), -1); -+ return process->uid; - } - - /** -- * polkit_unix_process_get_owner: -+ * polkit_unix_process_set_uid: - * @process: A #PolkitUnixProcess. -- * @error: (allow-none): Return location for error or %NULL. -+ * @uid: The user id to set for @process or -1 to unset it. - * -- * Gets the uid of the owner of @process. -+ * Sets the (real, not effective) user id for @process. -+ */ -+void -+polkit_unix_process_set_uid (PolkitUnixProcess *process, -+ gint uid) -+{ -+ g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); -+ g_return_if_fail (uid >= -1); -+ process->uid = uid; -+} -+ -+/** -+ * polkit_unix_process_get_pid: -+ * @process: A #PolkitUnixProcess. - * -- * Note that this returns the real user-id (not the effective user-id) of @process. -+ * Gets the process id for @process. - * -- * Returns: The UNIX user id of the owner for @process or 0 if @error is set. -- **/ -+ * Returns: The process id for @process. -+ */ - gint --polkit_unix_process_get_owner (PolkitUnixProcess *process, -- GError **error) -+polkit_unix_process_get_pid (PolkitUnixProcess *process) - { -- gint result; -- gchar *contents; -- gchar **lines; --#ifdef HAVE_FREEBSD -- struct kinfo_proc p; --#else -- gchar filename[64]; -- guint n; --#endif -- - g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); -- g_return_val_if_fail (error == NULL || *error == NULL, 0); -- -- result = 0; -- lines = NULL; -- contents = NULL; -- --#ifdef HAVE_FREEBSD -- if (get_kinfo_proc (process->pid, &p) == 0) -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "get_kinfo_proc() failed for pid %d: %s", -- process->pid, -- g_strerror (errno)); -- goto out; -- } -- -- result = p.ki_uid; --#else -- -- /* see 'man proc' for layout of the status file -- * -- * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). -- */ -- g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); -- if (!g_file_get_contents (filename, -- &contents, -- NULL, -- error)) -- { -- goto out; -- } -- lines = g_strsplit (contents, "\n", -1); -- for (n = 0; lines != NULL && lines[n] != NULL; n++) -- { -- gint real_uid, effective_uid; -- if (!g_str_has_prefix (lines[n], "Uid:")) -- continue; -- if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) -- { -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "Unexpected line `%s' in file %s", -- lines[n], -- filename); -- goto out; -- } -- else -- { -- result = real_uid; -- goto out; -- } -- } -- -- g_set_error (error, -- POLKIT_ERROR, -- POLKIT_ERROR_FAILED, -- "Didn't find any line starting with `Uid:' in file %s", -- filename); --#endif -- --out: -- g_strfreev (lines); -- g_free (contents); -- return result; -+ return process->pid; - } - - /** -@@ -311,6 +315,21 @@ polkit_unix_process_get_start_time (PolkitUnixProcess *process) - } - - /** -+ * polkit_unix_process_set_start_time: -+ * @process: A #PolkitUnixProcess. -+ * @start_time: The start time for @pid. -+ * -+ * Set the start time of @process. -+ */ -+void -+polkit_unix_process_set_start_time (PolkitUnixProcess *process, -+ guint64 start_time) -+{ -+ g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); -+ process->start_time = start_time; -+} -+ -+/** - * polkit_unix_process_set_pid: - * @process: A #PolkitUnixProcess. - * @pid: A process id. -@@ -323,18 +342,17 @@ polkit_unix_process_set_pid (PolkitUnixProcess *process, - { - g_return_if_fail (POLKIT_IS_UNIX_PROCESS (process)); - process->pid = pid; -- if (pid != (gint) -1) -- process->start_time = get_start_time_for_pid (pid, NULL); - } - - /** - * polkit_unix_process_new: - * @pid: The process id. - * -- * Creates a new #PolkitUnixProcess for @pid. The start time of the -- * process will be looked up in using e.g. the -- * <filename>/proc</filename> filesystem depending on the platform in -- * use. -+ * Creates a new #PolkitUnixProcess for @pid. -+ * -+ * The uid and start time of the process will be looked up in using -+ * e.g. the <filename>/proc</filename> filesystem depending on the -+ * platform in use. - * - * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). - */ -@@ -353,22 +371,42 @@ polkit_unix_process_new (gint pid) - * - * Creates a new #PolkitUnixProcess object for @pid and @start_time. - * -+ * The uid of the process will be looked up in using e.g. the -+ * <filename>/proc</filename> filesystem depending on the platform in -+ * use. -+ * - * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). - */ - PolkitSubject * - polkit_unix_process_new_full (gint pid, - guint64 start_time) - { -- PolkitUnixProcess *process; -- -- process = POLKIT_UNIX_PROCESS (polkit_unix_process_new ((gint) -1)); -- process->pid = pid; -- if (start_time != 0) -- process->start_time = start_time; -- else -- process->start_time = get_start_time_for_pid (pid, NULL); -+ return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS, -+ "pid", pid, -+ "start_time", start_time, -+ NULL)); -+} - -- return POLKIT_SUBJECT (process); -+/** -+ * polkit_unix_process_new_for_owner: -+ * @pid: The process id. -+ * @start_time: The start time for @pid or 0 to look it up in e.g. <filename>/proc</filename>. -+ * @uid: The (real, not effective) uid of the owner of @pid or -1 to look it up in e.g. <filename>/proc</filename>. -+ * -+ * Creates a new #PolkitUnixProcess object for @pid, @start_time and @uid. -+ * -+ * Returns: (transfer full): A #PolkitSubject. Free with g_object_unref(). -+ */ -+PolkitSubject * -+polkit_unix_process_new_for_owner (gint pid, -+ guint64 start_time, -+ gint uid) -+{ -+ return POLKIT_SUBJECT (g_object_new (POLKIT_TYPE_UNIX_PROCESS, -+ "pid", pid, -+ "start_time", start_time, -+ "uid", uid, -+ NULL)); - } - - static guint -@@ -616,3 +654,95 @@ out: - - return start_time; - } -+ -+static gint -+_polkit_unix_process_get_owner (PolkitUnixProcess *process, -+ GError **error) -+{ -+ gint result; -+ gchar *contents; -+ gchar **lines; -+#ifdef HAVE_FREEBSD -+ struct kinfo_proc p; -+#else -+ gchar filename[64]; -+ guint n; -+#endif -+ -+ g_return_val_if_fail (POLKIT_IS_UNIX_PROCESS (process), 0); -+ g_return_val_if_fail (error == NULL || *error == NULL, 0); -+ -+ result = 0; -+ lines = NULL; -+ contents = NULL; -+ -+#ifdef HAVE_FREEBSD -+ if (get_kinfo_proc (process->pid, &p) == 0) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "get_kinfo_proc() failed for pid %d: %s", -+ process->pid, -+ g_strerror (errno)); -+ goto out; -+ } -+ -+ result = p.ki_uid; -+#else -+ -+ /* see 'man proc' for layout of the status file -+ * -+ * Uid, Gid: Real, effective, saved set, and file system UIDs (GIDs). -+ */ -+ g_snprintf (filename, sizeof filename, "/proc/%d/status", process->pid); -+ if (!g_file_get_contents (filename, -+ &contents, -+ NULL, -+ error)) -+ { -+ goto out; -+ } -+ lines = g_strsplit (contents, "\n", -1); -+ for (n = 0; lines != NULL && lines[n] != NULL; n++) -+ { -+ gint real_uid, effective_uid; -+ if (!g_str_has_prefix (lines[n], "Uid:")) -+ continue; -+ if (sscanf (lines[n] + 4, "%d %d", &real_uid, &effective_uid) != 2) -+ { -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Unexpected line `%s' in file %s", -+ lines[n], -+ filename); -+ goto out; -+ } -+ else -+ { -+ result = real_uid; -+ goto out; -+ } -+ } -+ -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Didn't find any line starting with `Uid:' in file %s", -+ filename); -+#endif -+ -+out: -+ g_strfreev (lines); -+ g_free (contents); -+ return result; -+} -+ -+/* deprecated public method */ -+gint -+polkit_unix_process_get_owner (PolkitUnixProcess *process, -+ GError **error) -+{ -+ return _polkit_unix_process_get_owner (process, error); -+} -diff --git a/src/polkit/polkitunixprocess.h b/src/polkit/polkitunixprocess.h -index b88cd03..531a57d 100644 ---- a/src/polkit/polkitunixprocess.h -+++ b/src/polkit/polkitunixprocess.h -@@ -47,16 +47,24 @@ typedef struct _PolkitUnixProcess PolkitUnixProcess; - typedef struct _PolkitUnixProcessClass PolkitUnixProcessClass; - - GType polkit_unix_process_get_type (void) G_GNUC_CONST; --PolkitSubject *polkit_unix_process_new (gint pid); --PolkitSubject *polkit_unix_process_new_full (gint pid, -- guint64 start_time); -- -+PolkitSubject *polkit_unix_process_new (gint pid); -+PolkitSubject *polkit_unix_process_new_full (gint pid, -+ guint64 start_time); -+PolkitSubject *polkit_unix_process_new_for_owner (gint pid, -+ guint64 start_time, -+ gint uid); - gint polkit_unix_process_get_pid (PolkitUnixProcess *process); - guint64 polkit_unix_process_get_start_time (PolkitUnixProcess *process); -+gint polkit_unix_process_get_uid (PolkitUnixProcess *process); - void polkit_unix_process_set_pid (PolkitUnixProcess *process, - gint pid); -+void polkit_unix_process_set_uid (PolkitUnixProcess *process, -+ gint uid); -+void polkit_unix_process_set_start_time (PolkitUnixProcess *process, -+ guint64 start_time); -+ - gint polkit_unix_process_get_owner (PolkitUnixProcess *process, -- GError **error); -+ GError **error) G_GNUC_DEPRECATED_FOR (polkit_unix_process_get_uid); - - G_END_DECLS - --- -1.7.4.4 - diff --git a/source/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch b/source/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch deleted file mode 100644 index 90d9352e3..000000000 --- a/source/l/polkit/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c23d74447c7615dc74dae259f0fc3688ec988867 Mon Sep 17 00:00:00 2001 -From: David Zeuthen <davidz@redhat.com> -Date: Fri, 1 Apr 2011 12:12:27 -0400 -Subject: [PATCH 3/4] Use polkit_unix_process_get_uid() to get the owner of a - process - -This avoids a TOCTTOU problem. - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- - src/polkitbackend/polkitbackendsessionmonitor.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/src/polkitbackend/polkitbackendsessionmonitor.c b/src/polkitbackend/polkitbackendsessionmonitor.c -index 495f752..9c331b6 100644 ---- a/src/polkitbackend/polkitbackendsessionmonitor.c -+++ b/src/polkitbackend/polkitbackendsessionmonitor.c -@@ -293,14 +293,15 @@ polkit_backend_session_monitor_get_user_for_subject (PolkitBackendSessionMonitor - - if (POLKIT_IS_UNIX_PROCESS (subject)) - { -- local_error = NULL; -- uid = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), &local_error); -- if (local_error != NULL) -+ uid = polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)); -+ if ((gint) uid == -1) - { -- g_propagate_prefixed_error (error, local_error, "Error getting user for process: "); -+ g_set_error (error, -+ POLKIT_ERROR, -+ POLKIT_ERROR_FAILED, -+ "Unix process subject does not have uid set"); - goto out; - } -- - ret = polkit_unix_user_new (uid); - } - else if (POLKIT_IS_SYSTEM_BUS_NAME (subject)) --- -1.7.4.4 - diff --git a/source/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch b/source/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch deleted file mode 100644 index 8572f732d..000000000 --- a/source/l/polkit/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 3b12cfac29dddd27f1f166a7574d8374cc1dccf2 Mon Sep 17 00:00:00 2001 -From: David Zeuthen <davidz@redhat.com> -Date: Fri, 1 Apr 2011 12:13:15 -0400 -Subject: [PATCH 4/4] pkexec: Avoid TOCTTOU problems with parent process - -In a nutshell, the parent process may change its uid (either real- or -effective uid) after launching pkexec. It can do this by exec()'ing -e.g. a setuid root program. - -To avoid this problem, just use the uid the parent process had when it -executed pkexec. This happens to be the same uid of the pkexec process -itself. - -Additionally, remove some dubious code that allowed pkexec to continue -when the parent process died as there is no reason to support -something like that. Also ensure that the pkexec process is killed if -the parent process dies. - -This problem was pointed out by Neel Mehta <nmehta@google.com>. - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- - src/programs/pkexec.c | 66 +++++++++++++++++++++++++++++-------------------- - 1 files changed, 39 insertions(+), 27 deletions(-) - -diff --git a/src/programs/pkexec.c b/src/programs/pkexec.c -index 9217954..3e656be 100644 ---- a/src/programs/pkexec.c -+++ b/src/programs/pkexec.c -@@ -35,6 +35,10 @@ - #include <pwd.h> - #include <errno.h> - -+#ifdef __linux__ -+#include <sys/prctl.h> -+#endif -+ - #include <glib/gi18n.h> - - #ifdef POLKIT_AUTHFW_PAM -@@ -423,7 +427,6 @@ main (int argc, char *argv[]) - GPtrArray *saved_env; - gchar *opt_user; - pid_t pid_of_caller; -- uid_t uid_of_caller; - gpointer local_agent_handle; - - ret = 127; -@@ -598,40 +601,49 @@ main (int argc, char *argv[]) - */ - g_type_init (); - -- /* now check if the program that invoked us is authorized */ -+ /* make sure we are nuked if the parent process dies */ -+#ifdef __linux__ -+ if (prctl (PR_SET_PDEATHSIG, SIGTERM) != 0) -+ { -+ g_printerr ("prctl(PR_SET_PDEATHSIG, SIGTERM) failed: %s\n", g_strerror (errno)); -+ goto out; -+ } -+#else -+#warning "Please add OS specific code to catch when the parent dies" -+#endif -+ -+ /* Figure out the parent process */ - pid_of_caller = getppid (); - if (pid_of_caller == 1) - { - /* getppid() can return 1 if the parent died (meaning that we are reaped -- * by /sbin/init); get process group leader instead - for example, this -- * happens when launching via gnome-panel (alt+f2, then 'pkexec gedit'). -+ * by /sbin/init); In that case we simpy bail. - */ -- pid_of_caller = getpgrp (); -- } -- -- subject = polkit_unix_process_new (pid_of_caller); -- if (subject == NULL) -- { -- g_printerr ("No such process for pid %d: %s\n", (gint) pid_of_caller, error->message); -- g_error_free (error); -+ g_printerr ("Refusing to render service to dead parents.\n"); - goto out; - } - -- /* paranoia: check that the uid of pid_of_caller matches getuid() */ -- error = NULL; -- uid_of_caller = polkit_unix_process_get_owner (POLKIT_UNIX_PROCESS (subject), -- &error); -- if (error != NULL) -- { -- g_printerr ("Error determing pid of caller (pid %d): %s\n", (gint) pid_of_caller, error->message); -- g_error_free (error); -- goto out; -- } -- if (uid_of_caller != getuid ()) -- { -- g_printerr ("User of caller (%d) does not match our uid (%d)\n", uid_of_caller, getuid ()); -- goto out; -- } -+ /* This process we want to check an authorization for is the process -+ * that launched us - our parent process. -+ * -+ * At the time the parent process fork()'ed and exec()'ed us, the -+ * process had the same real-uid that we have now. So we use this -+ * real-uid instead of of looking it up to avoid TOCTTOU issues -+ * (consider the parent process exec()'ing a setuid helper). -+ * -+ * On the other hand, the monotonic process start-time is guaranteed -+ * to never change so it's safe to look that up given only the PID -+ * since we are guaranteed to be nuked if the parent goes away -+ * (cf. the prctl(2) call above). -+ */ -+ subject = polkit_unix_process_new_for_owner (pid_of_caller, -+ 0, /* 0 means "look up start-time in /proc" */ -+ getuid ()); -+ /* really double-check the invariants guaranteed by the PolkitUnixProcess class */ -+ g_assert (subject != NULL); -+ g_assert (polkit_unix_process_get_pid (POLKIT_UNIX_PROCESS (subject)) == pid_of_caller); -+ g_assert (polkit_unix_process_get_uid (POLKIT_UNIX_PROCESS (subject)) >= 0); -+ g_assert (polkit_unix_process_get_start_time (POLKIT_UNIX_PROCESS (subject)) > 0); - - error = NULL; - authority = polkit_authority_get_sync (NULL /* GCancellable* */, &error); --- -1.7.4.4 - diff --git a/source/l/polkit/doinst.sh b/source/l/polkit/doinst.sh new file mode 100644 index 000000000..bce9ca90e --- /dev/null +++ b/source/l/polkit/doinst.sh @@ -0,0 +1,13 @@ +config() { + NEW="$1" + 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 + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} +config etc/polkit-1/localauthority/50-local.d/20-plugdev-group-mount-override.pkla.new +config etc/polkit-1/localauthority/50-local.d/10-org.freedesktop.NetworkManager.pkla.new diff --git a/source/l/polkit/polkit.SlackBuild b/source/l/polkit/polkit.SlackBuild index 7aa40f5df..a4bb9fc11 100755 --- a/source/l/polkit/polkit.SlackBuild +++ b/source/l/polkit/polkit.SlackBuild @@ -2,7 +2,7 @@ # Copyright 2009, 2011 Robby Workman, Northport, Alabama, USA # Copyright 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PKGNAM=polkit VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -72,12 +72,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# https://bugzilla.redhat.com/show_bug.cgi?id=692922 -patch -p1 < $CWD/CVE-2011-1485/0001-PolkitUnixProcess-Clarify-that-the-real-uid-is-retur.patch || exit 1 -patch -p1 < $CWD/CVE-2011-1485/0002-Make-PolkitUnixProcess-also-record-the-uid-of-the-pr.patch || exit 1 -patch -p1 < $CWD/CVE-2011-1485/0003-Use-polkit_unix_process_get_uid-to-get-the-owner-of-.patch || exit 1 -patch -p1 < $CWD/CVE-2011-1485/0004-pkexec-Avoid-TOCTTOU-problems-with-parent-process.patch || exit 1 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -90,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-gtk-doc \ --mandir=/usr/man \ --disable-static \ - --disable-introspection \ + --enable-introspection \ --with-authfw=shadow \ --enable-verbose-mode \ --with-os-type=Slackware \ @@ -109,6 +103,10 @@ CXXFLAGS="$SLKCFLAGS" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Add default policy files for udisks2 and NetworkManager events: +cat $CWD/20-plugdev-group-mount-override.pkla > $PKG/etc/polkit-1/localauthority/50-local.d/20-plugdev-group-mount-override.pkla.new +cat $CWD/10-org.freedesktop.NetworkManager.pkla > $PKG/etc/polkit-1/localauthority/50-local.d/10-org.freedesktop.NetworkManager.pkla.new + # Strip binaries: find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -131,12 +129,20 @@ fi # Add a documentation directory: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog HACKING INSTALL NEWS README \ + AUTHORS COPYING HACKING INSTALL NEWS README \ $PKG/usr/doc/$PKGNAM-$VERSION -( cd $PKG/usr/doc/$PKGNAM-$VERSION; ln -s ../../share/gtk-doc/html/polkit-1 html -) +( cd $PKG/usr/doc/$PKGNAM-$VERSION; ln -s ../../share/gtk-doc/html/polkit-1 html ) + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install +zcat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG diff --git a/source/l/poppler-data/poppler-data.SlackBuild b/source/l/poppler-data/poppler-data.SlackBuild index 1c77ed9b1..c9937e7f0 100755 --- a/source/l/poppler-data/poppler-data.SlackBuild +++ b/source/l/poppler-data/poppler-data.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -53,6 +53,14 @@ cp -a \ COPYING* README \ $PKG/usr/doc/${PKGNAM}-$VERSION +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/poppler/poppler.SlackBuild b/source/l/poppler/poppler.SlackBuild index dcf3e8997..b2e5955a4 100755 --- a/source/l/poppler/poppler.SlackBuild +++ b/source/l/poppler/poppler.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -61,6 +61,10 @@ cd $TMP || exit 1 rm -rf ${PKGNAM}-${VERSION} tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}-$VERSION || exit 1 + +# Fix printing of some pdf files: +zcat $CWD/poppler_xyscale.patch.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -87,6 +91,7 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Compress and link manpages, if any: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man for manpagedir in $(find . -type d -name "man*") ; do @@ -95,7 +100,7 @@ if [ -d $PKG/usr/man ]; then ln -s $( readlink $eachpage ).gz $eachpage.gz rm $eachpage done - gzip -9 *.* + gzip -9 *.? ) done ) diff --git a/source/l/poppler/poppler_xyscale.patch b/source/l/poppler/poppler_xyscale.patch new file mode 100644 index 000000000..bd23d36c8 --- /dev/null +++ b/source/l/poppler/poppler_xyscale.patch @@ -0,0 +1,47 @@ +From 36481939e3064de920e49d9d1742a85473a50963 Mon Sep 17 00:00:00 2001 +From: Thomas Freitag <Thomas.Freitag@alfa.de> +Date: Sun, 22 Jul 2012 16:40:46 +0000 +Subject: Make sure xScale and yScale are always initialized + +Bug #52215 +--- +diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc +index a01a4b3..e15c2e9 100644 +--- a/poppler/PSOutputDev.cc ++++ b/poppler/PSOutputDev.cc +@@ -3521,6 +3521,7 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) { + saveState(NULL); + } + ++ xScale = yScale = 1; + switch (mode) { + + case psModePSOrigPageSizes: +@@ -3631,8 +3632,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) { + } else { + yScale = xScale; + } +- } else { +- xScale = yScale = 1; + } + // deal with odd bounding boxes or clipping + if (clipLLX0 < clipURX0 && clipLLY0 < clipURY0) { +@@ -3694,7 +3693,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) { + if (tx != 0 || ty != 0) { + writePSFmt("{0:.6g} {1:.6g} translate\n", tx, ty); + } +- xScale = yScale = 1; + break; + + case psModeForm: +@@ -3702,7 +3700,6 @@ void PSOutputDev::startPage(int pageNum, GfxState *state) { + writePS("begin xpdf begin\n"); + writePS("pdfStartPage\n"); + tx = ty = 0; +- xScale = yScale = 1; + rotate = 0; + break; + } +-- +cgit v0.9.0.2-2-gbebe + diff --git a/source/l/pycairo/pycairo.SlackBuild b/source/l/pycairo/pycairo.SlackBuild index 1d072b74a..365745b80 100755 --- a/source/l/pycairo/pycairo.SlackBuild +++ b/source/l/pycairo/pycairo.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=pycairo SRCNAM=py2cairo VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} diff --git a/source/l/hal-info/hal-info.SlackBuild b/source/l/pycurl/pycurl.SlackBuild index 5f527f584..4d9c43395 100755 --- a/source/l/hal-info/hal-info.SlackBuild +++ b/source/l/pycurl/pycurl.SlackBuild @@ -1,7 +1,6 @@ #!/bin/sh -# Copyright 2007-2010 Robby Workman, Northport, AL, USA -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +21,21 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PKGNAM=hal-info -VERSION=${VERSION:-20091130} -ARCH=noarch -BUILD=${BUILD:-1} +PKGNAM=pycurl +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} + +# 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 + +NUMJOBS=${NUMJOBS:--j6} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -44,22 +54,27 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Apply a couple of patches from git -zcat $CWD/patches/quirk-LG_X110-keyboard.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/quirk-acer_aspire_hotkey.patch.gz | patch -p1 --verbose || exit 1 +python setup.py build || exit 1 +python setup.py install --root=$PKG || exit 1 -./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - || exit 1 - -make || exit 1 -make install DESTDIR=$PKG || exit 1 +find $PKG | xargs file | grep -e "shared object" -e "executable" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING* HACKING INSTALL NEWS README* \ +cp -a COPYING* NEWS README TODO \ + doc/* \ $PKG/usr/doc/$PKGNAM-$VERSION +rm -rf $PKG/usr/share/doc/pycurl +rmdir $PKG/usr/share/doc +rmdir $PKG/usr/share + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/source/l/pycurl/slack-desc b/source/l/pycurl/slack-desc new file mode 100644 index 000000000..0ba82db14 --- /dev/null +++ b/source/l/pycurl/slack-desc @@ -0,0 +1,19 @@ +# 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----------------------------------------------| +pycurl: pycurl (Python interface to cURL library) +pycurl: +pycurl: PycURL is a Python interface to libcurl. PycURL can be used +pycurl: to fetch objects identified by a URL from a Python program, +pycurl: similar to the urllib Python module. PycURL is mature, very +pycurl: fast, and supports a lot of features. +pycurl: +pycurl: Homepage: http://pycurl.sourceforge.net +pycurl: +pycurl: +pycurl: diff --git a/source/l/pygobject/pygobject.SlackBuild b/source/l/pygobject/pygobject.SlackBuild index 064ca3c1d..e39feacb0 100755 --- a/source/l/pygobject/pygobject.SlackBuild +++ b/source/l/pygobject/pygobject.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=pygobject VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -63,8 +63,11 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 cd $PKGNAM-$VERSION || exit 1 + +zcat $CWD/pygobject.flags.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -72,8 +75,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/pygobject.fix.no.introspection.crash.diff.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/l/pygobject/pygobject.fix.no.introspection.crash.diff b/source/l/pygobject/pygobject.fix.no.introspection.crash.diff deleted file mode 100644 index df59b4826..000000000 --- a/source/l/pygobject/pygobject.fix.no.introspection.crash.diff +++ /dev/null @@ -1,22 +0,0 @@ -From 97774cb149c5b03d5ef82a5af3f19e2ce4d79d0b Mon Sep 17 00:00:00 2001 -From: John (J5) Palmieri <johnp@redhat.com> -Date: Mon, 04 Oct 2010 16:43:31 +0000 -Subject: return NULL instead of -1 which fixes crash when introspection is turned off - -* see https://bugzilla.gnome.org/show_bug.cgi?id=631158 ---- -diff --git a/gi/pygi.h b/gi/pygi.h -index 551bb6f..da71d28 100644 ---- a/gi/pygi.h -+++ b/gi/pygi.h -@@ -155,7 +155,7 @@ static inline PyObject * - pygi_get_property_value (PyGObject *instance, - const gchar *attr_name) - { -- return -1; -+ return NULL; - } - - static inline gint --- -cgit v0.8.3.1 diff --git a/source/l/pygobject/pygobject.flags.diff b/source/l/pygobject/pygobject.flags.diff new file mode 100644 index 000000000..6a0e99e1f --- /dev/null +++ b/source/l/pygobject/pygobject.flags.diff @@ -0,0 +1,49 @@ +From 42d01f060c5d764baa881d13c103d68897163a49 Mon Sep 17 00:00:00 2001 +From: Ryan Lortie <desrt@desrt.ca> +Date: Mon, 12 Mar 2012 16:44:14 -0400 +Subject: [PATCH] gio-types.defs: change some enums to flags + +These flags types were originally incorrectly handled in glib as being +enums. That bug was fixed, but they're still enums here, leading to +warnings about the mismatch. + +Change them to flags. + +https://bugzilla.gnome.org/show_bug.cgi?id=668522 +--- + gio/gio-types.defs | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/gio/gio-types.defs b/gio/gio-types.defs +index 331e0bc..7eee5c8 100644 +--- a/gio/gio-types.defs ++++ b/gio/gio-types.defs +@@ -526,7 +526,7 @@ + ) + ) + +-(define-enum MountMountFlags ++(define-flags MountMountFlags + (in-module "gio") + (c-name "GMountMountFlags") + (gtype-id "G_TYPE_MOUNT_MOUNT_FLAGS") +@@ -545,7 +545,7 @@ + ) + ) + +-(define-enum DriveStartFlags ++(define-flags DriveStartFlags + (in-module "gio") + (c-name "GDriveStartFlags") + (gtype-id "G_TYPE_DRIVE_START_FLAGS") +@@ -770,7 +770,7 @@ + ) + ) + +-(define-enum SocketMsgFlags ++(define-flags SocketMsgFlags + (in-module "gio") + (c-name "GSocketMsgFlags") + (gtype-id "G_TYPE_SOCKET_MSG_FLAGS") +-- +1.7.9.1 diff --git a/source/l/pygtk/pygtk.SlackBuild b/source/l/pygtk/pygtk.SlackBuild index 7823f4dd8..b4170da85 100755 --- a/source/l/pygtk/pygtk.SlackBuild +++ b/source/l/pygtk/pygtk.SlackBuild @@ -63,7 +63,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP || exit 1 rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ diff --git a/source/l/pyrex/pyrex.SlackBuild b/source/l/pyrex/pyrex.SlackBuild index 42b9f7ccd..94b34c2eb 100755 --- a/source/l/pyrex/pyrex.SlackBuild +++ b/source/l/pyrex/pyrex.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=Pyrex VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/qca-cyrus-sasl/slack-desc b/source/l/qca-cyrus-sasl/slack-desc index 29585fe9a..55bf91d2c 100644 --- a/source/l/qca-cyrus-sasl/slack-desc +++ b/source/l/qca-cyrus-sasl/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler---------------------------------------------| + |-----handy-ruler------------------------------------------------------| qca-cyrus-sasl: qca-cyrus-sasl (Cyrus SASL plugin for QCA) qca-cyrus-sasl: qca-cyrus-sasl: This plugin provides features based on Cyrus SASL version 2. diff --git a/source/l/qca-ossl/qca-ossl-openssl-1.0.0.patch b/source/l/qca-ossl/qca-ossl-openssl-1.0.0.patch new file mode 100644 index 000000000..7c6fa5bd4 --- /dev/null +++ b/source/l/qca-ossl/qca-ossl-openssl-1.0.0.patch @@ -0,0 +1,155 @@ +diff -ru ../qca-ossl-2.0.0-beta3/CMakeLists.txt ./CMakeLists.txt +--- ../qca-ossl-2.0.0-beta3/CMakeLists.txt 2007-06-29 23:10:53.000000000 +0200 ++++ ./CMakeLists.txt 2010-04-18 04:05:09.000000000 +0200 +@@ -1,5 +1,12 @@ + # QCA OSSL + ++INCLUDE(CheckFunctionExists) ++SET(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) ++CHECK_FUNCTION_EXISTS(EVP_md2 HAVE_OPENSSL_MD2) ++IF (HAVE_OPENSSL_MD2) ++ ADD_DEFINITIONS(-DHAVE_OPENSSL_MD2) ++ENDIF (HAVE_OPENSSL_MD2) ++ + SET(QCA_OSSL_SOURCES qca-ossl.cpp) + + MY_AUTOMOC( QCA_OSSL_SOURCES ) +diff -ru ../qca-ossl-2.0.0-beta3/qca-ossl.cpp ./qca-ossl.cpp +--- ../qca-ossl-2.0.0-beta3/qca-ossl.cpp 2007-12-11 07:34:57.000000000 +0100 ++++ ./qca-ossl.cpp 2010-04-18 04:08:46.000000000 +0200 +@@ -42,6 +42,15 @@ + #define OSSL_097 + #endif + ++#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L ++// OpenSSL 1.0.0 makes a few changes that aren't very C++ friendly... ++// Among other things, CHECKED_PTR_OF returns a void*, but is used in ++// contexts requiring STACK pointers. ++#undef CHECKED_PTR_OF ++#define CHECKED_PTR_OF(type, p) \ ++ ((_STACK*) (1 ? p : (type*)0)) ++#endif ++ + using namespace QCA; + + namespace opensslQCAPlugin { +@@ -1771,8 +1780,10 @@ + md = EVP_sha1(); + else if(alg == EMSA3_MD5) + md = EVP_md5(); ++#ifdef HAVE_OPENSSL_MD2 + else if(alg == EMSA3_MD2) + md = EVP_md2(); ++#endif + else if(alg == EMSA3_RIPEMD160) + md = EVP_ripemd160(); + else if(alg == EMSA3_Raw) +@@ -1789,8 +1800,10 @@ + md = EVP_sha1(); + else if(alg == EMSA3_MD5) + md = EVP_md5(); ++#ifdef HAVE_OPENSSL_MD2 + else if(alg == EMSA3_MD2) + md = EVP_md2(); ++#endif + else if(alg == EMSA3_RIPEMD160) + md = EVP_ripemd160(); + else if(alg == EMSA3_Raw) +@@ -3385,9 +3398,11 @@ + case NID_md5WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD5; + break; ++#ifdef HAVE_OPENSSL_MD2 + case NID_md2WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD2; + break; ++#endif + case NID_ripemd160WithRSA: + p.sigalgo = QCA::EMSA3_RIPEMD160; + break; +@@ -3871,9 +3886,11 @@ + case NID_md5WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD5; + break; ++#ifdef HAVE_OPENSSL_MD2 + case NID_md2WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD2; + break; ++#endif + case NID_ripemd160WithRSA: + p.sigalgo = QCA::EMSA3_RIPEMD160; + break; +@@ -4061,9 +4078,11 @@ + case NID_md5WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD5; + break; ++#ifdef HAVE_OPENSSL_MD2 + case NID_md2WithRSAEncryption: + p.sigalgo = QCA::EMSA3_MD2; + break; ++#endif + case NID_ripemd160WithRSA: + p.sigalgo = QCA::EMSA3_RIPEMD160; + break; +@@ -6582,7 +6601,9 @@ + list += "sha1"; + list += "sha0"; + list += "ripemd160"; ++#ifdef HAVE_OPENSSL_MD2 + list += "md2"; ++#endif + list += "md4"; + list += "md5"; + #ifdef SHA224_DIGEST_LENGTH +@@ -6597,9 +6618,11 @@ + #ifdef SHA512_DIGEST_LENGTH + list += "sha512"; + #endif ++/* + #ifdef OBJ_whirlpool + list += "whirlpool"; + #endif ++*/ + return list; + } + +@@ -6757,7 +6780,9 @@ + list += all_hash_types(); + list += all_mac_types(); + list += all_cipher_types(); ++#ifdef HAVE_OPENSSL_MD2 + list += "pbkdf1(md2)"; ++#endif + list += "pbkdf1(sha1)"; + list += "pbkdf2(sha1)"; + list += "pkey"; +@@ -6788,8 +6813,10 @@ + return new opensslHashContext( EVP_sha(), this, type); + else if ( type == "ripemd160" ) + return new opensslHashContext( EVP_ripemd160(), this, type); ++#ifdef HAVE_OPENSSL_MD2 + else if ( type == "md2" ) + return new opensslHashContext( EVP_md2(), this, type); ++#endif + else if ( type == "md4" ) + return new opensslHashContext( EVP_md4(), this, type); + else if ( type == "md5" ) +@@ -6810,14 +6837,18 @@ + else if ( type == "sha512" ) + return new opensslHashContext( EVP_sha512(), this, type); + #endif ++/* + #ifdef OBJ_whirlpool + else if ( type == "whirlpool" ) + return new opensslHashContext( EVP_whirlpool(), this, type); + #endif ++*/ + else if ( type == "pbkdf1(sha1)" ) + return new opensslPbkdf1Context( EVP_sha1(), this, type ); ++#ifdef HAVE_OPENSSL_MD2 + else if ( type == "pbkdf1(md2)" ) + return new opensslPbkdf1Context( EVP_md2(), this, type ); ++#endif + else if ( type == "pbkdf2(sha1)" ) + return new opensslPbkdf2Context( this, type ); + else if ( type == "hmac(md5)" ) diff --git a/source/l/qca-ossl/qca-ossl.SlackBuild b/source/l/qca-ossl/qca-ossl.SlackBuild index 33bba9696..c1fbcc95f 100755 --- a/source/l/qca-ossl/qca-ossl.SlackBuild +++ b/source/l/qca-ossl/qca-ossl.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ PKGNAM=qca-ossl VERSION=2.0.0_beta3 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -64,7 +64,7 @@ tar xvf $CWD/$PKGNAM-$(echo $VERSION | tr _ -).tar.bz2 || exit 1 cd $PKGNAM-$(echo $VERSION | tr _ -) || exit 1 chown -R root:root . # Fix a compilation error with our new openssh: -zcat $CWD/qca-ossl.nowhirlpool.diff.gz | patch -p0 --verbose || exit 1 +zcat $CWD/qca-ossl-openssl-1.0.0.patch.gz | patch -p1 --verbose || exit 1 find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ -exec chmod 755 {} \; -o \ diff --git a/source/l/qca-ossl/qca-ossl.nowhirlpool.diff b/source/l/qca-ossl/qca-ossl.nowhirlpool.diff deleted file mode 100644 index 96451e1a6..000000000 --- a/source/l/qca-ossl/qca-ossl.nowhirlpool.diff +++ /dev/null @@ -1,30 +0,0 @@ -# remove whirlpool usage. the algorithm is missing on at least 0.9.8g and -# 0.9.8i, even though there's an OBJ_whirlpool definition in 0.9.8i. ---- qca-ossl.cpp 2008/08/18 09:08:51 848615 -+++ qca-ossl.cpp 2008/09/24 19:22:26 864423 -@@ -6616,9 +6616,11 @@ - #ifdef SHA512_DIGEST_LENGTH - list += "sha512"; - #endif -+/* - #ifdef OBJ_whirlpool - list += "whirlpool"; - #endif -+*/ - return list; - } - -@@ -6863,10 +6865,12 @@ - else if ( type == "sha512" ) - return new opensslHashContext( EVP_sha512(), this, type); - #endif -+/* - #ifdef OBJ_whirlpool - else if ( type == "whirlpool" ) - return new opensslHashContext( EVP_whirlpool(), this, type); - #endif -+*/ - else if ( type == "pbkdf1(sha1)" ) - return new opensslPbkdf1Context( EVP_sha1(), this, type ); - else if ( type == "pbkdf1(md2)" ) - diff --git a/source/l/qt/QElfParser-fix-type-of-sh_size.patch b/source/l/qt/QElfParser-fix-type-of-sh_size.patch new file mode 100644 index 000000000..1c30f9a4f --- /dev/null +++ b/source/l/qt/QElfParser-fix-type-of-sh_size.patch @@ -0,0 +1,41 @@ +From 9e981c4dd03effc2c52b52f529edfa8955e534ce Mon Sep 17 00:00:00 2001 +From: Pino Toscano <toscano.pino@tiscali.it> +Date: Tue, 15 May 2012 14:40:15 +0200 +Subject: [PATCH] QElfParser: fix type of sh_size + +The type of the sh_size field of a section header is either Elf32_Word or Elf64_Xword, +so the type used cannot be qelfword_t (always 32 bits) but qelfoff_t. + +Change-Id: Ia380b6823913fee7a96b39f742630ae3a9ca0cb8 +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com> +(backport of 77b179689ba37dc909778fdd00df2701f83a2868 from qtbase) +--- + src/corelib/plugin/qelfparser_p.cpp | 4 ++-- + src/corelib/plugin/qelfparser_p.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +--- a/src/corelib/plugin/qelfparser_p.cpp ++++ b/src/corelib/plugin/qelfparser_p.cpp +@@ -61,8 +61,8 @@ const char *QElfParser::parseSectionHead + + sizeof(qelfaddr_t); // sh_addr + sh->offset = read<qelfoff_t>(data); + data += sizeof(qelfoff_t); // sh_offset +- sh->size = read<qelfword_t>(data); +- data += sizeof(qelfword_t); // sh_size ++ sh->size = read<qelfoff_t>(data); ++ data += sizeof(qelfoff_t); // sh_size + return data; + } + +--- a/src/corelib/plugin/qelfparser_p.h ++++ b/src/corelib/plugin/qelfparser_p.h +@@ -80,7 +80,7 @@ public: + qelfword_t name; + qelfword_t type; + qelfoff_t offset; +- qelfword_t size; ++ qelfoff_t size; + }; + + int m_endian; diff --git a/source/l/qt/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch b/source/l/qt/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch new file mode 100644 index 000000000..9acae10c8 --- /dev/null +++ b/source/l/qt/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch @@ -0,0 +1,37 @@ +Description: + QPainter together with QPrinter leaves a lot of temporary files in + /tmp with every printout. That is a problem for embedded devices, + which have not such a large /tmp-partition. We are using 80 MByte as + tmpfs, i.e. in RAM. After some printounts cups deactivates the printer + because there is no space to copy the temporary files to /tmp. + + What happened: In QPdfBaseEnginePrivate::openPrintDevice() noone + remembers the file descriptor opened by tempFile() which is a call to + the cups library to cupsTempFile() + + Later in closePrintDevice the check for fd<0 fails, so no one closes + the file descriptor. If you later remove the file, the descriptor is + still open and cannot removed until you close the application. + + If you print 20 times and more during your application is running and + you print out large files (complicate forms with a lot of elements + produces files with 3-4 MByte) your temporary file can be full, but + you don't see (with ls) files in it. + +Bug: https://bugreports.qt.nokia.com/browse/QTBUG-14724 +Author: Georg Scherzer + +--- + src/gui/painting/qpdf.cpp | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/gui/painting/qpdf.cpp ++++ b/src/gui/painting/qpdf.cpp +@@ -1686,6 +1686,7 @@ bool QPdfBaseEnginePrivate::openPrintDev + cupsTempFile = ret.second; + outDevice = new QFile(); + static_cast<QFile *>(outDevice)->open(ret.first, QIODevice::WriteOnly); ++ fd = ret.first; + #endif + #ifndef QT_NO_LPR + } else { diff --git a/source/l/qt/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch b/source/l/qt/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch new file mode 100644 index 000000000..4d9834a8d --- /dev/null +++ b/source/l/qt/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch @@ -0,0 +1,97 @@ +From a91e9dd202640598d8dec091c67ec94536390e7f Mon Sep 17 00:00:00 2001 +From: "Owen W. Taylor" <otaylor@fishsoup.net> +Date: Mon, 17 Oct 2011 17:27:43 -0400 +Subject: [PATCH] Fix logic for figuring out what ConfigureNotify positions can be trusted + +When reading ahead in the queue for ConfigureNotify events, it's necessary +to look for intermediate ReparentNotify events as well, since they will +determine whether the position in the event can be trusted or not. + +Bug: https://bugreports.qt.nokia.com/browse/QTBUG-21900 +--- + src/gui/kernel/qapplication_x11.cpp | 47 +++++++++++++++++++++++++++++++----- + 1 file changed, 41 insertions(+), 6 deletions(-) + +--- a/src/gui/kernel/qapplication_x11.cpp ++++ b/src/gui/kernel/qapplication_x11.cpp +@@ -816,6 +816,27 @@ static Bool qt_sync_request_scanner(Disp + #endif + #endif // QT_NO_XSYNC + ++struct qt_configure_event_data ++{ ++ WId window; ++ WId parent; ++}; ++ ++static Bool qt_configure_event_scanner(Display*, XEvent *event, XPointer arg) ++{ ++ qt_configure_event_data *data = ++ reinterpret_cast<qt_configure_event_data*>(arg); ++ if (event->type == ConfigureNotify && ++ event->xconfigure.window == data->window) { ++ return true; ++ } else if (event->type == ReparentNotify && ++ event->xreparent.window == data->window) { ++ data->parent = event->xreparent.parent; ++ } ++ ++ return false; ++} ++ + static void qt_x11_create_intern_atoms() + { + const char *names[QX11Data::NAtoms]; +@@ -5281,8 +5302,11 @@ bool QETWidget::translateConfigEvent(con + if (d->extra->compress_events) { + // ConfigureNotify compression for faster opaque resizing + XEvent otherEvent; +- while (XCheckTypedWindowEvent(X11->display, internalWinId(), ConfigureNotify, +- &otherEvent)) { ++ qt_configure_event_data configureData; ++ configureData.window = internalWinId(); ++ configureData.parent = d->topData()->parentWinId; ++ while (XCheckIfEvent(X11->display, &otherEvent, ++ &qt_configure_event_scanner, (XPointer)&configureData)) { + if (qt_x11EventFilter(&otherEvent)) + continue; + +@@ -5295,13 +5319,19 @@ bool QETWidget::translateConfigEvent(con + newSize.setWidth(otherEvent.xconfigure.width); + newSize.setHeight(otherEvent.xconfigure.height); + ++ trust = isVisible() ++ && (configureData.parent == XNone || ++ configureData.parent == QX11Info::appRootWindow()); ++ + if (otherEvent.xconfigure.send_event || trust) { + newCPos.rx() = otherEvent.xconfigure.x + + otherEvent.xconfigure.border_width; + newCPos.ry() = otherEvent.xconfigure.y + + otherEvent.xconfigure.border_width; + isCPos = true; +- } ++ } else { ++ isCPos = false; ++ } + } + #ifndef QT_NO_XSYNC + qt_sync_request_event_data sync_event; +@@ -5314,9 +5344,14 @@ bool QETWidget::translateConfigEvent(con + } + + if (!isCPos) { +- // we didn't get an updated position of the toplevel. +- // either we haven't moved or there is a bug in the window manager. +- // anyway, let's query the position to be certain. ++ // If the last configure event didn't have a trustable position, ++ // it's necessary to query, see ICCCM 4.24: ++ // ++ // Any real ConfigureNotify event on a top-level window implies ++ // that the window position on the root may have changed, even ++ // though the event reports that the window position in its ++ // parent is unchanged because the window may have been reparented. ++ + int x, y; + Window child; + XTranslateCoordinates(X11->display, internalWinId(), diff --git a/source/l/qt/Qt.pc b/source/l/qt/Qt.pc new file mode 100644 index 000000000..f4c0d5938 --- /dev/null +++ b/source/l/qt/Qt.pc @@ -0,0 +1,16 @@ +prefix=/usr/lib${LIBDIRSUFFIX}/qt +bindir=${prefix}/bin +datadir=${prefix} +docdir=${prefix}/doc +headerdir=${prefix}/include +importdir=${prefix}/imports +libdir=${prefix}/lib +moc=${bindir}/moc +plugindir=${prefix}/plugins +qmake=${bindir}/qmake +sysconfdir=/etc +translationdir=${prefix}/translations + +Name: Qt +Description: Qt Configuration +Version: 4.8.1 diff --git a/source/l/qt/doinst.sh b/source/l/qt/doinst.sh index 6f7c5df07..b9a2c53ba 100644 --- a/source/l/qt/doinst.sh +++ b/source/l/qt/doinst.sh @@ -3,3 +3,8 @@ if [ -x sbin/ldconfig ]; then chroot . /sbin/ldconfig 2> /dev/null fi +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1 +fi + + diff --git a/source/l/qt/qt.QSortFilterProxyModel.reformatted.diff b/source/l/qt/qt.QSortFilterProxyModel.reformatted.diff deleted file mode 100644 index 0ab94b319..000000000 --- a/source/l/qt/qt.QSortFilterProxyModel.reformatted.diff +++ /dev/null @@ -1,92 +0,0 @@ ---- ./src/gui/itemviews/qsortfilterproxymodel.cpp.orig 2010-11-20 17:54:23.000000000 -0600 -+++ ./src/gui/itemviews/qsortfilterproxymodel.cpp 2011-01-07 00:40:04.000000000 -0600 -@@ -782,14 +782,14 @@ - if (orthogonal_source_to_proxy.isEmpty()) { - const int ortho_end = (orient == Qt::Horizontal) ? model->rowCount(source_parent) : model->columnCount(source_parent); - -+ orthogonal_source_to_proxy.resize(ortho_end); -+ - for (int ortho_item = 0; ortho_item < ortho_end; ++ortho_item) { - if ((orient == Qt::Horizontal) ? q->filterAcceptsRow(ortho_item, source_parent) - : q->filterAcceptsColumn(ortho_item, source_parent)) { - orthogonal_proxy_to_source.append(ortho_item); - } - } -- orthogonal_source_to_proxy.resize(orthogonal_proxy_to_source.size()); -- - if (orient == Qt::Horizontal) { - // We're reacting to columnsInserted, but we've just inserted new rows. Sort them. - sort_source_rows(orthogonal_proxy_to_source, source_parent); ---- ./tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro.orig 2010-11-20 17:54:28.000000000 -0600 -+++ ./tests/auto/qsortfilterproxymodel/qsortfilterproxymodel.pro 2011-01-07 00:40:04.000000000 -0600 -@@ -1,6 +1,7 @@ - load(qttest_p4) - --SOURCES += tst_qsortfilterproxymodel.cpp -- -+INCLUDEPATH += $$PWD/../modeltest - -+SOURCES += tst_qsortfilterproxymodel.cpp ../modeltest/dynamictreemodel.cpp ../modeltest/modeltest.cpp -+HEADERS += ../modeltest/dynamictreemodel.h ../modeltest/modeltest.h - ---- ./tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp.orig 2010-11-20 17:54:28.000000000 -0600 -+++ ./tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp 2011-01-07 00:41:02.000000000 -0600 -@@ -43,6 +43,9 @@ - #include <QtTest/QtTest> - #include "../../shared/util.h" - -+#include "dynamictreemodel.h" -+#include "modeltest.h" -+ - #include <QtCore> - #include <QtGui> - -@@ -143,6 +146,7 @@ - void taskQTBUG_10287_unnecessaryMapCreation(); - - void testMultipleProxiesWithSelection(); -+ void filteredColumns(); - - protected: - void buildHierarchy(const QStringList &data, QAbstractItemModel *model); -@@ -3135,5 +3139,40 @@ - // No assert failure, it passes. - } - -+class FilteredColumnProxyModel : public QSortFilterProxyModel -+{ -+ Q_OBJECT -+public: -+ FilteredColumnProxyModel(QObject *parent = 0) -+ : QSortFilterProxyModel(parent) -+ { -+ -+ } -+ -+protected: -+ bool filterAcceptsColumn(int column, const QModelIndex &source_parent) const -+ { -+ return column % 2 != 0; -+ } -+}; -+ -+void tst_QSortFilterProxyModel::filteredColumns() -+{ -+ DynamicTreeModel *model = new DynamicTreeModel(this); -+ -+ FilteredColumnProxyModel *proxy = new FilteredColumnProxyModel(this); -+ proxy->setSourceModel(model); -+ -+ new ModelTest(proxy, this); -+ -+ ModelInsertCommand *insertCommand = new ModelInsertCommand(model, this); -+ insertCommand->setNumCols(2); -+ insertCommand->setStartRow(0); -+ insertCommand->setEndRow(0); -+ // Parent is QModelIndex() -+ insertCommand->doCommand(); -+ -+} -+ - QTEST_MAIN(tst_QSortFilterProxyModel) - #include "tst_qsortfilterproxymodel.moc" diff --git a/source/l/qt/qt.SlackBuild b/source/l/qt/qt.SlackBuild index f79d2c2a2..b361aaee4 100755 --- a/source/l/qt/qt.SlackBuild +++ b/source/l/qt/qt.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -35,23 +35,28 @@ # # Alternate method (we don't use this): # wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched +# +# Modifications 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL +# qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2 are built from original nokia sources. PKGNAM=qt -VERSION=$(ls qt-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev) -BUILD=${BUILD:-3} +VERSION=$(ls qt-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev) +BUILD=${BUILD:-4} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j7} - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -61,11 +66,22 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + # To prevent "qatomic_armv6.h error: output number 2 not directly addressable" + # More permanent solution is to patch gcc: + # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731 + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-${PKGNAM} @@ -73,23 +89,9 @@ PKG=$TMP/package-${PKGNAM} rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -#rm -rf qt-x11-opensource-src-$VERSION -#tar xvf $CWD/qt-x11-opensource-src-$VERSION.tar.gz # For qt releases -#cd qt-x11-opensource-src-$VERSION || exit 1 - -rm -rf qt-$VERSION -if [ -r $CWD/qt-$VERSION.tar.gz ]; then - tar xvf $CWD/qt-$VERSION.tar.gz || exit 1 -elif [ -r $CWD/qt-$VERSION.tar.bz2 ]; then - tar xvf $CWD/qt-$VERSION.tar.bz2 || exit 1 -elif [ -r $CWD/qt-$VERSION.tar.xz ]; then - tar xvf $CWD/qt-$VERSION.tar.xz || exit 1 -elif [ -r $CWD/qt-$VERSION.tar.lzma ]; then - tar xvf $CWD/qt-$VERSION.tar.lzma || exit 1 -else - exit 1 -fi -cd qt-$VERSION || exit 1 +rm -rf qt-everywhere-opensource-src-$VERSION +tar xvf $CWD/qt-everywhere-opensource-src-$VERSION.tar.xz # For qt releases +cd qt-everywhere-opensource-src-$VERSION || exit 1 chown -R root:root . find . \ @@ -98,28 +100,32 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# apply_patches looks for a ".svn" directory, which doesn't exist in the used snapshot. -# removing the check from apply_patches to not try to apply already applied patches -sed -i "s| test -d .svn &&||" apply_patches - -# This is only needed/wanted for qt-copy (the r###### version) that we're -# building right now. It might require manual intervention, so don't walk -# away during the build -./apply_patches - if [ $ARCH = "i486" ]; then - zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 || exit 1 + sed -i -e "s/QMAKE_CFLAGS_RELEASE += -O2/QMAKE_CFLAGS_RELEASE += $SLKCFLAGS/" mkspecs/common/gcc-base.conf || exit 1 fi # Fix path to mysql header zcat $CWD/qt.mysql.h.diff.gz | patch -p1 --verbose || exit 1 -# Upstream patch required for upcoming kdepim-4.6.x: -zcat $CWD/qt.QSortFilterProxyModel.reformatted.diff.gz | patch -p1 --verbose || exit 1 +# gcc doesn't support flag "-fuse-ld=gold": +zcat $CWD/qt.ld-gold.patch.gz | patch -p1 --verbose || exit 1 + +# Stupid idea - remove it: +zcat $CWD/qt.webkit-no_Werror.patch.gz | patch -p1 --verbose || exit 1 + +# Fix cursor position bug within tables: +zcat $CWD/qt.ca89c49.cursor.position.diff.gz | patch -p1 --verbose || exit 1 + +# Fix assistant crash: +zcat $CWD/qt.assistant.memcpy-crash.diff.gz | patch -p0 --verbose || exit 1 + +# Fix webkit compiling with recent glib: +zcat $CWD/qt.webkit.glib.diff.gz | patch -p1 --verbose || exit 1 -# Blacklist compromised certificates: -zcat $CWD/qt.blacklist.bad.certs.diff.gz | patch -p1 --verbose || exit 1 -zcat $CWD/qt.blacklist.bad.certs.patch02.diff.gz | patch -p1 --verbose || exit 1 +# Some patches from upstream: +zcat $CWD/QElfParser-fix-type-of-sh_size.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/QTBUG-14724_close_orphaned_file_descriptors_after_printing.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/QTBUG-21900_Buttons_in_Qt_applications_not_clickable_when_run_under_gnome-shell.patch.gz | patch -p1 --verbose || exit 1 export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -128,7 +134,6 @@ export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" -confirm-license \ -opensource \ -prefix /usr/lib${LIBDIRSUFFIX}/qt \ - -qt-gif \ -fast \ -system-libpng \ -system-libjpeg \ @@ -152,10 +157,34 @@ make install INSTALL_ROOT=$PKG || exit 1 # The infamous qt -> qt-${VERSION} link that keeps the full path out of .la files: ( cd $PKG/usr/lib${LIBDIRSUFFIX} ; ln -sf qt qt-${VERSION} ) -# libjscore is used internally. Prevent a false dependency on this in the .la files: +# Add a missing Qt.pc which is needed by KDE applications: +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig +cat <<EOF > $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/Qt.pc +prefix=/usr/lib${LIBDIRSUFFIX}/qt +bindir=\${prefix}/bin +datadir=\${prefix} +docdir=\${prefix}/doc +headerdir=\${prefix}/include +importdir=\${prefix}/imports +libdir=\${prefix}/lib +moc=\${bindir}/moc +plugindir=\${prefix}/plugins +qmake=\${bindir}/qmake +sysconfdir=\${prefix}/etc/settings +translationdir=\${prefix}/translations + +Name: Qt +Description: Qt Configuration +Version: $VERSION +EOF + +# libjscore is used internally. Prevent a false dependency on this in the .la and .pc files: sed -i "s,-ljscore,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc sed -i "s,-L../JavaScriptCore/release,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/*.pc +# libwebcore is used internally. Prevent a false dependency on this in the .la and .pc files: +sed -i "s#-L/usr/lib${LIBDIRSUFFIX}/qt/lib -L../../WebCore/release -L../../JavaScriptCore/release -L/usr/X11R6/lib$LIBDIRSUFFIX -lwebcore##g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/libQtWebKit.la $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/pkgconfig/QtWebKit.pc + # Link the shared libraries into /usr/lib: ( cd $PKG/usr/lib${LIBDIRSUFFIX} for file in qt/lib/*.so* ; do @@ -163,11 +192,6 @@ sed -i "s,-L../JavaScriptCore/release,,g" $PKG/usr/lib${LIBDIRSUFFIX}/qt/lib/*.l done ) -if [ $ARCH = "i486" ]; then - # Put this back as shipped: - zcat $CWD/qt.x86.cflags.diff.gz | patch -p1 -R -fi - find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -195,6 +219,71 @@ mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig done ) +# Add menu entries for all those hidden but great Qt applications: +# Qt logo: +convert $PKG/usr/lib$LIBDIRSUFFIX/qt/doc/src/images/qt-logo.png -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt-logo.png +convert $PKG/usr/lib$LIBDIRSUFFIX/qt/doc/src/images/qt-logo.png -resize 48x48 $PKG/usr/share/icons/hicolor/48x48/apps/qt-logo.png +# Assistant icons +install -p -m644 -D tools/assistant/tools/assistant/images/assistant.png $PKG/usr/share/icons/hicolor/32x32/apps/assistant.png +install -p -m644 -D tools/assistant/tools/assistant/images/assistant-128.png $PKG/usr/share/icons/hicolor/128x128/apps/assistant.png +# Designer icon +install -p -m644 -D tools/designer/src/designer/images/designer.png $PKG/usr/share/icons/hicolor/128x128/apps/designer.png +# Linguist icons +for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do + size=$(echo $(basename ${icon}) | cut -d- -f2) + install -p -m644 -D ${icon} $PKG/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png +done + +# And the .desktop files +mkdir -p $PKG/usr/share/applications +cat <<EOF > $PKG/usr/share/applications/designer.desktop +[Desktop Entry] +Name=Qt4 Designer +GenericName=Interface Designer +Comment=Design GUIs for Qt4 applications +Exec=designer +Icon=designer +MimeType=application/x-designer; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; +EOF +cat <<EOF > $PKG/usr/share/applications/assistant.desktop +[Desktop Entry] +Name=Qt4 Assistant +Comment=Shows Qt4 documentation and examples +Exec=assistant +Icon=assistant +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development;Documentation; +EOF +cat <<EOF > $PKG/usr/share/applications/linguist.desktop +[Desktop Entry] +Name=Qt4 Linguist +Comment=Add translations to Qt4 applications +Exec=linguist +Icon=linguist +MimeType=text/vnd.trolltech.linguist;application/x-linguist; +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Development; +EOF +cat <<EOF > $PKG/usr/share/applications/qtconfig.desktop +[Desktop Entry] +Name=Qt4 Config +Comment=Configure Qt4 behavior, styles, fonts +Exec=qtconfig +Icon=qt-logo +Terminal=false +Encoding=UTF-8 +Type=Application +Categories=Qt;Settings; +EOF + # Add a documentation directory: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a *GPL_EXCEPTION* FAQ* INSTALL KNOWN* LICENSE* README* changes-* \ diff --git a/source/l/qt/qt.assistant.memcpy-crash.diff b/source/l/qt/qt.assistant.memcpy-crash.diff new file mode 100644 index 000000000..f2193ee8b --- /dev/null +++ b/source/l/qt/qt.assistant.memcpy-crash.diff @@ -0,0 +1,11 @@ +--- tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:02:37.539564947 +0200 ++++ tools/assistant/tools/assistant/mainwindow.cpp 2012-06-27 03:03:18.843561620 +0200 +@@ -944,8 +944,7 @@ void MainWindow::updateApplicationFont() + if (helpEngine.usesAppFont()) + font = helpEngine.appFont(); + +- const QWidgetList &widgets = qApp->allWidgets(); +- foreach (QWidget* widget, widgets) ++ foreach (QWidget* widget, QApplication::allWidgets()) + widget->setFont(font); + } diff --git a/source/l/qt/qt.blacklist.bad.certs.diff b/source/l/qt/qt.blacklist.bad.certs.diff deleted file mode 100644 index 38b6d369f..000000000 --- a/source/l/qt/qt.blacklist.bad.certs.diff +++ /dev/null @@ -1,67 +0,0 @@ ---- ./src/network/ssl/qsslcertificate_p.h.orig 2010-11-20 17:54:24.000000000 -0600 -+++ ./src/network/ssl/qsslcertificate_p.h 2011-03-24 18:08:59.000000000 -0500 -@@ -96,6 +96,7 @@ - static QSslCertificate QSslCertificate_from_X509(X509 *x509); - static QList<QSslCertificate> certificatesFromPem(const QByteArray &pem, int count = -1); - static QList<QSslCertificate> certificatesFromDer(const QByteArray &der, int count = -1); -+ static bool isBlacklisted(const QSslCertificate &certificate); - - friend class QSslSocketBackendPrivate; - ---- ./src/network/ssl/qsslcertificate.cpp.orig 2010-11-20 17:54:24.000000000 -0600 -+++ ./src/network/ssl/qsslcertificate.cpp 2011-03-24 18:08:59.000000000 -0500 -@@ -219,17 +219,19 @@ - Returns true if this certificate is valid; otherwise returns - false. - -- Note: Currently, this function only checks that the current -+ Note: Currently, this function checks that the current - data-time is within the date-time range during which the -- certificate is considered valid. No other checks are -- currently performed. -+ certificate is considered valid, and checks that the -+ certificate is not in a blacklist of fraudulent certificates. - - \sa isNull() - */ - bool QSslCertificate::isValid() const - { - const QDateTime currentTime = QDateTime::currentDateTime(); -- return currentTime >= d->notValidBefore && currentTime <= d->notValidAfter; -+ return currentTime >= d->notValidBefore && -+ currentTime <= d->notValidAfter && -+ ! QSslCertificatePrivate::isBlacklisted(*this); - } - - /*! -@@ -798,6 +800,30 @@ - return certificates; - } - -+// These certificates are known to be fraudulent and were created during the comodo -+// compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html -+static const char *certificate_blacklist[] = { -+ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", -+ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", -+ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", -+ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", -+ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", -+ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", -+ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", -+ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", -+ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", -+ 0 -+}; -+ -+bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate) -+{ -+ for (int a = 0; certificate_blacklist[a] != 0; a++) { -+ if (certificate.serialNumber() == certificate_blacklist[a]) -+ return true; -+ } -+ return false; -+} -+ - #ifndef QT_NO_DEBUG_STREAM - QDebug operator<<(QDebug debug, const QSslCertificate &certificate) - { diff --git a/source/l/qt/qt.blacklist.bad.certs.patch02.diff b/source/l/qt/qt.blacklist.bad.certs.patch02.diff deleted file mode 100644 index b8bb1e4e7..000000000 --- a/source/l/qt/qt.blacklist.bad.certs.patch02.diff +++ /dev/null @@ -1,35 +0,0 @@ -From b87528a71b66e786c11804d7b79e408aae612748 Mon Sep 17 00:00:00 2001 -From: Peter Hartmann <peter.hartmann@nokia.com> -Date: Fri, 25 Mar 2011 13:45:24 +0100 -Subject: [PATCH] QSslSocket internals: abort on encountering blacklisted certificates - -tested manually with "openssl s_server -cert blacklisted.pem -key -key.pem" and connecting a QSslSocket. - -Reviewed-by: Markus Goetz -Task-number: QTBUG-18338 ---- - src/network/ssl/qsslsocket_openssl.cpp | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp -index 0866534..2427193 100644 ---- a/src/network/ssl/qsslsocket_openssl.cpp -+++ b/src/network/ssl/qsslsocket_openssl.cpp -@@ -1193,6 +1193,13 @@ bool QSslSocketBackendPrivate::startHandshake() - X509 *x509 = q_SSL_get_peer_certificate(ssl); - configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509); - q_X509_free(x509); -+ if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) { -+ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted")); -+ q->setSocketError(QAbstractSocket::SslHandshakeFailedError); -+ emit q->error(QAbstractSocket::SslHandshakeFailedError); -+ plainSocket->disconnectFromHost(); -+ return false; -+ } - - // Start translating errors. - QList<QSslError> errors; --- -1.6.1 - diff --git a/source/l/qt/qt.ca89c49.cursor.position.diff b/source/l/qt/qt.ca89c49.cursor.position.diff new file mode 100644 index 000000000..ab3429f8c --- /dev/null +++ b/source/l/qt/qt.ca89c49.cursor.position.diff @@ -0,0 +1,31 @@ +From ca89c49fa2c5cbb3945897046f33eed9f7da846c Mon Sep 17 00:00:00 2001 +From: Jiang Jiang <jiang.jiang@nokia.com> +Date: Tue, 3 Jul 2012 10:17:49 +0200 +Subject: [PATCH] Fix cursor truncate to include line position + +Since we could have moved the line position (QTextLine::setPosition), +the truncating position should be adjusted with that. + +Change-Id: Ie1acd4a1b6a4adfbeeb9ce8ee2dfa19d992470e8 +Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> +--- + src/gui/text/qtextlayout.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp +index 16f7150..52f2793 100644 +--- a/src/gui/text/qtextlayout.cpp ++++ b/src/gui/text/qtextlayout.cpp +@@ -2616,8 +2616,8 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const + x += eng->offsetInLigature(si, pos, end, glyph_pos); + } + +- if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.width) +- x = line.width; ++ if (eng->option.wrapMode() != QTextOption::NoWrap && x > line.x + line.width) ++ x = line.x + line.width; + + *cursorPos = pos + si->position; + return x.toReal(); +-- +1.7.10 diff --git a/source/l/qt/qt.ld-gold.patch b/source/l/qt/qt.ld-gold.patch new file mode 100644 index 000000000..0e3897e98 --- /dev/null +++ b/source/l/qt/qt.ld-gold.patch @@ -0,0 +1,22 @@ +diff -up qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri +--- qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri.me 2012-01-24 13:05:50.460890750 +0100 ++++ qt-everywhere-opensource-src-4.8.0/src/3rdparty/webkit/Source/common.pri 2012-01-24 13:19:08.836799974 +0100 +@@ -3,12 +3,12 @@ + contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1 + contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0 + +-linux-g++ { +-isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { +- message(Using gold linker) +- QMAKE_LFLAGS+=-fuse-ld=gold +-} +-} ++#linux-g++ { ++#isEmpty($$(SBOX_DPKG_INST_ARCH)):exists(/usr/bin/ld.gold) { ++# message(Using gold linker) ++# QMAKE_LFLAGS+=-fuse-ld=gold ++#} ++#} + + # We use this flag on production branches + # See https://bugs.webkit.org/show_bug.cgi?id=60824 diff --git a/source/l/qt/qt.webkit-no_Werror.patch b/source/l/qt/qt.webkit-no_Werror.patch new file mode 100644 index 000000000..b8e718e06 --- /dev/null +++ b/source/l/qt/qt.webkit-no_Werror.patch @@ -0,0 +1,13 @@ +diff -up qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri +--- qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri.no_Werror 2012-03-14 15:01:29.000000000 +0100 ++++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/webkit/Source/WebKit.pri 2012-03-28 17:12:33.391294004 +0200 +@@ -102,8 +102,6 @@ CONFIG -= warn_on + + # Treat warnings as errors on x86/Linux/GCC + linux-g++* { +- !CONFIG(standalone_package):isEqual(QT_ARCH,x86_64)|isEqual(QT_ARCH,i386): QMAKE_CXXFLAGS += -Werror +- + greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { + if (!contains(QMAKE_CXXFLAGS, -std=c++0x) && !contains(QMAKE_CXXFLAGS, -std=gnu++0x)) { + # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr). + diff --git a/source/l/qt/qt.webkit.glib.diff b/source/l/qt/qt.webkit.glib.diff new file mode 100644 index 000000000..b16662562 --- /dev/null +++ b/source/l/qt/qt.webkit.glib.diff @@ -0,0 +1,11 @@ +--- ./src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h.orig 2012-04-26 14:46:14.000000000 -0500 ++++ ./src/3rdparty/webkit/Source/JavaScriptCore/wtf/gobject/GTypedefs.h 2012-08-06 19:53:44.134339082 -0500 +@@ -52,7 +52,7 @@ + typedef struct _GHashTable GHashTable; + typedef struct _GInputStream GInputStream; + typedef struct _GList GList; +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GPatternSpec GPatternSpec; + typedef struct _GPollableOutputStream GPollableOutputStream; + typedef struct _GSocketClient GSocketClient; diff --git a/source/l/qt/qt.x86.cflags.diff b/source/l/qt/qt.x86.cflags.diff deleted file mode 100644 index a9e65fbb8..000000000 --- a/source/l/qt/qt.x86.cflags.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- qt.orig/mkspecs/common/g++.conf 2007-12-22 00:22:18.295453075 -0600 -+++ qt/mkspecs/common/g++.conf 2007-12-22 00:23:07.514257895 -0600 -@@ -7,7 +7,7 @@ - QMAKE_CFLAGS_DEPS += -M - QMAKE_CFLAGS_WARN_ON += -Wall -W - QMAKE_CFLAGS_WARN_OFF += -w --QMAKE_CFLAGS_RELEASE += -O2 -+QMAKE_CFLAGS_RELEASE += -O2 -march=i486 -mtune=i686 - QMAKE_CFLAGS_DEBUG += -g - QMAKE_CFLAGS_SHLIB += -fPIC - QMAKE_CFLAGS_STATIC_LIB += -fPIC diff --git a/source/l/qt/slack-desc b/source/l/qt/slack-desc index 3f77a7fb4..f511d8991 100644 --- a/source/l/qt/slack-desc +++ b/source/l/qt/slack-desc @@ -11,9 +11,9 @@ qt: qt: Qt is a complete and well-developed object-oriented framework for qt: developing graphical user interface (GUI) applications using C++. qt: +qt: Homepage: http://qt.nokia.com qt: qt: qt: qt: -qt: Homepage: http://qt.nokia.com qt: diff --git a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild b/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild index 9664ddb22..f1bf2a15b 100755 --- a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild +++ b/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for qtscriptgenerator # Copyright 2009 Heinz Wiesinger <pprkut@liwjatan.at> -# Copyright 2009 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=qtscriptgenerator -VERSION=${VERSION:-0.1.0} -BUILD=${BUILD:-2} +PKGNAM=qtscriptgenerator +VERSION=${VERSION:-0.2.0} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -39,7 +39,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-$PRGNAM +PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -72,11 +72,9 @@ fi rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf $PRGNAM-src-$VERSION -tar xvf $CWD/$PRGNAM-src-$VERSION.tar.?z* || exit 1 -cd $PRGNAM-src-$VERSION || exit 1 - -zcat $CWD/qtscriptgenerator.gcc44.diff.gz | patch -p1 --verbose || exit 1 +rm -rf $PKGNAM-src-$VERSION +tar xvf $CWD/$PKGNAM-src-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-src-$VERSION || exit 1 chown -R root:root . find . \ @@ -117,15 +115,15 @@ cp -a plugins/script/libqtscript* $PKG/usr/lib${LIBDIRSUFFIX}/qt/plugins/script/ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a tools/qsexec/README.TXT README.qsexec cp -a \ LICENSE.GPL README* \ - $PKG/usr/doc/$PRGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff b/source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff deleted file mode 100644 index 165c97df0..000000000 --- a/source/l/qtscriptgenerator/qtscriptgenerator.gcc44.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./generator/parser/rpp/pp-internal.h.orig 2009-02-20 05:42:24.000000000 -0600 -+++ ./generator/parser/rpp/pp-internal.h 2010-02-18 19:12:22.000000000 -0600 -@@ -16,6 +16,7 @@ - #define PP_INTERNAL_H - - #include <algorithm> -+#include <cstdio> - - namespace rpp { - diff --git a/source/l/qtscriptgenerator/slack-desc b/source/l/qtscriptgenerator/slack-desc index f24e9f679..16f2ba052 100644 --- a/source/l/qtscriptgenerator/slack-desc +++ b/source/l/qtscriptgenerator/slack-desc @@ -5,15 +5,15 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-------------------------------------------| + |-----handy-ruler------------------------------------------------------| qtscriptgenerator: qtscriptgenerator (Qt API Bindings for QtScript) qtscriptgenerator: -qtscriptgenerator: Qt Script Generator is a tool that generates Qt bindings -qtscriptgenerator: for Qt Script. With the generated bindings you get access -qtscriptgenerator: to substantial portions of the Qt API from within Qt -qtscriptgenerator: Script. +qtscriptgenerator: Qt Script Generator is a tool that generates Qt bindings for Qt +qtscriptgenerator: Script. With the generated bindings you get access to substantial +qtscriptgenerator: portions of the Qt API from within Qt Script. +qtscriptgenerator: +qtscriptgenerator: Homepage: http://code.google.com/p/qtscriptgenerator/ qtscriptgenerator: qtscriptgenerator: qtscriptgenerator: -qtscriptgenerator: Homepage: http://code.google.com/p/qtscriptgenerator/ qtscriptgenerator: diff --git a/source/l/raptor/raptor.info b/source/l/raptor/raptor.info deleted file mode 100644 index 0f2bae33d..000000000 --- a/source/l/raptor/raptor.info +++ /dev/null @@ -1,2 +0,0 @@ -HOMEPAGE="http://librdf.org/" -DOWNLOAD="http://download.librdf.org/source/raptor-1.4.18.tar.gz" diff --git a/source/l/raptor/slack-desc b/source/l/raptor/slack-desc deleted file mode 100644 index e15154b74..000000000 --- a/source/l/raptor/slack-desc +++ /dev/null @@ -1,12 +0,0 @@ - |-----handy-ruler------------------------------------------------------| -raptor: raptor (RDF Parser & Serializer) -raptor: -raptor: Raptor is a free software/Open Source C library that provides a set of -raptor: parsers and serializers that generate Resource Description Framework -raptor: (RDF) triples by parsing syntaxes or serialize the triples into a -raptor: syntax. The supported parsing syntaxes are RDF/XML, N-Triples, TRiG, -raptor: Turtle, RSS tag soup including all versions of RSS, Atom 1.0 and 0.3, -raptor: GRDDL and microformats for HTML, XHTML and XML. -raptor: -raptor: Homepage: http://librdf.org/ -raptor: diff --git a/source/l/raptor2/raptor2.SlackBuild b/source/l/raptor2/raptor2.SlackBuild index 4b024ce4d..38c596bae 100755 --- a/source/l/raptor2/raptor2.SlackBuild +++ b/source/l/raptor2/raptor2.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2007 Heinz Wiesinger <hmwiesinger@gmx.at> -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2012 Heinz Wiesinger, Amsterdam, NL +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,6 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Robby Workman <rworkman@slackware.com> +# Modified by Eric Hameleers <alien@slackware.com> # No added terms or copyright claims @@ -29,22 +30,20 @@ PKGNAM=raptor2 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:--j7} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -54,11 +53,23 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -81,7 +92,8 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --disable-static \ - --build=$ARCH-slackware-linux + --with-icu-config=/usr/bin/icu-config \ + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/raptor2/slack-desc b/source/l/raptor2/slack-desc index d5f1d4635..309b74a13 100644 --- a/source/l/raptor2/slack-desc +++ b/source/l/raptor2/slack-desc @@ -1,3 +1,10 @@ +# 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------------------------------------------------------| raptor2: raptor2 (RDF Parser & Serializer) raptor2: diff --git a/source/l/rasqal/rasqal.SlackBuild b/source/l/rasqal/rasqal.SlackBuild index 435991a03..0da299dd2 100755 --- a/source/l/rasqal/rasqal.SlackBuild +++ b/source/l/rasqal/rasqal.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007 Heinz Wiesinger <hmwiesinger@gmx.at> -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -29,22 +29,20 @@ PKGNAM=rasqal VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:--j7} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -54,11 +52,23 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -81,7 +91,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --disable-static \ - --build=$ARCH-slackware-linux + --build=$TARGET make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/rasqal/slack-desc b/source/l/rasqal/slack-desc index 46e8b19c1..00e549d0c 100644 --- a/source/l/rasqal/slack-desc +++ b/source/l/rasqal/slack-desc @@ -1,3 +1,10 @@ +# 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------------------------------------------------------| rasqal: rasqal (RDF parsing library) rasqal: @@ -7,6 +14,6 @@ rasqal: constructing the queries, executing them and returning result formats. rasqal: It currently handles the RDF Data Query Language (RDQL) and SPARQL rasqal: Query language. rasqal: -rasqal: rasqal: Homepage: http://librdf.org/ rasqal: +rasqal: diff --git a/source/l/redland/redland.SlackBuild b/source/l/redland/redland.SlackBuild index 1849481e3..16d90675c 100755 --- a/source/l/redland/redland.SlackBuild +++ b/source/l/redland/redland.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007 Heinz Wiesinger <hmwiesinger@gmx.at> -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -28,24 +28,22 @@ PKGNAM=redland VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-4} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -55,11 +53,23 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -95,8 +105,9 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --with-included-ltdl=no \ --with-bdb-lib=/usr/lib${LIBDIRSUFFIX} \ + --with-bdb-dbname=db-4.4 \ --with-threads \ - --build=$ARCH-slackware-linux + --build=$TARGET # Prevent error "No rule to make target `-lltdl', needed by `librdf.la'" sed -i -e 's# -lltdl$# #' -e '/^LIBS =/s# = # = -lltdl #' src/Makefile diff --git a/source/l/redland/slack-desc b/source/l/redland/slack-desc index db035907a..f16c1d450 100644 --- a/source/l/redland/slack-desc +++ b/source/l/redland/slack-desc @@ -1,3 +1,10 @@ +# 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----------------------------------------------------| redland: redland (RDF high-level interface library) redland: diff --git a/source/l/sg3_utils/sg3_utils.SlackBuild b/source/l/sg3_utils/sg3_utils.SlackBuild new file mode 100755 index 000000000..935f6f8c9 --- /dev/null +++ b/source/l/sg3_utils/sg3_utils.SlackBuild @@ -0,0 +1,113 @@ +#!/bin/sh + +# Slackware build script for sg3_utils + +# Copyright 2010 Robby Workman Northport, AL, USA +# Copyright 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=sg3_utils +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$TARGET + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS BSD_LICENSE COPYING COVERAGE CREDITS ChangeLog NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/source/l/sg3_utils/sg3_utils.info b/source/l/sg3_utils/sg3_utils.info new file mode 100644 index 000000000..f429377ea --- /dev/null +++ b/source/l/sg3_utils/sg3_utils.info @@ -0,0 +1 @@ +http://sg.danny.cz/sg/p/ diff --git a/source/l/sg3_utils/slack-desc b/source/l/sg3_utils/slack-desc new file mode 100644 index 000000000..b086caf68 --- /dev/null +++ b/source/l/sg3_utils/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +sg3_utils: sg3_utils (utilities and test programs for the linux sg driver) +sg3_utils: +sg3_utils: This package contains low level utilities for devices that use a SCSI +sg3_utils: command set. Apart from SCSI parallel interface (SPI) devices, the +sg3_utils: SCSI command set is used by ATAPI devices (CD/DVDs and tapes), USB +sg3_utils: mass storage devices, Fibre Channel disks, IEEE 1394 storage devices +sg3_utils: (that use the "SBP" protocol), SAS, iSCSI and FCoE devices (among +sg3_utils: others). +sg3_utils: +sg3_utils: Homepage: http://sg.danny.cz/sg/sg3_utils.html +sg3_utils: diff --git a/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild b/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild index eb0f00ad4..76ae4733c 100755 --- a/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild +++ b/source/l/shared-desktop-ontologies/shared-desktop-ontologies.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,24 +21,24 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-0.5} +PKGNAM=shared-desktop-ontologies +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-shared-desktop-ontologies - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -48,17 +48,24 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf shared-desktop-ontologies-$VERSION -tar xvf $CWD/shared-desktop-ontologies-$VERSION.tar.?z* || exit 1 -cd shared-desktop-ontologies-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -86,10 +93,10 @@ cd - find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/shared-desktop-ontologies-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS LICENSE* README \ - $PKG/usr/doc/shared-desktop-ontologies-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: @@ -103,5 +110,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/shared-desktop-ontologies-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/shared-desktop-ontologies/slack-desc b/source/l/shared-desktop-ontologies/slack-desc index 8057846b4..18412ab50 100644 --- a/source/l/shared-desktop-ontologies/slack-desc +++ b/source/l/shared-desktop-ontologies/slack-desc @@ -13,7 +13,7 @@ shared-desktop-ontologies: the desktop in terms of vocabulary. It contains the w shared-desktop-ontologies: ontologies such as RDF and RDFS as well as the Nepomuk ontologies shared-desktop-ontologies: which are used by projects like KDE or Strigi. shared-desktop-ontologies: +shared-desktop-ontologies: Homepage: http://oscaf.sourceforge.net shared-desktop-ontologies: shared-desktop-ontologies: -shared-desktop-ontologies: Homepage: http://oscaf.sourceforge.net shared-desktop-ontologies: diff --git a/source/l/shared-mime-info/doinst.sh b/source/l/shared-mime-info/doinst.sh index 387262254..6c596b732 100644 --- a/source/l/shared-mime-info/doinst.sh +++ b/source/l/shared-mime-info/doinst.sh @@ -6,7 +6,7 @@ if [ -x /usr/bin/update-mime-database ]; then if [ -d $homedir/.local/share/mime ]; then username=$(echo $passwdline | cut -f 1 -d :) # Sorry about the long command line, alienBOB ;-) - su $username -c "/usr/bin/update-mime-database $homemimedir 1>/dev/null 2>/dev/null" 2> /dev/null + su $username -c "/usr/bin/update-mime-database $homedir/.local/share/mime 1>/dev/null 2>/dev/null" 2> /dev/null fi done # This is just "cleanup" in case something might be missed in /home/*/ diff --git a/source/l/shared-mime-info/shared-mime-info.SlackBuild b/source/l/shared-mime-info/shared-mime-info.SlackBuild index 81d5f01ba..ed72d9baa 100755 --- a/source/l/shared-mime-info/shared-mime-info.SlackBuild +++ b/source/l/shared-mime-info/shared-mime-info.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=shared-mime-info VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -75,10 +75,10 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/${PKGNAM}-$VERSION \ --disable-update-mimedb \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG +make install DESTDIR=$PKG || exit 1 mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} mv $PKG/usr/share/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX} @@ -93,10 +93,20 @@ chmod 755 $PKG/var/log/setup/setup.07.update-mime-database find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ diff --git a/source/l/sip/sip.SlackBuild b/source/l/sip/sip.SlackBuild index 687d76f91..4412ea25b 100755 --- a/source/l/sip/sip.SlackBuild +++ b/source/l/sip/sip.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008 Aleksandar Samardzic <asamardzic@gmail.com> -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,22 +22,24 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Modified by Robby Workman <rworkman@slackware.com> +# Modified by Eric Hameleers <alien@slackware.com> -VERSION=${VERSION:-4.11.2} -BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j6} +PKGNAM=sip +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-2} -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-sip +NUMJOBS=${NUMJOBS:--j7} -# Automatically determine architecture for build & packaging: +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi @@ -47,6 +49,8 @@ elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" else SLKCFLAGS="-O2" fi @@ -54,12 +58,16 @@ fi PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' ) +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf sip-$VERSION -tar xvf $CWD/sip-$VERSION.tar.?z* || exit 1 -cd sip-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -80,15 +88,15 @@ make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/sip-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ LICENSE COPYING* NEWS README TODO doc/* \ - $PKG/usr/doc/sip-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION chown -R root:root $PKG/usr/doc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/sip-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz diff --git a/source/l/sip/slack-desc b/source/l/sip/slack-desc index 01147eeaf..d2fae243e 100644 --- a/source/l/sip/slack-desc +++ b/source/l/sip/slack-desc @@ -13,7 +13,7 @@ sip: C and C++ libraries. It was originally developed to create PyQt, sip: the Python bindings for the Qt toolkit, but can be used to create sip: bindings for any C or C++ library. sip: +sip: Homepage: http://www.riverbankcomputing.co.uk/software/sip/ sip: sip: -sip: Homepage: http://www.riverbankcomputing.co.uk/software/sip/ sip: diff --git a/source/l/soprano/slack-desc b/source/l/soprano/slack-desc index 1cb3f2f8c..44327e074 100644 --- a/source/l/soprano/slack-desc +++ b/source/l/soprano/slack-desc @@ -5,7 +5,7 @@ # make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':'. - |-----handy-ruler-----------------------------------------------------| + |-----handy-ruler-----------------------------------------------------| soprano: soprano (C++/Qt4 framework for RDF data) soprano: soprano: Soprano (formally known as QRDF) is a library which provides @@ -13,7 +13,7 @@ soprano: a nice Qt interface to RDF storage solutions. It has a modular soprano: structure which allows to replace the actual RDF storage soprano: implementation used. soprano: +soprano: Homepage: http://soprano.sourceforge.net/ soprano: soprano: -soprano: Homepage: http://soprano.sourceforge.net/ soprano: diff --git a/source/l/soprano/soprano.SlackBuild b/source/l/soprano/soprano.SlackBuild index 054fb20b2..5ddd9f996 100755 --- a/source/l/soprano/soprano.SlackBuild +++ b/source/l/soprano/soprano.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007-2008 Robby Workman, Northport, Alabama, USA -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -21,27 +21,27 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port. + PKGNAM=soprano VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-soprano - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -51,24 +51,21 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-soprano + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP - -# Detect JDK, needed for libsoprano_sesame2backend.so: -if ! ls /var/log/packages/jdk-* 1> /dev/null 2> /dev/null ; then - echo - echo "JDK package not found in /var/log/packages." - echo "This is needed to compile libsoprano_sesame2backend.so." - echo - exit 1 -fi - rm -rf soprano-$VERSION tar xvf $CWD/soprano-$VERSION.tar.bz2 || exit 1 cd soprano-$VERSION || exit 1 diff --git a/source/l/sound-theme-freedesktop/slack-desc b/source/l/sound-theme-freedesktop/slack-desc new file mode 100644 index 000000000..78db32b43 --- /dev/null +++ b/source/l/sound-theme-freedesktop/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +sound-theme-freedesktop: sound-theme-freedesktop (freedesktop.org sound theme) +sound-theme-freedesktop: +sound-theme-freedesktop: The freedesktop.org sound theme is a basic set of sounds for +sound-theme-freedesktop: applications to use. +sound-theme-freedesktop: +sound-theme-freedesktop: Homepage: http://freedesktop.org/wiki/Specifications/sound-theme-spec +sound-theme-freedesktop: +sound-theme-freedesktop: +sound-theme-freedesktop: +sound-theme-freedesktop: +sound-theme-freedesktop: diff --git a/source/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild b/source/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild new file mode 100755 index 000000000..e9ab1b542 --- /dev/null +++ b/source/l/sound-theme-freedesktop/sound-theme-freedesktop.SlackBuild @@ -0,0 +1,73 @@ +#!/bin/sh + +# Slackware build script for sound-theme-freedesktop + +# Copyright 2010, 2011, 2012 Robby Workman, Northport, Alabama, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PKGNAM=sound-theme-freedesktop +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -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 \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --build=$ARCH-slackware-linux || exit 1 + +make || exit 1 +make install DESTDIR=$PKG || exit 1 + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS COPYING* INSTALL NEWS README* \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# If there's a ChangeLog, installing at least part of the recent history +# is useful, but don't let it get totally out of control: +if [ -r ChangeLog ]; then + DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) + cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog + touch -r ChangeLog $DOCSDIR/ChangeLog +fi + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/sound-theme-freedesktop/sound-theme-freedesktop.url b/source/l/sound-theme-freedesktop/sound-theme-freedesktop.url new file mode 100644 index 000000000..5964491b0 --- /dev/null +++ b/source/l/sound-theme-freedesktop/sound-theme-freedesktop.url @@ -0,0 +1,2 @@ +http://freedesktop.org/wiki/Specifications/sound-theme-spec +http://people.freedesktop.org/~mccann/dist/ diff --git a/source/l/startup-notification/startup-notification.SlackBuild b/source/l/startup-notification/startup-notification.SlackBuild index c247069fa..6fce983e3 100755 --- a/source/l/startup-notification/startup-notification.SlackBuild +++ b/source/l/startup-notification/startup-notification.SlackBuild @@ -59,7 +59,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf startup-notification-$VERSION -tar xvf $CWD/startup-notification-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/startup-notification-$VERSION.tar.xz || exit 1 cd startup-notification-$VERSION chown -R root:root . find . \ diff --git a/source/l/strigi/README b/source/l/strigi/README new file mode 100644 index 000000000..218e8ce2f --- /dev/null +++ b/source/l/strigi/README @@ -0,0 +1,17 @@ +trueg's blog, +http://trueg.wordpress.com/2011/09/22/about-strigi-soprano-virtuoso-clucene-and-libstreamanalyzer/ + +recommends using a newer libstreamanalyzer (and friends) than what is currently formally released. + +I ran the script +https://projects.kde.org/projects/kdesupport/strigi/strigi/repository/revisions/master/changes/createtararchive.sh +to generate a tarball, and am hosting it at: + +http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2 +http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2.md5sum +http://rdieter.fedorapeople.org/strigi/strigi-0.7.6.tar.bz2.sha1sum + +for others' convenience. + +-- rex + diff --git a/source/l/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff b/source/l/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff new file mode 100644 index 000000000..d4721c393 --- /dev/null +++ b/source/l/strigi/strigi-fix-ftbfs-with-gcc-4.7.diff @@ -0,0 +1,16 @@ +Description: Fix FTBFS with gcc 4.7 due to missing <unistd.h> include. +Author: Cyril Brulebois <kibi@debian.org> +Bug-Debian: http://bugs.debian.org/667384 + +--- strigi-0.7.7.orig/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp ++++ strigi-0.7.7/strigidaemon/bin/daemon/eventlistener/eventlistenerqueue.cpp +@@ -27,9 +27,7 @@ + #include <iostream> + #include <stdio.h> + +-#if defined(__SUNPRO_CC) + #include <unistd.h> +-#endif + + using namespace std; + diff --git a/source/l/strigi/strigi.SlackBuild b/source/l/strigi/strigi.SlackBuild index c7cdaa795..8b7374fca 100755 --- a/source/l/strigi/strigi.SlackBuild +++ b/source/l/strigi/strigi.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2007-2008 Robby Workman, Northport, Alabama, USA -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -21,25 +21,27 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# Modified 2012 by Eric Hameleers <alien at slackware.com> for ARM port. -VERSION=${VERSION:-$(echo strigi-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} + +PKGNAM=strigi +VERSION=${VERSION:-0.7.7} BUILD=${BUILD:-2} +NUMJOBS=${NUMJOBS:--j7} + # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-strigi -NUMJOBS=${NUMJOBS:--j6} - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -49,17 +51,27 @@ elif [ "$ARCH" = "s390" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP -rm -rf strigi-$VERSION -tar xvf $CWD/strigi-$VERSION.tar.?z* || exit 1 -cd strigi-$VERSION || exit 1 +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +zcat $CWD/strigi-fix-ftbfs-with-gcc-4.7.diff.gz | patch -p1 --verbose || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -88,10 +100,10 @@ cd - find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null -mkdir -p $PKG/usr/doc/strigi-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ AUTHORS COPYING NEWS README TODO \ - $PKG/usr/doc/strigi-$VERSION + $PKG/usr/doc/$PKGNAM-$VERSION # If there's a ChangeLog, installing at least part of the recent history # is useful, but don't let it get totally out of control: @@ -105,5 +117,5 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $TMP/strigi-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/source/l/system-config-printer/doinst.sh b/source/l/system-config-printer/doinst.sh index 214038e76..884cda801 100644 --- a/source/l/system-config-printer/doinst.sh +++ b/source/l/system-config-printer/doinst.sh @@ -11,8 +11,8 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/dbus-1/system.d/newprinternotification.conf.new -config etc/dbus-1/system.d/printerdriversinstaller.conf.new +config etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf.new +config etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf.new # Update the desktop database: if [ -x usr/bin/update-desktop-database ]; then diff --git a/source/l/system-config-printer/system-config-printer.SlackBuild b/source/l/system-config-printer/system-config-printer.SlackBuild index 8ba12a89c..fafaba720 100755 --- a/source/l/system-config-printer/system-config-printer.SlackBuild +++ b/source/l/system-config-printer/system-config-printer.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL +# Copyright 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -23,27 +23,25 @@ # SUCH DAMAGE. # ----------------------------------------------------------------------------- -# Set initial variables: PKGNAM=system-config-printer -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:" -j4 "} + +NUMJOBS=${NUMJOBS:" -j7 "} # Automatically determine the architecture we're building on: +MARCH=$( uname -m ) if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) export ARCH=$MARCH ;; esac fi -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -53,11 +51,23 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" fi +case "$ARCH" in + arm*) TARGET=$ARCH-slackware-linux-gnueabi ;; + *) TARGET=$ARCH-slackware-linux ;; +esac + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + rm -rf $PKG mkdir -p $TMP $PKG cd $TMP @@ -87,19 +97,23 @@ CFLAGS="$SLKCFLAGS" \ --with-udev-rules \ --program-prefix= \ --program-suffix= \ - --build=$ARCH-slackware-linux + --build=$TARGET # Build and install: -make $NUMJOBS udevrulesdir=/lib/udev/rules.d udevhelperdir=/lib/udev || make || exit 1 -make install DESTDIR=$PKG udevrulesdir=/lib/udev/rules.d udevhelperdir=/lib/udev || exit 1 +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG + +# Move the udev files to the usual Slackware location: +mkdir -p $PKG/lib +mv $PKG/etc/udev $PKG/lib/ # Slackware does not use PAM. Instead, your user must be in group 'lp'. sed -i -e 's/at_console="true"/group="lp"/g' \ $PKG/etc/dbus-1/system.d/newprinternotification.conf # Don't clobber the configuration file: -mv $PKG/etc/dbus-1/system.d/newprinternotification.conf{,.new} -mv $PKG/etc/dbus-1/system.d/printerdriversinstaller.conf{,.new} +mv $PKG/etc/dbus-1/system.d/com.redhat.NewPrinterNotification.conf{,.new} +mv $PKG/etc/dbus-1/system.d/com.redhat.PrinterDriversInstaller.conf{,.new} # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION diff --git a/source/l/t1lib/t1lib.SlackBuild b/source/l/t1lib/t1lib.SlackBuild index 86002a21f..dc6c69b01 100755 --- a/source/l/t1lib/t1lib.SlackBuild +++ b/source/l/t1lib/t1lib.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008, 2009, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=t1lib VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -60,7 +60,7 @@ tar xvf $CWD/t1lib-$VERSION.tar.?z* || exit 1 cd t1lib-$VERSION # Apply Debian's patch since upstream seems inactive: -zcat $CWD/t1lib_5.1.2-3.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/t1lib_5.1.2-3.5.diff.gz | patch -p1 --verbose || exit 1 # I don't think anyone is applying this first one: #cat debian/patches/segfault.diff -b -z .segf | patch -p1 --verbose || exit 1 @@ -68,6 +68,10 @@ zcat $CWD/t1lib_5.1.2-3.diff.gz | patch -p1 --verbose || exit 1 cat debian/patches/no-config.diff | patch -p1 --verbose || exit 1 cat debian/patches/no-docs.diff | patch -p1 --verbose || exit 1 cat debian/patches/lib-cleanup.diff | patch -p1 --verbose || exit 1 +cat debian/patches/format-security.diff | patch -p1 --verbose || exit 1 +cat debian/patches/CVE-2011-0764.diff | patch -p1 --verbose || exit 1 +cat debian/patches/CVE-2011-1552_1553_1554.patch | patch -p1 --verbose || exit 1 +cat debian/patches/CVE-2010-2642.patch | patch -p1 --verbose || exit 1 chown -R root:root . find . \ diff --git a/source/l/t1lib/t1lib_5.1.2-3.diff b/source/l/t1lib/t1lib_5.1.2-3.5.diff index 8ae0b3adf..bd1374664 100644 --- a/source/l/t1lib/t1lib_5.1.2-3.diff +++ b/source/l/t1lib/t1lib_5.1.2-3.5.diff @@ -1,3 +1,494 @@ +--- t1lib-5.1.2.orig/debian/libt1-doc.docs ++++ t1lib-5.1.2/debian/libt1-doc.docs +@@ -0,0 +1 @@ ++doc/*.pdf +--- t1lib-5.1.2.orig/debian/orig-tar.sh ++++ t1lib-5.1.2/debian/orig-tar.sh +@@ -0,0 +1,11 @@ ++#!/bin/sh -e ++ ++# called by uscan with '--upstream-version' <version> <file> ++ ++# move to directory 'tarballs' ++if [ -r .svn/deb-layout ]; then ++ . .svn/deb-layout ++ mv $3 $origDir ++ echo "moved $3 to $origDir" ++fi ++ +--- t1lib-5.1.2.orig/debian/libt1-5.install ++++ t1lib-5.1.2/debian/libt1-5.install +@@ -0,0 +1 @@ ++debian/tmp/usr/lib/libt1*.so.* +--- t1lib-5.1.2.orig/debian/changelog ++++ t1lib-5.1.2/debian/changelog +@@ -0,0 +1,456 @@ ++t1lib (5.1.2-3.5) unstable; urgency=high ++ ++ * Non-maintainer upload by the Security Team. ++ * Thanks Jamie Strandboge from Ubuntu for the patch. ++ * debian/patches: ++ - series: make sure CVE-2010-2642.patch is really applied so CVE-2010-2642 ++ (denial of service via oversized fonts) is really fixed. ++ - CVE-2011-1552_1553_1554 added, few more fixes for CVE-2011-1552, ++ CVE-2011-1553 and CVE-2011-1554 (heap-based buffer overflow via AFM font ++ parser) ++ ++ -- Yves-Alexis Perez <corsac@debian.org> Wed, 18 Jan 2012 10:43:23 +0100 ++ ++t1lib (5.1.2-3.4) unstable; urgency=high ++ ++ * Non-maintainer upload by the Security Team. ++ * debian/patches: ++ - CVE-2010-2642 added, fix heap-based buffer overflow first found in ++ evince but applicable to the embedded afmparse library found in t1lib ++ too. Fixes CVE-2011-0433 too on the same patch. ++ ++ -- Yves-Alexis Perez <corsac@debian.org> Sun, 15 Jan 2012 13:47:26 +0100 ++ ++t1lib (5.1.2-3.3) unstable; urgency=low ++ ++ * Non-maintainer upload. ++ * Fix arbitrary code execution CVE-2011-0764 by only using ppoints when ++ it is a valid pointer (Closes: #652996). ++ * Don't ship .la file anymore (Closes: #633247). ++ ++ -- Luk Claes <luk@debian.org> Thu, 29 Dec 2011 23:21:33 +0100 ++ ++t1lib (5.1.2-3.2) unstable; urgency=low ++ ++ * Non-maintainer upload. (version 5.1.2-3.2 triggered a problem with dak) ++ * format-security.diff: use relevant "%s" format when passing a ++ variable string to a printf() function and replace printf() ++ with puts() for the model-only IfTrace0 macro. Thanks to Colin Watson ++ and Loïc Minier! (Closes: #646470) ++ ++ -- Mònica Ramírez Arceda <monica@probeta.net> Sat, 03 Dec 2011 21:28:31 +0100 ++ ++t1lib (5.1.2-3) unstable; urgency=low ++ ++ * New Maintainer (Closes: #430611) ++ * Solved some hyphen-used-as-minus-sign in FontDatabase.5 ++ * Reformated debian/copyrigth ++ * Added symbols control file ++ ++ -- Ruben Molina <rmolina@udea.edu.co> Wed, 23 Jul 2008 20:24:22 -0500 ++ ++t1lib (5.1.2-2) unstable; urgency=low ++ ++ * Add a package with debugging information. ++ ++ -- Torsten Werner <twerner@debian.org> Sat, 08 Mar 2008 10:21:43 +0100 ++ ++t1lib (5.1.2-1) unstable; urgency=low ++ ++ * new upstream release ++ * Correct debian/watch. ++ * Remove patch cve-2007-4033.diff because it has been integrated upstream. ++ * Remove parts of patch segfault.diff that have been integrated upstream. ++ * Do not apply the remaining segfault.diff because it does not look safe but ++ keep the patch as a reminder that something was broken in the past. ++ ++ -- Torsten Werner <twerner@debian.org> Sat, 08 Mar 2008 10:07:54 +0100 ++ ++t1lib (5.1.1-5) unstable; urgency=low ++ ++ * Replace Build-Depends-Indep by Build-Depends again. ++ ++ -- Torsten Werner <twerner@debian.org> Tue, 08 Jan 2008 21:34:25 +0100 ++ ++t1lib (5.1.1-4) unstable; urgency=low ++ ++ * Add Build-Depends-Indep: libxt-dev. (Closes: #459754) ++ ++ -- Torsten Werner <twerner@debian.org> Tue, 08 Jan 2008 20:29:01 +0100 ++ ++t1lib (5.1.1-3) unstable; urgency=low ++ ++ * Replace static changes of upstream files by quilt patches as requested by ++ Fedora developers. ++ * Remove postinst that removed the old /usr/doc symlink. ++ * Remove preinst that removed the old /usr/share/doc/t1lib-bin symlink. ++ * Rename menu.t1lib-bin to t1lib-bin.menu to make sure the menu file gets ++ installed. ++ * Update menu file to conform to current menu policy. ++ * Install documentation with dh_installdocs instead of dh_install and some ++ other minor cleanups. ++ * Switch to cdbs. ++ * Fix versioned Build-Depends: debhelper (>= 5). ++ * Move some Build-Depends to Build-Depends-Indep. ++ * Apply two patches provided by Patrice Dumas: ++ - Update t1libconfig's font search. ++ - Fixes a segfault. ++ * Integrate another patch that fixes a segfault. (Closes: #313236) ++ ++ -- Torsten Werner <twerner@debian.org> Sun, 06 Jan 2008 20:50:19 +0100 ++ ++t1lib (5.1.1-2) unstable; urgency=low ++ ++ * Add Depends: libxaw7-dev to -dev package. ++ * Switch to DH_COMPAT = 5. ++ * Update Vcs headers in debian/control. ++ * Change Standards-Version: 3.7.3. ++ * Do not link with unneeded libraries. ++ * Add LDFLAGS=-Wl,--as-needed. ++ ++ -- Torsten Werner <twerner@debian.org> Fri, 21 Dec 2007 22:54:43 +0100 ++ ++t1lib (5.1.1-1) unstable; urgency=low ++ ++ * new upstream version (Closes: #418664) ++ * Add XS-Vcs-* header to debian/control. ++ * Update Standards-Version to 3.7.2 (no changes). ++ * Remove Depends: libc6-dev. (Closes: #446375). ++ * Change Maintainer to myself. ++ * Replace ${Source-Version} by ${binary:Version}. ++ * Do not ignore errors of 'make distclean'. ++ ++ -- Torsten Werner <twerner@debian.org> Sat, 13 Oct 2007 14:46:23 +0200 ++ ++t1lib (5.1.0-3) unstable; urgency=low ++ ++ * Apply patch from Artur R. Czechowski to fix CVE-2007-4033. ++ (Closes: #439927) ++ ++ -- Torsten Werner <twerner@debian.org> Mon, 17 Sep 2007 23:25:45 +0200 ++ ++t1lib (5.1.0-2) unstable; urgency=low ++ ++ * Upload to unstable ++ * Bump-up Standards-Version to 3.6.2 (no changes required) ++ * Torsten Werner <twerner@debian.org> is sponsoring the package ++ ++ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 6 Aug 2005 20:11:51 +0200 ++ ++t1lib (5.1.0-1) experimental; urgency=low ++ ++ * New upstream release ++ * README.t1lib-5.0.2 replaced with README.t1lib-5.1.0 ++ * README.win32 is no longer installed ++ * Removed misleading information from README.Debian ++ * Replace -V with -V 'libt1-5 (>= 5.0.2)' for dh_makeshlibs in debian/rules ++ * Remove some commented stuff from debian/rules ++ * Torsten Werner <twerner@debian.org> is sponsoring the package ++ ++ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 4 Jun 2005 22:12:43 +0200 ++ ++t1lib (5.0.2-3) unstable; urgency=low ++ ++ * Update libtool (Closes: #246753) ++ * Build-Depends on individual library instead dummy xlibs-dev ++ * Added dependencies to -dev package (Closes: #249973) ++ * Thanks to Christopher L Cheney for above patches ++ * Add -V to dh_makeshlibs to make a versioned dependencies on this library ++ * Torsten Werner <twerner@debian.org> is sponsoring the package ++ ++ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 23 May 2004 01:02:02 +0200 ++ ++t1lib (5.0.2-2) unstable; urgency=low ++ ++ * change distribution to unstable ++ * Torsten Werner <twerner@debian.org> is sponsoring the package ++ ++ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 18 Apr 2004 13:07:23 +0200 ++ ++t1lib (5.0.2-1) experimental; urgency=low ++ ++ * New upstream release (Closes: #243916) ++ - fixed some crashes (Closes: #242570, #243378) ++ * Reference to README.t1lib-5.0.2 instead -5.0.0 in some debian/ files ++ * Torsten Werner <twerner@debian.org> is sponsoring the package ++ ++ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 17 Apr 2004 19:22:09 +0200 ++ ++t1lib (5.0.0-5) unstable; urgency=low ++ ++ * debian/rules: documentation is build from binary-indep (Closes: #230386) ++ * debian/watch has been added ++ * Torsten Werner <twerner@debian.org> is sponsoring the package ++ ++ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 21 Feb 2004 20:19:38 +0100 ++ ++t1lib (5.0.0-4) unstable; urgency=low ++ ++ * Added missing files in NEWS.Debian ++ ++ -- Artur R. Czechowski <arturcz@hell.pl> Wed, 21 Jan 2004 00:27:24 +0100 ++ ++t1lib (5.0.0-3) unstable; urgency=low ++ ++ * New release uploaded to unstable (finaly closes: #185097, #216501) ++ * Unleash it to allow to migrate to testing (Closes: #221198) ++ * libt1-dev and t1lib-dev conflict with each other, ++ * libt1-dev conflicts with t1lib1-dev to smooth upgrade from t1lib 1.3.1-6 ++ * t1lib-bin provides/conflicts/replaces t1lib1-bin to smooth upgrade from ++ t1lib 1.3.1-6 ++ * Some README.* files in libt1-dev ++ * Applied patch which fixes memory access bug (see #224314 for details) ++ * Torsten Werner <twerner@debian.org> is sponsoring the package ++ ++ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 18 Jan 2004 03:00:05 +0100 ++ ++t1lib (5.0.0-2) experimental; urgency=low ++ ++ * rename source package to t1lib ++ * rename binary packages: ++ + libt1-5 -> libt1-dev ++ + t1lib5-bin -> t1lib-bin ++ + libt1-5-doc -> libt1-doc ++ * rationale for all above: ++ http://lists.debian.org/debian-devel/2003/debian-devel-200311/msg01083.html ++ and rest of this thread ++ * linking libt1x with X libraries to avoid undefined symbols (see #220111) ++ * clearing independency of X11 in README.Debian ++ * removed all tracks of t1lib0 (Conflict, Replaces, etc) ++ * Torsten Werner <twerner@debian.org> is sponsoring the package ++ ++ -- Artur R. Czechowski <arturcz@hell.pl> Wed, 24 Dec 2003 01:50:37 +0100 ++ ++t1lib5 (5.0.0-1) experimental; urgency=low ++ ++ * New upstream release (Closes: #185097, #216501) ++ * This release is binary incompatible with the previous one. ++ * t1lib-bin and t1lib-dev are virtual packages now ++ * removed weird ``dbl'' from configure - typo in upstream configure.in ++ * there is no necessity to conflict current -doc with the other ones ++ * library, devel and documentation package is libt1-5{,-dev,-doc} to be ++ consistent with Debian Policy 8.1 ++ * do not anymore copy config.{sub,guess} automagically ++ * update ac-tools/config.{sub,guess} to 20031007 ++ * Torsten Werner <twerner@debian.org> is sponsoring the package ++ ++ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 9 Nov 2003 15:16:51 +0100 ++ ++t1lib (1.3.1-4) unstable; urgency=low ++ ++ * New Maintainer, Adopted Package (Closes: #189694) ++ * Prepare for migration to t1lib 5.x: ++ - all packages renamed to t1lib1{,-foo} ++ - empty packages t1lib-bin and t1lib-dev depending on t1lib1-bin ++ and t1lib1-dev ++ * Packaging from scratch using debhelper, Standards-Version is 3.6.1.0 now ++ * Remove non-existent xlib6g-dev from Build-Depends ++ * Updated README.Debian ++ * Remove symlinks from /usr/doc/t1lib* ++ * Only t1lib1-bin contains /etc/t1lib directory ++ * t1lib-dev has been split into two packages: t1lib1-dev and t1lib1-doc ++ * t1lib1-bin: change manual section for type1afm from 8 to 1 ++ * t1lib1-bin: create files in /etc/t1lib if don't exist (Closes: #58275) ++ * t1lib1-bin: remove symlink /usr/share/doc/t1lib-bin -> t1lib1 if exists ++ * Torsten Werner <twerner@debian.org> is sponsoring the package ++ ++ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 2 Nov 2003 03:47:51 +0100 ++ ++t1lib (1.3.1-3) unstable; urgency=low ++ ++ * Change t1lib-dev's section from "devel" to "libdevel" (thanks, Katie!) ++ ++ -- Adam Conrad <adconrad@0c3.net> Mon, 18 Aug 2003 22:42:17 -0600 ++ ++t1lib (1.3.1-2) unstable; urgency=low ++ ++ * Set maintainer to QA, as this package was orphaned months ago (see #189694) ++ * Change "make" to "make without_doc" and remove build-dep on ++ tetex-bin (closes: #192291, #192290) ++ * Change libxaw-dev build-dep to libxaw7-dev, so we are asking for a real ++ package, rather than a virtual (closes: #170012) ++ * lib/Makefile.in changes (closes: #193757) ++ - add "-lm" to libt1.la target ++ - add "-L@top_srcdir@/lib/.libs/ -lt1" to libt1x.la target ++ ++ -- Adam Conrad <adconrad@0c3.net> Mon, 18 Aug 2003 21:50:22 -0600 ++ ++t1lib (1.3.1-1) unstable; urgency=low ++ ++ * New upstream version. (Closes: #127619,#127618) ++ ++ -- David Huggins-Daines <dhd@debian.org> Thu, 3 Jan 2002 21:53:29 -0500 ++ ++t1lib (1.2-1) unstable; urgency=low ++ ++ * New upstream version. ++ ++ -- David Huggins-Daines <dhd@debian.org> Wed, 22 Aug 2001 21:16:36 -0400 ++ ++t1lib (1.1.1-2.2) unstable; urgency=low ++ ++ * NMU ++ * debian/rules: if LD_LIBRARY_PATH is already set, append to it, so ++ builds under fakeroot will work (Closes: #104046) ++ ++ -- Branden Robinson <branden@debian.org> Fri, 10 Aug 2001 04:57:50 -0500 ++ ++t1lib (1.1.1-2.1) unstable; urgency=low ++ ++ * NMU, with updated config.{guess,sub} for newer architectures ++ ++ -- Randolph Chung <tausq@debian.org> Sat, 7 Jul 2001 01:01:51 -0600 ++ ++t1lib (1.1.1-2) unstable; urgency=high ++ ++ * Yow! Major upstream weirdness. Do *not* try to print the documentation ++ when building... Closes: #94660 ++ ++ -- David Huggins-Daines <dhd@debian.org> Fri, 20 Apr 2001 20:35:49 -0400 ++ ++t1lib (1.1.1-1) unstable; urgency=low ++ ++ * New upstream version. Closes: #94627 (why did I never get this bug ++ report in the first place?) ++ ++ -- David Huggins-Daines <dhd@debian.org> Fri, 20 Apr 2001 11:16:15 -0400 ++ ++t1lib (1.0.1-2) unstable; urgency=low ++ ++ * Recompile with new XFree86 libraries and glibc. ++ ++ -- David Huggins-Daines <dhd@debian.org> Wed, 24 Jan 2001 22:33:43 -0500 ++ ++t1lib (1.0.1-1) unstable; urgency=low ++ ++ * New upstream version. Closes: #69689 ++ ++ -- David Huggins-Daines <dhd@debian.org> Thu, 9 Nov 2000 00:29:06 -0500 ++ ++t1lib (1.0-2) frozen unstable; urgency=low ++ ++ * Use dpkg-architecture to supply a target architecture name to ++ configure, should fix the compile problems on Alpha and ARM for good. ++ (closes:#57839) ++ ++ -- David Huggins-Daines <dhd@eradicator.org> Wed, 1 Mar 2000 21:22:49 -0500 ++ ++t1lib (1.0-1) unstable; urgency=low ++ ++ * New upstream version. ++ * Twiddled package names to make more sense. ++ * Move back to priority optional to satisfy dependencies of xpdf and ++ php3. ++ * Moved .la files to t1lib-dev. Added versioned Replaces: field in the ++ control file to cope with potato-to-potato upgrades (the t1lib0 ++ packages in slink were not buggy in this way) ++ * t1libconfig and associated manual pages (FontDataBase.5, ++ t1libconfig.8) are now in the t1lib-bin package, for much the same ++ reason. Unfortunately this Replaces: field cannot be versioned. ++ * The t1lib packages no longer manage the contents of /etc/t1lib/. In ++ the near future, t1lib1 may have a debconf interface for doing so. ++ The t1lib.config and FontDataBase were never used by any programs that ++ linked with t1lib anyway, thankfully. ++ ++ -- David Huggins-Daines <dhd@eradicator.org> Sun, 2 Jan 2000 03:02:30 -0500 ++ ++t1lib0 (0.9.2-1) unstable; urgency=low ++ ++ * New upstream version. ++ * Being more intelligent in t1libconfig to avoid postinst-lossage. ++ Fixes: #44095 ++ * Updated for FHS compliance. ++ ++ -- David Huggins-Daines <dhd@debian.org> Fri, 8 Oct 1999 15:27:46 -0400 ++ ++t1lib0 (0.9.1-4) unstable; urgency=medium ++ ++ * Updated the shlibs file since it appears that programs compiled ++ against 0.9.1 won't work with 0.9 (though the other way around does ++ work). Fixes: #43215, #43231 ++ * Removed ARCH bogosity and updated config.sub and config.guess ++ (upstream maintainer will be notified) ++ ++ -- David Huggins-Daines <dhd@debian.org> Sat, 21 Aug 1999 01:23:39 -0400 ++ ++t1lib0 (0.9.1-3) unstable; urgency=low ++ ++ * Conditionalize that ARCH thing, or the Hurd people will kill me. ++ ++ -- David Huggins-Daines <dhd@debian.org> Sat, 3 Jul 1999 13:56:12 -0400 ++ ++t1lib0 (0.9.1-2) unstable; urgency=low ++ ++ * Oops. T1lib installs a dummy config file. We remove this before ++ building the package (because we generate our own). Also, the preinst ++ has to compensate for the past brokenness by saving it before an ++ upgrade. ++ ++ -- David Huggins-Daines <dhd@debian.org> Fri, 2 Jul 1999 16:13:46 -0400 ++ ++t1lib0 (0.9.1-1) unstable; urgency=low ++ ++ * New upstream version. ++ * Moved back to extra, because that's the way the winds are blowing. ++ * Added ARCH variable to debian/rules to work around strange ++ architecture detection on Alpha. ++ ++ -- David Huggins-Daines <dhd@debian.org> Fri, 2 Jul 1999 14:58:32 -0400 ++ ++t1lib0 (0.9-1) unstable; urgency=low ++ ++ * New upstream version ++ ++ -- David Huggins-Daines <dhd@debian.org> Thu, 10 Jun 1999 23:00:12 -0400 ++ ++t1lib0 (0.8.1-1) unstable; urgency=low ++ ++ * New upstream version. (fixes bug #31549) ++ * Upstream move to libtool has made debian/rules a lot less contorted, ++ and slimmed up the diff considerably. Thanks! ++ * I'm now uploading m68k versions as well. ++ * Fixed "confdif" typo in t1libconfig (oops!) ++ * This release breaks binary and source compatibility. Bumping the ++ soname seems a bit extreme, since there is only one Debian package ++ (gglyph) which depends on this, and I'm simultaneously uploading a ++ fixed version. ++ ++ -- David Huggins-Daines <dhd@debian.org> Wed, 24 Feb 1999 17:16:41 -0500 ++ ++t1lib0 (0.7.1-5) unstable; urgency=low ++ ++ * Changed debian/rules to remove debian/files on clean. (fixes bug #26907) ++ * Changed t1libconfig to allow installation </dev/null (fixes bug #27609) ++ ++ -- David Huggins-Daines <dhd@debian.org> Fri, 16 Oct 1998 20:12:02 -0400 ++ ++t1lib0 (0.7.1-4) unstable; urgency=low ++ ++ * Changed debian/rules not to use debhelper, to fix PowerPC and Alpha compile ++ problems and (hopefully) make the purists happy :) ++ * Upgraded priority to Optional, since it doesn't conflict with or break ++ anything, and is relatively stable. ++ ++ -- David Huggins-Daines <dhd@debian.org> Fri, 18 Sep 1998 18:36:07 -0400 ++ ++t1lib0 (0.7.1-3) unstable; urgency=low ++ ++ * Changed "read" to "read foo" in t1libconfig to make it more sh-friendly. ++ * Minor change to debian/rules (fixes bug #25501) ++ ++ -- David Huggins-Daines <dhd@debian.org> Fri, 7 Aug 1998 13:31:28 -0400 ++ ++t1lib0 (0.7.1-2) unstable; urgency=low ++ ++ * Patched lib/t1lib/t1finfo.c to fix segfault problems with some fonts. ++ * Fixed the URLs and info in copyright and README.Debian. ++ ++ -- David Huggins-Daines <dhd@debian.org> Tue, 21 Jul 1998 16:01:03 -0400 ++ ++t1lib0 (0.7.1-1) unstable; urgency=low ++ ++ * Initial release. ++ ++ -- David Huggins-Daines <dhd@debian.org> Thu, 16 Jul 1998 22:07:08 -0400 ++ ++ +--- t1lib-5.1.2.orig/debian/libt1-5.docs ++++ t1lib-5.1.2/debian/libt1-5.docs +@@ -0,0 +1,2 @@ ++README.t1lib-* ++README.t1python +--- t1lib-5.1.2.orig/debian/libt1-dev.docs ++++ t1lib-5.1.2/debian/libt1-dev.docs +@@ -0,0 +1,2 @@ ++README.t1lib-* ++README.t1python --- t1lib-5.1.2.orig/debian/t1libconfig +++ t1lib-5.1.2/debian/t1libconfig @@ -0,0 +1,163 @@ @@ -164,128 +655,124 @@ +fi + +exit 0 ---- t1lib-5.1.2.orig/debian/t1lib-bin.postrm -+++ t1lib-5.1.2/debian/t1lib-bin.postrm +--- t1lib-5.1.2.orig/debian/t1lib-bin.postinst ++++ t1lib-5.1.2/debian/t1lib-bin.postinst @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + -+if [ "$1" = "purge" ]; then -+ rm -rf /etc/t1lib ++if [ ! -f /etc/t1lib/t1lib.config ]; then ++ /usr/sbin/t1libconfig +fi + +#DEBHELPER# ---- t1lib-5.1.2.orig/debian/libt1-5.install -+++ t1lib-5.1.2/debian/libt1-5.install -@@ -0,0 +1 @@ -+debian/tmp/usr/lib/libt1*.so.* ---- t1lib-5.1.2.orig/debian/libt1-doc.docs -+++ t1lib-5.1.2/debian/libt1-doc.docs -@@ -0,0 +1 @@ -+doc/*.pdf ---- t1lib-5.1.2.orig/debian/libt1-dev.docs -+++ t1lib-5.1.2/debian/libt1-dev.docs +--- t1lib-5.1.2.orig/debian/t1lib-bin.menu ++++ t1lib-5.1.2/debian/t1lib-bin.menu @@ -0,0 +1,2 @@ -+README.t1lib-* -+README.t1python ---- t1lib-5.1.2.orig/debian/t1lib-bin.dirs -+++ t1lib-5.1.2/debian/t1lib-bin.dirs -@@ -0,0 +1 @@ -+etc/t1lib ---- t1lib-5.1.2.orig/debian/t1lib-bin.manpages -+++ t1lib-5.1.2/debian/t1lib-bin.manpages -@@ -0,0 +1,4 @@ -+debian/man/FontDatabase.5 -+debian/man/t1libconfig.8 -+debian/man/type1afm.1 -+debian/man/xglyph.1 ---- t1lib-5.1.2.orig/debian/control -+++ t1lib-5.1.2/debian/control -@@ -0,0 +1,84 @@ -+Source: t1lib -+Section: libs -+Priority: optional -+Maintainer: Ruben Molina <rmolina@udea.edu.co> -+Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libice-dev, libsm-dev, libx11-dev, libxext-dev, libxaw7-dev, quilt -+Standards-Version: 3.8.0 -+Homepage: ftp://sunsite.unc.edu/pub/Linux/libs/graphics/ ++?package(t1lib-bin): needs="X11" section="Applications/Viewers" \ ++ title="XGlyph" command="/usr/bin/xglyph" +--- t1lib-5.1.2.orig/debian/t1lib-bin.install ++++ t1lib-5.1.2/debian/t1lib-bin.install +@@ -0,0 +1,2 @@ ++debian/t1libconfig usr/sbin ++debian/tmp/usr/bin/* +--- t1lib-5.1.2.orig/debian/copyright ++++ t1lib-5.1.2/debian/copyright +@@ -0,0 +1,94 @@ ++This package was debianized by David Huggins-Daines <dhd@debian.org> on ++Fri, 19 Jun 1998 20:01:01 -0400. It has been also maintained by Artur ++R. Czechowski <arturcz@hell.pl> and Torsten Werner <twerner@debian.org>. + -+Package: libt1-5 -+Section: libs -+Architecture: any -+Depends: ${shlibs:Depends}, ${misc:Depends} -+Description: Type 1 font rasterizer library - runtime -+ T1lib is an enhanced rasterizer for Type 1 fonts. -+ . -+ T1lib is based on the X11R5 font rasterizer code, but operates independently -+ of X11. It includes many enhancements, including underlining, antialiasing, -+ user-defined slant and extension factors, and rotation. -+ . -+ This package contains the shared libraries needed to run programs using T1lib. ++It was downloaded from ftp://sunsite.unc.edu/pub/Linux/libs/graphics/ + -+Package: libt1-dev -+Section: libdevel -+Architecture: any -+Depends: libt1-5 (= ${binary:Version}), libice-dev, libsm-dev, libx11-dev, -+ libxext-dev, libxaw7-dev -+Recommends: libt1-doc -+Conflicts: t1lib-dev, t1lib1-dev -+Description: Type 1 font rasterizer library - development -+ T1lib is an enhanced rasterizer for Type 1 fonts. -+ . -+ T1lib is based on the X11R5 font rasterizer code, but operates independently -+ of X11. It includes many enhancements, including underlining, antialiasing, -+ user-defined slant and extension factors, and rotation. -+ . -+ This package contains the header files and static libraries needed to -+ develop programs using T1lib. -+ . -+ Please note, that PDF documentation is placed in libt1-doc ++Upstream Author: + -+Package: t1lib-bin -+Architecture: any -+Section: misc -+Depends: ${shlibs:Depends} -+Provides: t1lib1-bin -+Replaces: t1lib1-bin -+Conflicts: t1lib1-bin -+Description: Type 1 font rasterizer library - user binaries -+ T1lib is an enhanced rasterizer for Type 1 fonts. -+ . -+ T1lib is based on the X11R5 font rasterizer code, but operates independently -+ of X11. It includes many enhancements, including underlining, antialiasing, -+ user-defined slant and extension factors, and rotation. -+ . -+ This package contains the programs "xglyph" and "type1afm", included in the -+ upstream T1lib distribution. It also contains the "t1libconfig" -+ script used to configure t1lib. ++ Rainer Menzner <Rainer.Menzner@web.de> + -+Package: libt1-doc -+Architecture: all -+Section: doc -+Description: Type 1 font rasterizer library - developers documentation -+ T1lib is an enhanced rasterizer for Type 1 fonts. -+ . -+ T1lib is based on the X11R5 font rasterizer code, but operates independently -+ of X11. It includes many enhancements, including underlining, antialiasing, -+ user-defined slant and extension factors, and rotation. -+ . -+ This package contains developers documentation. ++Copyright: + -+Package: libt1-5-dbg -+Section: libdevel -+Priority: extra -+Architecture: any -+Depends: libt1-5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -+Description: Type 1 font rasterizer library - debugging runtime -+ T1lib is an enhanced rasterizer for Type 1 fonts. -+ . -+ T1lib is based on the X11R5 font rasterizer code, but operates independently -+ of X11. It includes many enhancements, including underlining, antialiasing, -+ user-defined slant and extension factors, and rotation. -+ . -+ This package contains debugging information. ++ Copyright (C) 1996-2003 Rainer Menzner ++ ++License: ++ ++ This package is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2 of the License, or (at your option) any later version. ++ ++ This package 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 ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this package; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ++ ++On Debian systems, the complete text of the GNU Lesser General ++Public License can be found in `/usr/share/common-licenses/LGPL'. ++ ++The Debian packaging is (C) 2008, Ruben Molina <rmolina@udea.edu.co> and ++is licensed under the GPL, see `/usr/share/common-licenses/GPL'. + ++Please note that there are parts of t1lib that are subject to other licenses: ++- The parseAFM-package is copyrighted by Adobe Systems Inc. ++- The type1 rasterizer is copyrighted by IBM and the X11-consortium. ++ ++(from lib/t1lib/parseAFM.c) ++/* ++ * (C) 1988, 1989, 1990 by Adobe Systems Incorporated. All rights reserved. ++ * ++ * This file may be freely copied and redistributed as long as: ++ * 1) This entire notice continues to be included in the file, ++ * 2) If the file has been modified in any way, a notice of such ++ * modification is conspicuously indicated. ++ * ++ * PostScript, Display PostScript, and Adobe are registered trademarks of ++ * Adobe Systems Incorporated. ++ * ++ * ************************************************************************ ++ * THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT ++ * NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS ++ * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR ++ * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY ++ * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION, ++ * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. ++ * ************************************************************************ ++ */ ++ ++(from lib/type1/type1.c) ++/* $XConsortium: type1.c,v 1.5 91/10/10 11:20:06 rws Exp $ */ ++/* Copyright International Business Machines, Corp. 1991 ++ * All Rights Reserved ++ * Copyright Lexmark International, Inc. 1991 ++ * All Rights Reserved ++ * Portions Copyright (c) 1990 Adobe Systems Incorporated. ++ * All Rights Reserved ++ * ++ * License to use, copy, modify, and distribute this software and its ++ * documentation for any purpose and without fee is hereby granted, ++ * provided that the above copyright notice appear in all copies and that ++ * both that copyright notice and this permission notice appear in ++ * supporting documentation, and that the name of IBM or Lexmark or Adobe ++ * not be used in advertising or publicity pertaining to distribution of ++ * the software without specific, written prior permission. ++ * ++ * IBM, LEXMARK, AND ADOBE PROVIDE THIS SOFTWARE "AS IS", WITHOUT ANY ++ * WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT ++ * LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A ++ * PARTICULAR PURPOSE, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE ++ * ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE, INCLUDING ++ * ANY DUTY TO SUPPORT OR MAINTAIN, BELONGS TO THE LICENSEE. SHOULD ANY ++ * PORTION OF THE SOFTWARE PROVE DEFECTIVE, THE LICENSEE (NOT IBM, ++ * LEXMARK, OR ADOBE) ASSUMES THE ENTIRE COST OF ALL SERVICING, REPAIR AND ++ * CORRECTION. IN NO EVENT SHALL IBM, LEXMARK, OR ADOBE BE LIABLE FOR ANY ++ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ++ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF ++ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN ++ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ */ --- t1lib-5.1.2.orig/debian/NEWS +++ t1lib-5.1.2/debian/NEWS @@ -0,0 +1,9 @@ @@ -298,6 +785,38 @@ + - README.t1lib-5.0.0.gz + + -- Artur R. Czechowski <arturcz@hell.pl> Sun, 18 Jan 2004 00:02:29 +0100 +--- t1lib-5.1.2.orig/debian/t1lib-bin.manpages ++++ t1lib-5.1.2/debian/t1lib-bin.manpages +@@ -0,0 +1,4 @@ ++debian/man/FontDatabase.5 ++debian/man/t1libconfig.8 ++debian/man/type1afm.1 ++debian/man/xglyph.1 +--- t1lib-5.1.2.orig/debian/rules ++++ t1lib-5.1.2/debian/rules +@@ -0,0 +1,22 @@ ++#!/usr/bin/make -f ++ ++include /usr/share/cdbs/1/rules/debhelper.mk ++include /usr/share/cdbs/1/class/autotools.mk ++include /usr/share/cdbs/1/rules/patchsys-quilt.mk ++ ++export LDFLAGS := -Wl,--as-needed ++ ++DEB_MAKE_BUILD_TARGET := without_doc ++DEB_MAKE_INSTALL_TARGET := install prefix=$(CURDIR)/debian/tmp/usr ++DEB_INSTALL_DOCS_ALL += debian/README.Debian ++ ++binary-post-install/libt1-5 :: ++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ ++binary-post-install/libt1-5-dbg :: ++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ ++binary-post-install/libt1-dev :: ++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ ++binary-post-install/libt1-doc :: ++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ ++binary-post-install/t1lib-bin :: ++ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ --- t1lib-5.1.2.orig/debian/libt1-5.symbols +++ t1lib-5.1.2/debian/libt1-5.symbols @@ -0,0 +1,381 @@ @@ -682,588 +1201,120 @@ + T1_SetStringX@Base 5.1.1 + T1_SetX11Params@Base 5.1.1 + T1_XImageFromGlyph@Base 5.1.1 ---- t1lib-5.1.2.orig/debian/rules -+++ t1lib-5.1.2/debian/rules -@@ -0,0 +1,22 @@ -+#!/usr/bin/make -f +--- t1lib-5.1.2.orig/debian/control ++++ t1lib-5.1.2/debian/control +@@ -0,0 +1,84 @@ ++Source: t1lib ++Section: libs ++Priority: optional ++Maintainer: Ruben Molina <rmolina@udea.edu.co> ++Build-Depends: cdbs, debhelper (>= 7), autotools-dev, libice-dev, libsm-dev, libx11-dev, libxext-dev, libxaw7-dev, quilt ++Standards-Version: 3.8.0 ++Homepage: ftp://sunsite.unc.edu/pub/Linux/libs/graphics/ + -+include /usr/share/cdbs/1/rules/debhelper.mk -+include /usr/share/cdbs/1/class/autotools.mk -+include /usr/share/cdbs/1/rules/patchsys-quilt.mk ++Package: libt1-5 ++Section: libs ++Architecture: any ++Depends: ${shlibs:Depends}, ${misc:Depends} ++Description: Type 1 font rasterizer library - runtime ++ T1lib is an enhanced rasterizer for Type 1 fonts. ++ . ++ T1lib is based on the X11R5 font rasterizer code, but operates independently ++ of X11. It includes many enhancements, including underlining, antialiasing, ++ user-defined slant and extension factors, and rotation. ++ . ++ This package contains the shared libraries needed to run programs using T1lib. + -+export LDFLAGS := -Wl,--as-needed ++Package: libt1-dev ++Section: libdevel ++Architecture: any ++Depends: libt1-5 (= ${binary:Version}), libice-dev, libsm-dev, libx11-dev, ++ libxext-dev, libxaw7-dev ++Recommends: libt1-doc ++Conflicts: t1lib-dev, t1lib1-dev ++Description: Type 1 font rasterizer library - development ++ T1lib is an enhanced rasterizer for Type 1 fonts. ++ . ++ T1lib is based on the X11R5 font rasterizer code, but operates independently ++ of X11. It includes many enhancements, including underlining, antialiasing, ++ user-defined slant and extension factors, and rotation. ++ . ++ This package contains the header files and static libraries needed to ++ develop programs using T1lib. ++ . ++ Please note, that PDF documentation is placed in libt1-doc + -+DEB_MAKE_BUILD_TARGET := without_doc -+DEB_MAKE_INSTALL_TARGET := install prefix=$(CURDIR)/debian/tmp/usr -+DEB_INSTALL_DOCS_ALL += debian/README.Debian ++Package: t1lib-bin ++Architecture: any ++Section: misc ++Depends: ${shlibs:Depends} ++Provides: t1lib1-bin ++Replaces: t1lib1-bin ++Conflicts: t1lib1-bin ++Description: Type 1 font rasterizer library - user binaries ++ T1lib is an enhanced rasterizer for Type 1 fonts. ++ . ++ T1lib is based on the X11R5 font rasterizer code, but operates independently ++ of X11. It includes many enhancements, including underlining, antialiasing, ++ user-defined slant and extension factors, and rotation. ++ . ++ This package contains the programs "xglyph" and "type1afm", included in the ++ upstream T1lib distribution. It also contains the "t1libconfig" ++ script used to configure t1lib. + -+binary-post-install/libt1-5 :: -+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ -+binary-post-install/libt1-5-dbg :: -+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ -+binary-post-install/libt1-dev :: -+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ -+binary-post-install/libt1-doc :: -+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ -+binary-post-install/t1lib-bin :: -+ rm -rf debian/libt1-5-dbg/usr/lib/debug/usr/bin/ ++Package: libt1-doc ++Architecture: all ++Section: doc ++Description: Type 1 font rasterizer library - developers documentation ++ T1lib is an enhanced rasterizer for Type 1 fonts. ++ . ++ T1lib is based on the X11R5 font rasterizer code, but operates independently ++ of X11. It includes many enhancements, including underlining, antialiasing, ++ user-defined slant and extension factors, and rotation. ++ . ++ This package contains developers documentation. ++ ++Package: libt1-5-dbg ++Section: libdevel ++Priority: extra ++Architecture: any ++Depends: libt1-5 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} ++Description: Type 1 font rasterizer library - debugging runtime ++ T1lib is an enhanced rasterizer for Type 1 fonts. ++ . ++ T1lib is based on the X11R5 font rasterizer code, but operates independently ++ of X11. It includes many enhancements, including underlining, antialiasing, ++ user-defined slant and extension factors, and rotation. ++ . ++ This package contains debugging information. ++ +--- t1lib-5.1.2.orig/debian/libt1-dev.install ++++ t1lib-5.1.2/debian/libt1-dev.install +@@ -0,0 +1,3 @@ ++debian/tmp/usr/include/* ++debian/tmp/usr/lib/*.so ++debian/tmp/usr/lib/*.a --- t1lib-5.1.2.orig/debian/compat +++ t1lib-5.1.2/debian/compat @@ -0,0 +1 @@ +7 ---- t1lib-5.1.2.orig/debian/t1lib-bin.postinst -+++ t1lib-5.1.2/debian/t1lib-bin.postinst +--- t1lib-5.1.2.orig/debian/t1lib-bin.postrm ++++ t1lib-5.1.2/debian/t1lib-bin.postrm @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + -+if [ ! -f /etc/t1lib/t1lib.config ]; then -+ /usr/sbin/t1libconfig ++if [ "$1" = "purge" ]; then ++ rm -rf /etc/t1lib +fi + +#DEBHELPER# ---- t1lib-5.1.2.orig/debian/libt1-dev.install -+++ t1lib-5.1.2/debian/libt1-dev.install -@@ -0,0 +1,4 @@ -+debian/tmp/usr/include/* -+debian/tmp/usr/lib/*.so -+debian/tmp/usr/lib/*.la -+debian/tmp/usr/lib/*.a ---- t1lib-5.1.2.orig/debian/changelog -+++ t1lib-5.1.2/debian/changelog -@@ -0,0 +1,414 @@ -+t1lib (5.1.2-3) unstable; urgency=low -+ -+ * New Maintainer (Closes: #430611) -+ * Solved some hyphen-used-as-minus-sign in FontDatabase.5 -+ * Reformated debian/copyrigth -+ * Added symbols control file -+ -+ -- Ruben Molina <rmolina@udea.edu.co> Wed, 23 Jul 2008 20:24:22 -0500 -+ -+t1lib (5.1.2-2) unstable; urgency=low -+ -+ * Add a package with debugging information. -+ -+ -- Torsten Werner <twerner@debian.org> Sat, 08 Mar 2008 10:21:43 +0100 -+ -+t1lib (5.1.2-1) unstable; urgency=low -+ -+ * new upstream release -+ * Correct debian/watch. -+ * Remove patch cve-2007-4033.diff because it has been integrated upstream. -+ * Remove parts of patch segfault.diff that have been integrated upstream. -+ * Do not apply the remaining segfault.diff because it does not look safe but -+ keep the patch as a reminder that something was broken in the past. -+ -+ -- Torsten Werner <twerner@debian.org> Sat, 08 Mar 2008 10:07:54 +0100 -+ -+t1lib (5.1.1-5) unstable; urgency=low -+ -+ * Replace Build-Depends-Indep by Build-Depends again. -+ -+ -- Torsten Werner <twerner@debian.org> Tue, 08 Jan 2008 21:34:25 +0100 -+ -+t1lib (5.1.1-4) unstable; urgency=low -+ -+ * Add Build-Depends-Indep: libxt-dev. (Closes: #459754) -+ -+ -- Torsten Werner <twerner@debian.org> Tue, 08 Jan 2008 20:29:01 +0100 -+ -+t1lib (5.1.1-3) unstable; urgency=low -+ -+ * Replace static changes of upstream files by quilt patches as requested by -+ Fedora developers. -+ * Remove postinst that removed the old /usr/doc symlink. -+ * Remove preinst that removed the old /usr/share/doc/t1lib-bin symlink. -+ * Rename menu.t1lib-bin to t1lib-bin.menu to make sure the menu file gets -+ installed. -+ * Update menu file to conform to current menu policy. -+ * Install documentation with dh_installdocs instead of dh_install and some -+ other minor cleanups. -+ * Switch to cdbs. -+ * Fix versioned Build-Depends: debhelper (>= 5). -+ * Move some Build-Depends to Build-Depends-Indep. -+ * Apply two patches provided by Patrice Dumas: -+ - Update t1libconfig's font search. -+ - Fixes a segfault. -+ * Integrate another patch that fixes a segfault. (Closes: #313236) -+ -+ -- Torsten Werner <twerner@debian.org> Sun, 06 Jan 2008 20:50:19 +0100 -+ -+t1lib (5.1.1-2) unstable; urgency=low -+ -+ * Add Depends: libxaw7-dev to -dev package. -+ * Switch to DH_COMPAT = 5. -+ * Update Vcs headers in debian/control. -+ * Change Standards-Version: 3.7.3. -+ * Do not link with unneeded libraries. -+ * Add LDFLAGS=-Wl,--as-needed. -+ -+ -- Torsten Werner <twerner@debian.org> Fri, 21 Dec 2007 22:54:43 +0100 -+ -+t1lib (5.1.1-1) unstable; urgency=low -+ -+ * new upstream version (Closes: #418664) -+ * Add XS-Vcs-* header to debian/control. -+ * Update Standards-Version to 3.7.2 (no changes). -+ * Remove Depends: libc6-dev. (Closes: #446375). -+ * Change Maintainer to myself. -+ * Replace ${Source-Version} by ${binary:Version}. -+ * Do not ignore errors of 'make distclean'. -+ -+ -- Torsten Werner <twerner@debian.org> Sat, 13 Oct 2007 14:46:23 +0200 -+ -+t1lib (5.1.0-3) unstable; urgency=low -+ -+ * Apply patch from Artur R. Czechowski to fix CVE-2007-4033. -+ (Closes: #439927) -+ -+ -- Torsten Werner <twerner@debian.org> Mon, 17 Sep 2007 23:25:45 +0200 -+ -+t1lib (5.1.0-2) unstable; urgency=low -+ -+ * Upload to unstable -+ * Bump-up Standards-Version to 3.6.2 (no changes required) -+ * Torsten Werner <twerner@debian.org> is sponsoring the package -+ -+ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 6 Aug 2005 20:11:51 +0200 -+ -+t1lib (5.1.0-1) experimental; urgency=low -+ -+ * New upstream release -+ * README.t1lib-5.0.2 replaced with README.t1lib-5.1.0 -+ * README.win32 is no longer installed -+ * Removed misleading information from README.Debian -+ * Replace -V with -V 'libt1-5 (>= 5.0.2)' for dh_makeshlibs in debian/rules -+ * Remove some commented stuff from debian/rules -+ * Torsten Werner <twerner@debian.org> is sponsoring the package -+ -+ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 4 Jun 2005 22:12:43 +0200 -+ -+t1lib (5.0.2-3) unstable; urgency=low -+ -+ * Update libtool (Closes: #246753) -+ * Build-Depends on individual library instead dummy xlibs-dev -+ * Added dependencies to -dev package (Closes: #249973) -+ * Thanks to Christopher L Cheney for above patches -+ * Add -V to dh_makeshlibs to make a versioned dependencies on this library -+ * Torsten Werner <twerner@debian.org> is sponsoring the package -+ -+ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 23 May 2004 01:02:02 +0200 -+ -+t1lib (5.0.2-2) unstable; urgency=low -+ -+ * change distribution to unstable -+ * Torsten Werner <twerner@debian.org> is sponsoring the package -+ -+ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 18 Apr 2004 13:07:23 +0200 -+ -+t1lib (5.0.2-1) experimental; urgency=low -+ -+ * New upstream release (Closes: #243916) -+ - fixed some crashes (Closes: #242570, #243378) -+ * Reference to README.t1lib-5.0.2 instead -5.0.0 in some debian/ files -+ * Torsten Werner <twerner@debian.org> is sponsoring the package -+ -+ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 17 Apr 2004 19:22:09 +0200 -+ -+t1lib (5.0.0-5) unstable; urgency=low -+ -+ * debian/rules: documentation is build from binary-indep (Closes: #230386) -+ * debian/watch has been added -+ * Torsten Werner <twerner@debian.org> is sponsoring the package -+ -+ -- Artur R. Czechowski <arturcz@hell.pl> Sat, 21 Feb 2004 20:19:38 +0100 -+ -+t1lib (5.0.0-4) unstable; urgency=low -+ -+ * Added missing files in NEWS.Debian -+ -+ -- Artur R. Czechowski <arturcz@hell.pl> Wed, 21 Jan 2004 00:27:24 +0100 -+ -+t1lib (5.0.0-3) unstable; urgency=low -+ -+ * New release uploaded to unstable (finaly closes: #185097, #216501) -+ * Unleash it to allow to migrate to testing (Closes: #221198) -+ * libt1-dev and t1lib-dev conflict with each other, -+ * libt1-dev conflicts with t1lib1-dev to smooth upgrade from t1lib 1.3.1-6 -+ * t1lib-bin provides/conflicts/replaces t1lib1-bin to smooth upgrade from -+ t1lib 1.3.1-6 -+ * Some README.* files in libt1-dev -+ * Applied patch which fixes memory access bug (see #224314 for details) -+ * Torsten Werner <twerner@debian.org> is sponsoring the package -+ -+ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 18 Jan 2004 03:00:05 +0100 -+ -+t1lib (5.0.0-2) experimental; urgency=low -+ -+ * rename source package to t1lib -+ * rename binary packages: -+ + libt1-5 -> libt1-dev -+ + t1lib5-bin -> t1lib-bin -+ + libt1-5-doc -> libt1-doc -+ * rationale for all above: -+ http://lists.debian.org/debian-devel/2003/debian-devel-200311/msg01083.html -+ and rest of this thread -+ * linking libt1x with X libraries to avoid undefined symbols (see #220111) -+ * clearing independency of X11 in README.Debian -+ * removed all tracks of t1lib0 (Conflict, Replaces, etc) -+ * Torsten Werner <twerner@debian.org> is sponsoring the package -+ -+ -- Artur R. Czechowski <arturcz@hell.pl> Wed, 24 Dec 2003 01:50:37 +0100 -+ -+t1lib5 (5.0.0-1) experimental; urgency=low -+ -+ * New upstream release (Closes: #185097, #216501) -+ * This release is binary incompatible with the previous one. -+ * t1lib-bin and t1lib-dev are virtual packages now -+ * removed weird ``dbl'' from configure - typo in upstream configure.in -+ * there is no necessity to conflict current -doc with the other ones -+ * library, devel and documentation package is libt1-5{,-dev,-doc} to be -+ consistent with Debian Policy 8.1 -+ * do not anymore copy config.{sub,guess} automagically -+ * update ac-tools/config.{sub,guess} to 20031007 -+ * Torsten Werner <twerner@debian.org> is sponsoring the package -+ -+ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 9 Nov 2003 15:16:51 +0100 -+ -+t1lib (1.3.1-4) unstable; urgency=low -+ -+ * New Maintainer, Adopted Package (Closes: #189694) -+ * Prepare for migration to t1lib 5.x: -+ - all packages renamed to t1lib1{,-foo} -+ - empty packages t1lib-bin and t1lib-dev depending on t1lib1-bin -+ and t1lib1-dev -+ * Packaging from scratch using debhelper, Standards-Version is 3.6.1.0 now -+ * Remove non-existent xlib6g-dev from Build-Depends -+ * Updated README.Debian -+ * Remove symlinks from /usr/doc/t1lib* -+ * Only t1lib1-bin contains /etc/t1lib directory -+ * t1lib-dev has been split into two packages: t1lib1-dev and t1lib1-doc -+ * t1lib1-bin: change manual section for type1afm from 8 to 1 -+ * t1lib1-bin: create files in /etc/t1lib if don't exist (Closes: #58275) -+ * t1lib1-bin: remove symlink /usr/share/doc/t1lib-bin -> t1lib1 if exists -+ * Torsten Werner <twerner@debian.org> is sponsoring the package -+ -+ -- Artur R. Czechowski <arturcz@hell.pl> Sun, 2 Nov 2003 03:47:51 +0100 -+ -+t1lib (1.3.1-3) unstable; urgency=low -+ -+ * Change t1lib-dev's section from "devel" to "libdevel" (thanks, Katie!) -+ -+ -- Adam Conrad <adconrad@0c3.net> Mon, 18 Aug 2003 22:42:17 -0600 -+ -+t1lib (1.3.1-2) unstable; urgency=low -+ -+ * Set maintainer to QA, as this package was orphaned months ago (see #189694) -+ * Change "make" to "make without_doc" and remove build-dep on -+ tetex-bin (closes: #192291, #192290) -+ * Change libxaw-dev build-dep to libxaw7-dev, so we are asking for a real -+ package, rather than a virtual (closes: #170012) -+ * lib/Makefile.in changes (closes: #193757) -+ - add "-lm" to libt1.la target -+ - add "-L@top_srcdir@/lib/.libs/ -lt1" to libt1x.la target -+ -+ -- Adam Conrad <adconrad@0c3.net> Mon, 18 Aug 2003 21:50:22 -0600 -+ -+t1lib (1.3.1-1) unstable; urgency=low -+ -+ * New upstream version. (Closes: #127619,#127618) -+ -+ -- David Huggins-Daines <dhd@debian.org> Thu, 3 Jan 2002 21:53:29 -0500 -+ -+t1lib (1.2-1) unstable; urgency=low -+ -+ * New upstream version. -+ -+ -- David Huggins-Daines <dhd@debian.org> Wed, 22 Aug 2001 21:16:36 -0400 -+ -+t1lib (1.1.1-2.2) unstable; urgency=low -+ -+ * NMU -+ * debian/rules: if LD_LIBRARY_PATH is already set, append to it, so -+ builds under fakeroot will work (Closes: #104046) -+ -+ -- Branden Robinson <branden@debian.org> Fri, 10 Aug 2001 04:57:50 -0500 -+ -+t1lib (1.1.1-2.1) unstable; urgency=low -+ -+ * NMU, with updated config.{guess,sub} for newer architectures -+ -+ -- Randolph Chung <tausq@debian.org> Sat, 7 Jul 2001 01:01:51 -0600 -+ -+t1lib (1.1.1-2) unstable; urgency=high -+ -+ * Yow! Major upstream weirdness. Do *not* try to print the documentation -+ when building... Closes: #94660 -+ -+ -- David Huggins-Daines <dhd@debian.org> Fri, 20 Apr 2001 20:35:49 -0400 -+ -+t1lib (1.1.1-1) unstable; urgency=low -+ -+ * New upstream version. Closes: #94627 (why did I never get this bug -+ report in the first place?) -+ -+ -- David Huggins-Daines <dhd@debian.org> Fri, 20 Apr 2001 11:16:15 -0400 -+ -+t1lib (1.0.1-2) unstable; urgency=low -+ -+ * Recompile with new XFree86 libraries and glibc. -+ -+ -- David Huggins-Daines <dhd@debian.org> Wed, 24 Jan 2001 22:33:43 -0500 -+ -+t1lib (1.0.1-1) unstable; urgency=low -+ -+ * New upstream version. Closes: #69689 -+ -+ -- David Huggins-Daines <dhd@debian.org> Thu, 9 Nov 2000 00:29:06 -0500 -+ -+t1lib (1.0-2) frozen unstable; urgency=low -+ -+ * Use dpkg-architecture to supply a target architecture name to -+ configure, should fix the compile problems on Alpha and ARM for good. -+ (closes:#57839) -+ -+ -- David Huggins-Daines <dhd@eradicator.org> Wed, 1 Mar 2000 21:22:49 -0500 -+ -+t1lib (1.0-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Twiddled package names to make more sense. -+ * Move back to priority optional to satisfy dependencies of xpdf and -+ php3. -+ * Moved .la files to t1lib-dev. Added versioned Replaces: field in the -+ control file to cope with potato-to-potato upgrades (the t1lib0 -+ packages in slink were not buggy in this way) -+ * t1libconfig and associated manual pages (FontDataBase.5, -+ t1libconfig.8) are now in the t1lib-bin package, for much the same -+ reason. Unfortunately this Replaces: field cannot be versioned. -+ * The t1lib packages no longer manage the contents of /etc/t1lib/. In -+ the near future, t1lib1 may have a debconf interface for doing so. -+ The t1lib.config and FontDataBase were never used by any programs that -+ linked with t1lib anyway, thankfully. -+ -+ -- David Huggins-Daines <dhd@eradicator.org> Sun, 2 Jan 2000 03:02:30 -0500 -+ -+t1lib0 (0.9.2-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Being more intelligent in t1libconfig to avoid postinst-lossage. -+ Fixes: #44095 -+ * Updated for FHS compliance. -+ -+ -- David Huggins-Daines <dhd@debian.org> Fri, 8 Oct 1999 15:27:46 -0400 -+ -+t1lib0 (0.9.1-4) unstable; urgency=medium -+ -+ * Updated the shlibs file since it appears that programs compiled -+ against 0.9.1 won't work with 0.9 (though the other way around does -+ work). Fixes: #43215, #43231 -+ * Removed ARCH bogosity and updated config.sub and config.guess -+ (upstream maintainer will be notified) -+ -+ -- David Huggins-Daines <dhd@debian.org> Sat, 21 Aug 1999 01:23:39 -0400 -+ -+t1lib0 (0.9.1-3) unstable; urgency=low -+ -+ * Conditionalize that ARCH thing, or the Hurd people will kill me. -+ -+ -- David Huggins-Daines <dhd@debian.org> Sat, 3 Jul 1999 13:56:12 -0400 -+ -+t1lib0 (0.9.1-2) unstable; urgency=low -+ -+ * Oops. T1lib installs a dummy config file. We remove this before -+ building the package (because we generate our own). Also, the preinst -+ has to compensate for the past brokenness by saving it before an -+ upgrade. -+ -+ -- David Huggins-Daines <dhd@debian.org> Fri, 2 Jul 1999 16:13:46 -0400 -+ -+t1lib0 (0.9.1-1) unstable; urgency=low -+ -+ * New upstream version. -+ * Moved back to extra, because that's the way the winds are blowing. -+ * Added ARCH variable to debian/rules to work around strange -+ architecture detection on Alpha. -+ -+ -- David Huggins-Daines <dhd@debian.org> Fri, 2 Jul 1999 14:58:32 -0400 -+ -+t1lib0 (0.9-1) unstable; urgency=low -+ -+ * New upstream version -+ -+ -- David Huggins-Daines <dhd@debian.org> Thu, 10 Jun 1999 23:00:12 -0400 -+ -+t1lib0 (0.8.1-1) unstable; urgency=low -+ -+ * New upstream version. (fixes bug #31549) -+ * Upstream move to libtool has made debian/rules a lot less contorted, -+ and slimmed up the diff considerably. Thanks! -+ * I'm now uploading m68k versions as well. -+ * Fixed "confdif" typo in t1libconfig (oops!) -+ * This release breaks binary and source compatibility. Bumping the -+ soname seems a bit extreme, since there is only one Debian package -+ (gglyph) which depends on this, and I'm simultaneously uploading a -+ fixed version. -+ -+ -- David Huggins-Daines <dhd@debian.org> Wed, 24 Feb 1999 17:16:41 -0500 -+ -+t1lib0 (0.7.1-5) unstable; urgency=low -+ -+ * Changed debian/rules to remove debian/files on clean. (fixes bug #26907) -+ * Changed t1libconfig to allow installation </dev/null (fixes bug #27609) -+ -+ -- David Huggins-Daines <dhd@debian.org> Fri, 16 Oct 1998 20:12:02 -0400 -+ -+t1lib0 (0.7.1-4) unstable; urgency=low -+ -+ * Changed debian/rules not to use debhelper, to fix PowerPC and Alpha compile -+ problems and (hopefully) make the purists happy :) -+ * Upgraded priority to Optional, since it doesn't conflict with or break -+ anything, and is relatively stable. -+ -+ -- David Huggins-Daines <dhd@debian.org> Fri, 18 Sep 1998 18:36:07 -0400 -+ -+t1lib0 (0.7.1-3) unstable; urgency=low -+ -+ * Changed "read" to "read foo" in t1libconfig to make it more sh-friendly. -+ * Minor change to debian/rules (fixes bug #25501) -+ -+ -- David Huggins-Daines <dhd@debian.org> Fri, 7 Aug 1998 13:31:28 -0400 -+ -+t1lib0 (0.7.1-2) unstable; urgency=low -+ -+ * Patched lib/t1lib/t1finfo.c to fix segfault problems with some fonts. -+ * Fixed the URLs and info in copyright and README.Debian. -+ -+ -- David Huggins-Daines <dhd@debian.org> Tue, 21 Jul 1998 16:01:03 -0400 -+ -+t1lib0 (0.7.1-1) unstable; urgency=low -+ -+ * Initial release. -+ -+ -- David Huggins-Daines <dhd@debian.org> Thu, 16 Jul 1998 22:07:08 -0400 -+ -+ ---- t1lib-5.1.2.orig/debian/copyright -+++ t1lib-5.1.2/debian/copyright -@@ -0,0 +1,94 @@ -+This package was debianized by David Huggins-Daines <dhd@debian.org> on -+Fri, 19 Jun 1998 20:01:01 -0400. It has been also maintained by Artur -+R. Czechowski <arturcz@hell.pl> and Torsten Werner <twerner@debian.org>. -+ -+It was downloaded from ftp://sunsite.unc.edu/pub/Linux/libs/graphics/ -+ -+Upstream Author: -+ -+ Rainer Menzner <Rainer.Menzner@web.de> -+ -+Copyright: -+ -+ Copyright (C) 1996-2003 Rainer Menzner -+ -+License: -+ -+ This package is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This package 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 -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this package; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -+ -+On Debian systems, the complete text of the GNU Lesser General -+Public License can be found in `/usr/share/common-licenses/LGPL'. -+ -+The Debian packaging is (C) 2008, Ruben Molina <rmolina@udea.edu.co> and -+is licensed under the GPL, see `/usr/share/common-licenses/GPL'. -+ -+Please note that there are parts of t1lib that are subject to other licenses: -+- The parseAFM-package is copyrighted by Adobe Systems Inc. -+- The type1 rasterizer is copyrighted by IBM and the X11-consortium. -+ -+(from lib/t1lib/parseAFM.c) -+/* -+ * (C) 1988, 1989, 1990 by Adobe Systems Incorporated. All rights reserved. -+ * -+ * This file may be freely copied and redistributed as long as: -+ * 1) This entire notice continues to be included in the file, -+ * 2) If the file has been modified in any way, a notice of such -+ * modification is conspicuously indicated. -+ * -+ * PostScript, Display PostScript, and Adobe are registered trademarks of -+ * Adobe Systems Incorporated. -+ * -+ * ************************************************************************ -+ * THE INFORMATION BELOW IS FURNISHED AS IS, IS SUBJECT TO CHANGE WITHOUT -+ * NOTICE, AND SHOULD NOT BE CONSTRUED AS A COMMITMENT BY ADOBE SYSTEMS -+ * INCORPORATED. ADOBE SYSTEMS INCORPORATED ASSUMES NO RESPONSIBILITY OR -+ * LIABILITY FOR ANY ERRORS OR INACCURACIES, MAKES NO WARRANTY OF ANY -+ * KIND (EXPRESS, IMPLIED OR STATUTORY) WITH RESPECT TO THIS INFORMATION, -+ * AND EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR PARTICULAR PURPOSES AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. -+ * ************************************************************************ -+ */ -+ -+(from lib/type1/type1.c) -+/* $XConsortium: type1.c,v 1.5 91/10/10 11:20:06 rws Exp $ */ -+/* Copyright International Business Machines, Corp. 1991 -+ * All Rights Reserved -+ * Copyright Lexmark International, Inc. 1991 -+ * All Rights Reserved -+ * Portions Copyright (c) 1990 Adobe Systems Incorporated. -+ * All Rights Reserved -+ * -+ * License to use, copy, modify, and distribute this software and its -+ * documentation for any purpose and without fee is hereby granted, -+ * provided that the above copyright notice appear in all copies and that -+ * both that copyright notice and this permission notice appear in -+ * supporting documentation, and that the name of IBM or Lexmark or Adobe -+ * not be used in advertising or publicity pertaining to distribution of -+ * the software without specific, written prior permission. -+ * -+ * IBM, LEXMARK, AND ADOBE PROVIDE THIS SOFTWARE "AS IS", WITHOUT ANY -+ * WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT -+ * LIMITED TO ANY IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A -+ * PARTICULAR PURPOSE, AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. THE -+ * ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE SOFTWARE, INCLUDING -+ * ANY DUTY TO SUPPORT OR MAINTAIN, BELONGS TO THE LICENSEE. SHOULD ANY -+ * PORTION OF THE SOFTWARE PROVE DEFECTIVE, THE LICENSEE (NOT IBM, -+ * LEXMARK, OR ADOBE) ASSUMES THE ENTIRE COST OF ALL SERVICING, REPAIR AND -+ * CORRECTION. IN NO EVENT SHALL IBM, LEXMARK, OR ADOBE BE LIABLE FOR ANY -+ * SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER -+ * RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF -+ * CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN -+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+ */ ---- t1lib-5.1.2.orig/debian/t1lib-bin.menu -+++ t1lib-5.1.2/debian/t1lib-bin.menu -@@ -0,0 +1,2 @@ -+?package(t1lib-bin): needs="X11" section="Applications/Viewers" \ -+ title="XGlyph" command="/usr/bin/xglyph" --- t1lib-5.1.2.orig/debian/watch +++ t1lib-5.1.2/debian/watch @@ -0,0 +1,3 @@ +version=3 +ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-(.*)\.tar\.gz \ + debian debian/orig-tar.sh ---- t1lib-5.1.2.orig/debian/libt1-5.docs -+++ t1lib-5.1.2/debian/libt1-5.docs -@@ -0,0 +1,2 @@ -+README.t1lib-* -+README.t1python ---- t1lib-5.1.2.orig/debian/t1lib-bin.install -+++ t1lib-5.1.2/debian/t1lib-bin.install -@@ -0,0 +1,2 @@ -+debian/t1libconfig usr/sbin -+debian/tmp/usr/bin/* --- t1lib-5.1.2.orig/debian/README.Debian +++ t1lib-5.1.2/debian/README.Debian @@ -0,0 +1,25 @@ @@ -1292,87 +1343,47 @@ +thanks to him for his good job. + + -- Artur R. Czechowski <arturcz@hell.pl>, Tue, 11 Nov 2003 13:31:48 +0100 ---- t1lib-5.1.2.orig/debian/orig-tar.sh -+++ t1lib-5.1.2/debian/orig-tar.sh -@@ -0,0 +1,11 @@ -+#!/bin/sh -e -+ -+# called by uscan with '--upstream-version' <version> <file> -+ -+# move to directory 'tarballs' -+if [ -r .svn/deb-layout ]; then -+ . .svn/deb-layout -+ mv $3 $origDir -+ echo "moved $3 to $origDir" -+fi -+ ---- t1lib-5.1.2.orig/debian/patches/series -+++ t1lib-5.1.2/debian/patches/series -@@ -0,0 +1,4 @@ -+no-docs.diff -+no-config.diff -+lib-cleanup.diff -+#segfault.diff ---- t1lib-5.1.2.orig/debian/patches/no-config.diff -+++ t1lib-5.1.2/debian/patches/no-config.diff -@@ -0,0 +1,57 @@ -+do not install a static configuration file +--- t1lib-5.1.2.orig/debian/t1lib-bin.dirs ++++ t1lib-5.1.2/debian/t1lib-bin.dirs +@@ -0,0 +1 @@ ++etc/t1lib +--- t1lib-5.1.2.orig/debian/patches/no-docs.diff ++++ t1lib-5.1.2/debian/patches/no-docs.diff +@@ -0,0 +1,34 @@ ++We are using debhelper to install the documentation in the correct ++directory. + -+Index: t1lib-5.1.1/lib/Makefile.in ++Index: t1lib-5.1.1/doc/Makefile.in +=================================================================== -+--- t1lib-5.1.1.orig/lib/Makefile.in 2008-01-05 19:13:57.000000000 +0100 -++++ t1lib-5.1.1/lib/Makefile.in 2008-01-05 19:14:18.000000000 +0100 -+@@ -161,17 +161,17 @@ ++--- t1lib-5.1.1.orig/doc/Makefile.in 2008-01-05 19:05:03.000000000 +0100 +++++ t1lib-5.1.1/doc/Makefile.in 2008-01-05 19:05:25.000000000 +0100 ++@@ -89,16 +89,16 @@ ++ ++ + install: dummy -+ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) -+ $(MKINSTALLDIRS) $(DESTDIR)$(includedir) -+- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@ -++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@ -+ $(LIBTOOL) --mode=install \ -+ $(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir) -+ $(LIBTOOL) --mode=install \ -+ $(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir) -+- if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \ ++- if (test -f t1lib_doc.ps) \ +- then \ -+- echo "Alert: Global configuration file exists, installation skipped!"; \ -+- else \ -+- $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \ ++- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ ++- $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +- fi; -++# if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \ ++- if (test -f t1lib_doc.pdf) \ ++- then \ ++- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ ++- $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ ++- fi; +++# if (test -f t1lib_doc.ps) \ ++# then \ -++# echo "Alert: Global configuration file exists, installation skipped!"; \ -++# else \ -++# $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \ +++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +++# $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +++# fi; +++# if (test -f t1lib_doc.pdf) \ +++# then \ +++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +++# $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ ++# fi; + + + uninstall: dummy -+@@ -179,7 +179,7 @@ -+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libt1x.la -+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1lib.h -+ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1libx.h -+- -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config -++# -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config -+ -+ -+ dummy: -+Index: t1lib-5.1.1/xglyph/xglyph.c -+=================================================================== -+--- t1lib-5.1.1.orig/xglyph/xglyph.c 2008-01-05 19:16:30.000000000 +0100 -++++ t1lib-5.1.1/xglyph/xglyph.c 2008-01-05 19:16:40.000000000 +0100 -+@@ -526,9 +526,12 @@ -+ -+ /* Check for environment entry. If not set, set it to current -+ directory so that configuration file is found there */ -++ /* It violates the Debian Policy */ -++#if 0 -+ if (getenv("T1LIB_CONFIG")==NULL){ -+ putenv( "T1LIB_CONFIG=./t1lib.config"); -+ } -++#endif -+ -+ -+ /* Set log-level: */ --- t1lib-5.1.2.orig/debian/patches/lib-cleanup.diff +++ t1lib-5.1.2/debian/patches/lib-cleanup.diff @@ -0,0 +1,59 @@ @@ -1435,43 +1446,66 @@ + + + all: xglyph ---- t1lib-5.1.2.orig/debian/patches/no-docs.diff -+++ t1lib-5.1.2/debian/patches/no-docs.diff -@@ -0,0 +1,34 @@ -+We are using debhelper to install the documentation in the correct -+directory. +--- t1lib-5.1.2.orig/debian/patches/no-config.diff ++++ t1lib-5.1.2/debian/patches/no-config.diff +@@ -0,0 +1,57 @@ ++do not install a static configuration file + -+Index: t1lib-5.1.1/doc/Makefile.in ++Index: t1lib-5.1.1/lib/Makefile.in +=================================================================== -+--- t1lib-5.1.1.orig/doc/Makefile.in 2008-01-05 19:05:03.000000000 +0100 -++++ t1lib-5.1.1/doc/Makefile.in 2008-01-05 19:05:25.000000000 +0100 -+@@ -89,16 +89,16 @@ -+ -+ ++--- t1lib-5.1.1.orig/lib/Makefile.in 2008-01-05 19:13:57.000000000 +0100 +++++ t1lib-5.1.1/lib/Makefile.in 2008-01-05 19:14:18.000000000 +0100 ++@@ -161,17 +161,17 @@ + install: dummy -+- if (test -f t1lib_doc.ps) \ -+- then \ -+- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -+- $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -+- fi; -+- if (test -f t1lib_doc.pdf) \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(libdir) ++ $(MKINSTALLDIRS) $(DESTDIR)$(includedir) ++- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@ +++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@ ++ $(LIBTOOL) --mode=install \ ++ $(INSTALL_DATA) $(MAIN_TARGET) $(DESTDIR)$(libdir) ++ $(LIBTOOL) --mode=install \ ++ $(INSTALL_DATA) $(MAIN_HEADER) $(DESTDIR)$(includedir) ++- if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \ +- then \ -+- $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -+- $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ ++- echo "Alert: Global configuration file exists, installation skipped!"; \ ++- else \ ++- $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \ +- fi; -++# if (test -f t1lib_doc.ps) \ -++# then \ -++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -++# $(INSTALL_DATA) t1lib_doc.ps $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -++# fi; -++# if (test -f t1lib_doc.pdf) \ +++# if (test -f $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config) \ ++# then \ -++# $(MKINSTALLDIRS) $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ -++# $(INSTALL_DATA) t1lib_doc.pdf $(DESTDIR)@T1LIB_DATA_DIR@/doc; \ +++# echo "Alert: Global configuration file exists, installation skipped!"; \ +++# else \ +++# $(LIBTOOL) --mode=install $(INSTALL_DATA) t1lib.config $(DESTDIR)@T1LIB_DATA_DIR@; \ ++# fi; + + + uninstall: dummy ++@@ -179,7 +179,7 @@ ++ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(libdir)/libt1x.la ++ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1lib.h ++ -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)$(includedir)/t1libx.h ++- -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config +++# -$(LIBTOOL) --mode=uninstall $(RM) $(DESTDIR)@T1LIB_DATA_DIR@/t1lib.config ++ ++ ++ dummy: ++Index: t1lib-5.1.1/xglyph/xglyph.c ++=================================================================== ++--- t1lib-5.1.1.orig/xglyph/xglyph.c 2008-01-05 19:16:30.000000000 +0100 +++++ t1lib-5.1.1/xglyph/xglyph.c 2008-01-05 19:16:40.000000000 +0100 ++@@ -526,9 +526,12 @@ ++ ++ /* Check for environment entry. If not set, set it to current ++ directory so that configuration file is found there */ +++ /* It violates the Debian Policy */ +++#if 0 ++ if (getenv("T1LIB_CONFIG")==NULL){ ++ putenv( "T1LIB_CONFIG=./t1lib.config"); ++ } +++#endif ++ ++ ++ /* Set log-level: */ --- t1lib-5.1.2.orig/debian/patches/segfault.diff +++ t1lib-5.1.2/debian/patches/segfault.diff @@ -0,0 +1,62 @@ @@ -1537,42 +1571,330 @@ + extern int T1_SetFontDataBase( char *filename); + extern int T1_AddFontDataBase( int mode, char *filename); + extern int T1_SetFontDataBaseXLFD( char *filename); ---- t1lib-5.1.2.orig/debian/man/type1afm.1 -+++ t1lib-5.1.2/debian/man/type1afm.1 -@@ -0,0 +1,34 @@ -+.TH TYPE1AFM 1 +--- t1lib-5.1.2.orig/debian/patches/CVE-2010-2642.patch ++++ t1lib-5.1.2/debian/patches/CVE-2010-2642.patch +@@ -0,0 +1,24 @@ ++diff --git a/lib/t1lib/parseAFM.c b/lib/t1lib/parseAFM.c ++index 6a31d7f..ba64541 100644 ++--- a/lib/t1lib/parseAFM.c +++++ b/lib/t1lib/parseAFM.c ++@@ -199,7 +199,9 @@ static char *token(stream) ++ idx = 0; ++ ++ while (ch != EOF && ch != ' ' && ch != CR && ch != LF && ++- ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';'){ +++ ch != CTRL_Z && ch != '\t' && ch != ':' && ch != ';' +++ && idx < (MAX_NAME -1)) +++ { ++ ident[idx++] = ch; ++ ch = fgetc(stream); ++ } /* while */ ++@@ -235,7 +237,7 @@ static char *linetoken(stream) ++ while ((ch = fgetc(stream)) == ' ' || ch == '\t' ); ++ ++ idx = 0; ++- while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z) +++ while (ch != EOF && ch != CR && ch != LF && ch != CTRL_Z && idx < (MAX_NAME - 1)) ++ { ++ ident[idx++] = ch; ++ ch = fgetc(stream); +--- t1lib-5.1.2.orig/debian/patches/CVE-2011-0764.diff ++++ t1lib-5.1.2/debian/patches/CVE-2011-0764.diff +@@ -0,0 +1,32 @@ ++Description: Don't lookup previous point if there isn't any ++Author: Marc Deslauriers <marc.deslauriers@canonical.com> ++Forwarded: no ++ ++Index: t1lib-5.1.2/lib/type1/type1.c ++=================================================================== ++--- t1lib-5.1.2.orig/lib/type1/type1.c 2011-12-13 14:24:14.280965637 -0600 +++++ t1lib-5.1.2/lib/type1/type1.c 2011-12-13 14:25:25.893320747 -0600 ++@@ -1700,6 +1700,7 @@ ++ long pindex = 0; ++ ++ /* compute hinting for previous segment! */ +++ if (ppoints == NULL) Error0i("RLineTo: No previous point!\n"); ++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx, dy); ++ ++ /* Allocate a new path point and pre-setup data */ ++@@ -1728,6 +1729,7 @@ ++ long pindex = 0; ++ ++ /* compute hinting for previous point! */ +++ if (ppoints == NULL) Error0i("RRCurveTo: No previous point!\n"); ++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx1, dy1); ++ ++ /* Allocate three new path points and pre-setup data */ ++@@ -1903,6 +1905,7 @@ ++ FindStems( currx, curry, 0, 0, dx, dy); ++ } ++ else { +++ if (ppoints == NULL) Error0i("RMoveTo: No previous point!\n"); ++ FindStems( currx, curry, ppoints[numppoints-2].x, ppoints[numppoints-2].y, dx, dy); ++ } ++ +--- t1lib-5.1.2.orig/debian/patches/CVE-2011-1552_1553_1554.patch ++++ t1lib-5.1.2/debian/patches/CVE-2011-1552_1553_1554.patch +@@ -0,0 +1,133 @@ ++Author: Jaroslav Škarvada <jskarvad@redhat.com> ++Description: Fix more crashes on oversized fonts ++Bug-Redhat: http://bugzilla.redhat.com/show_bug.cgi?id=692909 ++Index: t1lib-5.1.2/lib/type1/lines.c ++=================================================================== ++--- t1lib-5.1.2.orig/lib/type1/lines.c 2007-12-23 09:49:42.000000000 -0600 +++++ t1lib-5.1.2/lib/type1/lines.c 2012-01-17 14:15:08.000000000 -0600 ++@@ -67,6 +67,10 @@ ++ None. ++ */ ++ +++#define BITS (sizeof(LONG)*8) +++#define HIGHTEST(p) (((p)>>(BITS-2)) != 0) /* includes sign bit */ +++#define TOOBIG(xy) ((xy < 0) ? HIGHTEST(-xy) : HIGHTEST(xy)) +++ ++ /* ++ :h2.StepLine() - Produces Run Ends for a Line After Checks ++ ++@@ -84,6 +88,9 @@ ++ IfTrace4((LineDebug > 0), ".....StepLine: (%d,%d) to (%d,%d)\n", ++ x1, y1, x2, y2); ++ +++ if ( TOOBIG(x1) || TOOBIG(x2) || TOOBIG(y1) || TOOBIG(y2)) +++ abort("Lines this big not supported", 49); +++ ++ dy = y2 - y1; ++ ++ /* ++Index: t1lib-5.1.2/lib/type1/objects.c ++=================================================================== ++--- t1lib-5.1.2.orig/lib/type1/objects.c 2007-12-23 09:49:42.000000000 -0600 +++++ t1lib-5.1.2/lib/type1/objects.c 2012-01-17 14:15:08.000000000 -0600 ++@@ -1137,12 +1137,13 @@ ++ "Context: out of them", /* 46 */ ++ "MatrixInvert: can't", /* 47 */ ++ "xiStub called", /* 48 */ ++- "Illegal access type1 abort() message" /* 49 */ +++ "Lines this big not supported", /* 49 */ +++ "Illegal access type1 abort() message" /* 50 */ ++ }; ++ ++- /* no is valid from 1 to 48 */ ++- if ( (number<1)||(number>48)) ++- number=49; +++ /* no is valid from 1 to 49 */ +++ if ( (number<1)||(number>49)) +++ number=50; ++ return( err_msgs[number-1]); ++ ++ } ++Index: t1lib-5.1.2/lib/type1/type1.c ++=================================================================== ++--- t1lib-5.1.2.orig/lib/type1/type1.c 2012-01-17 14:13:28.000000000 -0600 +++++ t1lib-5.1.2/lib/type1/type1.c 2012-01-17 14:19:54.000000000 -0600 ++@@ -1012,6 +1012,7 @@ ++ double nextdtana = 0.0; /* tangent of post-delta against horizontal line */ ++ double nextdtanb = 0.0; /* tangent of post-delta against vertical line */ ++ +++ if (ppoints == NULL || numppoints < 1) Error0v("FindStems: No previous point!\n"); ++ ++ /* setup default hinted position */ ++ ppoints[numppoints-1].ax = ppoints[numppoints-1].x; ++@@ -1289,7 +1290,7 @@ ++ static int DoRead(CodeP) ++ int *CodeP; ++ { ++- if (strindex >= CharStringP->len) return(FALSE); /* end of string */ +++ if (!CharStringP || strindex >= CharStringP->len) return(FALSE); /* end of string */ ++ /* We handle the non-documented Adobe convention to use lenIV=-1 to ++ suppress charstring encryption. */ ++ if (blues->lenIV==-1) { ++@@ -1700,7 +1701,7 @@ ++ long pindex = 0; ++ ++ /* compute hinting for previous segment! */ ++- if (ppoints == NULL) Error0i("RLineTo: No previous point!\n"); +++ if (ppoints == NULL || numppoints < 2) Error0i("RLineTo: No previous point!\n"); ++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx, dy); ++ ++ /* Allocate a new path point and pre-setup data */ ++@@ -1729,7 +1730,7 @@ ++ long pindex = 0; ++ ++ /* compute hinting for previous point! */ ++- if (ppoints == NULL) Error0i("RRCurveTo: No previous point!\n"); +++ if (ppoints == NULL || numppoints < 2) Error0i("RRCurveTo: No previous point!\n"); ++ FindStems( currx, curry, currx-ppoints[numppoints-2].x, curry-ppoints[numppoints-2].y, dx1, dy1); ++ ++ /* Allocate three new path points and pre-setup data */ ++@@ -1788,7 +1789,9 @@ ++ long tmpind; ++ double deltax = 0.0; ++ double deltay = 0.0; ++- +++ +++ if (ppoints == NULL || numppoints < 1) Error0i("DoClosePath: No previous point!"); +++ ++ /* If this ClosePath command together with the starting point of this ++ path completes to a segment aligned to a stem, we would miss ++ hinting for this point. --> Check and explicitly care for this! */ ++@@ -1803,6 +1806,7 @@ ++ deltax = ppoints[i].x - ppoints[numppoints-1].x; ++ deltay = ppoints[i].y - ppoints[numppoints-1].y; ++ +++ if (ppoints == NULL || numppoints <= i + 1) Error0i("DoClosePath: No previous point!"); ++ /* save nummppoints and reset to move point */ ++ tmpind = numppoints; ++ numppoints = i + 1; ++@@ -1905,7 +1909,7 @@ ++ FindStems( currx, curry, 0, 0, dx, dy); ++ } ++ else { ++- if (ppoints == NULL) Error0i("RMoveTo: No previous point!\n"); +++ if (ppoints == NULL || numppoints < 2) Error0i("RMoveTo: No previous point!\n"); ++ FindStems( currx, curry, ppoints[numppoints-2].x, ppoints[numppoints-2].y, dx, dy); ++ } ++ ++@@ -2155,6 +2159,7 @@ ++ DOUBLE cx, cy; ++ DOUBLE ex, ey; ++ +++ if (ppoints == NULL || numppoints < 8) Error0v("FlxProc: No previous point!"); ++ ++ /* Our PPOINT list now contains 7 moveto commands which ++ are about to be consumed by the Flex mechanism. --> Remove these ++@@ -2324,6 +2329,7 @@ ++ /* Returns currentpoint on stack */ ++ static void FlxProc2() ++ { +++ if (ppoints == NULL || numppoints < 1) Error0v("FlxProc2: No previous point!"); ++ /* Push CurrentPoint on fake PostScript stack */ ++ PSFakePush( ppoints[numppoints-1].x); ++ PSFakePush( ppoints[numppoints-1].y); +--- t1lib-5.1.2.orig/debian/patches/format-security.diff ++++ t1lib-5.1.2/debian/patches/format-security.diff +@@ -0,0 +1,33 @@ ++--- a/lib/type1/objects.c +++++ b/lib/type1/objects.c ++@@ -957,7 +957,7 @@ ++ ++ sprintf(typemsg, "Wrong object type in %s; expected %s, found %s.\n", ++ name, TypeFmt(expect), TypeFmt(obj->type)); ++- IfTrace0(TRUE,typemsg); +++ IfTrace1(TRUE, "%s", typemsg); ++ ++ ObjectPostMortem(obj); ++ ++--- a/lib/t1lib/t1subset.c +++++ b/lib/t1lib/t1subset.c ++@@ -759,7 +759,7 @@ ++ tr_len); ++ T1_PrintLog( "T1_SubsetFont()", err_warn_msg_buf, ++ T1LOG_DEBUG); ++- l+=sprintf( &(trailerbuf[l]), linebuf); /* contains the PostScript trailer */ +++ l+=sprintf( &(trailerbuf[l]), "%s", linebuf); /* contains the PostScript trailer */ ++ } ++ ++ /* compute size of output file */ ++--- a/lib/type1/objects.h +++++ b/lib/type1/objects.h ++@@ -214,7 +214,7 @@ ++ /*SHARED*/ ++ /* NDW: personally, I want to see status and error messages! */ ++ #define IfTrace0(condition,model) \ ++- {if (condition) printf(model);} +++ {if (condition) fputs(model,stdout);} ++ #define IfTrace1(condition,model,arg0) \ ++ {if (condition) printf(model,arg0);} ++ #define IfTrace2(condition,model,arg0,arg1) \ +--- t1lib-5.1.2.orig/debian/patches/series ++++ t1lib-5.1.2/debian/patches/series +@@ -0,0 +1,8 @@ ++no-docs.diff ++no-config.diff ++lib-cleanup.diff ++#segfault.diff ++format-security.diff ++CVE-2011-0764.diff ++CVE-2011-1552_1553_1554.patch ++CVE-2010-2642.patch +--- t1lib-5.1.2.orig/debian/man/FontDatabase.5 ++++ t1lib-5.1.2/debian/man/FontDatabase.5 +@@ -0,0 +1,77 @@ ++.TH FONTDATABASE 5 +.SH NAME -+.B type1afm -+\- create a font metrics file from a Type 1 font file -+.SH SYNOPSIS -+.B type1afm -+[ -+.BR \-l -+] -+.B fontfile -+[ -+.B fontfile... -+] ++FontDataBase \- database of fonts accessible to t1lib. +.SH DESCRIPTION -+This manual page was written for the Debian GNU/Linux distribution -+because the original program does not have a manual page. ++This manual page has been written for the Debian GNU/Linux ++distribution. It has been adapted from the documentation included in ++the upstream ++.B t1lib ++distribution. +.PP -+.B type1afm -+reads in Type 1 font files specified on the command line, rasterizes -+them to 1000bp, and writes AFM (font metrics) files based on the -+observed metrics information. ++.B /etc/t1lib/FontDataBase ++is a text file which contains, minimally, the basenames of Type 1 font ++files to be made accessible to the ++.B t1lib ++font rasterizer library. The format is intentionally similar to that ++of the ++.B fonts.dir ++and ++.B fonts.scale ++files used by X11. +.PP -+The AFM file is created in the same directory as the font file, so be -+sure that you have write access there before running this program. -+.SH OPTIONS -+.TP -+.BR \-l -+Write a log file -+.SH SEE ALSO -+.BR getafm (1) -+.SH AUTHOR -+This manual page was David Huggins-Daines <dhd@debian.org> -+for the Debian GNU/Linux distribution (but may be used by others) ++Line 1 of this file contains a positive integer specifying the number ++of fonts declared in that file. This is as in the ++.B fonts.dir ++files of the X11 system. ++.PP ++All remaining lines contain declarations of one font each. The only ++thing taken from such a line is the last string (delimited by white ++space) in it. It is assumed to be a filename of the format ++\fIbasename\fR.\fIsomeextension\fR. ++.PP ++The \fIbasename\fR part is assumed to be the ++.BR basename (1) ++of a fontfile. After the a string has been parsed, the ++.I extension ++is cut off and replaced in turn with ++.I .pfa ++and ++.I .pfb. ++The initialization routine tries to open a font file in ++its search path with one of the resulting filenames. ++.PP ++The remainder of the line, i.e., from beginning to the start of the ++filename string, is completely ignored and thus may contain ++information for other programs. ++.SH EXAMPLES ++Here is a minimal font database file for 4 fonts: ++.sp ++.nf ++4 ++isvl.afm ++isvli.afm ++isvd.afm ++isvdi.afm ++.fi ++.PP ++This file is \fIminimal\fR, because it contains just the information ++needed, and nothing not needed by the library. ++.PP ++Here is a more realistic example, which allows an application to match ++a fully qualified X11 fontname to a FontID in ++.B t1lib. ++This is also a valid font database file: ++.sp ++.nf ++4 ++Souvenir Souvenir-Light --- \-itc-souvenir-light-r-normal--#-0-0-0-p-0-iso8859-1 isvl.afm ++Souvenir Souvenir-LightItalic -*- \-itc-souvenir-light-i-normal--#-0-0-0-p-0-iso8859-1 isvli.afm ++ Souvenir-Demi *-- \-itc-souvenir-demi-r-normal--#-0-0-0-p-0-iso8859-1 isvd.afm ++ Souvenir-DemiItalic **- \-itc-souvenir-demi-i-normal--#-0-0-0-p-0-iso8859-1 isvdi.afm ++.fi ++.PP ++.SH FILES ++.I /etc/t1lib/FontDataBase ++.SH "SEE ALSO" ++.BR mkfontdir (1x) + --- t1lib-5.1.2.orig/debian/man/t1libconfig.8 +++ t1lib-5.1.2/debian/man/t1libconfig.8 @@ -1748,83 +2070,40 @@ +This manual page was written by David Huggins-Daines +<dhd@debian.org>, for the Debian GNU/Linux system (but may +be used by others). ---- t1lib-5.1.2.orig/debian/man/FontDatabase.5 -+++ t1lib-5.1.2/debian/man/FontDatabase.5 -@@ -0,0 +1,77 @@ -+.TH FONTDATABASE 5 +--- t1lib-5.1.2.orig/debian/man/type1afm.1 ++++ t1lib-5.1.2/debian/man/type1afm.1 +@@ -0,0 +1,34 @@ ++.TH TYPE1AFM 1 +.SH NAME -+FontDataBase \- database of fonts accessible to t1lib. ++.B type1afm ++\- create a font metrics file from a Type 1 font file ++.SH SYNOPSIS ++.B type1afm ++[ ++.BR \-l ++] ++.B fontfile ++[ ++.B fontfile... ++] +.SH DESCRIPTION -+This manual page has been written for the Debian GNU/Linux -+distribution. It has been adapted from the documentation included in -+the upstream -+.B t1lib -+distribution. -+.PP -+.B /etc/t1lib/FontDataBase -+is a text file which contains, minimally, the basenames of Type 1 font -+files to be made accessible to the -+.B t1lib -+font rasterizer library. The format is intentionally similar to that -+of the -+.B fonts.dir -+and -+.B fonts.scale -+files used by X11. -+.PP -+Line 1 of this file contains a positive integer specifying the number -+of fonts declared in that file. This is as in the -+.B fonts.dir -+files of the X11 system. -+.PP -+All remaining lines contain declarations of one font each. The only -+thing taken from such a line is the last string (delimited by white -+space) in it. It is assumed to be a filename of the format -+\fIbasename\fR.\fIsomeextension\fR. -+.PP -+The \fIbasename\fR part is assumed to be the -+.BR basename (1) -+of a fontfile. After the a string has been parsed, the -+.I extension -+is cut off and replaced in turn with -+.I .pfa -+and -+.I .pfb. -+The initialization routine tries to open a font file in -+its search path with one of the resulting filenames. -+.PP -+The remainder of the line, i.e., from beginning to the start of the -+filename string, is completely ignored and thus may contain -+information for other programs. -+.SH EXAMPLES -+Here is a minimal font database file for 4 fonts: -+.sp -+.nf -+4 -+isvl.afm -+isvli.afm -+isvd.afm -+isvdi.afm -+.fi -+.PP -+This file is \fIminimal\fR, because it contains just the information -+needed, and nothing not needed by the library. ++This manual page was written for the Debian GNU/Linux distribution ++because the original program does not have a manual page. +.PP -+Here is a more realistic example, which allows an application to match -+a fully qualified X11 fontname to a FontID in -+.B t1lib. -+This is also a valid font database file: -+.sp -+.nf -+4 -+Souvenir Souvenir-Light --- \-itc-souvenir-light-r-normal--#-0-0-0-p-0-iso8859-1 isvl.afm -+Souvenir Souvenir-LightItalic -*- \-itc-souvenir-light-i-normal--#-0-0-0-p-0-iso8859-1 isvli.afm -+ Souvenir-Demi *-- \-itc-souvenir-demi-r-normal--#-0-0-0-p-0-iso8859-1 isvd.afm -+ Souvenir-DemiItalic **- \-itc-souvenir-demi-i-normal--#-0-0-0-p-0-iso8859-1 isvdi.afm -+.fi ++.B type1afm ++reads in Type 1 font files specified on the command line, rasterizes ++them to 1000bp, and writes AFM (font metrics) files based on the ++observed metrics information. +.PP -+.SH FILES -+.I /etc/t1lib/FontDataBase -+.SH "SEE ALSO" -+.BR mkfontdir (1x) ++The AFM file is created in the same directory as the font file, so be ++sure that you have write access there before running this program. ++.SH OPTIONS ++.TP ++.BR \-l ++Write a log file ++.SH SEE ALSO ++.BR getafm (1) ++.SH AUTHOR ++This manual page was David Huggins-Daines <dhd@debian.org> ++for the Debian GNU/Linux distribution (but may be used by others) + diff --git a/source/l/taglib/taglib.SlackBuild b/source/l/taglib/taglib.SlackBuild index 1f3673fc1..31794626d 100755 --- a/source/l/taglib/taglib.SlackBuild +++ b/source/l/taglib/taglib.SlackBuild @@ -69,14 +69,13 @@ find . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-mp4 \ - --enable-asf \ - --program-prefix="" \ - --program-suffix="" \ - --build=$ARCH-slackware-linux +CXX=gcc \ +cmake \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX="${LIBDIRSUFFIX}" \ + -DWITH_MP4=ON \ + -DWITH_ASF=ON \ + . make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/l/urwid/urwid.SlackBuild b/source/l/urwid/urwid.SlackBuild index b34a618a6..152be6252 100755 --- a/source/l/urwid/urwid.SlackBuild +++ b/source/l/urwid/urwid.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for urwid # Copyright 2009 Andrew Psaltis <ampsaltis@gmail.com> +# Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +26,7 @@ # Modified by Robby Workman <rworkman@slackware.com> PRGNAM=urwid -VERSION=0.9.9.1 +VERSION=1.0.1 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/l/v4l-utils/slack-desc b/source/l/v4l-utils/slack-desc index 574911598..1f235d185 100644 --- a/source/l/v4l-utils/slack-desc +++ b/source/l/v4l-utils/slack-desc @@ -11,9 +11,9 @@ v4l-utils: v4l-utils: libv4l is a collection of libraries which adds a thin abstraction v4l-utils: layer on top of video4linux2 devices. The purpose of this (thin) v4l-utils: layer is to make it easy for application writers to support a wide -v4l-utils: variety of devices without having to write seperate code for +v4l-utils: variety of devices without having to write separate code for v4l-utils: different devices in the same class. Linux V4L2 and DVB API v4l-utils: utilities are also included. v4l-utils: -v4l-utils: Homepage: http://freshmeat.net/projects/libv4l +v4l-utils: Homepage: http://linuxtv.org v4l-utils: diff --git a/source/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild index c0ffa36b7..da7839940 100755 --- a/source/l/v4l-utils/v4l-utils.SlackBuild +++ b/source/l/v4l-utils/v4l-utils.SlackBuild @@ -78,9 +78,9 @@ export CFLAGS="$SLKCFLAGS" export CPPFLAGS="$SLKCFLAGS" export LDFLAGS="$SLKLDFLAGS" make ${NUMJOBS} PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} || \ - make PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} || \ + make PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man || \ exit 1 -make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} DESTDIR=$PKG || exit 1 +make install PREFIX=/usr LIBDIR=/usr/lib${LIBDIRSUFFIX} MANDIR=/usr/man DESTDIR=$PKG || exit 1 # System udev files should go under /lib: if [ -r $PKG/etc/udev/rules.d/70-infrared.rules ]; then diff --git a/source/l/virtuoso-ose/virtuoso-opensource-6.1.3.unicode.patch b/source/l/virtuoso-ose/virtuoso-opensource-6.1.3.unicode.patch new file mode 100644 index 000000000..6aa5e5a5a --- /dev/null +++ b/source/l/virtuoso-ose/virtuoso-opensource-6.1.3.unicode.patch @@ -0,0 +1,16 @@ +--- libsrc/Wi/xqf.c 3 Mar 2011 11:56:45 -0000 1.21.2.9 ++++ libsrc/Wi/xqf.c 26 Aug 2011 19:34:56 -0000 1.21.2.12 +@@ -3520,6 +3552,12 @@ + desc = xqf_str_parser_descs + desc_idx; + if (DV_DB_NULL == arg_dtp) + return NEW_DB_NULL; ++ /* if we have wide and we want typed string we do utf8, cast do to default charset so we do not do it */ ++ if (DV_WIDE == arg_dtp && desc->p_dest_dtp == DV_STRING) ++ { ++ res = box_wide_as_utf8_char (arg, box_length (arg) / sizeof (wchar_t) - 1, DV_STRING); ++ goto res_ready; ++ } + if (DV_STRING != arg_dtp) + { + caddr_t err = NULL; + diff --git a/source/l/virtuoso-ose/virtuoso-ose.SlackBuild b/source/l/virtuoso-ose/virtuoso-ose.SlackBuild index 5dd4fe5c8..bb9d88abe 100755 --- a/source/l/virtuoso-ose/virtuoso-ose.SlackBuild +++ b/source/l/virtuoso-ose/virtuoso-ose.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright 2009, 2010 Eric Hameleers, Eindhoven, NL -# Copyright 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2010, 2011 Eric Hameleers, Eindhoven, NL +# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=virtuoso-opensource VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -61,6 +61,11 @@ cd $TMP rm -rf virtuoso-opensource-$VERSION tar xvf $CWD/virtuoso-opensource-$VERSION.tar.xz || exit 1 cd virtuoso-opensource-$VERSION || exit 1 + +# Apply a patch that fixes Unicode issue as described here: +# https://bugs.kde.org/show_bug.cgi?id=271664 +cat $CWD/virtuoso-opensource-6.1.3.unicode.patch | patch -p0 --verbose || exit + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/vte/fix_meta_alt_keybinding.patch b/source/l/vte/fix_meta_alt_keybinding.patch new file mode 100644 index 000000000..bd364be58 --- /dev/null +++ b/source/l/vte/fix_meta_alt_keybinding.patch @@ -0,0 +1,74 @@ +From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Tue, 15 Nov 2011 03:06:40 -0500 +Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2 + compatibility + +Also, since VTE_META_MASK is now a mask with multiple bits set, code that +compares gdk key modifiers to VTE_META_MASK by numerical equality is no +longer guaranteed to work. Therefore, for such comparisons a new function, +vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits +matching matching VTE_META_MASK are set, then all are set. + +https://bugzilla.gnome.org/show_bug.cgi?id=663779 +--- + src/keymap.c | 15 +++++++++++++-- + src/keymap.h | 2 +- + 2 files changed, 14 insertions(+), 3 deletions(-) + +diff --git a/src/keymap.c b/src/keymap.c +index 9a21669..95b4c5b 100644 +--- a/src/keymap.c ++++ b/src/keymap.c +@@ -990,6 +990,17 @@ static const struct _vte_keymap_group { + {GDK_KEY (F35), _vte_keymap_GDK_F35}, + }; + ++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK, ++ * despite being a compound mask, is treated as indivisible. */ ++GdkModifierType ++_vte_keymap_fixup_modifiers(GdkModifierType modifiers, ++ GdkModifierType mask) ++{ ++ if (modifiers & VTE_META_MASK) ++ modifiers |= VTE_META_MASK; ++ return modifiers & mask; ++} ++ + /* Map the specified keyval/modifier setup, dependent on the mode, to either + * a literal string or a capability name. */ + void +@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval, + } else { + fkey_mode = fkey_default; + } +- modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); ++ modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK); + + /* Search for the conditions. */ + for (i = 0; entries[i].normal_length || entries[i].special[0]; i++) +@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval, + return; + } + +- switch (modifiers & significant_modifiers) { ++ switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) { + case 0: + modifier = 0; + break; +diff --git a/src/keymap.h b/src/keymap.h +index 243e22e..21d9b8e 100644 +--- a/src/keymap.h ++++ b/src/keymap.h +@@ -27,7 +27,7 @@ + + G_BEGIN_DECLS + +-#define VTE_META_MASK GDK_META_MASK ++#define VTE_META_MASK (GDK_META_MASK | GDK_MOD1_MASK) + #define VTE_NUMLOCK_MASK GDK_MOD2_MASK + + /* Map the specified keyval/modifier setup, dependent on the mode, to either +-- +1.7.8.rc3 + diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild index 858b119ab..70386cb13 100755 --- a/source/l/vte/vte.SlackBuild +++ b/source/l/vte/vte.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2007, 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=vte VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -70,6 +70,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# https://bugzilla.gnome.org/show_bug.cgi?id=663779 +zcat $CWD/fix_meta_alt_keybinding.patch.gz | patch -p1 || exit 1 + +# Escape sequences can cause high CPU usage (CVE-2012-2738): +zcat $CWD/vte.escape.cpu.usage.diff.gz | patch -p1 || exit 1 + # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/source/l/vte/vte.escape.cpu.usage.diff b/source/l/vte/vte.escape.cpu.usage.diff new file mode 100644 index 000000000..e82cf4687 --- /dev/null +++ b/source/l/vte/vte.escape.cpu.usage.diff @@ -0,0 +1,89 @@ +--- ./src/table.c.orig 2011-08-16 16:52:48.000000000 -0500 ++++ ./src/table.c 2012-08-08 21:25:15.080344805 -0500 +@@ -550,7 +550,7 @@ + if (G_UNLIKELY (*array == NULL)) { + *array = g_value_array_new(1); + } +- g_value_set_long(&value, total); ++ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT)); + g_value_array_append(*array, &value); + } while (i++ < arginfo->length); + g_value_unset(&value); +--- ./src/vteseq.c.orig 2011-08-16 16:52:48.000000000 -0500 ++++ ./src/vteseq.c 2012-08-08 21:25:15.104344804 -0500 +@@ -557,7 +557,7 @@ + GValueArray *params, + VteTerminalSequenceHandler handler) + { +- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG); ++ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT); + } + + static void +@@ -1392,7 +1392,7 @@ + static void + vte_sequence_handler_DC (VteTerminal *terminal, GValueArray *params) + { +- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_dc); ++ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_dc); + } + + /* Delete a line at the current cursor position. */ +@@ -1785,7 +1785,7 @@ + static void + vte_sequence_handler_RI (VteTerminal *terminal, GValueArray *params) + { +- vte_sequence_handler_multiple(terminal, params, vte_sequence_handler_nd); ++ vte_sequence_handler_multiple_r(terminal, params, vte_sequence_handler_nd); + } + + /* Save cursor (position). */ +@@ -2777,8 +2777,7 @@ + { + GValue *value; + VteScreen *screen; +- long param, end, row; +- int i; ++ long param, end, row, i, limit; + screen = terminal->pvt->screen; + /* The default is one. */ + param = 1; +@@ -2796,7 +2795,13 @@ + } else { + end = screen->insert_delta + terminal->row_count - 1; + } +- /* Insert the new lines at the cursor. */ ++ ++ /* Only allow to insert as many lines as there are between this row ++ * and the end of the scrolling region. See bug #676090. ++ */ ++ limit = end - row + 1; ++ param = MIN (param, limit); ++ + for (i = 0; i < param; i++) { + /* Clear a line off the end of the region and add one to the + * top of the region. */ +@@ -2817,8 +2822,7 @@ + { + GValue *value; + VteScreen *screen; +- long param, end, row; +- int i; ++ long param, end, row, i, limit; + + screen = terminal->pvt->screen; + /* The default is one. */ +@@ -2837,6 +2841,13 @@ + } else { + end = screen->insert_delta + terminal->row_count - 1; + } ++ ++ /* Only allow to delete as many lines as there are between this row ++ * and the end of the scrolling region. See bug #676090. ++ */ ++ limit = end - row + 1; ++ param = MIN (param, limit); ++ + /* Clear them from below the current cursor. */ + for (i = 0; i < param; i++) { + /* Insert a line at the end of the region and remove one from diff --git a/source/l/wv2/slack-desc b/source/l/wv2/slack-desc deleted file mode 100644 index e5861a4b6..000000000 --- a/source/l/wv2/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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------------------------------------------------------| -wv2: wv2 (MS Word document import library) -wv2: -wv2: wv2 is a portable MS Word .doc import filter that is used by KWord. -wv2: Currently, it supports MS Word 6, MS Word 95, MS Word 97, MS Word -wv2: 2000, and MS Word 2002 (XP) documents. Older versions like Word 2, 3, -wv2: 4, and 5 aren't supported yet, but might be in the future. -wv2: -wv2: wv2's authors are Shaheed Haque, Werner Trobin, and David Faure. -wv2: -wv2: -wv2: diff --git a/source/l/zlib/zlib.SlackBuild b/source/l/zlib/zlib.SlackBuild index 9d5f928d7..eb2842806 100755 --- a/source/l/zlib/zlib.SlackBuild +++ b/source/l/zlib/zlib.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2005-2010 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=zlib VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -64,13 +64,6 @@ rm -rf zlib-$VERSION tar xvf $CWD/zlib-$VERSION.tar.?z* || exit 1 cd zlib-$VERSION || exit 1 -# Attempt to work around a problem that affects libxml2 on 64-bits -# and probably breaks other things as well. The issue stems from -# misuse of zlib by other libraries, but there's no other good place -# to put this fix. Note to self - keep an eye on upstream for a -# proper fix. -zcat $CWD/zlib.largefile64_source.diff.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -104,6 +97,18 @@ cat zlib.3 | gzip -9c > $PKG/usr/man/man3/zlib.3.gz mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig cat zlib.pc > $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/zlib.pc +# Now that libkmod requires libz, we had better move the shared library +# up a level: +mkdir $PKG/lib${LIBDIRSUFFIX} +( cd $PKG/usr/lib${LIBDIRSUFFIX} + for file in lib*.so.?.* ; do + mv $file ../../lib${LIBDIRSUFFIX} + ln -sf ../../lib${LIBDIRSUFFIX}/$file . + done + cp -a lib*.so.? ../../lib${LIBDIRSUFFIX} +) + +# 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 diff --git a/source/l/zlib/zlib.largefile64_source.diff b/source/l/zlib/zlib.largefile64_source.diff deleted file mode 100644 index 61d7b84dd..000000000 --- a/source/l/zlib/zlib.largefile64_source.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- ./zlib.h.orig 2010-04-19 23:12:48.000000000 -0500 -+++ ./zlib.h 2011-02-09 12:12:15.000000000 -0600 -@@ -1578,7 +1578,7 @@ - # define gzoffset gzoffset64 - # define adler32_combine adler32_combine64 - # define crc32_combine crc32_combine64 --# ifdef _LARGEFILE64_SOURCE -+# ifndef _LARGEFILE64_SOURCE - ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); - ZEXTERN z_off_t ZEXPORT gzseek64 OF((gzFile, z_off_t, int)); - ZEXTERN z_off_t ZEXPORT gztell64 OF((gzFile)); |