| 1 |
ticho 07/11/14 19:25:06 |
| 2 |
|
| 3 |
Modified: ChangeLog clamav-0.91.2.ebuild |
| 4 |
clamav-0.92_rc2.ebuild |
| 5 |
Removed: clamav-0.91.1.ebuild clamav-0.91.ebuild |
| 6 |
Log: |
| 7 |
Version cleanup. Get rid of logrotate USE flag - bug #198901. |
| 8 |
(Portage version: 2.1.3.18) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.256 app-antivirus/clamav/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/ChangeLog?rev=1.256&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/ChangeLog?rev=1.256&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/ChangeLog?r1=1.255&r2=1.256 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v |
| 20 |
retrieving revision 1.255 |
| 21 |
retrieving revision 1.256 |
| 22 |
diff -u -r1.255 -r1.256 |
| 23 |
--- ChangeLog 10 Oct 2007 08:47:41 -0000 1.255 |
| 24 |
+++ ChangeLog 14 Nov 2007 19:25:05 -0000 1.256 |
| 25 |
@@ -1,6 +1,10 @@ |
| 26 |
# ChangeLog for app-antivirus/clamav |
| 27 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.255 2007/10/10 08:47:41 lordvan Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.256 2007/11/14 19:25:05 ticho Exp $ |
| 30 |
+ |
| 31 |
+ 14 Nov 2007; Andrej Kacian <ticho@g.o> -clamav-0.91.ebuild, |
| 32 |
+ -clamav-0.91.1.ebuild, clamav-0.91.2.ebuild, clamav-0.92_rc2.ebuild: |
| 33 |
+ Version cleanup. Get rid of logrotate USE flag - bug #198901. |
| 34 |
|
| 35 |
*clamav-0.92_rc2 (10 Oct 2007) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
|
| 40 |
1.9 app-antivirus/clamav/clamav-0.91.2.ebuild |
| 41 |
|
| 42 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/clamav-0.91.2.ebuild?rev=1.9&view=markup |
| 43 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/clamav-0.91.2.ebuild?rev=1.9&content-type=text/plain |
| 44 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/clamav-0.91.2.ebuild?r1=1.8&r2=1.9 |
| 45 |
|
| 46 |
Index: clamav-0.91.2.ebuild |
| 47 |
=================================================================== |
| 48 |
RCS file: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.91.2.ebuild,v |
| 49 |
retrieving revision 1.8 |
| 50 |
retrieving revision 1.9 |
| 51 |
diff -u -r1.8 -r1.9 |
| 52 |
--- clamav-0.91.2.ebuild 29 Aug 2007 10:27:34 -0000 1.8 |
| 53 |
+++ clamav-0.91.2.ebuild 14 Nov 2007 19:25:05 -0000 1.9 |
| 54 |
@@ -1,6 +1,6 @@ |
| 55 |
# Copyright 1999-2007 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.91.2.ebuild,v 1.8 2007/08/29 10:27:34 corsair Exp $ |
| 58 |
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.91.2.ebuild,v 1.9 2007/11/14 19:25:05 ticho Exp $ |
| 59 |
|
| 60 |
inherit autotools eutils flag-o-matic fixheadtails |
| 61 |
|
| 62 |
@@ -11,7 +11,7 @@ |
| 63 |
LICENSE="GPL-2" |
| 64 |
SLOT="0" |
| 65 |
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" |
| 66 |
-IUSE="bzip2 crypt logrotate mailwrapper milter nls selinux" |
| 67 |
+IUSE="bzip2 crypt mailwrapper milter nls selinux" |
| 68 |
|
| 69 |
DEPEND="virtual/libc |
| 70 |
bzip2? ( app-arch/bzip2 ) |
| 71 |
@@ -23,7 +23,6 @@ |
| 72 |
>=sys-apps/sed-4" |
| 73 |
RDEPEND="${DEPEND} |
| 74 |
selinux? ( sec-policy/selinux-clamav ) |
| 75 |
- logrotate? ( app-admin/logrotate ) |
| 76 |
sys-apps/grep" |
| 77 |
PROVIDE="virtual/antivirus" |
| 78 |
|
| 79 |
@@ -74,11 +73,11 @@ |
| 80 |
} |
| 81 |
|
| 82 |
src_install() { |
| 83 |
- make DESTDIR=${D} install || die |
| 84 |
+ make DESTDIR="${D}" install || die |
| 85 |
dodoc AUTHORS BUGS NEWS README ChangeLog FAQ |
| 86 |
- newconfd ${FILESDIR}/clamd.conf clamd |
| 87 |
- newinitd ${FILESDIR}/clamd.rc clamd |
| 88 |
- dodoc ${FILESDIR}/clamav-milter.README.gentoo |
| 89 |
+ newconfd "${FILESDIR}"/clamd.conf clamd |
| 90 |
+ newinitd "${FILESDIR}"/clamd.rc clamd |
| 91 |
+ dodoc "${FILESDIR}"/clamav-milter.README.gentoo |
| 92 |
|
| 93 |
dodir /var/run/clamav |
| 94 |
keepdir /var/run/clamav |
| 95 |
@@ -94,7 +93,7 @@ |
| 96 |
-e "s:.*\(User\) .*:\1 clamav:" \ |
| 97 |
-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \ |
| 98 |
-e "s:^\#\(LogTime\).*:\1 yes:" \ |
| 99 |
- ${D}/etc/clamd.conf |
| 100 |
+ "${D}"/etc/clamd.conf |
| 101 |
|
| 102 |
# Do the same for /etc/freshclam.conf |
| 103 |
sed -i -e "s:^\(Example\):\# \1:" \ |
| 104 |
@@ -103,24 +102,22 @@ |
| 105 |
-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \ |
| 106 |
-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \ |
| 107 |
-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ |
| 108 |
- ${D}/etc/freshclam.conf |
| 109 |
+ "${D}"/etc/freshclam.conf |
| 110 |
|
| 111 |
if use milter ; then |
| 112 |
echo "START_MILTER=no" \ |
| 113 |
- >> ${D}/etc/conf.d/clamd |
| 114 |
+ >> "${D}"/etc/conf.d/clamd |
| 115 |
echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \ |
| 116 |
- >>${D}/etc/conf.d/clamd |
| 117 |
+ >>"${D}"/etc/conf.d/clamd |
| 118 |
echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \ |
| 119 |
- >>${D}/etc/conf.d/clamd |
| 120 |
+ >>"${D}"/etc/conf.d/clamd |
| 121 |
fi |
| 122 |
|
| 123 |
- if use logrotate ; then |
| 124 |
- diropts "" |
| 125 |
- dodir /etc/logrotate.d |
| 126 |
- insopts -m0644 |
| 127 |
- insinto /etc/logrotate.d |
| 128 |
- newins ${FILESDIR}/${PN}.logrotate ${PN} |
| 129 |
- fi |
| 130 |
+ diropts "" |
| 131 |
+ dodir /etc/logrotate.d |
| 132 |
+ insopts -m0644 |
| 133 |
+ insinto /etc/logrotate.d |
| 134 |
+ newins "${FILESDIR}"/${PN}.logrotate ${PN} |
| 135 |
} |
| 136 |
|
| 137 |
pkg_postinst() { |
| 138 |
|
| 139 |
|
| 140 |
|
| 141 |
1.2 app-antivirus/clamav/clamav-0.92_rc2.ebuild |
| 142 |
|
| 143 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/clamav-0.92_rc2.ebuild?rev=1.2&view=markup |
| 144 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/clamav-0.92_rc2.ebuild?rev=1.2&content-type=text/plain |
| 145 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-antivirus/clamav/clamav-0.92_rc2.ebuild?r1=1.1&r2=1.2 |
| 146 |
|
| 147 |
Index: clamav-0.92_rc2.ebuild |
| 148 |
=================================================================== |
| 149 |
RCS file: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.92_rc2.ebuild,v |
| 150 |
retrieving revision 1.1 |
| 151 |
retrieving revision 1.2 |
| 152 |
diff -u -r1.1 -r1.2 |
| 153 |
--- clamav-0.92_rc2.ebuild 10 Oct 2007 08:47:41 -0000 1.1 |
| 154 |
+++ clamav-0.92_rc2.ebuild 14 Nov 2007 19:25:05 -0000 1.2 |
| 155 |
@@ -1,6 +1,6 @@ |
| 156 |
# Copyright 1999-2007 Gentoo Foundation |
| 157 |
# Distributed under the terms of the GNU General Public License v2 |
| 158 |
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.92_rc2.ebuild,v 1.1 2007/10/10 08:47:41 lordvan Exp $ |
| 159 |
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.92_rc2.ebuild,v 1.2 2007/11/14 19:25:05 ticho Exp $ |
| 160 |
|
| 161 |
inherit autotools eutils flag-o-matic fixheadtails |
| 162 |
|
| 163 |
@@ -12,7 +12,7 @@ |
| 164 |
LICENSE="GPL-2" |
| 165 |
SLOT="0" |
| 166 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
| 167 |
-IUSE="bzip2 crypt logrotate mailwrapper milter nls selinux" |
| 168 |
+IUSE="bzip2 crypt mailwrapper milter nls selinux" |
| 169 |
|
| 170 |
DEPEND="virtual/libc |
| 171 |
bzip2? ( app-arch/bzip2 ) |
| 172 |
@@ -24,7 +24,6 @@ |
| 173 |
>=sys-apps/sed-4" |
| 174 |
RDEPEND="${DEPEND} |
| 175 |
selinux? ( sec-policy/selinux-clamav ) |
| 176 |
- logrotate? ( app-admin/logrotate ) |
| 177 |
sys-apps/grep" |
| 178 |
PROVIDE="virtual/antivirus" |
| 179 |
|
| 180 |
@@ -45,7 +44,7 @@ |
| 181 |
src_unpack() { |
| 182 |
unpack "${A}" |
| 183 |
cd "${S}" |
| 184 |
- echo $S |
| 185 |
+ echo "${S}" |
| 186 |
epatch "${FILESDIR}"/${PN}-0.90-compat.patch |
| 187 |
epatch "${FILESDIR}"/${PN}-0.90-nls.patch |
| 188 |
eautoreconf |
| 189 |
@@ -77,11 +76,11 @@ |
| 190 |
} |
| 191 |
|
| 192 |
src_install() { |
| 193 |
- make DESTDIR=${D} install || die |
| 194 |
+ make DESTDIR="${D}" install || die |
| 195 |
dodoc AUTHORS BUGS NEWS README ChangeLog FAQ |
| 196 |
- newconfd ${FILESDIR}/clamd.conf clamd |
| 197 |
- newinitd ${FILESDIR}/clamd.rc clamd |
| 198 |
- dodoc ${FILESDIR}/clamav-milter.README.gentoo |
| 199 |
+ newconfd "${FILESDIR}"/clamd.conf clamd |
| 200 |
+ newinitd "${FILESDIR}"/clamd.rc clamd |
| 201 |
+ dodoc "${FILESDIR}"/clamav-milter.README.gentoo |
| 202 |
|
| 203 |
dodir /var/run/clamav |
| 204 |
keepdir /var/run/clamav |
| 205 |
@@ -97,7 +96,7 @@ |
| 206 |
-e "s:.*\(User\) .*:\1 clamav:" \ |
| 207 |
-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \ |
| 208 |
-e "s:^\#\(LogTime\).*:\1 yes:" \ |
| 209 |
- ${D}/etc/clamd.conf |
| 210 |
+ "${D}"/etc/clamd.conf |
| 211 |
|
| 212 |
# Do the same for /etc/freshclam.conf |
| 213 |
sed -i -e "s:^\(Example\):\# \1:" \ |
| 214 |
@@ -106,24 +105,22 @@ |
| 215 |
-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \ |
| 216 |
-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \ |
| 217 |
-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \ |
| 218 |
- ${D}/etc/freshclam.conf |
| 219 |
+ "${D}"/etc/freshclam.conf |
| 220 |
|
| 221 |
if use milter ; then |
| 222 |
echo "START_MILTER=no" \ |
| 223 |
- >> ${D}/etc/conf.d/clamd |
| 224 |
+ >>"${D}"/etc/conf.d/clamd |
| 225 |
echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \ |
| 226 |
- >>${D}/etc/conf.d/clamd |
| 227 |
+ >>"${D}"/etc/conf.d/clamd |
| 228 |
echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \ |
| 229 |
- >>${D}/etc/conf.d/clamd |
| 230 |
+ >>"${D}"/etc/conf.d/clamd |
| 231 |
fi |
| 232 |
|
| 233 |
- if use logrotate ; then |
| 234 |
- diropts "" |
| 235 |
- dodir /etc/logrotate.d |
| 236 |
- insopts -m0644 |
| 237 |
- insinto /etc/logrotate.d |
| 238 |
- newins ${FILESDIR}/${PN}.logrotate ${PN} |
| 239 |
- fi |
| 240 |
+ diropts "" |
| 241 |
+ dodir /etc/logrotate.d |
| 242 |
+ insopts -m0644 |
| 243 |
+ insinto /etc/logrotate.d |
| 244 |
+ newins "${FILESDIR}"/${PN}.logrotate ${PN} |
| 245 |
} |
| 246 |
|
| 247 |
pkg_postinst() { |
| 248 |
|
| 249 |
|
| 250 |
|
| 251 |
-- |
| 252 |
gentoo-commits@g.o mailing list |
Archives