diff options
Diffstat (limited to 'mail-filter')
60 files changed, 1078 insertions, 2555 deletions
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz Binary files differindex f4248efe7c61..bb212a3025e8 100644 --- a/mail-filter/Manifest.gz +++ b/mail-filter/Manifest.gz diff --git a/mail-filter/afew/Manifest b/mail-filter/afew/Manifest index cc8158d41d1c..64e17f0083c1 100644 --- a/mail-filter/afew/Manifest +++ b/mail-filter/afew/Manifest @@ -1,7 +1,7 @@ DIST afew-1.1.0.tar.gz 31119 BLAKE2B f5e66f000e8b06154aef8b2732c3d9f9d26befd5b606c78e75c239290ff50041987682a3d1a13abf611118a6153cbd7eec599f266783d41b7c1fca391c4ceacd SHA512 4f3c7234b15184b03264763cd271503cc8e49d9698169744718f17d6c4af9674bb50e592b23875991f9b1671b40dbea960a0e6153fa731aee92d4d1bd5c4548f DIST afew-1.2.0.tar.gz 31831 BLAKE2B 7976dfc1e56461afbd6244220c5d548c7de5e95649bd7ac0c986457c99cfc4574e6f5d6b90bc8985ef37e84f55f52b8417fcc1644c9aadf0a37123e0ea0ecba2 SHA512 98184808ae37e169bdbda9ac43db00e3e0712aaadc9b75e07c8d483c8024aa0cafb0a3424bda5703dfe77a09f5efd9812b80b3468009cfb4562eb5d0069558e4 DIST afew-1.3.0.tar.gz 33361 BLAKE2B 2553c04fce7e1c9f0a6551a8a01ed85735320bea95fe723050bdbde97aea80b93631c3621ec6cb0687753cbd88ac26725b1c608f7b8a6bcb4fc5bce6d3fce411 SHA512 2e15dc2aa6032b14c3fed57cb5912e3c3471592586f5fa40991b2a007d8a9579c0e1f69e455e1405923b93de64b9b8c126b5ccf8da72144528c57108beea7370 -EBUILD afew-1.1.0.ebuild 832 BLAKE2B 563ce06a8e842a9d545bb78a9ffb8f5a7b34c413512e5eb3d441ceea85920a396cc92958199bf1c17b2a98419ca250a4b5faf5d76152aec94762782a7297313a SHA512 dbf7954a989a1d3f11043bc781b69ead2b4a94e20d8d8e662cd130973dc247b0cb943f595ddca1e25272e35f4668bda1a37621b2a5df6c903aeae1958e7d2159 -EBUILD afew-1.2.0.ebuild 832 BLAKE2B 563ce06a8e842a9d545bb78a9ffb8f5a7b34c413512e5eb3d441ceea85920a396cc92958199bf1c17b2a98419ca250a4b5faf5d76152aec94762782a7297313a SHA512 dbf7954a989a1d3f11043bc781b69ead2b4a94e20d8d8e662cd130973dc247b0cb943f595ddca1e25272e35f4668bda1a37621b2a5df6c903aeae1958e7d2159 -EBUILD afew-1.3.0.ebuild 871 BLAKE2B f550906d5dbde6a6b775e2962b6db767a1fa6b57f612280b6394ee4c106dab5d874bcb7a80c8e6141b82d0dd51633eac528d1f3f167b5754014ebeb802f06cf0 SHA512 0ca720e1d2e0379b7578b26d771a6f408db1a7c53064be994c8bc3848181fa8c1ca179d00bae8a3d37bb365b88419344c4da0c1fdd5c126649c1d3256307d5fd +EBUILD afew-1.1.0.ebuild 825 BLAKE2B c2422af2db6930bfe25bd5cffb8c909dc5664a6b1d46902abe70e69c73ea6c0608d899b8549c5a40561fe0a6fc0945f0ee8dfcf02bc95b422f58e010d7979859 SHA512 ab2ec9c90871c429b7afc4ed23e13f8f635d503dc6e66b2f1d1d7c21dd75746fbead5b8bd8622d0172049cce711ea86ac1b3c35aa3bb28a0ecd15ae71878e9ec +EBUILD afew-1.2.0.ebuild 825 BLAKE2B c2422af2db6930bfe25bd5cffb8c909dc5664a6b1d46902abe70e69c73ea6c0608d899b8549c5a40561fe0a6fc0945f0ee8dfcf02bc95b422f58e010d7979859 SHA512 ab2ec9c90871c429b7afc4ed23e13f8f635d503dc6e66b2f1d1d7c21dd75746fbead5b8bd8622d0172049cce711ea86ac1b3c35aa3bb28a0ecd15ae71878e9ec +EBUILD afew-1.3.0.ebuild 864 BLAKE2B e3b3726f0a29a1147f2fb53f4f79bda8fb0953bc3b2c1a614d83e3b8826a424e7c52fd9ce1661918c2ca6f89a6666d92cdccc53c66d0200785af52c3002c5608 SHA512 fc44df98dfdf9971f0cf36089b49333e4f3405f5f2054ea65b3318ee00cc2b345483ee12ab78ee444f632c0b42ae90ea40b0994f404303cfbc203d2da028372f MISC metadata.xml 883 BLAKE2B 64c438e53564d21a25684eb8b8bcf6b5a9e53a79202a27eb43a7621669c716f5af96cec95ee616c5ef3d1be91433c523badb16cb1c6363ebb9574066b2d65833 SHA512 5f799a3db42139165f32075a9f753cdc2f11072c067e5602bc37f557b6edfc8c631a8ea9c512e492587224b287f2d996e38a4e690fe294e508f7b9568b6f15e7 diff --git a/mail-filter/afew/afew-1.1.0.ebuild b/mail-filter/afew/afew-1.1.0.ebuild index 056d2071a9bc..7a4d43ab559b 100644 --- a/mail-filter/afew/afew-1.1.0.ebuild +++ b/mail-filter/afew/afew-1.1.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{3_5,3_6} ) inherit distutils-r1 diff --git a/mail-filter/afew/afew-1.2.0.ebuild b/mail-filter/afew/afew-1.2.0.ebuild index 056d2071a9bc..7a4d43ab559b 100644 --- a/mail-filter/afew/afew-1.2.0.ebuild +++ b/mail-filter/afew/afew-1.2.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{3_5,3_6} ) inherit distutils-r1 diff --git a/mail-filter/afew/afew-1.3.0.ebuild b/mail-filter/afew/afew-1.3.0.ebuild index 8bbdbf2fe275..f47bf50ec0a8 100644 --- a/mail-filter/afew/afew-1.3.0.ebuild +++ b/mail-filter/afew/afew-1.3.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 DISTUTILS_SINGLE_IMPL=1 -PYTHON_COMPAT=( python{3_4,3_5,3_6} ) +PYTHON_COMPAT=( python{3_5,3_6} ) inherit distutils-r1 diff --git a/mail-filter/dspam/Manifest b/mail-filter/dspam/Manifest index 15dadafe6904..1e13e042c400 100644 --- a/mail-filter/dspam/Manifest +++ b/mail-filter/dspam/Manifest @@ -4,5 +4,5 @@ AUX dspam.initd 867 BLAKE2B c0dd2e67cb57b646b95b2b5cdf12aeea647166fde24036497e5e AUX dspam.logrotate 180 BLAKE2B 157570caf3ce9885ded6aaf99f189985a730306e7a15cdb77dfc050134e75722ac0d82b27f69ed9478b252e458a39b3705801d9829d4759cf439a892aaf66275 SHA512 8178e7ce02ca11171bc5650b70583fa02d2a84a25d184bbee1760618355578826c34a423d76310135f773e37d5ecab565a707ed1d33190005daf1851a756c389 DIST dspam-3.10.2.tar.gz 1035054 BLAKE2B 9200e6a3449feea3cec80572d7856597e487e553a69b52e7ecee1cd17c0792faf48fbda9e253d1fe52be40b8f0d4dcab4006b898abdcc62289550f17d7d876d3 SHA512 5fe53e1d0d7cabb3983f5c67274b074b7c647c1bae10ebc7ea3805542f99dbfb39abd4697e344e6eb80554522319a1253e1082ed6b389364bbaec1d6ddd43856 EBUILD dspam-3.10.2-r1.ebuild 5977 BLAKE2B f988cf01a109b7a96462c4de3e7e432f53a3e69533322e9bef453b651bbdd09ebe9cf18c65b2880ab2fbb6fdc697409205213ee50ffb0794c685ca69cd336a58 SHA512 f6f45d8fdd212442d289c535e260fe79274ebb84356a0dbb7b72b207278dc0ddd89d6fb255fd8d77945600bc9209b291737246a616caf89d9f3c44f9ed791554 -EBUILD dspam-3.10.2-r2.ebuild 5928 BLAKE2B edd2f70ee54ee49457912985f6b2e761294bce167191f0eb1a67ce5b56aecba19cec39cab82eaff74c42bf21f257cf4c97234d349410b9baaafb5eef3685ad17 SHA512 013d1d7409777899d12d001f4d7f2254d612af3e80c818dbc0479a1d7b2f4b2262567114a8bd8dd6a29e87af68bc8838cd342b5b46fe1c0755de1b03fbcf4735 +EBUILD dspam-3.10.2-r2.ebuild 5935 BLAKE2B c944b14fdd51d7e3a62e325c49e5cd240b9f573016194ad81aca4f50fa92d1efa3e61539d9ee80b3c0ff6bd04443327ec60e40a4b29ef9c63b624d102ff5beca SHA512 2d19c6567c14d35ed88c4586fb35a6390af92582f67f169f94dc0c25cae7f818cd0140729d3ba6112bfb891c0cd92ed09ab6c0db5cf6c1e3f79dc557702a8ab6 MISC metadata.xml 1080 BLAKE2B 99fe9506bc845c43f298230a531ea6e463dae9ffa353b7e55c1133f0ee37d10e2b0846f6edc726fd690e1ec637809e4e2fdb5a04456b80b7382fd767b39b44e3 SHA512 963fd0fc0c898ad12877e5905917d0b733cf8e52c62d254955455b60e60eacd1b909c998e3e88c030cfd9024786da80920222369939a189d8e142500a13a636f diff --git a/mail-filter/dspam/dspam-3.10.2-r2.ebuild b/mail-filter/dspam/dspam-3.10.2-r2.ebuild index 427586b4be9e..eb4899d3022e 100644 --- a/mail-filter/dspam/dspam-3.10.2-r2.ebuild +++ b/mail-filter/dspam/dspam-3.10.2-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" DRIVERS_IUSE="+hash mysql postgres sqlite" SCALES_IUSE="small-scale +domain-scale large-scale" IUSE="clamav daemon debug ldap static-libs syslog virtual-users user-homedirs ${DRIVERS_IUSE} ${SCALES_IUSE}" diff --git a/mail-filter/libdkim/Manifest b/mail-filter/libdkim/Manifest deleted file mode 100644 index a3c4eee7643a..000000000000 --- a/mail-filter/libdkim/Manifest +++ /dev/null @@ -1,15 +0,0 @@ -AUX debianize/Makefile.in 2428 BLAKE2B 04f4564a8cdc1fcac7386fd66059ef6f54d05ff5f17bd33b5162d64ae5488abbffffd8a76b468bc9ceedadb55f01d34e5af80ef4f263cf708eb829a96ec4bb04 SHA512 05db88fa13c37e3523c7ec9fd4687d57b250d789318afe886d9b5d37813d12ec1cccbff9d519faee213061e25a41dcb0cd2cf0490755d1712e5bc58a023e69c7 -AUX debianize/aclocal.m4 5813 BLAKE2B d2ed3f0de74e95a1360557c2cb28b1fbdfd45107d774969c3acbc466554f908191c33de44337d2c04a12c731c91f96b5fc5ed24e234a45c01099651b10057ca5 SHA512 f0e4b4d56768c1c05f0e814c36597f7011274914cad28938a8b174e89dbe4263374849ad88a246b64789f312740fc660853d086f54397fa5ccd3be95dfa9b99d -AUX debianize/configure.ac 958 BLAKE2B 9599456d827b4b2189848842ae7ff137f0ef376d4ebed5fc65333847cdc668a3dfc974103b556eb65003028d5d0b9a661f9a37fdeaf0552e6673d12adc6906b3 SHA512 c78b670a4bf7b6d56253f2ba78f26fdfbce2da70f2c1c872ca98062528729f25e1e0363f7520713640fe040c42d7900350ca16c15b0d40c04a45f40709f13354 -AUX debianize/libdkim.pc.in 293 BLAKE2B 959e382abe031844cc87a55d1d131a7f509351aa34528e25150686cc8f2be71eb0252412c8d08e9373ae5402c3d2e5f93f1890ba9e7f349d55e27496d7b37a7f SHA512 4bc756efd21b2e6c3673af626e93c542a861b9e380dbf91a7f61cecd72e87d4346552350382d10acaffb19b7adfeaaa422ebd3387754441115c882a807ee4250 -AUX debianize/libdkim.ver 34 BLAKE2B b0e5b77ce0c0c0830a023bacc37e4c7b1d3ea4cc3bcc29cf911be67eed48fd46d28b275045374ca676452f8a9cecbf3940df8f723f6d40c75108f39bb7f46565 SHA512 98c6b245561e1cc7c9b21e1dfff7f44c784de2b20cee036761ff517d5521fea6fa00b734c3710504fc50bb9b143bb0343b73f730da670c22047bff9b8407adc6 -AUX libdkim-1.0.21-gcc6.patch 4940 BLAKE2B ed4c62f075ade7741c80210174968d1f0aa0377e3cd1ab2d881cfa2deba169b03cedc3ae72376e4c73883eedf34801064cc8bf660fcbee7ef20a981d70e36c47 SHA512 59cfa92f9c1509495496c8adcdfddf08d296b8080baff37315bb68d46ff4b768ad238fbf6481f625bcd879c54134f5e612ffa468bc08ff2ce0ce41eeb2973ae9 -AUX libdkim-extra-options-r1.patch 2722 BLAKE2B bb5d7951065121c74f0d3b1244ce6cd3548f3ceeca85615838c1be6cd3487727dc9aebc32afc7092a8c52508d3fea98baec5ff932c896dbacbe0b136beebca3e SHA512 14fc04a6d67ed8982ca250323b910b20d34390772e3aa89eb28f1602e63bf1a24f38f4fb1a41fa1b7bf7226c40d3dd6b70bef1da6442344d7a980a8328ba5af8 -AUX libdkim-extra-options.patch 2614 BLAKE2B 61939530ad488a025342aeea8f4cbb97f9fbe334fb2056a0b18d4e8aa63e1795d78419eeeee07001ad8e4b22217377b8844d70475e880bde308857502c2f0a85 SHA512 da5521eca184074cf853f4438b6c0c58219ff32901c3c77de9f9ef8a894444e74854895909e55b0002f6ae561d7b065575d56193954ebf3892e0584b2386b10a -AUX patches/fix_warnings.patch 9483 BLAKE2B 8a0eb57a22712348adcadb7fb09f4375f9c13866a739264fe5ebfcd568a2fe5fe59c4d0fec46a9faeae6c007e97bb21bcc3326e33bfddfa4c46929ce4768a7d4 SHA512 868f1e3c21830f8237028e0e6263c7b1e5fd6d42482faaf67ae73ab730c334270b7fcff174832cddc20cecd0f56e577b634f6c5e8739f32ea15ec65e160d774e -AUX patches/series 34 BLAKE2B 8975814e5d91240964865f029c4e1b985b95796b20c6bd49a6e7213b0bf36a9a68cf68fdd444511ff9f6a27489844ce8804aaa1c6ead4a7e7a4f8ed6a8bd9cad SHA512 d2ba14924b9d56a2fb92ced7cc3186f061b0c9f4a7f3c6976e5051ac459998413667d7d5d7352eb05561f0f711fa104d78c7bbb47c193a383a9a5ce4ba6f44d0 -AUX patches/strtok_r.patch 3378 BLAKE2B f245cb047e8699084a25f1389834c0a2730bf09d013d038a8a539937336622259fd34c363c8671639150eab8c3d61784c9920e05227b3b92be6fc23967743a61 SHA512 ef6e5576ab1158e1bc05dfa20e686462e09461da870a41557d736848ea876c449e4064e7e44ba2e64647538c03208eaee06389f050feaa07cc615d547f7e061b -DIST libdkim-1.0.21.zip 55049 BLAKE2B f7481bc41a2f43357a67aa9f6e251634f1c2850fd1dfe3c4a4e0ea64341a3625ff0e393e039d679784c8c1ce349ee7063511f988ff6cf6d5b7acfc7c9633f9da SHA512 3996c64398151dc9c07d357e8f3ac9b94e3c8d06ce5d83ebbe546416f361349d869b0b73216f28d0b732319731f31e61afd9eab0f540471760b944a90130a094 -EBUILD libdkim-1.0.21-r3.ebuild 1157 BLAKE2B 240cc29463de8eaeb956368ca5af6f9161fc81bec9102744b1c91b81e89c6ddcf923ffa229ed282a09b7fff4d35a9033b66c57eeaacb9a00b38b786ee1bfe8c3 SHA512 883f7771388d591b3b64a132088b56abf5f40406252f856cb8fbcd2610bf6cee0c42192a9cb498bda62d2ea80bd302939876a49eabc198953e8d446c04b66101 -EBUILD libdkim-1.0.21-r4.ebuild 1078 BLAKE2B d381feec1ff7b56cf0750516318dd25f14956a836406c632bef830247849d9822423e2f37ed7863e26a62e2cf68e9a8c2af9f85802d3a454af58946e4a5c503a SHA512 790c84a98900be44aa11bed8f3b7e1f95db049b6fc4f685ae99085a1332898fc1789817585174ae7e880908184d84488fbd31dafb6ad21351b17207abfc3bcc3 -MISC metadata.xml 249 BLAKE2B 84210e21cccad244171f7fc855596c16abacf300aec5087825ccdfd4245a2a04f46dc99fbad2ae1998071511941f89380089cb1bf4d9e80111ecac1a5f157a03 SHA512 a2be284cf2f4e9a6c84979c88c89dc591d63b1c9093f63a72e96c7a725660467e69f780a7e6e586ec8e2665a8ae1b687cdec7cf79c16fbbd693dc5156c3f413b diff --git a/mail-filter/libdkim/files/debianize/Makefile.in b/mail-filter/libdkim/files/debianize/Makefile.in deleted file mode 100644 index 862f9b8478c7..000000000000 --- a/mail-filter/libdkim/files/debianize/Makefile.in +++ /dev/null @@ -1,93 +0,0 @@ -# libdkim makefile for UNIX -# -srcdir = @srcdir@ -VPATH = @srcdir@ - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -libdir = @libdir@ -includedir = @includedir@ - -OBJEXT = @OBJEXT@ -LIBS = @LIBS@ @libcrypto_LIBS@ - -CC = @CC@ -CXX = @CXX@ - -CFLAGS = @CFLAGS@ -CXXFLAGS = @CXXFLAGS@ -CPPFLAGS = @CPPFLAGS@ - -INCL = -LDFLAGS = @LDFLAGS@ - -libdkim_SOURCES = dkim.cpp dns.cpp dkimbase.cpp dkimsign.cpp dkimverify.cpp -HEADERS = dkim.h dns.h dkimbase.h dkimsign.h dkimverify.h - -libdkim_OBJS = $(libdkim_SOURCES:.cpp=.$(OBJEXT)) -libdkim_PURE_OBJS = $(libdkim_SOURCES:.cpp=.p$(OBJEXT)) - -libdkimtest_SOURCES = libdkimtest.cpp -libdkimtest_OBJS = libdkimtest.$(OBJEXT) - -SHLIBFORLINK = libdkim.so -SHLIBSONAME = $(SHLIBFORLINK).$(SHLIBMAJOR) -SHLIBTARGET = $(SHLIBFORLINK) -SHLIBLINK = $(CXX) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME) -Wl,-version-script=libdkim.ver -SHLIBMAJOR = 1d -SHLIBMINOR = 1 -SHLIBFILE = $(SHLIBSONAME).$(SHLIBMINOR) -SHLIBCFLAGS = -fPIC - -ARFLAGS = crs - -TARGETS = libdkim.a $(SHLIBTARGET) libdkimtest - -all: $(TARGETS) - -libdkim.a: $(libdkim_OBJS) - -rm -f $@ - $(AR) $(ARFLAGS) $@ $(libdkim_OBJS) - -$(SHLIBFORLINK): $(libdkim_PURE_OBJS) - $(SHLIBLINK) -o $@ $(libdkim_PURE_OBJS) $(LIBS) - -mkdir .lib 2>/dev/null - [ -z "$(SHLIBSONAME)" ] || (cd .lib \ - && ln -sf ../$(SHLIBFORLINK) $(SHLIBSONAME)) - -libdkimtest: $(libdkimtest_OBJS) $(SHLIBFORLINK) - $(CXX) ${LDFLAGS} -L. -o $@ libdkimtest.o -ldkim $(LIBS) - -libdkimtest.o: $(libdkimtest_SOURCES) $(HDRS) - $(CXX) $(CXXFLAGS) -o $@ -c $< - -%.$(OBJEXT): %.cpp $(HDRS) - $(CXX) $(CXXFLAGS) -o $@ -c $< - -%.p$(OBJEXT): %.cpp $(HDRS) - $(CXX) $(SHLIBCFLAGS) $(CXXFLAGS) -o $@ -c $< - -clean: - -rm -f *.$(OBJEXT) *.p$(OBJEXT) $(TARGETS) - -rm -rf .lib - -distclean: clean - -rm -f config.status config.log Makefile libdkim.pc - -install: all - install -m 755 -d $(DESTDIR)$(libdir) - install -m 755 -d $(DESTDIR)$(libdir)/pkgconfig - install -m 755 -d $(DESTDIR)$(includedir) - install -m 644 libdkim.a $(DESTDIR)$(libdir) - install -m 755 $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE) - [ -z "$(SHLIBSONAME)" ] \ - || (cd $(DESTDIR)$(libdir) \ - && ln -sf $(SHLIBFILE) $(SHLIBSONAME) \ - && ln -sf $(SHLIBFILE) $(SHLIBFORLINK) ) - install -m 644 $(srcdir)/dkim.h $(DESTDIR)$(includedir) - install -m 644 libdkim.pc $(DESTDIR)$(libdir)/pkgconfig - install -m 755 -d $(DESTDIR)$(bindir) - install -m 755 libdkimtest $(DESTDIR)$(bindir) - -.PHONY: all install clean distclean diff --git a/mail-filter/libdkim/files/debianize/aclocal.m4 b/mail-filter/libdkim/files/debianize/aclocal.m4 deleted file mode 100644 index 92a0b0dd9430..000000000000 --- a/mail-filter/libdkim/files/debianize/aclocal.m4 +++ /dev/null @@ -1,171 +0,0 @@ -# generated automatically by aclocal 1.9.6 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005 Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# -# Copyright © 2004 Scott James Remnant <scott@netsplit.com>. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi - -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# -# Similar to PKG_CHECK_MODULES, make sure that the first instance of -# this or PKG_CHECK_MODULES is called, or make sure to call -# PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_ifval([$2], [$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$PKG_CONFIG"; then - if test -n "$$1"; then - pkg_cv_[]$1="$$1" - else - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], - [pkg_failed=yes]) - fi -else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - ifelse([$4], , [AC_MSG_ERROR(dnl -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT -])], - [AC_MSG_RESULT([no]) - $4]) -elif test $pkg_failed = untried; then - ifelse([$4], , [AC_MSG_FAILURE(dnl -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], - [$4]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - ifelse([$3], , :, [$3]) -fi[]dnl -])# PKG_CHECK_MODULES - diff --git a/mail-filter/libdkim/files/debianize/configure.ac b/mail-filter/libdkim/files/debianize/configure.ac deleted file mode 100644 index 045fd33fcb6c..000000000000 --- a/mail-filter/libdkim/files/debianize/configure.ac +++ /dev/null @@ -1,39 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ(2.61) -AC_INIT(libdkim, 1.0.21) -LT_INIT -AC_CONFIG_SRCDIR([dkim.cpp]) -##AC_CONFIG_HEADER([config.h]) - -# Checks for programs. -AC_PROG_CXX -PKG_PROG_PKG_CONFIG - -# Checks for libraries. -#AC_CHECK_LIB([crypto], [PEM_read_PrivateKey]) -PKG_CHECK_MODULES([libcrypto], [libcrypto]) -AC_SEARCH_LIBS([res_query], [resolv c],, - [AC_SEARCH_LIBS(__res_query,resolv bind)]) - -# Checks for header files. -AC_HEADER_RESOLV -AC_HEADER_STDC -AC_CHECK_HEADERS([netdb.h netinet/in.h inttypes.h stdlib.h string.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STDBOOL -AC_C_CONST -AC_C_INLINE -AC_HEADER_TIME -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T - -# Checks for library functions. -AC_FUNC_MEMCMP -AC_FUNC_SELECT_ARGTYPES -AC_CHECK_FUNCS([select socket strchr]) - -AC_CONFIG_FILES([Makefile libdkim.pc]) -AC_OUTPUT diff --git a/mail-filter/libdkim/files/debianize/libdkim.pc.in b/mail-filter/libdkim/files/debianize/libdkim.pc.in deleted file mode 100644 index d8d914ac439a..000000000000 --- a/mail-filter/libdkim/files/debianize/libdkim.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: @PACKAGE_NAME@ -Description: DomainKeys Identified Mail library from Alt-N Inc. -Version: @PACKAGE_VERSION@ -Requires.private: libcrypto -Libs: -L${libdir} -ldkim -Libs.private: @LIBS@ -Cflags: -I${includedir} diff --git a/mail-filter/libdkim/files/debianize/libdkim.ver b/mail-filter/libdkim/files/debianize/libdkim.ver deleted file mode 100644 index d2049046aff4..000000000000 --- a/mail-filter/libdkim/files/debianize/libdkim.ver +++ /dev/null @@ -1,4 +0,0 @@ -{ - global: DKIM*; - local: *; -}; diff --git a/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch b/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch deleted file mode 100644 index d449ce95e480..000000000000 --- a/mail-filter/libdkim/files/libdkim-1.0.21-gcc6.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- src/dkimverify.cpp -+++ src/dkimverify.cpp -@@ -211,14 +211,14 @@ - unsigned DecodeBase64(char *ptr)
- {
- static const unsigned char base64_table[256] = {
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1,
-- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1,
-- -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1,
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-- -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,62,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,63,52,53,54,55,56,57,58,59,60,61,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,
-+ (unsigned char) -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,
-+ (unsigned char) -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,
-+ (unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1,(unsigned char) -1};
-
- unsigned char *s = (unsigned char *)ptr;
- unsigned char *d = (unsigned char *)ptr;
diff --git a/mail-filter/libdkim/files/libdkim-extra-options-r1.patch b/mail-filter/libdkim/files/libdkim-extra-options-r1.patch deleted file mode 100644 index abedbaa8a0bc..000000000000 --- a/mail-filter/libdkim/files/libdkim-extra-options-r1.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -Naur libdkim.orig/src/libdkimtest.cpp libdkim/src/libdkimtest.cpp ---- src/libdkimtest.cpp 2009-03-13 16:17:45.000000000 -0500 -+++ src/libdkimtest.cpp 2009-03-13 16:26:02.000000000 -0500 -@@ -55,8 +55,23 @@ - return 0;
- }
-
-+void usage()
-+{
-
--
-+ printf( "usage: libdkimtest [-b<allman|ietf|both>] [-c<r|s|t|u>] [-d<domain>] [-l] [-h] [-i<you@yourdomain.com>] [-q] [-s] [-t] [-v] [-x<expire time>] [-z<hash>] <msgfile> <privkeyfile> <outfile>\n");
-+ printf( "-b<standard> 1=allman, 2=ietf or 3=both\n");
-+ printf( "-c<canonicalization> r=relaxed [DEFAULT], s=simple, t=relaxed/simple, u=simple/relaxed\n");
-+ printf( "-d<domain> the domain tag, if not provided it will be determined from the sender/from header\n");
-+ printf( "-l include body length tag\n");
-+ printf( "-h this help\n");
-+ printf( "-i<identity> the identity, if not provided it will not be included\n");
-+ printf( "-s sign the message\n");
-+ printf( "-t include a timestamp tag\n");
-+ printf( "-v verify the message\n");
-+ printf( "-x<expire_time> the expire time in seconds since epoch ( DEFAULT = current time + 604800)\n\t\t if set to - then it will not be included\n");
-+ printf( "-z<hash> 1=sha1, 2=sha256, 3=both\n");
-+ printf( "-y<selector> selector tag DEFAULT=default\n");
-+}
- int main(int argc, char* argv[])
- {
- int n;
-@@ -77,7 +92,7 @@ - time(&t);
-
- opts.nCanon = DKIM_SIGN_RELAXED;
-- opts.nIncludeBodyLengthTag = 1;
-+ opts.nIncludeBodyLengthTag = 0;
- opts.nIncludeQueryMethod = 0;
- opts.nIncludeTimeStamp = 0;
- opts.expireTime = t + 604800; // expires in 1 week
-@@ -92,6 +107,11 @@ - int nArgParseState = 0;
- bool bSign = true;
-
-+ if(argc<2){
-+ usage();
-+ exit(1);
-+ }
-+
- for( n = 1; n < argc; n++ )
- {
- if( argv[n][0] == '-' && strlen(argv[n]) > 1 )
-@@ -121,14 +141,16 @@ - }
- break;
-
--
-+ case 'd':
-+ strncpy(opts.szDomain,(const char*)(argv[n]+2),sizeof(opts.szDomain)-1);
-+ break;
- case 'l': // body length tag
- opts.nIncludeBodyLengthTag = 1;
- break;
-
-
- case 'h':
-- printf( "usage: \n" );
-+ usage();
- return 0;
-
- case 'i': // identity
-@@ -138,7 +160,7 @@ - }
- else
- {
-- strcpy( opts.szIdentity, argv[n] + 2 );
-+ strncpy( opts.szIdentity, argv[n] + 2,sizeof(opts.szIdentity)-1 );
- }
- break;
-
-@@ -169,6 +191,9 @@ - }
- break;
-
-+ case 'y':
-+ strncpy( opts.szSelector, argv[n]+2, sizeof(opts.szSelector)-1);
-+ break;
-
- case 'z': // sign w/ sha1, sha256 or both
- opts.nHash = atoi( &argv[n][2] );
diff --git a/mail-filter/libdkim/files/libdkim-extra-options.patch b/mail-filter/libdkim/files/libdkim-extra-options.patch deleted file mode 100644 index 5c8a240fdbec..000000000000 --- a/mail-filter/libdkim/files/libdkim-extra-options.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff -Naur libdkim.orig/src/libdkimtest.cpp libdkim/src/libdkimtest.cpp ---- libdkim.orig/src/libdkimtest.cpp 2009-03-13 16:17:45.000000000 -0500 -+++ libdkim/src/libdkimtest.cpp 2009-03-13 16:26:02.000000000 -0500 -@@ -55,8 +55,23 @@ - return 0;
- }
-
-+void usage()
-+{
-
--
-+ printf( "usage: libdkimtest [-b<allman|ietf|both>] [-c<r|s|t|u>] [-d<domain>] [-l] [-h] [-i<you@yourdomain.com>] [-q] [-s] [-t] [-v] [-x<expire time>] [-z<hash>] <msgfile> <privkeyfile> <outfile>\n");
-+ printf( "-b<standard> allman , ietf or both\n");
-+ printf( "-c<canonicalization> r for relaxed [DEFAULT], s - simple, t relaxed/simple, u - simple/relaxed\n");
-+ printf( "-d<domain> the domain tag, if not provided it will be determined from the sender/from header\n");
-+ printf( "-l include body length tag\n");
-+ printf( "-h this help\n");
-+ printf( "-i<identity> the identity, if not provided it will not be included\n");
-+ printf( "-s sign the message\n");
-+ printf( "-t include a timestamp tag\n");
-+ printf( "-v verify the message\n");
-+ printf( "-x<expire_time> the expire time in seconds since epoch ( DEFAULT = current time + 604800)\n\t if set to - then it will not be included");
-+ printf( "-z<hash> 1 for sha1, 2 for sha256, 3 for both\n");
-+ printf( "-y<selector> the selector tag DEFAULT=MDaemon\n");
-+}
- int main(int argc, char* argv[])
- {
- int n;
-@@ -77,7 +92,7 @@ - time(&t);
-
- opts.nCanon = DKIM_SIGN_RELAXED;
-- opts.nIncludeBodyLengthTag = 1;
-+ opts.nIncludeBodyLengthTag = 0;
- opts.nIncludeQueryMethod = 0;
- opts.nIncludeTimeStamp = 0;
- opts.expireTime = t + 604800; // expires in 1 week
-@@ -92,6 +107,11 @@ - int nArgParseState = 0;
- bool bSign = true;
-
-+ if(argc<2){
-+ usage();
-+ exit(1);
-+ }
-+
- for( n = 1; n < argc; n++ )
- {
- if( argv[n][0] == '-' && strlen(argv[n]) > 1 )
-@@ -121,14 +141,16 @@ - }
- break;
-
--
-+ case 'd':
-+ strncpy(opts.szDomain,(const char*)(argv[n]+2),sizeof(opts.szDomain)-1);
-+ break;
- case 'l': // body length tag
- opts.nIncludeBodyLengthTag = 1;
- break;
-
-
- case 'h':
-- printf( "usage: \n" );
-+ usage();
- return 0;
-
- case 'i': // identity
-@@ -138,7 +160,7 @@ - }
- else
- {
-- strcpy( opts.szIdentity, argv[n] + 2 );
-+ strncpy( opts.szIdentity, argv[n] + 2,sizeof(opts.szIdentity)-1 );
- }
- break;
-
-@@ -169,6 +191,9 @@ - }
- break;
-
-+ case 'y':
-+ strncpy( opts.szSelector, argv[n]+2, sizeof(opts.szSelector)-1);
-+ break;
-
- case 'z': // sign w/ sha1, sha256 or both
- opts.nHash = atoi( &argv[n][2] );
diff --git a/mail-filter/libdkim/files/patches/fix_warnings.patch b/mail-filter/libdkim/files/patches/fix_warnings.patch deleted file mode 100644 index 84704290a60a..000000000000 --- a/mail-filter/libdkim/files/patches/fix_warnings.patch +++ /dev/null @@ -1,293 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 02_fix_warnings.dpatch by Russell Coker <russell@coker.com.au> -## -## DP: Get rid of warnings through the use of const and more correct types - -@DPATCH@ - -diff -ru src/dkim.cpp src/dkim.cpp ---- src/dkim.cpp 2008-05-12 20:07:32.000000000 +1000 -+++ src/dkim.cpp 2009-04-15 19:38:08.000000000 +1000 -@@ -172,7 +172,7 @@ - }
-
-
--int DKIM_CALL DKIMVerifyProcess( DKIMContext* pVerifyContext, char* szBuffer, int nBufLength )
-+int DKIM_CALL DKIMVerifyProcess( DKIMContext* pVerifyContext, const char* const szBuffer, int nBufLength )
- {
- CDKIMVerify* pVerify = (CDKIMVerify*)ValidateContext( pVerifyContext, false );
-
-@@ -226,13 +226,13 @@ - }
-
-
--char* DKIM_CALL DKIMVersion()
-+const char* DKIM_CALL DKIMVersion()
- {
- return VERSION_STRING;
- }
-
-
--static char* DKIMErrorStrings[-1-DKIM_MAX_ERROR] = {
-+static const char* DKIMErrorStrings[-1-DKIM_MAX_ERROR] = {
- "DKIM_FAIL",
- "DKIM_BAD_SYNTAX",
- "DKIM_SIGNATURE_BAD",
-@@ -254,7 +254,7 @@ - };
-
-
--char* DKIM_CALL DKIMGetErrorString( int ErrorCode )
-+const char* DKIM_CALL DKIMGetErrorString( int ErrorCode )
- {
- if (ErrorCode >= 0 || ErrorCode <= DKIM_MAX_ERROR)
- return "Unknown";
-diff -ru src/dkim.h src/dkim.h ---- src/dkim.h 2009-04-15 19:37:48.000000000 +1000 -+++ src/dkim.h 2009-04-15 19:38:08.000000000 +1000 -@@ -155,14 +155,14 @@ - void DKIM_CALL DKIMSignFree( DKIMContext* pSignContext );
-
- int DKIM_CALL DKIMVerifyInit( DKIMContext* pVerifyContext, DKIMVerifyOptions* pOptions );
--int DKIM_CALL DKIMVerifyProcess( DKIMContext* pVerifyContext, char* szBuffer, int nBufLength );
-+int DKIM_CALL DKIMVerifyProcess( DKIMContext* pVerifyContext, const char* szBuffer, int nBufLength );
- int DKIM_CALL DKIMVerifyResults( DKIMContext* pVerifyContext );
- int DKIM_CALL DKIMVerifyGetDetails( DKIMContext* pVerifyContext, int* nSigCount, DKIMVerifyDetails** pDetails, char* szPractices );
- void DKIM_CALL DKIMVerifyFree( DKIMContext* pVerifyContext );
-
--char *DKIM_CALL DKIMVersion();
-+const char *DKIM_CALL DKIMVersion();
-
--char *DKIM_CALL DKIMGetErrorString( int ErrorCode );
-+const char *DKIM_CALL DKIMGetErrorString( int ErrorCode );
-
- #ifdef __cplusplus
- }
-diff -ru src/dkimbase.cpp src/dkimbase.cpp ---- src/dkimbase.cpp 2008-05-12 20:07:36.000000000 +1000 -+++ src/dkimbase.cpp 2009-04-15 19:49:32.000000000 +1000 -@@ -118,10 +118,10 @@ - // Process - split buffers into lines without any CRs or LFs at the end.
- //
- ////////////////////////////////////////////////////////////////////////////////
--int CDKIMBase::Process( char* szBuffer, int nBufLength, bool bEOF )
-+int CDKIMBase::Process( const char* szBuffer, int nBufLength, bool bEOF )
- {
-- char* p = szBuffer;
-- char* e = szBuffer + nBufLength;
-+ const char* p = szBuffer;
-+ const char* e = szBuffer + nBufLength;
-
- while( p < e )
- {
-@@ -208,7 +208,8 @@ - {
- m_InHeaders = false;
- ProcessHeaders();
-- ProcessBody("", 0, true);
-+ /* type conversion should be safe as length is zero */
-+ ProcessBody((char *)"", 0, true);
- }
-
- return DKIM_SUCCESS;
-@@ -338,9 +339,9 @@ -
- CompressSWSP(sTemp);
-
-- unsigned cpos = sTemp.find(':');
-+ string::size_type cpos = sTemp.find(':');
-
-- if (cpos == -1)
-+ if (cpos == string::npos)
- {
- // no colon?!
- }
-diff -ru src/dkimbase.h src/dkimbase.h ---- src/dkimbase.h 2008-05-12 20:07:24.000000000 +1000 -+++ src/dkimbase.h 2009-04-15 19:49:32.000000000 +1000 -@@ -41,7 +41,7 @@ -
- int Init(void);
-
-- int Process( char* szBuffer, int nBufLength, bool bEOF );
-+ int Process( const char* szBuffer, int nBufLength, bool bEOF );
- int ProcessFinal(void);
-
- int Alloc( char*& szBuffer, int nRequiredSize );
-diff -ru src/dkimsign.cpp src/dkimsign.cpp ---- src/dkimsign.cpp 2008-05-12 20:07:46.000000000 +1000 -+++ src/dkimsign.cpp 2009-04-15 19:49:32.000000000 +1000 -@@ -144,7 +144,7 @@ -
- fwrite( szBuffer, 1, nBufLength, fpdebug );
-
-- /** END DEBUG CODE **/
-+ ** END DEBUG CODE **/
-
- if( bAllmanOnly )
- {
-@@ -555,7 +555,7 @@ - // if bFold, fold at cbrk char
- //
- ////////////////////////////////////////////////////////////////////////////////
--void CDKIMSign::AddTagToSig( char* Tag, const string &sValue, char cbrk, bool bFold )
-+void CDKIMSign::AddTagToSig( const char* const Tag, const string &sValue, char cbrk, bool bFold )
- {
- int nTagLen = strlen(Tag);
-
-@@ -583,10 +583,10 @@ - // AddTagToSig - add tag and numeric value to signature folding if necessary
- //
- ////////////////////////////////////////////////////////////////////////////////
--void CDKIMSign::AddTagToSig( char* Tag, unsigned long nValue )
-+void CDKIMSign::AddTagToSig( const char* const Tag, unsigned long nValue )
- {
- char szValue[64];
-- sprintf( szValue, "%u", nValue );
-+ sprintf( szValue, "%lu", nValue );
- AddTagToSig( Tag, szValue, 0, false );
- }
-
-@@ -686,7 +686,7 @@ - // GetSig - compute hash and return signature header in szSignature
- //
- ////////////////////////////////////////////////////////////////////////////////
--int CDKIMSign::GetSig( char* szPrivKey, char* szSignature, int nSigLength )
-+int CDKIMSign::GetSig( char* szPrivKey, char* szSignature, unsigned nSigLength )
- {
- if( szPrivKey == NULL )
- {
-@@ -794,7 +794,6 @@ - int size;
- int len;
- char* buf;
-- int pos = 0;
-
- // construct the DKIM-Signature: header and add to hash
- InitSig();
-@@ -879,7 +878,7 @@ - }
- BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
- BIO_push(b64, bio);
-- if (BIO_write(b64, Hash, nHashLen) < nHashLen)
-+ if (BIO_write(b64, Hash, nHashLen) < (int)nHashLen)
- {
- BIO_free_all(b64);
- return DKIM_OUT_OF_MEMORY;
-@@ -993,7 +992,7 @@ - }
- BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);
- BIO_push(b64, bio);
-- if (BIO_write(b64, sig, siglen) < siglen)
-+ if (BIO_write(b64, sig, siglen) < (int)siglen)
- {
- OPENSSL_free(sig);
- BIO_free_all(b64);
-diff -ru src/dkimsign.h src/dkimsign.h ---- src/dkimsign.h 2008-05-12 20:07:58.000000000 +1000 -+++ src/dkimsign.h 2009-04-15 19:49:32.000000000 +1000 -@@ -32,7 +32,7 @@ -
- int Init( DKIMSignOptions* pOptions );
-
-- int GetSig( char* szPrivKey, char* szSignature, int nSigLength );
-+ int GetSig( char* szPrivKey, char* szSignature, unsigned nSigLength );
- int GetSig2( char* szPrivKey, char** pszSignature );
-
- virtual int ProcessHeaders(void);
-@@ -50,8 +50,8 @@ - bool ParseFromAddress( void );
-
- void InitSig(void);
-- void AddTagToSig( char* Tag, const string &sValue, char cbrk, bool bFold );
-- void AddTagToSig( char* Tag, unsigned long nValue );
-+ void AddTagToSig( const char* const Tag, const string &sValue, char cbrk, bool bFold );
-+ void AddTagToSig( const char* const Tag, unsigned long nValue );
- void AddInterTagSpace( int nSizeOfNextTag );
- void AddFoldedValueToSig( const string &sValue, char cbrk );
-
-diff -ru src/dkimverify.cpp src/dkimverify.cpp ---- src/dkimverify.cpp 2009-04-15 19:37:48.000000000 +1000 -+++ src/dkimverify.cpp 2009-04-15 19:49:32.000000000 +1000 -@@ -440,7 +440,7 @@ - {
- ProcessFinal();
-
-- int SuccessCount=0;
-+ unsigned int SuccessCount=0;
- int TestingFailures=0;
- int RealFailures=0;
-
-@@ -646,7 +646,7 @@ - /** END DEBUG CODE **/
- #endif
-
-- if (IsBody && BodyLength != -1)
-+ if (IsBody && BodyLength != (unsigned)-1)
- {
- VerifiedBodyCount += nBufLength;
- if (VerifiedBodyCount > BodyLength)
-@@ -1019,7 +1019,7 @@ - // body count
- if (values[8] == NULL || !m_HonorBodyLengthTag)
- {
-- sig.BodyLength = -1;
-+ sig.BodyLength = (unsigned)-1;
- }
- else
- {
-@@ -1057,17 +1057,17 @@ - // expiration time
- if (values[11] == NULL)
- {
-- sig.ExpireTime = -1;
-+ sig.ExpireTime = (unsigned)-1;
- }
- else
- {
- if (!ParseUnsigned(values[11], &sig.ExpireTime))
- return DKIM_BAD_SYNTAX;
-
-- if (sig.ExpireTime != -1)
-+ if (sig.ExpireTime != (unsigned)-1)
- {
- // the value of x= MUST be greater than the value of t= if both are present
-- if (SignedTime != -1 && sig.ExpireTime <= SignedTime)
-+ if (SignedTime != (unsigned)-1 && sig.ExpireTime <= SignedTime)
- return DKIM_BAD_SYNTAX;
-
- // todo: if possible, use the received date/time instead of the current time
-@@ -1169,7 +1169,7 @@ - }
-
-
--SelectorInfo::SelectorInfo(const string &sSelector, const string &sDomain) : Selector(sSelector), Domain(sDomain)
-+SelectorInfo::SelectorInfo(const string &sSelector, const string &sDomain) : Domain(sDomain), Selector(sSelector)
- {
- AllowSHA1 = true;
- AllowSHA256 = true;
-@@ -1207,7 +1207,7 @@ - return DKIM_SELECTOR_INVALID; // todo: maybe create a new error code for unsupported selector version
-
- // make sure v= is the first tag in the response // todo: maybe don't enforce this, it seems unnecessary
-- for (int j=1; j<sizeof(values)/sizeof(values[0]); j++)
-+ for (unsigned j=1; j<sizeof(values)/sizeof(values[0]); j++)
- {
- if (values[j] != NULL && values[j] < values[0])
- {
-diff -ru src/libdkimtest.cpp src/libdkimtest.cpp ---- src/libdkimtest.cpp 2008-05-12 20:08:54.000000000 +1000 -+++ src/libdkimtest.cpp 2009-04-15 19:38:08.000000000 +1000 -@@ -60,9 +60,9 @@ - int main(int argc, char* argv[])
- {
- int n;
-- char* PrivKeyFile = "test.pem";
-- char* MsgFile = "test.msg";
-- char* OutFile = "signed.msg";
-+ const char* PrivKeyFile = "test.pem";
-+ const char* MsgFile = "test.msg";
-+ const char* OutFile = "signed.msg";
- int nPrivKeyLen;
- char PrivKey[2048];
- char Buffer[1024];
diff --git a/mail-filter/libdkim/files/patches/series b/mail-filter/libdkim/files/patches/series deleted file mode 100644 index 57acbdb1e7de..000000000000 --- a/mail-filter/libdkim/files/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -strtok_r.patch -fix_warnings.patch diff --git a/mail-filter/libdkim/files/patches/strtok_r.patch b/mail-filter/libdkim/files/patches/strtok_r.patch deleted file mode 100644 index 13acc585a075..000000000000 --- a/mail-filter/libdkim/files/patches/strtok_r.patch +++ /dev/null @@ -1,119 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_strtok_r.dpatch by Russell Coker <russell@coker.com.au> -## -## DP: Use strtok_r() instead of strtok(). - -@DPATCH@ - -diff -ru libdkim-1.0.19/src/dkimverify.cpp libdkim-1.0.19-new/src/dkimverify.cpp ---- src/dkimverify.cpp 2008-05-12 20:08:06.000000000 +1000 -+++ src/dkimverify.cpp 2009-06-11 18:28:10.000000000 +1000 -@@ -855,6 +855,9 @@ - ////////////////////////////////////////////////////////////////////////////////
- int CDKIMVerify::ParseDKIMSignature( const string& sHeader, SignatureInfo &sig )
- {
-+ // for strtok_r()
-+ char *saveptr;
-+
- // save header for later
- sig.Header = sHeader;
-
-@@ -1032,7 +1035,7 @@ - {
- // make sure "dns" is in the list
- bool HasDNS = false;
-- char *s = strtok(values[9], ":");
-+ char *s = strtok_r(values[9], ":", &saveptr);
- while (s != NULL)
- {
- if (strncmp(s, "dns", 3) == 0 && (s[3] == '\0' || s[3] == '/'))
-@@ -1040,7 +1043,7 @@ - HasDNS = true;
- break;
- }
-- s = strtok(NULL, ": \t");
-+ s = strtok_r(NULL, ": \t", &saveptr);
- }
- if (!HasDNS)
- return DKIM_BAD_SYNTAX; // todo: maybe create a new error code for unknown query method
-@@ -1080,7 +1083,7 @@ - // parse the signed headers list
- bool HasFrom = false, HasSubject = false;
- RemoveSWSP(values[4]); // header names shouldn't have spaces in them so this should be ok...
-- char *s = strtok(values[4], ":");
-+ char *s = strtok_r(values[4], ":", &saveptr);
- while (s != NULL)
- {
- if (_stricmp(s, "From") == 0)
-@@ -1090,7 +1093,7 @@ -
- sig.SignedHeaders.push_back(s);
-
-- s = strtok(NULL, ":");
-+ s = strtok_r(NULL, ":", &saveptr);
- }
-
- if (!HasFrom)
-@@ -1194,6 +1197,9 @@ - ////////////////////////////////////////////////////////////////////////////////
- int SelectorInfo::Parse( char* Buffer )
- {
-+ // for strtok_r()
-+ char *saveptr;
-+
- static const char *tags[] = {"v","g","h","k","p","s","t","n",NULL};
- char *values[sizeof(tags)/sizeof(tags[0])] = {NULL};
-
-@@ -1235,14 +1241,14 @@ - else
- {
- // MUST include "sha1" or "sha256"
-- char *s = strtok(values[2], ":");
-+ char *s = strtok_r(values[2], ":", &saveptr);
- while (s != NULL)
- {
- if (strcmp(s, "sha1") == 0)
- AllowSHA1 = true;
- else if (strcmp(s, "sha256") == 0)
- AllowSHA256 = true;
-- s = strtok(NULL, ":");
-+ s = strtok_r(NULL, ":", &saveptr);
- }
- if ( !(AllowSHA1 || AllowSHA256) )
- return DKIM_SELECTOR_INVALID; // todo: maybe create a new error code for unsupported hash algorithm
-@@ -1261,7 +1267,7 @@ - {
- // make sure "*" or "email" is in the list
- bool ServiceTypeMatch = false;
-- char *s = strtok(values[5], ":");
-+ char *s = strtok_r(values[5], ":", &saveptr);
- while (s != NULL)
- {
- if (strcmp(s, "*") == 0 || strcmp(s, "email") == 0)
-@@ -1269,7 +1275,7 @@ - ServiceTypeMatch = true;
- break;
- }
-- s = strtok(NULL, ":");
-+ s = strtok_r(NULL, ":", &saveptr);
- }
- if (!ServiceTypeMatch)
- return DKIM_SELECTOR_INVALID;
-@@ -1278,7 +1284,7 @@ - // flags
- if (values[6] != NULL)
- {
-- char *s = strtok(values[6], ":");
-+ char *s = strtok_r(values[6], ":", &saveptr);
- while (s != NULL)
- {
- if (strcmp(s, "y") == 0)
-@@ -1289,7 +1295,7 @@ - {
- SameDomain = true;
- }
-- s = strtok(NULL, ":");
-+ s = strtok_r(NULL, ":", &saveptr);
- }
- }
-
diff --git a/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild b/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild deleted file mode 100644 index d6a2a309bf8d..000000000000 --- a/mail-filter/libdkim/libdkim-1.0.21-r3.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_IN_SOURCE_BUILD=1 - -inherit autotools-utils eutils toolchain-funcs - -DESCRIPTION="DomainKeys Identified Mail library from Alt-N Inc" -HOMEPAGE="http://libdkim.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.zip" - -LICENSE="Apache-2.0 yahoo-patent-license-1.2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="libressl static-libs" - -DEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl ) - app-arch/unzip" -RDEPEND=" - !mail-filter/libdkim-exim - dev-libs/openssl" - -S="${WORKDIR}/${PN}/src" - -src_prepare() { - ecvs_clean - cp "${FILESDIR}"/debianize/* "${S}" || die - epatch "${FILESDIR}"/patches/*.patch - epatch "${FILESDIR}"/libdkim-extra-options.patch - epatch "${FILESDIR}"/${P}-gcc6.patch - - # Bug 476772 - if ! use static-libs; then - sed -i \ - -e '/^TARGETS/s/libdkim.a//' \ - -e '/install -m 644 libdkim.a/d' \ - Makefile.in || die 'sed on Makefile.in failed' - fi - - # Bug 476770 - tc-export AR - - autotools-utils_src_prepare -} - -src_install() { - autotools-utils_src_install - dodoc ../README -} diff --git a/mail-filter/libdkim/libdkim-1.0.21-r4.ebuild b/mail-filter/libdkim/libdkim-1.0.21-r4.ebuild deleted file mode 100644 index 9c1009fae2ba..000000000000 --- a/mail-filter/libdkim/libdkim-1.0.21-r4.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools toolchain-funcs vcs-clean - -DESCRIPTION="DomainKeys Identified Mail library from Alt-N Inc" -HOMEPAGE="http://libdkim.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.zip" - -LICENSE="Apache-2.0 yahoo-patent-license-1.2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="libressl static-libs" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - !mail-filter/libdkim-exim -" -DEPEND="${RDEPEND} - app-arch/unzip -" - -S="${WORKDIR}/${PN}/src" - -src_prepare() { - default - - ecvs_clean - cp "${FILESDIR}"/debianize/* "${S}" || die - eapply "${FILESDIR}"/patches/*.patch - eapply "${FILESDIR}"/libdkim-extra-options-r1.patch - eapply "${FILESDIR}"/${P}-gcc6.patch - - # Bug 476772 - if ! use static-libs; then - sed -i \ - -e '/^TARGETS/s/libdkim.a//' \ - -e '/install -m 644 libdkim.a/d' \ - Makefile.in || die 'sed on Makefile.in failed' - fi - - # Bug 476770 - tc-export AR - - eautoreconf -} - -src_install() { - default - dodoc ../README -} diff --git a/mail-filter/libdkim/metadata.xml b/mail-filter/libdkim/metadata.xml deleted file mode 100644 index f5f607de0d04..000000000000 --- a/mail-filter/libdkim/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <!-- maintainer-needed --> - <upstream> - <remote-id type="sourceforge">libdkim</remote-id> - </upstream> -</pkgmetadata> diff --git a/mail-filter/libmilter/Manifest b/mail-filter/libmilter/Manifest index 9adf622b57b6..3b501442a99a 100644 --- a/mail-filter/libmilter/Manifest +++ b/mail-filter/libmilter/Manifest @@ -2,5 +2,5 @@ AUX gentoo.config.m4 168 BLAKE2B bbd9a011f6ca442aebb3f4e0177dfae6c1f8b246a493205 AUX libmilter-build-system.patch 6855 BLAKE2B 987a71369b672d74835cb37a4ad5ceb58aa8b0fd451ffbcfbcba8ff89dafae58d0c9d412fec8c2a0f0621cce4b8bfce3ee618aa399feb6d7523bd22e3a210fe3 SHA512 d36adc49d5fec792139a921b5292ad0a6d71c11a31093cb1249f4e19b8255bb5a287beb3537b2ec0316d97505233cdd708bac27c0d4e1f54464918d4730be43b AUX libmilter-sharedlib.patch 2843 BLAKE2B d64be1f4f4561a4056bca9784f00b4c965adbf30e99e1b9318162e6a3dad043eb508e925234a586443a8e8fd992f8aee67557f6c3d1e54f644d9c6c8fa7c267a SHA512 31c36b57739946c1b9c7c85307fe5c53c45d7f8cbf427a0f2248db8b74871a6f5a30ef1af524915821aeca54310d28272bcd0a587cb918192214fa5c30e4a8da DIST sendmail.8.14.5.tar.gz 2092508 BLAKE2B 3d90fa9778ebb42f2f334b35e46d0f24e8fcfd46fe69d6032f246c90fc998fbeb21e70c70bc454c688a76ea00c90ee9b5f0e5e0fc9b89b9f16fa9c814a825f9c SHA512 178addd247f1c7c8ca90d70b9240db4cad4e55f0710d5df0fe979e5473a182d2035150c352836576a28bb2b9660b0d5ebfcd95269a156ac0d2c3dba3edb60452 -EBUILD libmilter-1.0.2.ebuild 1973 BLAKE2B 7b668415b357df4a15bf258203ed0776435d3f5706ce379bb6bd6f9bd3f97b5be801d0ef94d66744fbf557249c334ceb5cd96994e164696562ce4d2682005e88 SHA512 714d8a3b2c27949a9664a4efcd24a8e5904b2b01b3bd52e4787a2e0793683a8c4a1a2ec19b455fbe558a768d0cbf8f9b17ddf4d2e49f1036f344ddebc2a0acca +EBUILD libmilter-1.0.2.ebuild 1912 BLAKE2B cc6c396ee76d2a88f09a924acde0f03f037ec6ce6e288e3b45e3cb9d4e91930d567e96b10685a4ad7b13efaa655240b9029035127ea63313d30a0846794abdbf SHA512 56080e2231b39b1a0576c01669fb0a73a3c3326223c6e7363e6656b47ef4a8c60158ff40fa700f43a63a7405b45e16a3719eae5a7ebf750eba10323b7e8d55ac MISC metadata.xml 300 BLAKE2B 410778ccb51b94b32d34d1c9b70f2deff712ad96143c4bd4bbf027f6910e7dfa700dfd8ee07c774043a3d4b7ad6507e5457af71a44fda6b3a81b46cd976b9185 SHA512 07af4a01f72fbe8c5ccdbfa72ea3a869e07a9907f8e878d6df03d1fc3061304280fc9e813958061f00f101571343ada901ec2fd1917760c60c631804498089e5 diff --git a/mail-filter/libmilter/libmilter-1.0.2.ebuild b/mail-filter/libmilter/libmilter-1.0.2.ebuild index a804150cb01b..92db49b2c8a4 100644 --- a/mail-filter/libmilter/libmilter-1.0.2.ebuild +++ b/mail-filter/libmilter/libmilter-1.0.2.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="2" +EAPI=7 -inherit eutils multilib toolchain-funcs +inherit multilib toolchain-funcs # This library is part of sendmail, but it does not share the version number with it. # In order to find the right libmilter version number, check SMFI_VERSION definition @@ -17,7 +17,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/sendmail/sendmail.${SENDMAIL_VER}.tar.gz" LICENSE="Sendmail" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="ipv6 poll" DEPEND="!mail-mta/sendmail @@ -27,8 +27,9 @@ RDEPEND="!mail-mta/sendmail" S="${WORKDIR}/sendmail-${SENDMAIL_VER}" src_prepare() { - epatch "${FILESDIR}"/${PN}-build-system.patch - epatch "${FILESDIR}"/${PN}-sharedlib.patch + eapply "${FILESDIR}"/${PN}-build-system.patch + eapply "${FILESDIR}"/${PN}-sharedlib.patch + default local CC="$(tc-getCC)" local ENVDEF="-DNETUNIX -DNETINET" @@ -45,7 +46,7 @@ src_prepare() { src_compile() { pushd libmilter - emake -j1 MILTER_SOVER=${PV} || die "libmilter compilation failed" + emake -j1 MILTER_SOVER=${PV} popd } @@ -58,9 +59,8 @@ src_install () { MANOWN=root MANGRP=0 INCOWN=root INCGRP=0 \ MSPQOWN=root CFOWN=root CFGRP=0 \ MILTER_SOVER=${PV} \ - install -C obj.*/libmilter \ - || die "install failed" + install -C obj.*/libmilter dodoc libmilter/README - dohtml libmilter/docs/* + dodoc libmilter/docs/* } diff --git a/mail-filter/maildrop/Manifest b/mail-filter/maildrop/Manifest index eb69c0393b9f..87253c9be331 100644 --- a/mail-filter/maildrop/Manifest +++ b/mail-filter/maildrop/Manifest @@ -9,5 +9,5 @@ DIST maildrop-3.0.0.tar.bz2 2091018 BLAKE2B 3c8e3ae5c2c2f636b0223e2bafadcb88bf34 EBUILD maildrop-2.8.3.ebuild 3850 BLAKE2B 2092ce2c1d6850859e9594175debc4698b943ce744896250c694aff98727f2c97cad0b542c707745544a802f46c1b19c72a4546901be0a87bb5e4bef2041070a SHA512 4c667ca6fc6c8c62f6b70035f2c86704089c276fc361ec3bd8e28f58fdc01c29bc455a7936eb64f40c8c0c728a9bda7f463561e64fdf9a3c0aa6a81257d213d2 EBUILD maildrop-2.8.5.ebuild 3853 BLAKE2B 6a7aac741d903d1569a70564724c522f8259d2840ad6c2536399e4739b036e1747f8b4770d665a2ac0570cf57ade6c5120c4424065572e7540d2cd1c32f33c62 SHA512 fbd3aa6e7a07ae7ecb718eb32ccb15d5db1efb6b77405c1a34e2f487546dca2e487f58b7591cb637e74d03a1fc7d5ede0181f17bc8cb9b27374894df1d413cc5 EBUILD maildrop-2.9.0.ebuild 3713 BLAKE2B 9c8a9cd45f85e373d17a1a1e5a00d158d19fbecc843ac2bbc82eee0659cc7b03a526fab5d172858750738ee802b819e126f8e73888428ce291c2fb841a265c61 SHA512 9ff32d6f39bbeeaea6a0cee7a660c1db66b257fc4012501f7f77e72600a8aa48b4e38130970373452331f2df51f6f6daf40d990b6ff7212bd6da86fdff7bf01c -EBUILD maildrop-3.0.0.ebuild 3655 BLAKE2B 0bb81286f1f2f11583a3004b268bfb44d385421a8f6ed83c48ab38ec266bc04158abf9a1854fbf799b298fd976cb57b1e0c17dd92d6cd65e547c011f2fce3eca SHA512 5e8734b1fbc172c1e4a7d5284bb95dad92ddc73bec98e7c588d1608df606c46e0ab411046f276deb3e44f8b746945699369629f810aa21be2ab4666bcc79345b +EBUILD maildrop-3.0.0.ebuild 3654 BLAKE2B 4156b2a2b59676672f1fc59495470c923322a3a1ce58942977921097cd2e717e47cc6eb4cb4a9c2857dea4688f4f01aa2b0fca84c3f2b57ca71fa4afef11a8ee SHA512 e9c3f6bf1ddced3ed7da9405cd6e06164e117de82e7a508f858c42fb3224fc5a1ecdcc9b57d3620fed969b89a69dd7d65444a96fd0799e7df6f9e32153bb5f7a MISC metadata.xml 553 BLAKE2B 259c46533fe17a5fa0cb8a8f66e0934f048debde8aa2d3e8c231461ad9cd0840854ad5cd25170c8945c8c92fb6281b751db44180be6087c198a4057306487af6 SHA512 42f25a0370d0c41dedfd0ec15e244527ed97ac6d577b170794e9c10930a0a0603e9edba090b004c8fa648ff6bf164a05d7aa2b4cbe2576bd8d9dda6dc54e6e42 diff --git a/mail-filter/maildrop/maildrop-3.0.0.ebuild b/mail-filter/maildrop/maildrop-3.0.0.ebuild index 235198c8ec87..93168b597a98 100644 --- a/mail-filter/maildrop/maildrop-3.0.0.ebuild +++ b/mail-filter/maildrop/maildrop-3.0.0.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://www.courier-mta.org/maildrop/" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 s390 ~sh sparc x86" IUSE="berkdb debug dovecot fam gdbm ldap mysql postgres static-libs authlib +tools trashquota" CDEPEND="!mail-mta/courier diff --git a/mail-filter/milter-regex/Manifest b/mail-filter/milter-regex/Manifest index 881d6f91ca9c..de1573de9a96 100644 --- a/mail-filter/milter-regex/Manifest +++ b/mail-filter/milter-regex/Manifest @@ -1,11 +1,16 @@ AUX milter-regex-1.9-gentoo.patch 1074 BLAKE2B 2a5d23b52327ec538ca2c59cba79569c8ba376d2ed0cf8a72bb0cda669de0db143baf59b5f62ac7d896e3e8d7158af88c47f32e09cbc454fdc4601b00c66341f SHA512 d7311e3da08aeb39b2706c110c67a1aaf3f114aeb3fe94a73f8c10a8327e1865cb911f992a887fb518a6c500a4bae5d4e8c39955820436b21dab8f3820dd27cc AUX milter-regex-2.2-gentoo.patch 1078 BLAKE2B 30b782e70b2b9b23d3bdfb22ac5bdecfc1af0d08b018ac9f05d3893eef7f398a47072824cf814d8bea98a148f28c054d13963a54a1b98481961e6377233ca74f SHA512 6e5af31774d7dcb9d53eb4736bf1604f1d63ac83ad4cfb28bdcef451ff932f918afbbb4f6dcc68f5a82cba84c24f15f67ddffacb05b849297a942a789568a81b +AUX milter-regex-2.6-gentoo.patch 1078 BLAKE2B 30b782e70b2b9b23d3bdfb22ac5bdecfc1af0d08b018ac9f05d3893eef7f398a47072824cf814d8bea98a148f28c054d13963a54a1b98481961e6377233ca74f SHA512 6e5af31774d7dcb9d53eb4736bf1604f1d63ac83ad4cfb28bdcef451ff932f918afbbb4f6dcc68f5a82cba84c24f15f67ddffacb05b849297a942a789568a81b AUX milter-regex-conf 177 BLAKE2B 9a05241608c171c8cd0ff3c34962718baa94b5f67692758b01247de2386e3142f6cb4704b32b47427f2f45b222685ec9205227b4d99dfcc0c41f82f194c3c8f9 SHA512 b4fa346684bf2184021adad76c44fbf38e3127299792d5a3b0f0052019a6046deaab19b56bee2b44b7f4fced9c309f440cf4be18f8190d661fc08bedaadbc2e8 AUX milter-regex-conf-2.2 274 BLAKE2B 6622d3f5bee56d25a60ba2e9826bcbdf82a8ffaefab4ab94a9d45d8bb9d8d4c9dbba554589d608cf4d80d44d982f1cdd1d2edc35dccd5f7bb89f27b042aa13bb SHA512 5c16d1d121cd17b15520fb7d8bf6e06440e4b87c4214a2fc1587317d0927d96ba04d89610ee4c5db3b6fdfa2fe5ca536149e782081138e2b0b8c93826febcab5 +AUX milter-regex-conf-2.6 459 BLAKE2B d15f232945a919e49f26df7a5489701b1a13567fca10d877e93943e2ac31865bdf6af26a10da196a64ce0d42238e58631b041e2b846187e82dff0ff38e8aac83 SHA512 2178c0b11ca6fca9121da66a2b4c828105efe9e94ba4b4b6dd56b235dfe3b3ab14a6f7ac9004d7a1fb2b50ff4730f875e85afa0d11c72ab2949aa150b28f1c8c AUX milter-regex-init 842 BLAKE2B 052aee4916608c42f5d664a9bb46eea5c839456f69b71c6f4c9f737abd88eb86cc0a8e8814cab6391264c084967dd90c64117bbc2db55d79c82b37f79a991a89 SHA512 63ba6f37fe387179c12c6b938985cfd37d5a9ea470d90666636d14d5bac53fe42ee11e559513db6cd3f21066a9adc0ee3ef59c361bc5e65364fc9a41525ff2c8 AUX milter-regex-init-2.2 409 BLAKE2B 16b13cdd120a283918f7b7bf7802f3114c164776760a08a03158968347a757ea6db1d18ae957c0736def7ae08a47ca3d7c4c6c36fafc4cb624ff7521fc591a5f SHA512 4cb777e506304a0460da9ed13ad94257737a1f8d7346e0d0b6dc30b496da7863861c3d3184ed10e577e1b7ab234e210da70cc42a497c0111538f5a03ac21fc98 +AUX milter-regex-init-2.6 438 BLAKE2B 36f12dc620dca2f1dd2bc0d471c76355474fe0d50c2cb87559cdf0f6b19f9058bf12b085fa0737e32d02509994752c567f719ec7dbb42e9bf5d48b55c862b718 SHA512 a6754fefd61f884733fca4d0bdb9fc7ed057b4d87d37e63dc473b06aa270da0b6cb4df7b95ba59e6198e9a013f959a052e426b0df987eb4690122528bea819b8 DIST milter-regex-1.9.tar.gz 19880 BLAKE2B 8934eb4f78f168b6f4f93b3a7e70b896c6518cd1228ea8fe387184a718a002f051f5084a7a7f4d07c9e7832fe1c9e9bc907661c4e765dde938b7c6049c8772e6 SHA512 55cb97eba01220eb57c29498a090152c05d259abbe6f771e47a67499e7c2a1d4121ec9d0bce84cc8b6490bcd20dea8eaaba753e61f1ce9002edd8440b13f7148 DIST milter-regex-2.2.tar.gz 20496 BLAKE2B 75cd668e8f75a62bb16d1e38d089465e1e9b49a7441594cb8f77279c9e29f1b90c7b452595f8653b81167fbed8f10e8322ccec51374446938ca43b245cbfa440 SHA512 c2f94d1d9897e2a3f62639343ff9272d28c044f25c59e10f12f37250aa0e5426174cb2a74850993246628e828d21f5cba8567de65a225235eac1969836e41f28 +DIST milter-regex-2.6.tar.gz 20517 BLAKE2B d98587146010d60a062833d8529af2788d657141e19c249e97bf5c847ffa01d6c76f42b6c8413f957fbeb9843ad38281ba8257aef10d0f1bd414726c416533da SHA512 33afa9a314ff2a2f14a301a85fa142e6e4166ffb77e8d18632b094c7873397e037ee6c5d3d1c248bfbb23037c45a15f21fb0cebcbb0f90c69b3d985aad37f169 EBUILD milter-regex-1.9.ebuild 1629 BLAKE2B ab1894e178101a82f0770c7a55fb010c2edc07a62ade4992870be338a5e9d2b17e704e6fdb31beb3338c78013c6b6102ce813144b0de1a7d1e06d923aee25221 SHA512 f58ccd7fe3c43aaaea5508f5ef653c6a00d336cb130fef4b124d4402f1e7bf3c0e30d3720e5a2ccfabee41b8fcd21f2d302d955a74b8db75f14ce7960790dd75 EBUILD milter-regex-2.2.ebuild 1270 BLAKE2B bd58fe31035c9dcb7e4e2a45c28875c1acdfc532501d082148277cc5238fef566123004e5b3a95578e72e5055c08efb736d9e6669aed5690fcf60f6122238a28 SHA512 d30adc300ea4e186a202befef8cde5a22a5acbb4e9208ef4ee8abfc3353a5693b3ce33231713833a9b38ed321e5f00570da5a3d5dbfad9295e9ec35a0d869647 +EBUILD milter-regex-2.6.ebuild 1270 BLAKE2B 8ac75af975513bf51346f895cc491d65a355de8b143d170d3ba624bfec4404599983a9e4154b8a1ffa2d4c371dd2aa3bc46f50099fca9e11f3db83dd07d754d8 SHA512 b956e2ab2ee1aad2b3e878cfe99289c7131f213eb855b5513a5212fc0bfb90235fe3888f186c0212dc0e1eebe80a0e940c7b38d3a32c737e69788cd1dcef1aee MISC metadata.xml 696 BLAKE2B b6735f8b042cd7f064f4f7edc2b0ac8293e0c1e4641090e8890e13ea8b9642e1f3bdd892e629261006c607216b71c9a912b8b48a24c568ec1b1a1f15ff2a5de8 SHA512 df7e66be229bc3c32ab7d0b7ee8d035840d7b09df8f9070f0a2239a063e6fa7a67b4ff25926b57211b3b7b9d3da43cb96b9e1355ac2f0d693abc248eac3b96d6 diff --git a/mail-filter/milter-regex/files/milter-regex-2.6-gentoo.patch b/mail-filter/milter-regex/files/milter-regex-2.6-gentoo.patch new file mode 100644 index 000000000000..14efd964f843 --- /dev/null +++ b/mail-filter/milter-regex/files/milter-regex-2.6-gentoo.patch @@ -0,0 +1,38 @@ +--- a/Makefile.linux 2011-07-16 16:51:34.000000000 +0300 ++++ a/Makefile.linux 2012-08-05 18:15:30.906378968 +0300 +@@ -6,28 +6,27 @@ + # see milter-regex.init for an init script for RedHat/Fedora + # (contributed by admin@2ka.mipt.ru) + +-CFLAGS= -g +-LDFLAGS= -L/usr/lib/libmilter -lmilter -lpthread ++LIBS= -lmilter -lpthread + + all: milter-regex milter-regex.cat8 + + milter-regex: milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o +- gcc -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LDFLAGS) ++ $(CC) $(LDFLAGS) -o milter-regex milter-regex.o eval.o strlcat.o strlcpy.o y.tab.o $(LIBS) + + milter-regex.o: milter-regex.c eval.h +- gcc $(CFLAGS) -c milter-regex.c ++ $(CC) $(CFLAGS) -c milter-regex.c + + eval.o: eval.c eval.h +- gcc $(CFLAGS) -c eval.c ++ $(CC) $(CFLAGS) -c eval.c + + strlcat.o: strlcat.c +- gcc $(CFLAGS) -c strlcat.c ++ $(CC) $(CFLAGS) -c strlcat.c + + strlcpy.o: strlcpy.c +- gcc $(CFLAGS) -c strlcpy.c ++ $(CC) $(CFLAGS) -c strlcpy.c + + y.tab.o: y.tab.c +- gcc $(CFLAGS) -c y.tab.c ++ $(CC) $(CFLAGS) -c y.tab.c + + y.tab.c: parse.y + yacc -d parse.y diff --git a/mail-filter/milter-regex/files/milter-regex-conf-2.6 b/mail-filter/milter-regex/files/milter-regex-conf-2.6 new file mode 100644 index 000000000000..716b20327427 --- /dev/null +++ b/mail-filter/milter-regex/files/milter-regex-conf-2.6 @@ -0,0 +1,16 @@ +# Config file. +MR_CONF="/etc/milter-regex.conf" + +# Process and socket owner, socket group, socket permissions. Make +# sure to allow your MTA to write to the socket by specifying an +# appropriate group. +MR_USER="milter" +MR_GROUP="milter" +MR_PERM="0660" + +MR_RUNDIR="/run/milter-regex" +MR_SOCKET="${MR_RUNDIR}/socket" + +# Additional options for logging etc. Do not attempt to overwrite any +# of the options already defined in /etc/init.d/milter-regex. +MR_OPTS="" diff --git a/mail-filter/milter-regex/files/milter-regex-init-2.6 b/mail-filter/milter-regex/files/milter-regex-init-2.6 new file mode 100644 index 000000000000..9987363e272f --- /dev/null +++ b/mail-filter/milter-regex/files/milter-regex-init-2.6 @@ -0,0 +1,15 @@ +#!/sbin/openrc-run +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +pidfile="/run/${RC_SVCNAME}.pid" +command="/usr/bin/milter-regex" +command_args="-c ${MR_CONF} -r ${pidfile} -u ${MR_USER} -p ${MR_SOCKET} -P ${MR_PERM} -U ${MR_USER} -G ${MR_GROUP} ${MR_OPTS}" + +depend() { + before mta +} + +start_pre() { + checkpath --directory --mode 0755 --owner ${MR_USER}:${MR_GROUP} ${MR_RUNDIR} +} diff --git a/mail-filter/milter-regex/milter-regex-2.6.ebuild b/mail-filter/milter-regex/milter-regex-2.6.ebuild new file mode 100644 index 000000000000..8783e3fd0c9e --- /dev/null +++ b/mail-filter/milter-regex/milter-regex-2.6.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs user + +DESCRIPTION="A milter-based regular expression filter" +HOMEPAGE="https://www.benzedrine.ch/milter-regex.html" +SRC_URI="https://www.benzedrine.ch/${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )" +DEPEND="${RDEPEND} + virtual/yacc" + +PATCHES=( "${FILESDIR}/${P}-gentoo.patch" ) + +src_compile() { + emake CC="$(tc-getCC)" -f Makefile.linux all +} + +src_install() { + dobin ${PN} + + insinto /etc + newins rules ${PN}.conf + + newconfd "${FILESDIR}/${PN}-conf-${PV}" ${PN} + newinitd "${FILESDIR}/${PN}-init-${PV}" ${PN} + + doman *.8 +} + +pkg_preinst() { + # For consistency with mail-milter/spamass-milter (see bug #280571). + # While the milter process requires an owner, a home directory is not + # necessary because no data is written. + enewgroup milter + enewuser milter -1 -1 /var/lib/milter milter +} + +pkg_postinst() { + elog "Postfix configuration example (add to main.cf or master.cf):" + elog " smtpd_milters=unix:/run/milter-regex/socket" + elog "Sendmail configuration example:" + elog " INPUT_MAIL_FILTER(\`${PN}',\`S=unix:/run/milter-regex/socket,T=S:30s;R:2m')" +} diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest index 6a9c5bfeaf1d..334b1189f0dc 100644 --- a/mail-filter/opendkim/Manifest +++ b/mail-filter/opendkim/Manifest @@ -1,16 +1,17 @@ AUX opendkim-2.10.3-gnutls-3.4.patch 1555 BLAKE2B 17a74a6487a514b967d35e77a0a6bb22733648b561b8eac31d95eed16b0faef82a047a1444626bd560b27bc8ed67dd17f9cadc82449d169fdfb6ed45b50644b1 SHA512 f159f7ef3dffe876ccb01cff5b8fbb599357765ff028ef1db28b7f3dba5e13579c7e9bac305fc36fc324fdad0697224f8caa66d27dd3a1085b5fca133365f4ef +AUX opendkim-2.10.3-openrc.patch 10203 BLAKE2B e365ba4c0782dc03d8b5a32413b11b691fafe6859123f8da7daf882540b644069e1792a2b91743e8b00c85af2ba63c9556a4c7f90de4103ea712fe2a096e2b44 SHA512 97342811b4ce4957c4c375cda0edffc056a301348ee4e5dcf94d7425e69f4a91c1897a2e2b7219791fafa6eb731f8e3308aac2f3e1280738eb1d2e5b7d563e56 AUX opendkim-2.10.3-openssl-1.1.1.patch 5889 BLAKE2B 288900a8cba7b4ccf376240485234a0d01720b96a874ac73a7b2f5f5a63f00a67f5a940d5657a702fc7c058989764fe52d17e6625ce96c7cf390cee6c9a29ed9 SHA512 63d0b27e4cde4aadc72320f3ea6b2ea3e45357c019b4fe0e473eb6010c0c6ed3e4ec9541448325848cdd52955943d2ba2527f9819f5e10d5953f085ba4663f85 -AUX opendkim-r1.service 516 BLAKE2B 738fd145b6e6c62d76bdb45a6f782c1dfacb1623a658c648b924366fb0ec56d15fdaf0137d3cd3cfb777c563d6967c1272755db1bf4f02fef91ecb2f7d575c91 SHA512 ad0f95ee60628319f3e8f316984f2bee0fd278cebd52bf1c662cc0d38ff09e5bc5df76349e8aeb2918cdf44a92b05b2d5df2ed11738e86a6a5a64c86004fd971 +AUX opendkim-2.10.3-openssl-1.1.1.patch.r2 5966 BLAKE2B c0dcb757f1195e8a3fc055f5162b805bf5bb2fe7a6a7c24317cfc1f0ed05491803f2fefbc22e96409a339f9741cac5344044a1efadec1f3e3c87084b2c221ed6 SHA512 e532d0411bc6cf1f55bf2de1bad54dc29d19558b2c4ea27aa72f17738688d48f111c3662e88064169a78347144eae289b362bfa4849ab4d3b06ff97d439cce47 AUX opendkim-r3.service 540 BLAKE2B ff968ae27fc0333dd2938e2990306df213b58debfbbce2ba4b267f4f17ea657fe55697e987b252d0f019ca5b0725d2f92a22ae583a24e273a39d905aed0d5304 SHA512 11b6efb1ab8bde75ce494cffc84ba4fa2f7ef8dc7f00b96172a43c5e35b14cea0e1cd712eb9a6caca8005e2c9f2e464de2f2b7ab1502394708224b116f195235 AUX opendkim.confd 742 BLAKE2B 4061bd542c3993b1a1e4a24e7f51992b51380403490a5d0e011e5f0146f9785ebb521fcf5cb2f7731e0037d198a349b44866dd78d73e776112f3364d26368244 SHA512 db103c23d03bcc5919e795cd0bb6e9cfa6a0b8b65c55476fce8aaedfa539a707f0e2b7e10fc493e8a18ef9743b1f80bb97c1b3aaa8b6dc51646898ffdc0fff65 -AUX opendkim.init.r3 1430 BLAKE2B a09484ef2123f9d7096211c1539eab5fda14ff1f36a291c2f6366781ad868d43028bae60eb4e3676380f3c830a350cf53c6cb42837f56160c5b9c59d1f7e261b SHA512 d0a5985ffac171774664d4f619924f25c462d5829e8281b8ff643c22918295d513cf6e0e3a335c550c378b6d4739604539585f2ca809172a090f15d5c1294cf4 AUX opendkim.init.r5 2200 BLAKE2B d617879b128d5de97cc7239865400ea0d12e438c5f13ac97fc663b33b3ce24a4fb8798d287cb4e7a932e2005226c38b4a0a83a4a10d6e047103a19102f625790 SHA512 220ba494b83189aceba304534d1538cc38414c82a522a9fa8211f9277bf22ae8787581b3913e2a267b766ad33bfa4ee005780ee744633f2c765d15696f5bd0cb AUX opendkim.init.r6 2295 BLAKE2B 3ce426713b88e714e3f25a4d33ce1f6602ef2ae7546bfe1802d9615202ecd84295b7a469836535a6ecad1c191604e96ee336ec5b6a988dd473fc312cdce43f5c SHA512 8267610aa10bf2cf1c72baf6fd010cdfcaa8f11ffd10ab42e781bfb4e0e992a758d3f198b4caf2a8f1d66672d5ce797da16f1518abed1b3af31bb7ed61c887ea AUX opendkim.service 439 BLAKE2B 203f8d5a55f9f08069eec0bac8b9af743e3c0414a927c47ae67533a94c67371aa12963c347361056939cc18492612f067102eca09166de6aa83d1b0541d4a8e6 SHA512 308edc70fdb0bd57b424e739412217fd8017b017e9b27bc0954dec55294d10d8b7713f6f191836b94aa49bf578bfb391dca748af0c8d9b72e14ebe1eae21e834 AUX opendkim.service.conf 60 BLAKE2B 797a3947c9c984378955701252cc9d956c8398f1bba7696e7d5c052dd8103355dbf147ac05ae5b7f372867f2b330aaaf160e83709e440a9fc942e9069dbe7c2e SHA512 635e474464f81abe8444030b3cdc6e747298fc463bd02e4292e914ad622761f354b92921cd380387c8e9272435e1660de1a1cf8dbe34ded870e728ecc9e00246 AUX opendkim.service.r4 629 BLAKE2B 9d2fe74576a4085b1c2f4c74c319e490d332d34cb32206bf6ccbd8001600c63cc6fdb193900ca70f5d83e77694da126f15c86a6391d6835f843bd1c3a1dd413c SHA512 a41dbb8e14a4fae7f314935f9f6aedb66efe2ad6ca95eefdf92244ce0c577b8b18fe90266bd38437d6a033040195db46b02c595f958d6b59850974ccc98a9dda DIST opendkim-2.10.3.tar.gz 1210224 BLAKE2B affd4526568431fa1afee93a167c5569912c9344ea4e6eee3281a035bd0c76d2be5d2e8e144bbebabd681a73388a37ac56d9a2e4daf00af9baadad14ffb42265 SHA512 97923e533d072c07ae4d16a46cbed95ee799aa50f19468d8bc6d1dc534025a8616c3b4b68b5842bc899b509349a2c9a67312d574a726b048c0ea46dd4fcc45d8 -EBUILD opendkim-2.10.3-r3.ebuild 6086 BLAKE2B f1473a7605c8ebb73170498ce826ce0b6a630c5109a0661a6a3226aa25d06fad04fc621b9b8c3931f47f497bbaae1cf2273fdb101c2c805aef6921283ee5f8e4 SHA512 4601d56f81230dca6753b3793b0392c1b05365706d1f97961f6bbe5172cbeebb2fa4b914390460b7872e9aca72e44c6b89ba6ea71c2c40504a1e8343d84bf74d +EBUILD opendkim-2.10.3-r10.ebuild 7426 BLAKE2B a41072224c47d95fb7bd01d659df5ef3ccd2b65dcff22cc3f71b061310d936f26085f72e57a9c0142799817cf0d3f6504f9121ae3104822ac8c6e5c2cc9c96eb SHA512 d6b0f2dc00afb6caebb1dedf6a2bef12168eee05e9ae030bc32ef19634a2e17d687827f75ed6328a0064b80ca3b3e24df9fada28f9530a514f0c39ade8c3548f +EBUILD opendkim-2.10.3-r12.ebuild 7399 BLAKE2B bf56fff18ddf7d4f931906e00df4c2b39d9447eb42c38624f6010b3da816bd2a9c6f25f9019fe667fd17aed86a84b3c518c591bb92e0389b6557ba99e5864540 SHA512 483f07a5fa2373b57d819e0401cc7d3171417e8eb373d0098ca4cd3883db8a02d0900d243f90a7509034596b0cc8fd68f66994267ea248fa9a752fbbe894e1ff EBUILD opendkim-2.10.3-r8.ebuild 7233 BLAKE2B 81c780d136560365a2a4eebf31901448cadec91616388ab9851c0bbd24dfff965c517cec5af73fd3adc4507708aba1c24d13d8905f7e5499c09ef4e6751171ee SHA512 385e2da6c53900a98f35a9839007f5dd7caa65fb9138599e1ced1639759fbb674223ecd2ccf8bddd4341334934440476112b07f280efabf345af8e0b77098815 EBUILD opendkim-2.10.3-r9.ebuild 7490 BLAKE2B f929abefd9ce34340562040786fcd390b9b879e5b91e342c679fd955e32281f8f2578eeadc418d4448f3c536ed7be69efdf06dc192bfc906a4f5706e6abed166 SHA512 10844c172845ad2c52e64d5fb8ffd0262d6dfebc60a4053f8d8b5ba5d6e53c2927ac25848cf2783aed60a091d96fd3149d6e5280b438f050b652a776ac6e6040 MISC metadata.xml 1988 BLAKE2B 14cc3bed4822cd17ff675b16aba8a973476b78da8fcd73953ecc419778498c7d8e2b6837c7bacf7a0221086ec740ffbac6900cfb8d50143f995c6f8ddcb72752 SHA512 dea34aca15c223d2195de689333b98c23abb18830a64f73e602405d36b5ca7f46b065533f116307075ab2d01570e52e8352a394efae39a6e5d1af51c56b91543 diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch b/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch new file mode 100644 index 000000000000..9b645ba0f0ce --- /dev/null +++ b/mail-filter/opendkim/files/opendkim-2.10.3-openrc.patch @@ -0,0 +1,295 @@ +diff --git a/Makefile.am b/Makefile.am +index ee2d21ab..b085b988 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -39,6 +39,52 @@ DISTCLEANFILES = opendkim-@VERSION@.tar.gz + # though. + DISTCHECK_CONFIGURE_FLAGS=--enable-vbr --with-lua --enable-stats --with-odbx --with-db --with-openssl=/usr/local --enable-atps --enable-replace_rules + ++ ++# ++# Handle some scripts and configuration files that need @VARIABLE@ ++# replacements here, so that we can share the rules (which are ++# identical) between all of the targets. ++# ++ ++# We want to *build and install* these on the target machine. ++nodist_doc_DATA = contrib/OpenRC/opendkim.openrc \ ++ contrib/systemd/opendkim.service \ ++ contrib/systemd/opendkim.tmpfiles \ ++ opendkim/opendkim.conf.simple \ ++ opendkim/opendkim.conf.simple-verify ++ ++# Custom variable to keep the rule below as sane as possible. ++doc_DATA_intermediate = contrib/OpenRC/opendkim.openrc.in ++ ++# We want to *ship* these. ++EXTRA_DIST = contrib/OpenRC/opendkim.openrc.in.in \ ++ contrib/systemd/opendkim.service.in \ ++ contrib/systemd/opendkim.tmpfiles.in \ ++ opendkim/opendkim.conf.simple.in \ ++ opendkim/opendkim.conf.simple-verify.in ++ ++# The next rule allow us to replace bindir, libdir, etc. within ++# files. The example is taken from the autoconf documentation and can ++# be found in the "Installation Directory Variables" section. ++edit = sed -e 's|@DOMAIN[@]|$(DOMAIN)|g' \ ++ -e 's|@RUNSTATEDIR[@]|$(runstatedir)|g' \ ++ -e 's|@SBINDIR[@]|$(sbindir)|g' \ ++ -e 's|@SYSCONFDIR[@]|$(sysconfdir)|g' ++ ++# This rule includes EVERY source/intermediate file as a dependency of ++# EVERY output file, which is clearly wrong, but it may be the best we ++# can do without duplication. At least it's the right kind of wrong, ++# and rebuilds too often rather than not often enough. ++$(nodist_doc_DATA): $(doc_DATA_intermediate) $(EXTRA_DIST) Makefile ++ rm -f $@ $@.tmp ++ srcdir=''; \ ++ test -f ./$@.in || srcdir=$(srcdir)/; \ ++ $(edit) $${srcdir}$@.in > $@.tmp ++ mv $@.tmp $@ ++ ++ ++ ++ + $(DIST_ARCHIVES): distcheck + + $(DIST_ARCHIVES).md5: $(DIST_ARCHIVES) +diff --git a/configure.ac b/configure.ac +index 76914fd9..a478bb83 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -65,6 +65,9 @@ AC_PROG_CC_C99 + AM_PROG_CC_C_O + AC_PROG_LIBTOOL + ++# Used by the OpenRC service script, at least. ++AC_PROG_GREP ++ + PKG_PROG_PKG_CONFIG + + # +@@ -2628,6 +2631,11 @@ AC_SUBST(SPECCONFIGURE) + AC_SUBST(SPECREQUIRES) + AC_SUBST(SPECBUILDREQUIRES) + ++# Autoconf 2.70 will support this, and many distros patch it in, ++# but Autoconf 2.70 hasn't actually been released yet. ++AS_IF([test -z "${runstatedir}"], [runstatedir='${localstatedir}/run']) ++AC_SUBST([runstatedir]) ++ + # + # Finish up + # +@@ -2639,6 +2647,7 @@ AC_OUTPUT([ Makefile + contrib/docs/Makefile + contrib/init/Makefile + contrib/init/generic/Makefile ++ contrib/OpenRC/opendkim.openrc.in + contrib/init/redhat/Makefile + contrib/init/redhat/opendkim + contrib/init/redhat/opendkim-default-keygen +@@ -2650,8 +2659,6 @@ AC_OUTPUT([ Makefile + contrib/spec/Makefile + contrib/spec/opendkim.spec + contrib/stats/Makefile +- contrib/systemd/Makefile +- contrib/systemd/opendkim.service + libopendkim/opendkim.pc libopendkim/Makefile + libopendkim/docs/Makefile + libopendkim/tests/Makefile +@@ -2664,8 +2671,6 @@ AC_OUTPUT([ Makefile + opendkim/opendkim-lua.3 + opendkim/opendkim-testkey.8 opendkim/opendkim-stats.8 + opendkim/opendkim-testmsg.8 opendkim/opendkim.conf.5 +- opendkim/opendkim.conf.simple +- opendkim/opendkim.conf.simple-verify + opendkim/opendkim-atpszone.8 opendkim/opendkim-spam.1 + opendkim/tests/Makefile + stats/Makefile stats/opendkim-importstats.8 +diff --git a/contrib/Makefile.am b/contrib/Makefile.am +index 76df01cd..401130bb 100644 +--- a/contrib/Makefile.am ++++ b/contrib/Makefile.am +@@ -3,6 +3,6 @@ + + #AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = convert docs init ldap lua patches repute spec stats systemd ++SUBDIRS = convert docs init ldap lua patches repute spec stats + + dist_doc_DATA = README +diff --git a/contrib/OpenRC/opendkim.openrc.in.in b/contrib/OpenRC/opendkim.openrc.in.in +new file mode 100644 +index 00000000..4b783615 +--- /dev/null ++++ b/contrib/OpenRC/opendkim.openrc.in.in +@@ -0,0 +1,54 @@ ++#!/sbin/openrc-run ++# Copyright 1999-2019 Gentoo Authors ++# Distributed under the terms of the GNU General Public License v2 ++ ++CONFFILE="@SYSCONFDIR@/${RC_SVCNAME}.conf" ++required_files="${CONFFILE}" ++ ++command="@SBINDIR@/opendkim" ++pidfile="@RUNSTATEDIR@/${RC_SVCNAME}.pid" ++command_args="-P ${pidfile} -x ${CONFFILE}" ++extra_commands="checkconfig" ++ ++depend() { ++ use dns logger net ++ before mta ++} ++ ++checkconfig() { ++ # ++ # The opendkim.conf man page says, ++ # ++ # For parameters that are Boolean in nature, only the first byte ++ # of the value is processed... For negative values, the following ++ # are accepted: "F", "f", "N", "n", "0".' ++ # ++ if @GREP@ '^[[:space:]]*Background[[:space:]]\+[FfNn0]' "${CONFFILE}" \ ++ >/dev/null 2>&1; then ++ eend 1 "${RC_SVCNAME} cannot run in the foreground!" ++ fi ++ if ! "${command}" -n "${command_args}"; then ++ eend 1 "${RC_SVCNAME} configuration check failed" ++ fi ++} ++ ++start_pre() { ++ # If this isn't a restart, make sure that the user's config isn't ++ # busted before we try to start the daemon (this will produce ++ # better error messages than if we just try to start it blindly). ++ # ++ # If, on the other hand, this *is* a restart, then the stop_pre ++ # action will have ensured that the config is usable and we don't ++ # need to do that again. ++ if [ "${RC_CMD}" != "restart" ]; then ++ checkconfig || return $? ++ fi ++} ++ ++stop_pre() { ++ # If this is a restart, check to make sure the user's config ++ # isn't busted before we stop the running daemon. ++ if [ "${RC_CMD}" = "restart" ]; then ++ checkconfig || return $? ++ fi ++} +diff --git a/contrib/systemd/Makefile.am b/contrib/systemd/Makefile.am +deleted file mode 100644 +index 2ffc88cc..00000000 +--- a/contrib/systemd/Makefile.am ++++ /dev/null +@@ -1,3 +0,0 @@ +-# Copyright (c) 2013, The Trusted Domain Project. All rights reserved. +- +-dist_doc_DATA = opendkim.service +diff --git a/contrib/systemd/opendkim.service.in b/contrib/systemd/opendkim.service.in +index f7665f43..236f8a06 100644 +--- a/contrib/systemd/opendkim.service.in ++++ b/contrib/systemd/opendkim.service.in +@@ -1,20 +1,28 @@ +-# If you are using OpenDKIM with SQL datasets it might be necessary to start OpenDKIM after the database servers. +-# For example, if using both MariaDB and PostgreSQL, change "After=" in the "[Unit]" section to: +-# After=network.target nss-lookup.target syslog.target mariadb.service postgresql.service ++# If you are using OpenDKIM with SQL datasets, you should start ++# OpenDKIM after your database server. For example, when using ++# PostgreSQL, you should create a supplementary ".conf" file in the ++# appropriate directory containing, ++# ++# [Unit] ++# After=postgresql.service ++# + + [Unit] + Description=DomainKeys Identified Mail (DKIM) Milter +-Documentation=man:opendkim(8) man:opendkim.conf(5) man:opendkim-genkey(8) man:opendkim-genzone(8) man:opendkim-testadsp(8) man:opendkim-testkey http://www.opendkim.org/docs.html ++Documentation=man:opendkim(8) \ ++ man:opendkim.conf(5) \ ++ man:opendkim-genkey(8) \ ++ man:opendkim-genzone(8) \ ++ man:opendkim-testkey(8) \ ++ http://www.opendkim.org/docs.html + After=network.target nss-lookup.target syslog.target + + [Service] + Type=forking +-PIDFile=@localstatedir@/run/opendkim/opendkim.pid +-EnvironmentFile=-@sysconfdir@/sysconfig/opendkim +-ExecStart=@sbindir@/opendkim $OPTIONS ++ExecStart=@SBINDIR@/opendkim -P @RUNSTATEDIR@/opendkim.pid ++ExecStartPre=@SBINDIR@/opendkim -P @RUNSTATEDIR@/opendkim.pid -n -f + ExecReload=/bin/kill -USR1 $MAINPID +-User=opendkim +-Group=opendkim ++PIDFile=@RUNSTATEDIR@/opendkim.pid + + [Install] + WantedBy=multi-user.target +diff --git a/contrib/systemd/opendkim.tmpfiles.in b/contrib/systemd/opendkim.tmpfiles.in +new file mode 100644 +index 00000000..a9118974 +--- /dev/null ++++ b/contrib/systemd/opendkim.tmpfiles.in +@@ -0,0 +1,5 @@ ++# We allow everyone to read/traverse this directory because if it ++# contains a local socket, then (for example) your MTA will want to ++# look in there. Permissions on the socket itself are controlled ++# by the "UserID" and "UMask" directives in the daemon's configuration. ++d @RUNSTATEDIR@/opendkim 0755 opendkim opendkim +diff --git a/opendkim/Makefile.am b/opendkim/Makefile.am +index 4aa615c1..7d514771 100644 +--- a/opendkim/Makefile.am ++++ b/opendkim/Makefile.am +@@ -16,9 +16,11 @@ endif + sbin_PROGRAMS += opendkim-stats + endif + ++ + dist_sbin_SCRIPTS = opendkim-genkey +-dist_doc_DATA = opendkim.conf.sample opendkim.conf.simple \ +- opendkim.conf.simple-verify README.SQL ++ ++dist_doc_DATA = opendkim.conf.sample README.SQL ++ + + if BUILD_FILTER + sbin_PROGRAMS += opendkim +diff --git a/opendkim/opendkim.conf.simple-verify.in b/opendkim/opendkim.conf.simple-verify.in +index 2224b64f..463048ab 100644 +--- a/opendkim/opendkim.conf.simple-verify.in ++++ b/opendkim/opendkim.conf.simple-verify.in +@@ -17,5 +17,5 @@ Mode v + + # ADSPDiscard no + +-# PidFile /var/run/opendkim/opendkim.pid ++# PidFile @RUNSTATEDIR@/opendkim.pid + +diff --git a/opendkim/opendkim.conf.simple.in b/opendkim/opendkim.conf.simple.in +index 735b924b..b70bfb46 100644 +--- a/opendkim/opendkim.conf.simple.in ++++ b/opendkim/opendkim.conf.simple.in +@@ -12,6 +12,12 @@ KeyFile /var/db/dkim/@DOMAIN@.private + + Socket inet:8891@localhost + ++# To use a local socket instead, specify a path here. The "standard" ++# location is under @runstatedir@/opendkim, and it's best to agree ++# on that directory so that various init systems can configure its ++# permissions and ownership automatically. ++#Socket local:@RUNSTATEDIR@/opendkim/opendkim.sock ++ + ReportAddress postmaster@@DOMAIN@ + SendReports yes + +@@ -25,4 +31,4 @@ SendReports yes + # + # PeerList X.X.X.X + +-# PidFile /var/run/opendkim/opendkim.pid ++# PidFile @RUNSTATEDIR@/opendkim.pid diff --git a/mail-filter/opendkim/files/opendkim-2.10.3-openssl-1.1.1.patch.r2 b/mail-filter/opendkim/files/opendkim-2.10.3-openssl-1.1.1.patch.r2 new file mode 100644 index 000000000000..cc8f48bae2db --- /dev/null +++ b/mail-filter/opendkim/files/opendkim-2.10.3-openssl-1.1.1.patch.r2 @@ -0,0 +1,170 @@ +From FreeBSD: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223568 +--- a/configure.ac 2015-05-12 18:43:09 UTC ++++ b/configure.ac +@@ -860,26 +860,28 @@ then + AC_SEARCH_LIBS([ERR_peek_error], [crypto], , + AC_MSG_ERROR([libcrypto not found])) + +- AC_SEARCH_LIBS([SSL_library_init], [ssl], , +- [ +- if test x"$enable_shared" = x"yes" +- then +- AC_MSG_ERROR([Cannot build shared opendkim +- against static openssl libraries. +- Configure with --disable-shared +- to get this working or obtain a +- shared libssl library for +- opendkim to use.]) +- fi + +- # avoid caching issue - last result of SSL_library_init +- # shouldn't be cached for this next check +- unset ac_cv_search_SSL_library_init +- LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" +- AC_SEARCH_LIBS([SSL_library_init], [ssl], , +- AC_MSG_ERROR([libssl not found]), [-ldl]) +- ] +- ) ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[#include <openssl/ssl.h>]], ++ [[SSL_library_init();]])], ++ [od_have_ossl="yes";], ++ [od_have_ossl="no";]) ++ if test x"$od_have_ossl" = x"no" ++ then ++ if test x"$enable_shared" = x"yes" ++ then ++ AC_MSG_ERROR([Cannot build shared opendkim ++ against static openssl libraries. ++ Configure with --disable-shared ++ to get this working or obtain a ++ shared libssl library for ++ opendkim to use.]) ++ fi ++ ++ LIBCRYPTO_LIBS="$LIBCRYPTO_LIBS -ldl" ++ AC_SEARCH_LIBS([SSL_library_init], [ssl], , ++ AC_MSG_ERROR([libssl not found]), [-ldl]) ++ fi + + AC_CHECK_DECL([SHA256_DIGEST_LENGTH], + AC_DEFINE([HAVE_SHA256], 1, +--- a/libopendkim/tests/Makefile.in 2015-05-12 18:43:48 UTC ++++ b/libopendkim/tests/Makefile.in +@@ -1108,8 +1108,10 @@ am__nobase_list = $(am__nobase_strip_setup); \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' + am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\ ++/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\ ++/ /g' + am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ +@@ -4131,16 +4133,19 @@ uninstall-am: uninstall-dist_docDATA + @LCOV_TRUE@description.txt: $(check_PROGRAMS) $(check_SCRIPTS) + @LCOV_TRUE@ rm -f $@ + @LCOV_TRUE@ for i in $(check_PROGRAMS); do \ +-@LCOV_TRUE@ testname=$${i/t-}; \ +-@LCOV_TRUE@ testname=$${testname//-/_}; \ ++@LCOV_TRUE@ testname=$${i#t-}; \ ++@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \ + @LCOV_TRUE@ fgrep '***' $$i.c | tail -n 1 | \ +-@LCOV_TRUE@ (echo $${testname} ; sed -e 's/[^*]*\*\*\*\(.*\)\\n.*/\t\1\n/g' ) >> $@; \ ++@LCOV_TRUE@ (echo $${testname} ; sed -e 's/[^*]*\*\*\*\(.*\)\\ ++@LCOV_TRUE@.*/ \1\ ++@LCOV_TRUE@/g' ) >> $@; \ + @LCOV_TRUE@ done + @LCOV_TRUE@ for i in $(check_SCRIPTS); do \ +-@LCOV_TRUE@ testname=$${i/t-}; \ +-@LCOV_TRUE@ testname=$${testname//-/_}; \ ++@LCOV_TRUE@ testname=$${i#t-}; \ ++@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \ + @LCOV_TRUE@ grep '^#' $$i | tail -n 1 | \ +-@LCOV_TRUE@ (echo $${testname} ; sed -e 's/^# \(.*\)/\t\1\n/g' ) >> $@; \ ++@LCOV_TRUE@ (echo $${testname} ; sed -e 's/^# \(.*\)/ \1\ ++@LCOV_TRUE@/g' ) >> $@; \ + @LCOV_TRUE@ done + + @LCOV_TRUE@description.html: description.txt +--- a/libopendkim/dkim-canon.c 2015-05-11 03:56:13 UTC ++++ b/libopendkim/dkim-canon.c +@@ -388,7 +388,7 @@ dkim_canon_header_string(struct dkim_dstring *dstr, dk + } + + /* skip all spaces before first word */ +- while (*p != '\0' && DKIM_ISWSP(*p)) ++ while (*p != '\0' && DKIM_ISLWSP(*p)) + p++; + + space = FALSE; /* just saw a space */ +--- a/opendkim/tests/Makefile.in 2015-05-12 18:43:49 UTC ++++ b/opendkim/tests/Makefile.in +@@ -139,8 +139,10 @@ am__nobase_list = $(am__nobase_strip_setup); \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' + am__base_list = \ +- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ +- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' ++ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\ ++/ /g' | \ ++ sed '$$!N;$$!N;$$!N;$$!N;s/\ ++/ /g' + am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ +@@ -1298,14 +1300,16 @@ uninstall-am: uninstall-dist_docDATA + @LCOV_TRUE@description.txt: $(check_SCRIPTS) + @LCOV_TRUE@ rm -f $@ + @LCOV_TRUE@ for test in $? ; do \ +-@LCOV_TRUE@ testname=$${test/t-}; \ +-@LCOV_TRUE@ testname=$${testname//-/_}; \ ++@LCOV_TRUE@ testname=$${test#t-}; \ ++@LCOV_TRUE@ testname=$$(echo $${testname} | sed -e 's/-/_/g'); \ + @LCOV_TRUE@ grep ^# $$test | tail -n 1 | \ +-@LCOV_TRUE@ sed -e "s/^#\(.*\)/$${testname}\n\t\1\n/g" >> $@; \ ++@LCOV_TRUE@ sed -e "s/^#\(.*\)/$${testname}\ ++@LCOV_TRUE@ \1\ ++@LCOV_TRUE@/g" >> $@; \ + @LCOV_TRUE@ done + + @LCOV_TRUE@description.html: description.txt +-@LCOV_TRUE@ gendesc --output $@ $< ++@LCOV_TRUE@ gendesc --output $@ $? + + @LCOV_TRUE@maintainer-clean-local: + @LCOV_TRUE@ -rm -rf lcov/[^C]* +--- a/opendkim/opendkim-crypto.c 2013-02-25 21:02:41 UTC ++++ b/opendkim/opendkim-crypto.c +@@ -222,7 +222,11 @@ dkimf_crypto_free_id(void *ptr) + { + assert(pthread_setspecific(id_key, ptr) == 0); + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined (LIBRESSL_VERSION_NUMBER) ++ OPENSSL_thread_stop(); ++#else + ERR_remove_state(0); ++#endif + + free(ptr); + +@@ -392,11 +396,15 @@ dkimf_crypto_free(void) + { + if (crypto_init_done) + { ++#if OPENSSL_VERSION_NUMBER >= 0x10100000 && !defined (LIBRESSL_VERSION_NUMBER) ++ OPENSSL_thread_stop(); ++#else + CRYPTO_cleanup_all_ex_data(); + CONF_modules_free(); + EVP_cleanup(); + ERR_free_strings(); + ERR_remove_state(0); ++#endif + + if (nmutexes > 0) + { + diff --git a/mail-filter/opendkim/files/opendkim-r1.service b/mail-filter/opendkim/files/opendkim-r1.service deleted file mode 100644 index f2e937a6bf16..000000000000 --- a/mail-filter/opendkim/files/opendkim-r1.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=DomainKeys Identified Mail (DKIM) Milter -Documentation=man:opendkim(8) man:opendkim.conf(5) man:opendkim-genkey(8) man:opendkim-genzone(8) man:opendkim-testadsp(8) man:opendkim-testkey http://www.opendkim.org/docs.html -After=network.target nss-lookup.target syslog.target - -[Service] -ExecStart=/usr/sbin/opendkim -f -x /etc/opendkim/opendkim.conf -ExecReload=/bin/kill -USR1 $MAINPID -RuntimeDirectory=opendkim -RuntimeDirectoryMode=0750 -User=milter -Group=milter - -[Install] -WantedBy=multi-user.target diff --git a/mail-filter/opendkim/files/opendkim.init.r3 b/mail-filter/opendkim/files/opendkim.init.r3 deleted file mode 100644 index bb8ac96f0570..000000000000 --- a/mail-filter/opendkim/files/opendkim.init.r3 +++ /dev/null @@ -1,55 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -CONFFILE=/etc/opendkim/${SVCNAME}.conf - -depend() { - use dns logger net - before mta -} - -check_cfg() { - - PIDFILE=$(sed -ne 's/^[[:space:]]*PidFile[[:space:]]\+//p' "${CONFFILE}") - local PIDDIR="${PIDFILE%/*}" - if [ ! -d "${PIDDIR}" ] ; then - checkpath -q -d -o milter:milter -m 0755 "${PIDDIR}" || return 1 - fi - if [ ! -f "${CONFFILE}" ] ; then - eerror "Configuration file ${CONFFILE} is missing" - return 1 - fi - if [ -z "${PIDFILE}" ] ; then - eerror "Configuration file needs PidFile setting - recommend adding 'PidFile /var/run/opendkim/${SVCNAME}.pid' to ${CONFFILE}" - return 1 - fi - - if egrep -q '^[[:space:]]*Background[[:space:]]+no' "${CONFFILE}" ; then - eerror "${SVCNAME} service cannot run with Background key set to yes!" - return 1 - fi -} - -start() { - check_cfg || return 1 - - # Remove stalled Unix socket if no other process is using it - local UNIX_SOCKET=$(sed -ne 's/^[[:space:]]*Socket[[:space:]]\+\(unix\|local\)://p' "${CONFFILE}") - - if [ -S "${UNIX_SOCKET}" ] && ! fuser -s "${UNIX_SOCKET}"; then - rm "${UNIX_SOCKET}" - fi - - ebegin "Starting OpenDKIM" - start-stop-daemon --start --pidfile "${PIDFILE}" \ - --exec /usr/sbin/opendkim -- -x "${CONFFILE}" - eend $? -} - -stop() { - check_cfg || return 1 - ebegin "Stopping OpenDKIM" - start-stop-daemon --stop --pidfile "${PIDFILE}" - eend $? -} diff --git a/mail-filter/opendkim/opendkim-2.10.3-r10.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r10.ebuild new file mode 100644 index 000000000000..8cba8ef61703 --- /dev/null +++ b/mail-filter/opendkim/opendkim-2.10.3-r10.ebuild @@ -0,0 +1,227 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools db-use eutils systemd user + +DESCRIPTION="A milter providing DKIM signing and verification" +HOMEPAGE="http://opendkim.org/" +SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz" + +# The GPL-2 is for the init script, bug 425960. +LICENSE="BSD GPL-2 Sendmail-Open-Source" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound" + +DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) + dev-libs/libbsd + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + berkdb? ( >=sys-libs/db-3.2:* ) + opendbx? ( >=dev-db/opendbx-1.4.0 ) + lua? ( dev-lang/lua:* ) + ldap? ( net-nds/openldap ) + lmdb? ( dev-db/lmdb ) + memcached? ( dev-libs/libmemcached ) + sasl? ( dev-libs/cyrus-sasl ) + unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root ) + !unbound? ( net-libs/ldns )" + +RDEPEND="${DEPEND} + sys-process/psmisc + selinux? ( sec-policy/selinux-dkim ) +" + +REQUIRED_USE="sasl? ( ldap )" + +PATCHES=( + "${FILESDIR}/${P}-openssl-1.1.1.patch" +) + +pkg_setup() { + # This user can read your private keys, and must therefore not be + # shared with any other package. + enewgroup opendkim + enewuser opendkim -1 -1 -1 opendkim +} + +src_prepare() { + default + + # We delete the "Socket" setting because it's overridden by our + # conf.d file. + sed -e 's:/var/db/dkim:/var/lib/opendkim:g' \ + -e '/^[[:space:]]*Socket/d' \ + -i opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \ + stats/opendkim-reportstats{,.in} || die + + sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \ + || die + + # TODO: what purpose does this serve, do the tests even get run? + sed -e "/sock.*mt.getcwd/s:mt.getcwd():${T}:" \ + -i opendkim/tests/*.lua || die + + eautoreconf +} + +src_configure() { + local myconf=() + if use berkdb ; then + myconf+=( + $(db_includedir) + --with-db-incdir=${myconf#-I} + --enable-popauth + --enable-query_cache + --enable-stats + ) + fi + if use unbound; then + myconf+=( --with-unbound ) + else + myconf+=( --with-ldns ) + fi + if use ldap; then + myconf+=( $(use_with sasl) ) + fi + econf \ + $(use_with berkdb db) \ + $(use_with opendbx odbx) \ + $(use_with lua) \ + $(use_enable lua rbl) \ + $(use_with ldap openldap) \ + $(use_with lmdb) \ + $(use_enable poll) \ + $(use_enable static-libs static) \ + $(use_with memcached libmemcached) \ + "${myconf[@]}" \ + --enable-filter \ + --enable-atps \ + --enable-identity_header \ + --enable-rate_limit \ + --enable-resign \ + --enable-replace_rules \ + --enable-default_sender \ + --enable-sender_macro \ + --enable-vbr \ + --disable-live-testing +} + +src_install() { + default + prune_libtool_files + + dosbin stats/opendkim-reportstats + + newinitd "${FILESDIR}/opendkim.init.r6" opendkim + newconfd "${FILESDIR}/opendkim.confd" opendkim + systemd_newunit "${FILESDIR}/opendkim.service.r4" opendkim.service + systemd_install_serviced "${FILESDIR}/${PN}.service.conf" "${PN}.service" + + dodir /etc/opendkim + keepdir /var/lib/opendkim + + # The OpenDKIM data (particularly, your keys) should be read-only to + # the UserID that the daemon runs as. + fowners root:opendkim /var/lib/opendkim + fperms 750 /var/lib/opendkim + + # Strip the comments out of the "simple" example configuration... + grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \ + > "${T}/opendkim.conf" || die + + # and tweak it a bit before installing it unconditionally. + echo "# For use with unbound" >> "${T}/opendkim.conf" || die + echo "#TrustAnchorFile /etc/dnssec/root-anchors.txt" \ + >> "${T}/opendkim.conf" || die + echo "UserID opendkim" >> "${T}/opendkim.conf" || die + + # The UMask is really only used for the PID file (root:root) and the + # local UNIX socket, if you're using one. It should be 0117 for the + # socket, so we might as well set that unconditionally here. + echo "UMask 0117" >> "${T}/opendkim.conf" || die + + insinto /etc/opendkim + doins "${T}/opendkim.conf" +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSION} ]]; then + elog "If you want to sign your mail messages and need some help" + elog "please run:" + elog " emerge --config ${CATEGORY}/${PN}" + elog "It will help you create your key and give you hints on how" + elog "to configure your DNS and MTA." + + # TODO: This is tricky, we really need a good wiki page showing + # how to share a local socket with an MTA! + elog "If you are using a local (UNIX) socket, then you will" + elog "need to make sure that your MTA has read/write access" + elog "to the socket file. This is best accomplished by creating" + elog "a completely-new group with only your MTA user and the " + elog "\"opendkim\" user in it. You would then set \"UMask 0112\"" + elog "in your opendkim.conf, and switch the primary group of your" + elog "\"opendkim\" user to the group that you just created. The" + elog "last step is necessary for the socket to be created as the" + elog "new group (and not as group \"opendkim\")". + else + ewarn "The user account for the OpenDKIM daemon has changed" + ewarn "from \"milter\" to \"opendkim\" to prevent unrelated services" + ewarn "from being able to read your private keys. You should" + ewarn "adjust your existing configuration to use the \"opendkim\"" + ewarn "user and group, and change the permissions on" + ewarn "${ROOT}var/lib/opendkim to root:opendkim with mode 0750." + ewarn "The owner and group of the files within that directory" + ewarn "will likely need to be adjusted as well." + fi +} + +pkg_config() { + local selector keysize pubkey + + read -p "Enter the selector name (default ${HOSTNAME}): " selector + [[ -n "${selector}" ]] || selector="${HOSTNAME}" + if [[ -z "${selector}" ]]; then + eerror "Oddly enough, you don't have a HOSTNAME." + return 1 + fi + if [[ -f "${ROOT}var/lib/opendkim/${selector}.private" ]]; then + ewarn "The private key for this selector already exists." + else + keysize=1024 + # Generate the private and public keys. Note that opendkim-genkeys + # sets umask=077 on its own to keep these safe. However, we want + # them to be readable (only!) to the opendkim user, and we manage + # that by changing their groups and making everything group-readable. + opendkim-genkey -b ${keysize} -D "${ROOT}"var/lib/opendkim/ \ + -s "${selector}" -d '(your domain)' && \ + chgrp --no-dereference opendkim \ + "${ROOT}var/lib/opendkim/${selector}".{private,txt} || \ + { eerror "Failed to create private and public keys." ; + return 1; } + chmod g+r "${ROOT}var/lib/opendkim/${selector}".{private,txt} + fi + + # opendkim selector configuration + echo + einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:" + einfo " Keyfile /var/lib/opendkim/${selector}.private" + einfo " Selector ${selector}" + + # MTA configuration + echo + einfo "If you are using Postfix, add following lines to your main.cf:" + einfo " smtpd_milters = unix:/run/opendkim/opendkim.sock" + einfo " non_smtpd_milters = unix:/run/opendkim/opendkim.sock" + einfo " and read http://www.postfix.org/MILTER_README.html" + + # DNS configuration + einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:" + cat "${ROOT}var/lib/opendkim/${selector}.txt" + einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:" + einfo " http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text" +} diff --git a/mail-filter/opendkim/opendkim-2.10.3-r12.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r12.ebuild new file mode 100644 index 000000000000..ee5908da59c4 --- /dev/null +++ b/mail-filter/opendkim/opendkim-2.10.3-r12.ebuild @@ -0,0 +1,228 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools db-use eutils systemd tmpfiles user + +DESCRIPTION="A milter providing DKIM signing and verification" +HOMEPAGE="http://opendkim.org/" +SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz" + +# The GPL-2 is for the init script, bug 425960. +LICENSE="BSD GPL-2 Sendmail-Open-Source" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+berkdb ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound" + +DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) + dev-libs/libbsd + sys-apps/grep + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + berkdb? ( >=sys-libs/db-3.2:* ) + opendbx? ( >=dev-db/opendbx-1.4.0 ) + lua? ( dev-lang/lua:* ) + ldap? ( net-nds/openldap ) + lmdb? ( dev-db/lmdb ) + memcached? ( dev-libs/libmemcached ) + sasl? ( dev-libs/cyrus-sasl ) + unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root ) + !unbound? ( net-libs/ldns )" + +RDEPEND="${DEPEND} + sys-process/psmisc + selinux? ( sec-policy/selinux-dkim )" + +REQUIRED_USE="sasl? ( ldap )" + +PATCHES=( + "${FILESDIR}/${P}-openrc.patch" + "${FILESDIR}/${P}-openssl-1.1.1.patch.r2" +) + +pkg_setup() { + # This user can read your private keys, and must therefore not be + # shared with any other package. + enewgroup opendkim + enewuser opendkim -1 -1 -1 opendkim +} + +src_prepare() { + default + sed -i -e 's:/var/db/dkim:/var/lib/opendkim:g' \ + opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in || die + sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am || die + # TODO: what purpose does this serve? + sed -i -e "/sock.*mt.getcwd/s:mt.getcwd():${T}:" \ + opendkim/tests/*.lua || die + eautoreconf +} + +src_configure() { + local myconf=() + if use berkdb ; then + myconf+=( + $(db_includedir) + --with-db-incdir=${myconf#-I} + --enable-popauth + --enable-query_cache + --enable-stats + ) + fi + if use unbound; then + myconf+=( --with-unbound ) + else + myconf+=( --with-ldns ) + fi + if use ldap; then + myconf+=( $(use_with sasl) ) + fi + + # We install the our configuration filed under e.g. /etc/opendkim, + # so the next line is necessary to point the daemon and all of its + # documentation to the right location by default. + myconf+=( --sysconfdir="${EPREFIX}/etc/${PN}" ) + + econf \ + $(use_with berkdb db) \ + $(use_with opendbx odbx) \ + $(use_with lua) \ + $(use_enable lua rbl) \ + $(use_with ldap openldap) \ + $(use_with lmdb) \ + $(use_enable poll) \ + $(use_enable static-libs static) \ + $(use_with memcached libmemcached) \ + "${myconf[@]}" \ + --enable-filter \ + --enable-atps \ + --enable-identity_header \ + --enable-rate_limit \ + --enable-resign \ + --enable-replace_rules \ + --enable-default_sender \ + --enable-sender_macro \ + --enable-vbr \ + --disable-live-testing +} + +src_compile() { + emake runstatedir=/run +} + +src_install() { + default + find "${D}" -name '*.la' -type f -delete || die + + dosbin stats/opendkim-reportstats + + newinitd "${S}/contrib/OpenRC/opendkim.openrc" "${PN}" + systemd_newtmpfilesd "${S}/contrib/systemd/opendkim.tmpfiles" "${PN}.conf" + systemd_newunit "contrib/systemd/opendkim.service" "${PN}.service" + + dodir /etc/opendkim + keepdir /var/lib/opendkim + + # The OpenDKIM data (particularly, your keys) should be read-only to + # the UserID that the daemon runs as. + fowners root:opendkim /var/lib/opendkim + fperms 750 /var/lib/opendkim + + # Tweak the "simple" example configuration a bit before installing + # it unconditionally. + local cf="${T}/opendkim.conf" + # Some MTAs are known to break DKIM signatures with "simple" + # canonicalization [1], so we choose the "relaxed" policy + # over OpenDKIM's current default settings. + # [1] https://wordtothewise.com/2016/12/dkim-canonicalization-or-why-microsoft-breaks-your-mail/ + sed -E -e 's:^(Canonicalization)[[:space:]]+.*:\1\trelaxed/relaxed:' \ + "${S}/opendkim/opendkim.conf.simple" >"${cf}" || die + cat >>"${cf}" <<EOT || die + +# The UMask is really only used for the PID file (root:root) and the +# local UNIX socket, if you're using one. It should be 0117 for the +# socket. +UMask 0117 +UserID opendkim + +# For use with unbound +#TrustAnchorFile /etc/dnssec/root-anchors.txt +EOT + insinto /etc/opendkim + doins "${cf}" +} + +pkg_postinst() { + tmpfiles_process "${PN}.conf" + if [[ -z ${REPLACING_VERSION} ]]; then + elog "If you want to sign your mail messages and need some help" + elog "please run:" + elog " emerge --config ${CATEGORY}/${PN}" + elog "It will help you create your key and give you hints on how" + elog "to configure your DNS and MTA." + + elog "If you are using a local (UNIX) socket, then you will" + elog "need to make sure that your MTA has read/write access" + elog "to the socket file. This is best accomplished by creating" + elog "a completely-new group with only your MTA user and the" + elog "\"opendkim\" user in it. Step-by-step instructions can be" + elog "found on our Wiki, at https://wiki.gentoo.org/wiki/OpenDKIM ." + else + ewarn "The user account for the OpenDKIM daemon has changed" + ewarn "from \"milter\" to \"opendkim\" to prevent unrelated services" + ewarn "from being able to read your private keys. You should" + ewarn "adjust your existing configuration to use the \"opendkim\"" + ewarn "user and group, and change the permissions on" + ewarn "${ROOT}var/lib/opendkim to root:opendkim with mode 0750." + ewarn "The owner and group of the files within that directory" + ewarn "will likely need to be adjusted as well." + fi +} + +pkg_config() { + local selector keysize pubkey + + read -p "Enter the selector name (default ${HOSTNAME}): " selector + [[ -n "${selector}" ]] || selector="${HOSTNAME}" + if [[ -z "${selector}" ]]; then + eerror "Oddly enough, you don't have a HOSTNAME." + return 1 + fi + if [[ -f "${ROOT}var/lib/opendkim/${selector}.private" ]]; then + ewarn "The private key for this selector already exists." + else + keysize=1024 + # Generate the private and public keys. Note that opendkim-genkeys + # sets umask=077 on its own to keep these safe. However, we want + # them to be readable (only!) to the opendkim user, and we manage + # that by changing their groups and making everything group-readable. + opendkim-genkey -b ${keysize} -D "${ROOT}"var/lib/opendkim/ \ + -s "${selector}" -d '(your domain)' && \ + chgrp --no-dereference opendkim \ + "${ROOT}var/lib/opendkim/${selector}".{private,txt} || \ + { eerror "Failed to create private and public keys."; return 1; } + chmod g+r "${ROOT}var/lib/opendkim/${selector}".{private,txt} + fi + + # opendkim selector configuration + echo + einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:" + einfo " Keyfile /var/lib/opendkim/${selector}.private" + einfo " Selector ${selector}" + + # MTA configuration + echo + einfo "If you are using Postfix, add following lines to your main.cf:" + einfo " smtpd_milters = unix:/run/opendkim/opendkim.sock" + einfo " non_smtpd_milters = unix:/run/opendkim/opendkim.sock" + einfo " and read http://www.postfix.org/MILTER_README.html" + + # DNS configuration + einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:" + cat "${ROOT}var/lib/opendkim/${selector}.txt" + einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:" + einfo " http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text" +} diff --git a/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild b/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild deleted file mode 100644 index 4b39b476cb33..000000000000 --- a/mail-filter/opendkim/opendkim-2.10.3-r3.ebuild +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools db-use eutils systemd user - -# for betas -#MY_P=${P/_b/.B} -#S=${WORKDIR}/${PN}-2.8.0 -#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz" - -DESCRIPTION="A milter-based application to provide DKIM signing and verification" -HOMEPAGE="http://opendkim.org" -SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz" - -LICENSE="Sendmail-Open-Source BSD" -SLOT="0" -KEYWORDS="amd64 ~arm x86" -IUSE="+berkdb gnutls ldap libressl lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound" - -DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) - dev-libs/libbsd - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - ) - berkdb? ( >=sys-libs/db-3.2:* ) - opendbx? ( >=dev-db/opendbx-1.4.0 ) - lua? ( dev-lang/lua:* ) - ldap? ( net-nds/openldap ) - lmdb? ( dev-db/lmdb ) - memcached? ( dev-libs/libmemcached ) - sasl? ( dev-libs/cyrus-sasl ) - unbound? ( >=net-dns/unbound-1.4.1:= net-dns/dnssec-root ) - !unbound? ( net-libs/ldns ) - gnutls? ( >=net-libs/gnutls-3.3 )" - -RDEPEND="${DEPEND} - sys-process/psmisc - selinux? ( sec-policy/selinux-dkim ) -" - -REQUIRED_USE="sasl? ( ldap )" - -PATCHES=( - "${FILESDIR}/${P}-gnutls-3.4.patch" -) - -pkg_setup() { - enewgroup milter - # mail-milter/spamass-milter creates milter user with this home directory - # For consistency reasons, milter user must be created here with this home directory - # even though this package doesn't need a home directory for this user (#280571) - enewuser milter -1 -1 /var/lib/milter milter -} - -src_prepare() { - default - - sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \ - -e 's:/var/db/opendkim:/var/lib/opendkim:g' \ - -e 's:/etc/mail:/etc/opendkim:g' \ - -e 's:mailnull:milter:g' \ - -e 's:^#[[:space:]]*PidFile.*:PidFile /run/opendkim/opendkim.pid:' \ - opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \ - stats/opendkim-reportstats{,.in} || die - - sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \ - || die - - sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua - sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua - - eautoreconf -} - -src_configure() { - local myconf=() - if use berkdb ; then - myconf+=( - $(db_includedir) - --with-db-incdir=${myconf#-I} - --enable-popauth - --enable-query_cache - --enable-stats - ) - fi - if use unbound; then - myconf+=( --with-unbound ) - else - myconf+=( --with-ldns ) - fi - if use ldap; then - myconf+=( $(use_with sasl) ) - fi - econf \ - $(use_with berkdb db) \ - $(use_with opendbx odbx) \ - $(use_with lua) \ - $(use_enable lua rbl) \ - $(use_with ldap openldap) \ - $(use_with lmdb) \ - $(use_enable poll) \ - $(use_enable static-libs static) \ - $(use_with gnutls) \ - $(use_with memcached libmemcached) \ - "${myconf[@]}" \ - --enable-filter \ - --enable-atps \ - --enable-identity_header \ - --enable-rate_limit \ - --enable-resign \ - --enable-replace_rules \ - --enable-default_sender \ - --enable-sender_macro \ - --enable-vbr \ - --disable-live-testing - #--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S - #--disable-rpath -} - -src_install() { - default - prune_libtool_files - - dosbin stats/opendkim-reportstats - - newinitd "${FILESDIR}/opendkim.init.r3" opendkim - systemd_newunit "${FILESDIR}/opendkim-r1.service" opendkim.service - - dodir /etc/opendkim /var/lib/opendkim - fowners milter:milter /var/lib/opendkim - - # default configuration - if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then - grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \ - > "${D}"/etc/opendkim/opendkim.conf - if use unbound; then - echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf - fi - echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf - if use berkdb; then - echo Statistics /var/lib/opendkim/stats.dat >> \ - "${D}"/etc/opendkim/opendkim.conf - fi - fi -} - -pkg_postinst() { - if [[ -z ${REPLACING_VERSION} ]]; then - elog "If you want to sign your mail messages and need some help" - elog "please run:" - elog " emerge --config ${CATEGORY}/${PN}" - elog "It will help you create your key and give you hints on how" - elog "to configure your DNS and MTA." - - ewarn "Make sure your MTA has r/w access to the socket file." - ewarn "This can be done either by setting UMask to 002 and adding MTA's user" - ewarn "to milter group or you can simply set UMask to 000." - fi -} - -pkg_config() { - local selector keysize pubkey - - read -p "Enter the selector name (default ${HOSTNAME}): " selector - [[ -n "${selector}" ]] || selector=${HOSTNAME} - if [[ -z "${selector}" ]]; then - eerror "Oddly enough, you don't have a HOSTNAME." - return 1 - fi - if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then - ewarn "The private key for this selector already exists." - else - keysize=1024 - # generate the private and public keys - opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \ - -s ${selector} -d '(your domain)' && \ - chown milter:milter \ - "${ROOT}"etc/opendkim/"${selector}".private || \ - { eerror "Failed to create private and public keys." ; return 1; } - chmod go-r "${ROOT}"etc/opendkim/"${selector}".private - fi - - # opendkim selector configuration - echo - einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:" - einfo " Keyfile /etc/opendkim/${selector}.private" - einfo " Selector ${selector}" - - # MTA configuration - echo - einfo "If you are using Postfix, add following lines to your main.cf:" - einfo " smtpd_milters = unix:/var/run/opendkim/opendkim.sock" - einfo " non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock" - einfo " and read http://www.postfix.org/MILTER_README.html" - - # DNS configuration - einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:" - cat "${ROOT}"etc/opendkim/${selector}.txt - einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:" - einfo " http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text" -} diff --git a/mail-filter/opendmarc/Manifest b/mail-filter/opendmarc/Manifest index 348afc02cc4b..f4d1a9d5d370 100644 --- a/mail-filter/opendmarc/Manifest +++ b/mail-filter/opendmarc/Manifest @@ -5,5 +5,5 @@ DIST opendmarc-1.1.3.tar.gz 586574 BLAKE2B a5574aa705db6e5b87a704f3073039d667c90 DIST opendmarc-1.3.2.tar.gz 593448 BLAKE2B 80f47a82e38c6cdc5791a695485262c50e9363b81537a52d7af204bd6a830df6eea9e9b6f710b72b7934c3ab7df800def7d4b3e54f53b8908a7f1b42bcea2b2d SHA512 6045fb7d2be8f0ffdeca07324857d92908a41c6792749017c2fcc1058f05f55317b1919c67c780827dd7094ec8fff2e1fa4aeb5bab7ff7461537957af2652748 EBUILD opendmarc-1.1.3.ebuild 768 BLAKE2B f9fcb819281ac3eadbfc22875fdfa0d663cd5c73c9e4221ade6af260ae0f3bfdbb5b396de53b297a7346120cbc36b06a698d6ae1cb3df0b916a1842944751d2e SHA512 d2f7ae5dd159315b6f96bea798796cd6ee9ff7a3fd07329c80e7764fc1e9d9cc35fab481dccb369dea0f1682590ecc17ec45448be514602626bd565dab527257 EBUILD opendmarc-1.3.2-r1.ebuild 1522 BLAKE2B d75259d5ce9c44e3f8ba59bba674d520d886d150843298dbef587843f842d7ca8c9b368140ab4daffba1c4222245254d818bc868d5e33c6c4e18b4618c280093 SHA512 27d9c2f088c7a5789837e49e8357a3f7100852e752786060d5eb00854cbf552bf3803364ecb181aae7c13b2e5e2abfeb21f8b11ca08e98259618e77eca170250 -EBUILD opendmarc-1.3.2-r2.ebuild 1665 BLAKE2B 992f7c09da82d52e5385eeb4944e3fd5ae0aeed0ed4d071434458eb5c28449ad6849983cbe1dc6f86c5e67acbbdeb9fe29115c527e13230be08ac51ebbfcf2ba SHA512 463df4aafd0bdfa53914f9e0cad8f90be15d80fb618bb8aafba934bba49d936831247a2e2054de95905543d07573282663ee28685f8494d81896496e5f6268d8 +EBUILD opendmarc-1.3.2-r2.ebuild 1659 BLAKE2B bb2cdc469b65dca7fc78c5fdd7000bc4e1c3aad7f6033c68e39bf66dc997394cb300510a93c6083d25f95a366711de8d1ce91d111e40ca462dc8f58fda49c105 SHA512 1fb155acadfe1c1ee08fd0425f769fa2ce6f91c03fd2122c68634bf7e6a8ab969b570d48c0317b6f30db713ed78783084d90e23904dc73300efeb5c16785fd55 MISC metadata.xml 512 BLAKE2B e837ed3fdef4432f4a6e208b57942ac6b74de558ad20fa978ce046d49147b4225720506c7191a07eeceeb85d6773d3f6d2ae5ca62c08fddb7126061bcfd46fdb SHA512 33b5347b487959b6412dd8a9e7babf0cedac3dd27eb6397dfc226de5d34b70c7e67e9b30dae231bdf743e4c18ffd2cfcd6df1af450e201cafa3c5105d5a889f0 diff --git a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild index 8704d856f53d..8f08f7ac7c70 100644 --- a/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild +++ b/mail-filter/opendmarc/opendmarc-1.3.2-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/opendmarc/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd" IUSE="spf +reports static-libs" DEPEND="reports? ( dev-perl/DBI ) diff --git a/mail-filter/procmail/Manifest b/mail-filter/procmail/Manifest index ca77b2593085..572b5ae6ab83 100644 --- a/mail-filter/procmail/Manifest +++ b/mail-filter/procmail/Manifest @@ -9,7 +9,5 @@ AUX procmail-maxprocs-fix.diff 465 BLAKE2B 05df3e8111ec4953a034fbdd93c9342b1581e AUX procmail-pipealloc.diff 825 BLAKE2B 532fe5fe01b34989e6d5805c0e5e1681d0b64f3838214b9715b44431c58d3f681ec4c889935071542b832b0ca7d96cd07d043918d2cf592ec4d150a483a58480 SHA512 e2a93060ff133f073c8a988db1bd92cfe3aac149ee04eda65862c468576fe194cd09379a545a94bbb1e20dbe1e142eae9f7949e930288178968fd95f5450fdbc AUX procmail-prefix.patch 5748 BLAKE2B c25d1de87d59771f959940d59195096711e70cc2a586d6eb585a58dfa96da8eb02ebe1bc03e08c0f8d6678da97d6c6016f99ae2669f4931e9cfdeb39ff23d230 SHA512 be61e6e0c89145caea1351241196c3bc986382340ecba0360d10918691cf1e35c67028a33ffaf22c83a0c747d06e58f437bf84854fc819206fa6e7bf0bbeb0d5 DIST procmail-3.22.tar.gz 226817 BLAKE2B 4fd4641abcd3a897ea19bd8f76446f88806d22649d5221f8cef6f9efc29f7fcc02c9707cbf00c32fe247f16579d28fd887d3c18c4d3a2f8877c351bf92e85866 SHA512 3d0658329a55957a8d5741e03b0853b030c4524acef30641663213aa9eefc8264f8cc2b68a00a89e5f9f0f7c916c41a42e1b6c8df562c545ba97d8ab9049a936 -EBUILD procmail-3.22-r10.ebuild 2974 BLAKE2B 3be993b59382cd089b785b048efeb7eeed3f6c165b8abeee189618d5b3b13d307f9a29de1923c44e33b758e71767aa340bdae3483d512db8ff3917ea1b311aa4 SHA512 cce27ee51e5447af58414314ba955d089bbc637fb7cf53392c1f22a70a72686b8aef385b74155f4e14163f88dc469c4e5d9c76c508a7b39a5eb74cfc1c5ee02f -EBUILD procmail-3.22-r11.ebuild 3474 BLAKE2B f2a7a2a648a12e80588f44a321fe084bc2f2decb7034b77a6a2dada6f57e13061d5a942dd00248d74c8c2806250273f7912c7f9040d85554f1903ac9bb67ca16 SHA512 8b664a9979b4180c5b7814b84387f9fb8793ffc71b7b36ab662ec1eacb5d2774a49e80d60a78c782f74ad889736bbbd4fc215cad3aa6e7ab0f10572448873b97 -EBUILD procmail-3.22-r14.ebuild 3666 BLAKE2B 71535ffe867c6231fd8c2873fb5ec952fe6426d02a1060209dc9ef1cd3a9d4d72b2270d22e6dce206c86025d18103ca8cc34b000a28093aee804f90587f37ab0 SHA512 f11648b6078ebc1d158c566aaac82bd5847765d17708231493a13ba5ecc4665238a334d2bb7906f8010c8f712b4d088ae94b3ff8d64ffe10a0b43c47826cc1ab +EBUILD procmail-3.22-r14.ebuild 3659 BLAKE2B e305c81f6ec23aef8c38088b5a3fb21560f257061e4a5e62abdaba81cdce3f74d63e06b0dc8bd0e6594e578b020e4c3886b27ebcc170d40306494fcadcc46c63 SHA512 82800866188e9d3d266926c165aba17c1e0e164457f6b51b73139fde6e758f121de92d29e8e2951128ed9a24605aaf393dbe65f9c9f534dfe89d4708c1784410 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/mail-filter/procmail/procmail-3.22-r10.ebuild b/mail-filter/procmail/procmail-3.22-r10.ebuild deleted file mode 100644 index 44d9cfd6ede9..000000000000 --- a/mail-filter/procmail/procmail-3.22-r10.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=0 - -inherit eutils flag-o-matic toolchain-funcs prefix - -DESCRIPTION="Mail delivery agent/filter" -HOMEPAGE="http://www.procmail.org/" -SRC_URI="http://www.procmail.org/${P}.tar.gz" - -LICENSE="|| ( Artistic GPL-2 )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="mbox selinux" - -DEPEND="virtual/mta" -RDEPEND="selinux? ( sec-policy/selinux-procmail )" - -src_unpack() { - unpack ${A} - cd "${S}" - - # disable flock, using both fcntl and flock style locking - # doesn't work with NFS with 2.6.17+ kernels, bug #156493 - - sed -e "s:/\*#define NO_flock_LOCK:#define NO_flock_LOCK:" \ - -i config.h || die "sed failed" - - if ! use mbox ; then - echo "# Use maildir-style mailbox in user's home directory" > "${S}"/procmailrc - echo 'DEFAULT=$HOME/.maildir/' >> "${S}"/procmailrc - cd "${S}" - epatch "${FILESDIR}/gentoo-maildir3.diff" - else - echo '# Use mbox-style mailbox in /var/spool/mail' > "${S}"/procmailrc - echo 'DEFAULT=${EPREFIX}/var/spool/mail/$LOGNAME' >> "${S}"/procmailrc - fi - - # Do not use lazy bindings on lockfile and procmail - if [[ ${CHOST} != *-darwin* ]]; then - epatch "${FILESDIR}/${PN}-lazy-bindings.diff" - fi - - # Fix for bug #102340 - epatch "${FILESDIR}/${PN}-comsat-segfault.diff" - - # Fix for bug #119890 - epatch "${FILESDIR}/${PN}-maxprocs-fix.diff" - - # Prefixify config.h - epatch "${FILESDIR}"/${PN}-prefix.patch - eprefixify config.h Makefile src/autoconf src/recommend.c - - # Fix for bug #200006 - epatch "${FILESDIR}/${PN}-pipealloc.diff" - - # Fix for bug #270551 - epatch "${FILESDIR}/${PN}-3.22-glibc-2.10.patch" -} - -src_compile() { - # -finline-functions (implied by -O3) leaves strstr() in an infinite loop. - # To work around this, we append -fno-inline-functions to CFLAGS - # Since GCC 4.7 we also need -fno-ipa-cp-clone (bug #466552) - append-flags -fno-inline-functions -fno-ipa-cp-clone - - sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \ - -e "s:LDFLAGS0= -s:LDFLAGS0 = ${LDFLAGS}:" \ - -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \ - -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \ - -i Makefile || die "sed failed" - - emake CC="$(tc-getCC)" || die -} - -src_install() { - cd "${S}"/new - insinto /usr/bin - insopts -m 6755 - doins procmail || die - - doins lockfile || die - fowners root:mail /usr/bin/lockfile - fperms 2755 /usr/bin/lockfile - - dobin formail mailstat || die - insopts -m 0644 - - doman *.1 *.5 - - cd "${S}" - dodoc FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README - - insinto /etc - doins procmailrc || die - - docinto examples - dodoc examples/* -} - -pkg_postinst() { - if ! use mbox ; then - elog "Starting with mail-filter/procmail-3.22-r9 you'll need to ensure" - elog "that you configure a mail storage location using DEFAULT in" - elog "/etc/procmailrc, for example:" - elog "\tDEFAULT=\$HOME/.maildir/" - fi -} diff --git a/mail-filter/procmail/procmail-3.22-r11.ebuild b/mail-filter/procmail/procmail-3.22-r11.ebuild deleted file mode 100644 index c717564afa4f..000000000000 --- a/mail-filter/procmail/procmail-3.22-r11.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs prefix - -DESCRIPTION="Mail delivery agent/filter" -HOMEPAGE="http://www.procmail.org/" -SRC_URI="http://www.procmail.org/${P}.tar.gz" - -LICENSE="|| ( Artistic GPL-2 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" -IUSE="mbox selinux" - -DEPEND="virtual/mta" -RDEPEND="selinux? ( sec-policy/selinux-procmail )" - -src_prepare() { - # disable flock, using both fcntl and flock style locking - # doesn't work with NFS with 2.6.17+ kernels, bug #156493 - - sed -e "s:/\*#define NO_flock_LOCK:#define NO_flock_LOCK:" \ - -i config.h || die "sed failed" - - if ! use mbox ; then - echo "# Use maildir-style mailbox in user's home directory" > "${S}"/procmailrc || die - echo 'DEFAULT=$HOME/.maildir/' >> "${S}"/procmailrc || die - cd "${S}" || die - eapply "${FILESDIR}/gentoo-maildir3.diff" - else - echo '# Use mbox-style mailbox in /var/spool/mail' > "${S}"/procmailrc || die - echo 'DEFAULT=${EPREFIX}/var/spool/mail/$LOGNAME' >> "${S}"/procmailrc || die - fi - - # Do not use lazy bindings on lockfile and procmail - if [[ ${CHOST} != *-darwin* ]]; then - eapply -p0 "${FILESDIR}/${PN}-lazy-bindings.diff" - fi - - # Fix for bug #102340 - eapply -p0 "${FILESDIR}/${PN}-comsat-segfault.diff" - - # Fix for bug #119890 - eapply -p0 "${FILESDIR}/${PN}-maxprocs-fix.diff" - - # Prefixify config.h - eapply -p0 "${FILESDIR}"/${PN}-prefix.patch - eprefixify config.h Makefile src/autoconf src/recommend.c - - # Fix for bug #200006 - eapply "${FILESDIR}/${PN}-pipealloc.diff" - - # Fix for bug #270551 - eapply "${FILESDIR}/${PN}-3.22-glibc-2.10.patch" - - eapply_user -} - -src_compile() { - # -finline-functions (implied by -O3) leaves strstr() in an infinite loop. - # To work around this, we append -fno-inline-functions to CFLAGS - # Since GCC 4.7 we also need -fno-ipa-cp-clone (bug #466552) - # If it's clang, ignore -fno-ipa-cp-clone, as clang doesn't support this - case "$(tc-getCC)" in - "clang") append-flags -fno-inline-functions ;; - "gcc"|*) append-flags -fno-inline-functions -fno-ipa-cp-clone ;; - esac - - sed -e "s:CFLAGS0 = -O:CFLAGS0 = ${CFLAGS}:" \ - -e "s:LDFLAGS0= -s:LDFLAGS0 = ${LDFLAGS}:" \ - -e "s:LOCKINGTEST=__defaults__:#LOCKINGTEST=__defaults__:" \ - -e "s:#LOCKINGTEST=/tmp:LOCKINGTEST=/tmp:" \ - -i Makefile || die "sed failed" - - emake CC="$(tc-getCC)" -} - -src_install() { - cd "${S}"/new || die - insinto /usr/bin - insopts -m 6755 - doins procmail - - doins lockfile - fowners root:mail /usr/bin/lockfile - fperms 2755 /usr/bin/lockfile - - dobin formail mailstat - insopts -m 0644 - - doman *.1 *.5 - - cd "${S}" || die - dodoc FAQ FEATURES HISTORY INSTALL KNOWN_BUGS README - - insinto /etc - doins procmailrc - - docinto examples - dodoc examples/* -} - -pkg_postinst() { - if ! use mbox ; then - elog "Starting with mail-filter/procmail-3.22-r9 you'll need to ensure" - elog "that you configure a mail storage location using DEFAULT in" - elog "/etc/procmailrc, for example:" - elog "\tDEFAULT=\$HOME/.maildir/" - fi - if has sfperms ${FEATURES}; then - ewarn "FEATURES=sfperms removes the read-bit for others from" - ewarn " /usr/bin/procmail" - ewarn " /usr/bin/lockfile" - ewarn "If you use procmail from an MTA like Exim, you need to" - ewarn "re-add the read-bit or avoid the MTA checking the binary" - ewarn "exists." - fi -} diff --git a/mail-filter/procmail/procmail-3.22-r14.ebuild b/mail-filter/procmail/procmail-3.22-r14.ebuild index c23341b477e8..4d67def38fa9 100644 --- a/mail-filter/procmail/procmail-3.22-r14.ebuild +++ b/mail-filter/procmail/procmail-3.22-r14.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.procmail.org/${P}.tar.gz" LICENSE="|| ( Artistic GPL-2 )" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" IUSE="mbox selinux" DEPEND="virtual/mta" diff --git a/mail-filter/pypolicyd-spf/Manifest b/mail-filter/pypolicyd-spf/Manifest index e9f7935a0e83..c49db00caf55 100644 --- a/mail-filter/pypolicyd-spf/Manifest +++ b/mail-filter/pypolicyd-spf/Manifest @@ -1,3 +1,3 @@ DIST pypolicyd-spf-2.0.2.tar.gz 38546 BLAKE2B 691cd5db37592be0ef0cda41223280e764e83802e37563f4e6c08505731118199c03d27b0bf51cec0556aa946fc6c7465fe09d3c9100c8e2582a4d85ad828495 SHA512 adcc7b30c6922894f9407edd0637b02a138623f4480ec37635475396826b457c835b3ffb599d1985e306770fe5f72404552ed705bd957e63b5c54ca3d8991673 -EBUILD pypolicyd-spf-2.0.2.ebuild 1218 BLAKE2B e0207c016b88c2a2355a48c5b4fccd44f1aebbf2582709b562ac6aad1b430b7fb1664924d1bb87b185665f106d437f649ac46ac6cd19c0b18e3d2903fb7d272d SHA512 0b99240593c33485576d3e93f861226302f815acc502e69cedb5823c210f2509cb28dd4cdd5bcaaf376f7adb7144a2fb70d4ae537c6da3a837e5a04eb845a495 +EBUILD pypolicyd-spf-2.0.2.ebuild 1216 BLAKE2B 049868c40a0db7fc35d600c5cdf5619d6e45322240ec4e96142f553017ad39646ab4c31327f6305cff8d10509831b93e62e5f6829a3880a885b5f9aeaaed9ba7 SHA512 9daba1e4c33212178536ee7dc6faef1578d14fa939528492a05b1a4ceb4e2961d9f75121a3b83530088a39914e1be40a53486c3e5084c5ecaeee3f36cd4cbee5 MISC metadata.xml 356 BLAKE2B e28aba8830da5e0c372cc7090736a5a90c208af79c6fe338e8bf96ef79e17afa05cdabdb48ca172d57fd34203c66ff7e3be4ce4c043b14c0e9694639512a82f3 SHA512 67a8fd46090c3e558e7bf963277e99e11be4d2df97f4a4491a7fbc64a42f89e19af2131d13efec7370df1f27b2eb7385f59e732fae57b6ec67c47f18af8cfc72 diff --git a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild b/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild index f5bb05b2fbd4..8ad06af76151 100644 --- a/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild +++ b/mail-filter/pypolicyd-spf/pypolicyd-spf-2.0.2.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_{4,5,6} ) +PYTHON_COMPAT=( python3_{5,6} ) # The built-in ipaddress module handles the parsing of IP addresses. If # python is built without ipv6 support, then ipaddress can't parse ipv6 diff --git a/mail-filter/rspamd/Manifest b/mail-filter/rspamd/Manifest index 04dd3814b54e..aaf7869d5085 100644 --- a/mail-filter/rspamd/Manifest +++ b/mail-filter/rspamd/Manifest @@ -1,30 +1,9 @@ -AUX 1.6.6-dont-send-reject-message-after-set-reply.patch 3437 BLAKE2B ff628f61ed78de3cada4aa0e5b85d33eedda3c40e932aa6dd07970949f92e3dede78ec8592e57658dbb99b28422c4eaf60d4c4443470f721664fc0fbbb156e1c SHA512 4a66760909633601bb1ec91881cb6a3cde9fc66ffbaa31692d6847d088d661053f3294e3597c2a44bddb8b0a2f38175dba03ab1510ff420f3395087114a28486 AUX rspamd-r1.logrotate 305 BLAKE2B 58e816e54fd0a7e977dd2f6dcf97617c188888ffea66769ef60ce799f980e2814221734fee7b47c93790a5bbfecbb2f315f93c84bec9dd29b0f80c15e1b9e349 SHA512 0515d31a890058194106d9b8960d77909914986e73619dede751be2efb9592a41f90f15599310b5d6d027c3a203df412c8379ade7df09ecdfd4dcf43bfff4fa7 AUX rspamd-r6.init 1370 BLAKE2B 333683396f499c3d1cfc92d67434fc9d1fdab695b1ddf9798d0bed42b227111cb9c779fd33e04bb095affd09326edf6f80100d58248061795bf3540e2e9e0771 SHA512 40016348ed413414c9a06182f8da896bcb5b0f48bf7ec51db1cd7e4f9adea59e30c6c5ddc79135141b795e829af2660c047ed8f93fed1e181f9f2f01a419d690 AUX rspamd.conf 908 BLAKE2B 9d8c310c00990f47012e9d1710fbb7567ae5b0e92a411d3fb2696bfb32b70c31ceeaded873f06c759a471d534fb872656907e73ee095150fae384de4df6e9946 SHA512 753011de167af9261cc67676357aadf34d0b160d343a20d5efe8b3389e8a604775b7a6abbaad3174acae7df5579b52b4ba8a0a714419084befedfa96a3a8a9b1 -AUX rspamd.init-r5 993 BLAKE2B bce51947c56f4f61aeb24365b37fcbf89b3cf919fa355c6055691684420458bce4e7ab1c30012b849e0be50785be54785b5984fe46104c3312cf6421cbc46659 SHA512 a51e13e344a67436ba377ed5b5f5516895f7b0a87571dd1d8391fbc4db5794e98e609672f103f997d6c13aded81595ac4e0c4f315e7c23a79408d0dc680930a5 -AUX rspamd.logrotate 258 BLAKE2B 14a006d8768adc90b0b186e652c5516f4a983149fa10722545c8376d93f8333825a072906ac964b9f4c25c9165c001e1daf493c8a7e19cfe97ce5b8a6afcba85 SHA512 159e048552cc86b9e15b7dc826ee772a1d9be5cfe588b2025ffee7a8944e5f1af63f6512379efd9f0cca450a48f536babd6845812733060d087801ee5fd75770 AUX rspamd.tmpfile 33 BLAKE2B 3ce0f8ab29a2ca259023f90b12799d8c7f0f099a98ef1eb4abe3b3d3e6046d362dae9efc723dd675dff8f1c1df9d05c09e539fcd251382cd9fc5e92351ece8a9 SHA512 1c7e6b79a05cdf9a886c6e233417a0d7b398a1e27ddd3b19c3a595afd50e502a7fd7c09a3499cb9fe6e0291b8493d150550b094c8bf6e2221b71915239c72ef8 -DIST rspamd-1.6.5.tar.gz 2484271 BLAKE2B 880e862eecd4a082b87bee2ba8c7b17a475efbfe90dbb0cbf34c5ad6c42c80d6ea142f11c7632763d7f9e4155a4521274f2d5a26a77dfbdab9f585bb1e3fff5f SHA512 789abc994cf96a0d88662e14f0e77f95f5c7c7bd1f808ffd64af21cf73cef643b5aee4c1f066d81d04e79d6bb7f72f12095ff08d8515a40bcca23153715fc9f1 -DIST rspamd-1.6.6.tar.gz 2487482 BLAKE2B f18640f64a8c0bcf6077267a1715f0bb096ab18484c24de56a012c42666cdc9f8671237c5336dce7cd47f44f9aba7905ce3723232d53a5b8ddfe143df682bd9b SHA512 14c7144017df69600dbd09541d16dae19d87105b09f95811fc09624b60e89ca68200654e88dea242508afd3c4963ea7cac086abddec8ca1a3d8fc73d7c27e899 -DIST rspamd-1.7.1.tar.gz 4453460 BLAKE2B 28070804a6daf7f6354203038fbd974176a1ed5135b51a5ef7f089e63ffac3b3bbdca1961154b846f5b7d054071925722b311b46a3be6d09ff3d853232cbbd5f SHA512 3de4e07fa9cc72e306936a201f6bc019b5bf6f3ade003bf9217dc8a7decf027b986d80e1c0d2f09460af6f1d59aa520fee68287ad6ccee1cec94698054bc2fbb -DIST rspamd-1.7.2.tar.gz 4460606 BLAKE2B 2c4389fd5350d67d21745288f74c4e1276772c47bbb0c74364227d0c04e4102c2ce00cd8242a639825e8c9971e87822af7a38a0a8561ba979e3f3b396d120414 SHA512 45ab95c7488e58da9e8803daefda5a0f8920cc4d4c4508a0347ed07d201124d07b10e93010b2be5fab3ecd0ac2be962bcebbb41f434a449fdbc31ded744878cf -DIST rspamd-1.7.5.tar.gz 4494681 BLAKE2B 709b589157cb61568ebe78af64bb2363cb7342736e29971f30de1e1a1e9e667402006cb3a34e1d240a32560608ab9ab86838a288707b5043c89c3d9127880f60 SHA512 3e77c99abd47b1d22ccae33c0312b4338253af0ff10825dc2796fc42864142c91324d349677098bcd0c156a9229c04d3ce8a08808b6eb702624c918722e3acc4 -DIST rspamd-1.7.7.tar.gz 4534430 BLAKE2B 83ba39b80293bf87f397e6b1b1cbec27e7c44f096a148b6d29c641d10b607b616865ec54c1a88dc55f620b17e8c69bcf8690ee509d1b9a517a923fe0afc08b70 SHA512 7436848b3fc0e2ef90dcc54b48c1c95d6a7753175f484297de2e77bd117a9858da09b2a50f8692f210e48421b604ef465311b97197b473823a87ac74337d7752 -DIST rspamd-1.7.8.tar.gz 4542955 BLAKE2B 78fbb01c51d290f8d88f4c512df248fcbc8e28e00a820ba0d3dc22adf4bb1b54b1923aa5306fde5d4d75c81a9304f220608a6cec3f1077bbb9adfa1ea8bdc2a4 SHA512 43f2350dfa4e0369cd53480bd4c8d0aa3898d7c471540281e7460a264207032aea226c4fd519a26397b9e9e8c8de3951e5a9752e010eabf1b3733a0c3e3086c2 -DIST rspamd-1.7.9.tar.gz 4557492 BLAKE2B f42775ba8157ef4815331c304e3030c522e9ae5e10ef0194da0c7dde105b40fed2ae84b063d78aed37992146311aecc1ac77f64dacdaf3ff11bb85076e8aef7c SHA512 d11d8c03668b85feae665ed491cd156c7430fbad30f42fe44103ea3c3a8bc988e5f8981e784e8f31aa35ba1ff9f7abd23605638e4ee3086a056b22fb3109563e -DIST rspamd-1.8.1.tar.gz 4286637 BLAKE2B dd202a2f3dab4ef459d978e06231f8fcef3724ea5912c7455d553dc04e2744322b9144ba05a2f6f22a7eb58cd0a967f213bfc76fb273b5425036a5042975ed89 SHA512 98c2d909b7dc19f1c431d4e64444968092a10630ef238d3c8cc2825e7b2d92bee893bc7f9c431f3a6337ef2af4d2a157f0584e7b13fba0540660d7c853bc25cc DIST rspamd-1.8.3.tar.gz 4319623 BLAKE2B b7fdd6791df5899710bb1d696a9b94d1840335b6a34d6cdeebc2b5eebe9f4e5b6da3e90ed9ab5e3945aab7ef33f54f048024b51c3de37db1a083ad89c656b456 SHA512 5e20255466fe2cd4842196fb2138732b59911de655e73d9cc13009b5179b84e5a2060083961b35fe40b9f550f8e18067056415a1d803fac54fac000070024c01 DIST rspamd-1.9.0.tar.gz 4402395 BLAKE2B 11f90fc232496b493296ef0fb9ff4118ac11863528cd6a52bcae6adbdc09ce86453bb39df35714702fcd5c6a535007ec402a580bd735abbddeeb154ff8807219 SHA512 fee2a60c10fbab087b12d9188974a0c47417a9894308f66980eb6311496b16661194d858d1e522d2d524b3e359f2f3ad88535421d1dc05be26414b5a346afec6 -EBUILD rspamd-1.6.5.ebuild 1868 BLAKE2B 3a1b3b56887ac104ad88a01e6ba591d12dc2cd26faad7015b172f86fe9980527e96f8834237d88590ea3045ff15b4d75f6eb89378a24c34257dbb5a3a689bd0a SHA512 1377875abc3cdb66f5dd78fda1e44b93fb8a1f1c39f17757d7289a2c13464071731116ed1e4450b7c371f7682407575986fe73c8e0d9e3d0352b29a7e4098511 -EBUILD rspamd-1.6.6.ebuild 1947 BLAKE2B a126b72800155611a024b3767643b1e511d70a4cee87727d35292500b6d97cbb538b3dd960efef11d78de270d5804d0e1af20629898a017d635e9fec2bbf6e10 SHA512 62e4cca1df35d0889f06667cc2cb4498d818d555fea5a71a0cd924acc25eec25bf1e292a56f448b0339dbacd39f790502da239d8bb61c9500d58ac5c2a2d4118 -EBUILD rspamd-1.7.1.ebuild 1868 BLAKE2B b96b526ad711af5be848b9fe6ae541aec4fd05ff6b49ddaa6e39a7f5c6d208b2a48f3f650371bd4bff86d88a11e8eaedded27e903677d4d7445953b8138daab2 SHA512 9169fdab9007c470f68d4e9f227a6769dbdbad9e51bb3f8c5fb3ceb220cbc97fc65bfb6df27e45276816da7f10793f6c87c9f41df1c27fe8bd2b3d3d016fb46e -EBUILD rspamd-1.7.2.ebuild 1975 BLAKE2B 8ed2fa843435751c54b1e3bcc1701e3915b39d2967403fd74374cce8b20c26e4334239dda05041967d8fc266f1e7e76270d4cca28dc3cfa7f45f7bb990cd2e3d SHA512 da8518a050e62b815c7c2742ccfdfedd431299d6906bc840cc6cecb0fd05e51620475da63929eca5208ffd3d87eb3e36afd6d315619703059ef50f3f19170207 -EBUILD rspamd-1.7.5.ebuild 2158 BLAKE2B d1c19e91d0f1a1c886ca4173436003e3fb69511fd10a1ff4b6c09da8c978e0fd1bcf7c7e5d22bcef0771a6024616ea52ad5b586b492a67433281a3435d834b1e SHA512 063c50d3ae63e8811ea2d115250cbd08d8963e39e9259ad35140a8b6c8faf40820ae238b18d098c206d4b2969169ddbdda617a0244671e2b761227627342b247 -EBUILD rspamd-1.7.7.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0 -EBUILD rspamd-1.7.8.ebuild 2139 BLAKE2B 0352647a74ab84ba452f37f9c8a971f899dddb4ad61779ae8096794d63ede23729b3723700b28824f270761624230a3da8dbff5a83ccc1b1bda5232ce8ef9414 SHA512 bf624d2c221b4422180a09d4599c91c10e9cc2c204cc26d7fbcb258becbd96b2e1822b45ae65e97cb93db40737400d77e3bdd8e48ed5a9129d9bd6cd70ecacc8 -EBUILD rspamd-1.7.9.ebuild 2175 BLAKE2B 52ec154fc0bb61b361aa6fde7fe261e4c095f5a3a0de0c5f96f30ac23dfc50188d78ed354ff5033bf65e65f9c747c6d85dd7d5bc8f1612453201029237cf0bd5 SHA512 534cd4d4977c54a77283c646ad1c3146bb9dac3b39ff55d00a8cc09d91274060eaedf215ad62bd4c75debceec41b53cef5ec9d718ed452a9317183a8b7a3b2f0 -EBUILD rspamd-1.8.1.ebuild 2117 BLAKE2B e804856dafe84fae5ee9511965c20f4701b19ad14e727f372f0243f06c808c498c54b072fedd83242529f44573558aee6256d6649bb3d1796d46079f7260baff SHA512 811e35d2b63e8aebdec31a14f224d455670ff54996b69fa81b1979236f0eb71f1424f364ae3e66504a33611de618301258c649d4c494d930cf121c414ac53bfa EBUILD rspamd-1.8.3.ebuild 2315 BLAKE2B ab1addaef1d8b0df9d8e4a91ca13f189101a447906f97e97913224b5fe3b4fd2b8447a9348450793d6e2a654807b7a722f1852ba1252b845baae5fde45e3b939 SHA512 b0dd11c1b5576ad96ac73241cc08433707a2167ff3ee3095d4b752e1b68f2dde1d7584aa4750ac94332ddcde7a0eeb60ce597709dc995f2643cf3e7a91f432ce EBUILD rspamd-1.9.0.ebuild 2242 BLAKE2B f294fc165ccf83af918e37b5f4659bbca79e1fae2b378d4c7218074dcac318c3faea6ef10eb59bff59fc4ca3ea5115182d53948debdc6314ee457d70598a4df8 SHA512 c6f28512d0dee9213dcd48d7df0c3672c2f86d520090ed392efaa0c27ac0e27653ce487e5570953d34b50d6bfbc2c74d282f3ecd8d67acf1b5874f55c7f59797 EBUILD rspamd-9999.ebuild 2242 BLAKE2B f294fc165ccf83af918e37b5f4659bbca79e1fae2b378d4c7218074dcac318c3faea6ef10eb59bff59fc4ca3ea5115182d53948debdc6314ee457d70598a4df8 SHA512 c6f28512d0dee9213dcd48d7df0c3672c2f86d520090ed392efaa0c27ac0e27653ce487e5570953d34b50d6bfbc2c74d282f3ecd8d67acf1b5874f55c7f59797 diff --git a/mail-filter/rspamd/files/1.6.6-dont-send-reject-message-after-set-reply.patch b/mail-filter/rspamd/files/1.6.6-dont-send-reject-message-after-set-reply.patch deleted file mode 100644 index 4238c838dfa9..000000000000 --- a/mail-filter/rspamd/files/1.6.6-dont-send-reject-message-after-set-reply.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 2bda2989eee893c42ff04f48a904f00a33a7d07a Mon Sep 17 00:00:00 2001 -From: Vsevolod Stakhov <vsevolod@highsecure.ru> -Date: Tue, 27 Feb 2018 16:37:44 +0000 -Subject: [PATCH] [CritFix] Do not send reject messages after set reply - -Libmilter seems to be totally brain damaged: -https://github.com/freebsd/freebsd/blob/386ddae58459341ec567604707805814a2128a57/contrib/sendmail/libmilter/engine.c#L66 - ---- - src/libserver/milter.c | 22 ++++++++++++++++++---- - 1 file changed, 18 insertions(+), 4 deletions(-) - - Back-ported for rspamd 1.5.6 - -diff -ur rspamd-1.6.6/src/libserver/milter.c rspamd-1.6.6-badmilter/src/libserver/milter.c ---- rspamd-1.6.6/src/libserver/milter.c 2018-02-16 13:47:47.000000000 +0000 -+++ rspamd-1.6.6-badmilter/src/libserver/milter.c 2018-03-07 16:07:58.591483869 +0000 -@@ -99,6 +99,8 @@ - guint i; - - if (how & RSPAMD_MILTER_RESET_IO) { -+ msg_debug_milter ("cleanup IO on abort"); -+ - DL_FOREACH_SAFE (priv->out_chain, obuf, obuf_tmp) { - rspamd_milter_obuf_free (obuf); - } -@@ -111,8 +113,11 @@ - } - - if (how & RSPAMD_MILTER_RESET_COMMON) { -+ msg_debug_milter ("cleanup common data on abort"); -+ - if (session->message) { - session->message->len = 0; -+ msg_debug_milter ("cleanup message on abort"); - } - - if (session->rcpts) { -@@ -120,30 +125,38 @@ - rspamd_email_address_unref (cur); - } - -+ msg_debug_milter ("cleanup %d recipients on abort", -+ (gint)session->rcpts->len); -+ - g_ptr_array_free (session->rcpts, TRUE); - session->rcpts = NULL; - } - - if (session->from) { -+ msg_debug_milter ("cleanup from"); - rspamd_email_address_unref (session->from); - session->from = NULL; - } - - if (session->helo) { -+ msg_debug_milter ("cleanup helo"); - session->helo->len = 0; - } - - if (session->hostname) { -+ msg_debug_milter ("cleanup hostname"); - session->hostname->len = 0; - } - - if (priv->headers) { -+ msg_debug_milter ("cleanup headers"); - g_hash_table_remove_all (priv->headers); - } - } - - if (how & RSPAMD_MILTER_RESET_ADDR) { - if (session->addr) { -+ msg_debug_milter ("cleanup addr"); - rspamd_inet_address_free (session->addr); - session->addr = NULL; - } -@@ -151,6 +164,7 @@ - - if (how & RSPAMD_MILTER_RESET_MACRO) { - if (session->macros) { -+ msg_debug_milter ("cleanup macros"); - g_hash_table_unref (session->macros); - session->macros = NULL; - } -@@ -1612,7 +1626,7 @@ - msg_err_milter ("cannot find scan results, tempfail"); - rspamd_milter_send_action (session, RSPAMD_MILTER_TEMPFAIL); - -- return; -+ goto cleanup; - } - - elt = ucl_object_lookup (results, "action"); -@@ -1621,7 +1635,7 @@ - msg_err_milter ("cannot find action in results, tempfail"); - rspamd_milter_send_action (session, RSPAMD_MILTER_TEMPFAIL); - -- return; -+ goto cleanup; - } - - rspamd_action_from_str (ucl_object_tostring (elt), &action); -@@ -1681,7 +1695,6 @@ - } - - rspamd_milter_set_reply (session, rcode, xcode, reply); -- rspamd_milter_send_action (session, RSPAMD_MILTER_REJECT); - } - break; - case METRIC_ACTION_SOFT_REJECT: -@@ -1696,7 +1709,6 @@ - } - - rspamd_milter_set_reply (session, rcode, xcode, reply); -- rspamd_milter_send_action (session, RSPAMD_MILTER_REJECT); - break; - - case METRIC_ACTION_REWRITE_SUBJECT: -@@ -1741,6 +1753,8 @@ - rspamd_fstring_free (rcode); - rspamd_fstring_free (xcode); - rspamd_fstring_free (reply); -+ -+ rspamd_milter_session_reset (session, RSPAMD_MILTER_RESET_ABORT); - } - - void diff --git a/mail-filter/rspamd/files/rspamd.init-r5 b/mail-filter/rspamd/files/rspamd.init-r5 deleted file mode 100644 index 6d249f3f9051..000000000000 --- a/mail-filter/rspamd/files/rspamd.init-r5 +++ /dev/null @@ -1,48 +0,0 @@ -#!/sbin/openrc-run -# Copyright 2015-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -extra_commands="checkconfig" -extra_started_commands="reload" - -RUNDIR=/var/run/rspamd -PIDFILE=$RUNDIR/rspamd.pid - -depend() { - need net -} - -checkconfig() { - /usr/bin/rspamadm configtest -c /etc/rspamd/rspamd.conf > /dev/null \ - || return 1 -} - -start() { - checkconfig || return 1 - ebegin "Starting ${SVCNAME}" - - checkpath -d $RUNDIR -m 2750 -o rspamd:rspamd - rm -f $RUNDIR/$SVCNAME.sock - - start-stop-daemon --start --quiet --pidfile $PIDFILE -u rspamd -g rspamd \ - --exec /usr/bin/rspamd - eend $? -} - -stop() { - if [ "${RC_CMD}" = "restart" ] ; then - checkconfig || return 1 - fi - - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE \ - --exec /usr/bin/rspamd - eend $? -} - -reload() { - checkconfig || return 1 - ebegin "Reloading ${SVCNAME}" - start-stop-daemon --signal HUP --quiet --pidfile $PIDFILE - eend $? -} diff --git a/mail-filter/rspamd/files/rspamd.logrotate b/mail-filter/rspamd/files/rspamd.logrotate deleted file mode 100644 index 81400efc8914..000000000000 --- a/mail-filter/rspamd/files/rspamd.logrotate +++ /dev/null @@ -1,12 +0,0 @@ -/var/log/rspamd/rspamd.log { - daily - rotate 4 - delaycompress - compress - notifempty - missingok - postrotate - test -r /run/rspamd/rspamd.pid && kill -USR1 $(cat /run/rspamd/rspamd.pid) &>/dev/null - endscript -} - diff --git a/mail-filter/rspamd/rspamd-1.6.5.ebuild b/mail-filter/rspamd/rspamd-1.6.5.ebuild deleted file mode 100644 index 766acc60764a..000000000000 --- a/mail-filter/rspamd/rspamd-1.6.5.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils pax-utils user systemd - -DESCRIPTION="Rapid spam filtering system" -SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="https://github.com/vstakhov/rspamd" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2" - -RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - fann? ( sci-mathematics/fann ) - pcre2? ( dev-libs/libpcre2[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] ) - jit? ( dev-lang/luajit:2 ) - jemalloc? ( dev-libs/jemalloc ) - dev-libs/libevent - dev-db/sqlite:3 - dev-libs/glib:2 - <dev-util/ragel-7.0 - sys-apps/file - gd? ( media-libs/gd[jpeg] ) - dev-libs/icu - cpu_flags_x86_ssse3? ( dev-libs/hyperscan )" -DEPEND="dev-util/ragel - ${RDEPEND}" - -QA_MULTILIB_PATHS="usr/lib/rspamd/.*" - -pkg_setup() { - enewgroup rspamd - enewuser rspamd -1 -1 /var/lib/rspamd rspamd -} - -src_configure() { - local mycmakeargs=( - -DCONFDIR=/etc/rspamd - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - -DENABLE_LUAJIT=$(usex jit ON OFF) - -DENABLE_FANN=$(usex fann ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}/rspamd.init-r5" rspamd - - # Remove mprotect for JIT support - if use jit; then - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die - fi - - dodir /var/lib/rspamd - dodir /var/log/rspamd - - fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd - - insinto /etc/logrotate.d - newins "${FILESDIR}/rspamd.logrotate" rspamd - - systemd_newunit rspamd.service rspamd.service -} diff --git a/mail-filter/rspamd/rspamd-1.6.6.ebuild b/mail-filter/rspamd/rspamd-1.6.6.ebuild deleted file mode 100644 index 8ded37e068e3..000000000000 --- a/mail-filter/rspamd/rspamd-1.6.6.ebuild +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils pax-utils user systemd - -DESCRIPTION="Rapid spam filtering system" -SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="https://github.com/vstakhov/rspamd" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2" - -RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - fann? ( sci-mathematics/fann ) - pcre2? ( dev-libs/libpcre2[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] ) - jit? ( dev-lang/luajit:2 ) - jemalloc? ( dev-libs/jemalloc ) - dev-libs/libevent - dev-db/sqlite:3 - dev-libs/glib:2 - <dev-util/ragel-7.0 - sys-apps/file - gd? ( media-libs/gd[jpeg] ) - dev-libs/icu - cpu_flags_x86_ssse3? ( dev-libs/hyperscan )" -DEPEND="dev-util/ragel - ${RDEPEND}" - -QA_MULTILIB_PATHS="usr/lib/rspamd/.*" -PATCHES=( "${FILESDIR}/${PV}-dont-send-reject-message-after-set-reply.patch" ) - -pkg_setup() { - enewgroup rspamd - enewuser rspamd -1 -1 /var/lib/rspamd rspamd -} - -src_configure() { - local mycmakeargs=( - -DCONFDIR=/etc/rspamd - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - -DENABLE_LUAJIT=$(usex jit ON OFF) - -DENABLE_FANN=$(usex fann ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}/rspamd.init-r5" rspamd - - # Remove mprotect for JIT support - if use jit; then - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die - fi - - dodir /var/lib/rspamd - dodir /var/log/rspamd - - fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd - - insinto /etc/logrotate.d - newins "${FILESDIR}/rspamd.logrotate" rspamd - - systemd_newunit rspamd.service rspamd.service -} diff --git a/mail-filter/rspamd/rspamd-1.7.1.ebuild b/mail-filter/rspamd/rspamd-1.7.1.ebuild deleted file mode 100644 index 09bee4813a49..000000000000 --- a/mail-filter/rspamd/rspamd-1.7.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils pax-utils user systemd - -DESCRIPTION="Rapid spam filtering system" -SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="https://github.com/vstakhov/rspamd" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2" - -RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - fann? ( sci-mathematics/fann ) - pcre2? ( dev-libs/libpcre2[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] ) - jit? ( dev-lang/luajit:2 ) - jemalloc? ( dev-libs/jemalloc ) - dev-libs/libevent - dev-db/sqlite:3 - dev-libs/glib:2 - <dev-util/ragel-7.0 - sys-apps/file - gd? ( media-libs/gd[jpeg] ) - dev-libs/icu - cpu_flags_x86_ssse3? ( dev-libs/hyperscan )" -DEPEND="dev-util/ragel - ${RDEPEND}" - -QA_MULTILIB_PATHS="usr/lib/rspamd/.*" - -pkg_setup() { - enewgroup rspamd - enewuser rspamd -1 -1 /var/lib/rspamd rspamd -} - -src_configure() { - local mycmakeargs=( - -DCONFDIR=/etc/rspamd - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - -DENABLE_LUAJIT=$(usex jit ON OFF) - -DENABLE_FANN=$(usex fann ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}/rspamd.init-r5" rspamd - - # Remove mprotect for JIT support - if use jit; then - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die - fi - - dodir /var/lib/rspamd - dodir /var/log/rspamd - - fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd - - insinto /etc/logrotate.d - newins "${FILESDIR}/rspamd.logrotate" rspamd - - systemd_newunit rspamd.service rspamd.service -} diff --git a/mail-filter/rspamd/rspamd-1.7.2.ebuild b/mail-filter/rspamd/rspamd-1.7.2.ebuild deleted file mode 100644 index 8c2de174e29c..000000000000 --- a/mail-filter/rspamd/rspamd-1.7.2.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils pax-utils user systemd - -DESCRIPTION="Rapid spam filtering system" -SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" -HOMEPAGE="https://github.com/vstakhov/rspamd" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch" -REQUIRED_USE="torch? ( jit )" - -RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - fann? ( sci-mathematics/fann ) - pcre2? ( dev-libs/libpcre2[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] ) - jit? ( dev-lang/luajit:2 ) - jemalloc? ( dev-libs/jemalloc ) - dev-libs/libevent - dev-db/sqlite:3 - dev-libs/glib:2 - <dev-util/ragel-7.0 - sys-apps/file - gd? ( media-libs/gd[jpeg] ) - dev-libs/icu - cpu_flags_x86_ssse3? ( dev-libs/hyperscan )" -DEPEND="dev-util/ragel - ${RDEPEND}" - -QA_MULTILIB_PATHS="usr/lib/rspamd/.*" - -pkg_setup() { - enewgroup rspamd - enewuser rspamd -1 -1 /var/lib/rspamd rspamd -} - -src_configure() { - local mycmakeargs=( - -DCONFDIR=/etc/rspamd - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - -DENABLE_LUAJIT=$(usex jit ON OFF) - -DENABLE_FANN=$(usex fann ON OFF) - -DENABLE_GD=$(usex gd ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) - -DENABLE_TORCH=$(usex torch ON OFF) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}/rspamd.init-r5" rspamd - - # Remove mprotect for JIT support - if use jit; then - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die - fi - - dodir /var/lib/rspamd - dodir /var/log/rspamd - - fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd - - insinto /etc/logrotate.d - newins "${FILESDIR}/rspamd.logrotate" rspamd - - systemd_newunit rspamd.service rspamd.service -} diff --git a/mail-filter/rspamd/rspamd-1.7.5.ebuild b/mail-filter/rspamd/rspamd-1.7.5.ebuild deleted file mode 100644 index 1a20cc22321c..000000000000 --- a/mail-filter/rspamd/rspamd-1.7.5.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git" -fi - -inherit cmake-utils user systemd pax-utils ${SCM} - -DESCRIPTION="Rapid spam filtering system" -HOMEPAGE="https://github.com/vstakhov/rspamd" - -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch" -REQUIRED_USE="torch? ( jit )" - -RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - fann? ( sci-mathematics/fann ) - pcre2? ( dev-libs/libpcre2[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] ) - jit? ( dev-lang/luajit:2 ) - jemalloc? ( dev-libs/jemalloc ) - dev-libs/libevent - dev-db/sqlite:3 - dev-libs/glib:2 - <dev-util/ragel-7.0 - sys-apps/file - gd? ( media-libs/gd[jpeg] ) - dev-libs/icu - cpu_flags_x86_ssse3? ( dev-libs/hyperscan )" -DEPEND="dev-util/ragel - ${RDEPEND}" - -QA_MULTILIB_PATHS="usr/lib/rspamd/.*" - -pkg_setup() { - enewgroup rspamd - enewuser rspamd -1 -1 /var/lib/rspamd rspamd -} - -src_configure() { - local mycmakeargs=( - -DCONFDIR=/etc/rspamd - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - -DENABLE_LUAJIT=$(usex jit ON OFF) - -DENABLE_FANN=$(usex fann ON OFF) - -DENABLE_GD=$(usex gd ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) - -DENABLE_TORCH=$(usex torch ON OFF) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}/rspamd.init-r5" rspamd - - # Remove mprotect for JIT support - if use jit; then - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die - fi - - keepdir /var/lib/rspamd - keepdir /var/log/rspamd - - fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd - - insinto /etc/logrotate.d - newins "${FILESDIR}/rspamd.logrotate" rspamd - - systemd_newunit rspamd.service rspamd.service -} diff --git a/mail-filter/rspamd/rspamd-1.7.7.ebuild b/mail-filter/rspamd/rspamd-1.7.7.ebuild deleted file mode 100644 index e4b16db1465f..000000000000 --- a/mail-filter/rspamd/rspamd-1.7.7.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git" -fi - -inherit cmake-utils user systemd pax-utils ${SCM} - -DESCRIPTION="Rapid spam filtering system" -HOMEPAGE="https://github.com/vstakhov/rspamd" - -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch" -REQUIRED_USE="torch? ( jit )" - -RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - fann? ( sci-mathematics/fann ) - pcre2? ( dev-libs/libpcre2[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] ) - jit? ( dev-lang/luajit:2 ) - jemalloc? ( dev-libs/jemalloc ) - dev-libs/libevent - net-libs/libnsl - dev-db/sqlite:3 - dev-libs/glib:2 - <dev-util/ragel-7.0 - sys-apps/file - gd? ( media-libs/gd[jpeg] ) - dev-libs/icu - cpu_flags_x86_ssse3? ( dev-libs/hyperscan )" -DEPEND="dev-util/ragel - ${RDEPEND}" - -QA_MULTILIB_PATHS="usr/lib/rspamd/.*" - -pkg_setup() { - enewgroup rspamd - enewuser rspamd -1 -1 /var/lib/rspamd rspamd -} - -src_configure() { - local mycmakeargs=( - -DCONFDIR=/etc/rspamd - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - -DENABLE_LUAJIT=$(usex jit ON OFF) - -DENABLE_FANN=$(usex fann ON OFF) - -DENABLE_GD=$(usex gd ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) - -DENABLE_TORCH=$(usex torch ON OFF) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}/rspamd.init-r5" rspamd - - # Remove mprotect for JIT support - if use jit; then - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die - fi - - keepdir /var/lib/rspamd - keepdir /var/log/rspamd - - fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd - - insinto /etc/logrotate.d - newins "${FILESDIR}/rspamd.logrotate" rspamd - - systemd_newunit rspamd.service rspamd.service -} diff --git a/mail-filter/rspamd/rspamd-1.7.8.ebuild b/mail-filter/rspamd/rspamd-1.7.8.ebuild deleted file mode 100644 index 9ba47fbeea38..000000000000 --- a/mail-filter/rspamd/rspamd-1.7.8.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils user systemd pax-utils ${SCM} - -DESCRIPTION="Rapid spam filtering system" -HOMEPAGE="https://github.com/vstakhov/rspamd" - -if [[ ${PV} == *9999 ]]; then - SRC_URI="" - KEYWORDS="" - SCM="git-r3" - EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git" -else - SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch" -REQUIRED_USE="torch? ( jit )" - -RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - fann? ( sci-mathematics/fann ) - pcre2? ( dev-libs/libpcre2[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] ) - jit? ( dev-lang/luajit:2 ) - jemalloc? ( dev-libs/jemalloc ) - dev-libs/libevent - net-libs/libnsl - dev-db/sqlite:3 - dev-libs/glib:2 - <dev-util/ragel-7.0 - sys-apps/file - gd? ( media-libs/gd[jpeg] ) - dev-libs/icu - cpu_flags_x86_ssse3? ( dev-libs/hyperscan )" -DEPEND="dev-util/ragel - ${RDEPEND}" - -QA_MULTILIB_PATHS="usr/lib/rspamd/.*" - -pkg_setup() { - enewgroup rspamd - enewuser rspamd -1 -1 /var/lib/rspamd rspamd -} - -src_configure() { - local mycmakeargs=( - -DCONFDIR=/etc/rspamd - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - -DENABLE_LUAJIT=$(usex jit ON OFF) - -DENABLE_FANN=$(usex fann ON OFF) - -DENABLE_GD=$(usex gd ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) - -DENABLE_TORCH=$(usex torch ON OFF) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}/rspamd.init-r5" rspamd - - # Remove mprotect for JIT support - if use jit; then - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die - fi - - keepdir /var/lib/rspamd - keepdir /var/log/rspamd - - fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd - - insinto /etc/logrotate.d - newins "${FILESDIR}/rspamd.logrotate" rspamd - - systemd_newunit rspamd.service rspamd.service -} diff --git a/mail-filter/rspamd/rspamd-1.7.9.ebuild b/mail-filter/rspamd/rspamd-1.7.9.ebuild deleted file mode 100644 index e4b16db1465f..000000000000 --- a/mail-filter/rspamd/rspamd-1.7.9.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git" -fi - -inherit cmake-utils user systemd pax-utils ${SCM} - -DESCRIPTION="Rapid spam filtering system" -HOMEPAGE="https://github.com/vstakhov/rspamd" - -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch" -REQUIRED_USE="torch? ( jit )" - -RDEPEND="!libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - fann? ( sci-mathematics/fann ) - pcre2? ( dev-libs/libpcre2[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] ) - jit? ( dev-lang/luajit:2 ) - jemalloc? ( dev-libs/jemalloc ) - dev-libs/libevent - net-libs/libnsl - dev-db/sqlite:3 - dev-libs/glib:2 - <dev-util/ragel-7.0 - sys-apps/file - gd? ( media-libs/gd[jpeg] ) - dev-libs/icu - cpu_flags_x86_ssse3? ( dev-libs/hyperscan )" -DEPEND="dev-util/ragel - ${RDEPEND}" - -QA_MULTILIB_PATHS="usr/lib/rspamd/.*" - -pkg_setup() { - enewgroup rspamd - enewuser rspamd -1 -1 /var/lib/rspamd rspamd -} - -src_configure() { - local mycmakeargs=( - -DCONFDIR=/etc/rspamd - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - -DENABLE_LUAJIT=$(usex jit ON OFF) - -DENABLE_FANN=$(usex fann ON OFF) - -DENABLE_GD=$(usex gd ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) - -DENABLE_TORCH=$(usex torch ON OFF) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}/rspamd.init-r5" rspamd - - # Remove mprotect for JIT support - if use jit; then - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* || die - fi - - keepdir /var/lib/rspamd - keepdir /var/log/rspamd - - fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd - - insinto /etc/logrotate.d - newins "${FILESDIR}/rspamd.logrotate" rspamd - - systemd_newunit rspamd.service rspamd.service -} diff --git a/mail-filter/rspamd/rspamd-1.8.1.ebuild b/mail-filter/rspamd/rspamd-1.8.1.ebuild deleted file mode 100644 index 40d3b5290825..000000000000 --- a/mail-filter/rspamd/rspamd-1.8.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -if [[ ${PV} == *9999 ]] ; then - SCM="git-r3" - EGIT_REPO_URI="https://github.com/vstakhov/rspamd.git" -fi - -inherit cmake-utils pax-utils systemd user ${SCM} - -DESCRIPTION="Rapid spam filtering system" -HOMEPAGE="https://github.com/vstakhov/rspamd" - -if [[ ${PV} == *9999 ]] ; then - SRC_URI="" - KEYWORDS="" -else - SRC_URI="https://github.com/vstakhov/rspamd/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="cpu_flags_x86_ssse3 fann gd jemalloc +jit libressl pcre2 +torch" -REQUIRED_USE="torch? ( jit )" - -RDEPEND="dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/icu:= - dev-libs/libevent:= - net-libs/libnsl - sys-apps/file - <dev-util/ragel-7.0 - cpu_flags_x86_ssse3? ( dev-libs/hyperscan ) - fann? ( sci-mathematics/fann ) - gd? ( media-libs/gd[jpeg] ) - jemalloc? ( dev-libs/jemalloc ) - jit? ( dev-lang/luajit:2 ) - !libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - pcre2? ( dev-libs/libpcre2[jit=] ) - !pcre2? ( dev-libs/libpcre[jit=] )" -DEPEND="${RDEPEND}" - -pkg_setup() { - enewgroup rspamd - enewuser rspamd -1 -1 /var/lib/rspamd rspamd -} - -src_configure() { - local mycmakeargs=( - -DCONFDIR=/etc/rspamd - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - -DENABLE_LUAJIT=$(usex jit ON OFF) - -DENABLE_FANN=$(usex fann ON OFF) - -DENABLE_GD=$(usex gd ON OFF) - -DENABLE_PCRE2=$(usex pcre2 ON OFF) - -DENABLE_JEMALLOC=$(usex jemalloc ON OFF) - -DENABLE_HYPERSCAN=$(usex cpu_flags_x86_ssse3 ON OFF) - -DENABLE_TORCH=$(usex torch ON OFF) - ) - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - newinitd "${FILESDIR}/rspamd.init-r5" rspamd - - # Remove mprotect for JIT support - if use jit; then - pax-mark m "${ED}"/usr/bin/rspamd-* "${ED}"/usr/bin/rspamadm-* - fi - - keepdir /var/lib/rspamd - keepdir /var/log/rspamd - - fowners rspamd:rspamd /var/lib/rspamd /var/log/rspamd - - insinto /etc/logrotate.d - newins "${FILESDIR}/rspamd.logrotate" rspamd - - systemd_newunit rspamd.service rspamd.service -} |