1 |
mrness 07/10/02 05:19:47 |
2 |
|
3 |
Modified: dspam-3.8.0-r7.ebuild ChangeLog |
4 |
Log: |
5 |
Add syslog use-flag and sanitize flags processing. |
6 |
(Portage version: 2.1.3.9) |
7 |
|
8 |
Revision Changes Path |
9 |
1.3 mail-filter/dspam/dspam-3.8.0-r7.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/dspam-3.8.0-r7.ebuild?rev=1.3&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/dspam-3.8.0-r7.ebuild?rev=1.3&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/dspam-3.8.0-r7.ebuild?r1=1.2&r2=1.3 |
14 |
|
15 |
Index: dspam-3.8.0-r7.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.8.0-r7.ebuild,v |
18 |
retrieving revision 1.2 |
19 |
retrieving revision 1.3 |
20 |
diff -u -r1.2 -r1.3 |
21 |
--- dspam-3.8.0-r7.ebuild 30 Sep 2007 11:38:40 -0000 1.2 |
22 |
+++ dspam-3.8.0-r7.ebuild 2 Oct 2007 05:19:47 -0000 1.3 |
23 |
@@ -1,6 +1,6 @@ |
24 |
# Copyright 1999-2007 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.8.0-r7.ebuild,v 1.2 2007/09/30 11:38:40 mrness Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/dspam-3.8.0-r7.ebuild,v 1.3 2007/10/02 05:19:47 mrness Exp $ |
28 |
|
29 |
WANT_AUTOCONF="latest" |
30 |
WANT_AUTOMAKE="latest" |
31 |
@@ -16,7 +16,7 @@ |
32 |
LICENSE="GPL-2" |
33 |
SLOT="0" |
34 |
KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86" |
35 |
-IUSE="clamav daemon debug ldap mysql postgres sqlite \ |
36 |
+IUSE="clamav daemon debug ldap mysql postgres sqlite syslog \ |
37 |
large-domain virtual-users user-homedirs" |
38 |
|
39 |
COMMON_DEPEND="clamav? ( >=app-antivirus/clamav-0.90.2 ) |
40 |
@@ -51,11 +51,6 @@ |
41 |
} |
42 |
|
43 |
pkg_setup() { |
44 |
- if use virtual-users && use user-homedirs ; then |
45 |
- eerror "If the users are virtual, then they probably should not have home directories." |
46 |
- die "Incompatible USE flag selection" |
47 |
- fi |
48 |
- |
49 |
# Delete these lines some time after -r6 removal |
50 |
if has_version "<=mail-filter/dspam-3.8.0-r6" && |
51 |
built_with_use "<=mail-filter/dspam-3.8.0-r6" sqlite && |
52 |
@@ -83,23 +78,20 @@ |
53 |
} |
54 |
|
55 |
src_compile() { |
56 |
- local myconf="--enable-long-usernames --enable-syslog" |
57 |
- |
58 |
- use large-domain && myconf="${myconf} --enable-large-scale" || \ |
59 |
- myconf="${myconf} --enable-domain-scale" |
60 |
- |
61 |
- use user-homedirs && myconf="${myconf} --enable-homedir" |
62 |
- |
63 |
- use debug && myconf="${myconf} --enable-debug --enable-bnr-debug" |
64 |
+ local myconf="" |
65 |
|
66 |
- if use virtual-users ; then |
67 |
- if use mysql || use postgres ; then |
68 |
- myconf="${myconf} --enable-virtual-users" |
69 |
+ if use mysql || use postgres; then |
70 |
+ myconf="${myconf} $(use_enable virtual-users) --enable-preferences-extension" |
71 |
+ if use virtual-users; then |
72 |
+ myconf="${myconf} --disable-homedir" |
73 |
+ use user-homedirs && ewarn "user-homedirs support has been disabled (not compatible with --enable-virtual-users)" |
74 |
+ else |
75 |
+ myconf="${myconf} $(use_enable user-homedirs homedir)" |
76 |
fi |
77 |
- fi |
78 |
- |
79 |
- if use mysql || use postgres ; then |
80 |
- myconf="${myconf} --enable-preferences-extension" |
81 |
+ else |
82 |
+ myconf="${myconf} --disable-virtual-users --disable-preferences-extension \ |
83 |
+ $(use_enable user-homedirs homedir)" |
84 |
+ use virtual-users && ewarn "virtual-users support has been disabled (available only for mysql and postgres storage drivers)" |
85 |
fi |
86 |
|
87 |
local STORAGE="hash_drv" |
88 |
@@ -118,16 +110,23 @@ |
89 |
myconf="${myconf} --with-pgsql-libraries=/usr/$(get_libdir)/postgresql" |
90 |
fi |
91 |
|
92 |
- econf ${myconf} --with-storage-driver=${STORAGE} \ |
93 |
+ econf --with-storage-driver=${STORAGE} \ |
94 |
--with-dspam-home="${DSPAM_HOMEDIR}" \ |
95 |
--sysconfdir="${DSPAM_CONFDIR}" \ |
96 |
$(use_enable daemon) \ |
97 |
$(use_enable ldap) \ |
98 |
$(use_enable clamav) \ |
99 |
+ $(use_enable large-domain large-scale) \ |
100 |
+ $(use_enable !large-domain domain-scale) \ |
101 |
+ $(use_enable syslog) \ |
102 |
+ $(use_enable debug) \ |
103 |
+ $(use_enable debug bnr-debug) \ |
104 |
+ --enable-long-usernames \ |
105 |
--with-dspam-group=dspam \ |
106 |
--with-dspam-home-group=dspam \ |
107 |
--with-dspam-mode=${DSPAM_MODE} \ |
108 |
- --with-logdir="${DSPAM_LOGDIR}" || die "econf failed" |
109 |
+ --with-logdir="${DSPAM_LOGDIR}" \ |
110 |
+ ${myconf} || die "econf failed" |
111 |
emake || die "emake failed" |
112 |
} |
113 |
|
114 |
@@ -149,8 +148,8 @@ |
115 |
diropts -m0755 -o dspam -g dspam |
116 |
dodir /var/run/dspam |
117 |
|
118 |
- # create logdir (used only when build with debug useflag) |
119 |
- if use debug ; then |
120 |
+ # create logdir (used only when syslog support has been disabled or build with --enable-debug) |
121 |
+ if ! use syslog || use debug ; then |
122 |
diropts -m0770 -o dspam -g dspam |
123 |
dodir "${DSPAM_LOGDIR}" |
124 |
diropts -m0755 |
125 |
|
126 |
|
127 |
|
128 |
1.99 mail-filter/dspam/ChangeLog |
129 |
|
130 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/ChangeLog?rev=1.99&view=markup |
131 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/ChangeLog?rev=1.99&content-type=text/plain |
132 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/dspam/ChangeLog?r1=1.98&r2=1.99 |
133 |
|
134 |
Index: ChangeLog |
135 |
=================================================================== |
136 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v |
137 |
retrieving revision 1.98 |
138 |
retrieving revision 1.99 |
139 |
diff -u -r1.98 -r1.99 |
140 |
--- ChangeLog 30 Sep 2007 11:38:40 -0000 1.98 |
141 |
+++ ChangeLog 2 Oct 2007 05:19:47 -0000 1.99 |
142 |
@@ -1,6 +1,9 @@ |
143 |
# ChangeLog for mail-filter/dspam |
144 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
145 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.98 2007/09/30 11:38:40 mrness Exp $ |
146 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dspam/ChangeLog,v 1.99 2007/10/02 05:19:47 mrness Exp $ |
147 |
+ |
148 |
+ 02 Oct 2007; Alin Năstac <mrness@g.o> dspam-3.8.0-r7.ebuild: |
149 |
+ Add syslog use-flag and sanitize flags processing. |
150 |
|
151 |
*dspam-3.8.0-r7 (30 Sep 2007) |
152 |
|
153 |
|
154 |
|
155 |
|
156 |
-- |
157 |
gentoo-commits@g.o mailing list |