diff options
Diffstat (limited to 'network')
82 files changed, 1833 insertions, 222 deletions
diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild index 2f2b6b1886..04431cc0ab 100644 --- a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild +++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager-openconnect -VERSION=${VERSION:-0.9.8.4} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect.info b/network/NetworkManager-openconnect/NetworkManager-openconnect.info index 2733d7beb3..d11fdaa225 100644 --- a/network/NetworkManager-openconnect/NetworkManager-openconnect.info +++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager-openconnect" -VERSION="0.9.8.4" +VERSION="1.0.2" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-0.9.8.4.tar.xz" -MD5SUM="1afe9d5bfe5222d7ba2cdd88840695c9" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/1.0/NetworkManager-openconnect-1.0.2.tar.xz" +MD5SUM="90e5bdbcf976558a6eb4756fb62b641e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="openconnect" diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild index 6fc156beac..554c923ed3 100644 --- a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild +++ b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager-openvpn -VERSION=${VERSION:-0.9.8.4} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.info b/network/NetworkManager-openvpn/NetworkManager-openvpn.info index ef5e1a87c4..beef3cfc2c 100644 --- a/network/NetworkManager-openvpn/NetworkManager-openvpn.info +++ b/network/NetworkManager-openvpn/NetworkManager-openvpn.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager-openvpn" -VERSION="0.9.8.4" +VERSION="1.0.2" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-0.9.8.4.tar.xz" -MD5SUM="afe11c50ce63bd251e50a2f1b20af654" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.0/NetworkManager-openvpn-1.0.2.tar.xz" +MD5SUM="511eae0d4ac17c6d2659a3da2646296f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild index b2a06dd4f5..d47d1376e5 100644 --- a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild +++ b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager-pptp -VERSION=${VERSION:-0.9.8.4} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.info b/network/NetworkManager-pptp/NetworkManager-pptp.info index 05ccb6e344..f2f2e1d05b 100644 --- a/network/NetworkManager-pptp/NetworkManager-pptp.info +++ b/network/NetworkManager-pptp/NetworkManager-pptp.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager-pptp" -VERSION="0.9.8.4" +VERSION="1.0.2" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-0.9.8.4.tar.xz" -MD5SUM="2d1f48ab2383aaba1cc4acb43a187320" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/1.0/NetworkManager-pptp-1.0.2.tar.xz" +MD5SUM="1e3bf62f7971d356c76f6a7fb094e20a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pptp" diff --git a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild index 93c98e2ac1..8570d4c709 100644 --- a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild +++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager-vpnc -VERSION=${VERSION:-0.9.8.6} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/NetworkManager-vpnc/NetworkManager-vpnc.info b/network/NetworkManager-vpnc/NetworkManager-vpnc.info index c237012226..945823e235 100644 --- a/network/NetworkManager-vpnc/NetworkManager-vpnc.info +++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager-vpnc" -VERSION="0.9.8.6" +VERSION="1.0.2" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-0.9.8.6.tar.xz" -MD5SUM="ae7751aa3738fcd954d863d25e3720e2" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/1.0/NetworkManager-vpnc-1.0.2.tar.xz" +MD5SUM="24560f75ec9f1a45bc10192c3c431417" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="vpnc" diff --git a/network/airpwn/airpwn.SlackBuild b/network/airpwn/airpwn.SlackBuild index da190bd1dc..b09a5958d5 100644 --- a/network/airpwn/airpwn.SlackBuild +++ b/network/airpwn/airpwn.SlackBuild @@ -86,7 +86,7 @@ done sed -i "s|Python2.4|Python${PYTHON_VERSION1}|g" configure.ac sed -i "s|PYTHON2_4|PYTHON${PYTHON_VERSION2}|g" config.h.in -autoreconf +autoreconf -vif CFLAGS="$SLKCFLAGS" \ LDFLAGS="-L${PKG}/usr/lib${LIBDIRSUFFIX}" \ diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild index f478df2952..8f9dcfe8ef 100644 --- a/network/avahi/avahi.SlackBuild +++ b/network/avahi/avahi.SlackBuild @@ -99,6 +99,11 @@ find -L . \ # Thanks to Robby Workman for this patch. patch -p1 --verbose < $CWD/fixup_avahi-dnsconfd.action.patch +# Permit deprecated functions, see https://bugzilla.redhat.com/show_bug.cgi?id=1001676#c9 +# There's a cmake option for this, but no configure option, +# so thanks to Arch Linux for this one-liner: +sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.* + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/chromium/chromium.SlackBuild b/network/chromium/chromium.SlackBuild index 1052a4997f..f8b8f0dff1 100644 --- a/network/chromium/chromium.SlackBuild +++ b/network/chromium/chromium.SlackBuild @@ -114,6 +114,8 @@ build/gyp_chromium -f make build/all.gyp --depth=. \ -Duse_system_yasm=1 \ -Ddisable_nacl=1 \ -Drelease_extra_cflags="$CFLAGS" \ + -Dsystem_libdir=lib64 \ + -Dpython_ver=2.7 \ $DDSSE make chrome chrome_sandbox BUILDTYPE=Release V=1 diff --git a/network/dwb/dwb.SlackBuild b/network/dwb/dwb.SlackBuild index 3a84b368b5..c60ae28851 100644 --- a/network/dwb/dwb.SlackBuild +++ b/network/dwb/dwb.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for dwb by Marcin Herda <mherda@slackword.net> PRGNAM=dwb -VERSION=${VERSION:-2013.03.30} +VERSION=${VERSION:-20150419_8ba11e5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/dwb/dwb.info b/network/dwb/dwb.info index f9100e012d..ffb4f91c1b 100644 --- a/network/dwb/dwb.info +++ b/network/dwb/dwb.info @@ -1,8 +1,8 @@ PRGNAM="dwb" -VERSION="2013.03.30" +VERSION="20150419_8ba11e5" HOMEPAGE="http://portix.bitbucket.org/dwb/" -DOWNLOAD="https://bitbucket.org/portix/dwb/downloads/dwb-2013.03.30.tar.gz" -MD5SUM="bed54418cc6a560e3e6818e44e52a7bb" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/dwb-20150419_8ba11e5.tar.gz" +MD5SUM="65f3dd6352989feedf94e9a07e2c23d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="webkitgtk json-c" diff --git a/network/ekiga/ekiga.SlackBuild b/network/ekiga/ekiga.SlackBuild index b9c274a1a2..1496a539af 100644 --- a/network/ekiga/ekiga.SlackBuild +++ b/network/ekiga/ekiga.SlackBuild @@ -107,6 +107,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Fix for -current (20150722 dbs) +sed -e 's/gnome-icon-theme/adwaita-icon-theme/g' -i configure.ac +autoconf + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/filezilla-old/README b/network/filezilla-old/README new file mode 100644 index 0000000000..79ca6a496f --- /dev/null +++ b/network/filezilla-old/README @@ -0,0 +1,10 @@ +FileZilla Client is a fast and reliable cross-platform FTP, FTPS and +SFTP client with lots of useful features and an intuitive graphical +user interface. + +tinyxml is an optional dependency - to use an installed version of +tinyxml, run the script as "TINYXML=yes ./filezilla.SlackBuild" +otherwise, the build will use an included copy of tinyxml. + +*NOTE* +this conflicts with the filezilla script: install only one of the two! diff --git a/network/filezilla-old/doinst.sh b/network/filezilla-old/doinst.sh new file mode 100644 index 0000000000..9830478e8c --- /dev/null +++ b/network/filezilla-old/doinst.sh @@ -0,0 +1,14 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/network/filezilla-old/filezilla-old.SlackBuild b/network/filezilla-old/filezilla-old.SlackBuild new file mode 100644 index 0000000000..d8c48759d8 --- /dev/null +++ b/network/filezilla-old/filezilla-old.SlackBuild @@ -0,0 +1,121 @@ +#!/bin/sh +# Slackware build script for filezilla-old + +# Copyright 2007-2009 Grigorios Bouzakis <grbzks@xsmail.com> +# Copyright 2010-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2015 Matteo Bernardini <ponce@slackbuilds.org> +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for any purpose +# with or without fee is hereby granted, provided that the above copyright +# notice and this permission notice appear in all copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=filezilla-old +SRCNAM=filezilla +VERSION=${VERSION:-3.8.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 GPL.html" + +# Check if we have tinyxml package +if [ "${TINYXML:-no}" = "yes" ]; then + tinyxml="" +else + tinyxml="--with-tinyxml=builtin" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/FileZilla_${VERSION}_src.tar.bz2 +cd $SRCNAM-$VERSION +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Added LDFLAGS to make it compilable, thanks to LQ +# http://www.linuxquestions.org/questions/slackware-14/libsndfile-from-slackbuilds-org-fails-to-build-695456/ +LDFLAGS="-ldl" \ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$SRCNAM-$VERSION \ + --disable-static \ + --disable-manualupdatecheck \ + --disable-autoupdatecheck \ + --enable-locales \ + $tinyxml \ + --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/$SRCNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$SRCNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$SRCNAM-$VERSION/$PRGNAM.SlackBuild +mv $PKG/usr/share/$SRCNAM/docs/fzdefaults.xml.example $PKG/usr/doc/$SRCNAM-$VERSION +# remove empty docdir +rmdir $PKG/usr/share/$SRCNAM/docs + +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/filezilla-old/filezilla-old.info b/network/filezilla-old/filezilla-old.info new file mode 100644 index 0000000000..86a2996fba --- /dev/null +++ b/network/filezilla-old/filezilla-old.info @@ -0,0 +1,10 @@ +PRGNAM="filezilla-old" +VERSION="3.8.1" +HOMEPAGE="http://filezilla-project.org/" +DOWNLOAD="http://downloads.sourceforge.net/filezilla/FileZilla_3.8.1_src.tar.bz2" +MD5SUM="b4bce64b8db97419cfefa04468afc9fb" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="wxPython" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/network/filezilla-old/slack-desc b/network/filezilla-old/slack-desc new file mode 100644 index 0000000000..b61fb01016 --- /dev/null +++ b/network/filezilla-old/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------------------------------------------------------| +filezilla-old: filezilla-old (the free FTP solution) +filezilla-old: +filezilla-old: FileZilla is a fast and reliable cross-platform FTP, FTPS, and SFTP +filezilla-old: client with lots of useful features and an intuitive user interface. +filezilla-old: +filezilla-old: This is the last version still depending on wxPython (newer ones +filezilla-old: depend on wxGTK3). +filezilla-old: +filezilla-old: homepage: http://filezilla-project.org +filezilla-old: +filezilla-old: diff --git a/network/heimdal/heimdal.SlackBuild b/network/heimdal/heimdal.SlackBuild index 6ea71738e8..fe121bbff0 100644 --- a/network/heimdal/heimdal.SlackBuild +++ b/network/heimdal/heimdal.SlackBuild @@ -59,6 +59,7 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS="-lpthread" \ ./configure \ --prefix=/usr/heimdal \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/icecat/icecat.SlackBuild b/network/icecat/icecat.SlackBuild index 63945b42b5..8e206d5c3d 100644 --- a/network/icecat/icecat.SlackBuild +++ b/network/icecat/icecat.SlackBuild @@ -86,15 +86,12 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/${PRGNAM}-$VERSION-gnu1.tar.bz2 cd ${PRGNAM}-$VERSION -# Fix a long standing bug that's prevented staying current on GTK+. -# Thanks to the BLFS folks. :-) -cat << EOF >> layout/build/Makefile.in - -ifdef MOZ_ENABLE_CANVAS -EXTRA_DSO_LDOPTS += \$(XLDFLAGS) -lX11 -lXrender -endif - -EOF +# Fix building with gcc-4.9.x +# https://bugzilla.mozilla.org/show_bug.cgi?id=999496 +# Patch for freetype-2.6 +# https://bugzilla.mozilla.org/show_bug.cgi?id=1143411 +# Fix various CVEs +for i in $CWD/patches/* ; do patch -p1 < $i ; done chown -R root:root . find -L . \ diff --git a/network/icecat/patches/999496.patch b/network/icecat/patches/999496.patch new file mode 100644 index 0000000000..b8d161b8cf --- /dev/null +++ b/network/icecat/patches/999496.patch @@ -0,0 +1,56 @@ +--- a/content/media/MediaData.cpp ++++ a/content/media/MediaData.cpp +@@ -33,16 +33,26 @@ AudioData::EnsureAudioBuffer() + AudioDataValue* data = static_cast<AudioDataValue*>(mAudioBuffer->Data()); + for (uint32_t i = 0; i < mFrames; ++i) { + for (uint32_t j = 0; j < mChannels; ++j) { + data[j*mFrames + i] = mAudioData[i*mChannels + j]; + } + } + } + ++size_t ++AudioData::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const ++{ ++ size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData); ++ if (mAudioBuffer) { ++ size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf); ++ } ++ return size; ++} ++ + static bool + ValidatePlane(const VideoData::YCbCrBuffer::Plane& aPlane) + { + return aPlane.mWidth <= PlanarYCbCrImage::MAX_DIMENSION && + aPlane.mHeight <= PlanarYCbCrImage::MAX_DIMENSION && + aPlane.mWidth * aPlane.mHeight < MAX_VIDEO_WIDTH * MAX_VIDEO_HEIGHT && + aPlane.mStride > 0; + } +--- a/content/media/MediaData.h ++++ a/content/media/MediaData.h +@@ -75,23 +75,17 @@ public: + MOZ_COUNT_CTOR(AudioData); + } + + ~AudioData() + { + MOZ_COUNT_DTOR(AudioData); + } + +- size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const { +- size_t size = aMallocSizeOf(this) + aMallocSizeOf(mAudioData); +- if (mAudioBuffer) { +- size += mAudioBuffer->SizeOfIncludingThis(aMallocSizeOf); +- } +- return size; +- } ++ size_t SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const; + + // If mAudioBuffer is null, creates it from mAudioData. + void EnsureAudioBuffer(); + + const uint32_t mFrames; + const uint32_t mChannels; + // At least one of mAudioBuffer/mAudioData must be non-null. + // mChannels channels, each with mFrames frames diff --git a/network/icecat/patches/freetype26.patch b/network/icecat/patches/freetype26.patch new file mode 100644 index 0000000000..c1eb494972 --- /dev/null +++ b/network/icecat/patches/freetype26.patch @@ -0,0 +1,30 @@ + +# HG changeset patch +# User NiLuJe <ninuje@gmail.com> +# Date 1426721573 14400 +# Node ID afd840d66e6a775dc2ed35dd3add01ff07f950fe +# Parent 35515400af363bfc141353acd474814567c43c54 +Bug 1143411 - Fix build against latest freetype code. r=glandium + +diff --git a/config/system-headers b/config/system-headers +--- a/config/system-headers ++++ b/config/system-headers +@@ -465,16 +465,17 @@ freetype/tttables.h + freetype/t1tables.h + freetype/ftlcdfil.h + freetype/ftsizes.h + freetype/ftadvanc.h + freetype/ftbitmap.h + freetype/ftxf86.h + freetype.h + ftcache.h ++ftfntfmt.h + ftglyph.h + ftsynth.h + ftoutln.h + ttnameid.h + tttables.h + t1tables.h + ftlcdfil.h + ftsizes.h + diff --git a/network/icecat/patches/icecat-CVE-2015-4473-partial.patch b/network/icecat/patches/icecat-CVE-2015-4473-partial.patch new file mode 100644 index 0000000000..184a8c5092 --- /dev/null +++ b/network/icecat/patches/icecat-CVE-2015-4473-partial.patch @@ -0,0 +1,120 @@ +Backported to icecat-31.8 from the upstream esr38 branch. + +From 1a7eac06fab3b8ffca09936498887f99e233bcba Mon Sep 17 00:00:00 2001 +From: Randell Jesup <rjesup@jesup.org> +Date: Thu, 9 Jul 2015 20:18:34 -0400 +Subject: [PATCH] Bug 1178890 - Update timer arrays after sleep to account for + time sleeping. r=bwc, r=froydnj, a=sledru + +--- icecat-31.8.0/xpcom/threads/TimerThread.cpp.orig 1969-12-31 19:00:00.000000000 -0500 ++++ icecat-31.8.0/xpcom/threads/TimerThread.cpp 2015-08-12 16:38:11.789371171 -0400 +@@ -28,7 +28,8 @@ + mShutdown(false), + mWaiting(false), + mNotified(false), +- mSleeping(false) ++ mSleeping(false), ++ mLastTimerEventLoopRun(TimeStamp::Now()) + { + } + +@@ -222,6 +223,7 @@ + } else { + waitFor = PR_INTERVAL_NO_TIMEOUT; + TimeStamp now = TimeStamp::Now(); ++ mLastTimerEventLoopRun = now; + nsTimerImpl *timer = nullptr; + + if (!mTimers.IsEmpty()) { +@@ -411,6 +413,7 @@ + // This function must be called from within a lock + int32_t TimerThread::AddTimerInternal(nsTimerImpl *aTimer) + { ++ mMonitor.AssertCurrentThreadOwns(); + if (mShutdown) + return -1; + +@@ -434,6 +437,7 @@ + + bool TimerThread::RemoveTimerInternal(nsTimerImpl *aTimer) + { ++ mMonitor.AssertCurrentThreadOwns(); + if (!mTimers.RemoveElement(aTimer)) + return false; + +@@ -443,6 +447,10 @@ + + void TimerThread::ReleaseTimerInternal(nsTimerImpl *aTimer) + { ++ if (!mShutdown) { ++ // copied to a local array before releasing in shutdown ++ mMonitor.AssertCurrentThreadOwns(); ++ } + // Order is crucial here -- see nsTimerImpl::Release. + aTimer->mArmed = false; + NS_RELEASE(aTimer); +@@ -450,21 +458,39 @@ + + void TimerThread::DoBeforeSleep() + { ++ // Mainthread ++ MonitorAutoLock lock(mMonitor); ++ mLastTimerEventLoopRun = TimeStamp::Now(); + mSleeping = true; + } + ++// Note: wake may be notified without preceding sleep notification + void TimerThread::DoAfterSleep() + { +- mSleeping = true; // wake may be notified without preceding sleep notification ++ // Mainthread ++ TimeStamp now = TimeStamp::Now(); ++ ++ MonitorAutoLock lock(mMonitor); ++ ++ // an over-estimate of time slept, usually small ++ TimeDuration slept = now - mLastTimerEventLoopRun; ++ ++ // Adjust all old timers to expire roughly similar times in the future ++ // compared to when we went to sleep, by adding the time we slept to the ++ // target time. It's slightly possible a few will end up slightly in the ++ // past and fire immediately, but ordering should be preserved. All ++ // timers retain the exact same order (and relative times) as before ++ // going to sleep. + for (uint32_t i = 0; i < mTimers.Length(); i ++) { + nsTimerImpl *timer = mTimers[i]; +- // get and set the delay to cause its timeout to be recomputed +- uint32_t delay; +- timer->GetDelay(&delay); +- timer->SetDelay(delay); ++ timer->mTimeout += slept; + } +- + mSleeping = false; ++ mLastTimerEventLoopRun = now; ++ ++ // Wake up the timer thread to process the updated array ++ mNotified = true; ++ mMonitor.Notify(); + } + + +--- icecat-31.8.0/xpcom/threads/TimerThread.h.orig 1969-12-31 19:00:00.000000000 -0500 ++++ icecat-31.8.0/xpcom/threads/TimerThread.h 2015-08-12 16:38:38.542408062 -0400 +@@ -59,7 +59,7 @@ + mozilla::Atomic<bool> mInitInProgress; + bool mInitialized; + +- // These two internal helper methods must be called while mLock is held. ++ // These two internal helper methods must be called while mMonitor is held. + // AddTimerInternal returns the position where the timer was added in the + // list, or -1 if it failed. + int32_t AddTimerInternal(nsTimerImpl *aTimer); +@@ -73,6 +73,7 @@ + bool mWaiting; + bool mNotified; + bool mSleeping; ++ TimeStamp mLastTimerEventLoopRun; + + nsTArray<nsTimerImpl*> mTimers; + }; diff --git a/network/icecat/patches/icecat-CVE-2015-4482.patch b/network/icecat/patches/icecat-CVE-2015-4482.patch new file mode 100644 index 0000000000..41f0a3d0fc --- /dev/null +++ b/network/icecat/patches/icecat-CVE-2015-4482.patch @@ -0,0 +1,28 @@ +From 932a017c745d40d661602f6145c95c9226d8450d Mon Sep 17 00:00:00 2001 +From: Stephen Pohl <spohl.mozilla.bugs@gmail.com> +Date: Sat, 18 Jul 2015 18:42:15 -0700 +Subject: [PATCH] Bug 1184500 - Improve handling of index names in MAR files. + r=rstrong, a=lmandel + +--- + modules/libmar/src/mar_read.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/modules/libmar/src/mar_read.c b/modules/libmar/src/mar_read.c +index c647370..2013b0f 100644 +--- a/modules/libmar/src/mar_read.c ++++ b/modules/libmar/src/mar_read.c +@@ -96,6 +96,10 @@ static int mar_consume_index(MarFile *mar, char **buf, const char *buf_end) { + ++(*buf); + } + namelen = (*buf - name); ++ /* must ensure that namelen is valid */ ++ if (namelen < 0) { ++ return -1; ++ } + /* consume null byte */ + if (*buf == buf_end) + return -1; +-- +2.4.3 + diff --git a/network/icecat/patches/icecat-CVE-2015-4488.patch b/network/icecat/patches/icecat-CVE-2015-4488.patch new file mode 100644 index 0000000000..cee0905be0 --- /dev/null +++ b/network/icecat/patches/icecat-CVE-2015-4488.patch @@ -0,0 +1,21 @@ +Backported to icecat-31.8 from the upstream esr38 branch. + +From 103fb14ff54753305508448ba0e374247a463552 Mon Sep 17 00:00:00 2001 +From: Daniel Holbert <dholbert@cs.stanford.edu> +Date: Fri, 19 Jun 2015 15:56:12 -0700 +Subject: [PATCH] Bug 1176270 - Handle self-assignment in + StyleAnimationValue::operator=. r=dbaron, a=sledru + +--- icecat-31.8.0/layout/style/nsStyleAnimation.cpp.orig 1969-12-31 19:00:00.000000000 -0500 ++++ icecat-31.8.0/layout/style/nsStyleAnimation.cpp 2015-08-12 16:00:39.418122049 -0400 +@@ -3517,6 +3517,10 @@ + nsStyleAnimation::Value& + nsStyleAnimation::Value::operator=(const Value& aOther) + { ++ if (this == &aOther) { ++ return *this; ++ } ++ + FreeValue(); + + mUnit = aOther.mUnit; diff --git a/network/icecat/patches/icecat-CVE-2015-4489.patch b/network/icecat/patches/icecat-CVE-2015-4489.patch new file mode 100644 index 0000000000..4140891e3a --- /dev/null +++ b/network/icecat/patches/icecat-CVE-2015-4489.patch @@ -0,0 +1,21 @@ +Backported to icecat-31.8 from the upstream esr38 branch. + +From 95231c1bca9c9495393b795513bea71a21a6ec2f Mon Sep 17 00:00:00 2001 +From: Birunthan Mohanathas <birunthan@mohanathas.com> +Date: Tue, 21 Jul 2015 09:42:58 -0700 +Subject: [PATCH] Bug 1182723 - Properly handle self-assignment in + nsTArray::operator=. r=mccr8, a=abillings + +--- icecat-31.8.0/xpcom/glue/nsTArray.h.orig 2015-08-12 16:03:56.353746969 -0400 ++++ icecat-31.8.0/xpcom/glue/nsTArray.h 2015-08-12 16:06:52.144553848 -0400 +@@ -811,7 +811,9 @@ + // array. It is optimized to reuse existing storage if possible. + // @param other The array object to copy. + self_type& operator=(const self_type& other) { +- ReplaceElementsAt(0, Length(), other.Elements(), other.Length()); ++ if (this != &other) { ++ ReplaceElementsAt(0, Length(), other.Elements(), other.Length()); ++ } + return *this; + } + diff --git a/network/icecat/patches/icecat-CVE-2015-4491.patch b/network/icecat/patches/icecat-CVE-2015-4491.patch new file mode 100644 index 0000000000..c16885cfc7 --- /dev/null +++ b/network/icecat/patches/icecat-CVE-2015-4491.patch @@ -0,0 +1,41 @@ +From c154557bc0aa7e310824717f3e829dd82e6726e4 Mon Sep 17 00:00:00 2001 +From: Lee Salzman <lsalzman@mozilla.com> +Date: Tue, 21 Jul 2015 13:16:44 -0400 +Subject: [PATCH] Bug 1184009 - Limit image preview sizes. r=acomminos, + a=lmandel + +--HG-- +extra : transplant_source : %9B%86%13%60%B2%97%F1%8Fb%CB%9C%8D%FBWo%C9%EBPs1 +--- + widget/gtk/nsFilePicker.cpp | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp +index 0b5a8dc..3c0d543 100644 +--- a/widget/gtk/nsFilePicker.cpp ++++ b/widget/gtk/nsFilePicker.cpp +@@ -101,13 +101,16 @@ UpdateFilePreviewWidget(GtkFileChooser *file_chooser, + return; + } + +- GdkPixbuf *preview_pixbuf; ++ GdkPixbuf *preview_pixbuf = nullptr; + // Only scale down images that are too big + if (preview_width > MAX_PREVIEW_SIZE || preview_height > MAX_PREVIEW_SIZE) { +- preview_pixbuf = gdk_pixbuf_new_from_file_at_size(image_filename, +- MAX_PREVIEW_SIZE, +- MAX_PREVIEW_SIZE, +- nullptr); ++ if (ceil(preview_width / double(MAX_PREVIEW_SIZE) + 1.0) * ++ ceil(preview_height / double(MAX_PREVIEW_SIZE) + 1.0) < 0x7FFFFF) { ++ preview_pixbuf = gdk_pixbuf_new_from_file_at_size(image_filename, ++ MAX_PREVIEW_SIZE, ++ MAX_PREVIEW_SIZE, ++ nullptr); ++ } + } + else { + preview_pixbuf = gdk_pixbuf_new_from_file(image_filename, nullptr); +-- +2.4.3 + diff --git a/network/icecat/patches/icecat-CVE-2015-4492.patch b/network/icecat/patches/icecat-CVE-2015-4492.patch new file mode 100644 index 0000000000..5d401f5a32 --- /dev/null +++ b/network/icecat/patches/icecat-CVE-2015-4492.patch @@ -0,0 +1,81 @@ +From 9d5f21ee3a754d20bca4513f55553ea6694a7b25 Mon Sep 17 00:00:00 2001 +From: Andrea Marchesini <amarchesini@mozilla.com> +Date: Wed, 29 Jul 2015 16:10:15 -0400 +Subject: [PATCH] Bug 1185820 - XMLHttpRequest::Open() in worker should count + the recursion using a uint32_t and not a boolean. r=khuey, a=lmandel + +--HG-- +extra : transplant_source : %8F%89%24%FF%A1%F7d%5B%BE%E9%FC3%C6%E1%AC%27r%5Eq%16 +extra : histedit_source : 5857f0cedf1cfb5361e6f404a094719814a2b415 +--- + dom/workers/XMLHttpRequest.cpp | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) + +diff --git a/dom/workers/XMLHttpRequest.cpp b/dom/workers/XMLHttpRequest.cpp +index aac97ab..7099279 100644 +--- a/dom/workers/XMLHttpRequest.cpp ++++ b/dom/workers/XMLHttpRequest.cpp +@@ -100,6 +100,7 @@ public: + // Only touched on the worker thread. + uint32_t mOuterEventStreamId; + uint32_t mOuterChannelId; ++ uint32_t mOpenCount; + uint64_t mLastLoaded; + uint64_t mLastTotal; + uint64_t mLastUploadLoaded; +@@ -109,7 +110,6 @@ public: + bool mLastUploadLengthComputable; + bool mSeenLoadStart; + bool mSeenUploadLoadStart; +- bool mOpening; + + // Only touched on the main thread. + bool mUploadEventListenersAttached; +@@ -122,10 +122,10 @@ public: + : mWorkerPrivate(nullptr), mXMLHttpRequestPrivate(aXHRPrivate), + mMozAnon(aMozAnon), mMozSystem(aMozSystem), + mInnerEventStreamId(0), mInnerChannelId(0), mOutstandingSendCount(0), +- mOuterEventStreamId(0), mOuterChannelId(0), mLastLoaded(0), mLastTotal(0), +- mLastUploadLoaded(0), mLastUploadTotal(0), mIsSyncXHR(false), ++ mOuterEventStreamId(0), mOuterChannelId(0), mOpenCount(0), mLastLoaded(0), ++ mLastTotal(0), mLastUploadLoaded(0), mLastUploadTotal(0), mIsSyncXHR(false), + mLastLengthComputable(false), mLastUploadLengthComputable(false), +- mSeenLoadStart(false), mSeenUploadLoadStart(false), mOpening(false), ++ mSeenLoadStart(false), mSeenUploadLoadStart(false), + mUploadEventListenersAttached(false), mMainThreadSeenLoadStart(false), + mInOpen(false), mArrayBufferResponseWasTransferred(false) + { } +@@ -1850,7 +1850,7 @@ XMLHttpRequest::SendInternal(const nsAString& aStringBody, + mWorkerPrivate->AssertIsOnWorkerThread(); + + // No send() calls when open is running. +- if (mProxy->mOpening) { ++ if (mProxy->mOpenCount) { + aRv.Throw(NS_ERROR_FAILURE); + return; + } +@@ -1945,15 +1945,17 @@ XMLHttpRequest::Open(const nsACString& aMethod, const nsAString& aUrl, + mBackgroundRequest, mWithCredentials, + mTimeout); + +- mProxy->mOpening = true; ++ ++mProxy->mOpenCount; + if (!runnable->Dispatch(mWorkerPrivate->GetJSContext())) { +- mProxy->mOpening = false; +- ReleaseProxy(); ++ if (!--mProxy->mOpenCount) { ++ ReleaseProxy(); ++ } ++ + aRv.Throw(NS_ERROR_FAILURE); + return; + } + +- mProxy->mOpening = false; ++ --mProxy->mOpenCount; + mProxy->mIsSyncXHR = !aAsync; + } + +-- +2.4.3 + diff --git a/network/icecat/patches/icecat-CVE-2015-4495.patch b/network/icecat/patches/icecat-CVE-2015-4495.patch new file mode 100644 index 0000000000..e7514d9a5e --- /dev/null +++ b/network/icecat/patches/icecat-CVE-2015-4495.patch @@ -0,0 +1,28 @@ +Backported from upstream commits labelled "Bug 1178058" from the esr38 branch +by Boris Zbarsky <bzbarsky@mit.edu> and Bobby Holley <bobbyholley@gmail.com>. + +--- icecat-31.8.0/docshell/base/nsDocShell.cpp ++++ icecat-31.8.0/docshell/base/nsDocShell.cpp +@@ -1546,12 +1546,21 @@ + + if (owner && mItemType != typeChrome) { + nsCOMPtr<nsIPrincipal> ownerPrincipal = do_QueryInterface(owner); +- if (nsContentUtils::IsSystemOrExpandedPrincipal(ownerPrincipal)) { ++ if (nsContentUtils::IsSystemPrincipal(ownerPrincipal)) { + if (ownerIsExplicit) { + return NS_ERROR_DOM_SECURITY_ERR; + } + owner = nullptr; + inheritOwner = true; ++ } else if (nsContentUtils::IsExpandedPrincipal(ownerPrincipal)) { ++ if (ownerIsExplicit) { ++ return NS_ERROR_DOM_SECURITY_ERR; ++ } ++ // Don't inherit from the current page. Just do the safe thing ++ // and pretend that we were loaded by a nullprincipal. ++ owner = do_CreateInstance("@mozilla.org/nullprincipal;1"); ++ NS_ENSURE_TRUE(owner, NS_ERROR_FAILURE); ++ inheritOwner = false; + } + } + if (!owner && !inheritOwner && !ownerIsExplicit) { diff --git a/network/kadu/kadu.SlackBuild b/network/kadu/kadu.SlackBuild index 83402980ec..b24650c777 100644 --- a/network/kadu/kadu.SlackBuild +++ b/network/kadu/kadu.SlackBuild @@ -49,9 +49,10 @@ find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; patch -p1 < $CWD/kadu.patch + mkdir -p build cd build cmake .. \ @@ -76,11 +77,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 # Remove all license files -find $(INSTALL_DIR) -name '[lL][iI][cC][eE][nN][sS][eE].txt' -delete +find "$PKG" -name '[lL][iI][cC][eE][nN][sS][eE].txt' -delete # Move cmake files in the proper place mv $PKG/usr/share/cmake \ - $PKG/usr/share/cmake-$(cmake --version | cut -d\ -f3 | cut -d. -f1-2) + $PKG/usr/share/cmake-$(cmake --version | head -1 | cut -d\ -f3 | cut -d. -f1-2) # Move this away too... mv $PKG/usr/sdk $PKG/usr/share/$PRGNAM/ diff --git a/network/libnftnl/README b/network/libnftnl/README deleted file mode 100644 index acc52c6ece..0000000000 --- a/network/libnftnl/README +++ /dev/null @@ -1,8 +0,0 @@ -libnftnl (pre-requisite for nftables) - -libnftnl is a userspace library providing a low-level netlink interface (API) to -the in-kernel nf_tables subsystem. The library libnftnl has been previously -known as libnftables. This library is currently used by nftables. - -To benefit from libnftnl (but not to build it), you need a kernel that includes -the nf_tables subsystem (initial support >= 3.14). diff --git a/network/libnftnl/libnftnl.info b/network/libnftnl/libnftnl.info deleted file mode 100644 index f8af9ec470..0000000000 --- a/network/libnftnl/libnftnl.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libnftnl" -VERSION="1.0.3" -HOMEPAGE="http://www.netfilter.org/projects/libnftnl/" -DOWNLOAD="http://www.netfilter.org/projects/libnftnl/files/libnftnl-1.0.3.tar.bz2" -MD5SUM="203701a73cc3c51ca751d7cb2e176250" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Duncan Roe" -EMAIL="duncan_roe@acslink.net.au" diff --git a/network/libnftnl/slack-desc b/network/libnftnl/slack-desc deleted file mode 100644 index a398990b90..0000000000 --- a/network/libnftnl/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libnftnl: libnftnl (pre-requisite for nftables) -libnftnl: -libnftnl: libnftnl is a userspace library providing a low-level netlink -libnftnl: interface (API) to the in-kernel nf_tables subsystem. The library -libnftnl: libnftnl has been previously known as libnftables. This library is -libnftnl: currently used by nftables. -libnftnl: -libnftnl: To actually use libnftnl needs a kernel that includes the nf_tables -libnftnl: subsystem (initial support >= 3.14). -libnftnl: -libnftnl: Homepage: http://www.netfilter.org/projects/libnftnl/ diff --git a/network/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild index 76bae07e38..73479a16a2 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=${VERSION:-1.4.35} +VERSION=${VERSION:-1.4.36} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info index 5246876a81..c3da577aa8 100644 --- a/network/lighttpd/lighttpd.info +++ b/network/lighttpd/lighttpd.info @@ -1,8 +1,8 @@ PRGNAM="lighttpd" -VERSION="1.4.35" +VERSION="1.4.36" HOMEPAGE="http://www.lighttpd.net/" -DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.35.tar.xz" -MD5SUM="c7ae774eab4cb7ac85e41b712f4ee9ba" +DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.36.tar.xz" +MD5SUM="1843daffcb018aa528f6d15d43544654" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/netsurf/netsurf.SlackBuild b/network/netsurf/netsurf.SlackBuild index 738a5511bf..ed5e52a26a 100644 --- a/network/netsurf/netsurf.SlackBuild +++ b/network/netsurf/netsurf.SlackBuild @@ -54,14 +54,14 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-all-$VERSION.tar.gz -cd $PRGNAM-all-$VERSION +rm -rf netsurf-all-$VERSION +tar xvf $CWD/netsurf-all-$VERSION.tar.gz +cd netsurf-all-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -73,12 +73,17 @@ if [ "${NETSURF_USE_VIDEO:-NO}"=="YES" ]; then patch --verbose -p1 < $CWD/enable-deprecated.diff fi +sed \ + -e 's:_BSD_SOURCE:_DEFAULT_SOURCE:' \ + -e 's:(WARNFLAGS) -Werror:(WARNFLAGS):' \ + -i */Makefile */*/Makefile.target + make install DESTDIR=$PKG PREFIX=/usr \ NETSURF_USE_MOZJS=${NETSURF_USE_MOZJS:-YES} \ NETSURF_USE_WEBP=${NETSURF_USE_WEBP:-NO} \ NETSURF_USE_VIDEO=${NETSURF_USE_VIDEO:-NO} -mkdir $PKG/usr/share/pixmaps +mkdir -p $PKG/usr/share/pixmaps cp netsurf/gtk/res/netsurf.png $PKG/usr/share/pixmaps cp netsurf/gtk/res/netsurf.xpm $PKG/usr/share/pixmaps diff --git a/network/nft/README b/network/nft/README deleted file mode 100644 index c057392d9a..0000000000 --- a/network/nft/README +++ /dev/null @@ -1,12 +0,0 @@ -nft (nftables command-line interface) - -nftables is the project that aims to replace the existing {ip,ip6,arp,eb}tables -framework. Basically, this project provides a new packet filtering framework, a -new userspace utility and also a compatibility layer for {ip,ip6}tables. -nftables is built upon the building blocks of the Netfilter infrastructure such -as the existing hooks, the connection tracking system, the userspace queueing -component and the logging subsystem. - -In order to use nft, you need a Linux kernel >= 3.14 with nftables configured. - -nftables is currently under development, so for experimenters only! diff --git a/network/nft/nft.info b/network/nft/nft.info deleted file mode 100644 index 9da48ed502..0000000000 --- a/network/nft/nft.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nft" -VERSION="0.4" -HOMEPAGE="http://www.netfilter.org/projects/nftables/" -DOWNLOAD="http://www.netfilter.org/projects/nftables/files/nftables-0.4.tar.bz2" -MD5SUM="09b686c489ff10db670ca60dbed7ff43" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libnftnl" -MAINTAINER="Duncan Roe" -EMAIL="duncan_roe@acslink.net.au" diff --git a/network/nft/slack-desc b/network/nft/slack-desc deleted file mode 100644 index d1bf7dfe40..0000000000 --- a/network/nft/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -nft: nft (nftables command-line interface) -nft: -nft: nftables is the project that aims to replace the existing -nft: {ip,ip6,arp,eb}tables framework. Basically, this project provides a -nft: new packet filtering framework, a new userspace utility and also a -nft: compatibility layer for {ip,ip6}tables. -nft: -nft: nftables is currently under development, so for experimenters only! -nft: -nft: Homepage: http://www.netfilter.org/projects/nft/ -nft: diff --git a/network/redir/README b/network/redir/README new file mode 100644 index 0000000000..21a66f706f --- /dev/null +++ b/network/redir/README @@ -0,0 +1,3 @@ +redir is all you need to redirect traffic across firewalls. +The functionality of inetd/tcpd and "redir" will allow you to +do everything you need without screwy telnet/ftp etc gateways. diff --git a/network/redir/patches/01_fix_max_bandwidth_docs.dpatch b/network/redir/patches/01_fix_max_bandwidth_docs.dpatch new file mode 100644 index 0000000000..1ff9a7e6d5 --- /dev/null +++ b/network/redir/patches/01_fix_max_bandwidth_docs.dpatch @@ -0,0 +1,61 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_fix_max_bandwidth_docs.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix docs and --help to show --max_bandwidth instead of --maxbandwidth + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 1999-12-26 15:50:06.000000000 -0500 ++++ redir-2.2.1/redir.c 2005-10-22 21:21:56.849499952 -0400 +@@ -233,7 +233,7 @@ + #ifndef NO_SHAPER + /* options for bandwidth */ + fprintf(stderr, "\t\t--bufsize=<octets>\tsize of the buffer\n"); +- fprintf(stderr, "\t\t--maxbandwidth=<bit-per-sec>\tlimit the bandwidth\n"); ++ fprintf(stderr, "\t\t--max_bandwidth=<bit-per-sec>\tlimit the bandwidth\n"); + fprintf(stderr, "\t\t--random_wait=<millisec>\twait before each packet\n"); + fprintf(stderr, "\t\t--wait_in_out=<flag>\t1 wait for in, 2 out, 3 in&out\n"); + /* end options for bandwidth */ +diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man +--- redir-2.2.1~/redir.man 1999-12-26 15:52:24.000000000 -0500 ++++ redir-2.2.1/redir.man 2005-10-22 21:22:28.882630176 -0400 +@@ -18,7 +18,7 @@ + .I --lport=port + .I --cport=port + .RB [ \--bufsize=n ] +-.RB [ \--maxbandwidth=n ] ++.RB [ \--max_bandwidth=n ] + .RB [ \--random_wait=n ] + .RB [ \--wait_in_out=n ] + .ll -8 +@@ -35,7 +35,7 @@ + .RB [ \--connect=host:port ] + .I --cport=port + .RB [ \--bufsize=n ] +-.RB [ \--maxbandwidth=n ] ++.RB [ \--max_bandwidth=n ] + .RB [ \--random_wait=n ] + .RB [ \--wait_in_out=n ] + .ll -8 +@@ -102,9 +102,9 @@ + .TP + .B \--bufsize n + Set the bufsize (defaut 4096) in bytes. Can be used combined with +---maxbandwidth or --random_wait to simulate a slow connection. ++--max_bandwidth or --random_wait to simulate a slow connection. + .TP +-.B \--maxbandwidth n ++.B \--max_bandwidth n + Reduce the bandwidth to be no more than n bits/sec. The algorithme is + basic, the goal is to simulate a slow connection, so there is no pic + acceptance. +@@ -115,7 +115,7 @@ + than the bufsize (see also --bufsize). + .TP + .B \--wait_in_out n +-Apply --maxbandwidth and --random_wait for input if n=1, output if n=2 and ++Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and + both if n=3. + .SH "SEE ALSO" + inetd(1) diff --git a/network/redir/patches/02_use_ntohs.dpatch b/network/redir/patches/02_use_ntohs.dpatch new file mode 100644 index 0000000000..58622b0ddf --- /dev/null +++ b/network/redir/patches/02_use_ntohs.dpatch @@ -0,0 +1,50 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_use_ntohs.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use ntohs() to generate comprehensible debug()s and syslog()s. + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 1999-12-26 15:50:06.000000000 -0500 ++++ redir-2.2.1/redir.c 2005-10-22 21:29:55.491735272 -0400 +@@ -745,7 +745,7 @@ + } + + debug1("peer IP is %s\n", inet_ntoa(client.sin_addr)); +- debug1("peer socket is %d\n", client.sin_port); ++ debug1("peer socket is %d\n", ntohs(client.sin_port)); + + /* + * Double fork here so we don't have to wait later +@@ -871,8 +871,8 @@ + strcpy(tmp2, inet_ntoa(target->sin_addr)); + + syslog(LOG_NOTICE, "connecting %s/%d to %s/%d", +- tmp1, client.sin_port, +- tmp2, target->sin_port); ++ tmp1, ntohs(client.sin_port), ++ tmp2, ntohs(target->sin_port)); + } + + /* do proxy stuff */ +@@ -1066,7 +1066,7 @@ + + if (!getpeername(0, (struct sockaddr *) &client, &client_size)) { + debug1("peer IP is %s\n", inet_ntoa(client.sin_addr)); +- debug1("peer socket is %d\n", client.sin_port); ++ debug1("peer socket is %d\n", ntohs(client.sin_port)); + } + if ((targetsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) { + perror("target: socket"); +@@ -1109,8 +1109,8 @@ + + if (dosyslog) { + syslog(LOG_NOTICE, "connecting %s/%d to %s/%d", +- inet_ntoa(client.sin_addr), client.sin_port, +- target_ip, target.sin_port); ++ inet_ntoa(client.sin_addr), ntohs(client.sin_port), ++ target_ip, ntohs(target.sin_port)); + } + + /* Just start copying - one side of the loop is stdin - 0 */ diff --git a/network/redir/patches/03_fix_tcp_wrappers.dpatch b/network/redir/patches/03_fix_tcp_wrappers.dpatch new file mode 100644 index 0000000000..8709432ea2 --- /dev/null +++ b/network/redir/patches/03_fix_tcp_wrappers.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_fix_tcp_wrappers.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix calls to tcp wrappers + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 2005-10-22 22:10:11.439455392 -0400 ++++ redir-2.2.1/redir.c 2005-10-22 22:10:51.625346208 -0400 +@@ -802,8 +802,8 @@ + #ifdef USE_TCP_WRAPPERS + request_init(&request, RQ_DAEMON, ident, RQ_FILE, clisock, 0); + sock_host(&request); +- sock_hostname(&request); +- sock_hostaddr(&request); ++ sock_hostname(request.client); ++ sock_hostaddr(request.client); + + if (!hosts_access(&request)) { + refuse(&request); +@@ -1057,8 +1057,8 @@ + #ifdef USE_TCP_WRAPPERS + request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0); + sock_host(&request); +- sock_hostname(&request); +- sock_hostaddr(&request); ++ sock_hostname(request.client); ++ sock_hostaddr(request.client); + + if (!hosts_access(&request)) + refuse(&request); diff --git a/network/redir/patches/04_fix_timeouts.dpatch b/network/redir/patches/04_fix_timeouts.dpatch new file mode 100644 index 0000000000..87c1984517 --- /dev/null +++ b/network/redir/patches/04_fix_timeouts.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_fix_timeouts.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Apply a close approximation of Robert de Bath's patch for bug #142382 + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 2005-10-22 22:44:39.504061784 -0400 ++++ redir-2.2.1/redir.c 2005-10-22 22:47:14.746461352 -0400 +@@ -598,10 +598,6 @@ + /* Record start time */ + start_time = (unsigned int) time(NULL); + +- /* Set up timeout */ +- timeout.tv_sec = timeout_secs; +- timeout.tv_usec = 0; +- + /* file descriptor bits */ + FD_ZERO(&iofds); + FD_SET(insock, &iofds); +@@ -618,14 +614,21 @@ + while(1) { + (void) memcpy(&c_iofds, &iofds, sizeof(iofds)); + ++ /* Set up timeout, Linux returns seconds left in this structure ++ * so we have to reset it before each select(). */ ++ timeout.tv_sec = timeout_secs; ++ timeout.tv_usec = 0; ++ + + if (select(max_fd + 1, + &c_iofds, + (fd_set *)0, + (fd_set *)0, + (timeout_secs ? &timeout : NULL)) <= 0) { +- /* syslog(LLEV,"connection timeout: %d sec",timeout.tv_sec);*/ +- break; ++ if (dosyslog) { ++ syslog(LOG_NOTICE,"connection timeout: %d sec",timeout_secs); ++ } ++ break; + } + + if(FD_ISSET(insock, &c_iofds)) { diff --git a/network/redir/patches/05_pedantic.dpatch b/network/redir/patches/05_pedantic.dpatch new file mode 100644 index 0000000000..ff7b1a9fbf --- /dev/null +++ b/network/redir/patches/05_pedantic.dpatch @@ -0,0 +1,183 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_pedantic.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: changes to make clean up compilation + +@DPATCH@ +diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile +--- redir-2.2.1~/Makefile 2005-10-22 23:11:41.000000000 -0400 ++++ redir-2.2.1/Makefile 2005-10-22 23:11:48.818368360 -0400 +@@ -32,7 +32,7 @@ + # if your system lacks getopt_long, remove the comment from this line + OBJS = redir.o $(GETOPT_OBJS) + +-CFLAGS = -O2 -Wall $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS) ++CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS) + LDFLAGS = -s + + # solaris, and others, may also need these libraries to link +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 2005-10-22 23:11:48.282449832 -0400 ++++ redir-2.2.1/redir.c 2005-10-22 23:12:23.201141384 -0400 +@@ -73,6 +73,7 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/time.h> ++#include <time.h> + #include <sys/wait.h> + #include <netinet/in.h> + #include <arpa/inet.h> +@@ -460,7 +461,7 @@ + int lport, rport; + int remip[4]; + int localsock; +- int socksize = sizeof(struct sockaddr_in); ++ size_t socksize = sizeof(struct sockaddr_in); + + struct sockaddr_in newsession; + struct sockaddr_in sockname; +@@ -509,7 +510,7 @@ + if(getsockname(localsock, (struct sockaddr *)&sockname, &socksize) < 0) { + perror("getsockname"); + if (dosyslog) +- syslog(LOG_ERR, "getsockname failed: %m"); ++ syslog(LOG_ERR, "getsockname failed: %s",strerror(errno)); + exit(1); + } + +@@ -562,7 +563,7 @@ + switch(fork()) + { + case -1: /* Error */ +- syslog(LOG_ERR, "Couldn't fork: %m"); ++ syslog(LOG_ERR, "Couldn't fork: %s",strerror(errno)); + _exit(1); + case 0: /* Child */ + { +@@ -723,7 +724,7 @@ + int clisock; + int targetsock; + struct sockaddr_in client; +- int clientlen = sizeof(client); ++ size_t clientlen = sizeof(client); + int accept_errno; + + debug("top of accept loop\n"); +@@ -734,7 +735,7 @@ + perror("server: accept"); + + if (dosyslog) +- syslog(LOG_ERR, "accept failed: %m"); ++ syslog(LOG_ERR, "accept failed: %s",strerror(errno)); + + /* determine if this error is fatal */ + switch(accept_errno) { +@@ -768,7 +769,7 @@ + perror("(server) fork"); + + if (dosyslog) +- syslog(LOG_ERR, "(server) fork failed: %m"); ++ syslog(LOG_ERR, "(server) fork failed: %s",strerror(errno)); + + _exit(1); + case 0: /* Child */ +@@ -795,7 +796,7 @@ + perror("(child) fork"); + + if (dosyslog) +- syslog(LOG_ERR, "(child) fork failed: %m"); ++ syslog(LOG_ERR, "(child) fork failed: %s",strerror(errno)); + + _exit(1); + case 0: /* Child */ +@@ -826,7 +827,7 @@ + perror("target: socket"); + + if (dosyslog) +- syslog(LOG_ERR, "socket failed: %m"); ++ syslog(LOG_ERR, "socket failed: %s",strerror(errno)); + + _exit(1); + } +@@ -850,7 +851,7 @@ + only be different if the input value is 0 (let the system pick a + port) */ + if (dosyslog) +- syslog(LOG_ERR, "bind failed: %m"); ++ syslog(LOG_ERR, "bind failed: %s",strerror(errno)); + + _exit(1); + } +@@ -862,7 +863,7 @@ + perror("target: connect"); + + if (dosyslog) +- syslog(LOG_ERR, "bind failed: %m"); ++ syslog(LOG_ERR, "bind failed: %s",strerror(errno)); + + _exit(1); + } +@@ -923,7 +924,7 @@ + perror("server: socket"); + + if (dosyslog) +- syslog(LOG_ERR, "socket failed: %m"); ++ syslog(LOG_ERR, "socket failed: %s",strerror(errno)); + + exit(1); + } +@@ -962,7 +963,7 @@ + perror("server: bind"); + + if (dosyslog) +- syslog(LOG_ERR, "bind failed: %m"); ++ syslog(LOG_ERR, "bind failed: %s",strerror(errno)); + + exit(1); + } +@@ -980,7 +981,7 @@ + perror("server: listen"); + + if (dosyslog) +- syslog(LOG_ERR, "listen failed: %m"); ++ syslog(LOG_ERR, "listen failed: %s",strerror(errno)); + + exit(1); + } +@@ -1059,7 +1060,7 @@ + if (inetd) { + int targetsock; + struct sockaddr_in client; +- int client_size = sizeof(client); ++ size_t client_size = sizeof(client); + + #ifdef USE_TCP_WRAPPERS + request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0); +@@ -1079,7 +1080,7 @@ + perror("target: socket"); + + if (dosyslog) +- syslog(LOG_ERR, "targetsock failed: %m"); ++ syslog(LOG_ERR, "targetsock failed: %s",strerror(errno)); + + exit(1); + } +@@ -1097,7 +1098,7 @@ + perror("bind_addr: cannot bind to forcerd outgoing addr"); + + if (dosyslog) +- syslog(LOG_ERR, "bind failed: %m"); ++ syslog(LOG_ERR, "bind failed: %s",strerror(errno)); + + exit(1); + } +@@ -1109,7 +1110,7 @@ + perror("target: connect"); + + if (dosyslog) +- syslog(LOG_ERR, "connect failed: %m"); ++ syslog(LOG_ERR, "connect failed: %s",strerror(errno)); + + exit(1); + } diff --git a/network/redir/patches/06_fix_shaper_buffer.dpatch b/network/redir/patches/06_fix_shaper_buffer.dpatch new file mode 100644 index 0000000000..47c1e132ea --- /dev/null +++ b/network/redir/patches/06_fix_shaper_buffer.dpatch @@ -0,0 +1,63 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_fix_shaper_buffer.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: properly allocate copyloop buffer + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 2005-10-22 23:20:05.235901424 -0400 ++++ redir-2.2.1/redir.c 2005-10-22 23:22:20.198384008 -0400 +@@ -260,7 +260,7 @@ + #endif + int *transproxy, + #ifndef NO_SHAPER +- unsigned int * bufsize, ++ unsigned int * bufsizeout, + int * max_bandwidth, + int * random_wait, + int * wait_in_out, +@@ -367,7 +367,7 @@ + + #ifndef NO_SHAPER + case 'z': +- *bufsize = (unsigned int)atol(optarg); ++ *bufsizeout = (unsigned int)atol(optarg); + break; + + case 'm': +@@ -594,7 +594,7 @@ + unsigned long bytes_in = 0; + unsigned long bytes_out = 0; + unsigned int start_time, end_time; +- char buf[bufsize]; ++ char* buf = malloc(bufsize); + + /* Record start time */ + start_time = (unsigned int) time(NULL); +@@ -637,7 +637,7 @@ + } + + if(FD_ISSET(insock, &c_iofds)) { +- if((bytes = read(insock, buf, sizeof(buf))) <= 0) ++ if((bytes = read(insock, buf, bufsize)) <= 0) + break; + #ifndef NO_FTP + if (ftp & FTP_PORT) +@@ -652,7 +652,7 @@ + bytes_out += bytes; + } + if(FD_ISSET(outsock, &c_iofds)) { +- if((bytes = read(outsock, buf, sizeof(buf))) <= 0) ++ if((bytes = read(outsock, buf, bufsize)) <= 0) + break; + /* if we're correcting for PASV on ftp redirections, then + fix buf and bytes to have the new address, among other +@@ -689,6 +689,7 @@ + syslog(LOG_NOTICE, "disconnect %d secs, %ld in %ld out", + (end_time - start_time), bytes_in, bytes_out); + } ++ free(buf); + return; + } + diff --git a/network/redir/patches/07_cosmetics.dpatch b/network/redir/patches/07_cosmetics.dpatch new file mode 100644 index 0000000000..a692c73815 --- /dev/null +++ b/network/redir/patches/07_cosmetics.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_cosmetics.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cosmetic fixes which could be applied upstream + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man +--- redir-2.2.1~/redir.man 2005-10-22 21:41:51.284918168 -0400 ++++ redir-2.2.1/redir.man 2005-10-22 21:42:42.115190792 -0400 +@@ -73,7 +73,7 @@ + Specify program name to be used for TCP wrapper checks and syslog logging. + .TP + .B --timeout +-Timeout and close the connection after n seconds on inactivity. ++Timeout and close the connection after n seconds of inactivity. + .TP + .B \--syslog + Log information to syslog. +@@ -90,7 +90,7 @@ + undesirable. + .TP + .B \--transproxy +-On a linux system with transparany proxying enables, causes redir to ++On a linux system with transparent proxying enabled, causes redir to + make connections appear as if they had come from their true origin. + (see transproxy.txt in the source archive) + .TP diff --git a/network/redir/patches/08_add_wrappers.dpatch b/network/redir/patches/08_add_wrappers.dpatch new file mode 100644 index 0000000000..57e4e7a875 --- /dev/null +++ b/network/redir/patches/08_add_wrappers.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_add_wrappers.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enabling TCP wrapper support + +@DPATCH@ + +--- redir-2.2.1.orig/Makefile ++++ redir-2.2.1/Makefile +@@ -9,8 +9,8 @@ + # if you would like support for TCP wrappers (and have libwrap.a + # installed), remove these comments. + +-WRAP_CFLAGS = # -DUSE_TCP_WRAPPERS +-WRAP_LIBS = # -lwrap ++WRAP_CFLAGS = -DUSE_TCP_WRAPPERS ++WRAP_LIBS = -lwrap + + # if your system needs any additional libraries (solaris, for example, + # needs the ones commented out below), edit this line. + diff --git a/network/redir/patches/09_add_linux_software_map.dpatch b/network/redir/patches/09_add_linux_software_map.dpatch new file mode 100644 index 0000000000..0274957ca7 --- /dev/null +++ b/network/redir/patches/09_add_linux_software_map.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_add_linux_software_map.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add linux software map file + +@DPATCH@ + +--- redir-2.2.1.orig/redir-2.2.lsm ++++ redir-2.2.1/redir-2.2.lsm +@@ -0,0 +1,11 @@ ++Begin3 ++Title: redir ++Version: 2.2 ++Entered-date: 15DEC1999 ++Description: TCP Port redirector (for firewalls etc). ++Keywords: tcp port redirector bouncer proxy ++Author: sammy@oh.verio.com ++Primary-site: sunsite.unc.edu /pub/Linux/system/Network/daemons ++ 39936 redir-2.2.tar.gz ++Copying-policy: GPL ++End + diff --git a/network/redir/patches/15_deb_cosmetics.dpatch b/network/redir/patches/15_deb_cosmetics.dpatch new file mode 100644 index 0000000000..840d800125 --- /dev/null +++ b/network/redir/patches/15_deb_cosmetics.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_deb_cosmetics.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cosmetic changes applicable only to debian + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man +--- redir-2.2.1~/redir.man 2005-10-22 21:47:44.067287096 -0400 ++++ redir-2.2.1/redir.man 2005-10-22 21:48:34.218662928 -0400 +@@ -92,7 +92,7 @@ + .B \--transproxy + On a linux system with transparent proxying enabled, causes redir to + make connections appear as if they had come from their true origin. +-(see transproxy.txt in the source archive) ++(see /usr/share/doc/redir/transproxy.txt) + .TP + .B \--connect + Redirects connections through an HTTP proxy which supports the CONNECT diff --git a/network/redir/patches/20_do_not_strip.dpatch b/network/redir/patches/20_do_not_strip.dpatch new file mode 100644 index 0000000000..c47e13e1b0 --- /dev/null +++ b/network/redir/patches/20_do_not_strip.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_do_not_strip.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: don't strip by default. let dh_strip take care of it. + +@DPATCH@ +diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile +--- redir-2.2.1~/Makefile 2007-08-15 14:53:41.908911693 -0400 ++++ redir-2.2.1/Makefile 2007-08-15 14:53:59.409909018 -0400 +@@ -33,7 +33,7 @@ + OBJS = redir.o $(GETOPT_OBJS) + + CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS) +-LDFLAGS = -s ++LDFLAGS = # -s + + # solaris, and others, may also need these libraries to link + # also edit here if you're using the TCP wrappers code diff --git a/network/redir/patches/25_fix_setsockopt.dpatch b/network/redir/patches/25_fix_setsockopt.dpatch new file mode 100644 index 0000000000..0623198f72 --- /dev/null +++ b/network/redir/patches/25_fix_setsockopt.dpatch @@ -0,0 +1,62 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_fix_setsockopt.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Ensure that the server socket has SO_REUSEADDR and SO_LINGER set properly. + +@DPATCH@ +diff -urNad redir~/redir.c redir/redir.c +--- redir~/redir.c 2009-03-03 17:35:12.022427586 -0500 ++++ redir/redir.c 2009-03-03 17:45:28.998426896 -0500 +@@ -90,8 +90,8 @@ + /* let's set up some globals... */ + int dodebug = 0; + int dosyslog = 0; +-unsigned char reuse_addr = 1; +-unsigned char linger_opt = 0; ++int reuse_addr = 1; /* allow address reuse */ ++struct linger linger_opt = { 0, 0}; /* do not linger */ + char * bind_addr = NULL; + struct sockaddr_in addr_out; + int timeout = 0; +@@ -906,6 +906,7 @@ + + int servsock; + struct sockaddr_in server; ++ int ret; + + /* + * Get a socket to work with. This socket will +@@ -944,8 +945,30 @@ + server.sin_addr.s_addr = htonl(inet_addr("0.0.0.0")); + } + +- setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr)); +- setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(SO_LINGER)); ++ ret = setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr)); ++ if (ret != 0) { ++ if(fail) { ++ return -1; ++ } ++ else { ++ perror("server: setsockopt (SO_REUSEADDR)"); ++ if (dosyslog) ++ syslog(LOG_ERR, "setsockopt failed with SO_REUSEADDR: %s",strerror(errno)); ++ exit(1); ++ } ++ } ++ ret = setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(linger_opt)); ++ if (ret != 0) { ++ if(fail) { ++ return -1; ++ } ++ else { ++ perror("server: setsockopt (SO_LINGER)"); ++ if (dosyslog) ++ syslog(LOG_ERR, "setsockopt failed with SO_LINGER: %s",strerror(errno)); ++ exit(1); ++ } ++ } + + /* + * Try to bind the address to the socket. diff --git a/network/redir/patches/30_fix_manpage.dpatch b/network/redir/patches/30_fix_manpage.dpatch new file mode 100644 index 0000000000..3a36bc30ea --- /dev/null +++ b/network/redir/patches/30_fix_manpage.dpatch @@ -0,0 +1,183 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_fix_manpage.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Clean up questionable formatting in man page. + +@DPATCH@ +diff -urNad redir~/redir.man redir/redir.man +--- redir~/redir.man 2009-03-03 18:55:37.790428922 -0500 ++++ redir/redir.man 2009-03-03 18:58:48.486428715 -0500 +@@ -1,43 +1,42 @@ +-.PU + .TH REDIR 1 local + .SH NAME +-redir \- redirect tcp connections ++redir - redirect tcp connections + .SH SYNOPSIS + .ll +8 + .B redir +-.RB [ \--laddr=incoming.ip.address ] +-.RB [ \--caddr=host ] +-.RB [ \--debug ] +-.RB [ \--syslog +-.RB [ \--name=str ] +-.RB [ \--timeout=n ] +-.RB [ \--bind_addr=my.other.ip.address ] +-.RB [ \--ftp=type ] +-.RB [ \--transproxy ] +-.RB [ \--connect=host:port ] +-.I --lport=port +-.I --cport=port +-.RB [ \--bufsize=n ] +-.RB [ \--max_bandwidth=n ] +-.RB [ \--random_wait=n ] +-.RB [ \--wait_in_out=n ] ++.RB [ \-\-laddr=incoming.ip.address ] ++.RB [ \-\-caddr=host ] ++.RB [ \-\-debug ] ++.RB [ \-\-syslog ] ++.RB [ \-\-name=str ] ++.RB [ \-\-timeout=n ] ++.RB [ \-\-bind_addr=my.other.ip.address ] ++.RB [ \-\-ftp=type ] ++.RB [ \-\-transproxy ] ++.RB [ \-\-connect=host:port ] ++.I \-\-lport=port ++.I \-\-cport=port ++.RB [ \-\-bufsize=n ] ++.RB [ \-\-max_bandwidth=n ] ++.RB [ \-\-random_wait=n ] ++.RB [ \-\-wait_in_out=n ] + .ll -8 + .br + .B redir +-.RB \--inetd +-.RB [ \--caddr=host ] +-.RB [ \--debug ] +-.RB [ \--syslog +-.RB [ \--name=str ] +-.RB [ \--timeout=n ] +-.RB [ \--ftp=type ] +-.RB [ \--transproxy ] +-.RB [ \--connect=host:port ] +-.I --cport=port +-.RB [ \--bufsize=n ] +-.RB [ \--max_bandwidth=n ] +-.RB [ \--random_wait=n ] +-.RB [ \--wait_in_out=n ] ++.RB \-\-inetd ++.RB [ \-\-caddr=host ] ++.RB [ \-\-debug ] ++.RB [ \-\-syslog ] ++.RB [ \-\-name=str ] ++.RB [ \-\-timeout=n ] ++.RB [ \-\-ftp=type ] ++.RB [ \-\-transproxy ] ++.RB [ \-\-connect=host:port ] ++.I \-\-cport=port ++.RB [ \-\-bufsize=n ] ++.RB [ \-\-max_bandwidth=n ] ++.RB [ \-\-random_wait=n ] ++.RB [ \-\-wait_in_out=n ] + .ll -8 + .br + .SH DESCRIPTION +@@ -49,74 +48,73 @@ + Depending on how redir was compiled, not all options may be available. + .SH OPTIONS + .TP +-.B \--lport ++.B \-\-lport + Specifies port to listen for connections on (when not running from inetd) + .TP +-.B \--laddr ++.B \-\-laddr + IP address to bind to when listening for connections (when not + running from inetd) + .TP +-.B \--cport ++.B \-\-cport + Specifies port to connect to. + .TP +-.B \--caddr ++.B \-\-caddr + Specifies remote host to connect to. (localhost if omitted) + .TP +-.B \--inetd ++.B \-\-inetd + Run as a process started from inetd, with the connection passed as stdin + and stdout on startup. + .TP +-.B \--debug ++.B \-\-debug + Write debug output to stderr or syslog. + .TP +-.B \--name ++.B \-\-name + Specify program name to be used for TCP wrapper checks and syslog logging. + .TP +-.B --timeout ++.B \-\-timeout + Timeout and close the connection after n seconds of inactivity. + .TP +-.B \--syslog ++.B \-\-syslog + Log information to syslog. + .TP +-.B \--bind_addr ++.B \-\-bind_addr + Forces redir to pick a specific address/interface to bind to when it listens + for incoming connections. + .TP +-.B \--ftp ++.B \-\-ftp + When using redir for an FTP server, this will cause redir to also + redirect ftp connections. Type should be specified as either "port", + "pasv", or "both", to specify what type of FTP connection to handle. +-Note that --transproxy often makes one or the other (generally port) ++Note that \-\-transproxy often makes one or the other (generally port) + undesirable. + .TP +-.B \--transproxy ++.B \-\-transproxy + On a linux system with transparent proxying enabled, causes redir to + make connections appear as if they had come from their true origin. + (see /usr/share/doc/redir/transproxy.txt) + .TP +-.B \--connect ++.B \-\-connect + Redirects connections through an HTTP proxy which supports the CONNECT +-command. Specify the address and port of the proxy using --caddr and +---cport. --connect requires the hostname and port which the HTTP ++command. Specify the address and port of the proxy using \-\-caddr and ++\-\-cport. \-\-connect requires the hostname and port which the HTTP + proxy will be asked to connect to. + .TP +-.B \--bufsize n ++.B \-\-bufsize n + Set the bufsize (defaut 4096) in bytes. Can be used combined with +---max_bandwidth or --random_wait to simulate a slow connection. ++\-\-max_bandwidth or \-\-random_wait to simulate a slow connection. + .TP +-.B \--max_bandwidth n ++.B \-\-max_bandwidth n + Reduce the bandwidth to be no more than n bits/sec. The algorithme is + basic, the goal is to simulate a slow connection, so there is no pic + acceptance. + .TP +-.B \--random_wait n ++.B \-\-random_wait n + Wait between 0 and 2 x n milliseconds before each "packet". A "packet" is + a bloc of data read in one time by redir. A "packet" size is always less +-than the bufsize (see also --bufsize). ++than the bufsize (see also \-\-bufsize). + .TP +-.B \--wait_in_out n +-Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and ++.B \-\-wait_in_out n ++Apply \-\-max_bandwidth and \-\-random_wait for input if n=1, output if n=2 and + both if n=3. + .SH "SEE ALSO" + inetd(1) +- diff --git a/network/libnftnl/libnftnl.SlackBuild b/network/redir/redir.SlackBuild index 6a357b8512..74c1345ac0 100644 --- a/network/libnftnl/libnftnl.SlackBuild +++ b/network/redir/redir.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for libnftnl +# Slackware build script for redir -# Copyright 2014,2015 Duncan Roe Melbourne, Australia +# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=libnftnl -VERSION=${VERSION:-1.0.3} +PRGNAM=redir +VERSION=${VERSION:-2.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,7 +40,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCUMENTATION="COPYING" if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -55,40 +54,41 @@ else LIBDIRSUFFIX="" fi +DOCS="CHANGES COPYING README contrib transproxy.txt" + set -e 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 a-s,u+w,go+r-w . +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 {} \; + +for i in $CWD/patches/* ; do patch -p1 < $i ; done + +sed -i "s|^EXTRA_LIBS.*|EXTRA_LIBS = -lnsl|" Makefile 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 +install -D -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 -# libnftnl doesn't have man pages +mkdir -p $PKG/usr/man/man1 +gzip -9c $PRGNAM.man > $PKG/usr/man/man1/$PRGNAM.1.gz -DOCSDIR=$PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $DOCSDIR -cp -l $DOCUMENTATION $DOCSDIR -cat $CWD/$PRGNAM.SlackBuild > $DOCSDIR/$PRGNAM.SlackBuild +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 diff --git a/network/redir/redir.info b/network/redir/redir.info new file mode 100644 index 0000000000..3280819247 --- /dev/null +++ b/network/redir/redir.info @@ -0,0 +1,10 @@ +PRGNAM="redir" +VERSION="2.2.1" +HOMEPAGE="http://sammy.net/~sammy/hacks/" +DOWNLOAD="http://sammy.net/~sammy/hacks/redir-2.2.1.tar.gz" +MD5SUM="4342fadac30504c86c8db7beefe01995" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/network/redir/slack-desc b/network/redir/slack-desc new file mode 100644 index 0000000000..b201e42c75 --- /dev/null +++ b/network/redir/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------------------------------------------------------| +redir: redir (Redirect TCP connections) +redir: +redir: redir is all you need to redirect traffic across firewalls. +redir: The functionality of inetd/tcpd and "redir" will allow you to +redir: do everything you need without screwy telnet/ftp etc gateways. +redir: +redir: homepage: http://sammy.net/~sammy/hacks/ +redir: +redir: +redir: +redir: diff --git a/network/rekonq/rekonq.SlackBuild b/network/rekonq/rekonq.SlackBuild index 1a3c39e769..3fbcbc83b6 100644 --- a/network/rekonq/rekonq.SlackBuild +++ b/network/rekonq/rekonq.SlackBuild @@ -5,7 +5,7 @@ # Written by Branko Grubic <branko.grubic@gmail.com> PRGNAM=rekonq -VERSION=${VERSION:-2.4.0} +VERSION=${VERSION:-2.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/rekonq/rekonq.info b/network/rekonq/rekonq.info index cc17db0790..c6e28d3c90 100644 --- a/network/rekonq/rekonq.info +++ b/network/rekonq/rekonq.info @@ -1,8 +1,8 @@ PRGNAM="rekonq" -VERSION="2.4.0" +VERSION="2.4.2" HOMEPAGE="http://rekonq.kde.org/" -DOWNLOAD="http://sourceforge.net/projects/rekonq/files/2.0/rekonq-2.4.0.tar.xz" -MD5SUM="1cb82ad866681db888daf40485fd4ce2" +DOWNLOAD="http://downloads.sourceforge.net/rekonq/rekonq-2.4.2.tar.xz" +MD5SUM="5d2a5ce7817813f68144203c14419669" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/roger-router/roger-router.SlackBuild b/network/roger-router/roger-router.SlackBuild index 9d87ccfd12..9306c78dad 100644 --- a/network/roger-router/roger-router.SlackBuild +++ b/network/roger-router/roger-router.SlackBuild @@ -81,8 +81,9 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; ./autogen.sh -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ + +CFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/sks-keyserver/sks-keyserver.SlackBuild b/network/sks-keyserver/sks-keyserver.SlackBuild index d40a536eea..6ad1458e18 100644 --- a/network/sks-keyserver/sks-keyserver.SlackBuild +++ b/network/sks-keyserver/sks-keyserver.SlackBuild @@ -108,8 +108,8 @@ find -L . \ cp -v Makefile.local.unused Makefile.local -make dep -make all +make -j1 dep +make -j1 all make install PREFIX=$PKG/usr MANDIR=$PKG/usr/man install -D -m 0644 ${CWD}/rc.sks $PKG/etc/rc.d/rc.sks.new diff --git a/network/smb4k/README b/network/smb4k/README new file mode 100644 index 0000000000..a47fd61932 --- /dev/null +++ b/network/smb4k/README @@ -0,0 +1,3 @@ +Smb4K is an advanced network neighborhood browser for KDE and a frontend +to the programs of the Samba software suite. Its purpose is to provide +a program that's easy to use and has as many features as possible. diff --git a/network/smb4k/doinst.sh b/network/smb4k/doinst.sh new file mode 100644 index 0000000000..53c90287d1 --- /dev/null +++ b/network/smb4k/doinst.sh @@ -0,0 +1,30 @@ +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/dbus-1/system.d/net.sourceforge.smb4k.mounthelper.conf.new + +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 + +# Reload messagebus service +if [ -x etc/rc.d/rc.messagebus ]; then + chroot . /etc/rc.d/rc.messagebus reload +fi + diff --git a/network/smb4k/slack-desc b/network/smb4k/slack-desc new file mode 100644 index 0000000000..392f44fb1d --- /dev/null +++ b/network/smb4k/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------------------------------------------------------| +smb4k: smb4k (A SMB Share Browser) +smb4k: +smb4k: Smb4K is an advanced network neighborhood browser for KDE and a +smb4k: frontend to the programs of the Samba software suite. Its purpose is +smb4k: to provide a program that's easy to use and has as many features as +smb4k: possible. +smb4k: +smb4k: Homepage: http://smb4k.sourceforge.net/ +smb4k: +smb4k: +smb4k: diff --git a/network/smb4k/smb4k.SlackBuild b/network/smb4k/smb4k.SlackBuild new file mode 100644 index 0000000000..7a3b8dff9b --- /dev/null +++ b/network/smb4k/smb4k.SlackBuild @@ -0,0 +1,105 @@ +#!/bin/sh + +# Slackware build script for smb4k + +# Copyright 2008-2013 Roberto Neri, Palermo, Italy +# +# 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=smb4k +VERSION=${VERSION:-1.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 + +set -e + +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 -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; + +mkdir build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make + make install DESTDIR=$PKG +cd .. + +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 + +mv $PKG/etc/dbus-1/system.d/net.sourceforge.smb4k.mounthelper.conf \ + $PKG/etc/dbus-1/system.d/net.sourceforge.smb4k.mounthelper.conf.new + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS BUGS ChangeLog COPYING README \ + $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/doinst.sh > $PKG/install/doinst.sh +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/smb4k/smb4k.info b/network/smb4k/smb4k.info new file mode 100644 index 0000000000..24f7f10227 --- /dev/null +++ b/network/smb4k/smb4k.info @@ -0,0 +1,10 @@ +PRGNAM="smb4k" +VERSION="1.1.0" +HOMEPAGE="http://smb4k.sourceforge.net/" +DOWNLOAD="http://downloads.sourceforge.net/smb4k/smb4k-1.1.0.tar.bz2" +MD5SUM="2ccd1f4eda732654460ff03b77738a96" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="nobody" +EMAIL="nobody@nowhere" diff --git a/network/socat/socat.SlackBuild b/network/socat/socat.SlackBuild index 724c4e1dc0..22db8ca72a 100644 --- a/network/socat/socat.SlackBuild +++ b/network/socat/socat.SlackBuild @@ -22,7 +22,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=socat -VERSION=${VERSION:-1.7.2.4} +VERSION=${VERSION:-1.7.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/socat/socat.info b/network/socat/socat.info index b4c8bf2262..847eee4e2d 100644 --- a/network/socat/socat.info +++ b/network/socat/socat.info @@ -1,8 +1,8 @@ PRGNAM="socat" -VERSION="1.7.2.4" +VERSION="1.7.3.0" HOMEPAGE="http://www.dest-unreach.org/socat" -DOWNLOAD="http://www.dest-unreach.org/socat/download/socat-1.7.2.4.tar.bz2" -MD5SUM="69b8155dd442a6f24e28ef5407d868eb" +DOWNLOAD="http://www.dest-unreach.org/socat/download/socat-1.7.3.0.tar.bz2" +MD5SUM="b607edb65bc6c57f4a43f06247504274" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/thrift/thrift.SlackBuild b/network/thrift/thrift.SlackBuild index 81135d111e..f76fb6b52c 100644 --- a/network/thrift/thrift.SlackBuild +++ b/network/thrift/thrift.SlackBuild @@ -17,7 +17,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. PRGNAM=thrift -VERSION=${VERSION:-0.6.0} +VERSION=${VERSION:-0.9.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,10 +58,12 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Disable unit tests: https://issues.apache.org/jira/browse/THRIFT-3249 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -74,6 +76,7 @@ CXXFLAGS="$SLKCFLAGS" \ --without-ruby \ --without-php \ --without-php_extension \ + --disable-tests \ --build=$ARCH-slackware-linux make @@ -81,7 +84,7 @@ make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - CHANGES CONTRIBUTORS DISCLAIMER LICENSE NEWS NOTICE README \ + CHANGES LICENSE NOTICE README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/thrift/thrift.info b/network/thrift/thrift.info index 4fb4576c9e..ec2179291c 100644 --- a/network/thrift/thrift.info +++ b/network/thrift/thrift.info @@ -1,8 +1,8 @@ PRGNAM="thrift" -VERSION="0.6.0" +VERSION="0.9.2" HOMEPAGE="http://thrift.apache.org" -DOWNLOAD="http://archive.apache.org/dist/thrift/0.6.0/thrift-0.6.0.tar.gz" -MD5SUM="c1a9c679bc75d038ce5ef447bf6e4c75" +DOWNLOAD="http://archive.apache.org/dist/thrift/0.9.2/thrift-0.9.2.tar.gz" +MD5SUM="89f63cc4d0100912f4a1f8a9dee63678" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/urlview/README b/network/urlview/README new file mode 100644 index 0000000000..a89983e2c4 --- /dev/null +++ b/network/urlview/README @@ -0,0 +1,10 @@ +urlview is a curses program for extracting URLs from text files and +displaying a menu from which you can select a specific URL to view using +your favorite browser program. + +It was originally part of mutt. See /etc/urlview.conf on how to configure +mutt, tin, or your default browser. + +Please be aware that /etc/urlview.conf and /usr/bin/url_handler.sh are +configuration files, so they are not overwritten on upgrades. Be sure to +merge/move the .new files after each upgrade. diff --git a/network/nft/doinst.sh b/network/urlview/doinst.sh index 606a6d8d20..4cf8309066 100644 --- a/network/nft/doinst.sh +++ b/network/urlview/doinst.sh @@ -11,11 +11,5 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/nftables/bridge-filter.new -config etc/nftables/ipv4-filter.new -config etc/nftables/ipv4-mangle.new -config etc/nftables/ipv6-nat.new -config etc/nftables/ipv6-mangle.new -config etc/nftables/ipv4-nat.new -config etc/nftables/ipv6-filter.new -config etc/nftables/inet-filter.new +config etc/urlview.conf.new +config usr/bin/url_handler.sh.new diff --git a/network/urlview/patches/Makefile.in.diff b/network/urlview/patches/Makefile.in.diff new file mode 100644 index 0000000000..2bb0334b83 --- /dev/null +++ b/network/urlview/patches/Makefile.in.diff @@ -0,0 +1,12 @@ +--- Makefile.in~ 2007-06-08 14:09:57.000000000 +0200 ++++ Makefile.in 2007-06-08 14:33:40.000000000 +0200 +@@ -318,7 +318,8 @@ + + + install-data-local: +- $(INSTALL_DATA) urlview.man $(mandir)/man1/urlview.1 ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ++ $(INSTALL_DATA) urlview.man ${DESTDIR}$(mandir)/man1/urlview.1 + + # how to create a target for uninstall-data-local??? + diff --git a/network/urlview/patches/include-fix.diff b/network/urlview/patches/include-fix.diff new file mode 100644 index 0000000000..f4708e337a --- /dev/null +++ b/network/urlview/patches/include-fix.diff @@ -0,0 +1,11 @@ +--- urlview.c ++++ urlview.c +@@ -40,6 +40,8 @@ + #include <fcntl.h> + #include <sys/stat.h> + ++#include "quote.h" ++ + #ifdef HAVE_REGEX_H + #include <regex.h> + #else diff --git a/network/urlview/patches/sample.urlview.diff b/network/urlview/patches/sample.urlview.diff new file mode 100644 index 0000000000..111719f5e5 --- /dev/null +++ b/network/urlview/patches/sample.urlview.diff @@ -0,0 +1,15 @@ +--- sample.urlview~ 2007-06-08 14:11:09.000000000 +0200 ++++ sample.urlview 2007-06-08 14:11:33.000000000 +0200 +@@ -19,10 +19,10 @@ + #REGEXP (((http|https|ftp|gopher)|mailto):(//)?[^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):] + REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):] + +-# Command to invoke for selected URL. Use lynx, netscape, or url_handler.sh ++# Command to invoke for selected URL. Use lynx, firefox, or url_handler.sh + # shell script. + + #COMMAND lynx %s +-#COMMAND netscape -remote 'openURL(%s)' ++#COMMAND firefox -remote 'openURL(%s)' + COMMAND url_handler.sh + diff --git a/network/urlview/patches/url_handler.sh.diff b/network/urlview/patches/url_handler.sh.diff new file mode 100644 index 0000000000..d976e3c90b --- /dev/null +++ b/network/urlview/patches/url_handler.sh.diff @@ -0,0 +1,15 @@ +--- url_handler.sh~ 2007-06-08 14:12:20.000000000 +0200 ++++ url_handler.sh 2007-06-08 14:14:06.000000000 +0200 +@@ -28,8 +28,10 @@ + # VT: Launch in the same terminal + + # The lists of programs to be executed are +-https_prgs="/usr/X11R6/bin/netscape:XW /usr/bin/lynx:XT" +-http_prgs="/usr/bin/lynx:XT /usr/X11R6/bin/netscape:XW" ++https_prgs="/usr/bin/firefox:XW /usr/bin/lynx:XT" ++https_prgs="/usr/bin/firefox:XW /usr/bin/lynx:XT" ++http_prgs="/usr/bin/lynx:XT /usr/bin/firefox:XW" ++http_prgs="/usr/bin/lynx:XT /usr/bin/firefox:XW" + mailto_prgs="/usr/bin/mutt:VT /usr/bin/elm:VT /usr/bin/pine:VT /usr/bin/mail:VT" + gopher_prgs="/usr/bin/lynx:XT /usr/bin/gopher:XT" + ftp_prgs="/usr/bin/lynx:XT /usr/bin/ncftp:XT" diff --git a/network/urlview/slack-desc b/network/urlview/slack-desc new file mode 100644 index 0000000000..25cb759b22 --- /dev/null +++ b/network/urlview/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------------------------------------------------------| +urlview: urlview (extract URLs from text files) +urlview: +urlview: urlview is a curses program for extracting URLs from text files and +urlview: displaying a menu from which you can select a specific URL to view +urlview: using your favorite browser program. +urlview: +urlview: It was originally a part of mutt. +urlview: +urlview: +urlview: +urlview: diff --git a/network/nft/nft.SlackBuild b/network/urlview/urlview.SlackBuild index 411f6a9cb5..fc1673d0af 100644 --- a/network/nft/nft.SlackBuild +++ b/network/urlview/urlview.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh - -# Slackware build script for nft - -# Copyright 2014,2015 Duncan Roe Melbourne, Australia +# +# Slackware build script for urlview +# (C) 2007 Michael Wagner <lapinours@web.de> +# Copyright 2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=nft -PKGNAM=nftables -VERSION=${VERSION:-0.4} +PRGNAM=urlview +VERSION=0.9 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -41,7 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCUMENTATION="COPYING INSTALL TODO" +DOCS="AUTHORS COPYING ChangeLog INSTALL README" + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -56,34 +56,30 @@ else LIBDIRSUFFIX="" fi -set -e - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 -cd $PKGNAM-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +cd $PRGNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ -o -perm 511 \) -exec chmod 755 {} \; -o \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Apply patches for DESTDIR and mostly path fixes: +for i in $CWD/patches/*.diff; do + patch -p0 < $i || exit 1 +done -LDFLAGS="-lncurses" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-debug \ - --build=$ARCH-slackware-linux - + --libdir=/usr/lib${LIBDIRSUFFIX} + make make install DESTDIR=$PKG @@ -91,20 +87,18 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | 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 + +# Use sample.urlview as system-wide default configuration: +install -D -m 0644 sample.urlview $PKG/etc/urlview.conf.new -mv $PKG/etc/nftables/bridge-filter $PKG/etc/nftables/bridge-filter.new -mv $PKG/etc/nftables/ipv4-filter $PKG/etc/nftables/ipv4-filter.new -mv $PKG/etc/nftables/ipv4-mangle $PKG/etc/nftables/ipv4-mangle.new -mv $PKG/etc/nftables/ipv6-nat $PKG/etc/nftables/ipv6-nat.new -mv $PKG/etc/nftables/ipv6-mangle $PKG/etc/nftables/ipv6-mangle.new -mv $PKG/etc/nftables/ipv4-nat $PKG/etc/nftables/ipv4-nat.new -mv $PKG/etc/nftables/ipv6-filter $PKG/etc/nftables/ipv6-filter.new -mv $PKG/etc/nftables/inet-filter $PKG/etc/nftables/inet-filter.new +# Let url_handler.sh do what it is supposed to be, handle URL events: +install -m 0755 url_handler.sh $PKG/usr/bin/url_handler.sh.new -DOCSDIR=$PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $DOCSDIR -cp -a $DOCUMENTATION $DOCSDIR -cat $CWD/$PRGNAM.SlackBuild > $DOCSDIR/$PRGNAM.SlackBuild +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 +chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/* mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/network/urlview/urlview.info b/network/urlview/urlview.info new file mode 100644 index 0000000000..d7c5429dd0 --- /dev/null +++ b/network/urlview/urlview.info @@ -0,0 +1,10 @@ +PRGNAM="urlview" +VERSION="0.9" +HOMEPAGE="ftp://ftp.mutt.org/pub/mutt/contrib/urlview-0.9.README" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/urlview-0.9.tar.gz" +MD5SUM="67731f73e69297ffd106b65c8aebb2ab" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/network/varnish/varnish.SlackBuild b/network/varnish/varnish.SlackBuild index a58eb7116b..950474649c 100644 --- a/network/varnish/varnish.SlackBuild +++ b/network/varnish/varnish.SlackBuild @@ -5,7 +5,7 @@ # Written by Matt Schurenko <matt.schurenko@gmail.com> PRGNAM=varnish -VERSION=${VERSION:-2.1.5} +VERSION=${VERSION:-4.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -46,20 +46,20 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +sh ./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./autogen.sh - ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ - --localstatedir=/var \ + --localstatedir=/var/lib \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux @@ -81,10 +81,10 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -# copy rc.varnish into ./etc/rc.d/ -mkdir $PKG/etc/rc.d/ +mkdir -p $PKG/etc/varnish/ +cp $PKG/usr/doc/$PRGNAM-$VERSION/example.vcl $PKG/etc/varnish/default.vcl.new +mkdir -p $PKG/etc/rc.d/ cp -p $CWD/rc.varnishd $PKG/etc/rc.d/rc.varnishd.new -mv $PKG/etc/varnish/default.vcl{,.new} cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/varnish/varnish.info b/network/varnish/varnish.info index bf791b653f..16a1cbae82 100644 --- a/network/varnish/varnish.info +++ b/network/varnish/varnish.info @@ -1,10 +1,10 @@ PRGNAM="varnish" -VERSION="2.1.5" +VERSION="4.0.3" HOMEPAGE="https://www.varnish-cache.org/" -DOWNLOAD="http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz" -MD5SUM="2d2f227da36a2a240c475304c717b8e3" +DOWNLOAD="https://repo.varnish-cache.org/source/varnish-4.0.3.tar.gz" +MD5SUM="16a683f2e41f7d80219cec5d4649380c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="docutils" MAINTAINER="Matt Schurenko" EMAIL="matt.schurenko@gmail.com" diff --git a/network/vde2/vde2.SlackBuild b/network/vde2/vde2.SlackBuild index 7b7c5b2565..78e45757bc 100644 --- a/network/vde2/vde2.SlackBuild +++ b/network/vde2/vde2.SlackBuild @@ -96,7 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \ $OPTIONS \ --build=$ARCH-slackware-linux -make all +make -j1 all make install-strip DESTDIR=$PKG ( cd $PKG/usr/man |