diff options
| -rw-r--r-- | network/leafnode/README | 4 | ||||
| -rw-r--r-- | network/leafnode/leafnode.SlackBuild | 13 | ||||
| -rw-r--r-- | network/leafnode/leafnode.info | 8 | ||||
| -rw-r--r-- | network/leafnode/patches/applyfilter_plugleak.diff | 37 | ||||
| -rw-r--r-- | network/leafnode/patches/sizeof_fix.diff | 12 | ||||
| -rw-r--r-- | network/leafnode/patches/texpire_delete.diff | 21 |
6 files changed, 8 insertions, 87 deletions
diff --git a/network/leafnode/README b/network/leafnode/README index 08f7ca92b812..004977ddaae0 100644 --- a/network/leafnode/README +++ b/network/leafnode/README @@ -16,6 +16,4 @@ before installing Leafnode 2. In summary you will need to: 6. Fetch the newsgroup list from the upstream server. 7. Set your newsreader to use 'localhost'. -Future versions of Leafnode 2 will have access to the lua programming / -scripting language so we will be sitting tight with this particular version -of Leafnode 2 until the lua-enabled version has matured a little. +This is the non Lua-enabled version of Leafnode 2. diff --git a/network/leafnode/leafnode.SlackBuild b/network/leafnode/leafnode.SlackBuild index e7b9b505c92b..722fa127ac61 100644 --- a/network/leafnode/leafnode.SlackBuild +++ b/network/leafnode/leafnode.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for Leafnode 2 -# Copyright 2008-2009 Andrew Strong (http://www.andrews-corner.org) +# Copyright 2008-2011 Andrew Strong (http://www.andrews-corner.org) # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=leafnode -VERSION=2.0.0.alpha20081229a -BUILD=${BUILD:-3} +VERSION=2.0.0.alpha20110807a +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,13 +69,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix compiler error with recent gcc: -patch -p1 < $CWD/patches/sizeof_fix.diff -# Fix memory leak with applyfilter: -patch -p1 < $CWD/patches/applyfilter_plugleak.diff -# Don't delete articles when texpire -n -C MessID is run: -patch -p1 < $CWD/patches/texpire_delete.diff - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/leafnode/leafnode.info b/network/leafnode/leafnode.info index 4790b46cc1a5..fd09cd24a103 100644 --- a/network/leafnode/leafnode.info +++ b/network/leafnode/leafnode.info @@ -1,10 +1,10 @@ PRGNAM="leafnode" -VERSION="2.0.0.alpha20081229a" +VERSION="2.0.0.alpha20110807a" HOMEPAGE="http://www-dt.e-technik.uni-dortmund.de/~ma/leafnode/beta/" -DOWNLOAD="http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20081229a.tar.bz2" -MD5SUM="63972974353e4da064cf2646b93cc586" +DOWNLOAD="http://home.pages.de/~mandree/leafnode/beta/leafnode-2.0.0.alpha20110807a.tar.bz2" +MD5SUM="14bbaf19edd7ce0de7c30c3dfe87f520" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Andrew Strong" -EMAIL="andrew.david.45@gmail.com" +EMAIL="andrew@andrews-corner.org" APPROVED="rworkman" diff --git a/network/leafnode/patches/applyfilter_plugleak.diff b/network/leafnode/patches/applyfilter_plugleak.diff deleted file mode 100644 index 54274cb99803..000000000000 --- a/network/leafnode/patches/applyfilter_plugleak.diff +++ /dev/null @@ -1,37 +0,0 @@ ---- a/applyfilter.c -+++ b/applyfilter.c -@@ -71,14 +71,12 @@ static int applyfilter(const char *name, struct newsgroup *g, - unsigned long *kept, unsigned long *deleted) - { - static size_t lsize = MAXHEADERSIZE + 1; -- static char *l; -+ char *l; - struct stat st; - int score, fd; - struct utimbuf u; - unsigned long n; - -- l = (char *)critmalloc(lsize, "Space for article"); -- - if (stat(name, &st)) { - ln_log(LNLOG_SNOTICE, LNLOG_CARTICLE, - "cannot stat file \"%s\" in newsgroup %s: %m", -@@ -97,6 +95,8 @@ static int applyfilter(const char *name, struct newsgroup *g, - return 0; - } - -+ l = (char *)critmalloc(lsize, "Space for article"); -+ - if((fd = open(name, O_RDONLY)) >= 0) - { - int ret; -@@ -167,6 +167,9 @@ static int applyfilter(const char *name, struct newsgroup *g, - ln_log(LNLOG_SERR, LNLOG_CARTICLE, - "could not open file \"%s\" in newsgroup %s\n", - name, g->name); -+ -+ free(l); -+ - return 0; - } - diff --git a/network/leafnode/patches/sizeof_fix.diff b/network/leafnode/patches/sizeof_fix.diff deleted file mode 100644 index a5e519dfb069..000000000000 --- a/network/leafnode/patches/sizeof_fix.diff +++ /dev/null @@ -1,12 +0,0 @@ ---- a/system.h 2008-12-29 22:24:30.000000000 +1100 -+++ b/system.h 2010-05-26 19:39:22.376358080 +1000 -@@ -20,9 +20,6 @@ - #include <inttypes.h> - #elif HAVE_STDINT_H - #include <stdint.h> --#elif sizeof(unsigned long) == 4 && sizeof(unsigned char) == 1 --typedef unsigned long uint32_t; --typedef unsigned char uint8_t; - #else - #error "I cannot figure how to define uint32_t and uint8_t." - #endif diff --git a/network/leafnode/patches/texpire_delete.diff b/network/leafnode/patches/texpire_delete.diff deleted file mode 100644 index 9347a39e4362..000000000000 --- a/network/leafnode/patches/texpire_delete.diff +++ /dev/null @@ -1,21 +0,0 @@ -# commit f8c3b831ea2af3de9036c3dbebcff27fbfcfeec4 -# Author: Matthias Andree <matthias.andree@gmx.de> -# Date: Fri May 27 01:22:44 2011 +0200 -# -# Bugfix: don't delete articles when texpire -n -C MessID is run. -# -# Found by Paul Brooks. - ---- a/texpire.c -+++ b/texpire.c -@@ -1123,7 +1123,9 @@ main(int argc, char **argv) - while(optind < argc) { - if (verbose) - printf("Trying to remove %s...\n", argv[optind]); -- delete_article(argv[optind], "Remove", "Removed", 1); -+ if (!dryrun) { -+ delete_article(argv[optind], "Remove", "Removed", 1); -+ } - optind++; - } - break; |