diff options
author | Andrew Strong <andrew.david.45@gmail.com> | 2011-06-19 23:13:42 -0500 |
---|---|---|
committer | Robby Workman <rworkman@slackbuilds.org> | 2011-06-19 23:13:42 -0500 |
commit | f0fdcd72c110b6f8e00c1abca6f732ec5b39ab66 (patch) | |
tree | 58088d884dc611c82c196ea2bfb46c3b64f0ba2f | |
parent | 0149d7cf147a6e566a9ba08f65cbe9107658ad6f (diff) | |
download | slackbuilds-f0fdcd72c110b6f8e00c1abca6f732ec5b39ab66.tar.gz |
network/leafnode: Included upstream patch for texpire
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
-rw-r--r-- | network/leafnode/leafnode.SlackBuild | 8 | ||||
-rw-r--r-- | network/leafnode/patches/applyfilter_plugleak.diff (renamed from network/leafnode/applyfilter_plugleak.diff) | 0 | ||||
-rw-r--r-- | network/leafnode/patches/sizeof_fix.diff (renamed from network/leafnode/sizeof_fix.diff) | 0 | ||||
-rw-r--r-- | network/leafnode/patches/texpire_delete.diff | 21 |
4 files changed, 26 insertions, 3 deletions
diff --git a/network/leafnode/leafnode.SlackBuild b/network/leafnode/leafnode.SlackBuild index d485cba99e..e7b9b505c9 100644 --- a/network/leafnode/leafnode.SlackBuild +++ b/network/leafnode/leafnode.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=leafnode VERSION=2.0.0.alpha20081229a -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -70,9 +70,11 @@ find . \ -exec chmod 644 {} \; # Fix compiler error with recent gcc: -patch -p1 < $CWD/sizeof_fix.diff +patch -p1 < $CWD/patches/sizeof_fix.diff # Fix memory leak with applyfilter: -patch -p1 < $CWD/applyfilter_plugleak.diff +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" \ diff --git a/network/leafnode/applyfilter_plugleak.diff b/network/leafnode/patches/applyfilter_plugleak.diff index 54274cb998..54274cb998 100644 --- a/network/leafnode/applyfilter_plugleak.diff +++ b/network/leafnode/patches/applyfilter_plugleak.diff diff --git a/network/leafnode/sizeof_fix.diff b/network/leafnode/patches/sizeof_fix.diff index a5e519dfb0..a5e519dfb0 100644 --- a/network/leafnode/sizeof_fix.diff +++ b/network/leafnode/patches/sizeof_fix.diff diff --git a/network/leafnode/patches/texpire_delete.diff b/network/leafnode/patches/texpire_delete.diff new file mode 100644 index 0000000000..9347a39e43 --- /dev/null +++ b/network/leafnode/patches/texpire_delete.diff @@ -0,0 +1,21 @@ +# 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; |