network/r2e: Updated for version 2.71 + new maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

1 files changed, 39 insertions, 56 deletions

diff --git a/network/r2e/r2e.SlackBuild b/network/r2e/r2e.SlackBuild
index be493c8848..4811e8e369 100644
--- a/network/r2e/r2e.SlackBuild
+++ b/network/r2e/r2e.SlackBuild
@@ -1,51 +1,38 @@
 #!/bin/sh
 
 # Slackware build script for r2e
+
 # Written by Tom Canich <tcanich@canich.net>
 # Released under the BSD
+# Modified by Robby Workman <rworkman@slackbuilds.org>
 # Copyright (c) 2009, Tom Canich, State College, Pennsylvania, USA
+# Copyright 2016, Alexander Verbovetsky, Moscow, Russia
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#		disclaimer in the documentation and/or other materials
-#		provided with the distribution.
-#     * Neither the name of Tom Canich nor the names of other
-#		contributors may be used to endorse or promote products
-#		derived from this software without specific prior written
-#		permission.
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
 #
-# THIS SOFTWARE IS PROVIDED BY Tom Canich ''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 Tom Canich BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
-# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Modified by Robby Workman <rworkman@slackbuilds.org>
+# 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=r2e
-VERSION=2.66
+PRGNAMLONG=rss2email
+VERSION=${VERSION:-2.71}
 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
+ARCH=noarch
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
@@ -57,35 +44,31 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/rss2email-$VERSION.tar.gz
-cd rss2email-$VERSION
+rm -rf $PRGNAMLONG-$VERSION
+tar xvf $CWD/$PRGNAMLONG-$VERSION.tar.gz
+chmod -R a=r,a+X,u+w $PRGNAMLONG-$VERSION
+cd $PRGNAMLONG-$VERSION
+chown -R root:root .
 
-# Patch rss2email.py so that our config.py location is shown
-patch -p1 < $CWD/config.py.patch
+patch -p1 < $CWD/remove-newlines.patch
+patch -p1 < $CWD/fix-email-header-injection.patch
+sed --in-place \
+  -e 's/http:\/\/rss2email.infogami.com/http:\/\/www.allthingsrss.com\/rss2email\//g' \
+  -e 's/__version__ = "2.70"/__version__ = "2.71"/' \
+  rss2email.py
+[ "${CERTVER:-yes}" = "no" ] && patch < $CWD/rss2email.certver.patch
 
-mkdir -p $PKG/usr/lib/$PRGNAM
-install -m 0755 -o root -g root feedparser.py $PKG/usr/lib/$PRGNAM
-install -m 0755 -o root -g root html2text.py $PKG/usr/lib/$PRGNAM
-install -m 0755 -o root -g root rss2email.py $PKG/usr/lib/$PRGNAM
+mkdir -p $PKG/usr/share/$PRGNAM
+install -m 0644 -o root -g root feedparser.py $PKG/usr/share/$PRGNAM
+install -m 0644 -o root -g root html2text.py $PKG/usr/share/$PRGNAM
+install -m 0644 -o root -g root rss2email.py $PKG/usr/share/$PRGNAM
 
 mkdir -p $PKG/usr/bin
 install -m 0755 -o root -g root $CWD/wrapper.r2e $PKG/usr/bin/r2e
 
-mkdir -p $PKG/etc/r2e
-cat << EOF > $PKG/etc/r2e/config.py.new
-# This directory and file location is SlackBuilds.org-specific.
-# In other words, this is a deviation from upstream.
-# Official r2e looks in its current working directory for config.py,
-# which is actually /usr/lib/r2e in this package.  As such, this
-# config.py file is symlinked to that location as well.
-#
-EOF
-cat config.py >> $PKG/etc/r2e/config.py.new
-( cd $PKG/usr/lib/$PRGNAM ; ln -s ../../../etc/r2e/config.py config.py )
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README
+cp -a CHANGELOG config.py.example readme.html $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/README.Slackware > $PKG/usr/doc/$PRGNAM-$VERSION/README.Slackware
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install