Revbump to fix various bugs.

Package-Manager: portage-2.1.2_pre1

8 files changed, 369 insertions, 24 deletions

diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog
index 8aecea5c41e2..ae11659b2517 100644
--- a/net-ftp/proftpd/ChangeLog
+++ b/net-ftp/proftpd/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-ftp/proftpd
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.121 2006/09/23 18:17:38 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.122 2006/09/23 19:07:05 chtekk Exp $
+
+*proftpd-1.3.0-r2 (23 Sep 2006)
+
+  23 Sep 2006; Luca Longinotti <chtekk@gentoo.org>
+  +files/proftpd-1.3.0-mod_ctrls_sighup.patch, files/proftpd.rc6,
+  proftpd-1.2.10-r7.ebuild, proftpd-1.3.0-r1.ebuild,
+  +proftpd-1.3.0-r2.ebuild:
+  Fix redundant S definition. Update mod_clamav version, bug #141270. Fix PAM
+  linking, bug #101672. Update init-script to use dns, bug #147350. Fix
+  failure after SIGHUP, bug #147654.
 
   23 Sep 2006; Luca Longinotti <chtekk@gentoo.org>
   -files/openssl-0.9.8.patch, -files/proftpd-1.2.9-makefile.patch,
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 16449d9a9d6e..f2962899aaa0 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -14,6 +14,10 @@ AUX proftpd-1.2.10-sqlshowinfo.patch 1191 RMD160 c29fd8866760a34ff835bfaadc3d7bb
 MD5 098337e85fc8b71a16e91114ff54ece1 files/proftpd-1.2.10-sqlshowinfo.patch 1191
 RMD160 c29fd8866760a34ff835bfaadc3d7bb2bb10c3b3 files/proftpd-1.2.10-sqlshowinfo.patch 1191
 SHA256 f2b862eb2af71b2102d577290b3adec40ff9ea9000e8727e50b353d9567aa4d1 files/proftpd-1.2.10-sqlshowinfo.patch 1191
+AUX proftpd-1.3.0-mod_ctrls_sighup.patch 3071 RMD160 f19bb9368bb4512b5a2ce568d6544475d22e3eaa SHA1 243e2223cef4a92a030d29258113fc05df1b2059 SHA256 e134b169f36b874e4e0374fcd4ef4abac58c8644db61e612a0a68ea743946fb1
+MD5 e401d4e10b95e09d9262ad66ec9d95e4 files/proftpd-1.3.0-mod_ctrls_sighup.patch 3071
+RMD160 f19bb9368bb4512b5a2ce568d6544475d22e3eaa files/proftpd-1.3.0-mod_ctrls_sighup.patch 3071
+SHA256 e134b169f36b874e4e0374fcd4ef4abac58c8644db61e612a0a68ea743946fb1 files/proftpd-1.3.0-mod_ctrls_sighup.patch 3071
 AUX proftpd-1.3.0-mod_sql_mysql.patch 4101 RMD160 e865cf38629b023f83a26db4b5db597c0a57c946 SHA1 f8598cf9c166d7f631829192b8ce056e7bfd71f2 SHA256 01875eb931a7aaa97d585e34ce8b90e882eaea04bd08cfb2b264b4fbf0964aa2
 MD5 e4b0f779fd34bb8e3f5d77e8aec6120b files/proftpd-1.3.0-mod_sql_mysql.patch 4101
 RMD160 e865cf38629b023f83a26db4b5db597c0a57c946 files/proftpd-1.3.0-mod_sql_mysql.patch 4101
@@ -22,33 +26,39 @@ AUX proftpd.conf 1671 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 SHA1 91cad
 MD5 7d9ac1c2c6fb71a45a5c48c017a4fd10 files/proftpd.conf 1671
 RMD160 1242c9c20e21e4832e5771e5fd57085cc5312066 files/proftpd.conf 1671
 SHA256 d289078ee6c5764b16979e7b720d99bcccf4d87176eecd6108dc9dc37949f0dd files/proftpd.conf 1671
-AUX proftpd.rc6 754 RMD160 97b7b88917916302308037a4ba7229fdf43ce2ce SHA1 65bbd58a0d2f8e73baa9e4a637b689ef78722c59 SHA256 cfbb9f667f1c437770574d6ed3ed89d22b9c97a747be6d525b9ed4c99e6b6c9c
-MD5 432194d3132744bfc7b9e92930c7c66f files/proftpd.rc6 754
-RMD160 97b7b88917916302308037a4ba7229fdf43ce2ce files/proftpd.rc6 754
-SHA256 cfbb9f667f1c437770574d6ed3ed89d22b9c97a747be6d525b9ed4c99e6b6c9c files/proftpd.rc6 754
+AUX proftpd.rc6 763 RMD160 2895b0ae75bf520587ef2919d24ff98cc658c745 SHA1 4f18a88b6dee0781e004ce89b35551e8475ffec0 SHA256 b5635eaf53a96e5b0b6a33aabe36f000426e7e25fde62e1bdb3067c0046c600d
+MD5 fb3b84b939a09e25ddca75c218964e6e files/proftpd.rc6 763
+RMD160 2895b0ae75bf520587ef2919d24ff98cc658c745 files/proftpd.rc6 763
+SHA256 b5635eaf53a96e5b0b6a33aabe36f000426e7e25fde62e1bdb3067c0046c600d files/proftpd.rc6 763
 AUX proftpd.xinetd 295 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 SHA1 3f1bd8d6cbb1488301b9aa0346e02b571fd0783a SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d
 MD5 4d676b70c97bc6daabd8c2ba8d52d27a files/proftpd.xinetd 295
 RMD160 c5c829319e901f478fe58b920347cc1b8706a366 files/proftpd.xinetd 295
 SHA256 150a5701f5c2788ecdf2c6ec228ce674963c9dc7bc1c511ad1eba8dfe05e2d5d files/proftpd.xinetd 295
 DIST mod_clamav.c 6338 RMD160 0a642be8149ee118426bf04d04eca5b2250ea2b2 SHA1 721ab740ce960237b668585934c03cb5b6dc7ae7 SHA256 d3b7da4b145b355fe4d05f453d6803a7c6b0bf99af2aedbd65431ae6b98a4db7
 DIST mod_clamav.html 4151 RMD160 8ada0d2126ff1977d9277e0f5a1464caaf5f7b62 SHA1 ef19409f04ea36007a81086f3f90028580d843be SHA256 4e6c3936ba307376561dd164c52964c14a83bcb23fd5801eaaab22be325370bc
+DIST mod_clamav_new.c 7399 RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb SHA1 f037c573b6c0052f8ed5ee427504a8cd8834f15c SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1
+DIST mod_clamav_new.html 4645 RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 SHA1 58479f3aae082effad3636026a27c09ddb232905 SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e
 DIST proftpd-1.2.10.tar.bz2 920337 RMD160 198dc321fab5dde37465880d41bbab29f39c3c4b SHA1 5e3a4d7ae65429a5e3c2934db4ed36a19f41eb0b SHA256 5607d70b8cae3a99e60dcbc4a8286f6de2e10d765136d97834fafd75783c0b25
 DIST proftpd-1.3.0.tar.bz2 1386086 RMD160 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec SHA1 d117134035a3d8d130c5aa44d6b1788683a33410 SHA256 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe
 DIST proftpd-mod-shaper-0.5.5.tar.gz 18090 RMD160 ef99f3b1e6cf4d4461ab7463bf65dc5ef8e21697 SHA1 667b59184aa08e6f5ad7a2edc3c949b8534cf5af SHA256 eb079bf98ef382086b952977cac1a84c2add9d7add4f8b989c7bd67d8ab61696
 DIST proftpd-mod-shaper-0.5.6.tar.gz 18099 RMD160 3727e4407728727da4e6546e01b86c6b2cb68657 SHA1 33af13cf95374e0118fd6fece63d5fa55779810a SHA256 b846b9f4d8601a7ce426afa049b26db4da4ee8226ff61af97b0ca86b2fb8c827
 DIST proftpd-mod-vroot-0.7.1.tar.gz 5613 RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 SHA1 e773f850d5736ecede45304eca7b3ff339fdcd8c SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1
-EBUILD proftpd-1.2.10-r7.ebuild 4723 RMD160 8805a0bc22468e5618ee5064bb438b8cd3cdd330 SHA1 44f1c48a010030a52a89b1176f761ce6963a4937 SHA256 7d46b3351d5253f6ad2ca81c4ff44b3c638fd85d77fa673a4b12b385e9fe54f3
-MD5 e6c3f5e1b277cd02012bd7e3c10fe4bc proftpd-1.2.10-r7.ebuild 4723
-RMD160 8805a0bc22468e5618ee5064bb438b8cd3cdd330 proftpd-1.2.10-r7.ebuild 4723
-SHA256 7d46b3351d5253f6ad2ca81c4ff44b3c638fd85d77fa673a4b12b385e9fe54f3 proftpd-1.2.10-r7.ebuild 4723
-EBUILD proftpd-1.3.0-r1.ebuild 5665 RMD160 877f7221313b380c3d89727a83cbc7f2a910c529 SHA1 d6d92e846dfc093d9ad8c44ee010a84da3276576 SHA256 ca3d9cee1cfd07adffd1cb30f2bb6124b7c97737dde5d521363fa83549719b84
-MD5 3071fc28013e8a7fa49cc4ff8984582c proftpd-1.3.0-r1.ebuild 5665
-RMD160 877f7221313b380c3d89727a83cbc7f2a910c529 proftpd-1.3.0-r1.ebuild 5665
-SHA256 ca3d9cee1cfd07adffd1cb30f2bb6124b7c97737dde5d521363fa83549719b84 proftpd-1.3.0-r1.ebuild 5665
-MISC ChangeLog 19953 RMD160 5ea81a3dfb4c8ec94cd81092cd0a993ffa73491b SHA1 c267be7d7c04158d642397cbbfa69ada51612a37 SHA256 ec8524382f5a35195714f06895d3cf2c95cc80d680f434241fd2da6a87d38731
-MD5 8db4f96daec78aa266d4ddd1c44e118d ChangeLog 19953
-RMD160 5ea81a3dfb4c8ec94cd81092cd0a993ffa73491b ChangeLog 19953
-SHA256 ec8524382f5a35195714f06895d3cf2c95cc80d680f434241fd2da6a87d38731 ChangeLog 19953
+EBUILD proftpd-1.2.10-r7.ebuild 4702 RMD160 bd4b99dfeee32337c9113c07793716ba0eccef30 SHA1 9661871903504704a02ad2063fcd0b45b7f9ab04 SHA256 1af93452b599a88cecfefd98c8a0b37f90b90f0993ff859af89db13a840a8c76
+MD5 39a99edbc3ec2bf8ac5b601168147a92 proftpd-1.2.10-r7.ebuild 4702
+RMD160 bd4b99dfeee32337c9113c07793716ba0eccef30 proftpd-1.2.10-r7.ebuild 4702
+SHA256 1af93452b599a88cecfefd98c8a0b37f90b90f0993ff859af89db13a840a8c76 proftpd-1.2.10-r7.ebuild 4702
+EBUILD proftpd-1.3.0-r1.ebuild 5644 RMD160 6186c439e67550ce11215346700445d04b8bf1a2 SHA1 356e1321e8420676f70cd946f8f076ea26beeba8 SHA256 55e314ac222b163775160c59b1897a6c6855049764c5fb3f679de64ccdc05c1b
+MD5 41082dcb6c482013512826bb07ecd758 proftpd-1.3.0-r1.ebuild 5644
+RMD160 6186c439e67550ce11215346700445d04b8bf1a2 proftpd-1.3.0-r1.ebuild 5644
+SHA256 55e314ac222b163775160c59b1897a6c6855049764c5fb3f679de64ccdc05c1b proftpd-1.3.0-r1.ebuild 5644
+EBUILD proftpd-1.3.0-r2.ebuild 6102 RMD160 5aff7d5bf71a8ba700ec006c23213d4a70338fd8 SHA1 7bd0031bec037e8eaaa9ad1a2c34a3678e0cd8e8 SHA256 e5e957f7e0ec220f1e97e5480cfd8be7d0477898bc8ead640b73adbdeb57b31b
+MD5 ec9547efa4f88d3927bbffbb1f820806 proftpd-1.3.0-r2.ebuild 6102
+RMD160 5aff7d5bf71a8ba700ec006c23213d4a70338fd8 proftpd-1.3.0-r2.ebuild 6102
+SHA256 e5e957f7e0ec220f1e97e5480cfd8be7d0477898bc8ead640b73adbdeb57b31b proftpd-1.3.0-r2.ebuild 6102
+MISC ChangeLog 20372 RMD160 3eb347257dfaffe9bdf73fa23d616c5d9d29d851 SHA1 67f572fa7aff469957ff0358139091f1f2fe7234 SHA256 c71e5876dfa42f309340d5c7e0795584ca43324fcad4a55b5687eedb95ca6705
+MD5 79b609b3bdfdf4b0b3368cf3f31396da ChangeLog 20372
+RMD160 3eb347257dfaffe9bdf73fa23d616c5d9d29d851 ChangeLog 20372
+SHA256 c71e5876dfa42f309340d5c7e0795584ca43324fcad4a55b5687eedb95ca6705 ChangeLog 20372
 MISC metadata.xml 397 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 SHA1 ce13b1daa647114e642c1f5382fbd6453764e6b7 SHA256 18ffe70b54ea4d5875b74347b2580cb8dddbede73c3ccd9a6ef6981b7adb8a4f
 MD5 0dd625f2b64b8b0be0609009435beea1 metadata.xml 397
 RMD160 310baca7e2be7fea56472b78607c3f97eb6947e8 metadata.xml 397
@@ -59,3 +69,6 @@ SHA256 ea87bf530416e83405291521ef6268680a3b6a93cb982098e22e2ba9ebdac203 files/di
 MD5 35995cbe20ae79ce7bfe3c607082f42d files/digest-proftpd-1.3.0-r1 1214
 RMD160 a3b3282020c26af5c1725d10c26e98bcccda3d36 files/digest-proftpd-1.3.0-r1 1214
 SHA256 6c4adc001a19e749394cc9b3a8356c02451e4c3cabac659af921a8e628e84416 files/digest-proftpd-1.3.0-r1 1214
+MD5 c7b2fb963efdaad72f8b632c8293e3ff files/digest-proftpd-1.3.0-r2 1238
+RMD160 f21ff80eb1d1bd7a546105658d2f3d06849b84b1 files/digest-proftpd-1.3.0-r2 1238
+SHA256 874b41c34f7abfaa0af7232570fd80e494c6ae2a91ca72a61dd36d160cb1b11c files/digest-proftpd-1.3.0-r2 1238
diff --git a/net-ftp/proftpd/files/digest-proftpd-1.3.0-r2 b/net-ftp/proftpd/files/digest-proftpd-1.3.0-r2
new file mode 100644
index 000000000000..396fb437e240
--- /dev/null
+++ b/net-ftp/proftpd/files/digest-proftpd-1.3.0-r2
@@ -0,0 +1,15 @@
+MD5 da279361d5a34b37ce1f64d3830c4c17 mod_clamav_new.c 7399
+RMD160 ae4de6385245a3c79d3c54bb7af9d2fe45a59feb mod_clamav_new.c 7399
+SHA256 a5a3860c73c8bc3781516cbc912d7736517a92a15a6fd8352eeed638bcce60c1 mod_clamav_new.c 7399
+MD5 098551feed28f069ef01e77af88d55dc mod_clamav_new.html 4645
+RMD160 bc853541e6859e7929c0ed9b01b8f220e09b8ca2 mod_clamav_new.html 4645
+SHA256 ac0ab5f44cfc6c8118664c2a7300450486f52fb3bcde332b4bb9c506dd765a1e mod_clamav_new.html 4645
+MD5 fae47d01b52e035eb6b7190e74c17722 proftpd-1.3.0.tar.bz2 1386086
+RMD160 46cdd29a6c6ce4c3dd8f1a972df0a52b90a6d2ec proftpd-1.3.0.tar.bz2 1386086
+SHA256 83f220cba64455a2b1701b97ce9896f66a0020b179c50daf4860cdf362464ffe proftpd-1.3.0.tar.bz2 1386086
+MD5 a81c3ed2d45f7c938416a970fd559703 proftpd-mod-shaper-0.5.6.tar.gz 18099
+RMD160 3727e4407728727da4e6546e01b86c6b2cb68657 proftpd-mod-shaper-0.5.6.tar.gz 18099
+SHA256 b846b9f4d8601a7ce426afa049b26db4da4ee8226ff61af97b0ca86b2fb8c827 proftpd-mod-shaper-0.5.6.tar.gz 18099
+MD5 bafd6c9ecfdf352641465b866be12f27 proftpd-mod-vroot-0.7.1.tar.gz 5613
+RMD160 b9677793f7cf6075467d7f41e4b8a9dfef89a847 proftpd-mod-vroot-0.7.1.tar.gz 5613
+SHA256 30d58c326bb30c080048662db0c4ffaf28f478fce40452c0c3c217cb5d2124e1 proftpd-mod-vroot-0.7.1.tar.gz 5613
diff --git a/net-ftp/proftpd/files/proftpd-1.3.0-mod_ctrls_sighup.patch b/net-ftp/proftpd/files/proftpd-1.3.0-mod_ctrls_sighup.patch
new file mode 100644
index 000000000000..17bd69b17749
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.0-mod_ctrls_sighup.patch
@@ -0,0 +1,99 @@
+--- modules/mod_ctrls.c	11 Nov 2005 21:05:32 -0000	1.30
++++ modules/mod_ctrls.c	23 May 2006 17:31:51 -0000
+@@ -3,7 +3,7 @@
+  *          server, as well as several utility functions for other Controls
+  *          modules
+  *
+- * Copyright (c) 2000-2005 TJ Saunders
++ * Copyright (c) 2000-2006 TJ Saunders
+  *
+  * 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
+@@ -34,7 +34,7 @@
+ #include "privs.h"
+ #include "mod_ctrls.h"
+ 
+-#define MOD_CTRLS_VERSION "mod_ctrls/0.9.3"
++#define MOD_CTRLS_VERSION "mod_ctrls/0.9.4"
+ 
+ /* Master daemon in standalone mode? (from src/main.c) */
+ extern unsigned char is_master;
+@@ -518,7 +518,7 @@
+   } else if (res == PR_LOG_WRITABLE_DIR) {
+     pr_log_pri(PR_LOG_NOTICE, MOD_CTRLS_VERSION
+       ": unable to open ControlsLog '%s': "
+-      "containing directory is world writeable", ctrls_logname);
++      "containing directory is world writable", ctrls_logname);
+ 
+   } else if (res == PR_LOG_SYMLINK) {
+     pr_log_pri(PR_LOG_NOTICE, MOD_CTRLS_VERSION
+@@ -1476,7 +1476,7 @@
+ 
+     if (res == -2)
+       CONF_ERROR(cmd, pstrcat(cmd->tmp_pool,
+-        "unable to log to a world-writeable directory", NULL));
++        "unable to log to a world-writable directory", NULL));
+   }
+ 
+   return HANDLED(cmd);
+@@ -1506,10 +1506,12 @@
+     CONF_ERROR(cmd, "must be an absolute path");
+ 
+   /* Close the socket. */
+-  pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s'",
+-    ctrls_sock_file);
+-  close(ctrls_sockfd);
+-  ctrls_sockfd = -1;
++  if (ctrls_sockfd >= 0) {
++    pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s' (%d)",
++      ctrls_sock_file, ctrls_sockfd);
++    close(ctrls_sockfd);
++    ctrls_sockfd = -1;
++  }
+ 
+   /* Change the path. */
+   if (strcmp(cmd->argv[1], ctrls_sock_file) != 0)
+@@ -1608,9 +1610,28 @@
+   PRIVS_ROOT
+   ctrls_sockfd = ctrls_listen(ctrls_sock_file);
+   PRIVS_RELINQUISH
+-  if (ctrls_sockfd < 0)
++  if (ctrls_sockfd < 0) {
+     pr_log_pri(PR_LOG_NOTICE, "notice: unable to listen to local socket: %s",
+       strerror(errno));
++
++  } else {
++    /* Ensure that the listen socket used is not one of the major three
++     * (stdin, stdout, or stderr).
++     */
++    if (ctrls_sockfd < 3) {
++      if (dup2(ctrls_sockfd, 3) < 0) {
++        pr_log_pri(PR_LOG_NOTICE, MOD_CTRLS_VERSION
++          ": error duplicating listen socket: %s", strerror(errno));
++        (void) close(ctrls_sockfd);
++        ctrls_sockfd = -1;
++
++      } else {
++        (void) close(ctrls_sockfd);
++        ctrls_sockfd = 3;
++      }
++    }
++  }
++
+ }
+ 
+ static void ctrls_restart_ev(const void *event_data, void *user_data) {
+@@ -1633,10 +1654,11 @@
+   cl_list = NULL;
+   cl_listlen = 0;
+ 
+-  pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s'",
+-    ctrls_sock_file);
++  pr_log_debug(DEBUG3, MOD_CTRLS_VERSION ": closing ctrls socket '%s' (%d)",
++    ctrls_sock_file, ctrls_sockfd);
+   close(ctrls_sockfd);
+   ctrls_sockfd = -1;
++
+   ctrls_closelog();
+ 
+   /* Clear the existing pool */
diff --git a/net-ftp/proftpd/files/proftpd.rc6 b/net-ftp/proftpd/files/proftpd.rc6
index d543ded32bba..47b2ef651776 100644
--- a/net-ftp/proftpd/files/proftpd.rc6
+++ b/net-ftp/proftpd/files/proftpd.rc6
@@ -1,10 +1,11 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.10 2006/09/23 18:17:38 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/files/proftpd.rc6,v 1.11 2006/09/23 19:07:05 chtekk Exp $
 
 depend() {
 	need net
+	use dns
 }
 
 checkconfig() {
diff --git a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
index 9670b245466f..fc907dfab1cb 100644
--- a/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
+++ b/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild,v 1.11 2006/09/23 18:17:38 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.2.10-r7.ebuild,v 1.12 2006/09/23 19:07:05 chtekk Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -10,8 +10,6 @@ IUSE="authfile hardened ipv6 ldap mysql ncurses noauthunix pam postgres selinux
 
 SHAPER_VER="0.5.5"
 
-S="${WORKDIR}/${P}"
-
 DESCRIPTION="An advanced and very configurable FTP server."
 SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2
 		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )"
diff --git a/net-ftp/proftpd/proftpd-1.3.0-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.0-r1.ebuild
index 17b7187e4186..bff3c7a060a2 100644
--- a/net-ftp/proftpd/proftpd-1.3.0-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.0-r1.ebuild,v 1.10 2006/09/23 18:17:38 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.0-r1.ebuild,v 1.11 2006/09/23 19:07:05 chtekk Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -11,8 +11,6 @@ IUSE="acl authfile clamav hardened ifsession ipv6 ldap mysql ncurses noauthunix
 SHAPER_VER="0.5.6"
 VROOT_VER="0.7.1"
 
-S="${WORKDIR}/${P}"
-
 DESCRIPTION="An advanced and very configurable FTP server."
 SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2
 		clamav? ( http://www.uglyboxindustries.com/mod_clamav.c http://www.uglyboxindustries.com/mod_clamav.html )
diff --git a/net-ftp/proftpd/proftpd-1.3.0-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.0-r2.ebuild
new file mode 100644
index 000000000000..32f130761888
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.0-r2.ebuild
@@ -0,0 +1,211 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.0-r2.ebuild,v 1.1 2006/09/23 19:07:05 chtekk Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="acl authfile clamav hardened ifsession ipv6 ldap mysql ncurses noauthunix opensslcrypt pam postgres radius rewrite selinux shaper sitemisc softquota ssl tcpd vroot xinetd"
+
+SHAPER_VER="0.5.6"
+VROOT_VER="0.7.1"
+
+DESCRIPTION="An advanced and very configurable FTP server."
+SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P}.tar.bz2
+		clamav? ( http://www.uglyboxindustries.com/mod_clamav_new.c http://www.uglyboxindustries.com/mod_clamav_new.html )
+		shaper? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-shaper-${SHAPER_VER}.tar.gz )
+		vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )"
+HOMEPAGE="http://www.proftpd.org/
+		http://www.castaglia.org/proftpd/
+		http://www.uglyboxindustries.com/open-source.php"
+
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="acl? ( sys-apps/acl sys-apps/attr )
+		clamav? ( app-antivirus/clamav )
+		ldap? ( >=net-nds/openldap-1.2.11 )
+		mysql? ( >=dev-db/mysql-3.23.26 )
+		ncurses? ( sys-libs/ncurses )
+		opensslcrypt? ( >=dev-libs/openssl-0.9.6f )
+		pam? ( virtual/pam )
+		postgres? ( >=dev-db/postgresql-7.3 )
+		ssl? ( >=dev-libs/openssl-0.9.6f )
+		tcpd? ( >=sys-apps/tcp-wrappers-7.6-r3 )
+		xinetd? ( sys-apps/xinetd )"
+
+RDEPEND="${DEPEND}
+		net-ftp/ftpbase
+		selinux? ( sec-policy/selinux-ftpd )"
+
+pkg_setup() {
+	# Add the proftpd user to make the default config
+	# work out-of-the-box
+	enewgroup proftpd
+	enewuser proftpd -1 -1 -1 proftpd
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+
+	cd "${S}"
+
+	# Fix stripping of files
+	sed -e "s| @INSTALL_STRIP@||g" -i Make*
+
+	# Fix bug #147654, patch by upstream
+	epatch "${FILESDIR}/${P}-mod_ctrls_sighup.patch"
+
+	epatch "${FILESDIR}/${P}-mod_sql_mysql.patch"
+
+	if use shaper ; then
+		unpack ${PN}-mod-shaper-${SHAPER_VER}.tar.gz
+		cp -f mod_shaper/mod_shaper.c contrib/
+	fi
+
+	if use clamav ; then
+		cp -f "${DISTDIR}/mod_clamav_new.c" contrib/mod_clamav.c
+		cp -f "${DISTDIR}/mod_clamav_new.html" doc/mod_clamav.html
+	fi
+
+	if use vroot ; then
+		unpack ${PN}-mod-vroot-${VROOT_VER}.tar.gz
+		cp -f mod_vroot/mod_vroot.c contrib/
+		cp -f mod_vroot/mod_vroot.html doc/
+	fi
+}
+
+src_compile() {
+	addpredict /etc/krb5.conf
+	local modules myconf
+
+	modules="mod_ratio:mod_readme"
+	use acl && modules="${modules}:mod_facl"
+	use clamav && modules="${modules}:mod_clamav"
+	use pam && modules="${modules}:mod_auth_pam"
+	use radius && modules="${modules}:mod_radius"
+	use rewrite && modules="${modules}:mod_rewrite"
+	use shaper && modules="${modules}:mod_shaper"
+	use sitemisc && modules="${modules}:mod_site_misc"
+	use ssl && modules="${modules}:mod_tls"
+	use tcpd && modules="${modules}:mod_wrap"
+	use vroot && modules="${modules}:mod_vroot"
+
+	# pam needs to be explicitely disabled
+	use pam || myconf="${myconf} --enable-auth-pam=no"
+
+	if use ldap ; then
+		modules="${modules}:mod_ldap"
+		append-ldflags "-lresolv"
+	fi
+
+	if use opensslcrypt ; then
+		append-ldflags "-lcrypto"
+		myconf="${myconf} --with-includes=/usr/include/openssl"
+		CFLAGS="${CFLAGS} -DHAVE_OPENSSL"
+	fi
+
+	if use mysql && use postgres ; then
+		ewarn "ProFTPD only supports either the MySQL or PostgreSQL modules."
+		ewarn "Presently this ebuild defaults to mysql. If you would like to"
+		ewarn "change the default behaviour, merge ProFTPD with:"
+		ewarn "USE='-mysql postgres' emerge proftpd"
+		epause 5
+	fi
+
+	if use mysql ; then
+		modules="${modules}:mod_sql:mod_sql_mysql"
+		myconf="${myconf} --with-includes=/usr/include/mysql"
+	elif use postgres ; then
+		modules="${modules}:mod_sql:mod_sql_postgres"
+		myconf="${myconf} --with-includes=/usr/include/postgresql"
+	fi
+
+	if use softquota ; then
+		modules="${modules}:mod_quotatab"
+		if use mysql || use postgres ; then
+			modules="${modules}:mod_quotatab_sql"
+		fi
+		if use ldap ; then
+			modules="${modules}:mod_quotatab_file:mod_quotatab_ldap"
+		else
+			modules="${modules}:mod_quotatab_file"
+		fi
+	fi
+
+	# mod_ifsession should be the last module in the --with-modules list
+	# see http://www.castaglia.org/proftpd/modules/mod_ifsession.html#Installation
+	use ifsession && modules="${modules}:mod_ifsession"
+
+	# bug #30359
+	use hardened && echo > lib/libcap/cap_sys.c
+	gcc-specs-pie && echo > lib/libcap/cap_sys.c
+
+	if use noauthunix ; then
+		myconf="${myconf} --disable-auth-unix"
+	else
+		myconf="${myconf} --enable-auth-unix"
+	fi
+
+	econf \
+		--sbindir=/usr/sbin \
+		--localstatedir=/var/run \
+		--sysconfdir=/etc/proftpd \
+		--enable-shadow \
+		--enable-autoshadow \
+		--enable-ctrls \
+		--with-modules=${modules} \
+		$(use_enable acl facl) \
+		$(use_enable authfile auth-file) \
+		$(use_enable ipv6) \
+		$(use_enable ncurses) \
+		${myconf} || die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	# Note rundir needs to be specified to avoid sandbox violation
+	# on initial install. See Make.rules
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	keepdir /var/run/proftpd
+
+	dodoc "${FILESDIR}/proftpd.conf" \
+		COPYING CREDITS ChangeLog NEWS README* \
+		doc/license.txt
+	dohtml doc/*.html
+
+	use shaper && dohtml mod_shaper/mod_shaper.html
+
+	docinto rfc
+	dodoc doc/rfc/*.txt
+
+	mv -f "${D}/etc/proftpd/proftpd.conf" "${D}/etc/proftpd/proftpd.conf.distrib"
+
+	insinto /etc/proftpd
+	newins "${FILESDIR}/proftpd.conf" proftpd.conf.sample
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/proftpd.xinetd" proftpd
+	fi
+
+	newinitd "${FILESDIR}/proftpd.rc6" proftpd
+}
+
+pkg_postinst() {
+	einfo
+	einfo "You can find the config files in /etc/proftpd"
+	einfo
+	ewarn "With the introduction of net-ftp/ftpbase the ftp user is now ftp."
+	ewarn "Remember to change that in the configuration file."
+	einfo
+	if use clamav ; then
+		ewarn "mod_clamav was updated to a new version, which uses Clamd"
+		ewarn "only for virus scanning, so you'll have to set Clamd up"
+		ewarn "and start it, also re-check the mod_clamav docs."
+		einfo
+	fi
+}