diff options
241 files changed, 4745 insertions, 1704 deletions
@@ -1,3 +1,10 @@ +Check https://github.com/Ponce/slackbuilds/wiki for additional informations. + +See https://github.com/Ponce/slackbuilds/wiki/configuring-the-current-repository-with-sbopkg +for instructions on how to use this repository with sbopkg. + +original README from slackbuilds.org follow: +-------------------------------------------- See http://slackbuilds.org/howto/ for instructions on how to use the contents of this directory. @@ -7,3 +14,4 @@ Access is also available via: git://slackbuilds.org/slackbuilds http://slackbuilds.org/gitweb/ ftp://slackbuilds.org/ + diff --git a/audio/celt051/README b/audio/celt051/README new file mode 100644 index 0000000000..3942c44f4d --- /dev/null +++ b/audio/celt051/README @@ -0,0 +1,8 @@ +CELT is a very low delay audio codec designed for high-quality +communications. Traditional full-bandwidth codecs such as Vorbis and +AAC can offer high quality but they require codec delays of hundreds +of milliseconds, which makes them unsuitable for real-time +interactive applications like teleconferencing. Speech targeted +codecs, such as Speex or G.722, have lower 20-40ms delays but their +speech focus and limited sampling rates restricts their quality, +especially for music. diff --git a/audio/celt051/celt051.SlackBuild b/audio/celt051/celt051.SlackBuild new file mode 100644 index 0000000000..b21d940a1d --- /dev/null +++ b/audio/celt051/celt051.SlackBuild @@ -0,0 +1,97 @@ +#!/bin/sh + +# Slackware build script for celt + +# Copyright 2010 Heinz Wiesinger, Amsterdam, The Netherlands +# 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. + +PRGNAM=celt051 +VERSION=0.5.1.3 +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +# 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 + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 $OUTPUT +cd $TMP +rm -rf celt-$VERSION +tar xvf $CWD/celt-$VERSION.tar.gz +cd celt-$VERSION +chown -R root:root . +chmod -R u+w,go+r-w,a-s . + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --disable-static \ + --build=$ARCH-slackware-linux \ + --host=$ARCH-slackware-linux + +make +make install-strip 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 || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/celt051/celt051.info b/audio/celt051/celt051.info new file mode 100644 index 0000000000..1cc42bbdef --- /dev/null +++ b/audio/celt051/celt051.info @@ -0,0 +1,10 @@ +PRGNAM="celt051" +VERSION="0.5.1.3" +HOMEPAGE="http://www.celt-codec.org/" +DOWNLOAD="http://downloads.xiph.org/releases/celt/celt-0.5.1.3.tar.gz" +MD5SUM="67e7b5e45db57a6f1f0a6962f5ecb190" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/audio/celt051/slack-desc b/audio/celt051/slack-desc new file mode 100644 index 0000000000..b294651b7a --- /dev/null +++ b/audio/celt051/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------------------------------------------------------| +celt051: celt051 (low delay audio codec - version 0.5.1.x) +celt051: +celt051: CELT is a very low delay audio codec designed for high-quality +celt051: communications. Traditional full-bandwidth codecs such as Vorbis and +celt051: AAC can offer high quality but they require codec delays of hundreds +celt051: of milliseconds, which makes them unsuitable for real-time +celt051: interactive applications like teleconferencing. Speech targeted +celt051: codecs, such as Speex or G.722, have lower 20-40ms delays but their +celt051: speech focus and limited sampling rates restricts their quality, +celt051: especially for music. +celt051: diff --git a/audio/id3/id3.SlackBuild b/audio/id3/id3.SlackBuild index b3de0c065f..a6edf3680d 100644 --- a/audio/id3/id3.SlackBuild +++ b/audio/id3/id3.SlackBuild @@ -70,10 +70,8 @@ cp -a id3.man $PKG/usr/man/man1/id3.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 -( 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/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/$PRGNAM-$VERSION cp -a \ diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild index da31ce86d8..86786cb7c5 100644 --- a/audio/mixxx/mixxx.SlackBuild +++ b/audio/mixxx/mixxx.SlackBuild @@ -59,9 +59,10 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION~release-1.9.x~bzr2720 +rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz -cd $PRGNAM-$VERSION~release-1.9.x~bzr2720 +mv $PRGNAM-$VERSION* $PRGNAM-$VERSION +cd $PRGNAM-$VERSION chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -74,7 +75,9 @@ patch -p0 < $CWD/desktop.diff CFLAGS="$SLKCFLAGS" \ QTDIR=/usr/lib$LIBDIRSUFFIX/qt \ +# it seems libshout isn't detected :( scons \ + shoutcast=0 \ prefix=/usr QTDIR=/usr/lib$LIBDIRSUFFIX/qt \ diff --git a/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild index 70c8cba5b6..92aac65236 100644 --- a/audio/xmms2/xmms2.SlackBuild +++ b/audio/xmms2/xmms2.SlackBuild @@ -7,7 +7,7 @@ # Updated by Andrew Brouwers, abrouwers at gmail d0t com (13.0, 64-bit) PRGNAM=xmms2 -VERSION="0.7DrNo" +VERSION="0.8DrO_o" BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/audio/xmms2/xmms2.info b/audio/xmms2/xmms2.info index 916ec451ba..6e6cbfb997 100644 --- a/audio/xmms2/xmms2.info +++ b/audio/xmms2/xmms2.info @@ -1,10 +1,10 @@ PRGNAM="xmms2" -VERSION="0.7DrNo" +VERSION="0.8DrO_o" HOMEPAGE="http://wiki.xmms2.xmms.se/" -DOWNLOAD="http://downloads.sourceforge.net/xmms2/xmms2-0.7DrNo.tar.bz2" -MD5SUM="60e50b591078acb6a85cd83de0f2b077" +DOWNLOAD="http://downloads.sourceforge.net/xmms2/xmms2-0.8DrO_o.tar.bz2" +MD5SUM="84d5c05a70bfd31ed392a4e3f701eaa3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Andrew Brouwers" EMAIL="abrouwers@gmail.com" -APPROVED="Erik Hanson" +APPROVED="" diff --git a/desktop/lxde-common/config/panel b/desktop/lxde-common/config/panel index e81e5e5779..0ff574412e 100644 --- a/desktop/lxde-common/config/panel +++ b/desktop/lxde-common/config/panel @@ -142,6 +142,29 @@ Plugin { } Plugin { + type = batt + Config { + HideIfNoBattery=0 + AlarmCommand=xmessage Battery low + AlarmTime=5 + BackgroundColor=black + BorderWidth=1 + ChargingColor1=#28f200 + ChargingColor2=#22cc00 + DischargingColor1=#ffee00 + DischargingColor2=#d9ca00 + Size=8 + } +} + +Plugin { + type = space + Config { + Size=4 + } +} + +Plugin { type = cpu } diff --git a/desktop/lxde-common/lxde-common.SlackBuild b/desktop/lxde-common/lxde-common.SlackBuild index bee71a1d4e..d9c0bb18e5 100644 --- a/desktop/lxde-common/lxde-common.SlackBuild +++ b/desktop/lxde-common/lxde-common.SlackBuild @@ -42,6 +42,9 @@ # 0.5.5-1: 26/dec/2011 by ponce <matteo.bernardini@gmail.com> # * Update. # * su_cmd defaults to gksu-polkit. +# 0.5.5-2: 31/dec/2011 by ponce <matteo.bernardini@gmail.com> +# * updated panel default config with battery indicator +# (now seems to work). # # Run 'sh lxde-common.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -51,7 +54,7 @@ PRGNAM=lxde-common VERSION=${VERSION:-0.5.5} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/desktop/lxde-common/lxde-common.info b/desktop/lxde-common/lxde-common.info index 2b6f591030..6893bf03fa 100644 --- a/desktop/lxde-common/lxde-common.info +++ b/desktop/lxde-common/lxde-common.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="ponce" EMAIL="matteo.bernardini@gmail.com" -APPROVED="Erik Hanson" +APPROVED="" diff --git a/desktop/lxpanel/config/panel b/desktop/lxpanel/config/panel index e81e5e5779..0ff574412e 100644 --- a/desktop/lxpanel/config/panel +++ b/desktop/lxpanel/config/panel @@ -142,6 +142,29 @@ Plugin { } Plugin { + type = batt + Config { + HideIfNoBattery=0 + AlarmCommand=xmessage Battery low + AlarmTime=5 + BackgroundColor=black + BorderWidth=1 + ChargingColor1=#28f200 + ChargingColor2=#22cc00 + DischargingColor1=#ffee00 + DischargingColor2=#d9ca00 + Size=8 + } +} + +Plugin { + type = space + Config { + Size=4 + } +} + +Plugin { type = cpu } diff --git a/desktop/lxpanel/lxpanel.SlackBuild b/desktop/lxpanel/lxpanel.SlackBuild index e4d87eaa1c..2d43d0d828 100644 --- a/desktop/lxpanel/lxpanel.SlackBuild +++ b/desktop/lxpanel/lxpanel.SlackBuild @@ -24,7 +24,7 @@ # Modified by ponce <matteo.bernardini@gmail.com> PRGNAM=lxpanel -VERSION=${VERSION:-20111223_ef3cf14} +VERSION=${VERSION:-20111230_9acb4d2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/lxpanel/lxpanel.info b/desktop/lxpanel/lxpanel.info index 12160b224a..9151715cc8 100644 --- a/desktop/lxpanel/lxpanel.info +++ b/desktop/lxpanel/lxpanel.info @@ -1,10 +1,10 @@ PRGNAM="lxpanel" -VERSION="20111223_ef3cf14" +VERSION="20111230_9acb4d2" HOMEPAGE="http://wiki.lxde.org/en/LXPanel" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxpanel-20111223_ef3cf14.tar.xz" -MD5SUM="abed25038a6dc391b81ce469bc63fc54" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxpanel-20111230_9acb4d2.tar.xz" +MD5SUM="29bf57511a7922b1b124d6eb2cdff42e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="ponce" EMAIL="matteo.bernardini@gmail.com" -APPROVED="Erik Hanson" +APPROVED="" diff --git a/desktop/wmCalClock/wmCalClock.SlackBuild b/desktop/wmCalClock/wmCalClock.SlackBuild index bc068e5a62..b6b0e17be9 100644 --- a/desktop/wmCalClock/wmCalClock.SlackBuild +++ b/desktop/wmCalClock/wmCalClock.SlackBuild @@ -66,10 +66,8 @@ 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 -( 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/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/$PRGNAM-$VERSION cp -a BUGS CHANGES COPYING HINTS INSTALL README TODO \ diff --git a/desktop/wmMoonClock/wmMoonClock.SlackBuild b/desktop/wmMoonClock/wmMoonClock.SlackBuild index a1d9b95d06..31ed32ea0a 100644 --- a/desktop/wmMoonClock/wmMoonClock.SlackBuild +++ b/desktop/wmMoonClock/wmMoonClock.SlackBuild @@ -67,10 +67,8 @@ 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 -( 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/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/$PRGNAM-$VERSION cp -a BUGS COPYING $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/desktop/wmakerconf/wmakerconf.SlackBuild b/desktop/wmakerconf/wmakerconf.SlackBuild index b6ea8d85fe..67ae4ac488 100644 --- a/desktop/wmakerconf/wmakerconf.SlackBuild +++ b/desktop/wmakerconf/wmakerconf.SlackBuild @@ -73,10 +73,8 @@ 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 || true -( 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/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/$PRGNAM-$VERSION cp -a \ diff --git a/desktop/wmswallow/README b/desktop/wmswallow/README new file mode 100644 index 0000000000..df8422eab4 --- /dev/null +++ b/desktop/wmswallow/README @@ -0,0 +1,3 @@ +wmswallow (app docker) + +Dock any (!) application into the WindowMaker dock. diff --git a/desktop/wmswallow/slack-desc b/desktop/wmswallow/slack-desc new file mode 100644 index 0000000000..7f5463e8d1 --- /dev/null +++ b/desktop/wmswallow/slack-desc @@ -0,0 +1,14 @@ +# 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------------------------------------------------------| +wmswallow: wmswallow (app docker) +wmswallow: +wmswallow: Dock any (!) application into the WindowMaker dock. +wmswallow: +wmswallow: homepage: http://www.dockapps.org/file.php/id/102 +wmswallow: diff --git a/desktop/wmswallow/wmswallow.SlackBuild b/desktop/wmswallow/wmswallow.SlackBuild new file mode 100644 index 0000000000..0466bfd454 --- /dev/null +++ b/desktop/wmswallow/wmswallow.SlackBuild @@ -0,0 +1,74 @@ +#!/bin/sh + +# Slackware build script for wmswallow +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=wmswallow +VERSION=${VERSION:-0.6.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 $OUTPUT +cd $TMP +rm -rf $PRGNAM +tar xvf $CWD/$PRGNAM.tar.Z +cd $PRGNAM +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 {} \; + +sed -i -e "s|CFLAGS=-Wall -g|CFLAGS=$SLKCFLAGS|" Makefile +sed -i -e "s|\}/lib|}/lib$LIBDIRSUFFIX|" Makefile + +cat Makefile + +make xfree + +mkdir -p $PKG/usr/bin +install -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM + +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/$PRGNAM-$VERSION +cp -a CHANGELOG LICENCE README todo $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/wmswallow/wmswallow.info b/desktop/wmswallow/wmswallow.info new file mode 100644 index 0000000000..3a6a47f9bd --- /dev/null +++ b/desktop/wmswallow/wmswallow.info @@ -0,0 +1,10 @@ +PRGNAM="wmswallow" +VERSION="0.6.1" +HOMEPAGE="http://www.dockapps.org/file.php/id/102" +DOWNLOAD="http://www.dockapps.org/download.php/id/141/wmswallow.tar.Z" +MD5SUM="7ab8efef879a0ad6b64980f346635841" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/desktop/yad/notification.c.r158 b/desktop/yad/notification.c.r158 deleted file mode 100644 index adcaa859ac..0000000000 --- a/desktop/yad/notification.c.r158 +++ /dev/null @@ -1,380 +0,0 @@ -/* - * This file is part of YAD. - * - * YAD 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 3 of the License, or - * (at your option) any later version. - * - * YAD 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 YAD; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * Copyright (C) 2008-2010, Victor Ananjevsky <ananasik@gmail.com> - * - */ - -#include <sys/stat.h> -#include <fcntl.h> -#include <time.h> -#include <string.h> -#include <unistd.h> -#include <errno.h> - -#include "yad.h" - -typedef struct { - gchar *name; - gchar *action; -} MenuData; - -static GtkStatusIcon *status_icon; - -static gchar *icon = NULL; -static gchar *action = NULL; - -static GSList *menu_data; - -static gint exit_code; -static gint icon_size; - -static void -timeout_cb (gpointer data) -{ - exit_code = YAD_RESPONSE_TIMEOUT; - gtk_main_quit (); -} - -static void -set_icon (void) -{ - GdkPixbuf *pixbuf; - GError *err = NULL; - - if (icon == NULL) - { - gtk_status_icon_set_from_icon_name (status_icon, "yad"); - return; - } - - if (g_file_test (icon, G_FILE_TEST_EXISTS)) - { - pixbuf = - gdk_pixbuf_new_from_file_at_scale (icon, icon_size, icon_size, - TRUE, &err); - if (err) - { - g_printerr (_("Could not load notification icon '%s': %s"), - icon, err->message); - g_clear_error (&err); - } - if (pixbuf) - { - gtk_status_icon_set_from_pixbuf (status_icon, pixbuf); - g_object_unref (pixbuf); - } - else - gtk_status_icon_set_from_icon_name (status_icon, "yad"); - } - else - gtk_status_icon_set_from_icon_name (status_icon, icon); -} - -static gboolean -icon_size_changed_cb (GtkStatusIcon * icon, gint size, gpointer data) -{ - icon_size = size; - set_icon (); - return TRUE; -} - -static gboolean -activate_cb (GtkWidget * widget, YadData * data) -{ - if (action == NULL || g_ascii_strcasecmp (action, "quit") == 0) - { - exit_code = YAD_RESPONSE_OK; - gtk_main_quit (); - } - else - g_spawn_command_line_async (action, NULL); - - return TRUE; -} - -static gboolean -middle_quit_cb (GtkStatusIcon * icon, GdkEventButton * ev, - gpointer data) -{ - if (ev->button == 2) - { - exit_code = YAD_RESPONSE_ESC; - gtk_main_quit (); - } - - return FALSE; -} - -static void -popup_menu_item_activate_cb (GtkWidget * w, gpointer data) -{ - gchar *cmd = (gchar *) data; - - if (g_ascii_strcasecmp (cmd, "quit") == 0) - { - exit_code = YAD_RESPONSE_OK; - gtk_main_quit (); - } - else - g_spawn_command_line_async (cmd, NULL); -} - -static void -popup_menu_cb (GtkStatusIcon * icon, guint button, - guint activate_time, gpointer data) -{ - GtkWidget *menu; - GtkWidget *item; - int i; - - g_return_if_fail (menu_data != NULL); - - menu = gtk_menu_new (); - for (i = 0; i < g_slist_length (menu_data); i++) - { - MenuData *d = (MenuData *) g_slist_nth_data (menu_data, i); - - if (d->name) - { - item = gtk_menu_item_new_with_label (d->name); - g_signal_connect (GTK_MENU_ITEM (item), "activate", - G_CALLBACK (popup_menu_item_activate_cb), - (gpointer) d->action); - } - else - item = gtk_separator_menu_item_new (); - - gtk_widget_show (item); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - } - gtk_menu_popup (GTK_MENU (menu), NULL, NULL, - gtk_status_icon_position_menu, - icon, button, activate_time); -} - -static gboolean -handle_stdin (GIOChannel * channel, - GIOCondition condition, gpointer data) -{ - if ((condition & G_IO_IN) != 0) - { - GString *string; - GError *err = NULL; - - string = g_string_new (NULL); - while (channel->is_readable == FALSE) ; - - do - { - gint status; - gchar *command, *value, **args; - - do - { - status = - g_io_channel_read_line_string (channel, string, NULL, &err); - - while (gdk_events_pending ()) - gtk_main_iteration (); - } - while (status == G_IO_STATUS_AGAIN); - strip_new_line (string->str); - - if (status != G_IO_STATUS_NORMAL) - { - if (err) - { - g_printerr ("yad_notification_handle_stdin(): %s\n", - err->message); - g_error_free (err); - err = NULL; - } - continue; - } - - args = g_strsplit (string->str, ":", 2); - command = g_strdup (args[0]); - value = g_strdup (args[1]); - g_strfreev (args); - - if (!g_ascii_strcasecmp (command, "icon")) - { - while (*value && g_ascii_isspace (*value)) - value++; - - g_free (icon); - icon = g_strdup (value); - - if (gtk_status_icon_get_visible (status_icon) && - gtk_status_icon_is_embedded (status_icon)) - set_icon (); - } - else if (!g_ascii_strcasecmp (command, "tooltip")) - { - if (g_utf8_validate (value, -1, NULL)) - { - gchar *message = g_strcompress (value); -#if GTK_CHECK_VERSION(2,16,0) - if (options.data.no_markup) - gtk_status_icon_set_tooltip_markup (status_icon, message); - else - gtk_status_icon_set_tooltip_text (status_icon, message); -#else - gtk_status_icon_set_tooltip (status_icon, message); -#endif - - g_free (message); - } - else - g_printerr (_("Invalid UTF-8 in tooltip!\n")); - } - else if (!g_ascii_strcasecmp (command, "visible")) - { -#if !GTK_CHECK_VERSION(2,91,0) - if (!g_ascii_strcasecmp (value, "blink")) - { - gboolean state = gtk_status_icon_get_blinking (status_icon); - gtk_status_icon_set_blinking (status_icon, !state); - } - else -#endif - if (!g_ascii_strcasecmp (value, "false")) - gtk_status_icon_set_visible (status_icon, FALSE); - else - gtk_status_icon_set_visible (status_icon, TRUE); - } - else if (!g_ascii_strcasecmp (command, "action")) - { - g_free (action); - action = g_strdup (value); - } - else if (!g_ascii_strcasecmp (command, "quit")) - { - exit_code = YAD_RESPONSE_OK; - gtk_main_quit (); - } - else if (!g_ascii_strcasecmp (command, "menu")) - { - MenuData *mdata; - int i = 0; - gchar *s, **menu_vals = g_strsplit (value, options.common_data.separator, -1); - - g_slist_free (menu_data); - menu_data = NULL; - - while (menu_vals[i] != NULL) - { - mdata = g_new0 (MenuData, 1); - s = strchr (menu_vals[i], settings.menu_sep[0]); - if (s != NULL) - { - mdata->name = - g_strndup (menu_vals[i], s - menu_vals[i]); - mdata->action = g_strdup (s + 1); - } - menu_data = g_slist_append (menu_data, mdata); - i++; - } - - g_strfreev (menu_vals); - } - else - g_printerr (_("Unknown command '%s'\n"), command); - - g_free (command); - g_free (value); - } - while (g_io_channel_get_buffer_condition (channel) == G_IO_IN); - g_string_free (string, TRUE); - } - - if ((condition & G_IO_HUP) != 0) - { - g_io_channel_shutdown (channel, TRUE, NULL); - gtk_main_quit (); - return FALSE; - } - - return TRUE; -} - -gint -yad_notification_run () -{ - GIOChannel *channel = NULL; - - status_icon = gtk_status_icon_new (); - g_signal_connect (status_icon, "size-changed", - G_CALLBACK (icon_size_changed_cb), NULL); - - if (options.data.dialog_text) - { -#if GTK_CHECK_VERSION(2,16,0) - if (options.data.no_markup) - gtk_status_icon_set_tooltip_markup (status_icon, options.data.dialog_text); - else - gtk_status_icon_set_tooltip_text (status_icon, options.data.dialog_text); -#else - gtk_status_icon_set_tooltip (status_icon, options.data.dialog_text); -#endif - } - else -#if GTK_CHECK_VERSION(2,16,0) - gtk_status_icon_set_tooltip_text (status_icon, _("Yad notification")); -#else - gtk_status_icon_set_tooltip (status_icon, _("Yad notification")); -#endif - - if (options.data.dialog_image) - icon = g_strdup (options.data.dialog_image); - if (options.common_data.command) - action = g_strdup (options.common_data.command); - menu_data = NULL; - - g_signal_connect (status_icon, "activate", - G_CALLBACK (activate_cb), NULL); - - /* quit on middle click (like press Esc) */ - g_signal_connect (status_icon, "button-press-event", - G_CALLBACK (middle_quit_cb), NULL); - - if (options.notification_data.listen) - { - channel = g_io_channel_unix_new (0); - if (channel) - { - g_io_channel_set_encoding (channel, NULL, NULL); - g_io_channel_set_flags (channel, G_IO_FLAG_NONBLOCK, NULL); - g_io_add_watch (channel, G_IO_IN | G_IO_HUP, handle_stdin, NULL); - - g_signal_connect (status_icon, "popup_menu", - G_CALLBACK (popup_menu_cb), NULL); - } - } - - /* Show icon and wait */ - gtk_status_icon_set_visible (status_icon, TRUE); - - if (options.data.timeout > 0) - g_timeout_add_seconds (options.data.timeout, - (GSourceFunc) timeout_cb, NULL); - - gtk_main (); - - return exit_code; -} diff --git a/desktop/yad/yad.SlackBuild b/desktop/yad/yad.SlackBuild index cd6b847473..b35fdd41f5 100644 --- a/desktop/yad/yad.SlackBuild +++ b/desktop/yad/yad.SlackBuild @@ -5,7 +5,7 @@ # Written by Charles (SlackBuilds@catcons.co.uk) PRGNAM=yad -VERSION=${VERSION:-0.5.2} +VERSION=${VERSION:-0.12.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,9 +51,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Update notification.c with the SVN r158 version -cp $CWD/notification.c.r158 src/notification.c - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/yad/yad.info b/desktop/yad/yad.info index 02568f52fd..d03c5d5ff6 100644 --- a/desktop/yad/yad.info +++ b/desktop/yad/yad.info @@ -1,10 +1,10 @@ PRGNAM="yad" -VERSION="0.5.2" +VERSION="0.12.1" HOMEPAGE="http://code.google.com/p/yad/" -DOWNLOAD="http://yad.googlecode.com/files/yad-0.5.2.tar.xz" -MD5SUM="184c6476a79c6f456ca1f7f18127aa83" +DOWNLOAD="http://yad.googlecode.com/files/yad-0.12.1.tar.xz" +MD5SUM="eb978f5e1d5975d1937fd09ace79aef9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Charles" EMAIL="SlackBuilds@catcons.co.uk" -APPROVED="rworkman" +APPROVED="" diff --git a/development/icecream/icecream.SlackBuild b/development/icecream/icecream.SlackBuild index 0a745b9990..f3a8f51d8e 100644 --- a/development/icecream/icecream.SlackBuild +++ b/development/icecream/icecream.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=icecream SRCNAM=icecc -VERSION=0.9.6 +VERSION=0.9.7 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/icecream/icecream.info b/development/icecream/icecream.info index e64a545480..9b7f376353 100644 --- a/development/icecream/icecream.info +++ b/development/icecream/icecream.info @@ -1,10 +1,10 @@ PRGNAM="icecream" -VERSION="0.9.6" +VERSION="0.9.7" HOMEPAGE="http://old-en.opensuse.org/Icecream" -DOWNLOAD="ftp://ftp.suse.com/pub/projects/icecream/icecc-0.9.6.tar.bz2" -MD5SUM="c6dacb3f28eade45f603a99245cde4fd" +DOWNLOAD="ftp://ftp.suse.com/pub/projects/icecream/icecc-0.9.7.tar.bz2" +MD5SUM="c06900c2f4011428d0d48826a04f74fb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="rworkman" +APPROVED="" diff --git a/development/opencl-headers/README b/development/opencl-headers/README new file mode 100644 index 0000000000..4e432b6b4d --- /dev/null +++ b/development/opencl-headers/README @@ -0,0 +1,3 @@ +opencl-headers (headers file for OpenCL) + +This is a repackaging of the header files from khronos.org. diff --git a/development/opencl-headers/opencl-headers.SlackBuild b/development/opencl-headers/opencl-headers.SlackBuild new file mode 100644 index 0000000000..edb3bd055c --- /dev/null +++ b/development/opencl-headers/opencl-headers.SlackBuild @@ -0,0 +1,34 @@ +#!/bin/sh + +# Slackware build script for opencl-headers +# Written by ponce <matteo.bernardini@gmail.com> +# simply a repack of the original headers from khronos.org +# tarballed by me for easy maintenance. + +PRGNAM=opencl-headers +VERSION=${VERSION:-1.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG/usr/include/CL $OUTPUT +tar xf $CWD/$PRGNAM-$VERSION.tar.xz -C $PKG/usr/include/CL +chown root.root $PKG/usr/include/CL/* +chmod 644 $PKG/usr/include/CL/* + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/opencl-headers/opencl-headers.info b/development/opencl-headers/opencl-headers.info new file mode 100644 index 0000000000..4efba0ae51 --- /dev/null +++ b/development/opencl-headers/opencl-headers.info @@ -0,0 +1,10 @@ +PRGNAM="opencl-headers" +VERSION="1.1" +HOMEPAGE="http://www.khronos.org/opencl/" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/opencl-headers-1.1.tar.xz" +MD5SUM="3b9b4c49b3ddf37e275c5c22f94aa80a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/development/opencl-headers/slack-desc b/development/opencl-headers/slack-desc new file mode 100644 index 0000000000..c2ff1efcec --- /dev/null +++ b/development/opencl-headers/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------------------------------------------------------| +opencl-headers: opencl-headers (headers file for OpenCL) +opencl-headers: +opencl-headers: This is a repackaging of the header files from khronos.org. +opencl-headers: +opencl-headers: homepage: http://www.khronos.org/opencl/ +opencl-headers: +opencl-headers: +opencl-headers: +opencl-headers: +opencl-headers: +opencl-headers: diff --git a/development/rpcnis-headers/README b/development/rpcnis-headers/README new file mode 100644 index 0000000000..3c2e34c2d9 --- /dev/null +++ b/development/rpcnis-headers/README @@ -0,0 +1,10 @@ +rpcnis-headers (RPC NIS header files) + +RPC NIS headers no more in glibc >= 2.14. + +In the intentions of Ulrich Drepper you shouldn't +need these headers at all and use instead the +headers provided by libtirpc in /usr/include/tirpc +for software that requires rpc. +In practice it doesn't always work like that and +this might be needed. diff --git a/development/rpcnis-headers/rpcnis-headers.SlackBuild b/development/rpcnis-headers/rpcnis-headers.SlackBuild new file mode 100644 index 0000000000..a8d4da78cf --- /dev/null +++ b/development/rpcnis-headers/rpcnis-headers.SlackBuild @@ -0,0 +1,38 @@ +#!/bin/sh + +# Slackware build script for rpcnis-headers +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=rpcnis-headers +VERSION=${VERSION:-20111119} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} +ARCH=noarch +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG/usr/include $OUTPUT +tar xvf $CWD/$PRGNAM.tar.bz2 -C $PKG/usr/include +chown -R root:root $PKG +find $PKG \ + \( -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 is already in glibc package +rm $PKG/usr/include/rpc/netdb.h + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/rpcnis-headers/rpcnis-headers.info b/development/rpcnis-headers/rpcnis-headers.info new file mode 100644 index 0000000000..4a66e6478f --- /dev/null +++ b/development/rpcnis-headers/rpcnis-headers.info @@ -0,0 +1,10 @@ +PRGNAM="rpcnis-headers" +VERSION="20111119" +HOMEPAGE="http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libtirpc.html" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/rpcnis-headers.tar.bz2" +MD5SUM="635c7c9b6c962246a50a579ddbdbb95c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/development/rpcnis-headers/slack-desc b/development/rpcnis-headers/slack-desc new file mode 100644 index 0000000000..04a1694137 --- /dev/null +++ b/development/rpcnis-headers/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------------------------------------------------------| +rpcnis-headers: rpcnis-headers (RPC NIS header files) +rpcnis-headers: +rpcnis-headers: RPC NIS headers no more in glibc >= 2.14. +rpcnis-headers: +rpcnis-headers: http://www.linuxfromscratch.org/blfs/view/svn/basicnet/libtirpc.html +rpcnis-headers: +rpcnis-headers: +rpcnis-headers: +rpcnis-headers: +rpcnis-headers: +rpcnis-headers: diff --git a/development/spice-protocol/README b/development/spice-protocol/README new file mode 100644 index 0000000000..481b424168 --- /dev/null +++ b/development/spice-protocol/README @@ -0,0 +1,6 @@ +spice-protocol (spice protocol headers) + +Spice protocol defines a set of protocol messages for accessing, +controlling, and receiving inputs from remote computing devices (e.g., +keyboard, video, mouse) across networks, and sending output to them. +These are the protocol header files. diff --git a/development/spice-protocol/slack-desc b/development/spice-protocol/slack-desc new file mode 100644 index 0000000000..323be1bde3 --- /dev/null +++ b/development/spice-protocol/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------------------------------------------------------| +spice-protocol: spice-protocol (spice protocol headers) +spice-protocol: +spice-protocol: Spice protocol defines a set of protocol messages for accessing, +spice-protocol: controlling, and receiving inputs from remote computing devices (e.g., +spice-protocol: keyboard, video, mouse) across networks, and sending output to them. +spice-protocol: These are the protocol header files. +spice-protocol: +spice-protocol: homepage: http://spice-space.org +spice-protocol: +spice-protocol: +spice-protocol: diff --git a/development/spice-protocol/spice-protocol.SlackBuild b/development/spice-protocol/spice-protocol.SlackBuild new file mode 100644 index 0000000000..a95b4fc659 --- /dev/null +++ b/development/spice-protocol/spice-protocol.SlackBuild @@ -0,0 +1,49 @@ +#!/bin/sh + +# Slackware build script for spice-protocol +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=spice-protocol +VERSION=${VERSION:-0.10.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +ARCH=noarch + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README" + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$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 \ + --prefix=/usr + +make +make install DESTDIR=$PKG + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/spice-protocol/spice-protocol.info b/development/spice-protocol/spice-protocol.info new file mode 100644 index 0000000000..7218da5f73 --- /dev/null +++ b/development/spice-protocol/spice-protocol.info @@ -0,0 +1,10 @@ +PRGNAM="spice-protocol" +VERSION="0.10.0" +HOMEPAGE="http://spice-space.org" +DOWNLOAD="http://spice-space.org/download/releases/spice-protocol-0.10.0.tar.bz2" +MD5SUM="888d8a50d36a09a1c479cadddce244ae" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/development/trac-gitplugin/README b/development/trac-gitplugin/README new file mode 100644 index 0000000000..8a0780530a --- /dev/null +++ b/development/trac-gitplugin/README @@ -0,0 +1,3 @@ +trac-gitplugin (git plugin for trac) + +This is a plugin for trac that enables git to be used instead of subversion for the trac:VersioningSystemBackend. diff --git a/development/trac-gitplugin/slack-desc b/development/trac-gitplugin/slack-desc new file mode 100644 index 0000000000..d235f4aaef --- /dev/null +++ b/development/trac-gitplugin/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------------------------------------------------------| +trac-gitplugin: trac-gitplugin (git plugin for trac) +trac-gitplugin: +trac-gitplugin: This is a plugin for trac that enables git to be used instead of +trac-gitplugin: subversion for the trac:VersioningSystemBackend. +trac-gitplugin: +trac-gitplugin: +trac-gitplugin: +trac-gitplugin: +trac-gitplugin: +trac-gitplugin: homepage: http://trac-hacks.org/wiki/GitPlugin +trac-gitplugin: diff --git a/development/trac-gitplugin/trac-gitplugin.SlackBuild b/development/trac-gitplugin/trac-gitplugin.SlackBuild new file mode 100644 index 0000000000..f7d8e6041e --- /dev/null +++ b/development/trac-gitplugin/trac-gitplugin.SlackBuild @@ -0,0 +1,67 @@ +#!/bin/sh + +# Slackware build script for trac-gitplugin + +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=trac-gitplugin +VERSION=${VERSION:-20101104_60cf7b8} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z +cd $PRGNAM-$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 {} \; + +python setup.py install --root=$PKG + +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 +cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/trac-gitplugin/trac-gitplugin.info b/development/trac-gitplugin/trac-gitplugin.info new file mode 100644 index 0000000000..7a9a35811b --- /dev/null +++ b/development/trac-gitplugin/trac-gitplugin.info @@ -0,0 +1,10 @@ +PRGNAM="trac-gitplugin" +VERSION="20101104_60cf7b8" +HOMEPAGE="http://trac-hacks.org/wiki/GitPlugin" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/trac-gitplugin-20101104_60cf7b8.tar.xz" +MD5SUM="27c73b417a588a83200af09a347fc626" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/development/trac/trac.SlackBuild b/development/trac/trac.SlackBuild index 9d686b204d..36580b485e 100644 --- a/development/trac/trac.SlackBuild +++ b/development/trac/trac.SlackBuild @@ -5,7 +5,7 @@ PRGNAM="trac" SRCNAM="Trac" -VERSION=${VERSION:-0.11.6} +VERSION=${VERSION:-0.12.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/trac/trac.info b/development/trac/trac.info index e161b6d879..aee5707ae7 100644 --- a/development/trac/trac.info +++ b/development/trac/trac.info @@ -1,10 +1,10 @@ PRGNAM="trac" -VERSION="0.11.6" +VERSION="0.12.2" HOMEPAGE="http://trac.edgewall.com/" -DOWNLOAD="ftp://ftp.edgewall.com/pub/trac/Trac-0.11.6.tar.gz" -MD5SUM="f5a9542d81d3d50c3d9e46d8e2344f38" +DOWNLOAD="ftp://ftp.edgewall.com/pub/trac/Trac-0.12.2.tar.gz" +MD5SUM="f70c7676601f2592bcb7871319e62dd7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Eugene Suter" EMAIL="easuter@gmail.com" -APPROVED="dsomero" +APPROVED="" diff --git a/development/vala/vala.SlackBuild b/development/vala/vala.SlackBuild index 3ea5a4d4ea..98b619c5d3 100644 --- a/development/vala/vala.SlackBuild +++ b/development/vala/vala.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=vala -VERSION=${VERSION:-0.12.0} +VERSION=${VERSION:-0.12.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/vala/vala.info b/development/vala/vala.info index 4e82f1c8f6..81b5ba26da 100644 --- a/development/vala/vala.info +++ b/development/vala/vala.info @@ -1,10 +1,10 @@ PRGNAM="vala" -VERSION="0.12.0" +VERSION="0.12.1" HOMEPAGE="http://live.gnome.org/Vala" -DOWNLOAD="http://download.gnome.org/sources/vala/0.12/vala-0.12.0.tar.bz2" -MD5SUM="b11fafaa705085342156312e356b6ff2" +DOWNLOAD="http://download.gnome.org/sources/vala/0.12/vala-0.12.1.tar.bz2" +MD5SUM="bf35262cc611de447147d01cbac33767" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" -APPROVED="dsomero" +APPROVED="" diff --git a/games/assaultcube/assaultcube.SlackBuild b/games/assaultcube/assaultcube.SlackBuild index 01d498a457..3030eb1751 100644 --- a/games/assaultcube/assaultcube.SlackBuild +++ b/games/assaultcube/assaultcube.SlackBuild @@ -7,7 +7,7 @@ SRCNAM=AssaultCube PRGNAM=assaultcube VERSION=1.1.0.4 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -74,11 +74,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ mkdir -p $PKG/usr/share/applications install -m 0644 $CWD/$PRGNAM.desktop $PKG/usr/share/applications -for i in 16 32 64 96 128; do - convert source/vcpp/buildEnv/icon.ico -resize ${i}x${i}! $PRGNAM-$i.png - install -D -m 0644 $PRGNAM-$i.png \ - $PKG/usr/share/icons/hicolor/${i}x${i}/apps/$PRGNAM.png -done +install -D -m 0644 $CWD/$PRGNAM.svg $PKG/usr/share/pixmaps/$PRGNAM.svg mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ diff --git a/games/assaultcube/assaultcube.svg b/games/assaultcube/assaultcube.svg new file mode 100644 index 0000000000..082e00ed5d --- /dev/null +++ b/games/assaultcube/assaultcube.svg @@ -0,0 +1,247 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="47.298313" + height="49.527348" + id="svg3711" + version="1.1" + inkscape:version="0.48.1 r9760" + sodipodi:docname="Nuovo documento 2"> + <defs + id="defs3713" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.9666667" + inkscape:cx="45.670949" + inkscape:cy="23.212821" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + fit-margin-top="2" + fit-margin-left="5" + fit-margin-right="5" + fit-margin-bottom="5" + inkscape:window-width="548" + inkscape:window-height="457" + inkscape:window-x="425" + inkscape:window-y="208" + inkscape:window-maximized="0" /> + <metadata + id="metadata3716"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Livello 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(5.6709487,-3.1905169)"> + <path + style="fill:#9b0101" + d="m 11.481424,49.24329 c -1.11526,-0.18566 -2.2013895,-0.40425 -2.4476695,-1.58035 -0.284,-2.363 1.3719995,-3.027 2.3519995,-4.291 -1.1,-1.956 -1.7829996,0.814 -3.3449995,0.598 -0.981,-0.703 -0.625,-1.494 -0.175,-2.62 -1.0070005,-0.594 -1.7290005,-1.521 -2.7700005,-2.072 1.261,-2.249 -0.622,-4.286 -0.844,-7.089 -1.529,-0.268 -2.767,-0.87 -3.87199996,-1.621 -0.057,-0.875 -0.116,-1.745 -0.174,-2.621 1.55499996,-0.637 2.93399996,-1.426 3.97399996,-2.52 -0.737,-1.677 -3.83799996,0.698 -5.315,-0.775 -0.259,-1.4 0.67700004,-1.757 1.34500004,-2.344 1.29699996,0.132 1.82599996,1.138 3.44599996,0.9 0.286,-1.157 1.375,-1.621 1.694,-2.748 -0.245,-1.326 -1.127,-1.929 -0.993,-3.691 1.141,-0.761 1.888,-1.869 4.0140005,-1.771 -0.101,-0.951999 -0.77,-1.263999 -1.244,-1.797999 0.354,-0.863 0.496,-1.917001 0.946,-2.693001 2.2019995,-0.6329997 2.6009995,0.786 4.1959995,0.847 0.82,-0.097 0.055,-1.5959997 0.224,-2.2699997 1.124,-0.307 1.858,-0.9559997 1.725,-2.3679997 1.072,1.055 3.247,0.855 3.918,2.3719997 1.461,-0.482 2.147,-1.6439997 4.018,-1.7709997 1.214,-0.179 0.887,1.3989997 1.973,1.3739997 1.077,0.239 0.931,-0.5909997 1.848,-0.4999997 0.811,-0.122 1.209,0.23 1.194,1.0519997 1.702,-0.068 2.651,0.726 3.492,1.6489997 1.399,0.051 0.881,-1.5829997 2.548,-1.2979997 1.375,1.6439997 -1.214,2.3170007 -0.452,4.5410007 0.324,1.104999 2.212,0.424 2.718,1.325999 0.152,1.544 -0.709,2.198 -1.302,3.09 0.502,1.021 0.563,1.919 0.199,2.996 0.937,1.349 0.177,4.636 1.146,5.94 0.408,1.31 -0.932,2.314 0.554,2.595 -0.003,0.822 -0.896,0.867 -1.825,0.874 1.623,0.836 2.701,2.969 1.042,4.441 -1.517,0.263 -2.412,-0.188 -3.413,-0.525 -0.3,0.092 -0.352,0.402 -0.723,0.424 0.189,1.526 1.197,2.123 1.722,3.27 -0.312,0.787 -0.666,1.531 -0.978,2.322 -1.991,0.582 -2.061,-1.029 -3.395,-0.152 -0.309,-0.313 -0.458,-0.818 -0.47,-1.474 -1.38,0.206 -1.301,1.685 -2.095,2.396 -2.158,-1.003 -3.411,0.724 -4,2.145 -2.341,0.263 -4.222,-0.009 -5.337,-1.151 -1.104,0.563 -2.491,0.875 -3.667,1.374 0.359,1.597 1.258,3.354 0.692,4.839" + id="path3653" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccccccccc" /> + <g + transform="translate(-430.83924,-152.40405)" + id="g288"> + <g + id="g290"> + <g + id="g292"> + <g + id="g294"> + <polygon + style="fill:#ffffff" + id="polygon296" + points="450.12,179.294 450.858,190.419 461.441,182.747 460.705,171.616 " /> + <g + id="g298"> + <polygon + style="fill:none" + id="polygon300" + points="450.12,179.294 450.858,190.419 461.441,182.747 460.705,171.616 " /> + <g + id="g302"> + <g + id="g304"> + <g + id="g306"> + <polygon + style="fill:#202020" + id="polygon308" + points="451.409,179.862 451.468,179.904 451.403,179.717 " /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path310" + d="m 451.47,179.3 -0.089,-0.094 0.138,0.568 c 0.259,0.189 -0.222,-0.602 -0.049,-0.474 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path312" + d="m 451.555,179.305 c 0.145,0.052 0.024,-0.174 -0.011,-0.256 0.091,0.177 -0.166,0.046 0.011,0.256 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path314" + d="m 457.629,174.742 -0.012,0.029 0.012,-0.029 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path316" + d="m 458.729,172.882 -0.102,-0.175 c -0.088,0.508 -0.641,0.457 -0.864,0.814 l -0.021,-0.074 c -0.851,0.52 -1.393,1.33 -2.1,2.033 l -0.03,-0.106 c 0.002,0.084 0.035,0.22 -0.019,0.238 l -0.042,-0.112 c -0.364,-0.148 -0.37,0.53 -0.626,0.397 -0.024,0.064 0.034,0.191 0.124,0.259 -0.574,0.521 -1.204,1.058 -1.686,1.729 -0.059,-0.016 -0.116,-0.085 -0.177,-0.185 -0.226,0.833 -0.921,1.071 -1.527,1.403 0.062,0.13 0.145,0.081 0.178,0.241 0.283,0.014 0.121,-0.521 0.438,-0.428 l 0.06,0.126 c 0.169,-0.016 -0.18,-0.298 0.046,-0.244 0.116,0.059 0.091,0.15 0.12,0.143 0.217,-0.228 0.552,-0.316 0.591,-0.758 0.233,0.199 0.275,-0.187 0.536,-0.022 -0.005,-0.144 0.078,-0.166 -0.013,-0.344 0.969,-0.509 1.694,-1.392 2.606,-2.025 0.08,-0.773 0.988,-0.581 1.374,-1.1 l 0.033,0.048 c 0.08,-0.233 0.277,-0.459 0.514,-0.542 l 0.021,-0.317 c 0.731,-0.22 1.345,-0.619 1.938,-1.048 l 0.889,-0.649 c -1.812,-0.898 -0.48,0.383 -0.917,0.47 -0.034,1.672 -0.353,3.155 0.515,4.724 l -0.111,-0.024 c 0.146,0.459 -0.031,0.899 0.116,1.331 l -0.057,0.003 c 0.547,1.061 0.087,2.276 0.668,3.295 0.445,1.021 -1.795,1.691 -2.471,2.677 l -0.064,-0.095 c -0.739,0.834 -1.945,0.96 -2.718,1.743 -1.057,0.445 -1.473,1.878 -2.587,2.258 -0.895,-0.047 -0.93,1.464 -1.798,1.378 -0.082,0.038 -1.463,0.068 -0.338,0.297 0.04,-0.336 0.015,-0.665 -0.057,-0.992 -0.141,-0.654 -0.457,-1.296 -0.764,-1.949 0.229,-1.257 -0.653,-2.438 -0.097,-3.678 -0.445,-0.54 0.427,-1.228 0.268,-1.852 l -0.142,0.032 c 0.414,-0.255 -0.633,-0.465 -0.006,-0.648 l 0.032,0.021 c 0.314,-0.142 -0.783,-0.228 -0.401,-0.326 L 449.9,180.84 c -0.057,-0.143 0.181,-0.029 0.235,-0.146 -0.021,-0.041 -0.292,0.003 -0.206,-0.091 0.653,-0.063 -0.165,-0.347 0.568,-0.405 0.006,0.079 0.276,-0.144 0.443,0.024 0.07,-0.056 0.019,-0.297 -0.292,-0.254 -0.333,0.001 -0.629,-0.075 -0.873,0.09 l 0.242,0.014 c -0.237,0.066 -0.117,0.046 -0.298,0.076 -0.02,0.195 -0.369,0.244 -0.503,0.393 l 0.024,-0.003 c 0.295,0.076 0.134,0.219 0.097,0.296 l -0.133,0.04 c -0.277,0.063 0.563,0.183 0.078,0.156 0.146,0.385 0.17,0.836 0.204,1.274 0.188,0.05 0.006,0.338 0.353,0.219 -0.396,0.137 -0.475,0.47 -0.452,0.59 l -0.067,-0.024 c -0.505,0.271 0.503,0.247 -0.121,0.511 0.456,0.004 -0.117,0.41 0.421,0.499 l -0.27,0.045 c 0.019,0.397 -0.116,0.848 -0.114,1.185 0.413,0.262 -0.133,0.708 0.43,0.918 -0.104,0.213 -0.307,0.559 -0.07,0.83 l -0.066,-0.023 c 0.054,0.32 0.107,0.721 0.466,0.919 -0.519,0.13 -0.404,0.263 -0.562,0.413 0.258,0.198 0.214,0.638 0.455,0.951 -0.237,0.066 0.121,0.265 -0.229,0.305 0.185,0.219 0.313,0.455 0.395,0.702 l 0.029,0.093 0.006,0.023 0.002,0.006 c 0.542,0.255 -1.213,-0.566 1.216,0.573 l 0.002,-0.003 0.009,-0.009 0.033,-0.035 0.144,-0.132 0.314,-0.229 c 0.446,-0.275 0.986,-0.436 1.535,-0.517 l 0.003,0.028 c -0.009,-0.23 -0.14,-0.662 -0.182,-0.941 l 0.039,0.082 c 0.105,-0.159 0.446,0.022 0.553,-0.136 l 0.043,0.11 c 0.044,-0.226 0.446,0.022 0.448,-0.314 l 0.063,0.069 0.024,-0.181 c 0.065,0.096 0.164,0.24 0.087,0.249 1.316,-0.813 2.253,-2.236 3.588,-3.097 l 0.018,0.124 0.134,-0.341 0.041,0.11 c 0.433,-0.07 0.569,-0.574 0.907,-0.758 0.03,0.046 0.051,0.172 0.132,0.192 0.042,-0.423 0.608,0.067 0.338,-0.548 0.027,0.015 0.122,0.131 0.13,0.19 0.508,-0.638 1.168,-1.102 1.871,-1.479 0.464,-1.541 0.157,-1.645 -0.114,-2.503 l 0.119,-0.004 c -0.474,-0.857 -0.092,-1.825 -0.235,-2.736 0.021,-0.384 -0.136,-0.632 -0.169,-1.014 l 0.147,-0.019 c -0.604,-0.607 0.416,-1.387 -0.247,-2.018 l 0.203,0.033 c -0.317,-0.083 0.083,-0.414 -0.448,-0.338 l 0.153,-0.129 c -0.732,-0.41 0.271,-0.852 -0.224,-1.381 l 0.13,0.028 c -0.107,-0.142 -0.198,-0.311 -0.089,-0.428 l 0.093,0.039 c 0.393,-0.466 0.055,-1.054 -0.305,-1.399 l -0.094,-0.224 c -0.03,0.364 -0.535,0.412 -0.713,0.699 l -0.051,-0.102 -0.036,0.22 -0.133,-0.177 c -0.337,0.228 -0.534,0.609 -0.84,0.862 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path318" + d="m 455.552,175.5 0.008,0.003 -0.008,-0.003 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path320" + d="m 449.175,180.596 0.045,-0.053 -0.045,0.053 z" /> + </g> + </g> + </g> + </g> + </g> + <g + id="g322"> + <polygon + style="fill:#ffffff" + id="polygon324" + points="450.12,179.294 450.858,190.419 439.355,184.214 438.617,173.081 " /> + <g + id="g326"> + <polygon + style="fill:none" + id="polygon328" + points="450.12,179.294 450.858,190.419 439.355,184.214 438.617,173.081 " /> + <g + id="g330"> + <g + id="g332"> + <g + id="g334"> + <polygon + style="fill:#202020" + id="polygon336" + points="450.074,177.886 450.087,177.815 449.946,177.954 " /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path338" + d="m 449.541,178.075 -0.046,0.12 0.452,-0.369 c 0.059,-0.316 -0.446,0.46 -0.406,0.249 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path340" + d="m 449.509,177.997 c -0.016,-0.152 -0.167,0.053 -0.227,0.12 0.12,-0.158 0.114,0.129 0.227,-0.12 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path342" + d="m 442.766,174.498 0.031,-10e-4 -0.031,10e-4 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path344" + d="m 440.613,174.313 -0.114,0.167 c 0.496,-0.141 0.688,0.38 1.108,0.426 l -0.059,0.052 c 0.836,0.541 1.802,0.678 2.741,1.01 l -0.082,0.075 c 0.075,-0.038 0.183,-0.127 0.223,-0.088 l -0.083,0.086 c 0.023,0.393 0.639,0.104 0.629,0.393 0.069,-0.005 0.157,-0.114 0.181,-0.224 0.719,0.292 1.475,0.627 2.289,0.77 0.012,0.059 -0.025,0.142 -0.089,0.238 0.848,-0.158 1.362,0.366 1.926,0.771 0.091,-0.113 0.01,-0.166 0.141,-0.266 -0.109,-0.261 -0.521,0.116 -0.575,-0.207 l 0.088,-0.109 c -0.087,-0.146 -0.189,0.292 -0.238,0.063 0.002,-0.129 0.096,-0.147 0.075,-0.169 -0.299,-0.097 -0.522,-0.36 -0.938,-0.205 0.079,-0.297 -0.287,-0.167 -0.252,-0.474 -0.127,0.067 -0.185,0.002 -0.304,0.161 -0.879,-0.652 -1.989,-0.925 -2.955,-1.473 -0.732,0.263 -0.952,-0.639 -1.586,-0.762 l 0.027,-0.051 c -0.245,0.03 -0.533,-0.05 -0.711,-0.228 l -0.295,0.119 c -0.516,-0.564 -1.14,-0.944 -1.784,-1.292 l -0.97,-0.519 c -2.021,1.25 -0.538,0.979 -1.021,1.544 -0.034,1.672 -0.353,3.155 0.516,4.724 l -0.112,-0.023 c 0.146,0.46 -0.031,0.899 0.116,1.331 l -0.057,0.002 c 0.547,1.061 0.088,2.276 0.669,3.295 0.037,1.773 2.11,1.608 3.139,2.375 l -0.058,0.099 c 1.071,0.304 1.709,1.336 2.75,1.691 0.858,0.759 2.331,0.512 3.155,1.352 0.347,0.825 1.724,0.201 2.022,1.022 0.377,0.092 0.008,1.208 1.102,0.252 0.04,-0.335 0.015,-0.665 -0.057,-0.992 -0.141,-0.653 -0.457,-1.296 -0.764,-1.948 0.229,-1.257 -0.653,-2.438 -0.097,-3.678 -0.445,-0.541 0.427,-1.228 0.268,-1.852 l -0.142,0.032 c 0.414,-0.255 -0.633,-0.466 -0.006,-0.648 l 0.032,0.021 c 0.314,-0.142 -0.783,-0.229 -0.401,-0.327 l -0.161,-0.009 c -0.057,-0.142 0.181,-0.028 0.235,-0.146 -0.021,-0.04 -0.292,0.004 -0.206,-0.091 0.653,-0.063 -0.165,-0.346 0.568,-0.404 0.006,0.079 0.275,-0.144 0.441,0.024 0.072,-0.056 0.021,-0.297 -0.291,-0.255 -0.332,0.002 -0.628,-0.074 -0.872,0.091 l 0.242,0.014 c -0.237,0.065 -0.117,0.046 -0.298,0.075 -0.02,0.196 -0.369,0.245 -0.503,0.394 l 0.024,-0.003 c 0.295,0.076 0.134,0.219 0.097,0.296 l -0.133,0.039 c -0.277,0.064 0.563,0.184 0.078,0.157 0.146,0.385 0.17,0.836 0.204,1.274 0.188,0.05 0.006,0.337 0.353,0.218 -0.396,0.137 -0.475,0.471 -0.452,0.591 l -0.067,-0.024 c -0.505,0.271 0.503,0.247 -0.122,0.51 0.457,0.005 -0.116,0.411 0.422,0.5 l -0.27,0.045 c 0.019,0.397 -0.116,0.847 -0.114,1.185 0.413,0.261 -0.134,0.707 0.43,0.918 -0.104,0.212 -0.307,0.559 -0.07,0.829 l -0.066,-0.023 c 0.054,0.32 0.107,0.722 0.466,0.92 -0.519,0.13 -0.404,0.262 -0.562,0.412 0.258,0.199 0.214,0.639 0.455,0.952 -0.237,0.066 0.12,0.265 -0.229,0.305 0.185,0.219 0.313,0.454 0.395,0.701 l 0.029,0.094 0.006,0.023 c 0.503,-0.321 -1.121,0.735 1.129,-0.718 l -0.012,-0.003 -0.046,-0.016 -0.182,-0.071 -0.344,-0.185 c -0.441,-0.282 -0.819,-0.699 -1.132,-1.159 l 0.024,-0.015 c -0.204,0.108 -0.536,0.413 -0.77,0.572 l 0.057,-0.07 c -0.189,-0.027 -0.174,-0.412 -0.362,-0.439 l 0.081,-0.086 c -0.224,0.058 -0.173,-0.412 -0.479,-0.268 l 0.035,-0.088 -0.174,0.055 c 0.058,-0.1 0.146,-0.251 0.187,-0.186 -1.305,-0.833 -2.992,-1.06 -4.347,-1.889 l 0.104,-0.069 -0.363,0.028 0.081,-0.086 c -0.252,-0.358 -0.766,-0.263 -1.077,-0.487 0.028,-0.049 0.133,-0.12 0.116,-0.202 -0.399,0.145 -0.203,-0.578 -0.641,-0.066 l 0.115,-0.2 c -0.795,-0.181 -1.499,-0.575 -2.146,-1.044 -0.441,0.804 -0.096,-0.995 -0.567,-1.33 l 0.119,-0.004 c -0.474,-0.857 -0.092,-1.825 -0.236,-2.736 0.021,-0.384 -0.135,-0.632 -0.169,-1.014 l 0.147,-0.02 c -0.604,-0.606 0.416,-1.387 -0.247,-2.017 l 0.203,0.033 c -0.317,-0.083 0.083,-0.414 -0.448,-0.338 l 0.152,-0.129 c -0.732,-0.41 0.271,-0.852 -0.223,-1.381 l 0.129,0.028 c -0.107,-0.142 -0.198,-0.31 -0.088,-0.428 l 0.091,0.039 c 0.455,-0.417 -0.086,-1.163 -0.163,-1.291 l -0.159,0.181 c 0.341,-0.13 0.603,0.304 0.938,0.34 l -0.07,0.089 0.215,-0.062 -0.103,0.196 c 0.358,0.208 0.787,0.221 1.149,0.388 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path346" + d="m 444.349,176.042 -10e-4,-0.008 10e-4,0.008 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path348" + d="m 449.175,180.596 0.045,-0.053 -0.045,0.053 z" /> + </g> + </g> + </g> + </g> + </g> + <g + id="g350"> + <polygon + style="fill:#ffffff" + id="polygon352" + points="438.617,173.081 450.12,179.294 460.705,171.616 449.263,165.434 " /> + <g + id="g354"> + <polygon + style="fill:none" + id="polygon356" + points="438.617,173.081 450.12,179.294 460.705,171.616 449.263,165.434 " /> + <g + id="g358"> + <g + id="g360"> + <g + id="g362"> + <polygon + style="fill:#202020" + id="polygon364" + points="440.995,172.871 441.054,172.913 440.991,172.725 " /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path366" + d="m 441.066,172.303 -0.09,-0.093 0.131,0.571 c 0.261,0.189 -0.215,-0.605 -0.041,-0.478 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path368" + d="m 441.151,172.308 c 0.146,0.051 0.027,-0.175 -0.007,-0.258 0.09,0.177 -0.167,0.047 0.007,0.258 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path370" + d="m 447.395,167.668 -0.013,0.029 0.013,-0.029 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path372" + d="m 448.541,165.786 -0.101,-0.176 c -0.098,0.513 -0.658,0.465 -0.892,0.827 l -0.021,-0.075 c -0.871,0.529 -1.436,1.35 -2.164,2.064 l -0.03,-0.107 c 10e-4,0.084 0.032,0.222 -0.021,0.24 l -0.04,-0.113 c -0.368,-0.147 -0.386,0.537 -0.645,0.405 -0.026,0.065 0.032,0.192 0.122,0.26 -0.592,0.529 -1.239,1.074 -1.739,1.755 -0.059,-0.015 -0.117,-0.085 -0.176,-0.185 -0.242,0.841 -0.953,1.085 -1.575,1.424 0.063,0.131 0.146,0.081 0.178,0.243 0.286,0.012 0.132,-0.526 0.449,-0.435 l 0.06,0.126 c 0.172,-0.016 -0.179,-0.299 0.052,-0.246 0.116,0.058 0.09,0.151 0.119,0.143 0.224,-0.231 0.563,-0.323 0.611,-0.769 0.234,0.2 0.283,-0.19 0.546,-0.026 -0.003,-0.145 0.082,-0.168 -0.009,-0.346 0.992,-0.52 1.744,-1.415 2.682,-2.06 0.094,-0.78 1.014,-0.592 1.413,-1.118 l 0.032,0.048 c 0.085,-0.236 0.289,-0.465 0.531,-0.55 l 0.025,-0.32 c 0.46,-0.031 2.018,-1.071 1.341,-0.63 0.659,0.357 1.339,0.683 1.949,1.131 1.432,0.938 2.55,2.014 4.373,2.133 l -0.08,0.082 c 0.477,0.126 0.762,0.516 1.216,0.625 l -0.028,0.049 c 1.212,0.114 2.021,1.164 3.215,1.226 1.47,-0.077 -1.557,1.421 -2.023,2.177 l -0.064,-0.095 c -0.76,0.849 -1.985,0.99 -2.778,1.79 -1.077,0.461 -1.517,1.911 -2.652,2.306 -0.907,-0.036 -0.959,1.487 -1.842,1.411 -0.782,-0.279 -2.233,-1.245 -3.69,-1.18 -0.968,-0.878 -2.464,-0.774 -3.241,-1.92 -0.707,0.084 -0.838,-1.027 -1.464,-1.232 l -0.048,0.136 c 0,-0.489 -0.741,0.282 -0.564,-0.348 l 0.035,-0.015 c 0.046,-0.343 -0.615,0.538 -0.496,0.161 l -0.096,0.133 c -0.152,-0.03 0.071,-0.168 0,-0.279 -0.047,-0.003 -0.152,0.25 -0.188,0.125 0.294,-0.586 -0.39,-0.048 -0.048,-0.701 0.07,0.039 0.022,-0.312 0.258,-0.361 -0.011,-0.091 -0.247,-0.178 -0.376,0.108 -0.178,0.282 -0.4,0.491 -0.39,0.788 l 0.143,-0.198 c -0.069,0.237 -0.023,0.125 -0.093,0.293 0.158,0.123 0.016,0.445 0.071,0.639 l 0.012,-0.022 c 0.224,-0.208 0.261,0.005 0.308,0.08 l -0.036,0.133 c -0.093,0.27 0.46,-0.377 0.177,0.02 0.412,0.086 0.816,0.311 1.217,0.52 0.143,-0.132 0.295,0.179 0.377,-0.179 -0.094,0.409 0.153,0.657 0.271,0.703 l -0.058,0.045 c -0.036,0.575 0.481,-0.291 0.377,0.38 0.247,-0.383 0.293,0.322 0.658,-0.084 l -0.104,0.251 c 0.354,0.202 0.672,0.56 0.966,0.742 0.447,-0.208 0.543,0.497 1.025,0.136 0.129,0.203 0.32,0.563 0.683,0.51 l -0.057,0.044 c 0.307,0.129 0.684,0.301 1.046,0.106 -0.163,0.508 0.012,0.484 0.06,0.698 0.311,-0.109 0.667,0.167 1.068,0.133 -0.069,0.237 0.293,0.042 0.142,0.359 0.912,-0.253 0.342,0.48 2.301,-0.034 0.457,-0.283 1.007,-0.451 1.564,-0.539 l 0.003,0.028 c -0.007,-0.231 -0.135,-0.666 -0.175,-0.946 l 0.039,0.081 c 0.11,-0.161 0.453,0.018 0.563,-0.143 l 0.041,0.11 c 0.049,-0.229 0.454,0.018 0.459,-0.322 l 0.064,0.069 0.028,-0.182 c 0.063,0.095 0.163,0.239 0.085,0.249 1.346,-0.835 2.313,-2.281 3.678,-3.163 l 0.017,0.124 0.14,-0.344 0.041,0.11 c 0.438,-0.076 0.584,-0.586 0.93,-0.775 0.031,0.046 0.05,0.173 0.131,0.192 0.048,-0.427 0.618,0.061 0.351,-0.556 0.026,0.015 0.122,0.13 0.13,0.191 0.521,-0.649 1.198,-1.124 1.917,-1.514 0.137,-2.149 -1.003,-1.281 -1.618,-1.724 l 0.06,-0.104 c -0.996,-0.065 -1.632,-0.915 -2.499,-1.289 -0.32,-0.227 -0.621,-0.229 -0.97,-0.409 l 0.063,-0.135 c -0.85,0.181 -0.98,-1.106 -1.883,-0.888 l 0.138,-0.154 c -0.241,0.223 -0.314,-0.295 -0.532,0.195 l -0.031,-0.199 c -0.746,0.396 -0.595,-0.692 -1.315,-0.563 l 0.094,-0.094 c -0.183,0.014 -0.376,0 -0.419,-0.158 l 0.082,-0.057 c -0.183,-0.668 -0.913,-0.433 -1.349,-0.69 l 0.162,-0.18 c -0.346,0.127 -0.616,-0.312 -0.959,-0.352 l 0.07,-0.089 -0.218,0.061 0.102,-0.196 c -0.367,-0.393 -1.235,0.247 -1.264,0.451 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path374" + d="m 445.273,168.446 0.008,0.003 -0.008,-0.003 z" /> + <path + style="fill:#202020" + inkscape:connector-curvature="0" + id="path376" + d="m 440.409,175.219 -0.021,-0.066 0.021,0.066 z" /> + </g> + </g> + </g> + </g> + </g> + </g> + </g> + </g> + </g> +</svg> diff --git a/graphics/gpicview/gpicview.SlackBuild b/graphics/gpicview/gpicview.SlackBuild index d1912d08dd..9563507e5b 100644 --- a/graphics/gpicview/gpicview.SlackBuild +++ b/graphics/gpicview/gpicview.SlackBuild @@ -4,7 +4,7 @@ # Written Evandro Alves Rodrigues evandrofisico@gmail.com PRGNAM=gpicview -VERSION=0.2.1 +VERSION=0.2.2 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -52,7 +52,7 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAG="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -63,10 +63,7 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -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 || true +make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ diff --git a/graphics/gpicview/gpicview.info b/graphics/gpicview/gpicview.info index 9be7ad1b73..e64c6e747a 100644 --- a/graphics/gpicview/gpicview.info +++ b/graphics/gpicview/gpicview.info @@ -1,10 +1,10 @@ PRGNAM="gpicview" -VERSION="0.2.1" +VERSION="0.2.2" HOMEPAGE="http://lxde.sourceforge.net/gpicview/" -DOWNLOAD="http://downloads.sourceforge.net/lxde/gpicview-0.2.1.tar.gz" -MD5SUM="a2de255bf9bdc40746c0dc89b3454a10" +DOWNLOAD="http://downloads.sourceforge.net/lxde/gpicview-0.2.2.tar.gz" +MD5SUM="943da9f4a23541accd5acdd4fb69966f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Evandro Alves Rodrigues" EMAIL="evandrofisico@gmail.com" -APPROVED="rworkman" +APPROVED="" diff --git a/libraries/atkmm/atkmm.SlackBuild b/libraries/atkmm/atkmm.SlackBuild index 180247212c..a1f56eecc1 100644 --- a/libraries/atkmm/atkmm.SlackBuild +++ b/libraries/atkmm/atkmm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=atkmm -VERSION=${VERSION:-2.22.4} +VERSION=${VERSION:-2.22.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/atkmm/atkmm.info b/libraries/atkmm/atkmm.info index 87c484fdd2..4199e4ee30 100644 --- a/libraries/atkmm/atkmm.info +++ b/libraries/atkmm/atkmm.info @@ -1,10 +1,10 @@ PRGNAM="atkmm" -VERSION="2.22.4" +VERSION="2.22.5" HOMEPAGE="http://www.gtkmm.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.22/atkmm-2.22.4.tar.bz2" -MD5SUM="ad1ddcc707bf18a27968838a327195d7" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.22/atkmm-2.22.5.tar.bz2" +MD5SUM="d56fe2b29d4c88fa270918e5572fc8cf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="dsomero" +APPROVED="" diff --git a/libraries/frei0r/frei0r.SlackBuild b/libraries/frei0r/frei0r.SlackBuild index ec0085a7ef..541008c750 100644 --- a/libraries/frei0r/frei0r.SlackBuild +++ b/libraries/frei0r/frei0r.SlackBuild @@ -29,8 +29,8 @@ # PRGNAM=frei0r -VERSION=20100124 -BUILD=${BUILD:-2} +VERSION=1.3 +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} # Automatically determine the architecture we're building on: @@ -68,7 +68,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1 +tar xvf $CWD/$PRGNAM-plugins-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -77,7 +77,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -96,9 +95,11 @@ 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 -cd $TMP/$PRGNAM-$VERSION +# move html doc and clean $PKG/usr/share +#mv $PKG/usr/share/doc/$PRGNAM-plugins-$VERSION/html $PKG/usr/doc/$PRGNAM-$VERSION/ +#rm -fR $PKG/usr/share cp -a \ - AUTHORS COPYING ChangeLog Doxyfile INSTALL NEWS README \ + AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/frei0r/frei0r.info b/libraries/frei0r/frei0r.info index b3ddc03144..813df91d61 100644 --- a/libraries/frei0r/frei0r.info +++ b/libraries/frei0r/frei0r.info @@ -1,10 +1,10 @@ PRGNAM="frei0r" -VERSION="20100124" +VERSION="1.3" HOMEPAGE="http://www.piksel.org/frei0r" -DOWNLOAD="http://www.slackbuilds.org/sources/13.0/frei0r-20100124.tar.gz" -MD5SUM="a5bc4fe886c1b9915adae94559af143b" +DOWNLOAD="http://www.piksel.no/frei0r/releases/frei0r-plugins-1.3.tar.gz" +MD5SUM="a2eb63feeeb0c5cf439ccca276cbf70c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Jonathan Larsen" EMAIL="agentc0re@learnix.net" -APPROVED="dsomero" +APPROVED="" diff --git a/libraries/genshi/genshi.SlackBuild b/libraries/genshi/genshi.SlackBuild index 0d72a757a2..6d03e9319e 100644 --- a/libraries/genshi/genshi.SlackBuild +++ b/libraries/genshi/genshi.SlackBuild @@ -6,7 +6,7 @@ PRGNAM="genshi" SRCNAM="Genshi" -VERSION=${VERSION:-0.5.1} +VERSION=${VERSION:-0.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -45,7 +45,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.bz2 +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION chown -R root:root . find . \ diff --git a/libraries/genshi/genshi.info b/libraries/genshi/genshi.info index 08d9e8780c..dc18440ca8 100644 --- a/libraries/genshi/genshi.info +++ b/libraries/genshi/genshi.info @@ -1,10 +1,10 @@ PRGNAM="genshi" -VERSION="0.5.1" +VERSION="0.6" HOMEPAGE="http://genshi.edgewall.org/" -DOWNLOAD="http://ftp.edgewall.com/pub/genshi/Genshi-0.5.1.tar.bz2" -MD5SUM="822942bbc3109da9f6b472eb8ea4e3a4" +DOWNLOAD="http://ftp.edgewall.com/pub/genshi/Genshi-0.6.tar.gz" +MD5SUM="604e8b23b4697655d36a69c2d8ef7187" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Eugene Suter" EMAIL="easuter@gmail.com" -APPROVED="dsomero" +APPROVED="" diff --git a/libraries/glib-networking/README b/libraries/glib-networking/README new file mode 100644 index 0000000000..9da6d1cdff --- /dev/null +++ b/libraries/glib-networking/README @@ -0,0 +1,4 @@ +glib-networking (glib network giomodules) + +glib-networking provides network-related giomodules for glib such as +a proxy resolver and a gnutls gtlsconnection implementation. diff --git a/libraries/glib-networking/glib-networking.SlackBuild b/libraries/glib-networking/glib-networking.SlackBuild new file mode 100644 index 0000000000..ac62f8acc5 --- /dev/null +++ b/libraries/glib-networking/glib-networking.SlackBuild @@ -0,0 +1,88 @@ +#!/bin/sh + +# Slackware build script for glib-networking +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=glib-networking +VERSION=${VERSION:-2.28.7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +DOCS="AUTHORS COPYING INSTALL NEWS README" + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$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/$PRGNAM-$VERSION \ + --enable-shared \ + --disable-static \ + --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/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat <<EOF > $PKG/install/doinst.sh +# create the gio module cache during postinstall +if [ -x /usr/bin/gio-querymodules ]; then + chroot . /usr/bin/gio-querymodules /usr/lib${LIBDIRSUFFIX}/gio/modules/ >/dev/null 2>&1 +fi +EOF + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/glib-networking/glib-networking.info b/libraries/glib-networking/glib-networking.info new file mode 100644 index 0000000000..a1ab4b2cbb --- /dev/null +++ b/libraries/glib-networking/glib-networking.info @@ -0,0 +1,10 @@ +PRGNAM="glib-networking" +VERSION="2.28.7" +HOMEPAGE="http://live.gnome.org" +DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.28/glib-networking-2.28.7.tar.bz2" +MD5SUM="c10e51571d03c10111a37bcd21fbf777" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/libraries/glib-networking/slack-desc b/libraries/glib-networking/slack-desc new file mode 100644 index 0000000000..33b239b5f8 --- /dev/null +++ b/libraries/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 (glib network giomodules) +glib-networking: +glib-networking: glib-networking provides network-related giomodules for glib such as +glib-networking: a proxy resolver and a gnutls gtlsconnection implementation. +glib-networking: +glib-networking: +glib-networking: +glib-networking: +glib-networking: +glib-networking: +glib-networking: diff --git a/libraries/gobject-introspection/README b/libraries/gobject-introspection/README index e338dff7e1..73a765e183 100644 --- a/libraries/gobject-introspection/README +++ b/libraries/gobject-introspection/README @@ -4,3 +4,5 @@ GObject Introspection is a project for providing machine readable introspection data of the API of C libraries. This introspection data can be used in several different use cases, for example automatic code generation for bindings, API verification and documentation generation. + +libffi is an optional dependency. diff --git a/libraries/gobject-introspection/gobject-introspection.SlackBuild b/libraries/gobject-introspection/gobject-introspection.SlackBuild index 1c7a18383e..35409a1daa 100644 --- a/libraries/gobject-introspection/gobject-introspection.SlackBuild +++ b/libraries/gobject-introspection/gobject-introspection.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gobject-introspection -VERSION=${VERSION:-0.10.6} +VERSION=${VERSION:-0.10.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,7 +56,7 @@ else LIBDIRSUFFIX="" fi -DOCS="AUTHORS CONTRIBUTORS COPYING NEWS README TODO" +DOCS="AUTHORS CONTRIBUTORS COPYING* NEWS README TODO" set -e @@ -86,13 +86,11 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +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 -( 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/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/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/gobject-introspection/gobject-introspection.info b/libraries/gobject-introspection/gobject-introspection.info index 50d821669d..e845a13aac 100644 --- a/libraries/gobject-introspection/gobject-introspection.info +++ b/libraries/gobject-introspection/gobject-introspection.info @@ -1,10 +1,10 @@ PRGNAM="gobject-introspection" -VERSION="0.10.6" +VERSION="0.10.8" HOMEPAGE="http://live.gnome.org/GObjectIntrospection" -DOWNLOAD="ftp://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/0.10/gobject-introspection-0.10.6.tar.bz2" -MD5SUM="73a4b44d25f62f751825b30c621103ce" +DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gobject-introspection/0.10/gobject-introspection-0.10.8.tar.bz2" +MD5SUM="b5da58a5327d13b4d1e08b8e42b2456d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Andrew Psaltis" EMAIL="ampsaltis@gmail.com" -APPROVED="rworkman" +APPROVED="" diff --git a/libraries/lensfun/lensfun.SlackBuild b/libraries/lensfun/lensfun.SlackBuild index bb27a5812e..752b189cc5 100644 --- a/libraries/lensfun/lensfun.SlackBuild +++ b/libraries/lensfun/lensfun.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lensfun -VERSION=0.2.3 +VERSION=${VERSION:-r143} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.?z? || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || exit 1 cd $PRGNAM-$VERSION || exit 1 chown -R root:root . chmod -R u+w,go+r-w,a-s . diff --git a/libraries/lensfun/lensfun.info b/libraries/lensfun/lensfun.info index 7a528fca1d..768b8f816a 100644 --- a/libraries/lensfun/lensfun.info +++ b/libraries/lensfun/lensfun.info @@ -1,10 +1,10 @@ PRGNAM="lensfun" -VERSION="0.2.3" +VERSION="r143" HOMEPAGE="http://lensfun.berlios.de/" -DOWNLOAD="http://download.berlios.de/lensfun/lensfun-0.2.3.tar.bz2" -MD5SUM="c5c04be4f53e3eef450ff4948d8f65b3" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lensfun-r143.tar.bz2" +MD5SUM="d02628ef3eeeb1cfd83dff242db837ee" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Ricardson Williams" EMAIL="ricardsonwilliams@yahoo.com.br" -APPROVED="rworkman" +APPROVED="" diff --git a/libraries/libatasmart/libatasmart.SlackBuild b/libraries/libatasmart/libatasmart.SlackBuild index 6fc2517b71..9a122d3254 100644 --- a/libraries/libatasmart/libatasmart.SlackBuild +++ b/libraries/libatasmart/libatasmart.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libatasmart -VERSION=${VERSION:-0.17} +VERSION=${VERSION:-0.18} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/libatasmart/libatasmart.info b/libraries/libatasmart/libatasmart.info index f25e5961d3..5bc374e71a 100644 --- a/libraries/libatasmart/libatasmart.info +++ b/libraries/libatasmart/libatasmart.info @@ -1,10 +1,10 @@ PRGNAM="libatasmart" -VERSION="0.17" +VERSION="0.18" HOMEPAGE="http://0pointer.de/" -DOWNLOAD="http://0pointer.de/public/libatasmart-0.17.tar.gz" -MD5SUM="dc36cadbbb7fa38f8af175713eda1a21" +DOWNLOAD="http://0pointer.de/public/libatasmart-0.18.tar.gz" +MD5SUM="dc22b7acda1c2230f55ae98737e8b159" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="dsomero" +APPROVED="" diff --git a/libraries/libcacard/README b/libraries/libcacard/README new file mode 100644 index 0000000000..4a9bf1291e --- /dev/null +++ b/libraries/libcacard/README @@ -0,0 +1,6 @@ +libcacard (Virtual Smart Card Emulator library) + +This emulator is designed to provide emulation of actual smart cards +to a virtual card reader running in a guest virtual machine. The +emulates smart cards can be representations of real smart cards, or +the cards could be pure software constructs. diff --git a/libraries/libcacard/libcacard.SlackBuild b/libraries/libcacard/libcacard.SlackBuild new file mode 100644 index 0000000000..9f6920b8ec --- /dev/null +++ b/libraries/libcacard/libcacard.SlackBuild @@ -0,0 +1,81 @@ +#!/bin/sh + +# Slackware build script for libcacard +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=libcacard +VERSION=${VERSION:-20110223_2772885} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +DOCS="AUTHORS COPYING ChangeLog NEWS README" + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z +cd $PRGNAM-$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" \ +./autogen.sh \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --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/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libcacard/libcacard.info b/libraries/libcacard/libcacard.info new file mode 100644 index 0000000000..0111ad5986 --- /dev/null +++ b/libraries/libcacard/libcacard.info @@ -0,0 +1,10 @@ +PRGNAM="libcacard" +VERSION="20110223_2772885" +HOMEPAGE="http://spice-space.org" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/libcacard-20110223_2772885.tar.xz" +MD5SUM="e073322e246a751ef17955a1594cd298" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/libraries/libcacard/slack-desc b/libraries/libcacard/slack-desc new file mode 100644 index 0000000000..9b6f409b31 --- /dev/null +++ b/libraries/libcacard/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------------------------------------------------------| +libcacard: libcacard (Virtual Smart Card Emulator library) +libcacard: +libcacard: This emulator is designed to provide emulation of actual smart cards +libcacard: to a virtual card reader running in a guest virtual machine. The +libcacard: emulates smart cards can be representations of real smart cards, or +libcacard: the cards could be pure software constructs. +libcacard: +libcacard: homepage: http://spice-space.org +libcacard: +libcacard: +libcacard: diff --git a/libraries/libgnome-keyring/libgnome-keyring.SlackBuild b/libraries/libgnome-keyring/libgnome-keyring.SlackBuild index eccb5c673d..71fcdbcc13 100644 --- a/libraries/libgnome-keyring/libgnome-keyring.SlackBuild +++ b/libraries/libgnome-keyring/libgnome-keyring.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libgnome-keyring -VERSION=${VERSION:-2.32.0} +VERSION=${VERSION:-3.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find . \ diff --git a/libraries/libgnome-keyring/libgnome-keyring.info b/libraries/libgnome-keyring/libgnome-keyring.info index cf4a6a9a93..513ca9e1c3 100644 --- a/libraries/libgnome-keyring/libgnome-keyring.info +++ b/libraries/libgnome-keyring/libgnome-keyring.info @@ -1,10 +1,10 @@ PRGNAM="libgnome-keyring" -VERSION="2.32.0" +VERSION="3.0.3" HOMEPAGE="http://live.gnome.org/GnomeKeyring" -DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/libgnome-keyring/2.32/libgnome-keyring-2.32.0.tar.bz2" -MD5SUM="c42b2ca66204835d901d3dbfc1fa5ae6" +DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libgnome-keyring/3.0/libgnome-keyring-3.0.3.tar.xz" +MD5SUM="61e829d6c7b62cc7b3668cd31052b321" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="Erik Hanson" +APPROVED="" diff --git a/libraries/libproxy/4.6-r797.patch b/libraries/libproxy/4.6-r797.patch deleted file mode 100644 index 7b23bd9dbb..0000000000 --- a/libraries/libproxy/4.6-r797.patch +++ /dev/null @@ -1,798 +0,0 @@ -Index: cmake/mingw32.cmake -=================================================================== ---- cmake/mingw32.cmake (revision 753) -+++ cmake/mingw32.cmake (revision 797) -@@ -15,3 +15,5 @@ - set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) - set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) - -+# We want libgcc being statically linked. Everything else is annoying -+set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} -static-libgcc") -Index: cmake/paths.cmk -=================================================================== ---- cmake/paths.cmk (revision 753) -+++ cmake/paths.cmk (revision 797) -@@ -1,11 +1,11 @@ - if(WIN32) - set(CMAKE_INSTALL_PREFIX "" CACHE PATH "Install prefix") -- set(BIN_INSTALL_DIR "" CACHE PATH "Binary install dir") -- set(LIB_INSTALL_DIR "" CACHE PATH "Library install dir") -- set(LIBEXEC_INSTALL_DIR "" CACHE PATH "Private executable install dir") -+ set(BIN_INSTALL_DIR . CACHE PATH "Binary install dir") -+ set(LIB_INSTALL_DIR . CACHE PATH "Library install dir") -+ set(LIBEXEC_INSTALL_DIR . CACHE PATH "Private executable install dir") - set(INCLUDE_INSTALL_DIR include CACHE PATH "Include install dir") -- set(SYSCONF_INSTALL_DIR "" CACHE PATH "Configuration install dir") -- set(SHARE_INSTALL_DIR "" CACHE PATH "Data install dir") -+ set(SYSCONF_INSTALL_DIR . CACHE PATH "Configuration install dir") -+ set(SHARE_INSTALL_DIR . CACHE PATH "Data install dir") - else(WIN32) - set(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "Install prefix") - set(BIN_INSTALL_DIR bin CACHE PATH "Binary install dir") -Index: bindings/ruby/Libproxy.i -=================================================================== ---- bindings/ruby/Libproxy.i (revision 753) -+++ bindings/ruby/Libproxy.i (revision 797) -@@ -4,7 +4,6 @@ - #include "../../libproxy/proxy.h" - %} - -- - %typemap(out) char ** { - VALUE arr = rb_ary_new2(255); - int i; -@@ -15,7 +14,7 @@ - } - - %typemap(freearg) char ** { -- free($source); -+ free($source); - } - - %include "../../libproxy/proxy.h" -Index: bindings/ruby/test.rb -=================================================================== ---- bindings/ruby/test.rb (revision 753) -+++ bindings/ruby/test.rb (revision 797) -@@ -1,8 +1,7 @@ - require 'Libproxy' - - pf = Libproxy.px_proxy_factory_new -- - proxies = Libproxy.px_proxy_factory_get_proxies(pf, "http://www.google.com") - --print proxies -- -+proxies.each { |proxy| print proxy + " " } -+print "\n" -Index: bindings/python/CMakeLists.txt -=================================================================== ---- bindings/python/CMakeLists.txt (revision 753) -+++ bindings/python/CMakeLists.txt (revision 797) -@@ -12,21 +12,11 @@ - - message(STATUS "Found python version ${PYTHON_VERSION}") - -- if (IS_ABSOLUTE "${LIB_INSTALL_DIR}") -- set(libdir "${LIB_INSTALL_DIR}") -- else() -- set(libdir "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") -- endif() -- -- if (IS_DIRECTORY "${libdir}/python${PYTHON_VERSION}/site-packages") -- set(PYTHON_SITEPKG_DIR "${libdir}/python${PYTHON_VERSION}/site-packages") -- else() -- execute_process(COMMAND -- ${PYTHON_EXECUTABLE} -- -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_lib(plat_specific=0)" -- OUTPUT_VARIABLE PYTHON_SITEPKG_DIR -- OUTPUT_STRIP_TRAILING_WHITESPACE) -- endif() -+ execute_process(COMMAND -+ ${PYTHON_EXECUTABLE} -+ -c "import distutils.sysconfig ; print distutils.sysconfig.get_python_lib(plat_specific=0)" -+ OUTPUT_VARIABLE PYTHON_SITEPKG_DIR -+ OUTPUT_STRIP_TRAILING_WHITESPACE) - endif() - - message(STATUS "Using PYTHON_SITEPKG_DIR=${PYTHON_SITEPKG_DIR}") -Index: bindings/perl/src/CMakeLists.txt -=================================================================== ---- bindings/perl/src/CMakeLists.txt (revision 753) -+++ bindings/perl/src/CMakeLists.txt (revision 797) -@@ -1,5 +1,4 @@ - include_directories( ${PERL_INCLUDE_PATH} ${CMAKE_SOURCE_DIR}/libproxy ) --link_directories(${LIBPROXY_LIBRARY_DIRS}) - - # Run doxsubpp.pl to run xsubpp on Libproxy.xs - add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/Libproxy.c -@@ -10,9 +9,6 @@ - - set(Libproxy_LIB_SRCS Libproxy.c) - --set(CMAKE_C_COMPILER ${CMAKE_CXX_COMPILER}) --set(CMAKE_C_FLAGS ${PERL_CXX_FLAGS} ) -- - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net) - add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS}) - -Index: utils/CMakeLists.txt -=================================================================== ---- utils/CMakeLists.txt (revision 753) -+++ utils/CMakeLists.txt (revision 797) -@@ -1,5 +1,4 @@ - include_directories("../libproxy") --link_directories(${LIBPROXY_LIBRARY_DIRS}) - - add_executable(proxy proxy.c) - target_link_libraries(proxy libproxy) -Index: libmodman/test/main.hpp -=================================================================== ---- libmodman/test/main.hpp (revision 753) -+++ libmodman/test/main.hpp (revision 797) -@@ -20,6 +20,8 @@ - #ifndef MAIN_HPP_ - #define MAIN_HPP_ - -+#include <typeinfo> -+ - #include "../module_manager.hpp" - - using namespace std; -Index: libmodman/module_manager.cpp -=================================================================== ---- libmodman/module_manager.cpp (revision 753) -+++ libmodman/module_manager.cpp (revision 797) -@@ -20,6 +20,7 @@ - #include <algorithm> // For sort() - #include <sys/stat.h> // For stat() - #include <iostream> -+#include <typeinfo> - - #ifdef WIN32 - #include <windows.h> -@@ -42,7 +43,7 @@ - #define pdlopenl(filename) LoadLibraryEx(filename, NULL, DONT_RESOLVE_DLL_REFERENCES) - #define pdlclose(module) FreeLibrary((pdlmtype) module) - static void* pdlsym(pdlmtype mod, string sym) { -- return GetProcAddress(mod, sym.c_str()); -+ return (void *) GetProcAddress(mod, sym.c_str()); - } - - static pdlmtype pdlreopen(const char* filename, pdlmtype module) { -Index: libmodman/module.hpp -=================================================================== ---- libmodman/module.hpp (revision 753) -+++ libmodman/module.hpp (revision 797) -@@ -26,10 +26,9 @@ - #define MM_MODULE_BUILTIN - #endif - --#ifdef WIN32 -+#ifdef _MSC_VER - #define __MM_DLL_EXPORT __declspec(dllexport) - #else --#include <typeinfo> - #define __MM_DLL_EXPORT __attribute__ ((visibility("default"))) - #endif - -@@ -79,10 +78,10 @@ - template <class basetype, bool sngl=false> - class __MM_DLL_EXPORT extension : public base_extension { - public: --#ifdef WIN32 -+#ifdef _MSC_VER - static const char* base_type() { return __FUNCSIG__; } - #else -- static const char* base_type() { return typeid(basetype).name(); } -+ static const char* base_type() { return __PRETTY_FUNCTION__; } - #endif - - static bool singleton() { return sngl; } -@@ -96,7 +95,11 @@ - - struct __MM_DLL_EXPORT mm_module - { -- const unsigned int vers; -+/* For some unknown reason, when vers is const VC++ (win32) NULLs out the whole struct. -+ * This obviously breaks module loading. I'd love to know the reason for this, so if -+ * anyone knows, please tell me. In the meantime, vers not being const is by design, -+ * so don't change it. */ -+ unsigned int vers; - const char* name; - const char* (*type)(); - libmodman::base_extension** (*init)(); -Index: libmodman/CMakeLists.txt -=================================================================== ---- libmodman/CMakeLists.txt (revision 753) -+++ libmodman/CMakeLists.txt (revision 797) -@@ -3,19 +3,17 @@ - if (WIN32) - add_definitions(-D_CRT_SECURE_NO_WARNINGS=1) - else(WIN32) -- set(CMAKE_CXX_FLAGS "-fvisibility=hidden ${CMAKE_CXX_FLAGS}") -+ set(CMAKE_CXX_FLAGS "-fvisibility=hidden -fPIC ${CMAKE_CXX_FLAGS}") - endif(WIN32) - include_directories(${CMAKE_SOURCE_DIR}) - --add_library(modman SHARED -+add_library(modman STATIC - module.hpp - module_manager.hpp - module_manager.cpp) - if(NOT WIN32) - target_link_libraries(modman dl) - endif() --set_target_properties(modman PROPERTIES PREFIX "lib" VERSION 1.0.0 SOVERSION 1) --install(TARGETS modman DESTINATION ${LIB_INSTALL_DIR}) - - ### Tests - add_testdirectory(test) -Index: libproxy/test/url-test.cpp -=================================================================== ---- libproxy/test/url-test.cpp (revision 753) -+++ libproxy/test/url-test.cpp (revision 797) -@@ -59,6 +59,12 @@ - { - bool rtv = true; - -+#ifdef WIN32 -+ WSADATA wsadata; -+ WORD vers = MAKEWORD(2, 2); -+ WSAStartup(vers, &wsadata); -+#endif -+ - try_url ("file:///allo", rtv, - "file", - "", "", -@@ -131,6 +137,17 @@ - "", "", - "", 0, - "80"); -+ -+ /* Handle the case where there is nothing other than the scheme */ -+ try_url ("http://", rtv, -+ "http", -+ "", "", -+ "", 80, -+ ""); -+ -+#ifdef WIN32 -+ WSACleanup(); -+#endif - - return !rtv; - } -Index: libproxy/cmake/libproxy.cmk -=================================================================== ---- libproxy/cmake/libproxy.cmk (revision 753) -+++ libproxy/cmake/libproxy.cmk (revision 797) -@@ -18,5 +18,6 @@ - set_property(SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/proxy.cpp - PROPERTY COMPILE_DEFINITIONS MODULEDIR="${MODULEDIR}";BUILTIN_MODULES=${BUILTIN_MODULES}) - set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 1.0.0 SOVERSION 1) -+set_target_properties(libproxy PROPERTIES LINK_INTERFACE_LIBRARIES "") - install(TARGETS libproxy DESTINATION ${LIB_INSTALL_DIR}) - install(FILES proxy.h DESTINATION ${INCLUDE_INSTALL_DIR}) -Index: libproxy/cmake/modules.cmk -=================================================================== ---- libproxy/cmake/modules.cmk (revision 753) -+++ libproxy/cmake/modules.cmk (revision 797) -@@ -14,11 +14,12 @@ - include(cmake/modules/config_macosx.cmk) - include(cmake/modules/network_networkmanager.cmk) - include(cmake/modules/pacrunner_mozjs.cmk) -+include(cmake/modules/pacrunner_natus.cmk) - include(cmake/modules/pacrunner_webkit.cmk) - - # Build the pacrunner into libproxy unless we are building for multiple engines - set(BIPR 1) --if(MOZJS_FOUND AND WEBKIT_FOUND) -+if((MOZJS_FOUND AND WEBKIT_FOUND) OR (MOZJS_FOUND AND NATUS_FOUND) OR (WEBKIT_FOUND AND NATUS_FOUND)) - set(BIPR 0) - endif() - -@@ -36,6 +37,7 @@ - px_module(ignore_ip 1 1) - px_module(network_networkmanager "${NM_FOUND}" 0 ${NM_LIBRARIES}) - px_module(pacrunner_mozjs "${MOZJS_FOUND}" ${BIPR} ${MOZJS_LIBRARIES}) -+px_module(pacrunner_natus "${NATUS_FOUND}" ${BIPR} ${NATUS_LIBRARIES}) - px_module(pacrunner_webkit "${WEBKIT_FOUND}" ${BIPR} ${WEBKIT_LIBRARIES}) - px_module(wpad_dns_alias 1 1) - message("") -Index: libproxy/cmake/modules/pacrunner_natus.cmk -=================================================================== ---- libproxy/cmake/modules/pacrunner_natus.cmk (revision 0) -+++ libproxy/cmake/modules/pacrunner_natus.cmk (revision 797) -@@ -0,0 +1,7 @@ -+if(WIN32) -+ set(NATUS_FOUND 0) -+elseif(APPLE) -+ set(NATUS_FOUND 0) -+else() -+ px_check_modules(NATUS natus) -+endif() -\ No newline at end of file -Index: libproxy/cmake/modules/pacrunner_mozjs.cmk -=================================================================== ---- libproxy/cmake/modules/pacrunner_mozjs.cmk (revision 753) -+++ libproxy/cmake/modules/pacrunner_mozjs.cmk (revision 797) -@@ -7,16 +7,19 @@ - include_directories("${MOZJS_INCLUDE_DIR}") - endif() - elseif(NOT APPLE) -- set(MOZJS_SEARCH_ORDER "xulrunner-js;firefox-js;mozilla-js;seamonkey-js" CACHE STRING "MozJS search order") -+ 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) -- pkg_search_module(MOZJS ${MOZJS_SEARCH_ORDER}) -- if(MOZJS_FOUND) -- include_directories(${MOZJS_INCLUDE_DIRS}) -- link_directories(${MOZJS_LIBRARY_DIRS}) -- else() -- set(MOZJS_FOUND 0) -- endif() -+ 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() - else() - set(MOZJS_FOUND 0) - endif() -Index: libproxy/cmake/modules/pacrunner_webkit.cmk -=================================================================== ---- libproxy/cmake/modules/pacrunner_webkit.cmk (revision 753) -+++ libproxy/cmake/modules/pacrunner_webkit.cmk (revision 797) -@@ -12,5 +12,9 @@ - set(WEBKIT_FOUND 1) - endif() - else() -- px_check_modules(WEBKIT webkit-1.0) --endif() -\ No newline at end of file -+ if(WITH_WEBKIT3) -+ px_check_modules(WEBKIT webkitgtk-3.0) -+ else() -+ px_check_modules(WEBKIT webkit-1.0) -+ endif() -+endif() -Index: libproxy/url.cpp -=================================================================== ---- libproxy/url.cpp (revision 753) -+++ libproxy/url.cpp (revision 797) -@@ -36,12 +36,9 @@ - - #ifdef WIN32 - #include <io.h> --#define pfsize(st) (st.st_size) - #define close _close - #define read _read - #define SHUT_RDWR SD_BOTH --#else --#define pfsize(st) (st.st_blksize * st.st_blocks) - #endif - - #include "url.hpp" -@@ -56,13 +53,6 @@ - // This is the maximum pac size (to avoid memory attacks) - #define PAC_MAX_SIZE 102400 - --const string url::GENERIC_DELIMITERS(":/?#[]@"); --const string url::SUBCOMPONENT_DELIMITERS("!$&'()*+,;="); --const string url::ALLOWED_IN_USERINFO_ELEMENT(url::SUBCOMPONENT_DELIMITERS); --const string url::ALLOWED_IN_USERINFO(url::ALLOWED_IN_USERINFO_ELEMENT + ":"); --const string url::ALLOWED_IN_PATH_ELEMENT(url::SUBCOMPONENT_DELIMITERS + ":@"); --const string url::ALLOWED_IN_PATH(url::ALLOWED_IN_PATH_ELEMENT + "/"); -- - static inline int get_default_port(string scheme) { - struct servent *serv; - size_t plus = scheme.find('+'); -@@ -109,8 +99,8 @@ - - string url::encode(const string &data, const string &valid_reserved) { - ostringstream encoded; -- for (int i=0; data[i]; i++) { -- if (isalnum(data[i]) -+ for (unsigned int i=0; i < data.size(); i++) { -+ if (isalnum((unsigned char)data[i]) - || valid_reserved.find(data[i]) != string::npos - || string("-._~").find(data[i]) != string::npos) - encoded << data[i]; -@@ -211,7 +201,8 @@ - host_start = userinfo_end + 1; - - /* Check for IPv6 IP */ -- if (hier_part[host_start] == '[') { -+ if (host_start < hier_part.size() -+ && hier_part[host_start] == '[') { - host_end = hier_part.find(']', host_start); - if (host_end == string::npos) - throw parse_error("Invalid URL: " + url); -@@ -232,7 +223,7 @@ - /* Get port */ - m_port = get_default_port(m_scheme); - -- if (host_end != hier_part.size() -+ if (host_end < hier_part.size() - && hier_part[host_end] == ':') { - size_t port_start = host_end + 1; - m_port = atoi(hier_part.c_str() + port_start); -@@ -400,10 +391,12 @@ - struct stat st; - if ((sock = ::open(m_path.c_str(), O_RDONLY)) < 0) - return NULL; -- if (!fstat(sock, &st) && pfsize(st) < PAC_MAX_SIZE) { -- buffer = new char[pfsize(st)+1]; -- if (read(sock, buffer, pfsize(st)) == 0) { -- delete buffer; -+ -+ if (!fstat(sock, &st) && st.st_size < PAC_MAX_SIZE) { -+ buffer = new char[st.st_size+1]; -+ memset(buffer, 0, st.st_size+1); -+ if (read(sock, buffer, st.st_size) == 0) { -+ delete[] buffer; - buffer = NULL; - } - } -@@ -435,7 +428,7 @@ - if (sock < 0) return NULL; - - // Build the request string -- request = "GET " + m_path + " HTTP/1.1\r\n"; -+ request = "GET " + (m_path.size() > 0 ? m_path : "/") + " HTTP/1.1\r\n"; - request += "Host: " + m_host + "\r\n"; - request += "Accept: " + string(PAC_MIME_TYPE) + "\r\n"; - request += "Connection: close\r\n"; -Index: libproxy/url.hpp -=================================================================== ---- libproxy/url.hpp (revision 753) -+++ libproxy/url.hpp (revision 797) -@@ -27,6 +27,13 @@ - - #include "config.hpp" - -+#define URL_GENERIC_DELIMITERS ":/?#[]@" -+#define URL_SUBCOMPONENT_DELIMITERS "!$&'()*+,;=" -+#define URL_ALLOWED_IN_USERINFO_ELEMENT URL_SUBCOMPONENT_DELIMITERS -+#define URL_ALLOWED_IN_USERINFO URL_ALLOWED_IN_USERINFO_ELEMENT ":" -+#define URL_ALLOWED_IN_PATH_ELEMENT URL_SUBCOMPONENT_DELIMITERS ":@" -+#define URL_ALLOWED_IN_PATH URL_ALLOWED_IN_PATH_ELEMENT "/" -+ - namespace libproxy { - - using namespace std; -@@ -38,13 +45,6 @@ - - class DLL_PUBLIC url { - public: -- static const string ALLOWED_IN_PATH; -- static const string ALLOWED_IN_PATH_ELEMENT; -- static const string ALLOWED_IN_USERINFO; -- static const string ALLOWED_IN_USERINFO_ELEMENT; -- static const string GENERIC_DELIMITERS; -- static const string SUBCOMPONENT_DELIMITERS; -- - static bool is_valid(const string url); - static string encode(const string &data, const string &valid_reserved = ""); - -Index: libproxy/proxy.cpp -=================================================================== ---- libproxy/proxy.cpp (revision 753) -+++ libproxy/proxy.cpp (revision 797) -@@ -21,6 +21,7 @@ - #include <cstring> // For strdup() - #include <iostream> // For cerr - #include <stdexcept> // For exception -+#include <typeinfo> // Only for debug messages. - - #include <libmodman/module_manager.hpp> - -@@ -164,7 +165,7 @@ - proxy_factory::~proxy_factory() { - lock(); - -- if (this->pac) delete this->pac; -+ if (this->pac) delete[] this->pac; - if (this->pacurl) delete this->pacurl; - - unlock(); -@@ -260,7 +261,7 @@ - - /* Check our ignore patterns */ - ignores = this->mm.get_extensions<ignore_extension>(); -- invign = confign[0] == '-'; -+ invign = confign.size() > 0 && confign[0] == '-'; - if (invign) confign = confign.substr(1); - for (size_t i=0 ; i < confign.size() && !ignored;) { - size_t next = confign.find(',', i); -Index: libproxy/modules/pacrunner_mozjs.cpp -=================================================================== ---- libproxy/modules/pacrunner_mozjs.cpp (revision 753) -+++ libproxy/modules/pacrunner_mozjs.cpp (revision 797) -@@ -42,12 +42,12 @@ - #define INET6_ADDRSTRLEN 46 - #endif - --static JSBool dnsResolve(JSContext *cx, JSObject * /*obj*/, uintN /*argc*/, jsval *argv, jsval *rval) { -+static JSBool dnsResolve_(JSContext *cx, jsval hostname, jsval *vp) { - // Get hostname argument -- char *tmp = JS_strdup(cx, JS_GetStringBytes(JS_ValueToString(cx, argv[0]))); -+ char *tmp = JS_EncodeString(cx, JS_ValueToString(cx, hostname)); - - // Set the default return value -- *rval = JSVAL_NULL; -+ JS_SET_RVAL(cx, vp, JSVAL_NULL); - - // Look it up - struct addrinfo *info = NULL; -@@ -66,7 +66,7 @@ - NI_NUMERICHOST)) goto out; - - // We succeeded -- *rval = STRING_TO_JSVAL(JS_NewString(cx, tmp, strlen(tmp))); -+ JS_SET_RVAL(cx, vp, STRING_TO_JSVAL(JS_NewStringCopyN(cx, tmp, strlen(tmp)))); - tmp = NULL; - - out: -@@ -75,15 +75,20 @@ - return true; - } - --static JSBool myIpAddress(JSContext *cx, JSObject *obj, uintN /*argc*/, jsval * /*argv*/, jsval *rval) { -+static JSBool dnsResolve(JSContext *cx, uintN /*argc*/, jsval *vp) { -+ jsval *argv = JS_ARGV(cx, vp); -+ return dnsResolve_(cx, argv[0], vp); -+} -+ -+static JSBool myIpAddress(JSContext *cx, uintN /*argc*/, jsval *vp) { - char *hostname = (char *) JS_malloc(cx, 1024); - if (!gethostname(hostname, 1023)) { -- JSString *myhost = JS_NewString(cx, hostname, strlen(hostname)); -+ JSString *myhost = JS_NewStringCopyN(cx, hostname, strlen(hostname)); - jsval arg = STRING_TO_JSVAL(myhost); -- return dnsResolve(cx, obj, 1, &arg, rval); -+ return dnsResolve_(cx, 1, &arg); - } - JS_free(cx, hostname); -- *rval = JSVAL_NULL; -+ JS_SET_RVAL(cx, vp, JSVAL_NULL); - return true; - } - -@@ -91,7 +96,7 @@ - // This MUST be a static global - static JSClass cls = { - "global", JSCLASS_GLOBAL_FLAGS, -- JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, -+ JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub, - JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub, - NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL - }; -@@ -111,7 +116,7 @@ - //JS_SetOptions(this->jsctx, JSOPTION_VAROBJFIX); - //JS_SetVersion(this->jsctx, JSVERSION_LATEST); - //JS_SetErrorReporter(cx, reportError); -- if (!(this->jsglb = JS_NewObject(this->jsctx, &cls, NULL, NULL))) goto error; -+ if (!(this->jsglb = JS_NewCompartmentAndGlobalObject(this->jsctx, &cls, NULL))) goto error; - if (!JS_InitStandardClasses(this->jsctx, this->jsglb)) goto error; - - // Define Javascript functions -@@ -147,15 +152,19 @@ - throw bad_alloc(); - } - jsval args[2] = { -- STRING_TO_JSVAL(JS_NewString(this->jsctx, tmpurl, strlen(tmpurl))), -- STRING_TO_JSVAL(JS_NewString(this->jsctx, tmphost, strlen(tmphost))) -+ STRING_TO_JSVAL(JS_NewStringCopyN(this->jsctx, tmpurl, strlen(tmpurl))), -+ STRING_TO_JSVAL(JS_NewStringCopyN(this->jsctx, tmphost, strlen(tmphost))) - }; - - // Find the proxy (call FindProxyForURL()) - jsval rval; - JSBool result = JS_CallFunctionName(this->jsctx, this->jsglb, "FindProxyForURL", 2, args, &rval); - if (!result) return ""; -- string answer = string(JS_GetStringBytes(JS_ValueToString(this->jsctx, rval))); -+ -+ char * tmpanswer = JS_EncodeString(this->jsctx, JS_ValueToString(this->jsctx, rval)); -+ string answer = string(tmpanswer); -+ JS_free(this->jsctx, tmpanswer); -+ - if (answer == "undefined") return ""; - return answer; - } -Index: libproxy/modules/pacrunner_natus.cpp -=================================================================== ---- libproxy/modules/pacrunner_natus.cpp (revision 0) -+++ libproxy/modules/pacrunner_natus.cpp (revision 797) -@@ -0,0 +1,111 @@ -+/******************************************************************************* -+ * libproxy - A library for proxy configuration -+ * Copyright (C) 2006 Nathaniel McCallum <nathaniel@natemccallum.com> -+ * -+ * 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 -+ ******************************************************************************/ -+ -+#include "../extension_pacrunner.hpp" -+using namespace libproxy; -+ -+#define I_ACKNOWLEDGE_THAT_NATUS_IS_NOT_STABLE -+#include <natus/natus.h> -+#include "pacutils.h" -+ -+using namespace natus; -+ -+static Value dnsResolve(Value& ths, Value& fnc, vector<Value>& arg) { -+ Value exc = checkArguments(ths, arg, "s"); -+ if (exc.isException()) return exc; -+ -+ // Look it up -+ struct addrinfo *info; -+ if (getaddrinfo(arg[0].toString().c_str(), NULL, NULL, &info)) -+ return NULL; -+ -+ // Try for IPv4 -+ char* tmp = new char[INET6_ADDRSTRLEN+1]; -+ if (getnameinfo(info->ai_addr, info->ai_addrlen, -+ tmp, INET6_ADDRSTRLEN+1, -+ NULL, 0, -+ NI_NUMERICHOST)) { -+ freeaddrinfo(info); -+ delete tmp; -+ return NULL; -+ } -+ freeaddrinfo(info); -+ -+ // Create the return value -+ Value ret = ths.newString(tmp); -+ delete tmp; -+ return ret; -+} -+ -+static Value myIpAddress(Value& ths, Value& fnc, vector<Value>& arg) { -+ char hostname[1024]; -+ if (!gethostname(hostname, 1023)) { -+ vector<Value> dnsargs; -+ dnsargs.push_back(ths.newString(hostname)); -+ return dnsResolve(ths, fnc, dnsargs); -+ } -+ return ths.newString("Unable to find hostname!").toException(); -+} -+ -+class natus_pacrunner : public pacrunner { -+public: -+ natus_pacrunner(string pac, const url& pacurl) throw (bad_alloc) : pacrunner(pac, pacurl) { -+ Value exc; -+ -+ // Create the basic context -+ if (!eng.initialize()) goto error; -+ glb = this->eng.newGlobal(); -+ if (glb.isException()) goto error; -+ -+ // Add dnsResolve into the context -+ if (!glb.set("dnsResolve", glb.newFunction(dnsResolve))) goto error; -+ -+ // Add myIpAddress into the context -+ if (!glb.set("myIpAddress", glb.newFunction(myIpAddress))) goto error; -+ -+ // Add all other routines into the context -+ exc = glb.evaluate(JAVASCRIPT_ROUTINES); -+ if (exc.isException()) goto error; -+ -+ // Add the PAC into the context -+ exc = glb.evaluate(pac.c_str(), pacurl.to_string()); -+ if (exc.isException()) goto error; -+ return; -+ -+ error: -+ throw bad_alloc(); -+ } -+ -+ string run(const url& url_) throw (bad_alloc) { -+ vector<Value> args; -+ args.push_back(glb.newString(url_.to_string())); -+ args.push_back(glb.newString(url_.get_host())); -+ -+ Value res = glb.call("FindProxyForURL", args); -+ if (res.isString() && !res.isException()) -+ return res.toString(); -+ return ""; -+ } -+ -+private: -+ Engine eng; -+ Value glb; -+}; -+ -+PX_PACRUNNER_MODULE_EZ(natus, "nt_engine_init", "natus"); -Index: libproxy/modules/config_gnome.cpp -=================================================================== ---- libproxy/modules/config_gnome.cpp (revision 753) -+++ libproxy/modules/config_gnome.cpp (revision 797) -@@ -102,10 +102,8 @@ - if (dup2(rpipe[1], STDOUT_FILENO) != STDOUT_FILENO) _exit(2); - - // Close unneeded fds -- close(rpipe[0]); -- close(rpipe[1]); -- close(wpipe[0]); -- close(wpipe[1]); -+ for (int i = 3; i < sysconf(_SC_OPEN_MAX); i++) -+ close(i); - - // Exec - execl("/bin/sh", "sh", "-c", program, (char*) NULL); -@@ -194,8 +192,8 @@ - else if (this->data[PROXY_MODE] == "manual") { - string type, host, port; - bool auth = this->data[PROXY_USE_AUTHENTICATION] == "true"; -- string username = url::encode(this->data[PROXY_AUTH_USER], url::ALLOWED_IN_USERINFO_ELEMENT); -- string password = url::encode(this->data[PROXY_AUTH_PASSWORD], url::ALLOWED_IN_USERINFO_ELEMENT); -+ string username = url::encode(this->data[PROXY_AUTH_USER], URL_ALLOWED_IN_USERINFO_ELEMENT); -+ string password = url::encode(this->data[PROXY_AUTH_PASSWORD], URL_ALLOWED_IN_USERINFO_ELEMENT); - bool same_proxy = this->data[PROXY_SAME_FOR_ALL] == "true"; - - // If socks is set use it (except when same_proxy is set) -Index: NEWS -=================================================================== ---- NEWS (revision 753) -+++ NEWS (revision 797) -@@ -1,3 +1,14 @@ -+New in version 0.4.7 -+============================== -+* Support/require xulrunner 2.0+ -+* Support linking againgst libwebkit-gtk3 (-DWITH_WEBKIT3=ON) -+* Issues closed: -+ - #149: always test for the right python noarch module path -+ - #155: Cannot compile with Firefox 4 -+ - #156: libproxy should build against webkitgtk-3.0 -+ - #158: Won't compile w/ xulrunner 2.0 final -+ - #159: libproxy fails with autoconfiguration "http://proxy.domain.com" -+ - New in version 0.4.6 - ============================== - * Fixed a crash in the URL parser -Index: CMakeLists.txt -=================================================================== ---- CMakeLists.txt (revision 753) -+++ CMakeLists.txt (revision 797) -@@ -24,6 +24,8 @@ - include(cmake/ctest.cmk) - include(cmake/paths.cmk) - -+option(WITH_WEBKIT3 "Build against gtk-3 version of webkitgtk" OFF) -+ - ### Subdirectories - # Conditionally build bundled libmodman - option(FORCE_SYSTEM_LIBMODMAN "Force using system libmodman" OFF) -@@ -44,8 +46,12 @@ - endif() - endif() - -+# Conditionally build bindings -+if(NOT WIN32) -+ add_subdirectory(bindings) -+endif() -+ - # Always build these - add_subdirectory(libproxy) --add_subdirectory(bindings) - add_subdirectory(utils) - diff --git a/libraries/libproxy/libproxy.SlackBuild b/libraries/libproxy/libproxy.SlackBuild index b2f4b56ac3..6cf720715d 100644 --- a/libraries/libproxy/libproxy.SlackBuild +++ b/libraries/libproxy/libproxy.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libproxy -VERSION=${VERSION:-0.4.6} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.4.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,14 +69,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# http://code.google.com/p/libproxy/source/detail?r=797 -# This patch brings the 4.6 (r753) code up to r797. -patch -p0 < $CWD/4.6-r797.patch - cmake . \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DLIB_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX} \ -DMODULE_INSTALL_DIR=/usr/lib${LIBDIRSUFFIX}/libproxy/${VERSION}/modules \ -DPERL_VENDORINSTALL=yes diff --git a/libraries/libproxy/libproxy.info b/libraries/libproxy/libproxy.info index 3e00d1b4db..e7daa17fcd 100644 --- a/libraries/libproxy/libproxy.info +++ b/libraries/libproxy/libproxy.info @@ -1,10 +1,10 @@ PRGNAM="libproxy" -VERSION="0.4.6" +VERSION="0.4.7" HOMEPAGE="http://code.google.com/p/libproxy/" -DOWNLOAD="http://libproxy.googlecode.com/files/libproxy-0.4.6.tar.gz" -MD5SUM="199c6b120baf1f7258a55f38d5ec74f5" +DOWNLOAD="http://libproxy.googlecode.com/files/libproxy-0.4.7.tar.gz" +MD5SUM="509e03a488a61cd62bfbaf3ab6a2a7a5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="dsomero" +APPROVED="" diff --git a/libraries/libsoup/README b/libraries/libsoup/README index 348dfefcef..59cbafc029 100644 --- a/libraries/libsoup/README +++ b/libraries/libsoup/README @@ -2,4 +2,5 @@ Soup is an HTTP library implementation in C. It was originally part of a SOAP (Simple Object Access Protocol) implementation, but the SOAP code was later removed (and then later partially reimplemented...). +glib-networking is required. Optional dependencies for libsoup-gnome are libproxy and gnome-keyring. diff --git a/libraries/libsoup/libsoup.SlackBuild b/libraries/libsoup/libsoup.SlackBuild index 3d173edebe..4249967913 100644 --- a/libraries/libsoup/libsoup.SlackBuild +++ b/libraries/libsoup/libsoup.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libsoup -VERSION=2.32.2 -BUILD=${BUILD:-2} +VERSION=2.34.3 +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -54,21 +54,21 @@ else LIBDIRSUFFIX="" fi +if pkg-config --exists libproxy-1.0 gnome-keyring-1 ; then + GNOME=yes ; else GNOME=no +fi + set -eu rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . -if pkg-config --exists libproxy-1.0 gnome-keyring-1 ; then - GNOME=yes ; else GNOME=no -fi - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/libsoup/libsoup.info b/libraries/libsoup/libsoup.info index fecf9a9385..ac33926145 100644 --- a/libraries/libsoup/libsoup.info +++ b/libraries/libsoup/libsoup.info @@ -1,10 +1,10 @@ PRGNAM="libsoup" -VERSION="2.32.2" +VERSION="2.34.3" HOMEPAGE="http://live.gnome.org/LibSoup" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.32/libsoup-2.32.2.tar.bz2" -MD5SUM="03f37350a2a31046ebabb8470e75abcc" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.34/libsoup-2.34.3.tar.xz" +MD5SUM="dbec2025b30370f01674d83824d537ea" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Erik Hanson" EMAIL="erik@slackbuilds.org" -APPROVED="rworkman" +APPROVED="" diff --git a/libraries/libtasn1/libtasn1.SlackBuild b/libraries/libtasn1/libtasn1.SlackBuild index 0524775f43..76a5674da9 100644 --- a/libraries/libtasn1/libtasn1.SlackBuild +++ b/libraries/libtasn1/libtasn1.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libtasn1 -VERSION=${VERSION:-2.9} +VERSION=${VERSION:-2.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,7 +59,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find . \ diff --git a/libraries/libtasn1/libtasn1.info b/libraries/libtasn1/libtasn1.info index 1996fd2876..d83cee62b7 100644 --- a/libraries/libtasn1/libtasn1.info +++ b/libraries/libtasn1/libtasn1.info @@ -1,10 +1,10 @@ PRGNAM="libtasn1" -VERSION="2.9" +VERSION="2.11" HOMEPAGE="http://ftp.gnu.org/gnu/libtasn1/" -DOWNLOAD="http://ftp.gnu.org/gnu/libtasn1/libtasn1-2.9.tar.gz" -MD5SUM="f4f4035b84550100ffeb8ad4b261dea9" +DOWNLOAD="http://ftp.gnu.org/gnu/libtasn1/libtasn1-2.11.tar.gz" +MD5SUM="ee8076752f2afcbcd12f3dd9bc622748" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Stylianos Tsampas" EMAIL="ztsampas@otenet.gr" -APPROVED="Erik Hanson" +APPROVED="" diff --git a/libraries/libtirpc/README b/libraries/libtirpc/README new file mode 100644 index 0000000000..f235e1b6ec --- /dev/null +++ b/libraries/libtirpc/README @@ -0,0 +1,5 @@ +libtirpc (RPC library implementation) + +Libtirpc is a port of Suns Transport-Independent RPC library to Linux. +It's being developed by the Bull GNU/Linux NFSv4 project. +It currently lacks DES and NIS support. diff --git a/libraries/libtirpc/doinst.sh b/libraries/libtirpc/doinst.sh new file mode 100644 index 0000000000..cc5dc4a387 --- /dev/null +++ b/libraries/libtirpc/doinst.sh @@ -0,0 +1,14 @@ +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/netconfig.new diff --git a/libraries/libtirpc/libtirpc.SlackBuild b/libraries/libtirpc/libtirpc.SlackBuild new file mode 100644 index 0000000000..4bad33ec4e --- /dev/null +++ b/libraries/libtirpc/libtirpc.SlackBuild @@ -0,0 +1,99 @@ +#!/bin/sh + +# Slackware build script for libtirpc +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=libtirpc +VERSION=${VERSION:-0.2.2} +BUILD=${BUILD:-2} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO VERSION" + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$VERSION +mkdir src/rpcnis +tar xvf $CWD/rpcnis-headers.tar.bz2 -C src/rpcnis +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 {} \; + +# remove broken des and nis references +# http://www.mail-archive.com/blfs-support@linuxfromscratch.org/msg13412.html +patch -p1 < $CWD/no-des_no-nis.patch + +CFLAGS="$SLKCFLAGS -I./rpcnis" \ +CXXFLAGS="$SLKCFLAGS -I./rpcnis" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --enable-static=no \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +# remove the static libs +rm $PKG/usr/lib${LIBDIRSUFFIX}/*.la +# include all the headers, seems make install is too restrictive +rm -fR $PKG/usr/include/tirpc/* +cp -R tirpc/* $PKG/usr/include/tirpc/ + +mv $PKG/etc/netconfig $PKG/etc/netconfig.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 + +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/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libtirpc/libtirpc.info b/libraries/libtirpc/libtirpc.info new file mode 100644 index 0000000000..917e27d8d3 --- /dev/null +++ b/libraries/libtirpc/libtirpc.info @@ -0,0 +1,14 @@ +PRGNAM="libtirpc" +VERSION="0.2.2" +HOMEPAGE="http://libtirpc.sourceforge.net/" +DOWNLOAD="\ + http://downloads.sourceforge.net/libtirpc/libtirpc-0.2.2.tar.bz2 \ + http://ponce.cc/slackware/sources/repo/rpcnis-headers.tar.bz2" +MD5SUM="\ + 74c41c15c2909f7d11d9c7bfa7db6273 \ + 635c7c9b6c962246a50a579ddbdbb95c" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/libraries/libtirpc/no-des_no-nis.patch b/libraries/libtirpc/no-des_no-nis.patch new file mode 100644 index 0000000000..051f1e4ab4 --- /dev/null +++ b/libraries/libtirpc/no-des_no-nis.patch @@ -0,0 +1,153 @@ +*** ./src/rpc_soc.c.ORIG Wed Oct 26 18:02:55 2011 +--- ./src/rpc_soc.c Wed Oct 26 18:02:55 2011 +*************** +*** 519,524 **** +--- 519,525 ---- + * Create the client des authentication object. Obsoleted by + * authdes_seccreate(). + */ ++ #if 0 + AUTH * + authdes_create(servername, window, syncaddr, ckey) + char *servername; /* network name of server */ +*************** +*** 546,551 **** +--- 547,553 ---- + dummy = authdes_seccreate(servername, window, NULL, ckey); + return (dummy); + } ++ #endif + + /* + * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() +*** ./src/Makefile.in.ORIG Wed Oct 26 18:02:55 2011 +--- ./src/Makefile.in Wed Oct 26 18:02:55 2011 +*************** +*** 81,88 **** + rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \ + rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \ + svc_dg.c svc_auth_unix.c svc_generic.c svc_raw.c svc_run.c \ +! svc_simple.c svc_vc.c getpeereid.c auth_time.c auth_des.c \ +! authdes_prot.c des_crypt.c xdr.c xdr_rec.c xdr_array.c \ + xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c auth_gss.c \ + authgss_prot.c svc_auth_gss.c svc_auth_none.c + @GSS_TRUE@am__objects_1 = libtirpc_la-auth_gss.lo \ +--- 81,88 ---- + rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \ + rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \ + svc_dg.c svc_auth_unix.c svc_generic.c svc_raw.c svc_run.c \ +! svc_simple.c svc_vc.c getpeereid.c auth_time.c \ +! xdr.c xdr_rec.c xdr_array.c \ + xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c auth_gss.c \ + authgss_prot.c svc_auth_gss.c svc_auth_none.c + @GSS_TRUE@am__objects_1 = libtirpc_la-auth_gss.lo \ +*************** +*** 110,117 **** + libtirpc_la-svc_generic.lo libtirpc_la-svc_raw.lo \ + libtirpc_la-svc_run.lo libtirpc_la-svc_simple.lo \ + libtirpc_la-svc_vc.lo libtirpc_la-getpeereid.lo \ +! libtirpc_la-auth_time.lo libtirpc_la-auth_des.lo \ +! libtirpc_la-authdes_prot.lo libtirpc_la-des_crypt.lo \ + libtirpc_la-xdr.lo libtirpc_la-xdr_rec.lo \ + libtirpc_la-xdr_array.lo libtirpc_la-xdr_float.lo \ + libtirpc_la-xdr_mem.lo libtirpc_la-xdr_reference.lo \ +--- 110,117 ---- + libtirpc_la-svc_generic.lo libtirpc_la-svc_raw.lo \ + libtirpc_la-svc_run.lo libtirpc_la-svc_simple.lo \ + libtirpc_la-svc_vc.lo libtirpc_la-getpeereid.lo \ +! libtirpc_la-auth_time.lo \ +! \ + libtirpc_la-xdr.lo libtirpc_la-xdr_rec.lo \ + libtirpc_la-xdr_array.lo libtirpc_la-xdr_float.lo \ + libtirpc_la-xdr_mem.lo libtirpc_la-xdr_reference.lo \ +*************** +*** 291,297 **** + # release number of your package. This is an abuse that only fosters + # misunderstanding of the purpose of library versions." + # +! libtirpc_la_LDFLAGS = -lnsl -lpthread -version-info 1:10:0 \ + $(am__append_2) + libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \ + bindresvport.c clnt_bcast.c clnt_dg.c clnt_generic.c \ +--- 291,297 ---- + # release number of your package. This is an abuse that only fosters + # misunderstanding of the purpose of library versions." + # +! libtirpc_la_LDFLAGS = -lpthread -version-info 1:10:0 \ + $(am__append_2) + libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c \ + bindresvport.c clnt_bcast.c clnt_dg.c clnt_generic.c \ +*************** +*** 302,309 **** + rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \ + rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \ + svc_dg.c svc_auth_unix.c svc_generic.c svc_raw.c svc_run.c \ +! svc_simple.c svc_vc.c getpeereid.c auth_time.c auth_des.c \ +! authdes_prot.c des_crypt.c xdr.c xdr_rec.c xdr_array.c \ + xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \ + $(am__append_1) + @GSS_TRUE@libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS) +--- 302,309 ---- + rpc_commondata.c rpc_callmsg.c rpc_generic.c rpc_soc.c \ + rpcb_clnt.c rpcb_prot.c rpcb_st_xdr.c svc.c svc_auth.c \ + svc_dg.c svc_auth_unix.c svc_generic.c svc_raw.c svc_run.c \ +! svc_simple.c svc_vc.c getpeereid.c auth_time.c \ +! xdr.c xdr_rec.c xdr_array.c \ + xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c \ + $(am__append_1) + @GSS_TRUE@libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSGLUE_CFLAGS) +*************** +*** 753,778 **** + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c + +! libtirpc_la-auth_des.lo: auth_des.c +! @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-auth_des.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_des.Tpo -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtirpc_la-auth_des.Tpo $(DEPDIR)/libtirpc_la-auth_des.Plo +! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='auth_des.c' object='libtirpc_la-auth_des.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +! @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_des.lo `test -f 'auth_des.c' || echo '$(srcdir)/'`auth_des.c + +! libtirpc_la-authdes_prot.lo: authdes_prot.c +! @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-authdes_prot.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-authdes_prot.Tpo -c -o libtirpc_la-authdes_prot.lo `test -f 'authdes_prot.c' || echo '$(srcdir)/'`authdes_prot.c + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtirpc_la-authdes_prot.Tpo $(DEPDIR)/libtirpc_la-authdes_prot.Plo +! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='authdes_prot.c' object='libtirpc_la-authdes_prot.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +! @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-authdes_prot.lo `test -f 'authdes_prot.c' || echo '$(srcdir)/'`authdes_prot.c + +! libtirpc_la-des_crypt.lo: des_crypt.c +! @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-des_crypt.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-des_crypt.Tpo -c -o libtirpc_la-des_crypt.lo `test -f 'des_crypt.c' || echo '$(srcdir)/'`des_crypt.c + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtirpc_la-des_crypt.Tpo $(DEPDIR)/libtirpc_la-des_crypt.Plo +! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='des_crypt.c' object='libtirpc_la-des_crypt.lo' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +! @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-des_crypt.lo `test -f 'des_crypt.c' || echo '$(srcdir)/'`des_crypt.c + + libtirpc_la-xdr.lo: xdr.c + @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-xdr.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-xdr.Tpo -c -o libtirpc_la-xdr.lo `test -f 'xdr.c' || echo '$(srcdir)/'`xdr.c +--- 753,778 ---- + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o libtirpc_la-auth_time.lo `test -f 'auth_time.c' || echo '$(srcdir)/'`auth_time.c + +! : +! @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT -MD -MP -MF $(DEPDIR)/libtirpc_la-auth_des.Tpo -c -o `test -f '' || echo '$(srcdir)/'` + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtirpc_la-auth_des.Tpo $(DEPDIR)/libtirpc_la-auth_des.Plo +! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='' object='' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +! @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o `test -f '' || echo '$(srcdir)/'` + +! : +! @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT -MD -MP -MF $(DEPDIR)/libtirpc_la-authdes_prot.Tpo -c -o `test -f '' || echo '$(srcdir)/'` + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtirpc_la-authdes_prot.Tpo $(DEPDIR)/libtirpc_la-authdes_prot.Plo +! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='' object='' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +! @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o `test -f '' || echo '$(srcdir)/'` + +! : +! @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT -MD -MP -MF $(DEPDIR)/libtirpc_la-des_crypt.Tpo -c -o `test -f '' || echo '$(srcdir)/'` + @am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libtirpc_la-des_crypt.Tpo $(DEPDIR)/libtirpc_la-des_crypt.Plo +! @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='' object='' libtool=yes @AMDEPBACKSLASH@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +! @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -c -o `test -f '' || echo '$(srcdir)/'` + + libtirpc_la-xdr.lo: xdr.c + @am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtirpc_la_CFLAGS) $(CFLAGS) -MT libtirpc_la-xdr.lo -MD -MP -MF $(DEPDIR)/libtirpc_la-xdr.Tpo -c -o libtirpc_la-xdr.lo `test -f 'xdr.c' || echo '$(srcdir)/'`xdr.c diff --git a/libraries/libtirpc/slack-desc b/libraries/libtirpc/slack-desc new file mode 100644 index 0000000000..25b8262527 --- /dev/null +++ b/libraries/libtirpc/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------------------------------------------------------| +libtirpc: libtirpc (RPC library implementation) +libtirpc: +libtirpc: Libtirpc is a port of Suns Transport-Independent RPC library to Linux. +libtirpc: It's being developed by the Bull GNU/Linux NFSv4 project. +libtirpc: It currently lacks DES and NIS support. +libtirpc: +libtirpc: homepage: http://libtirpc.sourceforge.net/ +libtirpc: +libtirpc: +libtirpc: +libtirpc: diff --git a/libraries/libunicap/README b/libraries/libunicap/README index 792c9234af..f556b088a6 100644 --- a/libraries/libunicap/README +++ b/libraries/libunicap/README @@ -6,3 +6,5 @@ It offers a high level of hardware abstraction while maintaining maximum performance. Zero copy capture of video buffers is possible for devices supporting it allowing fast video capture with low CPU usage even on low-speed architectures. + +ffmpeg is an optional dependency. diff --git a/libraries/libunicap/disable-v4l.patch b/libraries/libunicap/disable-v4l.patch new file mode 100644 index 0000000000..bb2ca28af8 --- /dev/null +++ b/libraries/libunicap/disable-v4l.patch @@ -0,0 +1,11 @@ +diff -Naur libunicap-0.9.12.orig/cpi/v4l2cpi/uvcvideo.h libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h +--- libunicap-0.9.12.orig/cpi/v4l2cpi/uvcvideo.h 2010-01-17 08:49:29.000000000 +0100 ++++ libunicap-0.9.12/cpi/v4l2cpi/uvcvideo.h 2011-06-02 07:41:09.642997395 +0200 +@@ -2,7 +2,6 @@ + #define _USB_VIDEO_H_ + + #include <linux/kernel.h> +-#include <linux/videodev.h> + + #include "uvc_compat.h" + diff --git a/libraries/libunicap/libunicap.SlackBuild b/libraries/libunicap/libunicap.SlackBuild index 791c4532e1..b865bf5eaa 100644 --- a/libraries/libunicap/libunicap.SlackBuild +++ b/libraries/libunicap/libunicap.SlackBuild @@ -52,6 +52,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# kernel in 13.37 doesn't have this header anymore +# http://lists.fedoraproject.org/pipermail/devel/2011-February/148519.html +patch -p1 < $CWD/disable-v4l.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -61,6 +65,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --disable-static \ + --disable-v4l \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux diff --git a/libraries/libvirt/README b/libraries/libvirt/README index efc0370908..897ac9d999 100644 --- a/libraries/libvirt/README +++ b/libraries/libvirt/README @@ -2,3 +2,20 @@ libvirt - The virtualization API libvirt is a toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). + +You can enable other optional (not-autodetected) features +by passing variables to the script +(VAR=yes|no ./libvirt.SlackBuild): +VIRTGROUP=somegroup (default: users) qemu group used +XEN=yes|no (default: no) xen support +VMWARE=yes|no (default: no) vmware support +ESX=yes|no (default: no) esx support +TIRPC=yes|no (default: no) build against libtirpc (current) + +if you want to start the libvirt daemon at boot add this +to /etc/rc.d/rc.local + +# Start libvirt: +if [ -x /etc/rc.d/rc.libvirt ]; then + /etc/rc.d/rc.libvirt start +fi diff --git a/libraries/libvirt/doinst.sh b/libraries/libvirt/doinst.sh index d5a0dd37db..3de36d0ee3 100644 --- a/libraries/libvirt/doinst.sh +++ b/libraries/libvirt/doinst.sh @@ -36,3 +36,4 @@ config etc/logrotate.d/libvirtd.lxc.new config etc/logrotate.d/libvirtd.qemu.new config etc/logrotate.d/libvirtd.uml.new config etc/sasl2/libvirt.conf.new +config etc/rc.d/rc.libvirt.new diff --git a/libraries/libvirt/libvirt.SlackBuild b/libraries/libvirt/libvirt.SlackBuild index bee24a10ae..26c1bbfade 100644 --- a/libraries/libvirt/libvirt.SlackBuild +++ b/libraries/libvirt/libvirt.SlackBuild @@ -4,7 +4,7 @@ # Written by Michal Bialozor <bialyy@o2.pl> PRGNAM=libvirt -VERSION=0.9.4 +VERSION=${VERSION:-0.9.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -35,17 +35,46 @@ else LIBDIRSUFFIX="" fi +PYTHONSITEPKG=$(python -c "import sys, os; print os.path.join('/usr/lib${LIBDIRSUFFIX}', 'python%s' % sys.version[:3], 'site-packages')") + +VIRTGROUP=${VIRTGROUP:-users} + +if [ "${XEN:-no}" = "no" ]; then + enable_xen="--without-xen" +else + enable_xen="--with-xen" +fi + +if [ "${VMWARE:-no}" = "no" ]; then + enable_vmware="--without-vmware" +else + enable_vmware="--with-vmware" +fi + +if [ "${ESX:-no}" = "no" ]; then + enable_esx="--without-esx" +else + enable_esx="--with-esx" +fi + +if [ "${TIRPC:-no}" = "no" ]; then + XDRCFLAGS="" +else + XDRCFLAGS=" -I/usr/include/tirpc " +fi + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . +CPPFLAGS="$XDRCFLAGS" \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -58,7 +87,12 @@ CFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-static=no \ --enable-shared=yes \ - --without-xen \ + --with-python=/usr \ + --without-openvz \ + --with-qemu-group=$VIRTGROUP \ + $enable_xen \ + $enable_vmware \ + $enable_esx \ --build=$ARCH-slackware-linux make \ @@ -69,6 +103,18 @@ make \ EXAMPLE_DIR=/usr/doc/$PRGNAM-$VERSION/examples \ install-strip DESTDIR=$PKG +# add an rc.libvirt to start the daemon +install -D -m 0755 $CWD/rc.libvirt $PKG/etc/rc.d/rc.libvirt.new + +# by default we got no certs +sed -i -e 's|\#listen_tls\ =\ 0|listen_tls = 0|' $PKG/etc/libvirt/libvirtd.conf +# we use $VIRTGROUP as our virtualization group +sed -i -e "s|\#group\ =\ \"root\"|group = \"$VIRTGROUP\"|" $PKG/etc/libvirt/qemu.conf +sed -i -e "s|\#unix_sock_group\ =\ \"libvirt\"|unix_sock_group = \"$VIRTGROUP\"|" \ + $PKG/etc/libvirt/libvirtd.conf +sed -i -e "s|\#unix_sock_rw_perms\ =\ \"0770\"|unix_sock_rw_perms = \"0770\"|" \ + $PKG/etc/libvirt/libvirtd.conf + mv $PKG/etc/libvirt/qemu.conf \ $PKG/etc/libvirt/qemu.conf.new mv $PKG/etc/libvirt/qemu/networks/default.xml \ @@ -123,7 +169,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - ABOUT-NLS AUTHORS ChangeLog COPYING* INSTALL README NEWS TODO \ + ABOUT-NLS AUTHORS ChangeLog COPYING* INSTALL README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild rm -rf $PKG/usr/share/doc diff --git a/libraries/libvirt/libvirt.info b/libraries/libvirt/libvirt.info index 06f7d5feec..6b2721c004 100644 --- a/libraries/libvirt/libvirt.info +++ b/libraries/libvirt/libvirt.info @@ -1,10 +1,10 @@ PRGNAM="libvirt" -VERSION="0.9.4" +VERSION="0.9.8" HOMEPAGE="http://libvirt.org" -DOWNLOAD="http://libvirt.org/sources/libvirt-0.9.4.tar.gz" -MD5SUM="86b411b11bd23d4af20611699f372af7" +DOWNLOAD="http://libvirt.org/sources/libvirt-0.9.8.tar.gz" +MD5SUM="5bb74092e469d773c3d63128a8c57501" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Michal Bialozor" EMAIL="bialyy@o2.pl" -APPROVED="Niels Horn" +APPROVED="" diff --git a/libraries/libvirt/rc.libvirt b/libraries/libvirt/rc.libvirt new file mode 100644 index 0000000000..1cdea9a7ea --- /dev/null +++ b/libraries/libvirt/rc.libvirt @@ -0,0 +1,106 @@ +#!/bin/bash + +MODULES="tun vhost_net" +PIDFILE="/var/run/libvirtd.pid" +TIMEOUT=${TIMEOUT:-40} +OPTS=${OPTS:-" -v -f /etc/libvirt/libvirtd.conf "} + +check_running_machines() { + + i=0 + + for j in `/usr/sbin/virsh list | grep running | awk '{print $2;}'` ; do + /usr/sbin/virsh shutdown $j + done + + echo -n "Waiting machines" + + while [ $(/usr/sbin/virsh list | grep running | wc -l) -gt "0" ]; do + if [ "$i" -ge "$TIMEOUT" ];then + break + fi + echo -n "." + i=`expr $i + 1` + sleep 1 + done + + echo "" + + if [ $(/usr/sbin/virsh list | grep running | wc -l) -gt "0" ];then + + echo -n "The following machines are still running, forcing shutdown: " + for j in `/usr/sbin/virsh list | grep running | awk '{print $2;}'` ; do + /usr/sbin/virsh destroy $j + echo -n "$j " + done + + echo "" + sleep 2 + fi + +} + +check_processor() { + + egrep 'vmx' /proc/cpuinfo > /dev/null + + if [ "$?" -eq "0" ];then + MODULES="$MODULES kvm_intel kvm" + fi + + check=$? + + egrep 'svm' /proc/cpuinfo > /dev/null + + if [ "$?" -eq "0" ];then + MODULES="$MODULES kvm_amd kvm" + fi + + check=`expr $check + $?` + + if [ $check -eq "2" ];then + echo "Your systems does not support KVM!" + fi + +} + +start() { + if [ -f $PIDFILE ];then + echo "libvirt is already running..." + exit 1 + fi + echo "Starting libvirtd..." + check_processor + modprobe -a $MODULES + libvirtd -d -l $OPTS +} + +stop() { + if [ ! -f $PIDFILE ];then + echo "libvirt is not running..." + exit 2 + fi + check_running_machines + check_processor + echo "Stopping libvirtd..." + kill -TERM `cat $PIDFILE` + modprobe -ra $MODULES +} + +case $1 in +start) + start + ;; +stop) + stop + ;; +restart) + stop + sleep 1 + start + ;; +*) + echo "Usage: $0 (start|stop|restart)" + ;; +esac + diff --git a/libraries/pangomm/pangomm.SlackBuild b/libraries/pangomm/pangomm.SlackBuild index 94cfee8108..1002ca2dca 100644 --- a/libraries/pangomm/pangomm.SlackBuild +++ b/libraries/pangomm/pangomm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pangomm -VERSION=${VERSION:-2.28.1} +VERSION=${VERSION:-2.28.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/pangomm/pangomm.info b/libraries/pangomm/pangomm.info index c4b0cb3ffd..3a377524eb 100644 --- a/libraries/pangomm/pangomm.info +++ b/libraries/pangomm/pangomm.info @@ -1,10 +1,10 @@ PRGNAM="pangomm" -VERSION="2.28.1" +VERSION="2.28.2" HOMEPAGE="http://www.gtkmm.org/" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/pangomm/2.28/pangomm-2.28.1.tar.bz2" -MD5SUM="03e6406bfb311e4018e69ab2a02b489b" +DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/pangomm/2.28/pangomm-2.28.2.tar.bz2" +MD5SUM="005a474863495d3c6267429a80da6cf2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="Erik Hanson" +APPROVED="" diff --git a/libraries/sg3_utils/sg3_utils.SlackBuild b/libraries/sg3_utils/sg3_utils.SlackBuild index e3619b6299..9b6cc61275 100644 --- a/libraries/sg3_utils/sg3_utils.SlackBuild +++ b/libraries/sg3_utils/sg3_utils.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sg3_utils -VERSION=${VERSION:-1.31} +VERSION=${VERSION:-1.32} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/sg3_utils/sg3_utils.info b/libraries/sg3_utils/sg3_utils.info index 5415d0a680..b260a1de29 100644 --- a/libraries/sg3_utils/sg3_utils.info +++ b/libraries/sg3_utils/sg3_utils.info @@ -1,10 +1,10 @@ PRGNAM="sg3_utils" -VERSION="1.31" +VERSION="1.32" HOMEPAGE="http://sg.danny.cz/sg/sg3_utils.html" -DOWNLOAD="http://sg.danny.cz/sg/p/sg3_utils-1.31.tgz" -MD5SUM="9431e1944cde829a24dedf027e1364b5" +DOWNLOAD="http://sg.danny.cz/sg/p/sg3_utils-1.32.tgz" +MD5SUM="0f64a1a8d7e451f516f2b1df3d032e4b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="dsomero" +APPROVED="" diff --git a/libraries/soundtouch/soundtouch.SlackBuild b/libraries/soundtouch/soundtouch.SlackBuild index dae1738fc9..98862281c5 100644 --- a/libraries/soundtouch/soundtouch.SlackBuild +++ b/libraries/soundtouch/soundtouch.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=soundtouch -VERSION=1.5.0 +VERSION=${VERSION:-1.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,6 +71,8 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +./bootstrap + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/soundtouch/soundtouch.info b/libraries/soundtouch/soundtouch.info index b4047e4299..a0dc61d978 100644 --- a/libraries/soundtouch/soundtouch.info +++ b/libraries/soundtouch/soundtouch.info @@ -1,10 +1,10 @@ PRGNAM="soundtouch" -VERSION="1.5.0" +VERSION="1.6.0" HOMEPAGE="http://www.surina.net/soundtouch" -DOWNLOAD="http://www.surina.net/soundtouch/soundtouch-1.5.0.tar.gz" -MD5SUM="5456481d8707d2a2c27466ea64a099cb" +DOWNLOAD="http://www.surina.net/soundtouch/soundtouch-1.6.0.tar.gz" +MD5SUM="aa1c63d4d67b033f044a6a48d2be5bdd" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="dsomero" +APPROVED="" diff --git a/libraries/webkitgtk/README b/libraries/webkitgtk/README index d48b627604..35df8504d6 100644 --- a/libraries/webkitgtk/README +++ b/libraries/webkitgtk/README @@ -1,4 +1,4 @@ WebKitGTK+ is the port of the portable web rendering engine WebKit to the GTK+ platform. -Requires icu4c and libsoup. +Requires icu4c, libsoup and perl-switch. diff --git a/libraries/wvstreams/wvstreams-4.6.1-parallel-make.patch b/libraries/wvstreams/wvstreams-4.6.1-parallel-make.patch new file mode 100644 index 0000000000..5ad79fd7a9 --- /dev/null +++ b/libraries/wvstreams/wvstreams-4.6.1-parallel-make.patch @@ -0,0 +1,58 @@ +diff -ur wvstreams-4.6.1.orig/Makefile wvstreams-4.6.1/Makefile +--- wvstreams-4.6.1.orig/Makefile 2009-09-16 00:26:50.000000000 +0300 ++++ wvstreams-4.6.1/Makefile 2010-01-04 18:06:15.000000000 +0200 +@@ -131,12 +131,19 @@ + # libwvstreams: stream/event handling library + # + TARGETS += libwvstreams.so +-TARGETS += crypto/tests/ssltest ipstreams/tests/unixtest ++TARGETS += crypto/tests/ssltest ++crypto/tests/ssltest: $(LIBWVSTREAMS) ++ ++TARGETS += ipstreams/tests/unixtest ++ipstreams/tests/unixtest: $(LIBWVSTREAMS) ++ + TARGETS += crypto/tests/printcert ++crypto/tests/printcert: $(LIBWVSTREAMS) + + ifndef _MACOS + ifneq ("$(with_readline)", "no") + TARGETS += ipstreams/tests/wsd ++ ipstreams/tests/wsd: $(LIBWVSTREAMS) + ipstreams/tests/wsd-LIBS += -lreadline + else + TEST_SKIP_OBJS += ipstreams/tests/wsd +@@ -179,7 +186,11 @@ + # + ifneq ("$(with_dbus)", "no") + TARGETS += libwvdbus.so +- TARGETS += dbus/tests/wvdbus dbus/tests/wvdbusd ++ TARGETS += dbus/tests/wvdbus ++ dbus/tests/wvdbus: $(LIBWVDBUS) ++ ++ TARGETS += dbus/tests/wvdbusd ++ dbus/tests/wvdbusd: $(LIBWVDBUS) + TESTS += $(call tests_cc,dbus/tests) + libwvdbus_OBJS += $(call objects,dbus) + libwvdbus.so: $(libwvdbus_OBJS) $(LIBWVSTREAMS) +diff -ur wvstreams-4.6.1.orig/wvrules-posix.mk wvstreams-4.6.1/wvrules-posix.mk +--- wvstreams-4.6.1.orig/wvrules-posix.mk 2008-10-21 18:31:58.000000000 +0300 ++++ wvstreams-4.6.1/wvrules-posix.mk 2010-01-04 18:04:00.000000000 +0200 +@@ -85,12 +85,15 @@ + $(AR) s $1 + endef + +-CC: FORCE ++CC: + @CC="$(CC)" CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + $(WVSTREAMS)/gen-cc CC c + +-CXX: FORCE ++CXX: + @CC="$(CXX)" CFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + $(WVSTREAMS)/gen-cc CXX cc + ++#All files must depend on the above two rules. This is a godawful hack. ++$(shell find -type f '(' -name '*.c' -o -name '*.cc' ')' ): CC CXX ++ + wvlink=$(LINK_MSG)$(WVLINK_CC) $(LDFLAGS) $($1-LDFLAGS) -o $1 $(filter %.o %.a %.so, $2) $($1-LIBS) $(XX_LIBS) $(LDLIBS) $(PRELIBS) $(LIBS) diff --git a/libraries/wvstreams/wvstreams.SlackBuild b/libraries/wvstreams/wvstreams.SlackBuild index ebe4b85968..b6b9ae0c3b 100644 --- a/libraries/wvstreams/wvstreams.SlackBuild +++ b/libraries/wvstreams/wvstreams.SlackBuild @@ -54,6 +54,9 @@ find . \ # Fix a build error with glibc-2.12.x patch -p0 < $CWD/wvstreams-4.6.1-glibc212.patch +# patch to allow parallel builds +patch -p1 < $CWD/wvstreams-4.6.1-parallel-make.patch + # configure doesn't support disabling static libraries # Don't manually remove them either, as wvdial won't build then :) CFLAGS="$SLKCFLAGS" \ diff --git a/libraries/wxPython/wxPython.SlackBuild b/libraries/wxPython/wxPython.SlackBuild index 565f702d2b..8fb6532fe0 100644 --- a/libraries/wxPython/wxPython.SlackBuild +++ b/libraries/wxPython/wxPython.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wxPython -VERSION=2.8.12.0 +VERSION=${VERSION:-2.8.12.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/wxPython/wxPython.info b/libraries/wxPython/wxPython.info index 95b5e850c3..6c51560393 100644 --- a/libraries/wxPython/wxPython.info +++ b/libraries/wxPython/wxPython.info @@ -1,10 +1,10 @@ PRGNAM="wxPython" -VERSION="2.8.12.0" +VERSION="2.8.12.1" HOMEPAGE="http://wxPython.org/" -DOWNLOAD="http://downloads.sourceforge.net/wxpython/wxPython-src-2.8.12.0.tar.bz2" -MD5SUM="402e0b81e06f596d849e221a7a76acc6" +DOWNLOAD="http://downloads.sourceforge.net/wxpython/wxPython-src-2.8.12.1.tar.bz2" +MD5SUM="8c06c5941477beee213b4f2fa78be620" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="Niels Horn" +APPROVED="" diff --git a/misc/cksfv/cksfv.SlackBuild b/misc/cksfv/cksfv.SlackBuild index d76ef63007..96c229b55c 100644 --- a/misc/cksfv/cksfv.SlackBuild +++ b/misc/cksfv/cksfv.SlackBuild @@ -82,10 +82,8 @@ make install find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( 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/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/$PRGNAM-$VERSION cp -a AUTHORS ChangeLog COPYING INSTALL README TODO \ diff --git a/misc/gnome-keyring/doinst.sh b/misc/gnome-keyring/doinst.sh deleted file mode 100644 index 96d7857fb5..0000000000 --- a/misc/gnome-keyring/doinst.sh +++ /dev/null @@ -1 +0,0 @@ -chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/ diff --git a/misc/gnome-keyring/gnome-keyring.SlackBuild b/misc/gnome-keyring/gnome-keyring.SlackBuild index 1f1dba9520..b1b414ee64 100644 --- a/misc/gnome-keyring/gnome-keyring.SlackBuild +++ b/misc/gnome-keyring/gnome-keyring.SlackBuild @@ -24,7 +24,7 @@ # Modified by Robby Workman <rworkman@slackbuilds.org> PRGNAM=gnome-keyring -VERSION=${VERSION:-2.32.1} +VERSION=${VERSION:-3.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -61,7 +61,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -82,9 +82,10 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-shared \ --enable-nls \ --disable-debug \ - --enable-acl-prompts \ --enable-ssh-agent \ --with-root-certs=/etc/ssl/certs \ + --with-gtk=2 \ + --with-pam-dir=/lib${LIBDIRSUFFIX}/security \ --build=$ARCH-slackware-linux make @@ -101,7 +102,9 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh +cat <<EOF > $PKG/install/doinst.sh +chroot . /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas/ +EOF cd $PKG /sbin/makepkg -p -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/gnome-keyring/gnome-keyring.info b/misc/gnome-keyring/gnome-keyring.info index c2acb14f03..1c4c2a6631 100644 --- a/misc/gnome-keyring/gnome-keyring.info +++ b/misc/gnome-keyring/gnome-keyring.info @@ -1,10 +1,10 @@ PRGNAM="gnome-keyring" -VERSION="2.32.1" +VERSION="3.0.3" HOMEPAGE="http://live.gnome.org/GnomeKeyring" -DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/gnome-keyring/2.32/gnome-keyring-2.32.1.tar.bz2" -MD5SUM="9a8aa74e03361676f29d6e73155786fc" +DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gnome-keyring/3.0/gnome-keyring-3.0.3.tar.xz" +MD5SUM="52873f15f61f25489351a73a12d6588c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Stylianos Tsampas" EMAIL="ztsampas@otenet.gr" -APPROVED="Erik Hanson" +APPROVED="" diff --git a/misc/jigdo/README b/misc/jigdo/README new file mode 100644 index 0000000000..9b69320f1f --- /dev/null +++ b/misc/jigdo/README @@ -0,0 +1,8 @@ +jigdo (jigsaw download) + +Jigsaw Download, or short jigdo, is a tool designed to ease the +distribution of very large files over the internet, for example CD or +DVD images. Its aim is to make downloading the images as easy for +users as a click on a direct download link in a browser, while +avoiding all the problems that server administrators have with hosting +such large files. diff --git a/misc/jigdo/jigdo.SlackBuild b/misc/jigdo/jigdo.SlackBuild new file mode 100644 index 0000000000..33a574b5d5 --- /dev/null +++ b/misc/jigdo/jigdo.SlackBuild @@ -0,0 +1,85 @@ +#!/bin/sh + +# Slackware build script for jigdo +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=jigdo +VERSION=${VERSION:-0.7.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +DOCS="README THANKS changelog doc/TechDetails.txt doc/Hacking.txt" + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$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 {} \; + +# apply some patches from debian +zcat $CWD/jigdo_0.7.3-3.diff.gz | patch -p1 + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --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 + +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/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mv $PKG/usr/share/$PRGNAM/COPYING $PKG/usr/doc/$PRGNAM-$VERSION + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/misc/jigdo/jigdo.info b/misc/jigdo/jigdo.info new file mode 100644 index 0000000000..8c5f23a42e --- /dev/null +++ b/misc/jigdo/jigdo.info @@ -0,0 +1,10 @@ +PRGNAM="jigdo" +VERSION="0.7.3" +HOMEPAGE="http://atterer.org/jigdo/" +DOWNLOAD="http://atterer.org/sites/atterer/files/2009-08/jigdo/jigdo-0.7.3.tar.bz2" +MD5SUM="bbc1d9ac750bb34e0748f0b57157cc72" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/misc/jigdo/jigdo_0.7.3-3.diff.gz b/misc/jigdo/jigdo_0.7.3-3.diff.gz Binary files differnew file mode 100644 index 0000000000..43a8349d7d --- /dev/null +++ b/misc/jigdo/jigdo_0.7.3-3.diff.gz diff --git a/misc/jigdo/slack-desc b/misc/jigdo/slack-desc new file mode 100644 index 0000000000..d5596cacd4 --- /dev/null +++ b/misc/jigdo/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------------------------------------------------------| +jigdo: jigdo (jigsaw download) +jigdo: +jigdo: Jigsaw Download, or short jigdo, is a tool designed to ease the +jigdo: distribution of very large files over the internet, for example CD or +jigdo: DVD images. Its aim is to make downloading the images as easy for +jigdo: users as a click on a direct download link in a browser, while +jigdo: avoiding all the problems that server administrators have with hosting +jigdo: such large files. +jigdo: +jigdo: homepage: http://atterer.org/jigdo/ +jigdo: diff --git a/multimedia/LiVES/LiVES.SlackBuild b/multimedia/LiVES/LiVES.SlackBuild index 15326cda85..6272ff7477 100644 --- a/multimedia/LiVES/LiVES.SlackBuild +++ b/multimedia/LiVES/LiVES.SlackBuild @@ -8,7 +8,7 @@ # at slackbuilds.org PRGNAM=LiVES -VERSION=1.3.4 +VERSION=${VERSION:-1.4.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,6 +51,12 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+w,g-w+r,o-w+r . +# https://sf.net/tracker/index.php?func=detail&aid=3460799&group_id=64341&atid=507139 +patch -p1 < $CWD/patches/weed_palettes.patch + +# Drop Python3 version of multiencoder plugin +patch -p1 < $CWD/patches/drop_py3_multiencoder.patch + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -58,17 +64,30 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --program-prefix="" \ + --disable-static \ --build=$ARCH-slackware-linux make docdir=/usr/doc/$PRGNAM-$VERSION make install-strip docdir=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG +# fix link to lives exec +( cd $PKG/usr/bin ; rm lives ; ln -s lives-exe lives ) + +# remove static stuff +find $PKG/usr -name '*.la' -exec rm -f {} + +rm -f $PKG/usr/lib*/libweed-*.a + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a COPYING INSTALL NEWS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat <<EOF > $PKG/install/doinst.sh +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi +EOF cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/multimedia/LiVES/LiVES.info b/multimedia/LiVES/LiVES.info index 94f1dde9be..011dea5fab 100644 --- a/multimedia/LiVES/LiVES.info +++ b/multimedia/LiVES/LiVES.info @@ -1,10 +1,10 @@ PRGNAM="LiVES" -VERSION="1.3.4" +VERSION="1.4.9" HOMEPAGE="http://lives.sourceforge.net" -DOWNLOAD="http://www.xs4all.nl/%7Esalsaman/lives/current/LiVES-1.3.4.tar.bz2" -MD5SUM="aeedd75386aa64004ad0831fdbf29cee" +DOWNLOAD="http://www.xs4all.nl/~salsaman/lives/current/LiVES-1.4.9.tar.bz2" +MD5SUM="4664a50abf0efc12b536a2830a43dc72" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="klaatu" EMAIL="klaatu@hackerpublicradio.org" -APPROVED="rworkman" +APPROVED="" diff --git a/multimedia/LiVES/patches/drop_py3_multiencoder.patch b/multimedia/LiVES/patches/drop_py3_multiencoder.patch new file mode 100644 index 0000000000..9a01a71905 --- /dev/null +++ b/multimedia/LiVES/patches/drop_py3_multiencoder.patch @@ -0,0 +1,29 @@ +Description: Drop Python3 version of multiencoder plugin. +Author: Alessio Treglia <alessio@debian.org> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/632833 +Forwarded: not-needed +--- + lives-plugins/plugins/encoders/Makefile.am | 1 - + lives-plugins/plugins/encoders/Makefile.in | 1 - + 2 files changed, 2 deletions(-) + +--- lives.orig/lives-plugins/plugins/encoders/Makefile.am ++++ lives/lives-plugins/plugins/encoders/Makefile.am +@@ -8,7 +8,6 @@ ffmpeg_encoder \ + mencoder_encoder \ + mjpegtools_encoder \ + multi_encoder \ +-multi_encoder3 \ + qtutils_encoder \ + sswf_encoder \ + transcode_encoder \ +--- lives.orig/lives-plugins/plugins/encoders/Makefile.in ++++ lives/lives-plugins/plugins/encoders/Makefile.in +@@ -333,7 +333,6 @@ ffmpeg_encoder \ + mencoder_encoder \ + mjpegtools_encoder \ + multi_encoder \ +-multi_encoder3 \ + qtutils_encoder \ + sswf_encoder \ + transcode_encoder \ diff --git a/multimedia/LiVES/patches/weed_palettes.patch b/multimedia/LiVES/patches/weed_palettes.patch new file mode 100644 index 0000000000..cbbe55222f --- /dev/null +++ b/multimedia/LiVES/patches/weed_palettes.patch @@ -0,0 +1,14 @@ +diff -Naur lives-1.4.9.orig/lives-plugins/plugins/decoders/mkv_decoder.c lives-1.4.9/lives-plugins/plugins/decoders/mkv_decoder.c +--- lives-1.4.9.orig/lives-plugins/plugins/decoders/mkv_decoder.c 2011-12-08 06:33:19.000000000 +0100 ++++ lives-1.4.9/lives-plugins/plugins/decoders/mkv_decoder.c 2011-12-23 13:12:12.772897712 +0100 +@@ -50,6 +50,10 @@ + + #define HAVE_AVCODEC + ++#ifndef HAVE_SYSTEM_WEED ++#include "../../../libweed/weed-palettes.h" ++#endif ++ + #ifdef HAVE_SYSTEM_WEED_COMPAT + #include "weed/weed-compat.h" + #else diff --git a/multimedia/avidemux/avidemux-2.5.1-i18n.patch b/multimedia/avidemux/avidemux-2.5.1-i18n.patch deleted file mode 100644 index 956bbd1921..0000000000 --- a/multimedia/avidemux/avidemux-2.5.1-i18n.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp b/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp -index 4cce636..b875528 100644 ---- a/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp -+++ b/avidemux/ADM_userInterfaces/ADM_QT4/ui_support.cpp -@@ -73,7 +73,7 @@ void loadTranslator(void) - #ifdef __APPLE__
- QString appdir = QCoreApplication::applicationDirPath() + "/../Resources/locale/";
- #else
-- QString appdir = QCoreApplication::applicationDirPath() + "/i18n/";
-+ QString appdir = "/usr/share/avidemux/i18n/";
- #endif
-
- loadTranslation(&qtTranslator, appdir + "qt_" + QLocale::system().name());
-@@ -164,4 +164,4 @@ const char* getNativeRendererDesc(void) - }
-
- return "Qt";
--} -\ No newline at end of file -+}
-diff --git a/cmake/Ts.cmake b/cmake/Ts.cmake -index 15eb89b..e40f078 100644 ---- a/cmake/Ts.cmake -+++ b/cmake/Ts.cmake -@@ -64,7 +64,7 @@ MACRO(COMPILE_AVIDEMUX_TS_FILES ts_subdir _sources) -
- SET(qm_files ${qm_files} ${_outXml} ${_out})
-
-- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
-+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
- ENDFOREACH(ts_input ${ts_files})
-
- SET(${_sources} ${${_sources}} ${qm_files})
-@@ -95,7 +95,7 @@ MACRO(COMPILE_QT_TS_FILES ts_subdir _sources) -
- SET(qm_files ${qm_files} ${_out})
-
-- INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/${BIN_DIR}/i18n")
-+ INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/avidemux/i18n")
- ENDFOREACH(ts_input ${ts_files})
-
- SET(${_sources} ${${_sources}} ${qm_files})
diff --git a/multimedia/avidemux/avidemux-2.5.4-x264-build115.patch b/multimedia/avidemux/avidemux-2.5.4-x264-build115.patch new file mode 100644 index 0000000000..c627667ecd --- /dev/null +++ b/multimedia/avidemux/avidemux-2.5.4-x264-build115.patch @@ -0,0 +1,45 @@ +diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200 +@@ -488,8 +488,10 @@ + printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
+ printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
+ printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
++#elif X264_BUILD > 114
++ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
+ #endif
+ printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
+ #if X264_BUILD > 88
+diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp +--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200 ++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200 +@@ -417,7 +417,7 @@ + _param.b_cabac = cabac;
+ }
+
+-#if X264_BUILD > 101
++#if X264_BUILD > 101 && X264_BUILD < 115
+ unsigned int x264Options::getOpenGopMode(void)
+ {
+ return _param.i_open_gop;
+@@ -428,6 +428,17 @@ + if (openGopMode < 3)
+ _param.i_open_gop = openGopMode;
+ }
++#elif X264_BUILD > 114
++unsigned int x264Options::getOpenGopMode(void)
++{
++ return _param.b_open_gop;
++}
++
++void x264Options::setOpenGopMode(unsigned int openGopMode)
++{
++ if (openGopMode < 3)
++ _param.b_open_gop = openGopMode;
++}
+ #endif
+
+ unsigned int x264Options::getInterlaced(void)
diff --git a/multimedia/avidemux/avidemux.SlackBuild b/multimedia/avidemux/avidemux.SlackBuild index 7b1f78efaa..3344fef5ef 100644 --- a/multimedia/avidemux/avidemux.SlackBuild +++ b/multimedia/avidemux/avidemux.SlackBuild @@ -26,7 +26,7 @@ # project will use in the future. No additional license terms added PRGNAM=avidemux -VERSION=${VERSION:-2.5.2} +VERSION=${VERSION:-2.5.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,14 +71,14 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R a-s,u+w,go+r-w . -#Patch that installs i18n in the correct place even if we compile with qt4 support -cat $CWD/avidemux-2.5.1-i18n.patch | patch -p1 --verbose --backup --suffix=.orig - if [ "$ARCH" = "x86_64" ]; then # Some paths are incorrectly hardcoded to "lib": sed -i -e "s/Dir=\"lib\"/Dir=\"lib${LIBDIRSUFFIX}\"/" $(grep -lr 'Dir="lib"' .) fi +# a little fix for recent x264 snapshots (x264 version 115) +patch -p1 < $CWD/avidemux-2.5.4-x264-build115.patch + mkdir build cd build @@ -148,13 +148,23 @@ cat man/avidemux.1 | gzip -9c > $PKG/usr/man/man1/avidemux.1.gz cd $TMP/$PRGNAM-$VERSION mkdir -p $PKG/usr/share/{applications,pixmaps} -cat avidemux2-gtk.desktop > $PKG/usr/share/applications/avidemux2-gtk.desktop -cat avidemux2-gtk.desktop > $PKG/usr/share/applications/avidemux2-qt.desktop -cat avidemux_icon.png > $PKG/usr/share/pixmaps/avidemux.png -#patch avidemux2_qt.desktop to exec avidemux2_qt4 instead of avidemux2_gtk -sed -i 's/avidemux2_gtk/avidemux2_qt4/' $PKG/usr/share/applications/avidemux2-qt.desktop -sed -i 's/GTK+/Qt/g' $PKG/usr/share/applications/avidemux2-qt.desktop -sed -i 's/GTK/Qt/' $PKG/usr/share/applications/avidemux2-qt.desktop +mkdir -p $PKG/usr/share/icons/hicolor/{16x16,32x32,48x48,64x64}/apps +# If the qt4 binary was built, we prefer to use that over the gtk version: +if [ -x $PKG/usr/bin/avidemux2_qt4 ]; then + cat avidemux2.desktop | sed -e 's/_gtk/_qt4/' \ + > $PKG/usr/share/applications/avidemux2.desktop +else + install -m644 avidemux2.desktop $PKG/usr/share/applications/avidemux2.desktop +fi +install -m644 avidemux_icon.png $PKG/usr/share/pixmaps/avidemux.png +install -m644 avidemux_icon.png \ + ${PKG}/usr/share/icons/hicolor/64x64/apps/avidemux.png +convert avidemux_icon.png -resize 16x16 \ + ${PKG}/usr/share/icons/hicolor/16x16/apps/avidemux.png +convert avidemux_icon.png -resize 32x32 \ + ${PKG}/usr/share/icons/hicolor/32x32/apps/avidemux.png +convert avidemux_icon.png -resize 48x48 \ + ${PKG}/usr/share/icons/hicolor/48x48/apps/avidemux.png mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a AUTHORS COPYING README TODO \ @@ -168,6 +178,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} -if [ "$1" = "--cleanup" ]; then - rm -rf $PKG $TMP/$PRGNAM-$VERSION - fi diff --git a/multimedia/avidemux/avidemux.info b/multimedia/avidemux/avidemux.info index 719779c8a0..5803877918 100644 --- a/multimedia/avidemux/avidemux.info +++ b/multimedia/avidemux/avidemux.info @@ -1,10 +1,10 @@ PRGNAM="avidemux" -VERSION="2.5.2" +VERSION="2.5.5" HOMEPAGE="http://avidemux.org" -DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.5.2.tar.gz" +DOWNLOAD="http://downloads.sourceforge.net/avidemux/avidemux_2.5.5.tar.gz" DOWNLOAD_x86_64="" -MD5SUM="9027e1324c06e833e6c3c22298503cc7" +MD5SUM="33bbe210c6826cea1987ed18a41d57a7" MD5SUM_x86_64="" MAINTAINER="Niklas 'Nille' Åkerström" EMAIL="Nille.kungen[AT]gmail.com" -APPROVED="rworkman" +APPROVED="" diff --git a/multimedia/dvgrab/dvgrab.SlackBuild b/multimedia/dvgrab/dvgrab.SlackBuild index 37b8c6370b..75073af847 100644 --- a/multimedia/dvgrab/dvgrab.SlackBuild +++ b/multimedia/dvgrab/dvgrab.SlackBuild @@ -88,10 +88,8 @@ 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 || true -( 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/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/$PRGNAM-$VERSION cp -a AUTHORS ChangeLog COPYING INSTALL NEWS README TODO \ diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README index 082e3c9f4a..c2ee05e950 100644 --- a/multimedia/ffmpeg/README +++ b/multimedia/ffmpeg/README @@ -17,6 +17,8 @@ OPENCORE=yes|no (default: no), requires opencore-amr RTMP=yes|no (default: no), requires rtmpdump SCHROEDINGER=yes|no (default: no), requires schroedinger SPEEX=yes|no (default: no), requires speex +VAAPI=yes|no (default: no), requires libva +VDPAU=yes|no (default: no), requires libvdpau VPX=yes|no (default: no), requires libvpx X264=yes|no (default: yes), requires x264 XVID=yes|no (default: no), requires xvidcore diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild index b67c5422c0..6d19afa0d0 100644 --- a/multimedia/ffmpeg/ffmpeg.SlackBuild +++ b/multimedia/ffmpeg/ffmpeg.SlackBuild @@ -7,7 +7,7 @@ # Modified by Heinz Wiesinger <pprkut@liwjatan.org> PRGNAM=ffmpeg -VERSION=${VERSION:-0.8.7} +VERSION=${VERSION:-0.9} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,6 +65,8 @@ libopencv="" ; [ "${OPENCV:-no}" != "no" ] && libopencv="--enable-libopen librtmp="" ; [ "${RTMP:-no}" != "no" ] && librtmp="--enable-librtmp" dirac_fast="" ; [ "${SCHROEDINGER:-no}" != "no" ] && dirac_fast="--enable-libschroedinger" libspeex="" ; [ "${SPEEX:-no}" != "no" ] && libspeex="--enable-libspeex" +vaapi="" ; [ "${VAAPI:-no}" != "no" ] && vaapi="--enable-vaapi" +libvdpau="" ; [ "${VDPAU:-no}" != "no" ] && libvdpau="--enable-vdpau" libvpx="" ; [ "${VPX:-no}" != "no" ] && libvpx="--enable-libvpx" libxvid="" ; [ "${XVID:-no}" != "no" ] && libxvid="--enable-libxvid" @@ -126,6 +128,8 @@ CXXFLAGS="$SLKCFLAGS" \ $opencore_amr \ $libopencv \ $libfrei0r \ + $libvdpau \ + $vaapi \ $libcelt make @@ -137,10 +141,10 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ find $PKG/usr/man -type f -exec gzip -9 {} \; -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html cp -a COPYING* CREDITS INSTALL LICENSE MAINTAINERS README RELEASE \ - VERSION doc/TODO* doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION + VERSION doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a doc/*.html $PKG/usr/doc/$PRGNAM-$VERSION/html cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info index 6ff041ba63..4a075ba529 100644 --- a/multimedia/ffmpeg/ffmpeg.info +++ b/multimedia/ffmpeg/ffmpeg.info @@ -1,10 +1,10 @@ PRGNAM="ffmpeg" -VERSION="0.8.7" +VERSION="0.9" HOMEPAGE="http://www.ffmpeg.org" -DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.8.7.tar.bz2" -MD5SUM="31da4d5610d7138761e23fab8fe3a84d" +DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-0.9.tar.bz2" +MD5SUM="795058de6fc432aa11271408273a0535" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Heinz Wiesinger" EMAIL="pprkut@liwjatan.at" -APPROVED="rworkman" +APPROVED="" diff --git a/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild b/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild index 280855242d..b91958b0b1 100644 --- a/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild +++ b/multimedia/gst-ffmpeg/gst-ffmpeg.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gst-ffmpeg -VERSION=0.10.10 +VERSION=${VERSION:-0.10.13} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/multimedia/gst-ffmpeg/gst-ffmpeg.info b/multimedia/gst-ffmpeg/gst-ffmpeg.info index d32499357c..85beff8a4d 100644 --- a/multimedia/gst-ffmpeg/gst-ffmpeg.info +++ b/multimedia/gst-ffmpeg/gst-ffmpeg.info @@ -1,10 +1,10 @@ PRGNAM="gst-ffmpeg" -VERSION="0.10.10" +VERSION="0.10.13" HOMEPAGE="http://gstreamer.freedesktop.org/" -DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.10.tar.gz" -MD5SUM="2222134a34f6b60071f3f03f8d0d01d2" +DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.13.tar.gz" +MD5SUM="3e52d69a15d42f0a11abfc02f80effa1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Juan Valencia Escalante" EMAIL="jvalenciae@gmail.com" -APPROVED="rworkman" +APPROVED="" diff --git a/multimedia/gst-plugins-bad/check_for_mjpegtools-2.0.patch b/multimedia/gst-plugins-bad/check_for_mjpegtools-2.0.patch new file mode 100644 index 0000000000..771d757438 --- /dev/null +++ b/multimedia/gst-plugins-bad/check_for_mjpegtools-2.0.patch @@ -0,0 +1,26 @@ +From 407b02578689804dc6bc47e53be9e87cc1b25597 Mon Sep 17 00:00:00 2001 +From: Götz Waschk <waschk@mandriva.org> +Date: Tue, 24 May 2011 13:42:44 +0000 +Subject: mpeg2enc: support mjpegtools 2.0 + +This adds conditional includes for the renamed headers in mjpegtools 2.0. +Fixes: #650970. +--- +diff --git a/ext/mpeg2enc/gstmpeg2encoder.cc b/ext/mpeg2enc/gstmpeg2encoder.cc +index acfda50..31f1a30 100644 +--- a/ext/mpeg2enc/gstmpeg2encoder.cc ++++ b/ext/mpeg2enc/gstmpeg2encoder.cc +@@ -26,7 +26,10 @@ + + #include <mpegconsts.h> + #include <quantize.hh> +-#if GST_MJPEGTOOLS_API >= 10900 ++#if GST_MJPEGTOOLS_API >= 10903 ++#include <ontheflyratectlpass1.hh> ++#include <ontheflyratectlpass2.hh> ++#elif GST_MJPEGTOOLS_API >= 10900 + #include <ontheflyratectl.hh> + #include <pass1ratectl.hh> + #include <pass2ratectl.hh> +-- +cgit v0.9.0.2-2-gbebe diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild index 85d698615b..a590a98a3e 100644 --- a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild +++ b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild @@ -71,6 +71,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# add a patch from git to let it find the correct mjpegtools-2.0 headers +patch -p1 < $CWD/check_for_mjpegtools-2.0.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -80,6 +83,7 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/${PRGNAM-$VERSION} \ + --disable-celt \ --disable-static \ --build=$ARCH-slackware-linux diff --git a/multimedia/kino/1.3.4_fix_ftbfs_libav.patch b/multimedia/kino/1.3.4_fix_ftbfs_libav.patch new file mode 100644 index 0000000000..fc47663e7f --- /dev/null +++ b/multimedia/kino/1.3.4_fix_ftbfs_libav.patch @@ -0,0 +1,64 @@ +Description: fix FTBFS with libav 0.7, by using non-deprecated functions +Author: Fabrice Coutadeur<fabricesp@ubuntu.com> +Index: kino-1.3.4/src/frame.cc +=================================================================== +--- kino-1.3.4.orig/src/frame.cc 2011-07-17 14:54:59.089481638 +0200 ++++ kino-1.3.4/src/frame.cc 2011-07-17 15:09:23.199481714 +0200 +@@ -1063,7 +1063,12 @@ + AVPicture dest; + int got_picture; + +- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = data; ++ pkt.size = GetFrameSize(); ++ ++ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); + if ( got_picture ) + { + avpicture_fill( &dest, static_cast<uint8_t*>( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() ); +@@ -1123,7 +1128,12 @@ + AVPicture output; + int got_picture; + +- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = data; ++ pkt.size = GetFrameSize(); ++ ++ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); + if ( got_picture ) + { + avpicture_fill( &output, static_cast<uint8_t*>( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() ); +@@ -1156,7 +1166,12 @@ + AVFrame *frame = avcodec_alloc_frame(); + int got_picture; + +- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); ++ AVPacket pkt; ++ av_init_packet(&pkt); ++ pkt.data = data; ++ pkt.size = GetFrameSize(); ++ ++ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); + + int width = GetWidth(), height = GetHeight(); + +@@ -1319,12 +1334,12 @@ + #if defined(HAVE_LIBAVCODEC) + if ( avformatEncoder == NULL ) + { +- avformatEncoder = av_alloc_format_context(); ++ avformatEncoder = avformat_alloc_context(); + if ( avformatEncoder ) + { +- avformatEncoder->oformat = guess_format( "dv", NULL, NULL ); ++ avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); + AVStream* vst = av_new_stream( avformatEncoder, 0 ); +- vst->codec->codec_type = CODEC_TYPE_VIDEO; ++ vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; + vst->codec->codec_id = CODEC_ID_DVVIDEO; + vst->codec->bit_rate = 25000000; + vst->start_time = 0; diff --git a/multimedia/kino/kino.SlackBuild b/multimedia/kino/kino.SlackBuild index 7f1160248d..9de0839e5b 100644 --- a/multimedia/kino/kino.SlackBuild +++ b/multimedia/kino/kino.SlackBuild @@ -23,7 +23,7 @@ PRGNAM=kino VERSION=1.3.4 -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -63,6 +63,13 @@ cd $PRGNAM-$VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . +# fix building on kernel > 2.6.37, like in -current +# https://launchpad.net/ubuntu/natty/+source/kino/1.3.4-1ubuntu3 +patch -p1 < $CWD/v4l1_includes.diff + +# fix build with newer ffmpegs +patch -p1 < $CWD/1.3.4_fix_ftbfs_libav.patch + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/multimedia/kino/v4l1_includes.diff b/multimedia/kino/v4l1_includes.diff new file mode 100644 index 0000000000..01394fc471 --- /dev/null +++ b/multimedia/kino/v4l1_includes.diff @@ -0,0 +1,26 @@ +Index: kino-1.3.4/ffmpeg/libavdevice/v4l.c +=================================================================== +--- kino-1.3.4.orig/ffmpeg/libavdevice/v4l.c 2011-04-11 15:12:41.915593967 +0200 ++++ kino-1.3.4/ffmpeg/libavdevice/v4l.c 2011-04-11 15:13:05.825593979 +0200 +@@ -26,7 +26,7 @@ + #include <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <time.h> + + typedef struct { +Index: kino-1.3.4/src/v4l.h +=================================================================== +--- kino-1.3.4.orig/src/v4l.h 2011-04-11 15:12:41.895593967 +0200 ++++ kino-1.3.4/src/v4l.h 2011-04-11 15:12:57.555593975 +0200 +@@ -40,7 +40,7 @@ + + #define _DEVICE_H_ + #define _LINUX_TIME_H +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include "displayer.h" + diff --git a/multimedia/mjpegtools/mjpegtools.SlackBuild b/multimedia/mjpegtools/mjpegtools.SlackBuild index e2566c373a..e70df13874 100644 --- a/multimedia/mjpegtools/mjpegtools.SlackBuild +++ b/multimedia/mjpegtools/mjpegtools.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mjpegtools -VERSION=1.9.0 -BUILD=${BUILD:-3} +VERSION=2.0.0 +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} # Automatically determine the architecture we're building on: @@ -69,8 +69,8 @@ chmod -R a-s,u+w,go+r-w . # Fix for x86_64 sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure -patch -p1 < $CWD/mjpegtools-1.9.0-glibc-2.10.patch -patch -p0 < $CWD/mjpegtools-1.9.0-jpeg-7.patch +#patch -p1 < $CWD/mjpegtools-1.9.0-glibc-2.10.patch +#patch -p0 < $CWD/mjpegtools-1.9.0-jpeg-7.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -91,10 +91,8 @@ 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 || true -( 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/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 rm -f $PKG/usr/info/dir gzip -9 $PKG/usr/info/* diff --git a/multimedia/mjpegtools/mjpegtools.info b/multimedia/mjpegtools/mjpegtools.info index 47ac66d865..4972db46f0 100644 --- a/multimedia/mjpegtools/mjpegtools.info +++ b/multimedia/mjpegtools/mjpegtools.info @@ -1,10 +1,10 @@ PRGNAM="mjpegtools" -VERSION="1.9.0" +VERSION="2.0.0" HOMEPAGE="http://mjpeg.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/mjpeg/mjpegtools-1.9.0.tar.gz" -MD5SUM="309a6fcf0900a010d6a9c1e91afc2f5c" +DOWNLOAD="http://downloads.sourceforge.net/mjpeg/mjpegtools-2.0.0.tar.gz" +MD5SUM="903e1e3b967eebcc5fe5626d7517dc46" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Pierre Cazenave" EMAIL="pwcazenave {at} gmail {dot} com" -APPROVED="dsomero" +APPROVED="" diff --git a/multimedia/mpgtx/mpgtx.SlackBuild b/multimedia/mpgtx/mpgtx.SlackBuild index 4f5ffaaf72..a838ae5a4f 100644 --- a/multimedia/mpgtx/mpgtx.SlackBuild +++ b/multimedia/mpgtx/mpgtx.SlackBuild @@ -7,15 +7,13 @@ PRGNAM=mpgtx VERSION=${VERSION:-1.3.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} -# 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 @@ -25,6 +23,16 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" +else + SLKCFLAGS="-O2" +fi + set -e rm -rf $PKG @@ -40,15 +48,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -if [ "$ARCH" = "i486" ]; then - sed -i "s|-O3|-O2 -march=i486 -mtune=i686|g" configure -elif [ "$ARCH" = "i686" ]; then - sed -i "s|-O3|-O2 -march=i686 -mtune=i686|g" configure -elif [ "$ARCH" = "x86_64" ]; then - sed -i "s|-O3|-O2 -fPIC|g" configure -fi +# Various fixes from Timothy Redaelli <drizzt@gentoo.org> +patch -p0 < $CWD/patches/mpgtx-1.3.1-configure.patch +patch -p1 < $CWD/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch -./configure --prefix=/usr +CXXFLAGS=$SLKCFLAGS ./configure --prefix=/usr make cd man @@ -69,10 +73,8 @@ mkdir -p $PKG/usr/man/de/man1 cp -a man/*.1 $PKG/usr/man/man1 cp -a man/de/*.1 $PKG/usr/man/de/man1 -( 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/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/$PRGNAM-$VERSION cp -a AUTHORS COPYING README TODO $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch b/multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch new file mode 100644 index 0000000000..ec36e76ba6 --- /dev/null +++ b/multimedia/mpgtx/patches/mpgtx-1.3.1-configure.patch @@ -0,0 +1,69 @@ +--- configure.old 2006-12-07 19:51:08.000000000 +0100 ++++ configure 2006-12-07 19:51:02.000000000 +0100 +@@ -9,7 +9,6 @@ + prefix="/usr/local" + manprefix='$(PREFIX)' + #compiler flags +-CC="g++" + common_cflags="-Wall" + devel_cflags="-g -Werror -fno-builtin" + optimization_cflags="-O3" +@@ -36,7 +35,6 @@ + + if [ "${HOSTNAME}" = "powerpc-apple-darwin6.0" ]; then + #compiler flags +-CC="c++" + common_cflags="-pedantic -Wall" + #devel_cflags="-g -Werror -fno-builtin" + devel_cflags="-g -fno-builtin" +@@ -153,8 +151,15 @@ + if test "$gcc_minor" = "0" -o "$gcc_minor" = "1"; then + optimization_cflags="-O2"; + fi ++ if test "$gcc_minor" -ge 4; then ++ optimization_cflags="$optimization_cflags -fno-unit-at-a-time" ++ fi ++elif test "$gcc_major" -ge "4"; then ++ optimization_cflags="$optimization_cflags -fno-unit-at-a-time" + fi + ++ ++ + # Now check if the system handles large file support + # unless user has specified not to do so + if test $LFS = "yes"; then +@@ -165,7 +170,7 @@ + return (int)(fseeko(stdin,0,SEEK_SET)); + } + EOF +- $CC __LFStest.cpp -o __LFStestPASSED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 1>__LFSout 2>__LFSerror ++ ${CXX:-c++} __LFStest.cpp -o __LFStestPASSED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 1>__LFSout 2>__LFSerror + if test -f __LFStestPASSED; then + echo "PASSED"; + cflags="$cflags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"; +@@ -211,7 +211,6 @@ + fi + + if test $devel = "no" -a $debug = "no"; then +-lflags="$lflags -s"; + cflags="$cflags $optimization_cflags"; + fi + +@@ -293,15 +298,15 @@ + @echo "" + + mpgtx : commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o common.hh +- $CC \$(CFLAGS) \$(OFLAGS) -o mpgtx commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o \$(LFLAGS) ++ \$(CXX) \$(CFLAGS) \$(OFLAGS) \$(LDFLAGS) -o mpgtx commandline.cxx mpegOut.o mpeg.o chunkTab.o id3command.o \$(LFLAGS) + mpegOut.o : mpegOut.cxx mpegOut.hh mpeg.hh common.hh +- $CC \$(CFLAGS) \$(OFLAGS) -c mpegOut.cxx ++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c mpegOut.cxx + mpeg.o : mpeg.cxx mpeg.hh mpegOut.hh common.hh +- $CC \$(CFLAGS) \$(OFLAGS) -c mpeg.cxx ++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c mpeg.cxx + chunkTab.o : chunkTab.cxx chunkTab.hh common.hh +- $CC \$(CFLAGS) \$(OFLAGS) -c chunkTab.cxx ++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c chunkTab.cxx + id3command.o : id3command.cxx id3command.hh common.hh +- $CC \$(CFLAGS) \$(OFLAGS) -c id3command.cxx ++ \$(CXX) \$(CFLAGS) \$(OFLAGS) -c id3command.cxx diff --git a/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch b/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch new file mode 100644 index 0000000000..dc53dfd7e6 --- /dev/null +++ b/multimedia/mpgtx/patches/mpgtx-1.3.1-dont-ignore-cxx-flags.patch @@ -0,0 +1,12 @@ +diff -Naur mpgtx-1.3.1.orig/configure mpgtx-1.3.1/configure +--- mpgtx-1.3.1.orig/configure 2010-11-28 11:58:58.000000000 +0100 ++++ mpgtx-1.3.1/configure 2010-11-28 12:00:00.000000000 +0100 +@@ -11,7 +11,7 @@ + #compiler flags + common_cflags="-Wall" + devel_cflags="-g -Werror -fno-builtin" +-optimization_cflags="-O3" ++optimization_cflags="${CXXFLAGS}" + release_cflags=$optimization_cflags + OFLAGS="-ansi" + cflags=$common_cflags diff --git a/multimedia/rtmpdump/rtmpdump.SlackBuild b/multimedia/rtmpdump/rtmpdump.SlackBuild index 6a0a8df7f9..769fa93b0d 100644 --- a/multimedia/rtmpdump/rtmpdump.SlackBuild +++ b/multimedia/rtmpdump/rtmpdump.SlackBuild @@ -8,7 +8,7 @@ # Modified by SlackBuilds.org PRGNAM=rtmpdump -VERSION=${VERSION:-2.3} +VERSION=${VERSION:-20111114_5d03a4f} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -45,7 +45,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tgz +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . find . \ diff --git a/multimedia/rtmpdump/rtmpdump.info b/multimedia/rtmpdump/rtmpdump.info index a242e7afda..32d089a597 100644 --- a/multimedia/rtmpdump/rtmpdump.info +++ b/multimedia/rtmpdump/rtmpdump.info @@ -1,10 +1,10 @@ PRGNAM="rtmpdump" -VERSION="2.3" +VERSION="20111114_5d03a4f" HOMEPAGE="http://rtmpdump.mplayerhq.hu/" -DOWNLOAD="http://rtmpdump.mplayerhq.hu/download/rtmpdump-2.3.tgz" -MD5SUM="eb961f31cd55f0acf5aad1a7b900ef59" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/rtmpdump-20111114_5d03a4f.tar.xz" +MD5SUM="dc6d0af9761a19d9b875441c394c4d7b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="ponce" EMAIL="matteo.bernardini@gmail.com" -APPROVED="dsomero" +APPROVED="" diff --git a/multimedia/wxcam/wxcam.SlackBuild b/multimedia/wxcam/wxcam.SlackBuild index 41ce900ec4..9e349660c2 100644 --- a/multimedia/wxcam/wxcam.SlackBuild +++ b/multimedia/wxcam/wxcam.SlackBuild @@ -27,7 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wxcam -VERSION=1.0.7 +VERSION=1.0.8 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/multimedia/wxcam/wxcam.info b/multimedia/wxcam/wxcam.info index d6162af4a9..f2a7209cb4 100644 --- a/multimedia/wxcam/wxcam.info +++ b/multimedia/wxcam/wxcam.info @@ -1,10 +1,10 @@ PRGNAM="wxcam" -VERSION="1.0.7" +VERSION="1.0.8" HOMEPAGE="http://wxcam.sourceforge.net/" -DOWNLOAD="http://sourceforge.net/projects/wxcam/files/wxcam/1.0.7/wxcam-1.0.7.tar.bz2" -MD5SUM="deeb69999f7277e09b1844d52b75a54f" +DOWNLOAD="http://downloads.sourceforge.net/wxcam/wxcam-1.0.8.tar.bz2" +MD5SUM="d776fa541dcb8591dcd40d65df9e4b09" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Pierre Cazenave" EMAIL="pwcazenave<at>gmail<dot>com" -APPROVED="dsomero" +APPROVED="" diff --git a/network/cherokee/ChangeLog.txt b/network/cherokee/ChangeLog.txt index 94c24d33a9..65dadcfc20 100644 --- a/network/cherokee/ChangeLog.txt +++ b/network/cherokee/ChangeLog.txt @@ -1,3 +1,7 @@ +Sun 27 Dec 2011 - ponce (matteo.bernardini@gmail.com) +- SlackBuild script for Cherokee 1.2.101 +- Changed default user/group to apache/apache (easier php!). + Mon 07 Sep 2009 - Pablo Hernan Saro (pablosaro@gmail.com) - SlackBuild script for Cherokee 0.99.24 - Cherokee rc script updated diff --git a/network/cherokee/README b/network/cherokee/README index c0424311d2..87adb408ab 100644 --- a/network/cherokee/README +++ b/network/cherokee/README @@ -24,7 +24,7 @@ Notes about using this SlackBuild 1) To specify the WWW root directory pass WWWROOT=/path/to/www/root to the script, like this: - WWWROOT=/var/www ./cherokee.SlackBuild + WWWROOT=/var/www/htdocs-cherokee ./cherokee.SlackBuild 2) If you want to enable IPv6 support, pass IPV6=yes to the script. 3) If you want to disable the Cherokee-admin installation, pass @@ -35,9 +35,21 @@ Notes about using this SlackBuild to the script. 5) If you want to build Cherokee with debugging options, enable trace facility by passing TRACE=yes to the script. +6) The $WWWGROUP group and/or $WWWUSER user account are set to apache. + To run cherokee as a different user/group specify them passing the options + options WWWUSER/WWWGROUP to the slackbuild, like + + WWWUSER=cherokee WWWGROUP=cherokee ./cherokee.SlackBuild + + You may want to create first a dedicated user/group. + + groupadd -g 249 cherokee + useradd -u 249 -g cherokee -d /var/www cherokee Comments, suggestions or bug reports ------------------------------------ -If you have anything to say about this SlackBuild, event reporting a +If you have anything to say about this SlackBuild, even reporting a bug, don't hesitate to contact me at pablosaro@gmail.com +(be aware that pablo might not know that I wrecked his build +script for 1.2.101, ndponce <matteo.bernardini@gmail.com>) diff --git a/network/cherokee/cherokee.SlackBuild b/network/cherokee/cherokee.SlackBuild index caff2d9f11..a552820574 100644 --- a/network/cherokee/cherokee.SlackBuild +++ b/network/cherokee/cherokee.SlackBuild @@ -3,13 +3,21 @@ # Slackware build script for cherokee # Written by Pablo Hernan Saro (pablosaro@gmail.com) +# updated by ponce <matteo.bernardini@gmail.com> PRGNAM=cherokee -VERSION=${VERSION:-0.99.24} -ARCH=${ARCH:-i686} +VERSION=${VERSION:-1.2.101} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +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/SBo} PKG=$TMP/package-$PRGNAM @@ -24,10 +32,19 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi # Set the WWW root directory -WWWROOT=${WWWROOT:-/var/www} +WWWROOT=${WWWROOT:-/var/www/htdocs-cherokee} + +# Set the WWW user - defaulted to root, but apache is better +WWWUSER=${WWWUSER:-apache} + +# Set the WWW group - defaulted to root, but apache is better +WWWGROUP=${WWWGROUP:-apache} # Enable/Disable IPv6 support IPV6=${IPV6:-no} @@ -41,13 +58,27 @@ MYSQL=${MYSQL:-yes} # Enable/Disable trace facility (debugging options) TRACE=${TRACE:-no} +## you can optionally specify to run as a cherokee user +# See http://slackbuilds.org/uid_gid.txt for current recomendations. +hintz() { + printf "\n The cherokee group and/or the cherokee user account + are set to \"apache\". To run cherokee as a different + user/group specify them passing the options + WWWUSER/WWWGROUP to the slackbuild, like + WWWUSER=cherokee WWWGROUP=cherokee ./cherokee.SlackBuild + + You may want to create first a dedicated user/group. + groupadd -g 299 cherokee + useradd -u 299 -g cherokee -d ${WWWROOT}\n\n" +} + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -56,6 +87,12 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +if [ "$WWWUSER" = "apache" ] ; then + hintz +elif [ "$WWWGROUP" = "apache" ] ; then + hintz +fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -67,9 +104,12 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ --with-wwwroot=$WWWROOT \ + --with-wwwuser=$WWWUSER \ + --with-wwwgroup=$WWWGROUP \ --with-mysql=$MYSQL \ --enable-ipv6=$IPV6 \ --enable-admin=$ADMIN \ + --disable-pam \ --enable-trace=$TRACE make @@ -78,14 +118,12 @@ 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 || true -( 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/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/$PRGNAM-$VERSION cp -a \ - AUTHORS COPYING ChangeLog INSTALL NEWS README \ + AUTHORS COPYING ChangeLog NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild @@ -99,4 +137,3 @@ cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} - diff --git a/network/cherokee/cherokee.info b/network/cherokee/cherokee.info index 427929e9cc..a59bad9f56 100644 --- a/network/cherokee/cherokee.info +++ b/network/cherokee/cherokee.info @@ -1,10 +1,10 @@ PRGNAM="cherokee" -VERSION="0.99.24" +VERSION="1.2.101" HOMEPAGE="http://www.cherokee-project.com" -DOWNLOAD="http://www.cherokee-project.com/download/0.99/0.99.24/cherokee-0.99.24.tar.gz" -MD5SUM="5afed8bdd6020dc5bf0ba9ec83b947f1" +DOWNLOAD="http://www.cherokee-project.com/download/1.2/1.2.101/cherokee-1.2.101.tar.gz" +MD5SUM="ef47003355a2e368e4d9596cd070ef23" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Pablo Hernan Saro" EMAIL="pablosaro@gmail.com" -APPROVED="dsomero" +APPROVED="" diff --git a/network/darkstat/darkstat.SlackBuild b/network/darkstat/darkstat.SlackBuild index 3b585e000a..62508a77ef 100644 --- a/network/darkstat/darkstat.SlackBuild +++ b/network/darkstat/darkstat.SlackBuild @@ -70,10 +70,8 @@ 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 || true -( 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/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/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/network/ettercap/README b/network/ettercap/README new file mode 100644 index 0000000000..60caf1604b --- /dev/null +++ b/network/ettercap/README @@ -0,0 +1,14 @@ +Ettercap is a suite for man in the middle attacks on LAN. It features +sniffing of live connections, content filtering on the fly and many other +interesting tricks. It is capable of intercepting traffic on a network +segment, capturing passwords, and conducting man-in-the-middle attacks +against a number of common protocols. + +It supports active and passive dissection of many protocols (even +ciphered ones) and includes many feature for network and host analysis. + +It is free software, licensed under the terms of the +GNU General Public License. + +Ettercap requires libnet. A SlackBuild for this is available at +SlackBuilds.org. diff --git a/network/ettercap/doinst.sh b/network/ettercap/doinst.sh new file mode 100644 index 0000000000..837a7c8f69 --- /dev/null +++ b/network/ettercap/doinst.sh @@ -0,0 +1,19 @@ +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/etter.conf.new + +if [ -x usr/bin/update-desktop-database ]; then + usr/bin/update-desktop-database -q usr/share/applications +fi + diff --git a/network/ettercap/ettercap.SlackBuild b/network/ettercap/ettercap.SlackBuild new file mode 100644 index 0000000000..123de537dc --- /dev/null +++ b/network/ettercap/ettercap.SlackBuild @@ -0,0 +1,107 @@ +#!/bin/sh + +# Slackbuild for ettercap-NG +# +# Copyright 2008 meckafett <tom[DOT]bradish[AT]gmail[DOT]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 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 by the SlackBuilds.org team + +PRGNAM=ettercap +VERSION=${VERSION:-0.7.4} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 $OUTPUT +cd $TMP +rm -rf $PRGNAM +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM +chown -R root:root . +chmod -R u+w,go+r,a-s . + +sh autogen.sh + +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib$LIBDIRSUFFIX \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --enable-plugins \ + --enable-gtk \ + --build=$ARCH-slackware-linux \ + +make +make install DESTDIR=$PKG + +mkdir -p $PKG/usr/share/applications +cat $CWD/ettercap.desktop > $PKG/usr/share/applications/ettercap.desktop + +mv $PKG/etc/etter.conf $PKG/etc/etter.conf.new + +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/$PRGNAM-$VERSION +cp -a AUTHORS CHANGELOG INSTALL LICENSE README* THANKS TODO* doc/* \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/ettercap/ettercap.desktop b/network/ettercap/ettercap.desktop new file mode 100644 index 0000000000..5ca2e8b4d1 --- /dev/null +++ b/network/ettercap/ettercap.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Ettercap GTK +Icon=/usr/share/ettercap/ettercap.png +Exec=/usr/bin/ettercap --gtk +Terminal=false +Type=Application +Categories=Network;System;Security;GTK; diff --git a/network/ettercap/ettercap.info b/network/ettercap/ettercap.info new file mode 100644 index 0000000000..8da308a265 --- /dev/null +++ b/network/ettercap/ettercap.info @@ -0,0 +1,10 @@ +PRGNAM="ettercap" +VERSION="0.7.4" +HOMEPAGE="http://ettercap.sourceforge.net/" +DOWNLOAD="http://downloads.sourceforge.net/ettercap/ettercap-0.7.4.tar.gz" +MD5SUM="d196c263e7058de0bb4835cf8f4e65cf" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="meckafett" +EMAIL="tom.bradish@gmail.com" +APPROVED="" diff --git a/network/ettercap/slack-desc b/network/ettercap/slack-desc new file mode 100644 index 0000000000..0ba8403701 --- /dev/null +++ b/network/ettercap/slack-desc @@ -0,0 +1,18 @@ +# 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------------------------------------------------------| +ettercap: ettercap (Multipurpose sniffer/interceptor/logger) +ettercap: +ettercap: Ettercap is a suite for man in the middle attacks on LAN. It +ettercap: features sniffing of live connections, content filtering on the +ettercap: fly and many other interesting tricks. It supports active and +ettercap: passive dissection of many protocols (even ciphered ones) and +ettercap: includes many feature for network and host host analysis. +ettercap: +ettercap: Homepage: http://ettercap.sourceforge.net/ +ettercap: +ettercap: diff --git a/network/grsync/README b/network/grsync/README new file mode 100644 index 0000000000..e471a95abd --- /dev/null +++ b/network/grsync/README @@ -0,0 +1,6 @@ +grsync (rsync GUI) + +grsync is a GUI (Graphical User Interface) for rsync, the commandline +directory synchronization tool. +It can be effectively used to synchronize local directories and +it supports remote targets as well. diff --git a/network/grsync/doinst.sh b/network/grsync/doinst.sh new file mode 100644 index 0000000000..51b4303ede --- /dev/null +++ b/network/grsync/doinst.sh @@ -0,0 +1,4 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications > /dev/null 2>&1 +fi + diff --git a/network/grsync/grsync.SlackBuild b/network/grsync/grsync.SlackBuild new file mode 100644 index 0000000000..116db37a40 --- /dev/null +++ b/network/grsync/grsync.SlackBuild @@ -0,0 +1,81 @@ +#!/bin/sh + +# Slackware build script for grsync +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=grsync +VERSION=${VERSION:-1.1.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README" + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$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/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install-strip DESTDIR=$PKG + +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/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/grsync/grsync.info b/network/grsync/grsync.info new file mode 100644 index 0000000000..e4129d29d7 --- /dev/null +++ b/network/grsync/grsync.info @@ -0,0 +1,10 @@ +PRGNAM="grsync" +VERSION="1.1.1" +HOMEPAGE="http://www.opbyte.it/grsync/" +DOWNLOAD="http://www.opbyte.it/release/grsync-1.1.1.tar.gz" +MD5SUM="81d3b6a1827fa1b06d87491f9bb1c8b9" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/network/grsync/slack-desc b/network/grsync/slack-desc new file mode 100644 index 0000000000..7fecc7eb6c --- /dev/null +++ b/network/grsync/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------------------------------------------------------| +grsync: grsync (rsync GUI) +grsync: +grsync: grsync is a GUI (Graphical User Interface) for rsync, the commandline +grsync: directory synchronization tool. +grsync: It can be effectively used to synchronize local directories and +grsync: it supports remote targets as well. +grsync: +grsync: Homepage: http://www.opbyte.it/grsync/ +grsync: +grsync: +grsync: diff --git a/network/hping3/hping3.SlackBuild b/network/hping3/hping3.SlackBuild index a80574dfec..71c8ec4ec4 100644 --- a/network/hping3/hping3.SlackBuild +++ b/network/hping3/hping3.SlackBuild @@ -108,10 +108,8 @@ install -m 0644 docs/hping3.8 $PKG/usr/man/man8/ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -( 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/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/$PRGNAM-$VERSION ( cd docs ; cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION ) diff --git a/network/lighttpd/lighttpd.conf b/network/lighttpd/conf/lighttpd.conf index 0565ef3aeb..3002279086 100644 --- a/network/lighttpd/lighttpd.conf +++ b/network/lighttpd/conf/lighttpd.conf @@ -221,6 +221,48 @@ server.groupname = "lighttpd" # #### SSL engine +####################################################################### +### +### SSL Support +### ------------- +### +### To enable SSL for the whole server you have to provide a valid +### certificate and have to enable the SSL engine.:: +### +### ssl.engine = "enable" +### ssl.pemfile = "/path/to/server.pem" +### +### The HTTPS protocol does not allow you to use name-based virtual +### hosting with SSL. If you want to run multiple SSL servers with +### one lighttpd instance you must use IP-based virtual hosting: :: +### +### $SERVER["socket"] == "10.0.0.1:443" { +### ssl.engine = "enable" +### ssl.pemfile = "/etc/ssl/private/www.example.com.pem" +### # +### # Mitigate BEAST attack: +### # +### # A stricter base cipher suite. For details see: +### # http://blog.ivanristic.com/2011/10/mitigating-the-beast-attack-on-tls.html +### # +### ssl.cipher-list = "ECDHE-RSA-AES256-SHA384:AES256-SHA256:RC4-SHA:RC4:HIGH:!MD5:!aNULL:!EDH:!AESGCM" +### # +### # Make the server prefer the order of the server side cipher suite instead of the client suite. +### # This is necessary to mitigate the BEAST attack (unless you disable all non RC4 algorithms). +### # This option is enabled by default, but only used if ssl.cipher-list is set. +### # +### # ssl.honor-cipher-order = "enable" +### # +### # Mitigate CVE-2009-3555 by disabling client triggered renegotation +### # This is enabled by default. +### # +### # ssl.disable-client-renegotiation = "enable" +### # +### server.name = "www.example.com" +### +### server.document-root = "/var/www/vhosts/example.com/www/" +### } +### #ssl.engine = "enable" #ssl.pemfile = "server.pem" diff --git a/network/lighttpd/lighttpd.logrotate b/network/lighttpd/conf/lighttpd.logrotate index 65c13f36c8..65c13f36c8 100644 --- a/network/lighttpd/lighttpd.logrotate +++ b/network/lighttpd/conf/lighttpd.logrotate diff --git a/network/lighttpd/rc.lighttpd b/network/lighttpd/conf/rc.lighttpd index 919f6b2104..919f6b2104 100644 --- a/network/lighttpd/rc.lighttpd +++ b/network/lighttpd/conf/rc.lighttpd diff --git a/network/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild index 38e3ffb593..7ab18e7ae5 100644 --- a/network/lighttpd/lighttpd.SlackBuild +++ b/network/lighttpd/lighttpd.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lighttpd -VERSION=1.4.28 +VERSION=1.4.30 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -109,9 +109,9 @@ touch $PKG/var/log/lighttpd/{access,error}.log.new mkdir -p $PKG/var/run/lighttpd chown $LIGHTTPD_USER:$LIGHTTPD_GROUP $PKG/var/run/lighttpd -install -D -m 0755 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new -install -D -m 0644 $CWD/$PRGNAM.conf $PKG/etc/$PRGNAM/$PRGNAM.conf.new -install -D -m 0644 $CWD/$PRGNAM.logrotate $PKG/etc/logrotate.d/lighttpd.new +install -D -m 0755 $CWD/conf/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new +install -D -m 0644 $CWD/conf/$PRGNAM.conf $PKG/etc/$PRGNAM/$PRGNAM.conf.new +install -D -m 0644 $CWD/conf/$PRGNAM.logrotate $PKG/etc/logrotate.d/lighttpd.new chown -R $LIGHTTPD_USER:$LIGHTTPD_GROUP $PKG/var/log/lighttpd/ chown -R $LIGHTTPD_USER:$LIGHTTPD_GROUP $PKG/var/cache/lighttpd diff --git a/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info index 7231809265..5b3525aa9d 100644 --- a/network/lighttpd/lighttpd.info +++ b/network/lighttpd/lighttpd.info @@ -1,10 +1,10 @@ PRGNAM="lighttpd" -VERSION="1.4.28" +VERSION="1.4.30" HOMEPAGE="http://www.lighttpd.net/" -DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.28.tar.bz2" -MD5SUM="586eb535d31ac299652495b058dd87c4" +DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.30.tar.bz2" +MD5SUM="63f9df52dcae0ab5689a95c99c54e48a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="paul wisehart" EMAIL="paul@oldcode.org" -APPROVED="rworkman" +APPROVED="" diff --git a/network/postfix/README b/network/postfix/README index 1004bc808c..5175f7a11b 100644 --- a/network/postfix/README +++ b/network/postfix/README @@ -31,3 +31,6 @@ A couple things to remember about postfix: If you have any questions or comments about this script, you are free to contact me via e-mail at <alan@lizella.net>. Thanks! + +NIS support is disabled in this build for -current, blame Ulrich +Drepper ;P - ponce <matteo.bernardini@gmail.com> diff --git a/network/postfix/postfix.SlackBuild b/network/postfix/postfix.SlackBuild index f3e28e8867..1f7fb24510 100644 --- a/network/postfix/postfix.SlackBuild +++ b/network/postfix/postfix.SlackBuild @@ -23,7 +23,7 @@ # Updates by mario@slackverse.org, 2010-2011 PRGNAM=postfix -VERSION=${VERSION:-2.8.3} +VERSION=${VERSION:-2.8.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -138,6 +138,9 @@ cd $TMP tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +# on current we don't have glibc rpc headers so no nis here +patch -p1 < $CWD/no_nis.patch + # TLS, and SASL support # Postfix unfortunately does not use a handy ./configure script so you # must generate the makefiles using (what else?) "make makefiles". The diff --git a/network/postfix/postfix.info b/network/postfix/postfix.info index 03b89c6ce0..603264d862 100644 --- a/network/postfix/postfix.info +++ b/network/postfix/postfix.info @@ -1,10 +1,10 @@ PRGNAM="postfix" -VERSION="2.8.3" +VERSION="2.8.7" HOMEPAGE="http://www.postfix.org/" -DOWNLOAD="http://postfix.cs.utah.edu/source/official/postfix-2.8.3.tar.gz" -MD5SUM="b3922ededd3fd6051f759e58a4ada3ae" +DOWNLOAD="http://postfix.cs.utah.edu/source/official/postfix-2.8.7.tar.gz" +MD5SUM="b3ff47a38db920fc15bb207f42da53db" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Alan Hicks" EMAIL="alan@lizella.net" -APPROVED="rworkman" +APPROVED="" diff --git a/network/spice-gtk/README b/network/spice-gtk/README new file mode 100644 index 0000000000..87883886c6 --- /dev/null +++ b/network/spice-gtk/README @@ -0,0 +1,8 @@ +spice-gtk (spice gtk client/libraries) + +A Gtk client and libraries for spice remote desktop servers. + +This requires celt051, spice-protocol and spice, available +at slackbuilds.org. +vala is an optional dependency and can be enabled with the +parameter VALA=yes. diff --git a/network/spice-gtk/slack-desc b/network/spice-gtk/slack-desc new file mode 100644 index 0000000000..5f3729accb --- /dev/null +++ b/network/spice-gtk/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------------------------------------------------------| +spice-gtk: spice-gtk (spice gtk client/libraries) +spice-gtk: +spice-gtk: A Gtk client and libraries for spice remote desktop servers. +spice-gtk: +spice-gtk: homepage: http://spice-space.org +spice-gtk: +spice-gtk: +spice-gtk: +spice-gtk: +spice-gtk: +spice-gtk: diff --git a/network/spice-gtk/spice-gtk.SlackBuild b/network/spice-gtk/spice-gtk.SlackBuild new file mode 100644 index 0000000000..7de8c1db17 --- /dev/null +++ b/network/spice-gtk/spice-gtk.SlackBuild @@ -0,0 +1,97 @@ +#!/bin/sh + +# Slackware build script for spice-gtk +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=spice-gtk +VERSION=${VERSION:-0.7} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +if [ "${VALA:-no}" = "no" ]; then + with_vala="" +else + with_vala="--enable-vala" +fi + +DOCS="ABOUT-NLS AUTHORS COPYING NEWS README THANKS TODO" + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP + +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$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 gtk/controller/controller.{c,vala.stamp} gtk/controller/menu.c # force vala regen +export VALAC=$(which valac) + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --localstatedir=/var \ + --disable-static \ + --enable-shared \ + $with_vala \ + --with-gtk=2.0 \ + --with-audio=gstreamer \ + --disable-smartcard \ + --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/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/spice-gtk/spice-gtk.info b/network/spice-gtk/spice-gtk.info new file mode 100644 index 0000000000..338cd096c1 --- /dev/null +++ b/network/spice-gtk/spice-gtk.info @@ -0,0 +1,10 @@ +PRGNAM="spice-gtk" +VERSION="0.7" +HOMEPAGE="http://spice-space.org" +DOWNLOAD="http://spice-space.org/download/gtk/spice-gtk-0.7.tar.bz2" +MD5SUM="a47ca51ef4bb27cab35ddbfb9e6c0fff" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/network/spice/README b/network/spice/README new file mode 100644 index 0000000000..4a101dde8d --- /dev/null +++ b/network/spice/README @@ -0,0 +1,12 @@ +spice (remote computing solution) + +Spice is an open remote computing solution, providing client access to +remote machine display and devices (e.g., keyboard, mouse, audio). +Spice achieves a user experience similar to an interaction with a +local machine, while trying to offload most of the intensive CPU and +GPU tasks to the client. Spice is suitable for both LAN and WAN usage, +without compromising on the user experience. + +This requires spice-protocol. +libcacard (enabled passing the switch CACARD=yes) is an optional +dependency. diff --git a/network/spice/disable_tests.patch b/network/spice/disable_tests.patch new file mode 100644 index 0000000000..5936f8d36a --- /dev/null +++ b/network/spice/disable_tests.patch @@ -0,0 +1,30 @@ +--- spice-0.10.0/configure.orig 2011-11-10 16:02:17.000000000 +0100 ++++ spice-0.10.0/configure 2011-11-25 07:17:16.775848497 +0100 +@@ -18468,7 +18468,7 @@ + AM_BACKSLASH='\' + + +-ac_config_files="$ac_config_files Makefile spice-server.pc common/Makefile common/win/Makefile common/win/my_getopt-1.5/Makefile python_modules/Makefile server/Makefile server/tests/Makefile client/Makefile" ++ac_config_files="$ac_config_files Makefile spice-server.pc common/Makefile common/win/Makefile common/win/my_getopt-1.5/Makefile python_modules/Makefile server/Makefile client/Makefile" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -19639,7 +19639,6 @@ + "common/win/my_getopt-1.5/Makefile") CONFIG_FILES="$CONFIG_FILES common/win/my_getopt-1.5/Makefile" ;; + "python_modules/Makefile") CONFIG_FILES="$CONFIG_FILES python_modules/Makefile" ;; + "server/Makefile") CONFIG_FILES="$CONFIG_FILES server/Makefile" ;; +- "server/tests/Makefile") CONFIG_FILES="$CONFIG_FILES server/tests/Makefile" ;; + "client/Makefile") CONFIG_FILES="$CONFIG_FILES client/Makefile" ;; + + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; +--- spice-0.10.0/server/Makefile.in.orig 2011-11-10 16:02:16.000000000 +0100 ++++ spice-0.10.0/server/Makefile.in 2011-11-25 07:18:44.733749237 +0100 +@@ -375,7 +375,7 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = . tests ++SUBDIRS = . + NULL = + INCLUDES = \ + -I$(top_srcdir) \ diff --git a/network/spice/slack-desc b/network/spice/slack-desc new file mode 100644 index 0000000000..989091f049 --- /dev/null +++ b/network/spice/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------------------------------------------------------| +spice: spice (remote computing solution) +spice: +spice: Spice is an open remote computing solution, providing client access to +spice: remote machine display and devices (e.g., keyboard, mouse, audio). +spice: Spice achieves a user experience similar to an interaction with a +spice: local machine, while trying to offload most of the intensive CPU and +spice: GPU tasks to the client. Spice is suitable for both LAN and WAN usage, +spice: without compromising on the user experience. +spice: +spice: spice homepage: http://spice-space.org +spice: diff --git a/network/spice/spice.SlackBuild b/network/spice/spice.SlackBuild new file mode 100644 index 0000000000..77597fa8f1 --- /dev/null +++ b/network/spice/spice.SlackBuild @@ -0,0 +1,93 @@ +#!/bin/sh + +# Slackware build script for spice +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=spice +VERSION=${VERSION:-0.10.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README" + +if [ "${CACARD:-no}" = "no" ]; then + with_libcacard="" +else + with_libcacard="--enable-smartcard" +fi + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP + +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$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 {} \; + +# disable server tests - they don't build at all here +patch -p1 < $CWD/disable_tests.patch + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --localstatedir=/var \ + --disable-static \ + --enable-shared \ + $with_libcacard \ + --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/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/spice/spice.info b/network/spice/spice.info new file mode 100644 index 0000000000..aba6e9ad71 --- /dev/null +++ b/network/spice/spice.info @@ -0,0 +1,10 @@ +PRGNAM="spice" +VERSION="0.10.0" +HOMEPAGE="http://spice-space.org" +DOWNLOAD="http://spice-space.org/download/releases/spice-0.10.0.tar.bz2" +MD5SUM="d9f0b0280c9e2291623c9560e156be26" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/network/urlgrabber/urlgrabber.SlackBuild b/network/urlgrabber/urlgrabber.SlackBuild index 239d9e540d..84d322f0e3 100644 --- a/network/urlgrabber/urlgrabber.SlackBuild +++ b/network/urlgrabber/urlgrabber.SlackBuild @@ -25,7 +25,7 @@ # modified by Javier Rojas to fit urlgrabber PRGNAM=urlgrabber -VERSION=3.1.0 +VERSION=3.9.1 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/urlgrabber/urlgrabber.info b/network/urlgrabber/urlgrabber.info index a29cbed0fa..bc84bd0aab 100644 --- a/network/urlgrabber/urlgrabber.info +++ b/network/urlgrabber/urlgrabber.info @@ -1,10 +1,10 @@ PRGNAM="urlgrabber" -VERSION="3.1.0" +VERSION="3.9.1" HOMEPAGE="http://urlgrabber.baseurl.org/" -DOWNLOAD="http://urlgrabber.baseurl.org/download/urlgrabber-3.1.0.tar.gz" -MD5SUM="2a92d8ce0d89c5e772a98e9b8dcd5b73" +DOWNLOAD="http://urlgrabber.baseurl.org/download/urlgrabber-3.9.1.tar.gz" +MD5SUM="00c8359bf71062d0946bacea521f80b4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Javier Rojas" EMAIL="jerojasro@devnull.li" -APPROVED="dsomero" +APPROVED="" diff --git a/perl/perl-Net-SMTP-SSL/README b/perl/perl-Net-SMTP-SSL/README new file mode 100644 index 0000000000..2d440c0465 --- /dev/null +++ b/perl/perl-Net-SMTP-SSL/README @@ -0,0 +1,5 @@ +perl-Net-SMTP-SSL (SSL support for Net::SMTP) + +perl-Net-SMTP-SSL is a perl module that implements the same API as Net::SMTP, but uses IO::Socket::SSL for its network operations. + +it requires perl-IO-Socket-SSL, available at slackbuilds.org. diff --git a/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.SlackBuild b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.SlackBuild new file mode 100644 index 0000000000..88becfa246 --- /dev/null +++ b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.SlackBuild @@ -0,0 +1,83 @@ +#!/bin/sh + +# Slackware build script for perl-Net-SMTP-SSL +# Written by ponce <matteo.bernardini@gmail.com> +# based on slackbuilds.org perl template + +SRCNAM=Net-SMTP-SSL +PRGNAM=perl-$SRCNAM +VERSION=${VERSION:-1.01} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +DOCS="Changes MANIFEST README" + +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 $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +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 {} \; + +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN3DIR=/usr/man/man3 +make +make test +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 || 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 + +find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true + +find $PKG -depth -type d -empty -delete || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.info b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.info new file mode 100644 index 0000000000..0cf826e59a --- /dev/null +++ b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.info @@ -0,0 +1,10 @@ +PRGNAM="perl-Net-SMTP-SSL" +VERSION="1.01" +HOMEPAGE="http://search.cpan.org/~cwest/Net-SMTP-SSL-1.01/" +DOWNLOAD="http://search.cpan.org/CPAN/authors/id/C/CW/CWEST/Net-SMTP-SSL-1.01.tar.gz" +MD5SUM="ba039288ebf7a343feecacd374da8c1a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/perl/perl-Net-SMTP-SSL/slack-desc b/perl/perl-Net-SMTP-SSL/slack-desc new file mode 100644 index 0000000000..922cb66e73 --- /dev/null +++ b/perl/perl-Net-SMTP-SSL/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------------------------------------------------------| +perl-Net-SMTP-SSL: perl-Net-SMTP-SSL (SSL support for Net::SMTP) +perl-Net-SMTP-SSL: +perl-Net-SMTP-SSL: perl-Net-SMTP-SSL is a perl module that implements the same API as +perl-Net-SMTP-SSL: Net::SMTP, but uses IO::Socket::SSL for its network operations. +perl-Net-SMTP-SSL: +perl-Net-SMTP-SSL: +perl-Net-SMTP-SSL: +perl-Net-SMTP-SSL: +perl-Net-SMTP-SSL: +perl-Net-SMTP-SSL: homepage: http://search.cpan.org/~cwest/Net-SMTP-SSL-1.01/ +perl-Net-SMTP-SSL: diff --git a/perl/perl-switch/README b/perl/perl-switch/README new file mode 100644 index 0000000000..81d18ab0c4 --- /dev/null +++ b/perl/perl-switch/README @@ -0,0 +1,5 @@ +perl-switch (a switch statement for Perl) + +The Switch.pm module implements a generalized case mechanism that +covers a lot of the numerous possible combinations of switch and case +values. diff --git a/perl/perl-switch/perl-switch.SlackBuild b/perl/perl-switch/perl-switch.SlackBuild new file mode 100644 index 0000000000..6580806c80 --- /dev/null +++ b/perl/perl-switch/perl-switch.SlackBuild @@ -0,0 +1,84 @@ +#!/bin/sh + +# Slackware build script for perl-switch +# Written by ponce (matteo.bernardini@gmail.com) + +PRGNAM=perl-switch +VERSION=${VERSION:-2.16} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +SRCNAM=Switch + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +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 {} \; + +# fix http://rt.cpan.org/Public/Bug/Display.html?id=60380 +patch -p1 < $CWD/switch.diff + +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN3DIR=/usr/man/man3 +make +make test +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 + +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 + +find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true + +find $PKG -depth -type d -empty -delete || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Changes README MANIFEST $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/perl/perl-switch/perl-switch.info b/perl/perl-switch/perl-switch.info new file mode 100644 index 0000000000..53d3ea79ea --- /dev/null +++ b/perl/perl-switch/perl-switch.info @@ -0,0 +1,10 @@ +PRGNAM="perl-switch" +VERSION="2.16" +HOMEPAGE="http://search.cpan.org/~rgarcia/Switch-2.16/" +DOWNLOAD="http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Switch-2.16.tar.gz" +MD5SUM="bf75dc7f171b4718a2118c3d6cbe6013" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/perl/perl-switch/slack-desc b/perl/perl-switch/slack-desc new file mode 100644 index 0000000000..f04b3c3393 --- /dev/null +++ b/perl/perl-switch/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------------------------------------------------------| +perl-switch: perl-switch (a switch statement for Perl) +perl-switch: +perl-switch: The Switch.pm module implements a generalized case mechanism that +perl-switch: covers a lot of the numerous possible combinations of switch and case +perl-switch: values. +perl-switch: +perl-switch: +perl-switch: +perl-switch: +perl-switch: homepage: http://search.cpan.org/~rgarcia/Switch-2.16/ +perl-switch: diff --git a/perl/perl-switch/switch.diff b/perl/perl-switch/switch.diff new file mode 100644 index 0000000000..90e96cbb7d --- /dev/null +++ b/perl/perl-switch/switch.diff @@ -0,0 +1,11 @@ +--- Switch-2.16-wjgfvU/Switch.pm 2009-10-23 00:52:51.000000000 -0700 ++++ Switch-2.16-wjgfvUcopy/Switch.pm 2010-08-15 17:41:38.000000000 -0700 +@@ -146,7 +146,7 @@ sub filter_blocks + die "Bad $keyword statement (problem in the code block?) near $Switch::file line ", line(substr($source,0, pos $source), $line), "\n"; + }; + my $code = filter_blocks(substr($source,$pos[0],$pos[4]-$pos[0]),line(substr($source,0,$pos[0]),$line)); +- $code =~ s/{/{ local \$::_S_W_I_T_C_H; Switch::switch $arg;/; ++ $code =~ s/{/{ local \$::_S_W_I_T_C_H; Switch::switch($arg);/; + $text .= $code . 'continue {last}'; + next component; + } diff --git a/python/MySQL-python/MySQL-python.SlackBuild b/python/MySQL-python/MySQL-python.SlackBuild new file mode 100644 index 0000000000..9b2ed4fcb1 --- /dev/null +++ b/python/MySQL-python/MySQL-python.SlackBuild @@ -0,0 +1,69 @@ +#!/bin/sh + +# Slackware build script for MySQL-python. + +# Written by Jick Nan (jick.nan@gmail.com) + +PRGNAM=MySQL-python +VERSION=1.2.3 +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +# 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 + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION +chown -R root:root . +chmod -R u+w,go+r-w,a-s . + +# patch MANIFEST.in +patch -p1 < $CWD/docs.patch + +python setup.py install --root=$PKG + +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 +cp -a HISTORY PKG-INFO README doc/*.txt \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/python/MySQL-python/MySQL-python.info b/python/MySQL-python/MySQL-python.info new file mode 100644 index 0000000000..2f4b2aeafd --- /dev/null +++ b/python/MySQL-python/MySQL-python.info @@ -0,0 +1,10 @@ +PRGNAM="MySQL-python" +VERSION="1.2.3" +HOMEPAGE="http://cheeseshop.python.org/pypi/MySQL-python/" +DOWNLOAD="http://downloads.sourceforge.net/mysql-python/MySQL-python-1.2.3.tar.gz" +MD5SUM="215eddb6d853f6f4be5b4afc4154292f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="Jick Nan" +EMAIL="jick.nan@gmail.com" +APPROVED="" diff --git a/python/MySQL-python/README b/python/MySQL-python/README new file mode 100644 index 0000000000..545bf819fa --- /dev/null +++ b/python/MySQL-python/README @@ -0,0 +1,12 @@ +MySQL-python (Python interface to MySQL) + +MySQLdb is an interface to the popular MySQL database server for Python. +The design goals are: + + * Compliance with Python database API version 2.0 [PEP-0249] + * Thread-safety + * Thread-friendliness (threads will not block each other) + +MySQL-3.23 through 5.1 and Python-2.3 through 2.6 are currently supported. + +This requires the Python setuptools (pysetuptools on SlackBuilds.org). diff --git a/python/MySQL-python/docs.patch b/python/MySQL-python/docs.patch new file mode 100644 index 0000000000..9c624b3547 --- /dev/null +++ b/python/MySQL-python/docs.patch @@ -0,0 +1,14 @@ +--- MySQL-python-1.2.3/MANIFEST.in.orig 2010-11-20 17:45:00.000000000 +0100 ++++ MySQL-python-1.2.3/MANIFEST.in 2010-11-20 17:45:30.000000000 +0100 +@@ -1,10 +1,8 @@ + recursive-include doc *.txt + recursive-include tests *.py + include MANIFEST.in +-include MANIFEST +-include ChangeLog + include HISTORY +-include GPL ++include README + include pymemcompat.h + include metadata.cfg + include site.cfg diff --git a/python/MySQL-python/slack-desc b/python/MySQL-python/slack-desc new file mode 100644 index 0000000000..3bdaf5389e --- /dev/null +++ b/python/MySQL-python/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------------------------------------------------------| +MySQL-python: MySQL-python (Python interface to MySQL) +MySQL-python: +MySQL-python: MySQLdb is an interface to the popular MySQL database server +MySQL-python: for Python. The design goals are: +MySQL-python: * Compliance with Python database API version 2.0 [PEP-0249] +MySQL-python: * Thread-safety +MySQL-python: * Thread-friendliness (threads will not block each other) +MySQL-python: +MySQL-python: MySQL-3.23 through 5.0 and Python-2.3 through 2.5 are currently +MySQL-python: supported. +MySQL-python: diff --git a/python/babel/README b/python/babel/README new file mode 100644 index 0000000000..1e8cba91ba --- /dev/null +++ b/python/babel/README @@ -0,0 +1,6 @@ +babel (python internationalization tools) + +Babel is a collection of tools for internationalizing Python applications. +It's composed of two major parts: +- tools to build and work with gettext message catalogs; +- a Python interface to the CLDR (Common Locale Data Repository), providing access to various locale display names, localized number and date formatting, etc. diff --git a/python/babel/babel.SlackBuild b/python/babel/babel.SlackBuild new file mode 100644 index 0000000000..aab533bd87 --- /dev/null +++ b/python/babel/babel.SlackBuild @@ -0,0 +1,69 @@ +#!/bin/sh + +# Slackware build script for babel + +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=babel +SRCNAM=Babel +VERSION=${VERSION:-0.9.5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +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 {} \; + +python setup.py install --root=$PKG + +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/html +cp -a COPYING ChangeLog README.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a doc/* $PKG/usr/doc/$PRGNAM-$VERSION/html +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/python/babel/babel.info b/python/babel/babel.info new file mode 100644 index 0000000000..bb208bf8f5 --- /dev/null +++ b/python/babel/babel.info @@ -0,0 +1,10 @@ +PRGNAM="babel" +VERSION="0.9.5" +HOMEPAGE="http://babel.edgewall.org/" +DOWNLOAD="http://ftp.edgewall.com/pub/babel/Babel-0.9.5.tar.gz" +MD5SUM="05603f058644f81b9b5f75d0161a14dd" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/python/babel/slack-desc b/python/babel/slack-desc new file mode 100644 index 0000000000..7165a5b745 --- /dev/null +++ b/python/babel/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------------------------------------------------------| +babel: babel (python internationalization tools) +babel: +babel: Babel is a collection of tools for internationalizing Python apps. +babel: It's composed of two major parts: +babel: - tools to build and work with gettext message catalogs; +babel: - a Python interface to the CLDR (Common Locale Data Repository), +babel: providing access to various locale display names, localized number +babel: and date formatting, etc. +babel: +babel: homepage: http://babel.edgewall.org/ +babel: diff --git a/system/dconf/dconf.SlackBuild b/system/dconf/dconf.SlackBuild index b54dcaa008..6196c58bd5 100644 --- a/system/dconf/dconf.SlackBuild +++ b/system/dconf/dconf.SlackBuild @@ -27,7 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=dconf -VERSION=${VERSION:-0.7.3} +VERSION=${VERSION:-0.8.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -82,6 +82,7 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --disable-editor \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux diff --git a/system/dconf/dconf.info b/system/dconf/dconf.info index 07fbc16dc7..6d81f1dc6d 100644 --- a/system/dconf/dconf.info +++ b/system/dconf/dconf.info @@ -1,10 +1,10 @@ PRGNAM="dconf" -VERSION="0.7.3" +VERSION="0.8.0" HOMEPAGE="http://live.gnome.org/dconf" -DOWNLOAD="http://download.gnome.org/sources/dconf/0.7/dconf-0.7.3.tar.bz2" -MD5SUM="f541db70d0623d109b1866c732f1a51c" +DOWNLOAD="http://download.gnome.org/sources/dconf/0.8/dconf-0.8.0.tar.bz2" +MD5SUM="4c5c61a619ea27ffa15f88d142d20663" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="David Somero" EMAIL="dsomero@hotmail.com" -APPROVED="nobody"
\ No newline at end of file +APPROVED="" diff --git a/system/gnome-disk-utility/README b/system/gnome-disk-utility/README new file mode 100644 index 0000000000..db7b507c95 --- /dev/null +++ b/system/gnome-disk-utility/README @@ -0,0 +1,7 @@ +gnome-disk-utility (storage device library and toolset) + +gnome-disk-utility provides libraries and +applications for dealing with storage devices. + +To enable avahi support (needs avahi) pass the parameter +AVAHI=yes when launching the script. diff --git a/system/gnome-disk-utility/doinst.sh b/system/gnome-disk-utility/doinst.sh new file mode 100644 index 0000000000..17b18ef350 --- /dev/null +++ b/system/gnome-disk-utility/doinst.sh @@ -0,0 +1,23 @@ +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... +} + +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/system/gnome-disk-utility/gnome-disk-utility.SlackBuild b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild new file mode 100644 index 0000000000..ea06d96cb5 --- /dev/null +++ b/system/gnome-disk-utility/gnome-disk-utility.SlackBuild @@ -0,0 +1,109 @@ +#!/bin/sh + +# Slackware build script for gnome-disk-utility + +# 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. + +PRGNAM=gnome-disk-utility +VERSION=${VERSION:-2.32.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +OUTPUT=${OUTPUT:-/tmp} +PKG=$TMP/package-$PRGNAM + +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 $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +cd $PRGNAM-$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 {} \; + +cat $CWD/patches/remove_scrollkeeper_trash.diff | patch -p1 || exit 1 +cat $CWD/patches/autostart-in-all-but-kde.patch | patch -p1 || exit 1 +cat $CWD/patches/gdu_use_xdg-open_not_nautilus.patch | patch -p1 || exit 1 + +if [ "${AVAHI:-no}" = "no" ]; then + patch -p1 < $CWD/patches/gnome-disk-utility-2.32.0_cutoff_avahi.patch +fi + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ + --disable-scrollkeeper \ + --build=$ARCH-slackware-linux + +make +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 || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS COPYING INSTALL NEWS README TODO \ + $PKG/usr/doc/$PRGNAM-$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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} diff --git a/system/gnome-disk-utility/patches/autostart-in-all-but-kde.patch b/system/gnome-disk-utility/patches/autostart-in-all-but-kde.patch new file mode 100644 index 0000000000..c82db2bcc4 --- /dev/null +++ b/system/gnome-disk-utility/patches/autostart-in-all-but-kde.patch @@ -0,0 +1,24 @@ +diff -Nur gnome-disk-utility-2.32.0.orig//data/gdu-notification-daemon.desktop.in gnome-disk-utility-2.32.0//data/gdu-notification-daemon.desktop.in +--- gnome-disk-utility-2.32.0.orig//data/gdu-notification-daemon.desktop.in 2010-09-15 10:30:28.000000000 -0500 ++++ gnome-disk-utility-2.32.0//data/gdu-notification-daemon.desktop.in 2010-12-19 22:41:07.448844795 -0600 +@@ -6,7 +6,7 @@ + Terminal=false + Type=Application + Categories= +-OnlyShowIn=GNOME; ++NotShowIn=KDE; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-disk-utility + X-GNOME-Bugzilla-Component=notifications +diff -Nur gnome-disk-utility-2.32.0.orig//data/gdu-notification-daemon.desktop.in.in.in gnome-disk-utility-2.32.0//data/gdu-notification-daemon.desktop.in.in.in +--- gnome-disk-utility-2.32.0.orig//data/gdu-notification-daemon.desktop.in.in.in 2010-08-05 12:03:57.000000000 -0500 ++++ gnome-disk-utility-2.32.0//data/gdu-notification-daemon.desktop.in.in.in 2010-12-19 22:40:47.961099327 -0600 +@@ -6,7 +6,7 @@ + Terminal=false + Type=Application + Categories= +-OnlyShowIn=GNOME; ++NotShowIn=KDE; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gnome-disk-utility + X-GNOME-Bugzilla-Component=notifications diff --git a/system/gnome-disk-utility/patches/gdu_use_xdg-open_not_nautilus.patch b/system/gnome-disk-utility/patches/gdu_use_xdg-open_not_nautilus.patch new file mode 100644 index 0000000000..48b95e2a44 --- /dev/null +++ b/system/gnome-disk-utility/patches/gdu_use_xdg-open_not_nautilus.patch @@ -0,0 +1,25 @@ +diff -Nur gnome-disk-utility-2.32.0.orig//src/palimpsest/gdu-section-volumes.c gnome-disk-utility-2.32.0/src/palimpsest/gdu-section-volumes.c +--- gnome-disk-utility-2.32.0.orig//src/palimpsest/gdu-section-volumes.c 2010-08-05 12:03:58.000000000 -0500 ++++ gnome-disk-utility-2.32.0/src/palimpsest/gdu-section-volumes.c 2011-01-17 14:07:57.960802673 -0600 +@@ -1375,16 +1375,19 @@ + /* We want to use nautilus instead of gtk_show_uri() because + * the latter doesn't handle automatically mounting the mount + * - maybe gtk_show_uri() should do that though... ++ * ++ * Well, then there's this: ++ * https://bugzilla.gnome.org/show_bug.cgi?id=638938#c1 + */ + +- s = g_strdup_printf ("nautilus \"%s\"", uri); ++ s = g_strdup_printf ("xdg-open \"%s\"", uri); + + error = NULL; + if (!g_spawn_command_line_async (s, &error)) { + GtkWidget *dialog; + dialog = gdu_error_dialog_new (GTK_WINDOW (gdu_shell_get_toplevel (gdu_section_get_shell (GDU_SECTION (section)))), + gdu_section_get_presentable (GDU_SECTION (section)), +- _("Error spawning nautilus: %s"), ++ _("Error spawning file manager: %s"), + error); + gtk_widget_show_all (dialog); + gtk_window_present (GTK_WINDOW (dialog)); diff --git a/system/gnome-disk-utility/patches/gnome-disk-utility-2.32.0_cutoff_avahi.patch b/system/gnome-disk-utility/patches/gnome-disk-utility-2.32.0_cutoff_avahi.patch new file mode 100644 index 0000000000..479aa6511c --- /dev/null +++ b/system/gnome-disk-utility/patches/gnome-disk-utility-2.32.0_cutoff_avahi.patch @@ -0,0 +1,178 @@ +diff -Naur gnome-disk-utility-2.32.0.orig/configure gnome-disk-utility-2.32.0/configure +--- gnome-disk-utility-2.32.0.orig/configure 2010-09-15 17:27:20.000000000 +0200 ++++ gnome-disk-utility-2.32.0/configure 2011-12-07 18:06:00.883885910 +0100 +@@ -11427,7 +11427,6 @@ + UNIQUE_REQUIRED=1.0 + LIBNOTIFY_REQUIRED=0.3.0 + NAUTILUS_REQUIRED=2.24.0 +-AVAHI_UI_REQUIRED=0.6.25 + + UDISKS_REQUIRED=1.0.0 + UDISKS_NEXT_ABI_INCOMPATIBLE_VERSION=1.1.0 +@@ -12466,92 +12465,6 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } + : +-fi +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVAHI_UI" >&5 +-$as_echo_n "checking for AVAHI_UI... " >&6; } +- +-if test -n "$AVAHI_UI_CFLAGS"; then +- pkg_cv_AVAHI_UI_CFLAGS="$AVAHI_UI_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-ui >= \$AVAHI_UI_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "avahi-ui >= $AVAHI_UI_REQUIRED") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_AVAHI_UI_CFLAGS=`$PKG_CONFIG --cflags "avahi-ui >= $AVAHI_UI_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$AVAHI_UI_LIBS"; then +- pkg_cv_AVAHI_UI_LIBS="$AVAHI_UI_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"avahi-ui >= \$AVAHI_UI_REQUIRED\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "avahi-ui >= $AVAHI_UI_REQUIRED") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_AVAHI_UI_LIBS=`$PKG_CONFIG --libs "avahi-ui >= $AVAHI_UI_REQUIRED" 2>/dev/null` +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- AVAHI_UI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "avahi-ui >= $AVAHI_UI_REQUIRED" 2>&1` +- else +- AVAHI_UI_PKG_ERRORS=`$PKG_CONFIG --print-errors "avahi-ui >= $AVAHI_UI_REQUIRED" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$AVAHI_UI_PKG_ERRORS" >&5 +- +- as_fn_error "Package requirements (avahi-ui >= $AVAHI_UI_REQUIRED) were not met: +- +-$AVAHI_UI_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables AVAHI_UI_CFLAGS +-and AVAHI_UI_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" "$LINENO" 5 +-elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +-as_fn_error "The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables AVAHI_UI_CFLAGS +-and AVAHI_UI_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see <http://pkg-config.freedesktop.org/>. +-See \`config.log' for more details." "$LINENO" 5; } +-else +- AVAHI_UI_CFLAGS=$pkg_cv_AVAHI_UI_CFLAGS +- AVAHI_UI_LIBS=$pkg_cv_AVAHI_UI_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- : + fi + + # ************* +diff -Naur gnome-disk-utility-2.32.0.orig/src/gdu-gtk/gdu-connect-to-server-dialog.c gnome-disk-utility-2.32.0/src/gdu-gtk/gdu-connect-to-server-dialog.c +--- gnome-disk-utility-2.32.0.orig/src/gdu-gtk/gdu-connect-to-server-dialog.c 2010-09-15 16:12:21.000000000 +0200 ++++ gnome-disk-utility-2.32.0/src/gdu-gtk/gdu-connect-to-server-dialog.c 2011-12-07 18:00:55.884882658 +0100 +@@ -24,7 +24,6 @@ + + #include "config.h" + #include <glib/gi18n-lib.h> +-#include <avahi-ui/avahi-ui.h> + + #include "gdu-connect-to-server-dialog.h" + +@@ -144,37 +143,6 @@ + /* ---------------------------------------------------------------------------------------------------- */ + + static void +-on_dns_sd_clicked (GtkButton *button, +- gpointer user_data) +-{ +- GduConnectToServerDialog *dialog = GDU_CONNECT_TO_SERVER_DIALOG (user_data); +- GtkWidget *service_dialog; +- gint response; +- +- service_dialog = aui_service_dialog_new (_("Choose Server"), +- gtk_window_get_transient_for (GTK_WINDOW (dialog)), +- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, +- GTK_STOCK_OK, GTK_RESPONSE_OK, +- NULL); +- +- aui_service_dialog_set_browse_service_types (AUI_SERVICE_DIALOG (service_dialog), +- "_udisks-ssh._tcp", +- NULL); +- gtk_widget_show_all (service_dialog); +- response = gtk_dialog_run (GTK_DIALOG (service_dialog)); +- +- if (response == GTK_RESPONSE_OK) { +- const gchar *hostname; +- hostname = aui_service_dialog_get_host_name (AUI_SERVICE_DIALOG (service_dialog)); +- gtk_entry_set_text (GTK_ENTRY (dialog->priv->hostname_entry), hostname); +- } +- +- gtk_widget_destroy (service_dialog); +-} +- +-/* ---------------------------------------------------------------------------------------------------- */ +- +-static void + on_hostname_entry_changed (GtkEditable *editable, + gpointer user_data) + { +@@ -217,24 +185,6 @@ + GTK_STOCK_CONNECT, + GTK_RESPONSE_OK); + +- button = gtk_button_new_with_mnemonic (_("_Browse...")); +- image = gtk_image_new_from_stock (GTK_STOCK_NETWORK, GTK_ICON_SIZE_BUTTON); +- gtk_button_set_image (GTK_BUTTON (button), image); +- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), +- button, +- FALSE, +- FALSE, +- 0); +- gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (gtk_dialog_get_action_area (GTK_DIALOG (dialog))), +- button, +- TRUE); +- /* Translators: this is the tooltip for the "Browse..." button */ +- gtk_widget_set_tooltip_text (button, _("Browse servers discovered via the DNS-SD protocol")); +- g_signal_connect (button, +- "clicked", +- G_CALLBACK (on_dns_sd_clicked), +- dialog); +- + content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + + vbox = content_area; diff --git a/system/gnome-disk-utility/patches/remove_scrollkeeper_trash.diff b/system/gnome-disk-utility/patches/remove_scrollkeeper_trash.diff new file mode 100644 index 0000000000..115b86e884 --- /dev/null +++ b/system/gnome-disk-utility/patches/remove_scrollkeeper_trash.diff @@ -0,0 +1,60 @@ +diff -Nur gnome-disk-utility-2.32.0.orig//configure gnome-disk-utility-2.32.0/configure +--- gnome-disk-utility-2.32.0.orig//configure 2010-09-15 10:27:20.000000000 -0500 ++++ gnome-disk-utility-2.32.0/configure 2010-11-04 20:39:07.922165358 -0500 +@@ -12676,56 +12676,6 @@ + fi + + +-# ************* +-# Documentation +-# ************* +- +-# Extract the first word of "scrollkeeper-config", so it can be a program name with args. +-set dummy scrollkeeper-config; ac_word=$2 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +-$as_echo_n "checking for $ac_word... " >&6; } +-if test "${ac_cv_path_SCROLLKEEPER_CONFIG+set}" = set; then : +- $as_echo_n "(cached) " >&6 +-else +- case $SCROLLKEEPER_CONFIG in +- [\\/]* | ?:[\\/]*) +- ac_cv_path_SCROLLKEEPER_CONFIG="$SCROLLKEEPER_CONFIG" # Let the user override the test with a path. +- ;; +- *) +- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +-for as_dir in $PATH +-do +- IFS=$as_save_IFS +- test -z "$as_dir" && as_dir=. +- for ac_exec_ext in '' $ac_executable_extensions; do +- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then +- ac_cv_path_SCROLLKEEPER_CONFIG="$as_dir/$ac_word$ac_exec_ext" +- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 +- break 2 +- fi +-done +- done +-IFS=$as_save_IFS +- +- test -z "$ac_cv_path_SCROLLKEEPER_CONFIG" && ac_cv_path_SCROLLKEEPER_CONFIG="no" +- ;; +-esac +-fi +-SCROLLKEEPER_CONFIG=$ac_cv_path_SCROLLKEEPER_CONFIG +-if test -n "$SCROLLKEEPER_CONFIG"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SCROLLKEEPER_CONFIG" >&5 +-$as_echo "$SCROLLKEEPER_CONFIG" >&6; } +-else +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +-fi +- +- +-if test x$SCROLLKEEPER_CONFIG = xno; then +- { as_fn_set_status please install the scrollkeeper package +-as_fn_error "Couldn't find scrollkeeper-config" "$LINENO" 5; } +-fi +- + # ******************** + # Internationalization + # ******************** diff --git a/system/gnome-disk-utility/slack-desc b/system/gnome-disk-utility/slack-desc new file mode 100644 index 0000000000..bf5dbee964 --- /dev/null +++ b/system/gnome-disk-utility/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-disk-utility: gnome-disk-utility (storage device library and toolset) +gnome-disk-utility: +gnome-disk-utility: gnome-disk-utility provides libraries and +gnome-disk-utility: applications for dealing with storage devices. +gnome-disk-utility: +gnome-disk-utility: +gnome-disk-utility: +gnome-disk-utility: +gnome-disk-utility: +gnome-disk-utility: +gnome-disk-utility: diff --git a/system/gnomint/README b/system/gnomint/README new file mode 100644 index 0000000000..9143940d47 --- /dev/null +++ b/system/gnomint/README @@ -0,0 +1,7 @@ +gnomint (certification authorities gui) + +gnomint is a tool for an easy creation and management of Certification +Authorities. It allows a fancy visualization of all the pieces that +conform a CA: x509 certificates, CSRs, CRLs... + +This requires GConf and ORBit2. diff --git a/system/gnomint/doinst.sh b/system/gnomint/doinst.sh new file mode 100644 index 0000000000..7851dc4789 --- /dev/null +++ b/system/gnomint/doinst.sh @@ -0,0 +1,10 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database &> /dev/null +fi + +if [ -x usr/bin/gconftool-2 ]; then + ( cd $PKG/etc/gconf/schemas + GCONF_CONFIG_SOURCE="xml::etc/gconf/gconf.xml.defaults" \ + usr/bin/gconftool-2 --makefile-install-rule \ + etc/gconf/schemas/gnomint.schemas >/dev/null 2>&1 ) +fi diff --git a/system/gnomint/gnomint.SlackBuild b/system/gnomint/gnomint.SlackBuild new file mode 100644 index 0000000000..5c63786978 --- /dev/null +++ b/system/gnomint/gnomint.SlackBuild @@ -0,0 +1,88 @@ +#!/bin/sh + +# Slackware build script for gnomint +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=gnomint +VERSION=${VERSION:-1.2.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +DOCS="AUTHORS BUGS COPYING ChangeLog INSTALL MAINTAINERS NEWS README TODO" + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$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 {} \; + +# apply two patches from Debian, one for respect env CFLAGS and another +# to link explicitly to libgcryct +patch -p1 < $CWD/patches/01-ldd.patch +patch -p1 < $CWD/patches/02-cflags.patch + +autoreconf -i + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$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/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +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 $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/gnomint/gnomint.info b/system/gnomint/gnomint.info new file mode 100644 index 0000000000..032a819750 --- /dev/null +++ b/system/gnomint/gnomint.info @@ -0,0 +1,10 @@ +PRGNAM="gnomint" +VERSION="1.2.1" +HOMEPAGE="http://sourceforge.net/projects/gnomint/" +DOWNLOAD="http://downloads.sf.net/gnomint/gnomint-1.2.1.tar.gz" +MD5SUM="f09f55abe094232fbea2a2d13ef600e6" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/system/gnomint/patches/01-ldd.patch b/system/gnomint/patches/01-ldd.patch new file mode 100644 index 0000000000..0f92419fb0 --- /dev/null +++ b/system/gnomint/patches/01-ldd.patch @@ -0,0 +1,14 @@ +Author: Daniel Baumann <daniel@debian.org> +Description: Explicitly linking against libgcrypt. + +diff -Naurp gnomint.orig/src/Makefile.in gnomint/src/Makefile.in +--- gnomint.orig/src/Makefile.in 2011-05-17 19:57:50.013883380 +0200 ++++ gnomint/src/Makefile.in 2011-05-17 19:57:37.209981808 +0200 +@@ -347,6 +347,7 @@ gnomint_cli_SOURCES = \ + + gnomint_cli_LDADD = \ + $(GNOMINTCLI_LIBS) \ ++ $(LIBGCRYPT_LIBS) \ + $(LIBGNUTLS_LIBS) \ + $(SQLITE_LIBS) \ + $(READLINE_LIBS) \ diff --git a/system/gnomint/patches/02-cflags.patch b/system/gnomint/patches/02-cflags.patch new file mode 100644 index 0000000000..59e4f71943 --- /dev/null +++ b/system/gnomint/patches/02-cflags.patch @@ -0,0 +1,28 @@ +Author: Daniel Baumann <daniel@debian.org> +Description: + Don't hardcode CFLAGS and respect the environemnt (Closes: #634395). + +diff -Naurp gnomint.orig/configure gnomint/configure +--- gnomint.orig/configure 2011-09-08 07:58:09.324752523 +0000 ++++ gnomint/configure 2011-09-08 07:59:20.113103539 +0000 +@@ -14338,7 +14338,7 @@ fi + + + if test "x$GCC" = "xyes"; then +- CFLAGS="-Wall -Werror" ++ CFLAGS="${CFLAGS:--Wall -Werror}" + if test "x$use_debug" = "xYes"; then + CFLAGS="$CFLAGS -g -O0" + fi +diff -Naurp gnomint.orig/configure.in gnomint/configure.in +--- gnomint.orig/configure.in 2011-09-08 07:58:09.328752536 +0000 ++++ gnomint/configure.in 2011-09-08 07:59:20.113103539 +0000 +@@ -181,7 +181,7 @@ dnl + + dnl + if test "x$GCC" = "xyes"; then +- CFLAGS="-Wall -Werror" ++ CFLAGS="${CFLAGS:--Wall -Werror}" + if test "x$use_debug" = "xYes"; then + CFLAGS="$CFLAGS -g -O0" + fi diff --git a/system/gnomint/slack-desc b/system/gnomint/slack-desc new file mode 100644 index 0000000000..00ef8b50cf --- /dev/null +++ b/system/gnomint/slack-desc @@ -0,0 +1,20 @@ +# 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----------------------------------------------------| +gnomint: gnomint (certification authorities gui) +gnomint: +gnomint: gnomint is a tool for an easy creation and management of Certification +gnomint: Authorities. It allows a fancy visualization of all the pieces that +gnomint: conform a CA: x509 certificates, CSRs, CRLs... +gnomint: +gnomint: homepage: http://sourceforge.net/projects/gnomint/ +gnomint: +gnomint: +gnomint: +gnomint: + diff --git a/system/gvfs/gvfs.SlackBuild b/system/gvfs/gvfs.SlackBuild index e0db4e4b6c..2369c2acde 100644 --- a/system/gvfs/gvfs.SlackBuild +++ b/system/gvfs/gvfs.SlackBuild @@ -3,9 +3,10 @@ # Slackware build script for gvfs # Written by Luis Henrique <lmello.009@gmail.com> +# Thanks from ponce <matteo.bernardini@gmail.com> to Steve Kennedy for the hints :) PRGNAM=gvfs -VERSION=${VERSION:-1.6.7} +VERSION=${VERSION:-1.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,6 +61,8 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ + --disable-static \ + --disable-hal \ --build=$ARCH-slackware-linux make @@ -73,9 +76,17 @@ cp -a \ AUTHORS ChangeLog COPYING INSTALL MAINTAINERS NEWS README* \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +find $PKG/usr/doc/$PRGNAM-$VERSION/ -type f -exec chmod 644 {} \; +chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat <<EOF > $PKG/install/doinst.sh +# create the gio module cache during postinstall +if [ -x /usr/bin/gio-querymodules ]; then + chroot . /usr/bin/gio-querymodules /usr/lib${LIBDIRSUFFIX}/gio/modules/ >/dev/null 2>&1 +fi +EOF cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/gvfs/gvfs.info b/system/gvfs/gvfs.info index a7ef633fc2..7a155aebf3 100644 --- a/system/gvfs/gvfs.info +++ b/system/gvfs/gvfs.info @@ -1,10 +1,10 @@ PRGNAM="gvfs" -VERSION="1.6.7" +VERSION="1.8.2" HOMEPAGE="ftp://ftp.gnome.org" -DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/gvfs/1.6/gvfs-1.6.7.tar.bz2" -MD5SUM="ac249ae10e38cf3d5f779624b81ad3b0" +DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gvfs/1.8/gvfs-1.8.2.tar.bz2" +MD5SUM="402f94b187b197b403d25c85caeb9562" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Luis Henrique" EMAIL="lmello.009@gmail.com" -APPROVED="rworkman" +APPROVED="" diff --git a/system/ktsuss/README b/system/ktsuss/README new file mode 100644 index 0000000000..5934c149d1 --- /dev/null +++ b/system/ktsuss/README @@ -0,0 +1,3 @@ +ktsuss stands for "keep the su simple, stupid", and as the name says, is a +graphical version of su written in C and GTK+ 2. The idea of the project is +to remain simple and bug free... diff --git a/system/ktsuss/ktsuss.SlackBuild b/system/ktsuss/ktsuss.SlackBuild new file mode 100644 index 0000000000..3363187f0e --- /dev/null +++ b/system/ktsuss/ktsuss.SlackBuild @@ -0,0 +1,101 @@ +#!/bin/sh + +# Slackware build script for ktsuss + +# Copyright 2008 Murat D. Kadirov <banderols@gmail.com> +# Copyright 2009,2010 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. + +PRGNAM=ktsuss +VERSION=${VERSION:-2} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +# 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 + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$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 \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +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 || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + COPYING CREDITS Changelog INSTALL README \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/ktsuss/ktsuss.info b/system/ktsuss/ktsuss.info new file mode 100644 index 0000000000..eff66e76ca --- /dev/null +++ b/system/ktsuss/ktsuss.info @@ -0,0 +1,10 @@ +PRGNAM="ktsuss" +VERSION="2" +HOMEPAGE="http://code.google.com/p/ktsuss/" +DOWNLOAD="http://ktsuss.googlecode.com/files/ktsuss-2.tar.gz" +MD5SUM="30525f110b8b3fded8a53f1fc9785335" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/system/ktsuss/slack-desc b/system/ktsuss/slack-desc new file mode 100644 index 0000000000..b47abbb0a7 --- /dev/null +++ b/system/ktsuss/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------------------------------------------------------| +ktsuss: ktsuss (a gtk su helper) +ktsuss: +ktsuss: ktsuss stands for "keep the su simple, stupid", and as the name +ktsuss: implies, is a graphical version of su written in C and GTK+ 2 +ktsuss: (similar in functionality to kdesu and gksu). +ktsuss: +ktsuss: The goal of the project is to remain simple and bug free... +ktsuss: +ktsuss: Homepage: http://code.google.com/p/ktsuss/ +ktsuss: +ktsuss: diff --git a/system/lxdm/lxdm.SlackBuild b/system/lxdm/lxdm.SlackBuild index e657a9e43a..ded5c49ed2 100644 --- a/system/lxdm/lxdm.SlackBuild +++ b/system/lxdm/lxdm.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lxdm -VERSION=${VERSION:-0.3.0} -BUILD=${BUILD:-1} +VERSION=${VERSION:-0.4.1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +69,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# patch lxdm.conf.in to avoid a wrong libexec path - must go deep on +# why the build system gets it wrong +sed -i "s/@FULL_LIBEXECDIR@/\/usr\/libexec/" data/lxdm.conf.in + # Patch the Xsession file to source /etc/profile and xprofile on session start patch -p1 < $CWD/patches/source_profile_in_Xsession.diff @@ -91,6 +95,9 @@ patch -p1 < $CWD/patches/lxdm-0.3.0-without_pam.diff # to maintain ; let's hope I don't eat those words. --rworkman patch -p1 < $CWD/patches/lxdm-0.3.0-set_DESKTOP_SESSION_in_env.diff +# from git, fix null pointer dereference +patch -p1 < $CWD/patches/null_pointer_dereference.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -109,6 +116,10 @@ make install DESTDIR=$PKG # We said --without-pam rm -rf $PKG/etc/pam.d +# change default non-existent background image to an lxde one and theme accordingly :P +sed -i -e "s|^bg=.*|bg=/usr/share/lxde/wallpapers/lxde_green.jpg|" $PKG/etc/lxdm/lxdm.conf +sed -i -e "s|Clearlooks|Clearlooks-Olive|" $PKG/etc/lxdm/lxdm.conf + # Install a to-be-customized-if-needed /etc/lxdm/xinitrc cat $CWD/xinitrc > $PKG/etc/lxdm/xinitrc.new diff --git a/system/lxdm/lxdm.info b/system/lxdm/lxdm.info index c584170ee7..4190230038 100644 --- a/system/lxdm/lxdm.info +++ b/system/lxdm/lxdm.info @@ -1,10 +1,10 @@ PRGNAM="lxdm" -VERSION="0.3.0" +VERSION="0.4.1" HOMEPAGE="http://lxde.org/" -DOWNLOAD="http://downloads.sourceforge.net/lxde/lxdm-0.3.0.tar.gz" -MD5SUM="1d0688e088edab7c3c563263eb2f9654" +DOWNLOAD="http://downloads.sourceforge.net/lxde/lxdm-0.4.1.tar.gz" +MD5SUM="8da1cfc2be6dc9217c85a7cf51e1e821" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="michiel" +APPROVED="" diff --git a/system/lxdm/patches/lxdm-0.3.0-without_pam.diff b/system/lxdm/patches/lxdm-0.3.0-without_pam.diff index e9a8c5ae97..dacd16d770 100644 --- a/system/lxdm/patches/lxdm-0.3.0-without_pam.diff +++ b/system/lxdm/patches/lxdm-0.3.0-without_pam.diff @@ -1,18 +1,18 @@ -diff -Nur lxdm-0.3.0.orig//src/lxdm.c lxdm-0.3.0/src/lxdm.c ---- lxdm-0.3.0.orig//src/lxdm.c 2010-09-24 10:43:49.000000000 -0500 -+++ lxdm-0.3.0/src/lxdm.c 2010-10-10 23:01:24.711716765 -0500 -@@ -150,6 +150,7 @@ +diff -Naur lxdm-0.4.0.orig/src/lxdm.c lxdm-0.4.0/src/lxdm.c +--- lxdm-0.4.0.orig/src/lxdm.c 2011-07-13 14:00:34.000000000 +0200 ++++ lxdm-0.4.0/src/lxdm.c 2011-07-22 17:27:34.000000000 +0200 +@@ -153,6 +153,7 @@ while( waitpid(-1, 0, WNOHANG) > 0 ) ; } +/* Sorry, -ENOPAM here + #if HAVE_LIBPAM static void close_pam_session(pam_handle_t *pamh) { - int err; -@@ -159,6 +160,7 @@ - pam_end(pamh, err); +@@ -164,6 +165,7 @@ pamh = NULL; } + #endif +*/ static LXSession *lxsession_find_greeter(void) diff --git a/system/lxdm/patches/null_pointer_dereference.patch b/system/lxdm/patches/null_pointer_dereference.patch new file mode 100644 index 0000000000..7abdbd4705 --- /dev/null +++ b/system/lxdm/patches/null_pointer_dereference.patch @@ -0,0 +1,51 @@ +From 19f82a206b2cec964cea0475395d63dedf183788 Mon Sep 17 00:00:00 2001 +From: Andrea Florio <andrea@opensuse.org> +Date: Fri, 29 Jul 2011 23:59:32 +0200 +Subject: [PATCH] fix null pointer dereference + +--- + src/config.c | 25 ++++++++++--------------- + 1 files changed, 10 insertions(+), 15 deletions(-) + +diff --git a/src/config.c b/src/config.c +index 3f92f7b..4603ab4 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -125,24 +125,19 @@ static gboolean image_file_valid(const char *filename) + static void update_face_image(GtkWidget *w) + { + GdkPixbuf *pixbuf; +- char *path; +- path=g_build_filename(user->pw_dir,".face",NULL); +- if(access(path,R_OK)) +- { +- g_free(path); +- if(ui_nobody) +- pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); +- if(!pixbuf) +- pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), ++ char *path=g_build_filename(user->pw_dir,".face",NULL); ++ pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); ++ g_free(path); ++ if(!pixbuf && ui_nobody) ++ pixbuf=gdk_pixbuf_new_from_file_at_scale(ui_nobody,48,48,FALSE,NULL); ++ if(!pixbuf) ++ pixbuf=gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), + "avatar-default", 48,GTK_ICON_LOOKUP_FORCE_SIZE,NULL); +- } +- else ++ if(pixbuf) + { +- pixbuf=gdk_pixbuf_new_from_file_at_scale(path,48,48,FALSE,NULL); +- g_free(path); ++ gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); ++ g_object_unref(pixbuf); + } +- gtk_image_set_from_pixbuf(GTK_IMAGE(w),pixbuf); +- g_object_unref(pixbuf); + } + + static void set_face_file(const char *filename) +-- +1.7.0.1 + diff --git a/system/lxdm/patches/remove_suse_from_Xsession.diff b/system/lxdm/patches/remove_suse_from_Xsession.diff index df1da70b83..475c5c75a9 100644 --- a/system/lxdm/patches/remove_suse_from_Xsession.diff +++ b/system/lxdm/patches/remove_suse_from_Xsession.diff @@ -1,10 +1,10 @@ -diff -Nur lxdm-0.3.0.orig//data/Xsession lxdm-0.3.0/data/Xsession ---- lxdm-0.3.0.orig//data/Xsession 2010-10-12 20:13:01.316302089 -0500 -+++ lxdm-0.3.0/data/Xsession 2010-10-12 20:12:40.989504750 -0500 -@@ -31,10 +31,6 @@ +diff -Naur lxdm-0.4.0.orig/data/Xsession lxdm-0.4.0/data/Xsession +--- lxdm-0.4.0.orig/data/Xsession 2011-03-17 16:35:47.000000000 +0100 ++++ lxdm-0.4.0/data/Xsession 2011-07-22 17:23:49.000000000 +0200 +@@ -27,10 +27,6 @@ elif [ -x /etc/X11/Xsession ]; then # mandriva, debian, ubuntu - exec /etc/X11/Xsession $LXSESSION + exec /etc/X11/Xsession "$LXSESSION" -elif [ -x /etc/X11/xinit/xinitrc ]; then -#suse - export WINDOWMANAGER=$LXSESSION diff --git a/system/qemu-kvm/README b/system/qemu-kvm/README index 4c9a99a300..7cc4b68c17 100644 --- a/system/qemu-kvm/README +++ b/system/qemu-kvm/README @@ -27,3 +27,6 @@ be using plain "qemu" for the others (since they can't use the KVM stuff anyway. The default "x86_64" value works fine for for 32-bit or 64-bit QEMU-KVM hosts providing full system emulation supporting Linux, BSD, and Windows guests. + +If you want to enable spice remote desktop support you need spice, then +you can pass the script the variable SPICE=yes diff --git a/system/qemu-kvm/qemu-kvm.SlackBuild b/system/qemu-kvm/qemu-kvm.SlackBuild index 2858fe03e6..8f358adc53 100644 --- a/system/qemu-kvm/qemu-kvm.SlackBuild +++ b/system/qemu-kvm/qemu-kvm.SlackBuild @@ -70,6 +70,13 @@ elif [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" fi +if [ "${SPICE:-no}" = "no" ]; then + with_spice="" +else + with_spice="--enable-spice" + EXTRACFLAGS="-I/usr/include/spice-server -I/usr/include/spice-1" +fi + # Needed to build man pages if build is ran from su export PATH=$PATH:/usr/share/texmf/bin @@ -95,6 +102,7 @@ patch -p1 < $CWD/fixup_udev_rules.patch # This translates the possible targets into the correct format for configure TARGETS="$(for i in $BUILD_ARCH ; do printf "$i-softmmu " ; done)" +LDFLAGS="-L/usr/lib${LIBDIRSUFFIX} -lz" \ CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ @@ -102,6 +110,7 @@ CFLAGS="$SLKCFLAGS" \ --enable-mixemu \ --audio-drv-list=oss,alsa,sdl,esd \ --enable-system \ + $with_spice \ --target-list="$TARGETS" make V=1 \ diff --git a/system/redis/redis.SlackBuild b/system/redis/redis.SlackBuild index 1d180289fb..9002749114 100644 --- a/system/redis/redis.SlackBuild +++ b/system/redis/redis.SlackBuild @@ -4,7 +4,8 @@ # Written by kuroi_kenshi <kuroi_kenshi96@yahoo.com> PRGNAM=redis -VERSION=${VERSION:-1.02} +SRC_VERSION=2.2.105-scripting +VERSION=$(echo $SRC_VERSION | tr - _) BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -42,18 +43,15 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$SRC_VERSION +tar xvf $CWD/$PRGNAM-$SRC_VERSION.tar.gz +cd $PRGNAM-$SRC_VERSION chown -R root:root . chmod -R u+w,go+r-w,a-s . # No ./configure necessary -CFLAGS="$SLKCFLAGS" make - -# move binaries to /usr/bin/ -mkdir -p $PKG/usr/bin -install -m 0755 redis-server redis-cli redis-benchmark $PKG/usr/bin +CFLAGS="$SLKCFLAGS" make PREFIX=/usr +make PREFIX=$PKG/usr install find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true @@ -63,7 +61,7 @@ install -D -m 644 redis.conf $PKG/etc/redis.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - 00-RELEASENOTES BETATESTING.txt BUGS Changelog COPYING README TODO \ + 00-RELEASENOTES BUGS CONTRIBUTING Changelog COPYING README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/redis/redis.info b/system/redis/redis.info index d598f18caf..aac97f476e 100644 --- a/system/redis/redis.info +++ b/system/redis/redis.info @@ -1,10 +1,10 @@ PRGNAM="redis" -VERSION="1.02" -HOMEPAGE="http://code.google.com/p/redis/" -DOWNLOAD="http://redis.googlecode.com/files/redis-1.02.tar.gz" -MD5SUM="5396e2d8b67f451ab4702ce7655533ae" +VERSION="2.2.105_scripting" +HOMEPAGE="http://redis.io" +DOWNLOAD="http://redis.googlecode.com/files/redis-2.2.105-scripting.tar.gz" +MD5SUM="3e05ac7fe85445c7e7ba9c129f3dada6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Kuroi Kenshi" EMAIL="kuroi_kenshi96@yahoo.com" -APPROVED="rworkman" +APPROVED="" diff --git a/system/slackyd/README b/system/slackyd/README new file mode 100644 index 0000000000..35c43da926 --- /dev/null +++ b/system/slackyd/README @@ -0,0 +1,9 @@ +slackyd (slacky downloader) + +slackyd is a tool that let you download packages from a repository +(checking integrity by their md5) and perform other tasks like showing +package informations (description, size, dependencies and so on), +check for updates, search for official or unofficial installed +packages. It can build packages from source or just download the +files needed for building. It can resolve needed dependencies using +required and reccomended fields in PACKAGES.TXT diff --git a/system/slackyd/slack-desc b/system/slackyd/slack-desc new file mode 100644 index 0000000000..10d6b66ac6 --- /dev/null +++ b/system/slackyd/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------------------------------------------------------| +slackyd: slackyd (slacky downloader) +slackyd: +slackyd: slackyd is a tool that let you download packages from a repository +slackyd: (checking integrity by their md5) and perform other tasks like showing +slackyd: package informations (description, size, dependencies and so on), +slackyd: check for updates, search for official or unofficial installed +slackyd: packages. It can build packages from source or just download the +slackyd: files needed for building. It can resolve needed dependencies using +slackyd: required and reccomended fields in PACKAGES.TXT +slackyd: homepage: http://slacky.eu/~dani/slackyd/ +slackyd: diff --git a/system/slackyd/slackyd.SlackBuild b/system/slackyd/slackyd.SlackBuild new file mode 100644 index 0000000000..cf38843636 --- /dev/null +++ b/system/slackyd/slackyd.SlackBuild @@ -0,0 +1,70 @@ +#!/bin/sh + +# Slackware build script for slackyd +# Written by ponce <matteo.bernardini@gmail.com> + +PRGNAM=slackyd +VERSION=${VERSION:-1.0} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +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/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +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 + +DOCS="AUTHORS BUGS CHANGELOG INSTALL THANKS" + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +cd $PRGNAM-$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" \ +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/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/slackyd/slackyd.info b/system/slackyd/slackyd.info new file mode 100644 index 0000000000..6d36cc6cd6 --- /dev/null +++ b/system/slackyd/slackyd.info @@ -0,0 +1,10 @@ +PRGNAM="slackyd" +VERSION="1.0" +HOMEPAGE="http://slacky.eu/~dani/slackyd/" +DOWNLOAD="http://slacky.eu/~dani/slackyd/sources/slackyd-1.0.tar.bz2" +MD5SUM="577b97cc9116f5c21ca7b86ab945a737" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +MAINTAINER="ponce" +EMAIL="matteo.bernardini@gmail.com" +APPROVED="" diff --git a/system/udisks/udisks.SlackBuild b/system/udisks/udisks.SlackBuild index 672a3c26b5..6eb4bbc374 100644 --- a/system/udisks/udisks.SlackBuild +++ b/system/udisks/udisks.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=udisks -VERSION=${VERSION:-1.0.2} +VERSION=${VERSION:-1.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,6 +69,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# oversight +sed -i "s/^\+#/#/" configure + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -91,6 +94,11 @@ mkdir -p $PKG/etc/bash_completion.d mv $PKG/etc/profile.d/udisks-bash-completion.sh \ $PKG/etc/bash_completion.d/udisks +# use ntfs-3g by default +mkdir -p $PKG/etc/udev/rules.d +echo "ENV{ID_FS_TYPE}==\"ntfs\", ENV{ID_FS_TYPE}=\"ntfs-3g\"" \ + > $PKG/etc/udev/rules.d/99-udisks-ntfs3g.rules + 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 diff --git a/system/udisks/udisks.info b/system/udisks/udisks.info index 02c72641ad..c710e1bad1 100644 --- a/system/udisks/udisks.info +++ b/system/udisks/udisks.info @@ -1,10 +1,10 @@ PRGNAM="udisks" -VERSION="1.0.2" +VERSION="1.0.4" HOMEPAGE="http://www.freedesktop.org/wiki/Software/udisks" -DOWNLOAD="http://hal.freedesktop.org/releases/udisks-1.0.2.tar.gz" -MD5SUM="f630eefa51b95d6485eb3246bc1bea9a" +DOWNLOAD="http://hal.freedesktop.org/releases/udisks-1.0.4.tar.gz" +MD5SUM="86c63b2b5484f2060499a052b5b6256b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Robby Workman" EMAIL="rw@rlworkman.net" -APPROVED="dsomero" +APPROVED="" diff --git a/system/vice/patches/vice-2.1-64bit.patch b/system/vice/patches/vice-2.1-64bit.patch deleted file mode 100644 index eadf9b64e5..0000000000 --- a/system/vice/patches/vice-2.1-64bit.patch +++ /dev/null @@ -1,105 +0,0 @@ -diff -urpN vice-2.1/configure vice-2.1-64/configure ---- vice-2.1/configure 2008-12-15 21:18:47.000000000 +0100 -+++ vice-2.1-64/configure 2009-10-11 00:02:00.763205494 +0200 -@@ -960,7 +960,7 @@ htmldir='${docdir}' - dvidir='${docdir}' - pdfdir='${docdir}' - psdir='${docdir}' --libdir='${exec_prefix}/lib' -+libdir='${exec_prefix}/lib64' - localedir='${datarootdir}/locale' - mandir='${datarootdir}/man' - -@@ -1445,7 +1445,7 @@ Installation directories: - [PREFIX] - - By default, \`make install' will install all the files in --\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib64' etc. You can specify - an installation prefix other than \`$ac_default_prefix' using \`--prefix', - for instance \`--prefix=\$HOME'. - -@@ -1458,7 +1458,7 @@ Fine tuning of the installation director - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -+ --libdir=DIR object code libraries [EPREFIX/lib64] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -@@ -5583,7 +5583,7 @@ if test -z "$CPP"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # Double quotes because CPP needs to be expanded -- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib64/cpp" - do - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes -@@ -6369,7 +6369,7 @@ if test -z "$CPP"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # Double quotes because CPP needs to be expanded -- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib64/cpp" - do - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes -@@ -8652,7 +8652,7 @@ if test -z "$CXXCPP"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - # Double quotes because CXXCPP needs to be expanded -- for CXXCPP in "$CXX -E" "/lib/cpp" -+ for CXXCPP in "$CXX -E" "/lib64/cpp" - do - ac_preproc_ok=false - for ac_cxx_preproc_warn_flag in '' yes -@@ -8911,7 +8911,7 @@ _ACEOF - else - no_recursion=yes - -- LDFLAGS="$LDFLAGS -L$with_resid/lib" -+ LDFLAGS="$LDFLAGS -L$with_resid/lib64" - CPPFLAGS="$CPPFLAGS -I$with_resid/include" - - -@@ -9131,7 +9131,7 @@ cat >>confdefs.h <<\_ACEOF - _ACEOF - - RESID_DIR= -- RESID_LIBS="$with_resid/lib/libresid.a" -+ RESID_LIBS="$with_resid/lib64/libresid.a" - RESID_INCLUDES="-I$with_resid/include" - fi - -@@ -23284,7 +23284,7 @@ _ACEOF - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in -- /usr/lib | /lib) ;; -+ /usr/lib64 | /lib64) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi -@@ -28704,7 +28704,7 @@ fi - - ;; - *) -- VICEDIR="$PREFIX/lib/vice"; -+ VICEDIR="$PREFIX/lib64/vice"; - - - if false; then -diff -urpN vice-2.1/src/arch/unix/archdep.h vice-2.1-64/src/arch/unix/archdep.h ---- vice-2.1/src/arch/unix/archdep.h 2008-10-10 21:08:31.000000000 +0200 -+++ vice-2.1-64/src/arch/unix/archdep.h 2009-10-11 00:03:04.366722924 +0200 -@@ -116,7 +116,7 @@ extern const char *archdep_pref_path; - #ifdef __NetBSD__ - #define LIBDIR PREFIX "/share/vice" - #else --#define LIBDIR PREFIX "/lib/vice" -+#define LIBDIR PREFIX "/lib64/vice" - #endif - - #if defined(__FreeBSD__) || defined(__NetBSD__) diff --git a/system/vice/patches/vice-2.3.12-x86_64.patch b/system/vice/patches/vice-2.3.12-x86_64.patch new file mode 100644 index 0000000000..e56907ef47 --- /dev/null +++ b/system/vice/patches/vice-2.3.12-x86_64.patch @@ -0,0 +1,170 @@ +diff -Naur vice-2.3.12.orig/INSTALL vice-2.3.12/INSTALL +--- vice-2.3.12.orig/INSTALL 2011-01-29 14:17:50.000000000 +0100 ++++ vice-2.3.12/INSTALL 2011-12-23 12:22:05.147190182 +0100 +@@ -301,7 +301,7 @@ + + make install + +- The binaries and support files will all go under PREFIX/lib/vice. ++ The binaries and support files will all go under PREFIX/lib64/vice. + You must of course have write permissions for the directories where + VICE is to be installed. Normally only the system administrator + has write access to /usr/local, the default PREFIX. Either ask +diff -Naur vice-2.3.12.orig/configure.in vice-2.3.12/configure.in +--- vice-2.3.12.orig/configure.in 2011-12-02 01:28:21.000000000 +0100 ++++ vice-2.3.12/configure.in 2011-12-23 12:22:05.148190197 +0100 +@@ -1623,7 +1623,7 @@ + fi + else + if test x"$enable_ethernet" = "xyes"; then +- dnl /usr/lib/libpcap.a ++ dnl /usr/lib64/libpcap.a + AC_CHECK_LIB(pcap, pcap_inject,[ + AC_DEFINE(HAVE_TFE,,[Support for The Final Ethernet]) + AC_DEFINE(HAVE_PCAP_INJECT,,[A libpcap version with pcap_inject is available]) +@@ -1634,8 +1634,8 @@ + AC_DEFINE(HAVE_PCAP_SENDPACKET,,[A libpcap version with pcap_sendpacket is available]) + TFE_LIBS="-lpcap" + ],,$LIBS) +- dnl /usr/lib/libpcap.a +- dnl /usr/lib/libnet.a ++ dnl /usr/lib64/libpcap.a ++ dnl /usr/lib64/libnet.a + AC_CHECK_LIB(pcap, pcap_open_live,[ + AC_CHECK_LIB(net, libnet_init,[ + AC_DEFINE(HAVE_TFE,,[Support for The Final Ethernet]) +@@ -1643,8 +1643,8 @@ + TFE_LIBS="-lpcap `libnet-config --libs`" + CFLAGS="$CFLAGS `libnet-config --defines`" + ],,$LIBS)],,$LIBS) +- dnl /usr/lib/libpcap.a +- dnl /usr/lib/libnet.a ++ dnl /usr/lib64/libpcap.a ++ dnl /usr/lib64/libnet.a + AC_CHECK_LIB(pcap, pcap_open_live,[ + AC_CHECK_LIB(net, libnet_write_link_layer,[ + AC_DEFINE(HAVE_TFE,,[Support for The Final Ethernet]) +@@ -3393,7 +3393,7 @@ + AM_CONDITIONAL(ALTERNATE_DOCDIR, true) + ;; + *) +- VICEDIR="$PREFIX/lib/vice"; ++ VICEDIR="$PREFIX/lib64/vice"; + AM_CONDITIONAL(ALTERNATE_DOCDIR, false) + ;; + esac +diff -Naur vice-2.3.12.orig/doc/vice.guide vice-2.3.12/doc/vice.guide +--- vice-2.3.12.orig/doc/vice.guide 2011-12-02 01:28:21.000000000 +0100 ++++ vice-2.3.12/doc/vice.guide 2011-12-23 12:26:51.663193300 +0100 +@@ -1211,7 +1211,7 @@ + (`:')-separated search
path list, like the UNIX `PATH' environment + variable. The
default value is
+ +- PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
example
++ PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU
example
+ Where `PREFIX' is the installation prefix (usually
`/usr/local'), + `EMU' is the name of the emulated machine
(`C64', `C128', `PET', + `CBM-II' or `VIC20') and
`BOOTPATH' is the directory where the +@@ -1221,10 +1221,10 @@ + + /usr/local/bin/x64
example
then the value will be
+ +- /usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
++ /usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64
+ example
And system files will be searched for under the following + directories,
in the specified order:
+- `/usr/local/lib/VICE/C64'
++ `/usr/local/lib64/VICE/C64'
+ + `$HOME/.vice/C64'
+ +@@ -3542,7 +3542,7 @@ + LIBDIR/EMUID:$HOME/.vice/EMUID:BOOTPATH/EMUID:LIBDIR/DRIVES:$HOME/.vice/DRIVES:BOOTPATH/DRIVES
+
where:
+ `LIBDIR' is the VICE installation directory (usually
+- `/usr/local/lib/vice', `/usr/lib/vice' or
`/opt/vice/lib');
++ `/usr/local/lib64/vice', `/usr/lib64/vice' or
`/opt/vice/lib');
+ + `EMUID' is the emulation identification
string (`C64', `C128', + `VIC20' or `PET');
+diff -Naur vice-2.3.12.orig/doc/vice.texi vice-2.3.12/doc/vice.texi +--- vice-2.3.12.orig/doc/vice.texi 2011-11-27 21:01:24.000000000 +0100 ++++ vice-2.3.12/doc/vice.texi 2011-12-23 12:22:05.162190237 +0100 +@@ -1320,7 +1320,7 @@ + default value is + + @example +-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU ++PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU + @end example + + Where @code{PREFIX} is the installation prefix (usually +@@ -1339,7 +1339,7 @@ + then the value will be + + @example +-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 ++/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 + @end example + + And system files will be searched for under the following directories, +@@ -1347,7 +1347,7 @@ + + @enumerate 1 + @item +-@code{/usr/local/lib/VICE/C64} ++@code{/usr/local/lib64/VICE/C64} + @item + @code{$HOME/.vice/C64} + @item +diff -Naur vice-2.3.12.orig/doc/vice.txt vice-2.3.12/doc/vice.txt +--- vice-2.3.12.orig/doc/vice.txt 2011-11-28 12:43:23.000000000 +0100 ++++ vice-2.3.12/doc/vice.txt 2011-12-23 12:22:05.166190239 +0100 +@@ -1035,7 +1035,7 @@ + `Directory' resource, which is a colon (`:')-separated search path + list, like the UNIX `PATH' environment variable. The default value is + +-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU ++PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU + + Where `PREFIX' is the installation prefix (usually `/usr/local'), + `EMU' is the name of the emulated machine (`C64', `C128', `PET', +@@ -1049,12 +1049,12 @@ + + then the value will be + +-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 ++/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 + + And system files will be searched for under the following + directories, in the specified order: + +-1. `/usr/local/lib/VICE/C64' ++1. `/usr/local/lib64/VICE/C64' + + 2. `$HOME/.vice/C64' + +diff -Naur vice-2.3.12.orig/src/arch/sdl/archdep_unix.h vice-2.3.12/src/arch/sdl/archdep_unix.h +--- vice-2.3.12.orig/src/arch/sdl/archdep_unix.h 2011-07-21 05:10:28.000000000 +0200 ++++ vice-2.3.12/src/arch/sdl/archdep_unix.h 2011-12-23 12:22:05.167190238 +0100 +@@ -88,7 +88,7 @@ + #ifdef __NetBSD__ + #define LIBDIR PREFIX "/share/vice" + #else +-#define LIBDIR PREFIX "/lib/vice" ++#define LIBDIR PREFIX "/lib64/vice" + #endif + + #if defined(__FreeBSD__) || defined(__NetBSD__) +diff -Naur vice-2.3.12.orig/src/arch/unix/archdep.h vice-2.3.12/src/arch/unix/archdep.h +--- vice-2.3.12.orig/src/arch/unix/archdep.h 2010-10-06 18:17:43.000000000 +0200 ++++ vice-2.3.12/src/arch/unix/archdep.h 2011-12-23 12:22:05.167190238 +0100 +@@ -127,7 +127,7 @@ + #ifdef __NetBSD__ + #define LIBDIR PREFIX "/share/vice" + #else +-#define LIBDIR PREFIX "/lib/vice" ++#define LIBDIR PREFIX "/lib64/vice" + #endif + + #if defined(__FreeBSD__) || defined(__NetBSD__) diff --git a/system/vice/patches/vice-gcc-4.4.patch b/system/vice/patches/vice-gcc-4.4.patch deleted file mode 100644 index 505d736943..0000000000 --- a/system/vice/patches/vice-gcc-4.4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/arch/unix/joy.c -+++ src/arch/unix/joy.c -@@ -124,7 +124,7 @@ - #define JS_DATA_TYPE joystick - #define JS_RETURN sizeof(struct joystick) - int use_old_api=1; --#elif -+#else - #error Unknown Joystick - #endif - diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index ea0180229a..c507067c99 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=vice -VERSION=2.1 +VERSION=${VERSION:-2.3.12} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,7 +62,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z cd $PRGNAM-$VERSION chown -R root:root . find . \ @@ -71,16 +71,15 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Use /usr/lib64 on 64-bit Slackware +[ "$ARCH" == "x86_64" ] && patch -p1 < $CWD/patches/vice-2.3.12-x86_64.patch + +sh autogen.sh || true + # Set the help path correctly with respect to the actually installed doc # folder (the folder set up by "make install" is quite broken). patch -p1 <$CWD/patches/vice-fix-help.patch -# Use /usr/lib64 on 64-bit Slackware -[ "$ARCH" == "x86_64" ] && patch -p1 < $CWD/patches/vice-2.1-64bit.patch - -# patch for gcc 4.4 -patch -p0 < $CWD/patches/vice-gcc-4.4.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/vice/vice.info b/system/vice/vice.info index 2e02290c32..eeb764d911 100644 --- a/system/vice/vice.info +++ b/system/vice/vice.info @@ -1,10 +1,10 @@ PRGNAM="vice" -VERSION="2.1" +VERSION="2.3.12" HOMEPAGE="http://www.viceteam.org/" -DOWNLOAD="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.1.tar.gz" -MD5SUM="a4cca1aad12e12ac7f37d6c85310ade8" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/vice-2.3.12.tar.xz" +MD5SUM="268e524f4cf4eb9441e257990698066c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Eric B. Pratt" EMAIL="eric.b.pratt@gmail.com" -APPROVED="rworkman" +APPROVED="" |
