Skip to content

Commit

Permalink
Merge pull request #624 from MailScanner:102922addfiles
Browse files Browse the repository at this point in the history
Update spec files for rhel/suse
  • Loading branch information
shawniverson authored Oct 29, 2022
2 parents 5e730ed + 77b6dee commit 668cea1
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 0 deletions.
12 changes: 12 additions & 0 deletions rhel/mailscanner.spec
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ MailScanner/reports/ro
MailScanner/reports/sk
MailScanner/perl/MailScanner
MailScanner/perl/custom
MailScanner/perl/Sendmail/PMilter
EOF

while read f
Expand Down Expand Up @@ -207,6 +208,10 @@ done

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

install common/usr/share/MailScanner/perl/Sendmail/Milter.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/
install common/usr/share/MailScanner/perl/Sendmail/PMilter.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/
install common/usr/share/MailScanner/perl/Sendmail/PMilter/Context.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/PMilter

while read f
do
install common/usr/share/MailScanner/perl/MailScanner/$f ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/MailScanner/
Expand Down Expand Up @@ -766,6 +771,10 @@ exit 0
%attr(644,root,root) /usr/share/MailScanner/perl/MailScanner/ZMailer.pm
%attr(644,root,root) /usr/share/MailScanner/perl/MailScanner/ZMDiskStore.pm

%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/Milter.pm
%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/PMilter.pm
%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/PMilter/Context.pm

%attr(755,root,root) /etc/cron.daily/mailscanner
%attr(755,root,root) /etc/cron.hourly/mailscanner

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

%changelog
* Sat Oct 29 2022 Shawn Iverson <[email protected]>
- Integrate working PMilter code into MailScanner

* Sat Jan 08 2022 Shawn Iverson <[email protected]>
- Revert addition of 1x1spacer.gif in favor of base64 embedding

Expand Down
12 changes: 12 additions & 0 deletions suse/mailscanner.spec
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ MailScanner/reports/ro
MailScanner/reports/sk
MailScanner/perl/MailScanner
MailScanner/perl/custom
MailScanner/perl/Sendmail/PMilter
EOF

while read f
Expand Down Expand Up @@ -208,6 +209,10 @@ done

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

install common/usr/share/MailScanner/perl/Sendmail/Milter.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/
install common/usr/share/MailScanner/perl/Sendmail/PMilter.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/
install common/usr/share/MailScanner/perl/Sendmail/PMilter/Context.pm ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/Sendmail/PMilter

while read f
do
install common/usr/share/MailScanner/perl/MailScanner/$f ${RPM_BUILD_ROOT}/usr/share/MailScanner/perl/MailScanner/
Expand Down Expand Up @@ -691,6 +696,10 @@ exit 0
%attr(644,root,root) /usr/share/MailScanner/perl/MailScanner/ZMailer.pm
%attr(644,root,root) /usr/share/MailScanner/perl/MailScanner/ZMDiskStore.pm

%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/Milter.pm
%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/PMilter.pm
%attr(644,root,root) /usr/share/MailScanner/perl/Sendmail/PMilter/Context.pm

%attr(755,root,root) /etc/cron.daily/mailscanner
%attr(755,root,root) /etc/cron.hourly/mailscanner

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

%changelog
* Sat Oct 29 2022 Shawn Iverson <[email protected]>
- Integrate working PMilter code into MailScanner

* Sat Jan 08 2022 Shawn Iverson <[email protected]>
- Revert addition of 1x1spacer.gif in favor of base64 embedding

Expand Down

0 comments on commit 668cea1

Please sign in to comment.