Skip to content

Commit 668cea1

Browse files
authored
Merge pull request #624 from MailScanner:102922addfiles
Update spec files for rhel/suse
2 parents 5e730ed + 77b6dee commit 668cea1

File tree

2 files changed

+24
-0
lines changed

2 files changed

+24
-0
lines changed

rhel/mailscanner.spec

+12
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ MailScanner/reports/ro
7474
MailScanner/reports/sk
7575
MailScanner/perl/MailScanner
7676
MailScanner/perl/custom
77+
MailScanner/perl/Sendmail/PMilter
7778
EOF
7879

7980
while read f
@@ -207,6 +208,10 @@ done
207208

208209
install common/usr/share/MailScanner/perl/MailScanner.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/
209210

211+
install common/usr/share/MailScanner/perl/Sendmail/Milter.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/
212+
install common/usr/share/MailScanner/perl/Sendmail/PMilter.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/
213+
install common/usr/share/MailScanner/perl/Sendmail/PMilter/Context.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/PMilter
214+
210215
while read f
211216
do
212217
install common/usr/share/MailScanner/perl/MailScanner/$f ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/MailScanner/
@@ -766,6 +771,10 @@ exit 0
766771
%attr(644,root,root) /usr/share/MailScanner/perl/MailScanner/ZMailer.pm
767772
%attr(644,root,root) /usr/share/MailScanner/perl/MailScanner/ZMDiskStore.pm
768773

774+
%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/Milter.pm
775+
%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/PMilter.pm
776+
%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/PMilter/Context.pm
777+
769778
%attr(755,root,root) /etc/cron.daily/mailscanner
770779
%attr(755,root,root) /etc/cron.hourly/mailscanner
771780

@@ -1280,6 +1289,9 @@ exit 0
12801289
%config(noreplace) /usr/share/MailScanner/reports/ca/stored.virus.message.txt
12811290

12821291
%changelog
1292+
* Sat Oct 29 2022 Shawn Iverson <[email protected]>
1293+
- Integrate working PMilter code into MailScanner
1294+
12831295
* Sat Jan 08 2022 Shawn Iverson <[email protected]>
12841296
- Revert addition of 1x1spacer.gif in favor of base64 embedding
12851297

suse/mailscanner.spec

+12
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ MailScanner/reports/ro
7575
MailScanner/reports/sk
7676
MailScanner/perl/MailScanner
7777
MailScanner/perl/custom
78+
MailScanner/perl/Sendmail/PMilter
7879
EOF
7980

8081
while read f
@@ -208,6 +209,10 @@ done
208209

209210
install common/usr/share/MailScanner/perl/MailScanner.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/
210211

212+
install common/usr/share/MailScanner/perl/Sendmail/Milter.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/
213+
install common/usr/share/MailScanner/perl/Sendmail/PMilter.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/
214+
install common/usr/share/MailScanner/perl/Sendmail/PMilter/Context.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/PMilter
215+
211216
while read f
212217
do
213218
install common/usr/share/MailScanner/perl/MailScanner/$f ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/MailScanner/
@@ -691,6 +696,10 @@ exit 0
691696
%attr(644,root,root) /usr/share/MailScanner/perl/MailScanner/ZMailer.pm
692697
%attr(644,root,root) /usr/share/MailScanner/perl/MailScanner/ZMDiskStore.pm
693698

699+
%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/Milter.pm
700+
%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/PMilter.pm
701+
%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/PMilter/Context.pm
702+
694703
%attr(755,root,root) /etc/cron.daily/mailscanner
695704
%attr(755,root,root) /etc/cron.hourly/mailscanner
696705

@@ -1205,6 +1214,9 @@ exit 0
12051214
%config(noreplace) /usr/share/MailScanner/reports/ca/stored.virus.message.txt
12061215

12071216
%changelog
1217+
* Sat Oct 29 2022 Shawn Iverson <[email protected]>
1218+
- Integrate working PMilter code into MailScanner
1219+
12081220
* Sat Jan 08 2022 Shawn Iverson <[email protected]>
12091221
- Revert addition of 1x1spacer.gif in favor of base64 embedding
12101222

0 commit comments

Comments
 (0)