diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2012-09-26 01:10:42 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-05-31 22:51:55 +0200 |
| commit | 9664bee729d487bcc0a0bc35859f8e13d5421c75 (patch) | |
| tree | b428a16618e36ed864a8d76ea3435e19a452bf90 /extra/source | |
| parent | 75a4a592e5ccda30715f93563d741b83e0dcf39e (diff) | |
| download | current-9664bee729d487bcc0a0bc35859f8e13d5421c75.tar.gz | |
Slackware 14.0slackware-14.0
Wed Sep 26 01:10:42 UTC 2012
Slackware 14.0 x86_64 stable is released!
We're perfectionists here at Slackware, so this release has been a long
time a-brewing. But we think you'll agree that it was worth the wait.
Slackware 14.0 combines modern components, ease of use, and flexible
configuration... our "KISS" philosophy demands it.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
Thanks to everyone who helped make this happen. The Slackware team, the
upstream developers, and (of course) the awesome Slackware user
community.
Have fun! :-)
Diffstat (limited to 'extra/source')
48 files changed, 462 insertions, 1405 deletions
diff --git a/extra/source/GConf/GConf.SlackBuild b/extra/source/GConf/GConf.SlackBuild deleted file mode 100755 index f6e0627c..00000000 --- a/extra/source/GConf/GConf.SlackBuild +++ /dev/null @@ -1,113 +0,0 @@ -#!/bin/sh - -# Slackware build script for GConf - -# Copyright 2010, 2011 Robby Workman, Northport, Alabama, USA -# Copyright 2011 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PKGNAM=GConf -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --with-gtk=2.0 \ - --disable-static \ - --enable-debug=no \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -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 - -mv $PKG/etc/gconf/2/path $PKG/etc/gconf/2/path.new -mv $PKG/etc/gconf/2/evoldap.conf $PKG/etc/gconf/2/evoldap.conf.new - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a AUTHORS COPYING* NEWS README* TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/extra/source/GConf/GConf.url b/extra/source/GConf/GConf.url deleted file mode 100644 index 3fa6c986..00000000 --- a/extra/source/GConf/GConf.url +++ /dev/null @@ -1,2 +0,0 @@ -http://www.gnome.org/projects/gconf/ -ftp://ftp.gnome.org/pub/gnome/sources/GConf/2.32/GConf-2.32.0.tar.bz2 diff --git a/extra/source/GConf/doinst.sh b/extra/source/GConf/doinst.sh deleted file mode 100644 index e4c115f3..00000000 --- a/extra/source/GConf/doinst.sh +++ /dev/null @@ -1,16 +0,0 @@ -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/gconf/2/path.new -config etc/gconf/2/evoldap.conf.new - diff --git a/extra/source/GConf/slack-desc b/extra/source/GConf/slack-desc deleted file mode 100644 index 1c6ce492..00000000 --- a/extra/source/GConf/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-------------------------------------------------------| -GConf: GConf (GNOME configuration library) -GConf: -GConf: GConf is a configuration database system, functionally similar to the -GConf: Windows registry. -GConf: -GConf: -GConf: -GConf: -GConf: Homepage: http://www.gnome.org/projects/gconf/ -GConf: -GConf: diff --git a/extra/source/ORBit2/ORBit2.SlackBuild b/extra/source/ORBit2/ORBit2.SlackBuild deleted file mode 100755 index 36ef40cc..00000000 --- a/extra/source/ORBit2/ORBit2.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# Slackware build script for ORBit2 - -# Copyright 2010 Robby Workman, Northport, Alabama, USA -# Copyright 2011 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PKGNAM=ORBit2 -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - esac -fi - -NUMJOBS=${NUMJOBS:--j6} - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 -cd $PKGNAM-$VERSION || exit 1 -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING* HACKING MAINTAINERS NEWS README* TODO \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/extra/source/ORBit2/ORBit2.url b/extra/source/ORBit2/ORBit2.url deleted file mode 100644 index d51f9f0a..00000000 --- a/extra/source/ORBit2/ORBit2.url +++ /dev/null @@ -1,2 +0,0 @@ -http://www.gnome.org/projects/ORBit2/ -ftp://ftp.gnome.org/pub/gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2 diff --git a/extra/source/ORBit2/slack-desc b/extra/source/ORBit2/slack-desc deleted file mode 100644 index 867444e8..00000000 --- a/extra/source/ORBit2/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------------------------------------------------------| -ORBit2: ORBit2 (CORBA ORB library) -ORBit2: -ORBit2: ORBit is a high-performance CORBA (Common Object Request Broker -ORBit2: Architecture) ORB (object request broker). It allows programs to -ORBit2: send requests and receive replies from other programs, regardless -ORBit2: of the locations of the two programs. CORBA is an architecture that -ORBit2: enables communication between program objects, regardless of the -ORBit2: programming language they're written in or the operating system they -ORBit2: run on. -ORBit2: -ORBit2: diff --git a/extra/source/bash-completion/bash-completion.SlackBuild b/extra/source/bash-completion/bash-completion.SlackBuild index d2e59446..5fa23f6c 100755 --- a/extra/source/bash-completion/bash-completion.SlackBuild +++ b/extra/source/bash-completion/bash-completion.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,9 @@ # Slackware build script for bash-completion -VERSION=1.3 +VERSION=2.0 ARCH=noarch -BUILD=${BUILD:-4} +BUILD=${BUILD:-2} CWD=$(pwd) TMP=${TMP:-/tmp} @@ -46,6 +46,9 @@ find . \ # Fixup sh completion for us zcat $CWD/fixup-sh-script-completions.diff.gz | patch -p1 --verbose || exit 1 +# Support the XFCE package set +zcat $CWD/slackpkg-slapt-get-Update-the-list-of-package-sets.patch.gz | patch -p1 --verbose || exit 1 + ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -56,19 +59,8 @@ zcat $CWD/fixup-sh-script-completions.diff.gz | patch -p1 --verbose || exit 1 make || exit 1 make install DESTDIR=$PKG || exit 1 -mkdir -p $PKG/etc/profile.d -zcat $CWD/bash_completion.sh.gz > $PKG/etc/profile.d/bash_completion.sh chmod 0755 $PKG/etc/profile.d/bash_completion.sh -# Sorry, but these contrib scripts have been causing a lot of problems. -# If these are merged with upstream (and hopefully debugged) then we -# will have them, but adding them at this level is IMHO a mistake. -## https://github.com/GArik/bash-completion -## GArik has a 'slackware' branch with quite a few enhancements -#for i in pkgtools rpm2tgz sbopkg slackpkg slapt ; do -# cat $CWD/contrib/$i > $PKG/etc/bash_completion.d/$i ; -#done - mkdir -p $PKG/usr/doc/bash-completion-$VERSION cp -a \ AUTHORS COPYING* README* TODO \ diff --git a/extra/source/bash-completion/bash_completion.sh b/extra/source/bash-completion/bash_completion.sh deleted file mode 100644 index cb2adb67..00000000 --- a/extra/source/bash-completion/bash_completion.sh +++ /dev/null @@ -1,3 +0,0 @@ -if [ "$(basename $SHELL)" = "bash" -a -f /etc/bash_completion ]; then - . /etc/bash_completion -fi diff --git a/extra/source/bash-completion/contrib/pkgtools b/extra/source/bash-completion/contrib/pkgtools deleted file mode 100644 index 2b438efc..00000000 --- a/extra/source/bash-completion/contrib/pkgtools +++ /dev/null @@ -1,127 +0,0 @@ -# bash completion for Slackware Linux pkgtools - -[ -f /etc/slackware-version ] && -{ - -have pkgtool && -_pkgtool() -{ - COMPREPLY=() - local cur="${COMP_WORDS[COMP_CWORD]}" - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '--sets --ignore-tagfiles --tagfile \ - --source-mounted --source_dir --target_dir --source_device' \ - -- "$cur" ) ) - return 0 - fi - - local prev=${COMP_WORDS[COMP_CWORD-1]} - - case $prev in - --source_dir|--target_dir) - _filedir -d - return 0 - ;; - --sets) - # argument required but no completions available - return 0 - ;; - --source_device) - COMPREPLY=( $( compgen -f -d -- "${cur:-/dev/}" ) ) - return 0 - ;; - --tagfile) - _filedir - return 0 - ;; - esac -} && -complete -F _pkgtool pkgtool - -have removepkg && -_removepkg() -{ - COMPREPLY=() - local cur=`_get_cword` - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '-copy -keep -preserve -warn' \ - -- "$cur" ) ) - return 0 - fi - - COMPREPLY=( $( cd /var/log/packages; compgen -f -- "$cur" ) ) -} && -complete -F _removepkg removepkg - -have upgradepkg && -_upgradepkg() -{ - COMPREPLY=() - local cur=`_get_cword` - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '--dry-run --install-new --reinstall \ - --verbose' -- "$cur") ) - return 0 - fi - - _filedir "t[bglx]z" -} && complete -F _upgradepkg upgradepkg - -have installpkg && -_installpkg() -{ - COMPREPLY=() - local cur=`_get_cword` - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '--warn --md5sum --root --infobox --terse \ - --menu --ask --priority --tagfile' -- "$cur") ) - return 0 - fi - - local prev=`_get_pword` - - case $prev in - --root) - _filedir -d - return 0 - ;; - --priority) - COMPREPLY=( $( compgen -W 'ADD REC OPT SKP' -- "$cur" ) ) - return 0 - ;; - --tagfile) - _filedir - return 0 - ;; - esac - - _filedir "t[bglx]z" -} && complete -F _installpkg installpkg - -have makepkg && -_makepkg() -{ - COMPREPLY=() - local cur=`_get_cword` - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '-l --linkadd -p --prepend \ - -c --chown' -- "$cur") ) - return 0 - fi - - local prev=`_get_pword` - - case $prev in - -l|--linkadd|-c|--chown) - COMPREPLY=( $( compgen -W 'y n' -- "$cur" ) ) - return 0 - ;; - esac - - _filedir -} && complete -F _makepkg makepkg - -have explodepkg && -complete -o plusdirs -f -X '!*.t[bglx]z' explodepkg - -} diff --git a/extra/source/bash-completion/contrib/rpm2tgz b/extra/source/bash-completion/contrib/rpm2tgz deleted file mode 100644 index 23c70ac9..00000000 --- a/extra/source/bash-completion/contrib/rpm2tgz +++ /dev/null @@ -1,14 +0,0 @@ -# Slackware rpm2tgz completion. - -have rpm2tgz && -_rpm2tgz() -{ - COMPREPLY=() - local cur="${COMP_WORDS[COMP_CWORD]}" - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '-s -S -n -r -d -c' -- "$cur" ) ) - return 0 - fi - - COMPREPLY=( $(compgen -f -X "!*.rpm" -- "$cur") ) -} && complete -F _rpm2tgz -o plusdirs rpm2tgz rpm2txz rpm2targz diff --git a/extra/source/bash-completion/contrib/sbopkg b/extra/source/bash-completion/contrib/sbopkg deleted file mode 100644 index 698fdf18..00000000 --- a/extra/source/bash-completion/contrib/sbopkg +++ /dev/null @@ -1,76 +0,0 @@ -# bash completion for sbopkg tool - -have sbopkg && -_sbopkg() -{ - COMPREPLY=() - local cur prev - _get_comp_words_by_ref cur prev - - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '-b -c -d -e -f -g -h -i -k -l \ - -o -P -p -q -R -r -s -u -V -v' -- "$cur" ) ) - return 0 - fi - - case $prev in - -e) - COMPREPLY=( $( compgen -W 'ask continue stop' -- "$cur" ) ) - return 0 - ;; - -f) - _filedir - return 0 - ;; - -d) - _filedir -d - return 0 - ;; - -V) - COMPREPLY=( $( compgen -W "? \ - $(sbopkg -V ? 2>&1 | cut -s -f1)" -- "$cur" ) ) - return 0 - ;; - -i|-b) - ;; - *) - return 0 - ;; - esac - - local config="/etc/sbopkg/sbopkg.conf" - local words - _get_comp_words_by_ref words - - for (( i=${#words[@]}-1; i>0; i-- )); do - if [[ "${words[i]}" == -f ]]; then - config="${words[i+1]}" - break - fi - done - - if [ ! -r "$config" ]; then - return 0 - fi - - . $config - - for (( i=1; i<${#words[@]}; i++ )); do - case "${words[i]}" in - -V) - REPO_NAME="${words[i+1]%%/*}" - REPO_BRANCH="${words[i+1]#*/}" - ;; - -d) - REPO_ROOT="${words[i+1]}" - ;; - esac - done - - if [ ! -r "$REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT" ]; then - return 0 - fi - COMPREPLY=( $( sed -ne "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p}"\ - $REPO_ROOT/$REPO_NAME/$REPO_BRANCH/SLACKBUILDS.TXT ) - $( cd $QUEUEDIR; compgen -f -X "!*.sqf" -- "$cur" ) ) -} && complete -F _sbopkg sbopkg diff --git a/extra/source/bash-completion/contrib/slackpkg b/extra/source/bash-completion/contrib/slackpkg deleted file mode 100644 index 139e7edd..00000000 --- a/extra/source/bash-completion/contrib/slackpkg +++ /dev/null @@ -1,95 +0,0 @@ -# bash completion for slackpkg tool - -have slackpkg && -_slackpkg() -{ - COMPREPLY=() - local cur - _get_comp_words_by_ref cur - - # based on `grep '\-.*\=.*)' /usr/sbin/slackpkg | cut -f1 -d\)` - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '-delall=on -delall=off \ - -checkmd5=on -checkmd5=off \ - -checkgpg=on -checkgpg=off \ - -checksize=on -checksize=off \ - -postinst=on -postinst=off \ - -onoff=on -onoff=off \ - -download_all=on -download_all=off \ - -dialog=on -dialog=off \ - -dialog_maxargs= \ - -batch=on -batch=off \ - -only_new_dotnew=on -only_new_dotnew=off \ - -use_includes=on -use_includes=off \ - -spinning=on -spinning=off \ - -default_answer=yes -default_answer=no \ - -mirror=' -- "$cur" ) ) - return 0 - fi - - local confdir="/etc/slackpkg" - local config="$confdir/slackpkg.conf" - - if [ ! -r "$config" ]; then - return 0 - fi - . "$config" - - local action words - _get_comp_words_by_ref -n "=" words - - for (( i=1; i<${#words[@]}; i++ )); do - if [[ "${words[i]}" != -* ]]; then - action="${words[i]}" - break - fi - done - - case $action in - generate-template|search|file-search) - # argument required but no completions available - return 0 - ;; - install-template|remove-template) - if [ -e "$confdir/templates" ]; then - COMPREPLY=( $( cd "$confdir/templates"; \ - compgen -f -X "!*.template" -- "$cur" ) ) - COMPREPLY=( ${COMPREPLY[@]%.template} ) - fi - return 0 - ;; - remove) - _filedir - COMPREPLY+=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x \ - xap y' -- "$cur" ) ) - COMPREPLY+=( $( cd /var/log/packages; compgen -f -- "$cur" ) ) - return 0 - ;; - install|reinstall|upgrade|blacklist|download) - _filedir - COMPREPLY+=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x \ - xap y' -- "$cur" ) ) - COMPREPLY+=( $( cut -f 6 -d\ ${WORKDIR}/pkglist 2> /dev/null | \ - grep "^$cur" ) ) - return 0 - ;; - info) - COMPREPLY+=( $( cut -f 6 -d\ ${WORKDIR}/pkglist 2> /dev/null | \ - grep "^$cur" ) ) - return 0 - ;; - update) - # we should complete the same as the next `list` + "gpg" - COMPREPLY=( $( compgen -W 'gpg' -- "$cur" ) ) - ;& - *) - COMPREPLY+=( $( compgen -W 'install reinstall upgrade remove \ - blacklist download update install-new upgrade-all \ - clean-system new-config check-updates help generate-template \ - install-template remove-template search file-search info' -- \ - "$cur" ) ) - return 0 - ;; - esac - -} && complete -F _slackpkg slackpkg diff --git a/extra/source/bash-completion/contrib/slapt b/extra/source/bash-completion/contrib/slapt deleted file mode 100644 index 77946538..00000000 --- a/extra/source/bash-completion/contrib/slapt +++ /dev/null @@ -1,136 +0,0 @@ -# slapt-get and slapt-src completion - -have slapt-get && -_slapt_get() -{ - COMPREPLY=() - local cur prev - _get_comp_words_by_ref cur prev - - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '--download-only -d --simulate -s \ - --no-prompt -y --prompt -p --reinstall --ignore-excludes \ - --no-md5 --ignore-dep --no-dep --print-uris --show-stats -S \ - --config -c --remove-obsolete --retry --no-upgrade \ - --update -u --upgrade --dist-upgrade --install -i --install-set \ - --remove --show --filelist --search --list --available \ - --installed --clean --autoclean --add-keys \ - --version --help -h' -- "$cur" ) ) - return 0 - fi - - case $prev in - --config|-c) - _filedir - return 0 - ;; - --retry|--search) - # argument required but no completions available - return 0 - ;; - esac - - local words t - _get_comp_words_by_ref words - - # search for last action (--install|--install-set|--remove|--show|--filelist) - for (( i=${#words[@]}-1; i>0; i-- )); do - if [[ ${words[i]} == -@(i|-install|-show) ]]; then - t="all" - break - elif [[ ${words[i]} == --install-set ]]; then - t="set" - break - elif [[ ${words[i]} == --@(remove|filelist) ]]; then - t="ins" - break - fi - done - - case $t in - all) # --install|-i|--show - # slapt-get will fail to search for "^name-version" - # it can search for names only - local name=$( echo $cur | cut -f1 -d- ) - COMPREPLY=( $( slapt-get --search "^$name" 2> /dev/null | \ - sed -ne "/^$cur/{s/ .*$//;p}" ) ) - return 0 - ;; - ins) # --remove|--filelist - COMPREPLY=( $( cd /var/log/packages; compgen -f -- "$cur" ) ) - return 0 - ;; - set) # --install-set - COMPREPLY=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x \ - xap y' -- "$cur" ) ) - return 0 - ;; - esac -} && complete -F _slapt_get slapt-get - -have slapt-src && -_slapt_src() -{ - COMPREPLY=() - local cur prev - _get_comp_words_by_ref cur prev - - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '--update -u --list -l --clean -e \ - --search -s --show -w --install -i --build -b --fetch -f \ - --yes -y --config -c --no-dep -n --postprocess -p \ - --version -v --help -h' -- "$cur" ) ) - return 0 - fi - - case $prev in - --config|-c) - _filedir - return 0 - ;; - --search|-s|--postprocess|-p) - # argument required but no completions available - return 0 - ;; - esac - - local words - _get_comp_words_by_ref words - - local t - # search for last action (-i|-w|-b|-f) - for (( i=${#words[@]}-1; i>0; i-- )); do - if [[ ${words[i]} == -@(i|w|f|b|-install|-show|-build|-fetch) ]]; then - t="all" - break - fi - done - if [ "$t" != "all" ]; then - return 0 - fi - - local config="/etc/slapt-get/slapt-srcrc" # default config location - # search for config - for (( i=${#words[@]}-1; i>0; i-- )); do - if [[ ${words[i]} == -@(c|-config) ]]; then - config="${words[i+1]}" - break - fi - done - if [ ! -r "$config" ]; then - return 0 - fi - - local builddir=$( sed -ne "/^BUILDDIR=/{s/^BUILDDIR=//;p}" "$config" ) - if [ ! -d "$builddir" ]; then - return 0 - fi - - local slck_data="${builddir}/slackbuilds_data" - if [ ! -r "$slck_data" ]; then - return 0 - fi - - COMPREPLY=( $( sed -ne \ - "/^SLACKBUILD NAME: $cur/{s/^SLACKBUILD NAME: //;p}" "$slck_data" ) ) -} && complete -F _slapt_src slapt-src diff --git a/extra/source/bash-completion/slackpkg-slapt-get-Update-the-list-of-package-sets.patch b/extra/source/bash-completion/slackpkg-slapt-get-Update-the-list-of-package-sets.patch new file mode 100644 index 00000000..da7f08e6 --- /dev/null +++ b/extra/source/bash-completion/slackpkg-slapt-get-Update-the-list-of-package-sets.patch @@ -0,0 +1,48 @@ +From 371fb91b213c3bb4b86eb22e09701ec1be18b7dd Mon Sep 17 00:00:00 2001 +From: Igor Murzov <e-mail@date.by> +Date: Wed, 25 Jul 2012 02:39:23 +0400 +Subject: [PATCH] slackpkg, slapt-get: Update the list of package sets. + +Xfce has its own package set in Slackware-14.0. +--- + completions/slackpkg | 4 ++-- + completions/slapt-get | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/completions/slackpkg b/completions/slackpkg +index 1be2f95..dab9c6d 100644 +--- a/completions/slackpkg ++++ b/completions/slackpkg +@@ -70,14 +70,14 @@ _slackpkg() + remove) + _filedir + COMPREPLY+=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x +- xap y' -- "$cur" ) ) ++ xap xfce y' -- "$cur" ) ) + COMPREPLY+=( $( cd /var/log/packages; compgen -f -- "$cur" ) ) + return + ;; + install|reinstall|upgrade|blacklist|download) + _filedir + COMPREPLY+=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x +- xap y' -- "$cur" ) ) ++ xap xfce y' -- "$cur" ) ) + COMPREPLY+=( $( cut -f 6 -d\ "${WORKDIR}/pkglist" 2> /dev/null | \ + grep "^$cur" ) ) + return +diff --git a/completions/slapt-get b/completions/slapt-get +index ff42660..93d110b 100644 +--- a/completions/slapt-get ++++ b/completions/slapt-get +@@ -70,7 +70,7 @@ _slapt_get() + ;; + set) # --install-set + COMPREPLY=( $( compgen -W 'a ap d e f k kde kdei l n t tcl x +- xap y' -- "$cur" ) ) ++ xap xfce y' -- "$cur" ) ) + return + ;; + esac +-- +1.7.11.1 + diff --git a/extra/source/bittornado/bittornado.SlackBuild b/extra/source/bittornado/bittornado.SlackBuild index e6551c63..6d6f94f5 100755 --- a/extra/source/bittornado/bittornado.SlackBuild +++ b/extra/source/bittornado/bittornado.SlackBuild @@ -4,7 +4,7 @@ PKG=/tmp/package-bittornado VERSION=0.3.18 ARCH=noarch -BUILD=2 +BUILD=3 rm -rf $PKG mkdir -p $PKG diff --git a/extra/source/bittorrent/bittorrent.SlackBuild b/extra/source/bittorrent/bittorrent.SlackBuild index 5118d724..7bfc6a61 100755 --- a/extra/source/bittorrent/bittorrent.SlackBuild +++ b/extra/source/bittorrent/bittorrent.SlackBuild @@ -22,7 +22,7 @@ VERSION=${VERSION:-4.4.0} ARCH=noarch -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} CWD=$(pwd) TMP=${TMP:-/tmp} diff --git a/extra/source/brltty/brltty.SlackBuild b/extra/source/brltty/brltty.SlackBuild index 31d6fc1f..513c0989 100755 --- a/extra/source/brltty/brltty.SlackBuild +++ b/extra/source/brltty/brltty.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2010 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2010, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -30,7 +30,7 @@ if [ ! -d $TMP ]; then fi PKG=/tmp/package-brltty -VERSION=4.2 +VERSION=4.4 BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild b/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild index e61ce917..48c7acea 100755 --- a/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild +++ b/extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2008, 2009, 2010 Eric Hameleers, Eindhoven, NL +# Copyright 2008, 2009, 2010, 2011, 2012 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -26,27 +26,50 @@ # By: Eric Hameleers <alien@slackware.com> # For: flashplayer-plugin # Descr: Adobe flash player plugin for mozilla -# URL: http://labs.adobe.com/technologies/flashplayer10/ +# URL: +# http://labs.adobe.com/technologies/flashplatformruntimes/flashplayer11/ # Needs: # Changelog: -# 10.0.d20.7-1: 16/Dec/2008 by Eric Hameleers <alien@slackware.com> -# * Initial build. -# 10.0.d21.1-1: 20/Dec/2008 by Eric Hameleers <alien@slackware.com> -# * Update. -# 10.0.22.87-1: 26/feb/2009 by Eric Hameleers <alien@slackware.com> -# * Update (plugs vulnerability). -# 10.0.32.18-1: 10/aug/2009 by Patrick J. Volkerding <volkerdi@slackware.com> -# * Update (plugs vulnerability). -# 10.0.42.34-1: 14/dec/2009 by Patrick J. Volkerding <volkerdi@slackware.com> -# * Update (plugs vulnerability). -# 10.091510-1: 15/sep/2010 by Eric Hameleers <alien@slackware.com> -# * Preview1 of "flash player square". -# 10.092710-1: 28/sep/2010 by Eric Hameleers <alien@slackware.com> -# * Preview2 of "flash player square". -# 10_2.111710-1:28/sep/2010 by Eric Hameleers <alien@slackware.com> -# * New preview of "flash player square" for 64-bit Linux; there -# is no more 32-bit "square" version, because new developments -# are being folded into regular flashplayer10. +# 10.0.d20.7-1: 16/Dec/2008 by Eric Hameleers <alien@slackware.com> +# * Initial build. +# 10.0.d21.1-1: 20/Dec/2008 by Eric Hameleers <alien@slackware.com> +# * Update. +# 10.0.22.87-1: 26/feb/2009 by Eric Hameleers <alien@slackware.com> +# * Update (plugs vulnerability). +# 10.0.32.18-1: 10/aug/2009 by Patrick J. Volkerding <volkerdi@slackware.com> +# * Update (plugs vulnerability). +# 10.0.42.34-1: 14/dec/2009 by Patrick J. Volkerding <volkerdi@slackware.com> +# * Update (plugs vulnerability). +# 10.091510-1: 15/sep/2010 by Eric Hameleers <alien@slackware.com> +# * Preview1 of "flash player square". +# 10.092710-1: 28/sep/2010 by Eric Hameleers <alien@slackware.com> +# * Preview2 of "flash player square". +# 10_2.111710-1: 28/sep/2010 by Eric Hameleers <alien@slackware.com> +# * New preview of "flash player square" for 64-bit Linux; there +# is no more 32-bit "square" version, because new developments +# are being folded into regular flashplayer10. +# 11b1.071311-1: 25/jul/2011 by Eric Hameleers <alien@slackware.com> +# * Update to version 11 beta 1. +# Looks like 64-bit support has finally been folded into the +# mainstream development of the plugin. +# 11b1.080811-1: 12/aug/2011 by Eric Hameleers <alien@slackware.com> +# * Update to version 11 beta 2. +# 11r1.090611-1: 11/sep/2011 by Eric Hameleers <alien@slackware.com> +# * Update to version 11 release candidate 1. +# 11.0.1.152-1: 04/oct/2011 by Eric Hameleers <alien@slackware.com> +# * Update to stable release 11! +# 11.1.102.55-1: 05/feb/2012 by Eric Hameleers <alien@slackware.com> +# * Update to release 11.1. +# 11.1.102.62-1: 05/feb/2012 by Eric Hameleers <alien@slackware.com> +# * Minor update. +# 11.2.202.228-1:29/mar/2012 by Eric Hameleers <alien@slackware.com> +# * Minor update. +# 11.2.202.233-1:20/apr/2012 by Eric Hameleers <alien@slackware.com> +# * Minor update. +# 11.2.202.235-1:05/may/2012 by Eric Hameleers <alien@slackware.com> +# * Minor update. +# 11.2.202.236-1:19/jun/2012 by Eric Hameleers <alien@slackware.com> +# * Minor update. # # Run 'sh flashplayer-plugin.SlackBuild' to build a Slackware package. # The package (.txz) and .txt file as well as build logs are created in /tmp . @@ -57,10 +80,10 @@ # Set initial variables: PRGNAM=flashplayer-plugin -SRCVER=${SRCVER:-10_2} -BLDVER=${BLDVER:-111710} -VERSION=$SRCVER.$BLDVER +VERSION=${VERSION:-"11.2.202.236"} +MAJVER=$(echo $VERSION | cut -d. -f1) BUILD=${BUILD:-1} +TAG=${TAG:-"alien"} # Where do we look for sources? SRCDIR=$(cd $(dirname $0); pwd) @@ -72,7 +95,7 @@ OUTPUT=${OUTPUT:-/tmp} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i386 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -81,12 +104,10 @@ fi case "$ARCH" in x86_64) - PREVER=${PREVER:-3} LIBDIRSUFFIX="64" ARCHBITS="64" ;; i?86) - PREVER=${PREVER:-2} LIBDIRSUFFIX="" ARCHBITS="32" ;; @@ -96,8 +117,8 @@ case "$ARCH" in ;; esac -SOURCE="$SRCDIR/flashplayer${SRCVER}_p${PREVER}_${ARCHBITS}bit_linux_${BLDVER}.tar.gz" -SRCURL="http://download.macromedia.com/pub/labs/flashplayer10/flashplayer${SRCVER}_p${PREVER}_${ARCHBITS}bit_linux_${BLDVER}.tar.gz" +SOURCE="$SRCDIR/install_flash_player_${VERSION}_linux.${ARCH}.tar.gz" +SRCURL="http://fpdownload.macromedia.com/get/flashplayer/pdc/${VERSION}/install_flash_player_${MAJVER}_linux.${ARCH}.tar.gz" ## ## --- with a little luck, you won't have to edit below this point --- ## @@ -110,6 +131,10 @@ trap 'echo "$0 FAILED at line ${LINENO}" | tee $OUTPUT/error-${PRGNAM}.log' ERR set -u P1=${1:-1} +# Save old umask and set to 0022: +_UMASK_=$(umask) +umask 0022 + # Create working directories: mkdir -p $OUTPUT # place for the package to be saved mkdir -p $TMP/tmp-$PRGNAM # location to build the source @@ -121,10 +146,11 @@ rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log # Source file availability: if ! [ -f ${SOURCE} ]; then + echo "Source '$(basename ${SOURCE})' not available yet..." + # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT + [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" + if [ -f ${SOURCE} ]; then echo "Ah, found it!"; continue; fi if ! [ "x${SRCURL}" == "x" ]; then - # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT - [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/$(basename $SOURCE)" - echo "Source '$(basename ${SOURCE})' not available yet..." echo "Will download file to $(dirname $SOURCE)" wget -nv -T 20 -O "${SOURCE}" "${SRCURL}" || true if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then @@ -149,7 +175,8 @@ echo "++" echo "|| $PRGNAM-$VERSION" echo "++" -cd $TMP/tmp-$PRGNAM +#cd $TMP/tmp-$PRGNAM +cd $PKG echo "Extracting the source archive(s) for $PRGNAM..." tar -xvf ${SOURCE} chown -R root:root * @@ -168,13 +195,34 @@ case "$ARCH" in ;; esac -# Install the plugin to the package dir: -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins -install -m 0755 libflashplayer.so \ - $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins/libflashplayer.so +## Move lib to lib64 if needed: +#[ "$ARCH" = "x86_64" ] && mv usr/lib usr/lib${LIBDIRSUFFIX} + +# Install the plugin to the mozilla plugins dir and fix library file attributes: +mkdir -p usr/lib${LIBDIRSUFFIX}/mozilla/plugins +mv libflashplayer.so usr/lib${LIBDIRSUFFIX}/mozilla/plugins/ +find usr/lib${LIBDIRSUFFIX} -name "*.so" -exec chmod 755 {} \; + +# Add this to the doinst.sh: +mkdir -p $PKG/install +cat <<EOINS >> $PKG/install/doinst.sh +# Update the desktop database: +if [ -x usr/bin/update-desktop-database ]; then + chroot . /usr/bin/update-desktop-database usr/share/applications > /dev/null 2>&1 +fi + +# Update hicolor theme cache: +if [ -d usr/share/icons/hicolor ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + chroot . /usr/bin/gtk-update-icon-cache -f -t usr/share/icons/hicolor 1> /dev/null 2> /dev/null + fi +fi + +EOINS # Add documentation: mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv *.txt $PKG/usr/doc/$PRGNAM-$VERSION/ || true cp -a $SRCDIR/$(basename $0) $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild chown -R root:root $PKG/usr/doc/$PRGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; @@ -185,9 +233,12 @@ cat $SRCDIR/slack-desc > $PKG/install/slack-desc # Build the package: cd $PKG -makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log +makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log cd $OUTPUT -md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txz.md5 +md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txz.md5 cd - -cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt +cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}${TAG}.txt + +# Restore the original umask: +umask ${_UMASK_} diff --git a/extra/source/fvwm-2.6.1/doinst.sh b/extra/source/fvwm-2.6.1/doinst.sh deleted file mode 100644 index 087da9e3..00000000 --- a/extra/source/fvwm-2.6.1/doinst.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -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... -} -# Might need this later -#config etc/X11/fvwm2/system.fvwm2rc.new diff --git a/extra/source/fvwm-2.6.1/slack-desc b/extra/source/fvwm-2.6.1/slack-desc deleted file mode 100644 index 2d2a9ef5..00000000 --- a/extra/source/fvwm-2.6.1/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------------------------------------------------------| -fvwm: fvwm (a small and fast virtual window manager for X) -fvwm: -fvwm: Fvwm is the classic highly-configurable virtual window manager for -fvwm: X11. It is a derivative of twm, redesigned to minimize memory -fvwm: consumption, provide a 3-D look to window frames, and provide a simple -fvwm: virtual desktop. -fvwm: -fvwm: Homepage: http://www.fvwm.org -fvwm: -fvwm: -fvwm: diff --git a/extra/source/fvwm-2.6.1/xinitrc.fvwm2 b/extra/source/fvwm-2.6.1/xinitrc.fvwm2 deleted file mode 100644 index 788a4e43..00000000 --- a/extra/source/fvwm-2.6.1/xinitrc.fvwm2 +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# $XConsortium: xinitrc.cpp,v 1.4 91/08/22 11:41:34 rws Exp $ - -userresources=$HOME/.Xresources -usermodmap=$HOME/.Xmodmap -sysresources=/etc/X11/xinit/.Xresources -sysmodmap=/etc/X11/xinit/.Xmodmap - -# merge in defaults and keymaps - -if [ -f $sysresources ]; then - xrdb -merge $sysresources -fi - -if [ -f $sysmodmap ]; then - xmodmap $sysmodmap -fi - -if [ -f $userresources ]; then - xrdb -merge $userresources -fi - -if [ -f $usermodmap ]; then - xmodmap $usermodmap -fi - -# start some nice programs - -xsetroot -solid SteelBlue -if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then - ck-launch-session fvwm2 -else - fvwm2 -fi - diff --git a/extra/source/java/README b/extra/source/java/README new file mode 100644 index 00000000..4a812345 --- /dev/null +++ b/extra/source/java/README @@ -0,0 +1,17 @@ +This is a SlackBuild that will repackage Oracle Java into a package that +can be easily installed, upgraded, or removed using Slackware's native +package management tools. + +To use it, you'll need Oracle's JDK or JRE package for Linux. Get the +appropriate version for your architecture, either 32-bit i586 or 64-bit +x64. Be sure to get the version that is packaged as a .tar.gz! + +Then, run the script like this: + +./java.SlackBuild /tmp/jre-7u5-linux-x64.tar.gz + +A Slackware txz package will be created in /tmp. Install or upgrade it +with a command like this one (adjust for jdk or jre, arch, and version): + +upgradepkg --install-new jre-7u5-x86_64-1.txz + diff --git a/extra/source/java/java.SlackBuild b/extra/source/java/java.SlackBuild new file mode 100755 index 00000000..80542817 --- /dev/null +++ b/extra/source/java/java.SlackBuild @@ -0,0 +1,167 @@ +#!/bin/sh + +# Copyright 2008, 2009, 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# 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. + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-java +rm -rf $PKG +mkdir -p $TMP $PKG + +# If a Java archive was given as an argument to this script, use it. +# Otherwise, we'll use an archive found in the current directory if +# there is exactly one such archive. +if [ ! "$1" = "" ]; then + if [ -r "$(readlink -f $1)" ]; then + SOURCETGZ="$(readlink -f $1)" + else + echo "Java source archive $1 was not found." + exit 1 + fi +else + SOURCETGZ="$CWD/j??-*.tar.gz" + if [ ! -r $SOURCETGZ ]; then + echo "No (or multiple) jdk-*.tar.gz found!" + echo "Please make sure there is exactly one JDK or JRE archive in this" + echo "directory and then run this script again, or else specify a Java" + echo "archive on the command line like this:" + echo " ./java.SlackBuild /tmp/jdk-7u5-linux-x64.tar.gz" + exit 1 + fi +fi + +PKGNAM=$(basename $SOURCETGZ | cut -f 1 -d -) +VERSION=$(basename $SOURCETGZ | cut -f 2 -d -) +DVER=$(tar tf $SOURCETGZ | head -n 1 | cut -f 2 -d $(echo $PKGNAM | cut -b 3) | cut -f 1 -d /) +JAVA_ARCH=$(basename $SOURCETGZ | cut -f 4 -d - | cut -f 1 -d .) +if [ "$JAVA_ARCH" = "x64" ]; then + LIB_ARCH=amd64 + ARCH=x86_64 + LIBDIRSUFFIX="64" +else + LIB_ARCH=i386 + ARCH=i586 + LIBDIRSUFFIX="" +fi +BUILD=${BUILD:-1} + +cd $PKG +mkdir -p usr/lib${LIBDIRSUFFIX} +cd usr/lib${LIBDIRSUFFIX} +tar xf $SOURCETGZ || exit 1 +mkdir -p $PKG/etc/profile.d +for file in $(ls $CWD/profile.d/${PKGNAM}*) ; do + cat $file | sed -e "s#lib/java#lib${LIBDIRSUFFIX}/java#" \ + > $PKG/etc/profile.d/$(basename $file) +done +chown -R root.root $PKG +find $PKG \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; +chmod 755 $PKG/etc/profile.d/* +( cd $PKG/usr/lib${LIBDIRSUFFIX} + mv ${PKGNAM}${DVER} java || exit 1 + ln -sf java ${PKGNAM}${DVER} +) || exit 1 +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins +( cd $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins + if [ "$PKGNAM" = "jdk" ]; then + ln -sf /usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/libnpjp2.so libnpjp2.so + else + ln -sf /usr/lib${LIBDIRSUFFIX}/java/lib/${LIB_ARCH}/libnpjp2.so libnpjp2.so + fi +) +( cd $PKG/usr/lib${LIBDIRSUFFIX} + if [ "$PKGNAM" = "jdk" ]; then + ln -sf ./java/jre/lib/${LIB_ARCH}/server/libjvm.so . + else + ln -sf ./java/lib/${LIB_ARCH}/server/libjvm.so . + fi +) +mkdir -p $PKG/install +cat $CWD/slack-desc.${PKGNAM} > $PKG/install/slack-desc +cat << EOF > $PKG/install/doinst.sh +# Clean up a potential upgrade mess caused by changing the +# installation directory to /usr/lib${LIBDIRSUFFIX}/java/: +if [ -L usr/lib${LIBDIRSUFFIX}/java ]; then + rm -rf usr/lib${LIBDIRSUFFIX}/java + mkdir -p usr/lib${LIBDIRSUFFIX}/java/man +EOF +if [ "$PKGNAM" = "jdk" ]; then +cat << EOF >> $PKG/install/doinst.sh + mkdir -p usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/server + mkdir -p usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/client + mkdir -p usr/lib${LIBDIRSUFFIX}/java/jre/javaws + mkdir -p usr/lib${LIBDIRSUFFIX}/java/jre/bin +EOF +else +cat << EOF >> $PKG/install/doinst.sh + mkdir -p usr/lib${LIBDIRSUFFIX}/java/lib/${LIB_ARCH}/server + mkdir -p usr/lib/java/lib${LIBDIRSUFFIX}/${LIB_ARCH}/client + mkdir -p usr/lib${LIBDIRSUFFIX}/java/javaws +EOF +fi +cat << EOF >> $PKG/install/doinst.sh + mkdir -p usr/lib${LIBDIRSUFFIX}/java/bin + mkdir -p usr/lib${LIBDIRSUFFIX}/mozilla/plugins +fi +if [ -L ControlPanel ]; then + rm -f ControlPanel +fi +if [ -L ja ]; then + rm -f ja +fi +if [ -L javaws ]; then + rm -f javaws +fi +if [ -L libjsig.so ]; then + rm -f libjsig.so +fi +# End cleanup. + +EOF + +# Install the desktop/mime files: +mkdir -p $PKG/usr/share/{applications,icons,mime} +if [ "$PKGNAM" = "jdk" ]; then + cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/jre/lib/desktop/applications/* \ + $PKG/usr/share/applications/ + cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/jre/lib/desktop/icons/hicolor \ + $PKG/usr/share/icons/ + cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/jre/lib/desktop/mime/packages \ + $PKG/usr/share/mime/ +else + cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/applications/* \ + $PKG/usr/share/applications/ + cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/icons/hicolor \ + $PKG/usr/share/icons/ + cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/lib/desktop/mime/packages \ + $PKG/usr/share/mime/ +fi + +# Java may not expect compressed manpages, so don't compress them. + +cd $PKG +rm -f $TMP/${PKGNAM}-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz + diff --git a/extra/source/jdk-6/profile.d/jdk.csh b/extra/source/java/profile.d/jdk.csh index 3a1ec7be..3a1ec7be 100755 --- a/extra/source/jdk-6/profile.d/jdk.csh +++ b/extra/source/java/profile.d/jdk.csh diff --git a/extra/source/jdk-6/profile.d/jdk.sh b/extra/source/java/profile.d/jdk.sh index ed0bc73d..ed0bc73d 100755 --- a/extra/source/jdk-6/profile.d/jdk.sh +++ b/extra/source/java/profile.d/jdk.sh diff --git a/extra/source/java/profile.d/jre.csh b/extra/source/java/profile.d/jre.csh new file mode 100755 index 00000000..2beb66ec --- /dev/null +++ b/extra/source/java/profile.d/jre.csh @@ -0,0 +1,4 @@ +#!/bin/csh +setenv JAVA_HOME /usr/lib/java +setenv MANPATH ${MANPATH}:${JAVA_HOME}/man +setenv PATH ${PATH}:${JAVA_HOME}/bin diff --git a/extra/source/java/profile.d/jre.sh b/extra/source/java/profile.d/jre.sh new file mode 100755 index 00000000..227c15cb --- /dev/null +++ b/extra/source/java/profile.d/jre.sh @@ -0,0 +1,4 @@ +#!/bin/sh +export JAVA_HOME=/usr/lib/java +export MANPATH="${MANPATH}:${JAVA_HOME}/man" +export PATH="${PATH}:${JAVA_HOME}/bin" diff --git a/extra/source/jdk-6/slack-desc b/extra/source/java/slack-desc.jdk index 57dfb7e0..57dfb7e0 100644 --- a/extra/source/jdk-6/slack-desc +++ b/extra/source/java/slack-desc.jdk diff --git a/extra/source/java/slack-desc.jre b/extra/source/java/slack-desc.jre new file mode 100644 index 00000000..643ff763 --- /dev/null +++ b/extra/source/java/slack-desc.jre @@ -0,0 +1,18 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + |-----handy-ruler------------------------------------------------------| +jre: Java(TM) 2 Platform Standard Edition Runtime Environment. +jre: +jre: The J2SE(TM) Runtime Environment (JRE) is intended for software +jre: developers and vendors to redistribute with their applications. +jre: It contains the Java virtual machine, runtime class libraries, and +jre: Java application launcher that are necessary to run programs written +jre: in the Java programming language. +jre: +jre: +jre: +jre: diff --git a/extra/source/jdk-6/COPYRIGHT b/extra/source/jdk-6/COPYRIGHT deleted file mode 100644 index fcb67309..00000000 --- a/extra/source/jdk-6/COPYRIGHT +++ /dev/null @@ -1,70 +0,0 @@ -Copyright © 2006, 2011, Oracle and/or its affiliates. -All rights reserved. - -This software and related documentation are provided under a -license agreement containing restrictions on use and -disclosure and are protected by intellectual property laws. -Except as expressly permitted in your license agreement or -allowed by law, you may not use, copy, reproduce, translate, -broadcast, modify, license, transmit, distribute, exhibit, -perform, publish, or display any part, in any form, or by -any means. Reverse engineering, disassembly, or -decompilation of this software, unless required by law for -interoperability, is prohibited. - -The information contained herein is subject to change -without notice and is not warranted to be error-free. If -you find any errors, please report them to us in writing. - -If this is software or related software documentation that -is delivered to the U.S. Government or anyone licensing it -on behalf of the U.S. Government, the following notice is -applicable: - -U.S. GOVERNMENT RIGHTS Programs, software, databases, and -related documentation and technical data delivered to U.S. -Government customers are "commercial computer software" or -"commercial technical data" pursuant to the applicable -Federal Acquisition Regulation and agency-specific -supplemental regulations. As such, the use, duplication, -disclosure, modification, and adaptation shall be subject to -the restrictions and license terms set forth in the -applicable Government contract, and, to the extent -applicable by the terms of the Government contract, the -additional rights set forth in FAR 52.227-19, Commercial -Computer Software License (December 2007). Oracle America, -Inc., 500 Oracle Parkway, Redwood City, CA 94065. - -This software or hardware is developed for general use in a -variety of information management applications. It is not -developed or intended for use in any inherently dangerous -applications, including applications which may create a risk -of personal injury. If you use this software or hardware in -dangerous applications, then you shall be responsible to -take all appropriate fail-safe, backup, redundancy, and -other measures to ensure its safe use. Oracle Corporation -and its affiliates disclaim any liability for any damages -caused by use of this software or hardware in dangerous -applications. - -Oracle and Java are registered trademarks of Oracle and/or -its affiliates. Other names may be trademarks of their -respective owners. - -AMD, Opteron, the AMD logo, and the AMD Opteron logo are -trademarks or registered trademarks of Advanced Micro -Devices. Intel and Intel Xeon are trademarks or registered -trademarks of Intel Corporation. All SPARC trademarks are -used under license and are trademarks or registered -trademarks of SPARC International, Inc. UNIX is a -registered trademark licensed through X/Open Company, Ltd. - -This software or hardware and documentation may provide -access to or information on content, products, and services -from third parties. Oracle Corporation and its affiliates -are not responsible for and expressly disclaim all -warranties of any kind with respect to third-party content, -products, and services. Oracle Corporation and its -affiliates will not be responsible for any loss, costs, or -damages incurred due to your access to or use of third-party -content, products, or services. diff --git a/extra/source/jdk-6/HOWTO-BUILD-TXZ b/extra/source/jdk-6/HOWTO-BUILD-TXZ deleted file mode 100644 index 90a572b5..00000000 --- a/extra/source/jdk-6/HOWTO-BUILD-TXZ +++ /dev/null @@ -1,9 +0,0 @@ -1. Download the file jdk-6u*-linux-i586.bin from - java.com and put it in the directory. - -2. Run jdk.SlackBuild to package it as an installable - .txz package. - -Newer (or older) versions may be packaged by editing the -version number in jdk.SlackBuild first. - diff --git a/extra/source/jdk-6/LICENSE b/extra/source/jdk-6/LICENSE deleted file mode 100644 index 39e216aa..00000000 --- a/extra/source/jdk-6/LICENSE +++ /dev/null @@ -1 +0,0 @@ -Please refer to http://java.com/license diff --git a/extra/source/jdk-6/README.html b/extra/source/jdk-6/README.html deleted file mode 100644 index b7996aec..00000000 --- a/extra/source/jdk-6/README.html +++ /dev/null @@ -1,10 +0,0 @@ -<html> -<head> -<title>README -</title> -</head> -<body> -Please refer to http://java.com/licensereadme -</body> -</html> - diff --git a/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt b/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt deleted file mode 100644 index 4381e7df..00000000 --- a/extra/source/jdk-6/THIRDPARTYLICENSEREADME.txt +++ /dev/null @@ -1 +0,0 @@ -Please refer to http://java.com/thirdpartylicense diff --git a/extra/source/jdk-6/jdk.SlackBuild b/extra/source/jdk-6/jdk.SlackBuild deleted file mode 100755 index db589f7d..00000000 --- a/extra/source/jdk-6/jdk.SlackBuild +++ /dev/null @@ -1,123 +0,0 @@ -#!/bin/sh - -# Copyright 2008, 2009, 2010, 2011 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -VERSION=6u25 -DVER=1.6.0_25 -ARCH=x86_64 # only determines the lib path locations -JAVA_ARCH=${JAVA_ARCH:-x64} # or i586 if you want the 32bit version -BUILD=${BUILD:-1} - - -if [ "$JAVA_ARCH" = "x64" ]; then - LIB_ARCH=amd64 -else - LIB_ARCH=i386 -fi - -if [ "$ARCH" = "x86_64" ]; then - LIBDIRSUFFIX="64" -else - LIBDIRSUFFIX="" -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp} -PKG=$TMP/package-jdk -rm -rf $PKG -mkdir -p $TMP $PKG - -cd $PKG -mkdir -p usr/lib${LIBDIRSUFFIX} -cd usr/lib${LIBDIRSUFFIX} -yes yes | sh $CWD/jdk-${VERSION}-linux-${JAVA_ARCH}.bin || exit 1 -mkdir -p $PKG/etc/profile.d -for file in $(ls $CWD/profile.d/*) ; do - cat $file | sed -e "s#lib/java#lib${LIBDIRSUFFIX}/java#" \ - > $PKG/etc/profile.d/$(basename $file) -done -chown -R root.root $PKG -find $PKG \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 -\) \ - -exec chmod 644 {} \; - -chmod 755 $PKG/etc/profile.d/* -( cd $PKG/usr/lib${LIBDIRSUFFIX} - mv jdk${DVER} java || exit 1 - ln -sf java jdk${DVER} -) || exit 1 -mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins -( cd $PKG/usr/lib${LIBDIRSUFFIX}/mozilla/plugins - ln -sf /usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/libnpjp2.so libnpjp2.so -) -( cd $PKG/usr/lib${LIBDIRSUFFIX} - ln -sf ./java/jre/lib/${LIB_ARCH}/server/libjvm.so . -) - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat << EOF > $PKG/install/doinst.sh - -# Clean up a potential upgrade mess caused by changing the -# installation directory to /usr/lib${LIBDIRSUFFIX}/java/: -if [ -L usr/lib${LIBDIRSUFFIX}/java ]; then - rm -rf usr/lib${LIBDIRSUFFIX}/java - mkdir -p usr/lib${LIBDIRSUFFIX}/java/man - mkdir -p usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/server - mkdir -p usr/lib${LIBDIRSUFFIX}/java/jre/lib/${LIB_ARCH}/client - mkdir -p usr/lib${LIBDIRSUFFIX}/java/jre/javaws - mkdir -p usr/lib${LIBDIRSUFFIX}/java/jre/bin - mkdir -p usr/lib${LIBDIRSUFFIX}/java/bin - mkdir -p usr/lib${LIBDIRSUFFIX}/mozilla/plugins -fi -if [ -L ControlPanel ]; then - rm -f ControlPanel -fi -if [ -L ja ]; then - rm -f ja -fi -if [ -L javaws ]; then - rm -f javaws -fi -if [ -L libjsig.so ]; then - rm -f libjsig.so -fi -# End cleanup. -EOF - -# Install the desktop/mime files: -mkdir -p $PKG/usr/share/{applications,icons,mime} -cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/jre/lib/desktop/applications/* \ - $PKG/usr/share/applications/ -cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/jre/lib/desktop/icons/hicolor \ - $PKG/usr/share/icons/ -cp -a $PKG/usr/lib${LIBDIRSUFFIX}/java/jre/lib/desktop/mime/packages \ - $PKG/usr/share/mime/ - -# We ship the package unmodified, so we do not compress manpages. - -cd $PKG -/sbin/makepkg -l y -c n $TMP/jdk-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz - diff --git a/extra/source/jdk-6/register.html b/extra/source/jdk-6/register.html deleted file mode 100644 index b5411e14..00000000 --- a/extra/source/jdk-6/register.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" -"http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>Register your JDK</title> -<style type="text/css"> -<!-- -.style1 {font-family: Arial, Helvetica, sans-serif} -.style3 {font-family: Arial, Helvetica, sans-serif; font-size: small; } -input.buttonblue,input.defbutton{ background: #3F6580;border-right:1px solid #304C60;border-bottom:1px solid #304C60;border-left:1px solid #BACDD9;border-top:1px solid #BACDD9; font-weight:bold; color:#FFFFFF; font-size:.8em; height:1.9em} -input.buttonblue:hover{color:#fbe249;} -a:link,a.named:visited{color:#3E6B8A} -a:hover{text-decoration:underline} -a{text-decoration:none} -a:visited,a:visited code{color:#917E9C} ---> -</style> -</head> - -<body> -<table width="813" border="0" cellpadding="3" cellspacing="0"> - <tr> - <td width="7" height="78"> </td> - <td width="794" align="left" valign="top"> - <img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre/lib/servicetag/jdk_header.png" width="783" height="63"></td> - </tr> - <tr> - <td> </td> - <td><p class="style1">Thank you for installing the - <strong> Java Development Kit Version 6 Update 25 </strong> - from Oracle Corporation. </p> - <p class="style1">Registering your product will give you the following benefits:</p> - <ul class="style1"> - <li> Notification of new versions, patches, and updates</li> - <li> Special offers on Oracle developer products, services and training </li> - <li> Access to early releases and documentation </li> - </ul> - <p class="style1">Product registration is FREE, quick and easy!</p> - <blockquote> - <p class="style1">All you need is an Oracle.com account. If you don't already have one, you will be prompted to create one. </p> - <table width="708" border="0" cellspacing="0" cellpadding="3"> - <tr valign="top"> - <td width="126" height="35"> - <form name="form1" method="post" action="https://hs-ws1.oracle.com/RegistrationWeb/register/urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58?product=jdk&locale=en" enctype="text/xml"> - <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>00000000</hostId><osName>Linux</osName><osVersion>2.6.37.6</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58%22 version=%221.0%22><service_tag><instance_urn>urn:st:14aa9f1c-8a07-4e99-ada1-a020589ad7fd</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_25</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_25-b06 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2011-04-24 03:00:46 GMT</timestamp><container>global</container><source>jdk-6u25-fcs-bin-b06-linux-amd64-14_apr_2011.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>"> - <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';" value="Register My JDK"> - </form></td> - <td width="570"><span class="style3">You need to be connected to the Internet to register this Oracle product. </span></td> - </tr> - </table> - </blockquote> - </td> - </tr> - <tr> - <td> </td> - <td bgcolor="#f1f7df"> - <p class="style3">Oracle Corporation respects your privacy. - We will use your personal information for communications - and management of your Oracle.com account, the services - and applications you access using your Oracle.com account, - and the products and systems you register with your Oracle.com account.</p> - <p class="style3">For more information on the data that will be collected as - part of the registration process and how it will be managed <br> - see <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>. <br> - <br> - For more information on Oracle's Privacy Policy see <a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> or contact <a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">privacy_ww@oracle.com.</a></p></td> - </tr> - <tr> - <td> </td> - <td> </td> - </tr> - <tr> - <td> </td> - <td> </td> - </tr> -</table> -</body> -</html> diff --git a/extra/source/jdk-6/register_ja.html b/extra/source/jdk-6/register_ja.html deleted file mode 100644 index 330e8430..00000000 --- a/extra/source/jdk-6/register_ja.html +++ /dev/null @@ -1,91 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.or -g/TR/html4/loose.dtd"> -<html><head> - - -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>JDK 製å“登録</title> - -<!-- -Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. -DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - -This code is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License version 2 only, as -published by the Free Software Foundation. Oracle designates this -particular file as subject to the "Classpath" exception as provided -by Oracle in the LICENSE file that accompanied this code. - -This code is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -version 2 for more details (a copy is included in the LICENSE file that -accompanied this code). - -You should have received a copy of the GNU General Public License version -2 along with this work; if not, write to the Free Software Foundation, -Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - -Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA -or visit www.oracle.com if you need additional information or have any -questions. ---> - -<style type="text/css"> -<!-- -.style1 {font-family: Arial, Helvetica, sans-serif} -.style3 {font-family: Arial, Helvetica, sans-serif; font-size: small; } -input.buttonblue,input.defbutton{ background: #3F6580;border-right:1px solid #304C60;border-bottom:1px solid #304C60;border-left:1px solid #BACDD9;border-top:1px solid #BACDD9; font-weight:bold; color:#FFFFFF; font-size:.8em; height:1.9em} -input.buttonblue:hover{color:#fbe249;} -a:link,a.named:visited{color:#3E6B8A} -a:hover{text-decoration:underline} -a{text-decoration:none} -a:visited,a:visited code{color:#917E9C} ---> -</style></head><body> -<table border="0" cellpadding="3" cellspacing="0" width="813"> - <tbody><tr> - <td height="78" width="7"> </td> - <td align="left" valign="top" width="794"><img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre/lib/servicetag/jdk_header.png" height="63" width="783"></td> - </tr> - <tr> - <td> </td> - - <td><p class="style1">Oracle Corporation ã®<strong> Java Development Kit Version 6 Update 25 </strong>をインストールã—ã¦ã„ãŸã ãã€ã‚ã‚ŠãŒã¨ã†ã”ã–ã„ã¾ã™ã€‚ </p> - <p class="style1">製å“登録をã™ã‚‹ã¨ã€æ¬¡ã®ã‚ˆã†ãªç‰¹å…¸ã‚’å—ã‘ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</p> - <ul class="style1"> - <li> 最新ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€ãƒ‘ッãƒã€ãŠã‚ˆã³æ›´æ–°ã«ã¤ã„ã¦ã®é€šçŸ¥</li> - <li> Oracle ã®é–‹ç™ºè€…å‘ã‘製å“ã€ã‚µãƒ¼ãƒ“スã€ãŠã‚ˆã³ãƒˆãƒ¬ãƒ¼ãƒ‹ãƒ³ã‚°ã®ç‰¹åˆ¥è²©å£² </li> - <li> アーリーリリースãŠã‚ˆã³ãƒ‰ã‚ュメントã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ </li> - </ul> - <p class="style1">製å“登録ã¯ç„¡æ–™ã§ã‚ã‚Šã€è¿…速ã§ç°¡å˜ã§ã™ã€‚</p> - <blockquote> - <p class="style1">å¿…è¦ã«ãªã‚‹ã®ã¯ã€Oracle.com アカウントã ã‘ã§ã™ã€‚ ã¾ã アカウントãŒãªã„å ´åˆã¯ã€ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ä½œæˆãŒæ±‚ã‚られã¾ã™ã€‚ </p> - <table width="708" border="0" cellspacing="0" cellpadding="3"> - <tr valign="top"> - <td width="126" height="35"><form name="form1" method="post" action="https://hs-ws1.oracle.com/RegistrationWeb/register/urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58?product=jdk&locale=ja" enctype="text/xml"> - <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>00000000</hostId><osName>Linux</osName><osVersion>2.6.37.6</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58%22 version=%221.0%22><service_tag><instance_urn>urn:st:14aa9f1c-8a07-4e99-ada1-a020589ad7fd</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_25</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_25-b06 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2011-04-24 03:00:46 GMT</timestamp><container>global</container><source>jdk-6u25-fcs-bin-b06-linux-amd64-14_apr_2011.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>"> - <input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';" value="JDK 製å“登録"> - </form></td> - <td width="570"><span class="style3">ã“ã® Oracle 製å“を登録ã™ã‚‹ã«ã¯ã€ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«æŽ¥ç¶šã—ã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ </span></td> - </tr> - </table> - </blockquote> - </td> - </tr> - <tr> - <td> </td> - <td bgcolor="#f1f7df"> - <p class="style3">Oracle Corporation ã¯ã€ãŠå®¢æ§˜ã®ãƒ—ライãƒã‚·ãƒ¼ã‚’å°Šé‡ã—ã¾ã™ã€‚ ãŠå®¢æ§˜ã®å€‹äººæƒ…å ±ã¯ã€ãŠå®¢æ§˜ã® Oracle.com アカウントã€ãŠå®¢æ§˜ãŒ Oracle.com アカウントを使用ã—ã¦ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã‚µãƒ¼ãƒ“スã¨ã‚¢ãƒ—リケーションã€ãŠã‚ˆã³ãŠå®¢æ§˜ãŒ Oracle.com アカウントã§ç™»éŒ²ã™ã‚‹è£½å“ã¨ã‚·ã‚¹ãƒ†ãƒ ã®é€šä¿¡ã¨ç®¡ç†ã«ä½¿ç”¨ã—ã¾ã™ã€‚</p> - <p class="style3">登録ã®éš›ã«åŽé›†ã•ã‚Œã‚‹ãƒ‡ãƒ¼ã‚¿ã‚„ã€ãれらãŒã©ã®ã‚ˆã†ã«ç®¡ç†ã•ã‚Œã‚‹ã‹ã«ã¤ã„ã¦ã®è©³ç´°ã¯ã€<br><a href="http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/ja/registration/JDKRegistrationPrivacy.html</a> ã‚’å‚ç…§ã—ã¦ãã ã•ã„。 <br> <br> Oracle ã®ãƒ—ライãƒã‚·ãƒ¼ãƒãƒªã‚·ãƒ¼ã«ã¤ã„ã¦ã®è©³ç´°ã¯ã€<a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> ã‚’å‚ç…§ã™ã‚‹ã‹ã€<a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">ãŠå•ã„åˆã‚ã›ãƒ•ã‚©ãƒ¼ãƒ </a>ã‹ã‚‰ãŠå•ã„åˆã‚ã›ãã ã•ã„。</p></td> - </tr> - <tr> - <td> </td> - <td> </td> - </tr> - <tr> - <td> </td> - <td> </td> - </tr> -</table> -</body> -</html> diff --git a/extra/source/jdk-6/register_zh_CN.html b/extra/source/jdk-6/register_zh_CN.html deleted file mode 100644 index d17e3535..00000000 --- a/extra/source/jdk-6/register_zh_CN.html +++ /dev/null @@ -1,66 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" -"http://www.w3.org/TR/html4/loose.dtd"> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>注册您的 JDK</title> -<style type="text/css"> -<!-- -.style1 {font-family: Arial, Helvetica, sans-serif} -.style3 {font-family: Arial, Helvetica, sans-serif; font-size: small; } -input.buttonblue,input.defbutton{ background: #3F6580;border-right:1px solid #304C60;border-bottom:1px solid #304C60;border-left:1px solid #BACDD9;border-top:1px solid #BACDD9; font-weight:bold; color:#FFFFFF; font-size:.8em; height:1.9em} -input.buttonblue:hover{color:#fbe249;} -a:link,a.named:visited{color:#3E6B8A} -a:hover{text-decoration:underline} -a{text-decoration:none} -a:visited,a:visited code{color:#917E9C} ---> -</style></head><body> -<table border="0" cellpadding="3" cellspacing="0" width="813"> - <tbody><tr> - <td height="78" width="7"> </td> - <td align="left" valign="top" width="794"><img src="file:/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre/lib/servicetag/jdk_header.png" height="63" width="783"></td> - </tr> - - <tr> - <td> </td> - -<td><p class="style1">感谢您安装 Oracle Corporation çš„ <strong>Java Development Kit Version 6 Update 25</strong>。 </p> -<p class="style1">注册产å“åŽæ‚¨å°†èŽ·å¾—如下增值æœåŠ¡ï¼š</p> - <ul class="style1"> -<li> 获得新版本ã€ä¿®è¡¥ç¨‹åºå’Œæ›´æ–°çš„通知æœåŠ¡</li> -<li> 获得有关 Oracle å¼€å‘者产å“ã€æœåŠ¡å’ŒåŸ¹è®çš„ä¼˜æƒ </li> -<li> 获得对早期版本和文档的访问æƒé™ </li> - </ul> -<p class="style1">产å“注册是å…费的，å³å¿«é€Ÿåˆè½»æ¾ï¼</p> - <blockquote> -<p class="style1">您需è¦å…·æœ‰ Oracle.com å¸æˆ·ã€‚如果您没有，系统将æ示您创建一个。 </p> - <table width="708" border="0" cellspacing="0" cellpadding="3"> - <tr valign="top"> - <td width="126" height="35"><form name="form1" method="post" action="https://hs-ws1.oracle.com/RegistrationWeb/register/urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58?product=jdk&locale=zh_CN" enctype="text/xml"> - <input type="hidden" name="servicetag_payload" value="<?xml version=%221.0%22 encoding=%22UTF-8%22 standalone=%22no%22?><registration_data version=%221.0%22><environment><hostname>midas64</hostname><hostId>00000000</hostId><osName>Linux</osName><osVersion>2.6.37.6</osVersion><osArchitecture>amd64</osArchitecture><systemModel>AuthenticAMD</systemModel><systemManufacturer>emachines</systemManufacturer><cpuManufacturer>AuthenticAMD</cpuManufacturer><serialNumber>ptnba0200193508e052700</serialNumber></environment><registry urn=%22urn:st:38623f4b-7a05-441f-9da6-39cc71ca5a58%22 version=%221.0%22><service_tag><instance_urn>urn:st:14aa9f1c-8a07-4e99-ada1-a020589ad7fd</instance_urn><product_name>Java SE 6 Development Kit</product_name><product_version>1.6.0_25</product_version><product_urn>urn:uuid:b58ef9a8-5ae8-11db-a023-080020a9ed93</product_urn><product_parent_urn>urn:uuid:fdc90b21-018d-4cab-b866-612c7c119ed3</product_parent_urn><product_parent>Java Platform Standard Edition 6 (Java SE 6)</product_parent><product_defined_inst_id>id=1.6.0_25-b06 amd64,dir=/tmp/package-jdk/usr/lib64/jdk1.6.0_25/jre</product_defined_inst_id><product_vendor>Sun Microsystems</product_vendor><platform_arch>amd64</platform_arch><timestamp>2011-04-24 03:00:46 GMT</timestamp><container>global</container><source>jdk-6u25-fcs-bin-b06-linux-amd64-14_apr_2011.bin</source><installer_uid>-1</installer_uid></service_tag></registry></registration_data>"> -<input type="submit" name="Submit"border="0" class="buttonblue" onmouseover="this.style.color='#fbe249';" onmouseout="this.style.color='#FFF';" value="注册我的 JDK"> - </form></td> -<td width="570"><span class="style3">您需è¦è¿žæŽ¥åˆ° Internet æ¥æ³¨å†Œæ¤ Oracle 产å“。 </span></td> - </tr> - </table> - </blockquote> - </td> - </tr> - <tr> - <td> </td> - <td bgcolor="#f1f7df"> - <p class="style3">Oracle å°Šé‡æ‚¨çš„éšç§ã€‚我们会将您的个人信æ¯ç”¨äºŽé€šä¿¡å’Œ Oracle.com å¸æˆ·çš„管ç†ã€Oracle.com å¸æˆ·è®¿é—®çš„æœåŠ¡å’Œåº”用程åºä»¥åŠç”¨äºŽä½¿ç”¨ Oracle.com å¸æˆ·æ³¨å†Œçš„产å“和系统。</p> -<p class="style3">有关注册过程ä¸æ”¶é›†çš„æ•°æ®ä»¥åŠè¿™äº›æ•°æ®çš„管ç†æ–¹å¼çš„更多信æ¯ï¼Œ<br>请访问 <a href="http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html">http://java.sun.com/javase/registration/JDKRegistrationPrivacy.html</a>。<br> <br>有关 Oracle éšç§æ”¿ç–的更多信æ¯ï¼Œè¯·è®¿é—® <a href="http://www.oracle.com/html/privacy.html">http://www.oracle.com/html/privacy.html</a> 或与 <a class="moz-txt-link-rfc2396E" href="mailto:privacy_ww@oracle.com">privacy_ww@oracle.com</a> è”系。</p></td> - </tr> - <tr> - <td> </td> - <td> </td> - </tr> - <tr> - <td> </td> - <td> </td> - </tr> -</table> -</body> -</html> diff --git a/extra/source/recordmydesktop/recordmydesktop.SlackBuild b/extra/source/recordmydesktop/recordmydesktop.SlackBuild index c5ff5d0e..837f873e 100755 --- a/extra/source/recordmydesktop/recordmydesktop.SlackBuild +++ b/extra/source/recordmydesktop/recordmydesktop.SlackBuild @@ -46,10 +46,20 @@ PRGNAM=recordmydesktop VERSION=${VERSION:-0.3.8.1} QTVER=${QTVER:-0.3.8} -ARCH=${ARCH:-x86_64} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:" -j4 "} +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) ARCH=$(uname -m) ;; + esac + export ARCH +fi + DOCS="AUTHORS COPYING README ChangeLog" QTDOCS="AUTHORS COPYING README ChangeLog" diff --git a/extra/source/wicd/README.SLACKWARE b/extra/source/wicd/README.SLACKWARE index 47a9cba9..e7a374dc 100644 --- a/extra/source/wicd/README.SLACKWARE +++ b/extra/source/wicd/README.SLACKWARE @@ -13,9 +13,5 @@ Your user account will need to be a member of the 'netdev' group in order to use wicd. Note that urwid will need to be installed if you want to use the -curses client. - -Also, if you don't have kde installed, you won't have a graphical -sudo client available; you might wish to consider ktsuss from -SlackBuilds.org. - +curses client. Also, if you don't have kde installed, you won't +have a graphical sudo client available. diff --git a/extra/source/wicd/doinst.sh b/extra/source/wicd/doinst.sh index 2c0f7d98..78732c5b 100644 --- a/extra/source/wicd/doinst.sh +++ b/extra/source/wicd/doinst.sh @@ -33,4 +33,5 @@ fi config etc/dbus-1/system.d/wicd.conf.new config etc/rc.d/rc.wicd.new config etc/wicd/manager-settings.conf.new +config etc/logrotate.d/wicd.logrotate.new diff --git a/extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff b/extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff deleted file mode 100644 index d479b29c..00000000 --- a/extra/source/wicd/wicd-1.7.0-fix_EAP_fast_typo.diff +++ /dev/null @@ -1,23 +0,0 @@ -revno: 554 -committer: Andrew Psaltis <ampsaltis@gmail.com> -branch nick: 1.6 -timestamp: Mon 2010-03-29 13:19:08 -0400 -message: - Fixed typo in EAP-fast template, re-resolving bug 261804. - -=== modified file 'encryption/templates/eap' ---- encryption/templates/eap 2009-03-01 02:52:27 +0000 -+++ encryption/templates/eap 2010-03-29 17:19:08 +0000 -@@ -11,10 +11,10 @@ - proto=RSN WPA - pairwise=CCMP TKIP - group=CCMP TKIP -- key-mgmt=WPA-EAP -+ key_mgmt=WPA-EAP - eap=FAST - identity="$_USERNAME" - password="$_PASSWORD" - phase1="fast_provisioning=1" -- pac-file="$_PAC_FILE" -+ pac_file="$_PAC_FILE" - } diff --git a/extra/source/wicd/wicd-1.7.0-fix_script_bug.diff b/extra/source/wicd/wicd-1.7.0-fix_script_bug.diff deleted file mode 100644 index dc3ace60..00000000 --- a/extra/source/wicd/wicd-1.7.0-fix_script_bug.diff +++ /dev/null @@ -1,30 +0,0 @@ -revno: 553 -committer: Andrew Psaltis <ampsaltis@gmail.com> -branch nick: 1.6 -timestamp: Wed 2010-01-27 14:06:21 -0500 -message: - Fixed bug in script macro expansion. - -=== modified file 'wicd/networking.py' ---- wicd/networking.py 2010-01-15 04:02:10 +0000 -+++ wicd/networking.py 2010-01-27 19:06:21 +0000 -@@ -215,8 +215,8 @@ - if self.pre_disconnect_script: - print 'Running pre-disconnect script' - misc.ExecuteScript(expand_script_macros(self.pre_disconnect_script, -- 'pre-disconnection', (mac, -- name)), -+ 'pre-disconnection', -+ mac, name), - self.debug) - iface.ReleaseDHCP() - iface.SetAddress('0.0.0.0') -@@ -229,7 +229,7 @@ - print 'Running post-disconnect script' - misc.ExecuteScript(expand_script_macros(self.post_disconnect_script, - 'post-disconnection', -- (mac, name)), -+ mac, name), - self.debug) - - def ReleaseDHCP(self): diff --git a/extra/source/wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff b/extra/source/wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff new file mode 100644 index 00000000..4be44631 --- /dev/null +++ b/extra/source/wicd/wicd-1.7.2.4.sanitize.string.bugfix.diff @@ -0,0 +1,11 @@ +--- ./wicd/misc.py.orig 2012-04-30 14:20:09.000000000 -0500 ++++ ./wicd/misc.py 2012-05-09 14:08:24.611298308 -0500 +@@ -430,7 +430,7 @@ + """ Sanitize property names to be used in config-files. """ + allowed = string.ascii_letters + '_' + string.digits + table = string.maketrans(allowed, ' ' * len(allowed)) +- return s.translate(None, table) ++ return s.encode('ascii', 'replace').translate(None, table) + + def sanitize_escaped(s): + """ Sanitize double-escaped unicode strings. """ diff --git a/extra/source/wicd/wicd.SlackBuild b/extra/source/wicd/wicd.SlackBuild index 20dcd393..77c00f46 100755 --- a/extra/source/wicd/wicd.SlackBuild +++ b/extra/source/wicd/wicd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2008-2010 Robby Workman Northport, AL, USA +# Copyright 2008,2009,2010,2011,2012 Robby Workman Northport, AL, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,8 +21,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wicd -VERSION=${VERSION:-1.7.0} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.7.2.4} +BUILD=${BUILD:-4} # Automatically determine architecture for build & packaging: if [ -z "$ARCH" ]; then @@ -51,19 +51,30 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz || exit 1 cd $PRGNAM-$VERSION || exit 1 + chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \; -# Fix a couple of bugs that are addressed in the upstream bzr repo -zcat $CWD/wicd-1.7.0-fix_EAP_fast_typo.diff.gz | patch -p0 --verbose || exit 1 -zcat $CWD/wicd-1.7.0-fix_script_bug.diff.gz | patch -p0 --verbose || exit 1 +zcat $CWD/wicd-1.7.2.4.sanitize.string.bugfix.diff.gz | patch -p1 --verbose || exit 1 python setup.py configure \ --lib=/usr/lib${LIBDIRSUFFIX}/wicd \ --kdedir=/usr/share/autostart \ --backends=/usr/lib${LIBDIRSUFFIX}/wicd/backends \ || exit 1 + +# Bypass the need for pybabel (thanks, dapal!) +for pofile in $(find po/ -type f -name "*.po") ; do + mkdir -p translations/$(basename ${pofile} .po)/LC_MESSAGES + msgfmt -o translations/$(basename ${pofile} .po)/LC_MESSAGES/wicd.mo ${pofile} +done + python setup.py install --root=$PKG || exit 1 # Handle some Slackware defaults @@ -75,8 +86,9 @@ dhcp_client = 2 sudo_app = 2 EOF -# Don't clobber dbus config on upgrade +# Don't clobber configs on upgrade mv $PKG/etc/dbus-1/system.d/wicd.conf $PKG/etc/dbus-1/system.d/wicd.conf.new +mv $PKG/etc/logrotate.d/wicd.logrotate $PKG/etc/logrotate.d/wicd.logrotate.new mv $PKG/etc/rc.d/rc.wicd $PKG/etc/rc.d/rc.wicd.new # Compress the man pages and add a bit to the package docs diff --git a/extra/source/xf86-video-fbdev/slack-desc b/extra/source/xf86-video-fbdev/slack-desc new file mode 100644 index 00000000..08a636a1 --- /dev/null +++ b/extra/source/xf86-video-fbdev/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +xf86-video-fbdev: xf86-video-fbdev (X.Org generic framebuffer video driver) +xf86-video-fbdev: +xf86-video-fbdev: xf86-video-fbdev is the generic framebuffer video driver for X.Org, +xf86-video-fbdev: designed to draw into a video framebuffer provided by the +xf86-video-fbdev: underlying operating system. +xf86-video-fbdev: +xf86-video-fbdev: +xf86-video-fbdev: +xf86-video-fbdev: +xf86-video-fbdev: +xf86-video-fbdev: diff --git a/extra/source/fvwm-2.6.1/fvwm.SlackBuild b/extra/source/xf86-video-fbdev/xf86-video-fbdev.SlackBuild index e7aa4fa6..8ea08738 100755 --- a/extra/source/fvwm-2.6.1/fvwm.SlackBuild +++ b/extra/source/xf86-video-fbdev/xf86-video-fbdev.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2011 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,31 +21,44 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PKGNAM=fvwm +PKGNAM=xf86-video-fbdev VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; + case "$(uname -m)" in + i?86) ARCH=i486 ;; + arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7lh ;; # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; + *) ARCH=$(uname -m) ;; esac + export ARCH fi NUMJOBS=${NUMJOBS:-" -j7 "} -if [ "$ARCH" = "i486" ]; then +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mcpu=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -62,6 +75,7 @@ cd $TMP rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -69,31 +83,36 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +# Configure: +CFLAGS=$SLKCFLAGS \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ + --localstatedir=/var \ + --infodir=/usr/info \ --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --disable-bidi \ - --program-prefix= \ - --program-suffix= \ + --docdir=/usr/doc/xf86-video-fbdev-$VERSION \ + --disable-static \ --build=$ARCH-slackware-linux +# Build and install: make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -# Add a few more things: -mkdir -p $PKG/etc/X11/xinit -zcat $CWD/xinitrc.fvwm2.gz > $PKG/etc/X11/xinit/xinitrc.fvwm2 -chmod 755 $PKG/etc/X11/xinit/xinitrc.fvwm2 -#zcat $CWD/system.fvwm2rc.gz > $PKG/etc/system.fvwm2rc.new +# Strip binaries: +( cd $PKG + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +) -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null +# Add a documentation directory: +mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION +cp -a \ + COPYING* README* \ + $PKG/usr/doc/${PKGNAM}-$VERSION -# Compress and link manpages, if any: +# Compress and if needed symlink the man pages: if [ -d $PKG/usr/man ]; then ( cd $PKG/usr/man for manpagedir in $(find . -type d -name "man*") ; do @@ -108,22 +127,7 @@ if [ -d $PKG/usr/man ]; then ) fi -# Restore a few original file timestamps: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING* NEWS README* \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - mkdir -p $PKG/install -zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG |