From 05466a9da8a199dfd14676160e14295ba70b8785 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Tue, 23 Jul 2019 21:30:57 +0200 Subject: [PATCH] split source and packaging, and clean latter a bit up Signed-off-by: Thomas Lamprecht --- Makefile | 222 ++---------------- debian/rules | 3 +- src/Makefile | 205 ++++++++++++++++ NEWS => src/NEWS | 0 {PMG => src/PMG}/API2.pm | 0 {PMG => src/PMG}/API2/APT.pm | 0 {PMG => src/PMG}/API2/AccessControl.pm | 0 {PMG => src/PMG}/API2/Action.pm | 0 {PMG => src/PMG}/API2/Backup.pm | 0 {PMG => src/PMG}/API2/ClamAV.pm | 0 {PMG => src/PMG}/API2/Cluster.pm | 0 {PMG => src/PMG}/API2/Config.pm | 0 {PMG => src/PMG}/API2/DestinationTLSPolicy.pm | 0 {PMG => src/PMG}/API2/Domains.pm | 0 {PMG => src/PMG}/API2/Fetchmail.pm | 0 {PMG => src/PMG}/API2/LDAP.pm | 0 {PMG => src/PMG}/API2/MailTracker.pm | 0 {PMG => src/PMG}/API2/MimeTypes.pm | 0 {PMG => src/PMG}/API2/MyNetworks.pm | 0 {PMG => src/PMG}/API2/Network.pm | 0 {PMG => src/PMG}/API2/Nodes.pm | 0 {PMG => src/PMG}/API2/ObjectGroupHelpers.pm | 0 {PMG => src/PMG}/API2/Postfix.pm | 0 {PMG => src/PMG}/API2/Quarantine.pm | 0 {PMG => src/PMG}/API2/RuleDB.pm | 0 {PMG => src/PMG}/API2/Rules.pm | 0 {PMG => src/PMG}/API2/SMTPWhitelist.pm | 0 {PMG => src/PMG}/API2/Services.pm | 0 {PMG => src/PMG}/API2/SpamAssassin.pm | 0 {PMG => src/PMG}/API2/Statistics.pm | 0 {PMG => src/PMG}/API2/Subscription.pm | 0 {PMG => src/PMG}/API2/Tasks.pm | 0 {PMG => src/PMG}/API2/Transport.pm | 0 {PMG => src/PMG}/API2/Users.pm | 0 {PMG => src/PMG}/API2/What.pm | 0 {PMG => src/PMG}/API2/When.pm | 0 {PMG => src/PMG}/API2/Who.pm | 0 {PMG => src/PMG}/AccessControl.pm | 0 {PMG => src/PMG}/AtomicFile.pm | 0 {PMG => src/PMG}/Backup.pm | 0 {PMG => src/PMG}/CLI/pmgbackup.pm | 0 {PMG => src/PMG}/CLI/pmgcm.pm | 0 {PMG => src/PMG}/CLI/pmgconfig.pm | 0 {PMG => src/PMG}/CLI/pmgdb.pm | 0 {PMG => src/PMG}/CLI/pmgperf.pm | 0 {PMG => src/PMG}/CLI/pmgqm.pm | 0 {PMG => src/PMG}/CLI/pmgreport.pm | 0 {PMG => src/PMG}/CLI/pmgsubscription.pm | 0 {PMG => src/PMG}/CLI/pmgupgrade.pm | 0 {PMG => src/PMG}/CLI/pmgversion.pm | 0 {PMG => src/PMG}/Cluster.pm | 0 {PMG => src/PMG}/ClusterConfig.pm | 0 {PMG => src/PMG}/Config.pm | 0 {PMG => src/PMG}/DBTools.pm | 0 {PMG => src/PMG}/Fetchmail.pm | 0 {PMG => src/PMG}/HTMLMail.pm | 0 {PMG => src/PMG}/HTTPServer.pm | 0 {PMG => src/PMG}/LDAPCache.pm | 0 {PMG => src/PMG}/LDAPConfig.pm | 0 {PMG => src/PMG}/LDAPSet.pm | 0 {PMG => src/PMG}/MailQueue.pm | 0 {PMG => src/PMG}/ModGroup.pm | 0 {PMG => src/PMG}/Postfix.pm | 0 {PMG => src/PMG}/Quarantine.pm | 0 {PMG => src/PMG}/RESTEnvironment.pm | 0 {PMG => src/PMG}/Report.pm | 0 {PMG => src/PMG}/RuleCache.pm | 0 {PMG => src/PMG}/RuleDB.pm | 0 {PMG => src/PMG}/RuleDB/Accept.pm | 0 {PMG => src/PMG}/RuleDB/ArchiveFilter.pm | 0 {PMG => src/PMG}/RuleDB/Attach.pm | 0 {PMG => src/PMG}/RuleDB/BCC.pm | 0 {PMG => src/PMG}/RuleDB/Block.pm | 0 {PMG => src/PMG}/RuleDB/ContentTypeFilter.pm | 0 {PMG => src/PMG}/RuleDB/Counter.pm | 0 {PMG => src/PMG}/RuleDB/Disclaimer.pm | 0 {PMG => src/PMG}/RuleDB/Domain.pm | 0 {PMG => src/PMG}/RuleDB/EMail.pm | 0 {PMG => src/PMG}/RuleDB/Group.pm | 0 {PMG => src/PMG}/RuleDB/IPAddress.pm | 0 {PMG => src/PMG}/RuleDB/IPNet.pm | 0 {PMG => src/PMG}/RuleDB/LDAP.pm | 0 {PMG => src/PMG}/RuleDB/LDAPUser.pm | 0 {PMG => src/PMG}/RuleDB/MatchField.pm | 0 {PMG => src/PMG}/RuleDB/MatchFilename.pm | 0 {PMG => src/PMG}/RuleDB/ModField.pm | 0 {PMG => src/PMG}/RuleDB/Notify.pm | 0 {PMG => src/PMG}/RuleDB/Object.pm | 0 {PMG => src/PMG}/RuleDB/Quarantine.pm | 0 {PMG => src/PMG}/RuleDB/Receiver.pm | 0 {PMG => src/PMG}/RuleDB/ReceiverDomain.pm | 0 {PMG => src/PMG}/RuleDB/ReceiverRegex.pm | 0 {PMG => src/PMG}/RuleDB/Remove.pm | 0 {PMG => src/PMG}/RuleDB/ReportSpam.pm | 0 {PMG => src/PMG}/RuleDB/Rule.pm | 0 {PMG => src/PMG}/RuleDB/Spam.pm | 0 {PMG => src/PMG}/RuleDB/TimeFrame.pm | 0 {PMG => src/PMG}/RuleDB/Virus.pm | 0 {PMG => src/PMG}/RuleDB/WhoRegex.pm | 0 {PMG => src/PMG}/SMTP.pm | 0 {PMG => src/PMG}/SMTPPrinter.pm | 0 {PMG => src/PMG}/Service/pmgdaemon.pm | 0 {PMG => src/PMG}/Service/pmgmirror.pm | 0 {PMG => src/PMG}/Service/pmgproxy.pm | 0 {PMG => src/PMG}/Service/pmgtunnel.pm | 0 {PMG => src/PMG}/Statistic.pm | 0 {PMG => src/PMG}/Ticket.pm | 0 {PMG => src/PMG}/Unpack.pm | 0 {PMG => src/PMG}/UserConfig.pm | 0 {PMG => src/PMG}/Utils.pm | 0 {PMG => src/PMG}/pmgcfg.pm.in | 12 +- {bin => src/bin}/pmg-daily | 0 {bin => src/bin}/pmg-hourly | 0 {bin => src/bin}/pmg-smtp-filter | 0 {bin => src/bin}/pmg-system-report | 0 {bin => src/bin}/pmgbackup | 0 {bin => src/bin}/pmgbanner | 0 {bin => src/bin}/pmgcm | 0 {bin => src/bin}/pmgconfig | 0 {bin => src/bin}/pmgdaemon | 0 {bin => src/bin}/pmgdb | 0 {bin => src/bin}/pmgmirror | 0 {bin => src/bin}/pmgperf | 0 {bin => src/bin}/pmgpolicy | 0 {bin => src/bin}/pmgproxy | 0 {bin => src/bin}/pmgqm | 0 {bin => src/bin}/pmgreport | 0 {bin => src/bin}/pmgsh | 0 {bin => src/bin}/pmgsubscription | 0 {bin => src/bin}/pmgtunnel | 0 {bin => src/bin}/pmgupgrade | 0 {bin => src/bin}/pmgversion | 0 favicon.ico => src/favicon.ico | Bin pmg-apt.conf => src/pmg-apt.conf | 0 pmg-initramfs.conf => src/pmg-initramfs.conf | 0 pmg-sources.list => src/pmg-sources.list | 0 {templates => src/templates}/clamd.conf.in | 0 {templates => src/templates}/fetchmailrc.tt | 0 .../templates}/freshclam.conf.in | 0 {templates => src/templates}/init.pre.in | 0 {templates => src/templates}/local.cf.in | 0 {templates => src/templates}/main.cf.in | 0 {templates => src/templates}/main.cf.in.demo | 0 {templates => src/templates}/master.cf.in | 0 .../templates}/master.cf.in.demo | 0 {templates => src/templates}/pg_hba.conf.in | 0 {templates => src/templates}/pmgreport.tt | 0 .../templates}/postgresql.conf.in | 0 .../templates}/razor-agent.conf.in | 0 .../templates}/spamreport-short.tt | 0 .../templates}/spamreport-verbose.tt | 0 {templates => src/templates}/v310.pre.in | 0 {templates => src/templates}/v320.pre.in | 0 {tests => src/tests}/Makefile | 0 {tests => src/tests}/create_testdb.pl | 0 {tests => src/tests}/init_testdb.pl | 0 {tests => src/tests}/print_testdb.pl | 0 {tests => src/tests}/test_greylist.pl | 0 {tests => src/tests}/testdb.txt | 0 159 files changed, 227 insertions(+), 215 deletions(-) create mode 100644 src/Makefile rename NEWS => src/NEWS (100%) rename {PMG => src/PMG}/API2.pm (100%) rename {PMG => src/PMG}/API2/APT.pm (100%) rename {PMG => src/PMG}/API2/AccessControl.pm (100%) rename {PMG => src/PMG}/API2/Action.pm (100%) rename {PMG => src/PMG}/API2/Backup.pm (100%) rename {PMG => src/PMG}/API2/ClamAV.pm (100%) rename {PMG => src/PMG}/API2/Cluster.pm (100%) rename {PMG => src/PMG}/API2/Config.pm (100%) rename {PMG => src/PMG}/API2/DestinationTLSPolicy.pm (100%) rename {PMG => src/PMG}/API2/Domains.pm (100%) rename {PMG => src/PMG}/API2/Fetchmail.pm (100%) rename {PMG => src/PMG}/API2/LDAP.pm (100%) rename {PMG => src/PMG}/API2/MailTracker.pm (100%) rename {PMG => src/PMG}/API2/MimeTypes.pm (100%) rename {PMG => src/PMG}/API2/MyNetworks.pm (100%) rename {PMG => src/PMG}/API2/Network.pm (100%) rename {PMG => src/PMG}/API2/Nodes.pm (100%) rename {PMG => src/PMG}/API2/ObjectGroupHelpers.pm (100%) rename {PMG => src/PMG}/API2/Postfix.pm (100%) rename {PMG => src/PMG}/API2/Quarantine.pm (100%) rename {PMG => src/PMG}/API2/RuleDB.pm (100%) rename {PMG => src/PMG}/API2/Rules.pm (100%) rename {PMG => src/PMG}/API2/SMTPWhitelist.pm (100%) rename {PMG => src/PMG}/API2/Services.pm (100%) rename {PMG => src/PMG}/API2/SpamAssassin.pm (100%) rename {PMG => src/PMG}/API2/Statistics.pm (100%) rename {PMG => src/PMG}/API2/Subscription.pm (100%) rename {PMG => src/PMG}/API2/Tasks.pm (100%) rename {PMG => src/PMG}/API2/Transport.pm (100%) rename {PMG => src/PMG}/API2/Users.pm (100%) rename {PMG => src/PMG}/API2/What.pm (100%) rename {PMG => src/PMG}/API2/When.pm (100%) rename {PMG => src/PMG}/API2/Who.pm (100%) rename {PMG => src/PMG}/AccessControl.pm (100%) rename {PMG => src/PMG}/AtomicFile.pm (100%) rename {PMG => src/PMG}/Backup.pm (100%) rename {PMG => src/PMG}/CLI/pmgbackup.pm (100%) rename {PMG => src/PMG}/CLI/pmgcm.pm (100%) rename {PMG => src/PMG}/CLI/pmgconfig.pm (100%) rename {PMG => src/PMG}/CLI/pmgdb.pm (100%) rename {PMG => src/PMG}/CLI/pmgperf.pm (100%) rename {PMG => src/PMG}/CLI/pmgqm.pm (100%) rename {PMG => src/PMG}/CLI/pmgreport.pm (100%) rename {PMG => src/PMG}/CLI/pmgsubscription.pm (100%) rename {PMG => src/PMG}/CLI/pmgupgrade.pm (100%) rename {PMG => src/PMG}/CLI/pmgversion.pm (100%) rename {PMG => src/PMG}/Cluster.pm (100%) rename {PMG => src/PMG}/ClusterConfig.pm (100%) rename {PMG => src/PMG}/Config.pm (100%) rename {PMG => src/PMG}/DBTools.pm (100%) rename {PMG => src/PMG}/Fetchmail.pm (100%) rename {PMG => src/PMG}/HTMLMail.pm (100%) rename {PMG => src/PMG}/HTTPServer.pm (100%) rename {PMG => src/PMG}/LDAPCache.pm (100%) rename {PMG => src/PMG}/LDAPConfig.pm (100%) rename {PMG => src/PMG}/LDAPSet.pm (100%) rename {PMG => src/PMG}/MailQueue.pm (100%) rename {PMG => src/PMG}/ModGroup.pm (100%) rename {PMG => src/PMG}/Postfix.pm (100%) rename {PMG => src/PMG}/Quarantine.pm (100%) rename {PMG => src/PMG}/RESTEnvironment.pm (100%) rename {PMG => src/PMG}/Report.pm (100%) rename {PMG => src/PMG}/RuleCache.pm (100%) rename {PMG => src/PMG}/RuleDB.pm (100%) rename {PMG => src/PMG}/RuleDB/Accept.pm (100%) rename {PMG => src/PMG}/RuleDB/ArchiveFilter.pm (100%) rename {PMG => src/PMG}/RuleDB/Attach.pm (100%) rename {PMG => src/PMG}/RuleDB/BCC.pm (100%) rename {PMG => src/PMG}/RuleDB/Block.pm (100%) rename {PMG => src/PMG}/RuleDB/ContentTypeFilter.pm (100%) rename {PMG => src/PMG}/RuleDB/Counter.pm (100%) rename {PMG => src/PMG}/RuleDB/Disclaimer.pm (100%) rename {PMG => src/PMG}/RuleDB/Domain.pm (100%) rename {PMG => src/PMG}/RuleDB/EMail.pm (100%) rename {PMG => src/PMG}/RuleDB/Group.pm (100%) rename {PMG => src/PMG}/RuleDB/IPAddress.pm (100%) rename {PMG => src/PMG}/RuleDB/IPNet.pm (100%) rename {PMG => src/PMG}/RuleDB/LDAP.pm (100%) rename {PMG => src/PMG}/RuleDB/LDAPUser.pm (100%) rename {PMG => src/PMG}/RuleDB/MatchField.pm (100%) rename {PMG => src/PMG}/RuleDB/MatchFilename.pm (100%) rename {PMG => src/PMG}/RuleDB/ModField.pm (100%) rename {PMG => src/PMG}/RuleDB/Notify.pm (100%) rename {PMG => src/PMG}/RuleDB/Object.pm (100%) rename {PMG => src/PMG}/RuleDB/Quarantine.pm (100%) rename {PMG => src/PMG}/RuleDB/Receiver.pm (100%) rename {PMG => src/PMG}/RuleDB/ReceiverDomain.pm (100%) rename {PMG => src/PMG}/RuleDB/ReceiverRegex.pm (100%) rename {PMG => src/PMG}/RuleDB/Remove.pm (100%) rename {PMG => src/PMG}/RuleDB/ReportSpam.pm (100%) rename {PMG => src/PMG}/RuleDB/Rule.pm (100%) rename {PMG => src/PMG}/RuleDB/Spam.pm (100%) rename {PMG => src/PMG}/RuleDB/TimeFrame.pm (100%) rename {PMG => src/PMG}/RuleDB/Virus.pm (100%) rename {PMG => src/PMG}/RuleDB/WhoRegex.pm (100%) rename {PMG => src/PMG}/SMTP.pm (100%) rename {PMG => src/PMG}/SMTPPrinter.pm (100%) rename {PMG => src/PMG}/Service/pmgdaemon.pm (100%) rename {PMG => src/PMG}/Service/pmgmirror.pm (100%) rename {PMG => src/PMG}/Service/pmgproxy.pm (100%) rename {PMG => src/PMG}/Service/pmgtunnel.pm (100%) rename {PMG => src/PMG}/Statistic.pm (100%) rename {PMG => src/PMG}/Ticket.pm (100%) rename {PMG => src/PMG}/Unpack.pm (100%) rename {PMG => src/PMG}/UserConfig.pm (100%) rename {PMG => src/PMG}/Utils.pm (100%) rename {PMG => src/PMG}/pmgcfg.pm.in (63%) rename {bin => src/bin}/pmg-daily (100%) rename {bin => src/bin}/pmg-hourly (100%) rename {bin => src/bin}/pmg-smtp-filter (100%) rename {bin => src/bin}/pmg-system-report (100%) rename {bin => src/bin}/pmgbackup (100%) rename {bin => src/bin}/pmgbanner (100%) rename {bin => src/bin}/pmgcm (100%) rename {bin => src/bin}/pmgconfig (100%) rename {bin => src/bin}/pmgdaemon (100%) rename {bin => src/bin}/pmgdb (100%) rename {bin => src/bin}/pmgmirror (100%) rename {bin => src/bin}/pmgperf (100%) rename {bin => src/bin}/pmgpolicy (100%) rename {bin => src/bin}/pmgproxy (100%) rename {bin => src/bin}/pmgqm (100%) rename {bin => src/bin}/pmgreport (100%) rename {bin => src/bin}/pmgsh (100%) rename {bin => src/bin}/pmgsubscription (100%) rename {bin => src/bin}/pmgtunnel (100%) rename {bin => src/bin}/pmgupgrade (100%) rename {bin => src/bin}/pmgversion (100%) rename favicon.ico => src/favicon.ico (100%) rename pmg-apt.conf => src/pmg-apt.conf (100%) rename pmg-initramfs.conf => src/pmg-initramfs.conf (100%) rename pmg-sources.list => src/pmg-sources.list (100%) rename {templates => src/templates}/clamd.conf.in (100%) rename {templates => src/templates}/fetchmailrc.tt (100%) rename {templates => src/templates}/freshclam.conf.in (100%) rename {templates => src/templates}/init.pre.in (100%) rename {templates => src/templates}/local.cf.in (100%) rename {templates => src/templates}/main.cf.in (100%) rename {templates => src/templates}/main.cf.in.demo (100%) rename {templates => src/templates}/master.cf.in (100%) rename {templates => src/templates}/master.cf.in.demo (100%) rename {templates => src/templates}/pg_hba.conf.in (100%) rename {templates => src/templates}/pmgreport.tt (100%) rename {templates => src/templates}/postgresql.conf.in (100%) rename {templates => src/templates}/razor-agent.conf.in (100%) rename {templates => src/templates}/spamreport-short.tt (100%) rename {templates => src/templates}/spamreport-verbose.tt (100%) rename {templates => src/templates}/v310.pre.in (100%) rename {templates => src/templates}/v320.pre.in (100%) rename {tests => src/tests}/Makefile (100%) rename {tests => src/tests}/create_testdb.pl (100%) rename {tests => src/tests}/init_testdb.pl (100%) rename {tests => src/tests}/print_testdb.pl (100%) rename {tests => src/tests}/test_greylist.pl (100%) rename {tests => src/tests}/testdb.txt (100%) diff --git a/Makefile b/Makefile index 61c93a7..f6bf7c6 100644 --- a/Makefile +++ b/Makefile @@ -1,232 +1,40 @@ -PACKAGE=pmg-api -PKGVER=5.2 -PKGREL=6 - -# this requires package pmg-doc-generator -export NOVIEW=1 -include /usr/share/pmg-doc-generator/pmg-doc-generator.mk - - -DEB=${PACKAGE}_${PKGVER}-${PKGREL}_all.deb - -DESTDIR= - -PERL5DIR=${DESTDIR}/usr/share/perl5 -DOCDIR=${DESTDIR}/usr/share/doc/${PACKAGE} -BASHCOMPLDIR=${DESTDIR}/usr/share/bash-completion/completions/ - -REPOID=`./repoid.pl .git` - -SERVICES = pmgdaemon pmgproxy pmgtunnel pmgmirror -CLITOOLS = pmgdb pmgconfig pmgperf pmgcm pmgqm pmgreport pmgversion pmgupgrade pmgsubscription pmgbackup -CLISCRIPTS = pmg-smtp-filter pmgsh pmgpolicy pmgbanner pmg-system-report -CRONSCRIPTS = pmg-hourly pmg-daily - -CLI_CLASSES = $(addprefix PMG/CLI/, $(addsuffix .pm, ${CLITOOLS})) -SERVICE_CLASSES = $(addprefix PMG/Service/, $(addsuffix .pm, ${SERVICES})) -SERVICE_UNITS = $(addprefix debian/, $(addsuffix .service, ${SERVICES})) -TIMER_UNITS = $(addprefix debian/, $(addsuffix .timer, ${CRONSCRIPTS} pmgspamreport pmgreport)) - -CLI_BINARIES = $(addprefix bin/, ${CLITOOLS} ${CLISCRIPTS} ${CRONSCRIPTS}) -CLI_MANS = $(addsuffix .1, ${CLITOOLS}) pmgsh.1 pmg-system-report.1 +include /usr/share/dpkg/pkg-info.mk +PACKAGE=pmg-api -SERVICE_MANS = $(addsuffix .8, ${SERVICES}) pmg-smtp-filter.8 pmgpolicy.8 -CONF_MANS= pmg.conf.5 cluster.conf.5 - -TEMPLATES = \ - fetchmailrc.tt \ - pmgreport.tt \ - spamreport-verbose.tt \ - spamreport-short.tt \ - main.cf.in \ - main.cf.in.demo \ - master.cf.in \ - master.cf.in.demo \ - init.pre.in \ - local.cf.in \ - v310.pre.in \ - v320.pre.in \ - razor-agent.conf.in \ - freshclam.conf.in \ - clamd.conf.in \ - postgresql.conf.in \ - pg_hba.conf.in - -TEMPLATES_FILES = $(addprefix templates/, ${TEMPLATES}) +BUILDDIR ?= ${PACKAGE}-${DEB_VERSION_UPSTREAM} -LIBSOURCES = \ - PMG/pmgcfg.pm \ - PMG/RESTEnvironment.pm \ - PMG/Utils.pm \ - PMG/HTMLMail.pm \ - PMG/ModGroup.pm \ - PMG/SMTPPrinter.pm \ - PMG/Config.pm \ - PMG/Cluster.pm \ - PMG/ClusterConfig.pm \ - PMG/HTTPServer.pm \ - PMG/Ticket.pm \ - PMG/AccessControl.pm \ - PMG/AtomicFile.pm \ - PMG/MailQueue.pm \ - PMG/Postfix.pm \ - PMG/SMTP.pm \ - PMG/Unpack.pm \ - PMG/Backup.pm \ - PMG/RuleCache.pm \ - PMG/Statistic.pm \ - PMG/UserConfig.pm \ - PMG/Fetchmail.pm \ - PMG/LDAPConfig.pm \ - PMG/LDAPSet.pm \ - PMG/LDAPCache.pm \ - PMG/DBTools.pm \ - PMG/Quarantine.pm \ - PMG/Report.pm \ - PMG/RuleDB/Group.pm \ - PMG/RuleDB/Rule.pm \ - PMG/RuleDB/Object.pm \ - PMG/RuleDB/Quarantine.pm \ - PMG/RuleDB/WhoRegex.pm \ - PMG/RuleDB/IPAddress.pm \ - PMG/RuleDB/IPNet.pm \ - PMG/RuleDB/ModField.pm \ - PMG/RuleDB/MatchFilename.pm \ - PMG/RuleDB/ReceiverRegex.pm \ - PMG/RuleDB/EMail.pm \ - PMG/RuleDB/Receiver.pm \ - PMG/RuleDB/Domain.pm \ - PMG/RuleDB/ReceiverDomain.pm \ - PMG/RuleDB/LDAP.pm \ - PMG/RuleDB/LDAPUser.pm \ - PMG/RuleDB/TimeFrame.pm \ - PMG/RuleDB/MatchField.pm \ - PMG/RuleDB/ContentTypeFilter.pm \ - PMG/RuleDB/ArchiveFilter.pm \ - PMG/RuleDB/Spam.pm \ - PMG/RuleDB/Virus.pm \ - PMG/RuleDB/ReportSpam.pm \ - PMG/RuleDB/Remove.pm \ - PMG/RuleDB/Attach.pm \ - PMG/RuleDB/BCC.pm \ - PMG/RuleDB/Counter.pm \ - PMG/RuleDB/Notify.pm \ - PMG/RuleDB/Disclaimer.pm \ - PMG/RuleDB/Accept.pm \ - PMG/RuleDB/Block.pm \ - PMG/RuleDB.pm \ - ${CLI_CLASSES} \ - ${SERVICE_CLASSES} \ - PMG/API2/Subscription.pm \ - PMG/API2/APT.pm \ - PMG/API2/Network.pm \ - PMG/API2/Services.pm \ - PMG/API2/Tasks.pm \ - PMG/API2/LDAP.pm \ - PMG/API2/DestinationTLSPolicy.pm\ - PMG/API2/Domains.pm \ - PMG/API2/Fetchmail.pm \ - PMG/API2/Users.pm \ - PMG/API2/Transport.pm \ - PMG/API2/MyNetworks.pm \ - PMG/API2/MimeTypes.pm \ - PMG/API2/Config.pm \ - PMG/API2/Cluster.pm \ - PMG/API2/ClamAV.pm \ - PMG/API2/SpamAssassin.pm \ - PMG/API2/Statistics.pm \ - PMG/API2/MailTracker.pm \ - PMG/API2/Backup.pm \ - PMG/API2/Nodes.pm \ - PMG/API2/Postfix.pm \ - PMG/API2/Quarantine.pm \ - PMG/API2/AccessControl.pm \ - PMG/API2/ObjectGroupHelpers.pm \ - PMG/API2/Rules.pm \ - PMG/API2/RuleDB.pm \ - PMG/API2/SMTPWhitelist.pm \ - PMG/API2/Who.pm \ - PMG/API2/When.pm \ - PMG/API2/What.pm \ - PMG/API2/Action.pm \ - PMG/API2.pm +DEB=${PACKAGE}_${DEB_VERSION_UPSTREAM_REVISION}_all.deb -SOURCES = ${LIBSOURCES} ${CLI_BINARIES} ${TEMPLATES_FILES} ${CONF_MANS} ${CLI_MANS} ${SERVICE_MANS} ${SERVICE_UNITS} ${TIMER_UNITS} pmg-sources.list pmg-apt.conf pmg-initramfs.conf +REPOID = $(shell git rev-parse --short=8 HEAD) -all: ${SOURCES} +export PACKAGE +export REPOID +export PMGVERSION=${DEB_VERSION_UPSTREAM_REVISION} +export PMGRELEASE=${DEB_VERSION_UPSTREAM} .PHONY: deb -deb ${DEB}: ${SOURCES} - rm -rf build - rsync -a * build - cd build; dpkg-buildpackage -b -us -uc +deb ${DEB}: + rm -rf ${BUILDDIR} + rsync -a src/ debian ${BUILDDIR} + cd ${BUILDDIR}; dpkg-buildpackage -b -us -uc lintian ${DEB} -PMG/pmgcfg.pm: PMG/pmgcfg.pm.in - sed -e s/@VERSION@/${PKGVER}/ -e s/@PACKAGERELEASE@/${PKGREL}/ -e s/@PACKAGE@/${PACKAGE}/ -e s/@REPOID@/${REPOID}/ $< >$@.tmp - mv $@.tmp $@ - -%.bash-completion: - perl -I. -T -e "use PMG::CLI::$*; PMG::CLI::$*->generate_bash_completions();" >$@.tmp - mv $@.tmp $@ - -%.service-bash-completion: - perl -I. -T -e "use PMG::Service::$*; PMG::Service::$*->generate_bash_completions();" >$@.tmp - mv $@.tmp $@ - -install: ${SOURCES} $(addsuffix .service-bash-completion, ${SERVICES}) $(addsuffix .bash-completion, ${CLITOOLS}) - for i in ${SERVICES}; do perl -I. -T -e "use PMG::Service::$$i; PMG::Service::$$i->verify_api();"; done - for i in ${CLITOOLS}; do perl -I. -T -e "use PMG::CLI::$$i; PMG::CLI::$$i->verify_api();"; done - perl -I. bin/pmgsh verifyapi - install -d -m 0755 ${DESTDIR}/usr/bin - install -d -m 0755 -o www-data -g www-data ${DESTDIR}/var/log/pmgproxy - install -d -m 0755 ${DOCDIR} - # TODO: is there a better location ? - install -m 0644 favicon.ico ${DOCDIR} - install -D -m 0644 pmg-apt.conf ${DESTDIR}/etc/apt/apt.conf.d/75pmgconf - install -D -m 0644 pmg-sources.list ${DESTDIR}/etc/apt/sources.list.d/pmg-enterprise.list - for i in ${LIBSOURCES}; do install -D -m 0644 $$i ${PERL5DIR}/$$i; done - for i in ${SERVICES}; do install -D -m 0644 PMG/Service/$$i.pm ${PERL5DIR}/PMG/Service/$$i.pm; done - for i in ${SERVICES}; do install -m 0755 bin/$$i ${DESTDIR}/usr/bin; done - for i in ${SERVICES}; do install -m 0644 -D $$i.service-bash-completion ${BASHCOMPLDIR}/$$i; done - for i in ${CLITOOLS}; do install -D -m 0644 PMG/CLI/$$i.pm ${PERL5DIR}/PMG/CLI/$$i.pm; done - for i in ${CLITOOLS}; do install -D -m 0755 bin/$$i ${DESTDIR}/usr/bin/$$i; done - for i in ${CLITOOLS}; do install -D -m 0644 $$i.bash-completion ${BASHCOMPLDIR}/$$i; done - for i in ${CLISCRIPTS}; do install -D -m 0755 bin/$$i ${DESTDIR}/usr/bin/$$i; done - for i in ${TEMPLATES}; do install -D -m 0644 templates/$$i ${DESTDIR}/var/lib/pmg/templates/$$i; done - for i in ${CLI_MANS}; do install -D -m 0644 $$i ${DESTDIR}/usr/share/man/man1/$$i; done - for i in ${CONF_MANS}; do install -D -m 0644 $$i ${DESTDIR}/usr/share/man/man5/$$i; done - for i in ${SERVICE_MANS}; do install -D -m 0644 $$i ${DESTDIR}/usr/share/man/man8/$$i; done - for i in ${CRONSCRIPTS}; do install -D -m 0755 bin/$$i ${DESTDIR}/usr/lib/pmg/bin/$$i; done - install -d -m 0755 ${DESTDIR}/lib/systemd/system - for i in ${TIMER_UNITS}; do install -m 0644 $$i ${DESTDIR}/lib/systemd/system/; done - install -D -m 0644 pmg-initramfs.conf ${DESTDIR}/etc/initramfs-tools/conf.d/pmg-initramfs.conf - .PHONY: upload upload: ${DEB} - ./repoid.pl .git/ check tar cf - ${DEB} | ssh -X repoman@repo.proxmox.com -- upload --product pmg --dist stretch .PHONY: check check: make -C tests check +.PHONY: clean distclean distclean: clean - clean: - make cleanup-docgen - make -C tests clean - rm -rf ${CONF_MANS} ./build *.deb *.changes *.buildinfo *.bash-completion *.service-bash-completion - if test -d .git; then rm -f PMG/pmgcfg.pm; fi + rm -rf *.deb *.changes *.buildinfo ${BUILDDIR} ${PACKAGE}*.tar.gz *.dsc find . -name '*~' -exec rm {} ';' .PHONY: dinstall dinstall: ${DEB} dpkg -i ${DEB} - -%.1: bin/% - rm -f $@ - podselect $< |pod2man -n $(notdir $*) -s 1 -r ${PKGVER} -c "Proxmox Documentation" >$@.tmp - mv $@.tmp $@ diff --git a/debian/rules b/debian/rules index 9a80623..bab4d98 100755 --- a/debian/rules +++ b/debian/rules @@ -3,9 +3,8 @@ # output every command that modifies files on the build system. #DH_VERBOSE = 1 - %: - dh $@ --with=systemd + dh $@ override_dh_installinit: dh_systemd_enable --name=pmgdaemon pmgdaemon.service diff --git a/src/Makefile b/src/Makefile new file mode 100644 index 0000000..c864ae8 --- /dev/null +++ b/src/Makefile @@ -0,0 +1,205 @@ +# this requires package pmg-doc-generator +export NOVIEW=1 +include /usr/share/pmg-doc-generator/pmg-doc-generator.mk + +DESTDIR= + +PERL5DIR=${DESTDIR}/usr/share/perl5 +DOCDIR=${DESTDIR}/usr/share/doc/pmg-api/ +BASHCOMPLDIR=${DESTDIR}/usr/share/bash-completion/completions/ + +SERVICES = pmgdaemon pmgproxy pmgtunnel pmgmirror +CLITOOLS = pmgdb pmgconfig pmgperf pmgcm pmgqm pmgreport pmgversion pmgupgrade pmgsubscription pmgbackup +CLISCRIPTS = pmg-smtp-filter pmgsh pmgpolicy pmgbanner pmg-system-report +CRONSCRIPTS = pmg-hourly pmg-daily + +CLI_CLASSES = $(addprefix PMG/CLI/, $(addsuffix .pm, ${CLITOOLS})) +SERVICE_CLASSES = $(addprefix PMG/Service/, $(addsuffix .pm, ${SERVICES})) +SERVICE_UNITS = $(addprefix debian/, $(addsuffix .service, ${SERVICES})) +TIMER_UNITS = $(addprefix debian/, $(addsuffix .timer, ${CRONSCRIPTS} pmgspamreport pmgreport)) + +CLI_BINARIES = $(addprefix bin/, ${CLITOOLS} ${CLISCRIPTS} ${CRONSCRIPTS}) +CLI_MANS = $(addsuffix .1, ${CLITOOLS}) pmgsh.1 pmg-system-report.1 + + +SERVICE_MANS = $(addsuffix .8, ${SERVICES}) pmg-smtp-filter.8 pmgpolicy.8 +CONF_MANS= pmg.conf.5 cluster.conf.5 + +TEMPLATES = \ + fetchmailrc.tt \ + pmgreport.tt \ + spamreport-verbose.tt \ + spamreport-short.tt \ + main.cf.in \ + main.cf.in.demo \ + master.cf.in \ + master.cf.in.demo \ + init.pre.in \ + local.cf.in \ + v310.pre.in \ + v320.pre.in \ + razor-agent.conf.in \ + freshclam.conf.in \ + clamd.conf.in \ + postgresql.conf.in \ + pg_hba.conf.in + +TEMPLATES_FILES = $(addprefix templates/, ${TEMPLATES}) + +LIBSOURCES = \ + PMG/pmgcfg.pm \ + PMG/RESTEnvironment.pm \ + PMG/Utils.pm \ + PMG/HTMLMail.pm \ + PMG/ModGroup.pm \ + PMG/SMTPPrinter.pm \ + PMG/Config.pm \ + PMG/Cluster.pm \ + PMG/ClusterConfig.pm \ + PMG/HTTPServer.pm \ + PMG/Ticket.pm \ + PMG/AccessControl.pm \ + PMG/AtomicFile.pm \ + PMG/MailQueue.pm \ + PMG/Postfix.pm \ + PMG/SMTP.pm \ + PMG/Unpack.pm \ + PMG/Backup.pm \ + PMG/RuleCache.pm \ + PMG/Statistic.pm \ + PMG/UserConfig.pm \ + PMG/Fetchmail.pm \ + PMG/LDAPConfig.pm \ + PMG/LDAPSet.pm \ + PMG/LDAPCache.pm \ + PMG/DBTools.pm \ + PMG/Quarantine.pm \ + PMG/Report.pm \ + PMG/RuleDB/Group.pm \ + PMG/RuleDB/Rule.pm \ + PMG/RuleDB/Object.pm \ + PMG/RuleDB/Quarantine.pm \ + PMG/RuleDB/WhoRegex.pm \ + PMG/RuleDB/IPAddress.pm \ + PMG/RuleDB/IPNet.pm \ + PMG/RuleDB/ModField.pm \ + PMG/RuleDB/MatchFilename.pm \ + PMG/RuleDB/ReceiverRegex.pm \ + PMG/RuleDB/EMail.pm \ + PMG/RuleDB/Receiver.pm \ + PMG/RuleDB/Domain.pm \ + PMG/RuleDB/ReceiverDomain.pm \ + PMG/RuleDB/LDAP.pm \ + PMG/RuleDB/LDAPUser.pm \ + PMG/RuleDB/TimeFrame.pm \ + PMG/RuleDB/MatchField.pm \ + PMG/RuleDB/ContentTypeFilter.pm \ + PMG/RuleDB/ArchiveFilter.pm \ + PMG/RuleDB/Spam.pm \ + PMG/RuleDB/Virus.pm \ + PMG/RuleDB/ReportSpam.pm \ + PMG/RuleDB/Remove.pm \ + PMG/RuleDB/Attach.pm \ + PMG/RuleDB/BCC.pm \ + PMG/RuleDB/Counter.pm \ + PMG/RuleDB/Notify.pm \ + PMG/RuleDB/Disclaimer.pm \ + PMG/RuleDB/Accept.pm \ + PMG/RuleDB/Block.pm \ + PMG/RuleDB.pm \ + ${CLI_CLASSES} \ + ${SERVICE_CLASSES} \ + PMG/API2/Subscription.pm \ + PMG/API2/APT.pm \ + PMG/API2/Network.pm \ + PMG/API2/Services.pm \ + PMG/API2/Tasks.pm \ + PMG/API2/LDAP.pm \ + PMG/API2/DestinationTLSPolicy.pm\ + PMG/API2/Domains.pm \ + PMG/API2/Fetchmail.pm \ + PMG/API2/Users.pm \ + PMG/API2/Transport.pm \ + PMG/API2/MyNetworks.pm \ + PMG/API2/MimeTypes.pm \ + PMG/API2/Config.pm \ + PMG/API2/Cluster.pm \ + PMG/API2/ClamAV.pm \ + PMG/API2/SpamAssassin.pm \ + PMG/API2/Statistics.pm \ + PMG/API2/MailTracker.pm \ + PMG/API2/Backup.pm \ + PMG/API2/Nodes.pm \ + PMG/API2/Postfix.pm \ + PMG/API2/Quarantine.pm \ + PMG/API2/AccessControl.pm \ + PMG/API2/ObjectGroupHelpers.pm \ + PMG/API2/Rules.pm \ + PMG/API2/RuleDB.pm \ + PMG/API2/SMTPWhitelist.pm \ + PMG/API2/Who.pm \ + PMG/API2/When.pm \ + PMG/API2/What.pm \ + PMG/API2/Action.pm \ + PMG/API2.pm + +SOURCES = ${LIBSOURCES} ${CLI_BINARIES} ${TEMPLATES_FILES} ${CONF_MANS} ${CLI_MANS} ${SERVICE_MANS} ${SERVICE_UNITS} ${TIMER_UNITS} pmg-sources.list pmg-apt.conf pmg-initramfs.conf + +all: ${SOURCES} + +PMG/pmgcfg.pm: PMG/pmgcfg.pm.in + sed -e s/@VERSION@/${PMGVERSION}/ -e s/@PMGRELEASE@/${PMGRELEASE}/ -e s/@PACKAGE@/${PACKAGE}/ -e s/@REPOID@/${REPOID}/ $< >$@.tmp + mv $@.tmp $@ + +%.bash-completion: + perl -I. -T -e "use PMG::CLI::$*; PMG::CLI::$*->generate_bash_completions();" >$@.tmp + mv $@.tmp $@ + +%.service-bash-completion: + perl -I. -T -e "use PMG::Service::$*; PMG::Service::$*->generate_bash_completions();" >$@.tmp + mv $@.tmp $@ + +install: ${SOURCES} $(addsuffix .service-bash-completion, ${SERVICES}) $(addsuffix .bash-completion, ${CLITOOLS}) + for i in ${SERVICES}; do perl -I. -T -e "use PMG::Service::$$i; PMG::Service::$$i->verify_api();"; done + for i in ${CLITOOLS}; do perl -I. -T -e "use PMG::CLI::$$i; PMG::CLI::$$i->verify_api();"; done + perl -I. bin/pmgsh verifyapi + install -d -m 0755 ${DESTDIR}/usr/bin + install -d -m 0755 -o www-data -g www-data ${DESTDIR}/var/log/pmgproxy + install -d -m 0755 ${DOCDIR} + # TODO: is there a better location ? + install -m 0644 favicon.ico ${DOCDIR} + install -D -m 0644 pmg-apt.conf ${DESTDIR}/etc/apt/apt.conf.d/75pmgconf + install -D -m 0644 pmg-sources.list ${DESTDIR}/etc/apt/sources.list.d/pmg-enterprise.list + for i in ${LIBSOURCES}; do install -D -m 0644 $$i ${PERL5DIR}/$$i; done + for i in ${SERVICES}; do install -D -m 0644 PMG/Service/$$i.pm ${PERL5DIR}/PMG/Service/$$i.pm; done + for i in ${SERVICES}; do install -m 0755 bin/$$i ${DESTDIR}/usr/bin; done + for i in ${SERVICES}; do install -m 0644 -D $$i.service-bash-completion ${BASHCOMPLDIR}/$$i; done + for i in ${CLITOOLS}; do install -D -m 0644 PMG/CLI/$$i.pm ${PERL5DIR}/PMG/CLI/$$i.pm; done + for i in ${CLITOOLS}; do install -D -m 0755 bin/$$i ${DESTDIR}/usr/bin/$$i; done + for i in ${CLITOOLS}; do install -D -m 0644 $$i.bash-completion ${BASHCOMPLDIR}/$$i; done + for i in ${CLISCRIPTS}; do install -D -m 0755 bin/$$i ${DESTDIR}/usr/bin/$$i; done + for i in ${TEMPLATES}; do install -D -m 0644 templates/$$i ${DESTDIR}/var/lib/pmg/templates/$$i; done + for i in ${CLI_MANS}; do install -D -m 0644 $$i ${DESTDIR}/usr/share/man/man1/$$i; done + for i in ${CONF_MANS}; do install -D -m 0644 $$i ${DESTDIR}/usr/share/man/man5/$$i; done + for i in ${SERVICE_MANS}; do install -D -m 0644 $$i ${DESTDIR}/usr/share/man/man8/$$i; done + for i in ${CRONSCRIPTS}; do install -D -m 0755 bin/$$i ${DESTDIR}/usr/lib/pmg/bin/$$i; done + install -d -m 0755 ${DESTDIR}/lib/systemd/system + for i in ${TIMER_UNITS}; do install -m 0644 $$i ${DESTDIR}/lib/systemd/system/; done + install -D -m 0644 pmg-initramfs.conf ${DESTDIR}/etc/initramfs-tools/conf.d/pmg-initramfs.conf + +.PHONY: check +check: + make -C tests check + +.PHONY: clean +clean: + make cleanup-docgen + make -C tests clean + rm -rf ${CONF_MANS} *.bash-completion *.service-bash-completion + if test -d .git; then rm -f PMG/pmgcfg.pm; fi + find . -name '*~' -exec rm {} ';' + +%.1: bin/% + rm -f $@ + podselect $< |pod2man -n $(notdir $*) -s 1 -r ${PKGVER} -c"Proxmox Documentation" >$@.tmp + mv $@.tmp $@ diff --git a/NEWS b/src/NEWS similarity index 100% rename from NEWS rename to src/NEWS diff --git a/PMG/API2.pm b/src/PMG/API2.pm similarity index 100% rename from PMG/API2.pm rename to src/PMG/API2.pm diff --git a/PMG/API2/APT.pm b/src/PMG/API2/APT.pm similarity index 100% rename from PMG/API2/APT.pm rename to src/PMG/API2/APT.pm diff --git a/PMG/API2/AccessControl.pm b/src/PMG/API2/AccessControl.pm similarity index 100% rename from PMG/API2/AccessControl.pm rename to src/PMG/API2/AccessControl.pm diff --git a/PMG/API2/Action.pm b/src/PMG/API2/Action.pm similarity index 100% rename from PMG/API2/Action.pm rename to src/PMG/API2/Action.pm diff --git a/PMG/API2/Backup.pm b/src/PMG/API2/Backup.pm similarity index 100% rename from PMG/API2/Backup.pm rename to src/PMG/API2/Backup.pm diff --git a/PMG/API2/ClamAV.pm b/src/PMG/API2/ClamAV.pm similarity index 100% rename from PMG/API2/ClamAV.pm rename to src/PMG/API2/ClamAV.pm diff --git a/PMG/API2/Cluster.pm b/src/PMG/API2/Cluster.pm similarity index 100% rename from PMG/API2/Cluster.pm rename to src/PMG/API2/Cluster.pm diff --git a/PMG/API2/Config.pm b/src/PMG/API2/Config.pm similarity index 100% rename from PMG/API2/Config.pm rename to src/PMG/API2/Config.pm diff --git a/PMG/API2/DestinationTLSPolicy.pm b/src/PMG/API2/DestinationTLSPolicy.pm similarity index 100% rename from PMG/API2/DestinationTLSPolicy.pm rename to src/PMG/API2/DestinationTLSPolicy.pm diff --git a/PMG/API2/Domains.pm b/src/PMG/API2/Domains.pm similarity index 100% rename from PMG/API2/Domains.pm rename to src/PMG/API2/Domains.pm diff --git a/PMG/API2/Fetchmail.pm b/src/PMG/API2/Fetchmail.pm similarity index 100% rename from PMG/API2/Fetchmail.pm rename to src/PMG/API2/Fetchmail.pm diff --git a/PMG/API2/LDAP.pm b/src/PMG/API2/LDAP.pm similarity index 100% rename from PMG/API2/LDAP.pm rename to src/PMG/API2/LDAP.pm diff --git a/PMG/API2/MailTracker.pm b/src/PMG/API2/MailTracker.pm similarity index 100% rename from PMG/API2/MailTracker.pm rename to src/PMG/API2/MailTracker.pm diff --git a/PMG/API2/MimeTypes.pm b/src/PMG/API2/MimeTypes.pm similarity index 100% rename from PMG/API2/MimeTypes.pm rename to src/PMG/API2/MimeTypes.pm diff --git a/PMG/API2/MyNetworks.pm b/src/PMG/API2/MyNetworks.pm similarity index 100% rename from PMG/API2/MyNetworks.pm rename to src/PMG/API2/MyNetworks.pm diff --git a/PMG/API2/Network.pm b/src/PMG/API2/Network.pm similarity index 100% rename from PMG/API2/Network.pm rename to src/PMG/API2/Network.pm diff --git a/PMG/API2/Nodes.pm b/src/PMG/API2/Nodes.pm similarity index 100% rename from PMG/API2/Nodes.pm rename to src/PMG/API2/Nodes.pm diff --git a/PMG/API2/ObjectGroupHelpers.pm b/src/PMG/API2/ObjectGroupHelpers.pm similarity index 100% rename from PMG/API2/ObjectGroupHelpers.pm rename to src/PMG/API2/ObjectGroupHelpers.pm diff --git a/PMG/API2/Postfix.pm b/src/PMG/API2/Postfix.pm similarity index 100% rename from PMG/API2/Postfix.pm rename to src/PMG/API2/Postfix.pm diff --git a/PMG/API2/Quarantine.pm b/src/PMG/API2/Quarantine.pm similarity index 100% rename from PMG/API2/Quarantine.pm rename to src/PMG/API2/Quarantine.pm diff --git a/PMG/API2/RuleDB.pm b/src/PMG/API2/RuleDB.pm similarity index 100% rename from PMG/API2/RuleDB.pm rename to src/PMG/API2/RuleDB.pm diff --git a/PMG/API2/Rules.pm b/src/PMG/API2/Rules.pm similarity index 100% rename from PMG/API2/Rules.pm rename to src/PMG/API2/Rules.pm diff --git a/PMG/API2/SMTPWhitelist.pm b/src/PMG/API2/SMTPWhitelist.pm similarity index 100% rename from PMG/API2/SMTPWhitelist.pm rename to src/PMG/API2/SMTPWhitelist.pm diff --git a/PMG/API2/Services.pm b/src/PMG/API2/Services.pm similarity index 100% rename from PMG/API2/Services.pm rename to src/PMG/API2/Services.pm diff --git a/PMG/API2/SpamAssassin.pm b/src/PMG/API2/SpamAssassin.pm similarity index 100% rename from PMG/API2/SpamAssassin.pm rename to src/PMG/API2/SpamAssassin.pm diff --git a/PMG/API2/Statistics.pm b/src/PMG/API2/Statistics.pm similarity index 100% rename from PMG/API2/Statistics.pm rename to src/PMG/API2/Statistics.pm diff --git a/PMG/API2/Subscription.pm b/src/PMG/API2/Subscription.pm similarity index 100% rename from PMG/API2/Subscription.pm rename to src/PMG/API2/Subscription.pm diff --git a/PMG/API2/Tasks.pm b/src/PMG/API2/Tasks.pm similarity index 100% rename from PMG/API2/Tasks.pm rename to src/PMG/API2/Tasks.pm diff --git a/PMG/API2/Transport.pm b/src/PMG/API2/Transport.pm similarity index 100% rename from PMG/API2/Transport.pm rename to src/PMG/API2/Transport.pm diff --git a/PMG/API2/Users.pm b/src/PMG/API2/Users.pm similarity index 100% rename from PMG/API2/Users.pm rename to src/PMG/API2/Users.pm diff --git a/PMG/API2/What.pm b/src/PMG/API2/What.pm similarity index 100% rename from PMG/API2/What.pm rename to src/PMG/API2/What.pm diff --git a/PMG/API2/When.pm b/src/PMG/API2/When.pm similarity index 100% rename from PMG/API2/When.pm rename to src/PMG/API2/When.pm diff --git a/PMG/API2/Who.pm b/src/PMG/API2/Who.pm similarity index 100% rename from PMG/API2/Who.pm rename to src/PMG/API2/Who.pm diff --git a/PMG/AccessControl.pm b/src/PMG/AccessControl.pm similarity index 100% rename from PMG/AccessControl.pm rename to src/PMG/AccessControl.pm diff --git a/PMG/AtomicFile.pm b/src/PMG/AtomicFile.pm similarity index 100% rename from PMG/AtomicFile.pm rename to src/PMG/AtomicFile.pm diff --git a/PMG/Backup.pm b/src/PMG/Backup.pm similarity index 100% rename from PMG/Backup.pm rename to src/PMG/Backup.pm diff --git a/PMG/CLI/pmgbackup.pm b/src/PMG/CLI/pmgbackup.pm similarity index 100% rename from PMG/CLI/pmgbackup.pm rename to src/PMG/CLI/pmgbackup.pm diff --git a/PMG/CLI/pmgcm.pm b/src/PMG/CLI/pmgcm.pm similarity index 100% rename from PMG/CLI/pmgcm.pm rename to src/PMG/CLI/pmgcm.pm diff --git a/PMG/CLI/pmgconfig.pm b/src/PMG/CLI/pmgconfig.pm similarity index 100% rename from PMG/CLI/pmgconfig.pm rename to src/PMG/CLI/pmgconfig.pm diff --git a/PMG/CLI/pmgdb.pm b/src/PMG/CLI/pmgdb.pm similarity index 100% rename from PMG/CLI/pmgdb.pm rename to src/PMG/CLI/pmgdb.pm diff --git a/PMG/CLI/pmgperf.pm b/src/PMG/CLI/pmgperf.pm similarity index 100% rename from PMG/CLI/pmgperf.pm rename to src/PMG/CLI/pmgperf.pm diff --git a/PMG/CLI/pmgqm.pm b/src/PMG/CLI/pmgqm.pm similarity index 100% rename from PMG/CLI/pmgqm.pm rename to src/PMG/CLI/pmgqm.pm diff --git a/PMG/CLI/pmgreport.pm b/src/PMG/CLI/pmgreport.pm similarity index 100% rename from PMG/CLI/pmgreport.pm rename to src/PMG/CLI/pmgreport.pm diff --git a/PMG/CLI/pmgsubscription.pm b/src/PMG/CLI/pmgsubscription.pm similarity index 100% rename from PMG/CLI/pmgsubscription.pm rename to src/PMG/CLI/pmgsubscription.pm diff --git a/PMG/CLI/pmgupgrade.pm b/src/PMG/CLI/pmgupgrade.pm similarity index 100% rename from PMG/CLI/pmgupgrade.pm rename to src/PMG/CLI/pmgupgrade.pm diff --git a/PMG/CLI/pmgversion.pm b/src/PMG/CLI/pmgversion.pm similarity index 100% rename from PMG/CLI/pmgversion.pm rename to src/PMG/CLI/pmgversion.pm diff --git a/PMG/Cluster.pm b/src/PMG/Cluster.pm similarity index 100% rename from PMG/Cluster.pm rename to src/PMG/Cluster.pm diff --git a/PMG/ClusterConfig.pm b/src/PMG/ClusterConfig.pm similarity index 100% rename from PMG/ClusterConfig.pm rename to src/PMG/ClusterConfig.pm diff --git a/PMG/Config.pm b/src/PMG/Config.pm similarity index 100% rename from PMG/Config.pm rename to src/PMG/Config.pm diff --git a/PMG/DBTools.pm b/src/PMG/DBTools.pm similarity index 100% rename from PMG/DBTools.pm rename to src/PMG/DBTools.pm diff --git a/PMG/Fetchmail.pm b/src/PMG/Fetchmail.pm similarity index 100% rename from PMG/Fetchmail.pm rename to src/PMG/Fetchmail.pm diff --git a/PMG/HTMLMail.pm b/src/PMG/HTMLMail.pm similarity index 100% rename from PMG/HTMLMail.pm rename to src/PMG/HTMLMail.pm diff --git a/PMG/HTTPServer.pm b/src/PMG/HTTPServer.pm similarity index 100% rename from PMG/HTTPServer.pm rename to src/PMG/HTTPServer.pm diff --git a/PMG/LDAPCache.pm b/src/PMG/LDAPCache.pm similarity index 100% rename from PMG/LDAPCache.pm rename to src/PMG/LDAPCache.pm diff --git a/PMG/LDAPConfig.pm b/src/PMG/LDAPConfig.pm similarity index 100% rename from PMG/LDAPConfig.pm rename to src/PMG/LDAPConfig.pm diff --git a/PMG/LDAPSet.pm b/src/PMG/LDAPSet.pm similarity index 100% rename from PMG/LDAPSet.pm rename to src/PMG/LDAPSet.pm diff --git a/PMG/MailQueue.pm b/src/PMG/MailQueue.pm similarity index 100% rename from PMG/MailQueue.pm rename to src/PMG/MailQueue.pm diff --git a/PMG/ModGroup.pm b/src/PMG/ModGroup.pm similarity index 100% rename from PMG/ModGroup.pm rename to src/PMG/ModGroup.pm diff --git a/PMG/Postfix.pm b/src/PMG/Postfix.pm similarity index 100% rename from PMG/Postfix.pm rename to src/PMG/Postfix.pm diff --git a/PMG/Quarantine.pm b/src/PMG/Quarantine.pm similarity index 100% rename from PMG/Quarantine.pm rename to src/PMG/Quarantine.pm diff --git a/PMG/RESTEnvironment.pm b/src/PMG/RESTEnvironment.pm similarity index 100% rename from PMG/RESTEnvironment.pm rename to src/PMG/RESTEnvironment.pm diff --git a/PMG/Report.pm b/src/PMG/Report.pm similarity index 100% rename from PMG/Report.pm rename to src/PMG/Report.pm diff --git a/PMG/RuleCache.pm b/src/PMG/RuleCache.pm similarity index 100% rename from PMG/RuleCache.pm rename to src/PMG/RuleCache.pm diff --git a/PMG/RuleDB.pm b/src/PMG/RuleDB.pm similarity index 100% rename from PMG/RuleDB.pm rename to src/PMG/RuleDB.pm diff --git a/PMG/RuleDB/Accept.pm b/src/PMG/RuleDB/Accept.pm similarity index 100% rename from PMG/RuleDB/Accept.pm rename to src/PMG/RuleDB/Accept.pm diff --git a/PMG/RuleDB/ArchiveFilter.pm b/src/PMG/RuleDB/ArchiveFilter.pm similarity index 100% rename from PMG/RuleDB/ArchiveFilter.pm rename to src/PMG/RuleDB/ArchiveFilter.pm diff --git a/PMG/RuleDB/Attach.pm b/src/PMG/RuleDB/Attach.pm similarity index 100% rename from PMG/RuleDB/Attach.pm rename to src/PMG/RuleDB/Attach.pm diff --git a/PMG/RuleDB/BCC.pm b/src/PMG/RuleDB/BCC.pm similarity index 100% rename from PMG/RuleDB/BCC.pm rename to src/PMG/RuleDB/BCC.pm diff --git a/PMG/RuleDB/Block.pm b/src/PMG/RuleDB/Block.pm similarity index 100% rename from PMG/RuleDB/Block.pm rename to src/PMG/RuleDB/Block.pm diff --git a/PMG/RuleDB/ContentTypeFilter.pm b/src/PMG/RuleDB/ContentTypeFilter.pm similarity index 100% rename from PMG/RuleDB/ContentTypeFilter.pm rename to src/PMG/RuleDB/ContentTypeFilter.pm diff --git a/PMG/RuleDB/Counter.pm b/src/PMG/RuleDB/Counter.pm similarity index 100% rename from PMG/RuleDB/Counter.pm rename to src/PMG/RuleDB/Counter.pm diff --git a/PMG/RuleDB/Disclaimer.pm b/src/PMG/RuleDB/Disclaimer.pm similarity index 100% rename from PMG/RuleDB/Disclaimer.pm rename to src/PMG/RuleDB/Disclaimer.pm diff --git a/PMG/RuleDB/Domain.pm b/src/PMG/RuleDB/Domain.pm similarity index 100% rename from PMG/RuleDB/Domain.pm rename to src/PMG/RuleDB/Domain.pm diff --git a/PMG/RuleDB/EMail.pm b/src/PMG/RuleDB/EMail.pm similarity index 100% rename from PMG/RuleDB/EMail.pm rename to src/PMG/RuleDB/EMail.pm diff --git a/PMG/RuleDB/Group.pm b/src/PMG/RuleDB/Group.pm similarity index 100% rename from PMG/RuleDB/Group.pm rename to src/PMG/RuleDB/Group.pm diff --git a/PMG/RuleDB/IPAddress.pm b/src/PMG/RuleDB/IPAddress.pm similarity index 100% rename from PMG/RuleDB/IPAddress.pm rename to src/PMG/RuleDB/IPAddress.pm diff --git a/PMG/RuleDB/IPNet.pm b/src/PMG/RuleDB/IPNet.pm similarity index 100% rename from PMG/RuleDB/IPNet.pm rename to src/PMG/RuleDB/IPNet.pm diff --git a/PMG/RuleDB/LDAP.pm b/src/PMG/RuleDB/LDAP.pm similarity index 100% rename from PMG/RuleDB/LDAP.pm rename to src/PMG/RuleDB/LDAP.pm diff --git a/PMG/RuleDB/LDAPUser.pm b/src/PMG/RuleDB/LDAPUser.pm similarity index 100% rename from PMG/RuleDB/LDAPUser.pm rename to src/PMG/RuleDB/LDAPUser.pm diff --git a/PMG/RuleDB/MatchField.pm b/src/PMG/RuleDB/MatchField.pm similarity index 100% rename from PMG/RuleDB/MatchField.pm rename to src/PMG/RuleDB/MatchField.pm diff --git a/PMG/RuleDB/MatchFilename.pm b/src/PMG/RuleDB/MatchFilename.pm similarity index 100% rename from PMG/RuleDB/MatchFilename.pm rename to src/PMG/RuleDB/MatchFilename.pm diff --git a/PMG/RuleDB/ModField.pm b/src/PMG/RuleDB/ModField.pm similarity index 100% rename from PMG/RuleDB/ModField.pm rename to src/PMG/RuleDB/ModField.pm diff --git a/PMG/RuleDB/Notify.pm b/src/PMG/RuleDB/Notify.pm similarity index 100% rename from PMG/RuleDB/Notify.pm rename to src/PMG/RuleDB/Notify.pm diff --git a/PMG/RuleDB/Object.pm b/src/PMG/RuleDB/Object.pm similarity index 100% rename from PMG/RuleDB/Object.pm rename to src/PMG/RuleDB/Object.pm diff --git a/PMG/RuleDB/Quarantine.pm b/src/PMG/RuleDB/Quarantine.pm similarity index 100% rename from PMG/RuleDB/Quarantine.pm rename to src/PMG/RuleDB/Quarantine.pm diff --git a/PMG/RuleDB/Receiver.pm b/src/PMG/RuleDB/Receiver.pm similarity index 100% rename from PMG/RuleDB/Receiver.pm rename to src/PMG/RuleDB/Receiver.pm diff --git a/PMG/RuleDB/ReceiverDomain.pm b/src/PMG/RuleDB/ReceiverDomain.pm similarity index 100% rename from PMG/RuleDB/ReceiverDomain.pm rename to src/PMG/RuleDB/ReceiverDomain.pm diff --git a/PMG/RuleDB/ReceiverRegex.pm b/src/PMG/RuleDB/ReceiverRegex.pm similarity index 100% rename from PMG/RuleDB/ReceiverRegex.pm rename to src/PMG/RuleDB/ReceiverRegex.pm diff --git a/PMG/RuleDB/Remove.pm b/src/PMG/RuleDB/Remove.pm similarity index 100% rename from PMG/RuleDB/Remove.pm rename to src/PMG/RuleDB/Remove.pm diff --git a/PMG/RuleDB/ReportSpam.pm b/src/PMG/RuleDB/ReportSpam.pm similarity index 100% rename from PMG/RuleDB/ReportSpam.pm rename to src/PMG/RuleDB/ReportSpam.pm diff --git a/PMG/RuleDB/Rule.pm b/src/PMG/RuleDB/Rule.pm similarity index 100% rename from PMG/RuleDB/Rule.pm rename to src/PMG/RuleDB/Rule.pm diff --git a/PMG/RuleDB/Spam.pm b/src/PMG/RuleDB/Spam.pm similarity index 100% rename from PMG/RuleDB/Spam.pm rename to src/PMG/RuleDB/Spam.pm diff --git a/PMG/RuleDB/TimeFrame.pm b/src/PMG/RuleDB/TimeFrame.pm similarity index 100% rename from PMG/RuleDB/TimeFrame.pm rename to src/PMG/RuleDB/TimeFrame.pm diff --git a/PMG/RuleDB/Virus.pm b/src/PMG/RuleDB/Virus.pm similarity index 100% rename from PMG/RuleDB/Virus.pm rename to src/PMG/RuleDB/Virus.pm diff --git a/PMG/RuleDB/WhoRegex.pm b/src/PMG/RuleDB/WhoRegex.pm similarity index 100% rename from PMG/RuleDB/WhoRegex.pm rename to src/PMG/RuleDB/WhoRegex.pm diff --git a/PMG/SMTP.pm b/src/PMG/SMTP.pm similarity index 100% rename from PMG/SMTP.pm rename to src/PMG/SMTP.pm diff --git a/PMG/SMTPPrinter.pm b/src/PMG/SMTPPrinter.pm similarity index 100% rename from PMG/SMTPPrinter.pm rename to src/PMG/SMTPPrinter.pm diff --git a/PMG/Service/pmgdaemon.pm b/src/PMG/Service/pmgdaemon.pm similarity index 100% rename from PMG/Service/pmgdaemon.pm rename to src/PMG/Service/pmgdaemon.pm diff --git a/PMG/Service/pmgmirror.pm b/src/PMG/Service/pmgmirror.pm similarity index 100% rename from PMG/Service/pmgmirror.pm rename to src/PMG/Service/pmgmirror.pm diff --git a/PMG/Service/pmgproxy.pm b/src/PMG/Service/pmgproxy.pm similarity index 100% rename from PMG/Service/pmgproxy.pm rename to src/PMG/Service/pmgproxy.pm diff --git a/PMG/Service/pmgtunnel.pm b/src/PMG/Service/pmgtunnel.pm similarity index 100% rename from PMG/Service/pmgtunnel.pm rename to src/PMG/Service/pmgtunnel.pm diff --git a/PMG/Statistic.pm b/src/PMG/Statistic.pm similarity index 100% rename from PMG/Statistic.pm rename to src/PMG/Statistic.pm diff --git a/PMG/Ticket.pm b/src/PMG/Ticket.pm similarity index 100% rename from PMG/Ticket.pm rename to src/PMG/Ticket.pm diff --git a/PMG/Unpack.pm b/src/PMG/Unpack.pm similarity index 100% rename from PMG/Unpack.pm rename to src/PMG/Unpack.pm diff --git a/PMG/UserConfig.pm b/src/PMG/UserConfig.pm similarity index 100% rename from PMG/UserConfig.pm rename to src/PMG/UserConfig.pm diff --git a/PMG/Utils.pm b/src/PMG/Utils.pm similarity index 100% rename from PMG/Utils.pm rename to src/PMG/Utils.pm diff --git a/PMG/pmgcfg.pm.in b/src/PMG/pmgcfg.pm.in similarity index 63% rename from PMG/pmgcfg.pm.in rename to src/PMG/pmgcfg.pm.in index bc8886c..5b8506b 100644 --- a/PMG/pmgcfg.pm.in +++ b/src/PMG/pmgcfg.pm.in @@ -4,31 +4,31 @@ use strict; use vars qw(@ISA); sub package { - return '@PACKAGE@'; + return '@PACKAGE@'; } sub version { - return '@VERSION@'; + return '@VERSION@'; } sub release { - return '@PACKAGERELEASE@'; + return '@PMGRELEASE@'; } sub repoid { - return '@REPOID@'; + return '@REPOID@'; } # this is diplayed on the GUI sub version_text { - return '@VERSION@-@PACKAGERELEASE@/@REPOID@'; + return '@VERSION@/@REPOID@'; } # this is returned by the API sub version_info { return { 'version' => '@VERSION@', - 'release' => '@PACKAGERELEASE@', + 'release' => '@PMGRELEASE@', 'repoid' => '@REPOID@', } } diff --git a/bin/pmg-daily b/src/bin/pmg-daily similarity index 100% rename from bin/pmg-daily rename to src/bin/pmg-daily diff --git a/bin/pmg-hourly b/src/bin/pmg-hourly similarity index 100% rename from bin/pmg-hourly rename to src/bin/pmg-hourly diff --git a/bin/pmg-smtp-filter b/src/bin/pmg-smtp-filter similarity index 100% rename from bin/pmg-smtp-filter rename to src/bin/pmg-smtp-filter diff --git a/bin/pmg-system-report b/src/bin/pmg-system-report similarity index 100% rename from bin/pmg-system-report rename to src/bin/pmg-system-report diff --git a/bin/pmgbackup b/src/bin/pmgbackup similarity index 100% rename from bin/pmgbackup rename to src/bin/pmgbackup diff --git a/bin/pmgbanner b/src/bin/pmgbanner similarity index 100% rename from bin/pmgbanner rename to src/bin/pmgbanner diff --git a/bin/pmgcm b/src/bin/pmgcm similarity index 100% rename from bin/pmgcm rename to src/bin/pmgcm diff --git a/bin/pmgconfig b/src/bin/pmgconfig similarity index 100% rename from bin/pmgconfig rename to src/bin/pmgconfig diff --git a/bin/pmgdaemon b/src/bin/pmgdaemon similarity index 100% rename from bin/pmgdaemon rename to src/bin/pmgdaemon diff --git a/bin/pmgdb b/src/bin/pmgdb similarity index 100% rename from bin/pmgdb rename to src/bin/pmgdb diff --git a/bin/pmgmirror b/src/bin/pmgmirror similarity index 100% rename from bin/pmgmirror rename to src/bin/pmgmirror diff --git a/bin/pmgperf b/src/bin/pmgperf similarity index 100% rename from bin/pmgperf rename to src/bin/pmgperf diff --git a/bin/pmgpolicy b/src/bin/pmgpolicy similarity index 100% rename from bin/pmgpolicy rename to src/bin/pmgpolicy diff --git a/bin/pmgproxy b/src/bin/pmgproxy similarity index 100% rename from bin/pmgproxy rename to src/bin/pmgproxy diff --git a/bin/pmgqm b/src/bin/pmgqm similarity index 100% rename from bin/pmgqm rename to src/bin/pmgqm diff --git a/bin/pmgreport b/src/bin/pmgreport similarity index 100% rename from bin/pmgreport rename to src/bin/pmgreport diff --git a/bin/pmgsh b/src/bin/pmgsh similarity index 100% rename from bin/pmgsh rename to src/bin/pmgsh diff --git a/bin/pmgsubscription b/src/bin/pmgsubscription similarity index 100% rename from bin/pmgsubscription rename to src/bin/pmgsubscription diff --git a/bin/pmgtunnel b/src/bin/pmgtunnel similarity index 100% rename from bin/pmgtunnel rename to src/bin/pmgtunnel diff --git a/bin/pmgupgrade b/src/bin/pmgupgrade similarity index 100% rename from bin/pmgupgrade rename to src/bin/pmgupgrade diff --git a/bin/pmgversion b/src/bin/pmgversion similarity index 100% rename from bin/pmgversion rename to src/bin/pmgversion diff --git a/favicon.ico b/src/favicon.ico similarity index 100% rename from favicon.ico rename to src/favicon.ico diff --git a/pmg-apt.conf b/src/pmg-apt.conf similarity index 100% rename from pmg-apt.conf rename to src/pmg-apt.conf diff --git a/pmg-initramfs.conf b/src/pmg-initramfs.conf similarity index 100% rename from pmg-initramfs.conf rename to src/pmg-initramfs.conf diff --git a/pmg-sources.list b/src/pmg-sources.list similarity index 100% rename from pmg-sources.list rename to src/pmg-sources.list diff --git a/templates/clamd.conf.in b/src/templates/clamd.conf.in similarity index 100% rename from templates/clamd.conf.in rename to src/templates/clamd.conf.in diff --git a/templates/fetchmailrc.tt b/src/templates/fetchmailrc.tt similarity index 100% rename from templates/fetchmailrc.tt rename to src/templates/fetchmailrc.tt diff --git a/templates/freshclam.conf.in b/src/templates/freshclam.conf.in similarity index 100% rename from templates/freshclam.conf.in rename to src/templates/freshclam.conf.in diff --git a/templates/init.pre.in b/src/templates/init.pre.in similarity index 100% rename from templates/init.pre.in rename to src/templates/init.pre.in diff --git a/templates/local.cf.in b/src/templates/local.cf.in similarity index 100% rename from templates/local.cf.in rename to src/templates/local.cf.in diff --git a/templates/main.cf.in b/src/templates/main.cf.in similarity index 100% rename from templates/main.cf.in rename to src/templates/main.cf.in diff --git a/templates/main.cf.in.demo b/src/templates/main.cf.in.demo similarity index 100% rename from templates/main.cf.in.demo rename to src/templates/main.cf.in.demo diff --git a/templates/master.cf.in b/src/templates/master.cf.in similarity index 100% rename from templates/master.cf.in rename to src/templates/master.cf.in diff --git a/templates/master.cf.in.demo b/src/templates/master.cf.in.demo similarity index 100% rename from templates/master.cf.in.demo rename to src/templates/master.cf.in.demo diff --git a/templates/pg_hba.conf.in b/src/templates/pg_hba.conf.in similarity index 100% rename from templates/pg_hba.conf.in rename to src/templates/pg_hba.conf.in diff --git a/templates/pmgreport.tt b/src/templates/pmgreport.tt similarity index 100% rename from templates/pmgreport.tt rename to src/templates/pmgreport.tt diff --git a/templates/postgresql.conf.in b/src/templates/postgresql.conf.in similarity index 100% rename from templates/postgresql.conf.in rename to src/templates/postgresql.conf.in diff --git a/templates/razor-agent.conf.in b/src/templates/razor-agent.conf.in similarity index 100% rename from templates/razor-agent.conf.in rename to src/templates/razor-agent.conf.in diff --git a/templates/spamreport-short.tt b/src/templates/spamreport-short.tt similarity index 100% rename from templates/spamreport-short.tt rename to src/templates/spamreport-short.tt diff --git a/templates/spamreport-verbose.tt b/src/templates/spamreport-verbose.tt similarity index 100% rename from templates/spamreport-verbose.tt rename to src/templates/spamreport-verbose.tt diff --git a/templates/v310.pre.in b/src/templates/v310.pre.in similarity index 100% rename from templates/v310.pre.in rename to src/templates/v310.pre.in diff --git a/templates/v320.pre.in b/src/templates/v320.pre.in similarity index 100% rename from templates/v320.pre.in rename to src/templates/v320.pre.in diff --git a/tests/Makefile b/src/tests/Makefile similarity index 100% rename from tests/Makefile rename to src/tests/Makefile diff --git a/tests/create_testdb.pl b/src/tests/create_testdb.pl similarity index 100% rename from tests/create_testdb.pl rename to src/tests/create_testdb.pl diff --git a/tests/init_testdb.pl b/src/tests/init_testdb.pl similarity index 100% rename from tests/init_testdb.pl rename to src/tests/init_testdb.pl diff --git a/tests/print_testdb.pl b/src/tests/print_testdb.pl similarity index 100% rename from tests/print_testdb.pl rename to src/tests/print_testdb.pl diff --git a/tests/test_greylist.pl b/src/tests/test_greylist.pl similarity index 100% rename from tests/test_greylist.pl rename to src/tests/test_greylist.pl diff --git a/tests/testdb.txt b/src/tests/testdb.txt similarity index 100% rename from tests/testdb.txt rename to src/tests/testdb.txt -- 2.39.2