- orphaned, outdated

Changed files:
    pure-ftpd-cap.patch -> 1.2
    pure-ftpd-caps_p.patch -> 1.3
    pure-ftpd.rc-inetd -> 1.4

diff --git a/pure-ftpd-cap.patch b/pure-ftpd-cap.patch
deleted file mode 100644 (file)
index b9847d7..0000000
--- a/pure-ftpd-cap.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur pure-ftpd-0.96.1-/src/ftpd.c pure-ftpd-0.96.1/src/ftpd.c
---- pure-ftpd-0.96.1-/src/ftpd.c       Sat Mar 17 11:54:00 2001
-+++ pure-ftpd-0.96.1/src/ftpd.c        Sat Mar 17 14:21:41 2001
-@@ -52,7 +52,7 @@
-               syslog(LOG_ERR, "Cannot cap_set_proc: %s", strerror(errno));
-               exit(1);
-       }
--      if (-1 == cap_free(&caps)) {
-+      if (-1 == cap_free(caps)) {
-               printf("421 Cannot cap_free\r\n");
-               syslog(LOG_ERR, "Cannot cap_set_free");
-               exit(1);
-@@ -2273,7 +2273,7 @@
-               syslog(LOG_ERR, "Cannot cap_set_proc: %s", strerror(errno));
-               exit(1);
-       }
--      if (-1 == cap_free(&caps)) {
-+      if (-1 == cap_free(caps)) {
-               printf("421 Cannot cap_free\r\n");
-               syslog(LOG_ERR, "Cannot cap_set_free");
-               exit(1);
-Binary files pure-ftpd-0.96.1-/src/ftpd.o and pure-ftpd-0.96.1/src/ftpd.o differ
-Binary files pure-ftpd-0.96.1-/src/pure-ftpd and pure-ftpd-0.96.1/src/pure-ftpd differ

diff --git a/pure-ftpd-caps_p.patch b/pure-ftpd-caps_p.patch
deleted file mode 100644 (file)
index 406bd14..0000000
--- a/pure-ftpd-caps_p.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -urN pure-ftpd-1.0.16c/src/ftpd.c pure-ftpd-1.0.17/src/ftpd.c
---- pure-ftpd-1.0.16c/src/ftpd.c       2003-10-19 20:05:08.000000000 +0200
-+++ pure-ftpd-1.0.17/src/ftpd.c        2003-11-11 22:09:02.000000000 +0100
-@@ -1168,12 +1168,6 @@
-         }
- #endif
- 
--#ifdef WITH_PRIVSEP
--# ifdef USE_CAPABILITIES
--        drop_login_caps();
--# endif
--#endif        
--
- #ifndef NON_ROOT_FTP
-         if (authresult.uid > (uid_t) 0) {
- # ifdef WITH_PRIVSEP
-@@ -1193,10 +1187,8 @@
-         }
- #endif
- 
--#ifndef WITH_PRIVSEP
--# ifdef USE_CAPABILITIES
-+#ifdef USE_CAPABILITIES
-         drop_login_caps();
--# endif
- #endif
- 
- #ifndef MINIMAL
-@@ -1678,9 +1670,6 @@
-             die(421, LOG_ERR, MSG_CHROOT_FAILED);
-         }
- #ifdef WITH_PRIVSEP
--# ifdef USE_CAPABILITIES
--        drop_login_caps();
--# endif
-         if (setuid(authresult.uid) != 0 || seteuid(authresult.uid) != 0) {
-             _EXIT(EXIT_FAILURE);
-         }
-@@ -1695,6 +1684,9 @@
- #  endif
- # endif
- #endif
-+#ifdef USE_CAPABILITIES
-+        drop_login_caps();
-+#endif        
-         chrooted = 1;
- #ifdef RATIOS
-         if (ratio_for_non_anon == 0) {
-@@ -1718,13 +1710,8 @@
-     } else {
-         addreply(230, MSG_CURRENT_DIR_IS, wd);
-     }
--#ifndef WITH_PRIVSEP
--# ifdef USE_CAPABILITIES
--    drop_login_caps();
--# endif
--#endif
-     logfile(LOG_INFO, MSG_IS_NOW_LOGGED_IN, account);
--# ifdef FTPWHO
-+#ifdef FTPWHO
-     if (shm_data_cur != NULL) {
-         ftpwho_lock();
-         strncpy(shm_data_cur->account, account,
-@@ -1733,7 +1720,7 @@
-         ftpwho_unlock();
-         state_needs_update = 1;
-     }
--# endif
-+#endif
-     loggedin = 1;
-     if (getcwd(wd, sizeof wd - (size_t) 1U) == NULL) {
-         wd[0] = '/';
-

diff --git a/pure-ftpd.rc-inetd b/pure-ftpd.rc-inetd
deleted file mode 100644 (file)
index cd1bcf3..0000000
--- a/pure-ftpd.rc-inetd
+++ /dev/null
@@ -1,9 +0,0 @@
-SERVICE_NAME=ftp
-SOCK_TYPE=stream
-PROTOCOL=tcp
-PORT=21
-FLAGS=nowait
-USER=root
-SERVER=tcpd
-DAEMON=/usr/sbin/pure-ftpd
-DAEMONARGS="-f ftp -s -u 500 -L 10000:5"