From 287a1c6007af5765a3306385d3578f5b7279be31 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Mon, 13 Dec 2004 16:54:26 +0000 Subject: [PATCH] Clifford Wolf: maldrop: replaced deliverquota.patch with install wrapper [2004121016380209361] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5200 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/tsa/maildrop/deliverquota.patch | 60 ------------------------- package/tsa/maildrop/maildrop.conf | 4 ++ 2 files changed, 4 insertions(+), 60 deletions(-) delete mode 100644 package/tsa/maildrop/deliverquota.patch diff --git a/package/tsa/maildrop/deliverquota.patch b/package/tsa/maildrop/deliverquota.patch deleted file mode 100644 index ae37981d1..000000000 --- a/package/tsa/maildrop/deliverquota.patch +++ /dev/null @@ -1,60 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/tsa/maildrop/deliverquota.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./Makefile.am 2003-04-24 07:42:46.000000000 +0200 -+++ ./Makefile.am 2003-05-04 01:44:00.000000000 +0200 -@@ -115,7 +115,7 @@ - if INSTALL_DELIVERQUOTA - - DELIVERQUOTAHTML=maildirquota.html deliverquota.html --DELIVERQUOTAMAN=maildirquota.7 deliverquota.8 -+DELIVERQUOTAMAN=maildirquota.7 - - # Install deliverquota into libdir/bin - # -@@ -153,7 +153,7 @@ - MAILDROPMAN=lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.5 \ - maildir.5 \ - maildropfilter.5 maildropgdbm.5 makemime.1 reformail.1 reformime.1 \ -- maildirquota.7 deliverquota.8 -+ maildirquota.7 - - EXTRA_LIBRARIES=librfc822.a librfc2045.a - -diff -Nur maildrop-1.5.3.orig/Makefile.in maildrop-1.5.3/Makefile.in ---- maildrop-1.5.3.orig/Makefile.in 2003-05-01 22:12:19.000000000 +0200 -+++ maildrop-1.5.3/Makefile.in 2003-05-04 01:44:18.000000000 +0200 -@@ -119,7 +119,7 @@ - - @INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAHTML = maildirquota.html deliverquota.html - @INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAHTML = --@INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAMAN = maildirquota.7 deliverquota.8 -+@INSTALL_DELIVERQUOTA_TRUE@DELIVERQUOTAMAN = maildirquota.7 - @INSTALL_DELIVERQUOTA_FALSE@DELIVERQUOTAMAN = - - MAILDROPHTML = lockmail.html maildirmake.html maildropex.html \ -@@ -131,7 +131,7 @@ - MAILDROPMAN = lockmail.1 maildirmake.1 maildrop.1 mailbot.1 maildropex.5 \ - maildir.5 \ - maildropfilter.5 maildropgdbm.5 makemime.1 reformail.1 reformime.1 \ -- maildirquota.7 deliverquota.8 -+ maildirquota.7 - - - EXTRA_LIBRARIES = librfc822.a librfc2045.a diff --git a/package/tsa/maildrop/maildrop.conf b/package/tsa/maildrop/maildrop.conf index d97eae98f..ba8191710 100644 --- a/package/tsa/maildrop/maildrop.conf +++ b/package/tsa/maildrop/maildrop.conf @@ -23,3 +23,7 @@ var_append confopt " " "--with-devel" var_append confopt " " "--enable-syslog=1" +# avoid shared file with courier-imap +var_append INSTALL_WRAPPER_FILTER "|" \ + "sed 's,\(/usr/bin\|/usr/share/man/man8\)/deliverquota,\1/deliverquota_maildrop,'" +