summaryrefslogtreecommitdiff
path: root/net-ftp
diff options
context:
space:
mode:
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/Manifest.gzbin3180 -> 3177 bytes
-rw-r--r--net-ftp/proftpd/Manifest6
-rw-r--r--net-ftp/proftpd/files/proftpd-1.3.9-clamav-debool.patch82
-rw-r--r--net-ftp/proftpd/files/proftpd-1.3.9-clamav-refresh-api.patch24
-rw-r--r--net-ftp/proftpd/files/proftpd-1.3.9-gss-refresh-api.patch87
-rw-r--r--net-ftp/proftpd/proftpd-1.3.9-r1.ebuild (renamed from net-ftp/proftpd/proftpd-1.3.9.ebuild)20
6 files changed, 209 insertions, 10 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index f63256e78fbc..d7aa512cb3c8 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
Binary files differ
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 8ec313999927..adf6620e7698 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -5,6 +5,9 @@ AUX proftpd-1.3.6_rc4-msg-refresh-api.patch 903 BLAKE2B e335f81685552b0b9a05af37
AUX proftpd-1.3.6_rc4-vroot-refresh-api.patch 736 BLAKE2B 9f3c4a1f80a27ce7e6f9348153584bc1134e63ad4c839927b7680439966003c76c7a25821be0f3431c472092ef5c8386166b372645f498fb655559fd683c3e6e SHA512 9cd98e2fb8c17d2ca38f5f7a20f5c6ffb03da7f51e53542237992bd2b98b2ef5b5fc0634cd7f5eef24fba8a601703b70ff7d0404e1c5103394e9fda260b815cd
AUX proftpd-1.3.8-configure-clang16.patch 5872 BLAKE2B 4aeec52bbdebb5029e375c65a49bbb6a787ed9ca8e595e34c21f944d84ca9e47a05e6cc3d8510aa75e6ceddf8e08cac4af452200d9aa8c5b3889fdde972bdfb7 SHA512 91d6f9752bee6f3a5f78e85dcf0fba542ee06d2ed4f53b9c7c220cf011319b5ebcb352995a2a5887f0189abe68fe6bf27387635e55bfa477f96a71d83b38a96a
AUX proftpd-1.3.8a-configure-c99.patch 1003 BLAKE2B 4958cb7ca0735b245672d0bc92f2d6ec68b3d4dc35fc1c36a7aca3c48b00ecc6ec42bd5857db3f4696cdccf5ea81520237b80a751004bcf53f041140dac83310 SHA512 e73fe25afd5e55d4fbc82833954ba6c9a981a09500f337a7c092670ca72bad2c11f45dbd5ed45027cd6c0474b26d3c2620f6a84490515b971783b954ba70849a
+AUX proftpd-1.3.9-clamav-debool.patch 2695 BLAKE2B 30c37a0e1b9c19d3278359f850224b6f3640c61294f04a69413382fe088591d84515a4f24fc0a5db40ae6105313999b91aef564bf422a944e16cb2bc8ad54e92 SHA512 121bff877fa18bcc603e17347f346767d9ed0494df065ed4c7b5baf5fbd98fb5b73d303ed32c2892d753bb6204a7a86d171ed76c4b2b907dc2206efe3848027a
+AUX proftpd-1.3.9-clamav-refresh-api.patch 861 BLAKE2B 52d12259b8b783e1fe54d1cb6833ac27462a529577577a6bdbfb34a29d5d409941d209d86399fa729a4e219b5074d05ac80d904b50258dbfce62e3488c9fa6a8 SHA512 bd0e9224957b898a580e40138a1d97485ae8727b277f11a128e5df0113d52efd634e851c621591f1af0dd8dc666f7660d25b672a09e5f6ef8d4af3fc8bfea401
+AUX proftpd-1.3.9-gss-refresh-api.patch 2360 BLAKE2B 4325c25ff9207afd4ed3a920edb8ec8c4b7c74740575f99325f1a67de948ca0d1fa64a222442c547ee36bdaca6c06950d9d1cdd219d2fdfc4166b21ea667959c SHA512 3db34d5ba2714e245ad705d792a64f8beda71bc697f4b26e635b389e774c08410a04f3fd54a943b34a4beead5e6977150626687b83bcf73bf2768240078d27d5
AUX proftpd-tmpfiles.d.conf 34 BLAKE2B 03da2e04c7e0d4c6e889e4414a205942f0762a1ae856d16f95abb1d2e927d68f583ad5bbdbf142b32b141cd82e9288f2ef1faf459cbe8433e2e1127d3b30d686 SHA512 aa6ffbf15e4275941837306259fb426608e82e45a2da4b99c5d7778d11b8c9341e3a12ae9b751d0e173635239b6f1b20f0431be17296c005a83525a48327fa52
AUX proftpd-tmpfiles.d.conf-r1 30 BLAKE2B 0eb931370872ef78732d23179f20a3fe1289f8e601478c1b4709755748416f9283cdadcb2c43765019a9f6b5407e7c9db1aba8b1c1524db1e702b52898aa7602 SHA512 c85a6bc1375ebb44d88114c5c6f46d9c2e207e9d9555d9dc599f69a6485e2d5b2a161ac151f8b9e76f8e385f9dc3b811128db68f5d45648d960c8e8fbeb0050b
AUX proftpd.conf.sample 1275 BLAKE2B db10306f79544b344856e065946e9ae0fa37d43507185f7d2407f23a962750a05bb2682e7c97e3979ca42dfe35921c3db7e98c095431796d82144869df0e324e SHA512 1c26f3e98ed07d89192c640f7823af168c045abee6ab076791aee9d50be5446be870a189979df4b828e7ae907dd40a346f1b92998fa39195195bfada4061c5df
@@ -14,6 +17,7 @@ AUX proftpd.logrotate 237 BLAKE2B 755d6a369d510dde4e5ca7453fbc4117db4ee58b5ff5a7
AUX proftpd.service 196 BLAKE2B 89ef578220f97095a5ffd6b4f6d1880dfc26f54e1ac8667009f65da298fb6634f271a64e6593d78b5735069b4de8f8be73484fd97269c67f89573e8f7d434d5e SHA512 12ee7893d37a9d06140b5b6492be74308fe1165a741d4c1b6b690ab4b973f074cad8517fd36af54f2aa452494759d1534c11e70f7212cd55a37cfa439b953062
AUX proftpd.xinetd 295 BLAKE2B 4863cea66df5c32efba61647bbc854953dff28e154fab284c7e9f84efe3279a49c660ae37ef5b1410decdf32bb3061713e371fa3b529098848cae71f3e66d40d SHA512 a13d29ca2289f8bd58b4eb317683d57dfb7d608c53f163844349bbf0b896790f5e9f47a27eafda3b8fc78e60f4a0d6859da7c7ced7df852166cf0b8bcad876d4
DIST mod_case-0.9.1.tar.gz 22280 BLAKE2B f5cecaa81659eb37dbc378f3e9ad3a82cb927af3b9b5cb12d7c1949de167ab8699fab40436a9c53a9048d23e37e8d9cae3cc3fbc8e0160fde747ec03f8de8add SHA512 010fea310f320f7d3c117cb48cecdfc97764d0e4f0a0b487ea2441ca5d966b45fb5627f1349e9a237366342a6d15da4de490a023465f61a21d9a8abe6c7489dd
+DIST mod_diskuse-0.9.1.tar.gz 72314 BLAKE2B e80d196cd1d7ca2defed7baf9bc2d31ac85b2181ac7824aef690384ee8cd8ce4f256e44e27a0aa931b8ca0b94dc2076543e9d9ca909a807300ea74f3c05b63dd SHA512 6f662e0b2f5f43cd0d5ff77f00427c8c32475fe834a614154e135181f9b8efc46e76d77e7ed0e9d0d5197a445ee89576a6b97aa3fd76180ff394aa6168ffa1a5
DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef79dce7f51bcfed8dc726cb01a231232c65821ca3a240b77a5019fa22f31b45496c128a06627bd24dc960b566f SHA512 44615983b0f67939b110e54c4a83b3056263bad72ba78de1b16f9f8590f5504c60e679f55484708d49e694c528d4715d9abd0cb75cfe439982ea9e02e0c18891
DIST mod_msg-0.5.1.tar.gz 9689 BLAKE2B fc0cbcfa341c6339be4b064db9ea8860da91c22eeee91c77fd03581e49ebbce3fcd3a27a17da85d782286c6d329e12e7237ee7cbfb70ecc1d4d32bb21f0f74e2 SHA512 729261b151a98bc971c825e88131026725aa4f4fc161adc162af8c4c3c8a457bd981308aea20fe6a1b8711b26c63a17b8d40434ef00bc45504a7c9c2a9cbe4bf
DIST mod_vroot-0.9.12.tar.gz 112717 BLAKE2B 60a59539ff9db190432a807f88236e37ab42aea0510903586ff19a00ba9d2e118b58460bdef271f6de8f2b022411484d5fe6610d66552948a9ff459ddda45343 SHA512 a84c14b9d05c4890abe50c86f832c91fa4d0971bc2b1866a3a34d73ff85acd1e902fc0cae739e22ea46e530c73230fb005ea9edeb68fd6cfb963e0c5ca9655ec
@@ -25,5 +29,5 @@ DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cf
DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
EBUILD proftpd-1.3.8b-r1.ebuild 9000 BLAKE2B 2f9d00e13dc99c825eff81cf11f990cccf7e46f74e8ea721773808bba4fbc0d165e7f05e71039a82a927948320cd58abba140a809ee1a3e4638d953146f37c7b SHA512 5e174622c302d1ad4f1501611872e6a244d3e3e00c2f7f458d66a5fad4c23fc6321cca6d1006b6bf6b8177579b562dd73271342c8ef7d8e065abc54bf855cffe
-EBUILD proftpd-1.3.9.ebuild 8768 BLAKE2B 1e7adf26ca6d7f3f29a908c226ec1561a0b6601579158437562aef5a54814105d65b0b7a443102bdcee88d06cc5e0cabf8346847aa5482d78092f73575495ca6 SHA512 be1423af95ed43c82621106f1fca008bd35c4ee1b3cc1d913d7c1460e623a1898584599af15c37eddcd39994ad714069ce0a64a95bad4dcd026097c50bef5edb
+EBUILD proftpd-1.3.9-r1.ebuild 9151 BLAKE2B 01f44a6ea04a8a3b6e9bd587515af852a7df6d363bd1904daca2e7264f54414c26e8d731b3a219334687a3721c6d2848ac358eac151c76550335b7f6fbea5cd1 SHA512 3b33333ad94d298e4493664b6cf42a69d0bfe313dc4f56ff0c2c4d045d8d3d51ae6d9967c3de22df449337b2aa3a3583878699f5c3f4aafd670787c3c140491b
MISC metadata.xml 2793 BLAKE2B fa59abf255f37e7fb5442f6cb3c0234ac2eb5590a633f82ed0c8af6a4f6c534ecd3fbab8497d40d3e2d7117b4ca92fa9f8dbbd4c093c45cb45ce5f06f97d6974 SHA512 623e38d9da86cd996b22fcddbc5a04bd43655fc4a84e601ce112bdc2fa35eb94a0476382e3dd65d3fad412b916b9673d0f9edd3f328b5b9ce73998c7312ba745
diff --git a/net-ftp/proftpd/files/proftpd-1.3.9-clamav-debool.patch b/net-ftp/proftpd/files/proftpd-1.3.9-clamav-debool.patch
new file mode 100644
index 000000000000..3753d3ee937d
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.9-clamav-debool.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/953810
+https://github.com/jbenden/mod_clamav/pull/24/commits
+From ea822d6aa428b47aa9681d60af8d3c3d9eae0600 Mon Sep 17 00:00:00 2001
+From: TJ Saunders <tj@castaglia.org>
+Date: Sat, 12 Apr 2025 09:02:45 -0700
+Subject: [PATCH] Issue #23: Fix compilation with newer GCC versions, which
+complain of variables named `bool`.
+
+---
+ mod_clamav.c | 18 +++++++++---------
+ 1 file changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/mod_clamav.c b/mod_clamav.c
+index e25e99d..3be0ca6 100644
+--- a/mod_clamav.c
++++ b/mod_clamav.c
+@@ -667,18 +667,18 @@ static unsigned long parse_nbytes(char *nbytes_str, char *units_str) {
+ * Configuration setter: ClamAV
+ */
+ MODRET set_clamav(cmd_rec *cmd) {
+- int bool = -1;
++ int engine = -1;
+ config_rec *c = NULL;
+
+ CHECK_ARGS(cmd, 1);
+ CHECK_CONF(cmd, CONF_ROOT|CONF_LIMIT|CONF_VIRTUAL|CONF_GLOBAL|CONF_DIR);
+
+- if ((bool = get_boolean(cmd,1)) == -1)
++ if ((engine = get_boolean(cmd,1)) == -1)
+ CONF_ERROR(cmd, "expected Boolean parameter");
+
+ c = add_config_param(cmd->argv[0], 1, NULL);
+ c->argv[0] = pcalloc(c->pool, sizeof(unsigned char));
+- *((unsigned char *) c->argv[0]) = bool;
++ *((unsigned char *) c->argv[0]) = engine;
+ c->flags |= CF_MERGEDOWN;
+
+ return PR_HANDLED(cmd);
+@@ -688,18 +688,18 @@ MODRET set_clamav(cmd_rec *cmd) {
+ * Configuration setter: ClamStream
+ */
+ MODRET set_clamstream(cmd_rec *cmd) {
+- int bool = -1;
++ int use_stream = -1;
+ config_rec *c = NULL;
+
+ CHECK_ARGS(cmd, 1);
+ CHECK_CONF(cmd, CONF_ROOT|CONF_LIMIT|CONF_VIRTUAL|CONF_GLOBAL|CONF_DIR);
+
+- if ((bool = get_boolean(cmd,1)) == -1)
++ if ((use_stream = get_boolean(cmd,1)) == -1)
+ CONF_ERROR(cmd, "expected Boolean parameter");
+
+ c = add_config_param(cmd->argv[0], 1, NULL);
+ c->argv[0] = pcalloc(c->pool, sizeof(unsigned char));
+- *((unsigned char *) c->argv[0]) = bool;
++ *((unsigned char *) c->argv[0]) = use_stream;
+ c->flags |= CF_MERGEDOWN;
+
+ return PR_HANDLED(cmd);
+@@ -709,18 +709,18 @@ MODRET set_clamstream(cmd_rec *cmd) {
+ * Configuration setter: ClamFailsafe
+ */
+ MODRET set_clamfailsafe(cmd_rec *cmd) {
+- int bool = -1;
++ int use_failsafe = -1;
+ config_rec *c = NULL;
+
+ CHECK_ARGS(cmd, 1);
+ CHECK_CONF(cmd, CONF_ROOT|CONF_LIMIT|CONF_VIRTUAL|CONF_GLOBAL|CONF_DIR);
+
+- if ((bool = get_boolean(cmd, 1)) == -1)
++ if ((use_failsafe = get_boolean(cmd, 1)) == -1)
+ CONF_ERROR(cmd, "expected Boolean parameter");
+
+ c = add_config_param(cmd->argv[0], 1, NULL);
+ c->argv[0] = pcalloc(c->pool, sizeof(unsigned char));
+- *((unsigned char *) c->argv[0]) = bool;
++ *((unsigned char *) c->argv[0]) = use_failsafe;
+ c->flags |= CF_MERGEDOWN;
+
+ return PR_HANDLED(cmd);
diff --git a/net-ftp/proftpd/files/proftpd-1.3.9-clamav-refresh-api.patch b/net-ftp/proftpd/files/proftpd-1.3.9-clamav-refresh-api.patch
new file mode 100644
index 000000000000..f21cf4d49244
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.9-clamav-refresh-api.patch
@@ -0,0 +1,24 @@
+https://github.com/jbenden/mod_clamav/commit/509be57280634453be338b52d1bd0af212356587
+From 509be57280634453be338b52d1bd0af212356587 Mon Sep 17 00:00:00 2001
+From: offsides <josh@honorablemenschen.com>
+Date: Tue, 2 Jan 2024 17:21:37 -0500
+Subject: [PATCH] Update mod_clamav.c (#19)
+
+end_login is no longer defined in compat.h as of 1.3.9rc2, so the call needs to be replaced with pr_session_end
+---
+ mod_clamav.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mod_clamav.c b/mod_clamav.c
+index dcc4929..d39e347 100644
+--- a/mod_clamav.c
++++ b/mod_clamav.c
+@@ -239,7 +239,7 @@ static int clamavd_scan_stream(int sockd, const char *abs_filename,
+ buf = malloc(bufsz);
+ if (!buf) {
+ pr_log_pri(PR_LOG_CRIT, "Out of memory!");
+- end_login(1);
++ pr_session_end(1);
+ }
+
+ /* send file contents using protocol defined by Clamd */
diff --git a/net-ftp/proftpd/files/proftpd-1.3.9-gss-refresh-api.patch b/net-ftp/proftpd/files/proftpd-1.3.9-gss-refresh-api.patch
new file mode 100644
index 000000000000..ac05bb5bc8fb
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.9-gss-refresh-api.patch
@@ -0,0 +1,87 @@
+Fixes for old API, rename of bool for C23
+https://bugs.gentoo.org/953866
+--- a/mod_gss.c.in
++++ b/mod_gss.c.in
+@@ -1412,7 +1412,7 @@
+ }
+ /* If session.user is set, we had a valid login reinforce USER,PASS,ACCT*/
+ if (session.user) {
+- end_login(0);
++ pr_session_end(0);;
+ }
+
+ /* Convert the parameter to upper case */
+@@ -2126,18 +2126,18 @@
+
+ /* usage: GSSEngine on|off */
+ MODRET set_gssengine(cmd_rec *cmd) {
+- int bool = -1;
++ int Bool = -1;
+ config_rec *c = NULL;
+
+ CHECK_ARGS(cmd, 1);
+ CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
+
+- if ((bool = get_boolean(cmd, 1)) == -1)
++ if ((Bool = get_boolean(cmd, 1)) == -1)
+ CONF_ERROR(cmd, "expected Boolean parameter");
+
+ c = add_config_param(cmd->argv[0], 1, NULL);
+ c->argv[0] = pcalloc(c->pool, sizeof(unsigned char));
+- *((unsigned char *) c->argv[0]) = bool;
++ *((unsigned char *) c->argv[0]) = Bool;
+
+ return PR_HANDLED(cmd);
+ }
+@@ -2217,14 +2217,14 @@
+
+ /* usage: GSSRequired on|off|both|ctrl|control|data */
+ MODRET set_gssrequired(cmd_rec *cmd) {
+- int bool = -1;
++ int Bool = -1;
+ unsigned char on_ctrl = FALSE, on_data = FALSE;
+ config_rec *c = NULL;
+
+ CHECK_ARGS(cmd, 1);
+ CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
+
+- if ((bool = get_boolean(cmd, 1)) == -1) {
++ if ((Bool = get_boolean(cmd, 1)) == -1) {
+
+ if (!strcmp(cmd->argv[1], "control") || !strcmp(cmd->argv[1], "ctrl"))
+ on_ctrl = TRUE;
+@@ -2240,7 +2240,7 @@
+ CONF_ERROR(cmd, "bad parameter");
+
+ } else {
+- if (bool == TRUE) {
++ if (Bool == TRUE) {
+ on_ctrl = TRUE;
+ on_data = TRUE;
+ }
+@@ -2259,14 +2259,14 @@
+
+ /* usage: GSSInet6 on|off|yes|no*/
+ MODRET set_gss_af_inet6(cmd_rec *cmd) {
+- int bool = -1;
++ int Bool = -1;
+ unsigned char on_inet6 = FALSE;
+ config_rec *c = NULL;
+
+ CHECK_ARGS(cmd, 1);
+ CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL);
+
+- if ((bool = get_boolean(cmd, 1)) == -1) {
++ if ((Bool = get_boolean(cmd, 1)) == -1) {
+
+ if (!strcmp(cmd->argv[1], "on") || !strcmp(cmd->argv[1], "yes"))
+ on_inet6 = TRUE;
+@@ -2278,7 +2278,7 @@
+ CONF_ERROR(cmd, "bad parameter");
+
+ } else {
+- if (bool == TRUE)
++ if (Bool == TRUE)
+ on_inet6 = TRUE;
+ }
+
diff --git a/net-ftp/proftpd/proftpd-1.3.9.ebuild b/net-ftp/proftpd/proftpd-1.3.9-r1.ebuild
index 598d571660c6..4f0cca4bc62b 100644
--- a/net-ftp/proftpd/proftpd-1.3.9.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.9-r1.ebuild
@@ -7,7 +7,7 @@ inherit systemd tmpfiles toolchain-funcs
MOD_CASE="0.9.1"
MOD_CLAMAV="0.14rc2"
-MOD_DISKUSE="0.9"
+MOD_DISKUSE="0.9.1"
MOD_GSS="1.3.9"
MOD_MSG="0.5.1"
MOD_VROOT="0.9.12"
@@ -23,7 +23,7 @@ SRC_URI="
ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
case? ( https://github.com/Castaglia/${PN}-mod_case/archive/v${MOD_CASE}.tar.gz -> mod_case-${MOD_CASE}.tar.gz )
clamav? ( https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz )
- diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
+ diskuse? ( https://github.com/Castaglia/${PN}-mod_diskuse/archive/v${MOD_DISKUSE}.tar.gz -> mod_diskuse-${MOD_DISKUSE}.tar.gz )
kerberos? ( https://downloads.sourceforge.net/gssmod/mod_gss-${MOD_GSS}.tar.gz )
msg? ( https://github.com/Castaglia/${PN}-mod_msg/archive/v${MOD_MSG}.tar.gz -> mod_msg-${MOD_MSG}.tar.gz )
vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )
@@ -33,7 +33,7 @@ S="${WORKDIR}/${P/_/}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident
kerberos ldap log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
# Some tests are ran in chroot. Confuses sandbox.
@@ -114,18 +114,20 @@ src_prepare() {
fi
if use clamav ; then
+ in_dir mod_clamav-${MOD_CLAMAV} eapply "${FILESDIR}"/"${PN}"-1.3.9-clamav-refresh-api.patch
+ in_dir mod_clamav-${MOD_CLAMAV} eapply "${FILESDIR}"/"${PN}"-1.3.9-clamav-debool.patch
cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die
eapply -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.patch
fi
if use diskuse; then
- in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch
+ in_dir ${PN}-mod_diskuse-${MOD_DISKUSE} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch
# ./configure will modify files. Symlink them instead of copying
- ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die
+ ln -sv "${WORKDIR}"/${PN}-mod_diskuse-${MOD_DISKUSE}/mod_diskuse.h "${S}"/contrib || die
- cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die
- cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die
+ cp -v "${WORKDIR}"/${PN}-mod_diskuse-${MOD_DISKUSE}/mod_diskuse.c "${S}"/contrib || die
+ cp -v "${WORKDIR}"/${PN}-mod_diskuse-${MOD_DISKUSE}/mod_diskuse.html "${S}"/doc/contrib || die
fi
if use msg; then
@@ -139,6 +141,7 @@ src_prepare() {
if use kerberos ; then
# in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch
+ in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.9-gss-refresh-api.patch
# Support app-crypt/heimdal / Gentoo Bug #284853
sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die
@@ -175,7 +178,7 @@ src_configure() {
use ctrls && m="${m}:mod_ctrls_admin"
use deflate && m="${m}:mod_deflate"
if use diskuse ; then
- in_dir mod_diskuse econf
+ in_dir ${PN}-mod_diskuse-${MOD_DISKUSE} econf
m="${m}:mod_diskuse"
fi
use dynmasq && m="${m}:mod_dynmasq"
@@ -243,7 +246,6 @@ src_configure() {
$(use_enable ctrls)
$(use_enable dso)
$(use_enable ident)
- $(use_enable ipv6)
$(use_enable memcache)
$(use_enable ncurses)
$(use_enable nls)
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-20 17:30:27 +0000