| 1 |
wltjr 07/10/23 21:57:11 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: assp-1.3.3.8-r1.ebuild |
| 5 |
Log: |
| 6 |
Additional sed improvements, tweaked existing, added new expression. Both thanks to ovaron2 as always. |
| 7 |
(Portage version: 2.1.3.15) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.23 mail-filter/assp/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/assp/ChangeLog?rev=1.23&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/assp/ChangeLog?rev=1.23&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/assp/ChangeLog?r1=1.22&r2=1.23 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v |
| 19 |
retrieving revision 1.22 |
| 20 |
retrieving revision 1.23 |
| 21 |
diff -u -r1.22 -r1.23 |
| 22 |
--- ChangeLog 22 Oct 2007 03:57:07 -0000 1.22 |
| 23 |
+++ ChangeLog 23 Oct 2007 21:57:11 -0000 1.23 |
| 24 |
@@ -1,6 +1,13 @@ |
| 25 |
# ChangeLog for mail-filter/assp |
| 26 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.22 2007/10/22 03:57:07 wltjr Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/ChangeLog,v 1.23 2007/10/23 21:57:11 wltjr Exp $ |
| 29 |
+ |
| 30 |
+*assp-1.3.3.8-r1 (23 Oct 2007) |
| 31 |
+ |
| 32 |
+ 23 Oct 2007; William L. Thomson Jr. <wltjr@g.o> |
| 33 |
+ +assp-1.3.3.8-r1.ebuild: |
| 34 |
+ Additional sed improvements, tweaked existing, added new expression. Both |
| 35 |
+ thanks to ovaron2 as always. |
| 36 |
|
| 37 |
22 Oct 2007; William L. Thomson Jr. <wltjr@g.o> |
| 38 |
assp-1.3.3.8.ebuild: |
| 39 |
|
| 40 |
|
| 41 |
|
| 42 |
1.1 mail-filter/assp/assp-1.3.3.8-r1.ebuild |
| 43 |
|
| 44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/assp/assp-1.3.3.8-r1.ebuild?rev=1.1&view=markup |
| 45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/mail-filter/assp/assp-1.3.3.8-r1.ebuild?rev=1.1&content-type=text/plain |
| 46 |
|
| 47 |
Index: assp-1.3.3.8-r1.ebuild |
| 48 |
=================================================================== |
| 49 |
# Copyright 1999-2007 Gentoo Foundation |
| 50 |
# Distributed under the terms of the GNU General Public License v2 |
| 51 |
# $Header: /var/cvsroot/gentoo-x86/mail-filter/assp/assp-1.3.3.8-r1.ebuild,v 1.1 2007/10/23 21:57:11 wltjr Exp $ |
| 52 |
|
| 53 |
inherit eutils |
| 54 |
|
| 55 |
DESCRIPTION="Anti-Spam SMTP Proxy written in Perl." |
| 56 |
HOMEPAGE="http://assp.sourceforge.net/" |
| 57 |
MY_PN=ASSP_${PV}-Install |
| 58 |
SRC_URI="mirror://sourceforge/${PN}/${MY_PN}.zip" |
| 59 |
LICENSE="GPL-2" |
| 60 |
SLOT="0" |
| 61 |
|
| 62 |
KEYWORDS="~amd64 ~x86" |
| 63 |
|
| 64 |
IUSE="ldap spf srs" |
| 65 |
|
| 66 |
DEPEND="app-arch/unzip" |
| 67 |
|
| 68 |
RDEPEND="dev-lang/perl |
| 69 |
dev-perl/Net-DNS |
| 70 |
dev-perl/File-ReadBackwards |
| 71 |
dev-perl/Compress-Zlib |
| 72 |
dev-perl/Email-Valid |
| 73 |
dev-perl/libwww-perl |
| 74 |
virtual/perl-Digest-MD5 |
| 75 |
virtual/perl-Time-HiRes |
| 76 |
spf? ( dev-perl/Mail-SPF-Query ) |
| 77 |
srs? ( dev-perl/Mail-SRS ) |
| 78 |
ldap? ( dev-perl/perl-ldap )" |
| 79 |
|
| 80 |
S=${WORKDIR}/${MY_PN}/ASSP |
| 81 |
|
| 82 |
pkg_setup() { |
| 83 |
enewgroup assp |
| 84 |
enewuser assp -1 -1 /dev/null assp |
| 85 |
} |
| 86 |
|
| 87 |
src_unpack() { |
| 88 |
unpack ${A} |
| 89 |
cd "${S}" |
| 90 |
|
| 91 |
local FILES=" |
| 92 |
assp.pl |
| 93 |
move2num.pl |
| 94 |
rebuildspamdb.pl |
| 95 |
repair.pl |
| 96 |
stats.sh |
| 97 |
stat.pl |
| 98 |
" |
| 99 |
# just being safe |
| 100 |
for file in ${FILES}; do |
| 101 |
edos2unix ${file} |
| 102 |
done |
| 103 |
|
| 104 |
# portable changes via sed vs patch |
| 105 |
sed -i -e 's|file:files/|file:/etc/assp/|' \ |
| 106 |
-e 's|$base/images|/usr/share/assp/images|' \ |
| 107 |
-e 's|logs/maillog.txt|/var/log/assp/maillog.txt|' \ |
| 108 |
-e 's|PID File'\'',40,textinput,'\''pid'\''|PID File'\'',40,textinput,'\''asspd.pid'\''|' \ |
| 109 |
-e 's|Daemon\*\*'\'',0,checkbox,0|Daemon\*\*'\'',0,checkbox,1|' \ |
| 110 |
-e 's|UID\*\*'\'',20,textinput,'\'''\''|UID\*\*'\'',20,textinput,'\''assp'\''|' \ |
| 111 |
-e 's|GID\*\*'\'',20,textinput,'\'''\''|GID\*\*'\'',20,textinput,'\''assp'\''|' \ |
| 112 |
-e 's|popFileEditor'\('\\'\''pb/pbdb\.\([^\.]*\)\.db\\'\'',|popFileEditor(\\'\''/var/lib/assp/pb/pbdb.\1.db\\'\'',|g' \ |
| 113 |
-e 's|$base/assp.cfg|/etc/assp/assp.cfg|g' \ |
| 114 |
-e 's|$base/$pidfile|/var/run/assp/asspd.pid|' \ |
| 115 |
-e 's|mkdir "$base/$logdir",0700 if $logdir;||' \ |
| 116 |
-e 's|mkdir "$base/$logdir",0700;||' \ |
| 117 |
-e 's|$base/$logfile|$logfile|' \ |
| 118 |
-e 's|$base/$logdir|$logdir|' \ |
| 119 |
-e 's|"maillog.log"|"/var/log/assp/maillog.log"|' \ |
| 120 |
-e 's|-d "$base/logs" or mkdir "$base/logs",0700;||' \ |
| 121 |
-e 's|-d "$base/notes" or mkdir "$base/notes",0700;||' \ |
| 122 |
-e 's|-d "$base/docs" or mkdir "$base/docs",0777;||' \ |
| 123 |
-e 's|$base/$archivelogfile|$archivelogfile|' \ |
| 124 |
-e 's|"$base/$file",$sub,"$this|"/etc/assp/$file",$sub,"$this|' \ |
| 125 |
-e 's|"$base/$file",'\'''\'',"$this|"/etc/assp/$file",'\'''\'',"$this|' \ |
| 126 |
-e 's|my $fil=$1; $fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|my $fil=$1;|' \ |
| 127 |
-e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\/etc\\/assp\\/\|\\/var\\/lib\\/assp\\/\/i;|' \ |
| 128 |
-e 's|$fil="$base/$fil" if $fil!~/^((\[a-z\]:)?\[\\/\\\\\]\|\\Q$base\\E)/;||' \ |
| 129 |
-e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\/usr\\/share\\/assp\\//i) {|' \ |
| 130 |
-e 's|$fil="$base/$fil";|$fil="/usr/share/assp/$fil";|' \ |
| 131 |
-e 's|Q$base\\E|Q\\/etc\\/assp\\/\\E|' \ |
| 132 |
-e 's|$fil="$base/$fil"|$fil="/etc/assp/$fil"|' \ |
| 133 |
-e 's|$base/$bf|/etc/assp/$bf|g' \ |
| 134 |
assp.pl || die |
| 135 |
|
| 136 |
# questionable stuff |
| 137 |
# -e 's|$fil="$base/$fil" if $fil!~/^\\Q$base\\E/i;|$fil="/etc/assp/$fil" if $fil!~/^\\Q\\/etc\\/assp\\/\\E/i;|' \ |
| 138 |
# -e 's|if ($fil !~ /^\\Q$base\\E/i) {|if ($fil !~ /^\\Q\\/usr\\/share\\/assp\\/\\E/i) {|' \ |
| 139 |
# -e 's|split('\'' '\'', $this|split('\''$base/'\'', $this|' \ |
| 140 |
# -e 's|split('\'' '\'',lc|split('\''$base/'\'',lc|' \ |
| 141 |
# -e 's|split('\'' '\'',$pat)|split('\''$base/'\'',$pat)|' \ |
| 142 |
|
| 143 |
# sed move2num.pl |
| 144 |
sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' move2num.pl || die |
| 145 |
|
| 146 |
# sed rebuildspamdb.pl |
| 147 |
sed -i -e 's|assp.cfg|/etc/assp/assp.cfg|' \ |
| 148 |
-e 's|} && "$Config{base}/$Config{logfile}" \|\| '\''maillog.txt'\'';|};|' \ |
| 149 |
rebuildspamdb.pl || die |
| 150 |
|
| 151 |
# sed stats.sh |
| 152 |
sed -i -e 's|usr/local|var/log|' stats.sh || die |
| 153 |
|
| 154 |
# patch is against unix-format, so patch after dos2unix |
| 155 |
epatch "${FILESDIR}"/base.patch |
| 156 |
|
| 157 |
# remove windows stuff |
| 158 |
rm "${S}/addservice.pl" || die "Could not remove ${S}/addservice.pl" |
| 159 |
rm -f "${S}/Win32-quickstart-guide.txt" || die "Could not remove ${S}/Win32-quickstart-guide.txt" |
| 160 |
} |
| 161 |
|
| 162 |
src_install() { |
| 163 |
# Configuration directory |
| 164 |
dodir /etc/assp/notes |
| 165 |
|
| 166 |
insinto /etc/assp |
| 167 |
# Installs files that are used by assp for black/gray lists, |
| 168 |
# and domain country lookup. To be changed by admin as needed. |
| 169 |
doins files/*.txt || die |
| 170 |
|
| 171 |
fowners assp:assp /etc/assp -R |
| 172 |
fperms 770 /etc/assp /etc/assp/notes |
| 173 |
|
| 174 |
# Setup directories for mail to be stored for filter |
| 175 |
keepdir /var/lib/assp/spam /var/lib/assp/notspam |
| 176 |
keepdir /var/lib/assp/errors/spam /var/lib/assp/errors/notspam |
| 177 |
|
| 178 |
# Logs directory |
| 179 |
keepdir /var/log/assp |
| 180 |
fowners assp:assp -R /var/log/assp |
| 181 |
fperms 770 /var/log/assp |
| 182 |
|
| 183 |
# Install the app |
| 184 |
exeinto /usr/share/assp |
| 185 |
doexe *.pl *.sh || die |
| 186 |
insinto /usr/share/assp |
| 187 |
doins -r images/ || die |
| 188 |
|
| 189 |
# Lock down the files/data |
| 190 |
fowners assp:assp -R /usr/share/assp |
| 191 |
fperms 770 /usr/share/assp |
| 192 |
|
| 193 |
# Data storage |
| 194 |
fowners assp:assp -R /var/lib/assp |
| 195 |
fperms 770 /var/lib/assp |
| 196 |
|
| 197 |
# PID directory |
| 198 |
dodir /var/run/assp |
| 199 |
keepdir /var/run/assp |
| 200 |
fowners assp:assp -R /var/run/assp |
| 201 |
fperms 770 /var/run/assp |
| 202 |
|
| 203 |
# Install the init.d script to listen |
| 204 |
newinitd "${FILESDIR}/asspd.init" asspd |
| 205 |
|
| 206 |
dohtml *.htm |
| 207 |
} |
| 208 |
|
| 209 |
pkg_postinst() { |
| 210 |
elog |
| 211 |
elog "To configure ASSP, start /etc/init.d/asspd then point" |
| 212 |
elog "your browser to http://localhost:55555" |
| 213 |
elog "Username: admin Password: nospam4me (CHANGE ASAP!)" |
| 214 |
elog |
| 215 |
elog "File permissions have been set to use assp:assp" |
| 216 |
elog "with mode 770 on directories. When you configure" |
| 217 |
elog "ASSP, make sure and use the user assp." |
| 218 |
elog |
| 219 |
elog "Don't change any path related options." |
| 220 |
elog |
| 221 |
elog "See the on-line docs for a complete tutorial." |
| 222 |
elog "http://assp.sourceforge.net/docs.html" |
| 223 |
elog |
| 224 |
elog "If upgrading, please update your old config to set both" |
| 225 |
elog "redre.txt and nodelay.txt path of /etc/assp. There are" |
| 226 |
elog "also many new options that you should review." |
| 227 |
elog |
| 228 |
} |
| 229 |
|
| 230 |
|
| 231 |
|
| 232 |
-- |
| 233 |
gentoo-commits@g.o mailing list |
Archives