delete old pacakge
This commit is contained in:
Mario Fetka
parent
8c544ec26b
commit
474f53cc87
@ -1,18 +0,0 @@
|
|||||||
AUX conf.d.oftpd-r7 978 BLAKE2B a2bc79f57fdd7f9f1f127ad7606b44330afd41c32acae998d86eead6871724c371f438cd03aa89b68f9124cae2a7673e454497c721405e31d7e53948bc0d4617 SHA512 6f864b2a6010cd81e0f767bc769200a26793540f77f95deb4678254d48acb93814eb214e4d3df46825c647483fac1bfcbdfd1c32d4da11af6596331408f75e0f
|
|
||||||
AUX init.d.oftpd-r7 526 BLAKE2B 307a2e104555815cf833a5adafbe3d2fd065ff18efa33723b3d0e246f31e4a267d957a2531fe8c034d2e11bb48f17358ff5d6a3c28962b028f4f7d0fe3331bc3 SHA512 be48a7a04be71eff0330dbea622d79b15d75bf033de901158199862c8c049a1126021a069009152b938a8c55138c36db7862410f836570c65d2729f737112142
|
|
||||||
AUX oftpd-0.3.7-configure-ipv6.patch 571 BLAKE2B 0329fd80b83b508047cd39d9b08bb2ca60a7b0d7e313f97b4e13361ceb0a053fcb1cf1e221055f8334196977c6fad857778f47e8903e71a1e7dde379d2cc2d7b SHA512 e76c08d711169ef5e005d8a4cae9d9feec91c99057f086109df0bece27142149754c7e099f6cd978ce9c9e03bc699419bcf6c22448bd08476d4c39e68643f7be
|
|
||||||
AUX oftpd-0.3.7-delay-root-check.patch 778 BLAKE2B 90935612d7bbd82cc13cdac7f0929b76402b5d9b6b7894abc3217accec76cbe06c41f1de3e07d7b982cdbc0304824136461330ac1320ead837faeaeb98787ea8 SHA512 ea420fdec8df42d6482bf41409571769b1f4011e2bcf9157cd32f68c68c582edd0908cb13286618248647922023f72b029a4523464ce15a5adbfa4ce0bb9f326
|
|
||||||
AUX oftpd-0.3.7-error-output.patch 706 BLAKE2B da3f667f837cef0be59939939e46d0739db3b7c92829157e35786b61cdde23ab904220306c606568edf7e42d3f8d5620ea0ef60f7799f96bd3e503d42e2dd2f7 SHA512 36c996038784a0e6b6a17e1f52c346dde741f812588254441c3419f0859daf63c75135e156684f014a576315560da0227aa184870edb3a0c95a18968d9e62a52
|
|
||||||
AUX oftpd-0.3.7-family-1.patch 936 BLAKE2B 6609049281ce1886f29a81b4d68a08e64e1cd4e5e7265958fe7e154a904183c5b9d14c9761b82f8f876da6390aa94250e84354dc0fe696c5c7138bc94747d735 SHA512 045eb48da94b3f888ff3f9dab17170338d078284d136d2fb684fac09dedaef55dd186080a520072bf2906be17770f70e66a311e19b86da766f49fe68174857e2
|
|
||||||
AUX oftpd-0.3.7-htons.patch 458 BLAKE2B cacdc7339f3d6e1005a9539d3ea4bbcd8bb1c419c881b907a44d7d17f0bb0cdf88f7cbe619b4c099d548f08d5011fa139dcf8c40808264b8ca2618117e6e2b72 SHA512 75da3b40206b5c495a2edab531d6c7d2a41e30729a03605e514ec12e20499e4f7f3fb03859b19c5fc5cdb1ea591243abcbf18decefddc03c977254a924ff2109
|
|
||||||
AUX oftpd-0.3.7-ipv4.patch 1508 BLAKE2B a705ced52186cf67e93eafd00b9b018d74df5c94831a6707d9f3d77b541abbffc075d4cbd1be2fd101e8a336557202dab0864a0b698e10f7920480e27d67a715 SHA512 fb6ec0cbdc8058cffd0b9fedda4a5a1b7e4d0e1e31db43080b22f59d965af49ba8de959a86d8ca48745135cb3a2c0666f00e4c730c09f456e1f3198da454144a
|
|
||||||
AUX oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch 14107 BLAKE2B 800e260b7c89f96f451d8fa2b12a963736ad25014e255e8bc3e2d0988e1f77606542b57f6f9e7b0cb03a53cac5fc964bd555ddddf0d82b38c17fff0c3a8177b4 SHA512 c752bdeb0227c036268e3840c3aac9a19e875b9fa37e4f6440211aed312c42836982ff7e8a8e97a1f12f172552f96b290fb17bb139ded5d75999d49270facfc8
|
|
||||||
AUX oftpd-0.3.7-pthread-cancel.patch 797 BLAKE2B 07b08302c9cb1b50454031c16b2b01d1e42523e11bc530771c452c223408134bb53483d938face450037c84a1a9dc1c58f3a09fc79774d8053aa44c61a1307ac SHA512 7920c04bb3eb5ed3b832d140d7ff7808c3d214f804a04569706815d07fb505b7134d283c944c5a76fd64b1da55820ccda872d89a3be6e2363e31a386c320a161
|
|
||||||
AUX oftpd-0.3.7-unistd.patch 448 BLAKE2B 4f69ab2c867f2c443c0a5cfc0637b92a486a757d43a39d5b02ba81ebde87535949e4d0f6e5afa9a0d7c248477746f917a92091ca36d764f1896f60a007495662 SHA512 0e0ad78eecb9f2be425fcda44e624fe118ceb0ccb094a05bce96a9bb1268bf58e4a8efab553e767d4ad2165e9bc5b360f5d36ad28b21ccfee35f9a2809a96d7e
|
|
||||||
AUX oftpd.service 267 BLAKE2B 227e3fb94225dd78e2529986e89cd63d822805cdfe4084c051dcf94f6815cd449fcc9a88058037c2dc3750d6ca77c37226c37f47b90a80f03d51efaf423e66b3 SHA512 1cd022cc53aabaa37ce26fa3b6050ad3cd8fcf0666e8ebd6a1283daef9d1073dfad191d42f09b010436c1450041d134fc7624a5d300cd54e95a79579d8dd541d
|
|
||||||
AUX oftpd.service.conf 43 BLAKE2B 2cdd6d21f0edf8ee3342a9f7a8755a59c23aaeb568253cf25893bb4762ae12dce3c25810651a670f8b647311c25cc163ad7b3db0995d5fc321e6c53df8b238d8 SHA512 d27bc154b7a843db43df4c160bbcdc66fe2e3c8f078553fb3b9c2af56894541af1bec2aaa459de84480e75989c0ef1bcb8cabe5e5f77865046711abf977b40e1
|
|
||||||
DIST oftpd-0.3.6-ipv6rel2.patch.gz 12478 BLAKE2B 1d367979261fff05bdfa22201cf06ae537d7bc7cd656708cd2c672b8c437ec8b42d94c84c387ee450da140feab4af98e4601a1126077acdd93959284a28548b2 SHA512 76d12b82424a9a338f151534df55310511d3138a1e80851e6ebb8f4a841cd075892ab1a02851d871772a2229c107ec35de2d5fb3572c72207a65629e10e55dba
|
|
||||||
DIST oftpd-0.3.7.tar.gz 97364 BLAKE2B 4fef7204d905d248f5fbf1e641d015c0549dfcc08b0ad98ac3557250ca91dda2e25d0aaffe09c9d68d47318b977a637f693e5bbd359c20e894a656a412fccf59 SHA512 36bfd15dbe84043aee9678acbcc2c1312091887b381bee36a6a57f2516a5ec742a1733bf570c7cc71aaa28bd053d686976e6bfd549443a8bb398f8176db1a6a8
|
|
||||||
DIST oftpd-ftp_session.patch 859 BLAKE2B 3a079190a3910c29d8123011e8bba017970e5b3ab24dfb706fc96f7ad2aff77e6562edef45d584d58b98505f4de40fc14175b47b4901010c156e61976e2b270c SHA512 473b12946f716762a835fcc64819641a9eb4cc2f4dc3adcc3de57121231542018a93a6b281459e0a906887de3490f414a7638a27282c6e014668137ce36634ba
|
|
||||||
EBUILD oftpd-0.3.7-r10.ebuild 1551 BLAKE2B 0e6d8fa7e429d7a0b2c4d0ecff4abbb89ecb3051bbf7dd585724c9b4858ea2156ccd9a195339e46a458bef53bcbd37b4fb000cdb88b5ef9c31368bbb77f70d6c SHA512 c3e4abc07364bf2bfc5302878b72e054750b966a672acfc573ee4d08aea3ccbd92cf57e409568e4cabf1e95a311f35149c04652448049f7d277c1737fe70d78a
|
|
||||||
MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
|
|
||||||
@ -1,26 +0,0 @@
|
|||||||
# Please read the oftpd(8) man page for a more detailed explaination of these
|
|
||||||
# variables.
|
|
||||||
#
|
|
||||||
# FTPUSER (user-name in the man page):
|
|
||||||
# Set this variable to the user to run the ftp daemon as
|
|
||||||
FTPUSER=ftp
|
|
||||||
|
|
||||||
# FTPROOT (root-directory in the man page):
|
|
||||||
# The server uses chroot(2) to change the root directory of the server to this
|
|
||||||
# directory. When a user connects, this is the directory that they will start
|
|
||||||
# in, and is the top of their directory tree.
|
|
||||||
#
|
|
||||||
FTPROOT=/home/ftp
|
|
||||||
|
|
||||||
# FTPPORT (TCP port)
|
|
||||||
# 21 is the standard ftp port, but you can change it here to something else
|
|
||||||
FTPPORT=21
|
|
||||||
|
|
||||||
## Uncoment this line to activate oftpd service
|
|
||||||
# Note: in order for passive connections to work, you must specify an IP address
|
|
||||||
# here with the -i flag. You can make it listen to all IPv4 addresses:
|
|
||||||
# -i 0.0.0.0
|
|
||||||
# or make it listen to all IPv6 addresses:
|
|
||||||
# -i ::1
|
|
||||||
# By default, oftpd listens to all IPv4/IPv6 addresses, but passive mode fails.
|
|
||||||
#OFTPD_OPTS="-p ${FTPPORT} ${FTPUSER} ${FTPROOT}"
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
#!/sbin/openrc-run
|
|
||||||
# Copyright 1999-2011 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
depend() {
|
|
||||||
need net
|
|
||||||
}
|
|
||||||
|
|
||||||
checkconfig() {
|
|
||||||
if [ -z "${OFTPD_OPTS}" ] ; then
|
|
||||||
eerror "You need to setup OFTPD_OPTS /etc/conf.d/oftpd"
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
start() {
|
|
||||||
checkconfig || return 1
|
|
||||||
|
|
||||||
ebegin "Starting oftpd"
|
|
||||||
start-stop-daemon --start --exec /usr/sbin/oftpd -- ${OFTPD_OPTS}
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
|
|
||||||
stop() {
|
|
||||||
ebegin "Stopping oftpd"
|
|
||||||
start-stop-daemon --stop --quiet --exec /usr/sbin/oftpd
|
|
||||||
eend $?
|
|
||||||
}
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
diff --git a/configure.in b/configure.in
|
|
||||||
index cf38e45..ba7ad09 100644
|
|
||||||
--- a/configure.in
|
|
||||||
+++ b/configure.in
|
|
||||||
@@ -96,7 +96,11 @@ CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"
|
|
||||||
|
|
||||||
dnl Check whether to enable IPv6 support
|
|
||||||
AC_ARG_ENABLE([ipv6],[ --enable-ipv6 Enable IPv6 support (disabled by default)],
|
|
||||||
- CFLAGS="$CFLAGS -DINET6",)
|
|
||||||
+ [enable_ipv6=$enableval],
|
|
||||||
+ [enable_ipv6=no])
|
|
||||||
+if test $enable_ipv6 = yes; then
|
|
||||||
+ CFLAGS="$CFLAGS -DINET6"
|
|
||||||
+fi
|
|
||||||
|
|
||||||
AC_SUBST(HAVE_NEW_SS_FAMILY)
|
|
||||||
AC_OUTPUT(Makefile src/Makefile man/Makefile)
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
check for root after processing args so non-root can run --help
|
|
||||||
|
|
||||||
--- a/src/oftpd.c
|
|
||||||
+++ b/src/oftpd.c
|
|
||||||
@@ -56,12 +56,6 @@ int main(int argc, char *argv[])
|
|
||||||
exe_name = argv[0];
|
|
||||||
}
|
|
||||||
|
|
||||||
- /* verify we're running as root */
|
|
||||||
- if (geteuid() != 0) {
|
|
||||||
- fprintf(stderr, "%s: program needs root permission to run\n", exe_name);
|
|
||||||
- exit(1);
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
/* default command-line arguments */
|
|
||||||
port = FTP_PORT;
|
|
||||||
user_ptr = NULL;
|
|
||||||
@@ -187,6 +181,12 @@ int main(int argc, char *argv[])
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
+ /* verify we're running as root */
|
|
||||||
+ if (geteuid() != 0) {
|
|
||||||
+ fprintf(stderr, "%s: program needs root permission to run\n", exe_name);
|
|
||||||
+ exit(1);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
/* become a daemon */
|
|
||||||
if (detach) {
|
|
||||||
daemonize();
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
fix writing of the error message to stderr by processing the varargs
|
|
||||||
|
|
||||||
--- a/src/error.c
|
|
||||||
+++ b/src/error.c
|
|
||||||
@@ -23,7 +23,6 @@ void error_init(error_t *err, int error_code, const char *desc_fmt, ...)
|
|
||||||
{
|
|
||||||
va_list args;
|
|
||||||
|
|
||||||
- fprintf(stderr, "error_init: %d %s", error_code, desc_fmt);
|
|
||||||
daemon_assert(err != NULL);
|
|
||||||
daemon_assert(error_code >= 0);
|
|
||||||
daemon_assert(desc_fmt != NULL);
|
|
||||||
@@ -32,6 +31,7 @@ void error_init(error_t *err, int error_code, const char *desc_fmt, ...)
|
|
||||||
va_start(args, desc_fmt);
|
|
||||||
vsnprintf(err->desc, sizeof(err->desc), desc_fmt, args);
|
|
||||||
va_end(args);
|
|
||||||
+ fprintf(stderr, "error_init: %d %s\n", error_code, err->desc);
|
|
||||||
|
|
||||||
daemon_assert(invariant(err));
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
|
||||||
Date: 2010-01-05
|
|
||||||
Initial Package Version: 0.3.7
|
|
||||||
Origin: http://gentoo.mirror.solnet.ch/net-ftp/oftpd/files/oftpd-0.3.7-family.patch
|
|
||||||
Upstream Status: unkonwn
|
|
||||||
Description: dont crash on wrong protocol family
|
|
||||||
|
|
||||||
diff -Naur oftpd-0.3.7.orig/src/ftp_session.c oftpd-0.3.7/src/ftp_session.c
|
|
||||||
--- oftpd-0.3.7.orig/src/ftp_session.c 2010-01-05 21:56:48.540303543 +0000
|
|
||||||
+++ oftpd-0.3.7/src/ftp_session.c 2010-01-05 21:57:29.995553119 +0000
|
|
||||||
@@ -708,10 +708,12 @@
|
|
||||||
if ((((struct sockaddr *)host_port)->sa_family != AF_INET) &&
|
|
||||||
(((struct sockaddr *)host_port)->sa_family != AF_INET6)) {
|
|
||||||
reply(f, 521, "Only IPv4 and IPv6 supported, address families (4,6)");
|
|
||||||
+ return;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
if (((struct sockaddr *)host_port)->sa_family != AF_INET) {
|
|
||||||
reply(f, 521, "Only IPv4 supported, address family (4)");
|
|
||||||
+ return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
--- oftpd-0.3.7/src/ftp_listener.c
|
|
||||||
+++ oftpd-0.3.7/src/ftp_listener.c
|
|
||||||
@@ -159,11 +159,11 @@
|
|
||||||
switch (family) {
|
|
||||||
#ifdef INET6
|
|
||||||
case AF_INET6:
|
|
||||||
- ((struct sockaddr_in6*)&sock_addr)->sin6_port = port;
|
|
||||||
+ ((struct sockaddr_in6*)&sock_addr)->sin6_port = htons(port);
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
case AF_INET:
|
|
||||||
- ((struct sockaddr_in*)&sock_addr)->sin_port = port;
|
|
||||||
+ ((struct sockaddr_in*)&sock_addr)->sin_port = htons(port);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
/* handle error */
|
|
||||||
@ -1,52 +0,0 @@
|
|||||||
diff --git a/src/ftp_listener.c b/src/ftp_listener.c
|
|
||||||
index 0ac630d..3977078 100644
|
|
||||||
--- a/src/ftp_listener.c
|
|
||||||
+++ b/src/ftp_listener.c
|
|
||||||
@@ -148,7 +148,7 @@ int ftp_listener_init(ftp_listener_t *f,
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
- assert(hp->h_length <= sizeof(sock_addr));
|
|
||||||
+ daemon_assert(hp->h_length <= sizeof(sock_addr));
|
|
||||||
memcpy(&sock_addr, hp->h_addr, hp->h_length);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
@@ -489,7 +489,6 @@ static char *addr2string(const struct sockaddr *s)
|
|
||||||
|
|
||||||
daemon_assert(s != NULL);
|
|
||||||
|
|
||||||
-#ifdef INET6
|
|
||||||
error = getnameinfo((struct sockaddr *)s,
|
|
||||||
sizeof(struct sockaddr_storage),
|
|
||||||
addr,
|
|
||||||
@@ -503,9 +502,6 @@ static char *addr2string(const struct sockaddr *s)
|
|
||||||
} else {
|
|
||||||
ret_val = addr;
|
|
||||||
}
|
|
||||||
-#else
|
|
||||||
- ret_val = inet_ntoa(s->sin_addr);
|
|
||||||
-#endif
|
|
||||||
|
|
||||||
return ret_val;
|
|
||||||
}
|
|
||||||
diff --git a/src/ftp_session.c b/src/ftp_session.c
|
|
||||||
index 81e9c8e..7a1cbb1 100644
|
|
||||||
--- a/src/ftp_session.c
|
|
||||||
+++ b/src/ftp_session.c
|
|
||||||
@@ -1957,11 +1957,16 @@ static int ip_equal(const struct sockaddr *a, const struct sockaddr *b)
|
|
||||||
|
|
||||||
static int ip_equal(const struct sockaddr *a, const struct sockaddr *b)
|
|
||||||
{
|
|
||||||
+ struct sockaddr *aa, *bb;
|
|
||||||
+
|
|
||||||
daemon_assert(a != NULL);
|
|
||||||
daemon_assert(b != NULL);
|
|
||||||
daemon_assert(a->sa_family == AF_INET);
|
|
||||||
daemon_assert(b->sa_family == AF_INET);
|
|
||||||
|
|
||||||
+ aa = (struct sockaddr *)a;
|
|
||||||
+ bb = (struct sockaddr *)b;
|
|
||||||
+
|
|
||||||
if (((struct sockaddr_in *)aa)->sin_addr.s_addr !=
|
|
||||||
((struct sockaddr_in *)bb)->sin_addr.s_addr) return 0;
|
|
||||||
|
|
||||||
@ -1,354 +0,0 @@
|
|||||||
Difference from upstream mentioned patch for version 0.3.6
|
|
||||||
ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
|
|
||||||
to Mario Fetka (geos_one) (mario dot fetka at gmail dot com) at
|
|
||||||
http://bugs.gentoo.org/attachment.cgi?id=220543&action=view
|
|
||||||
|
|
||||||
--- oftpd-0.3.6-ipv6rel2.patch 2010-09-01 11:17:37.137000090 +0200
|
|
||||||
+++ oftpd-0.3.6-ipv6rel2.patch 2010-09-01 11:15:21.900000084 +0200
|
|
||||||
@@ -1,146 +1,10 @@
|
|
||||||
-diff -urN oftpd-0.3.6-orig/Makefile.in oftpd-0.3.6/Makefile.in
|
|
||||||
---- oftpd-0.3.6-orig/Makefile.in Mon May 28 00:53:40 2001
|
|
||||||
-+++ oftpd-0.3.6/Makefile.in Fri Jun 8 19:09:50 2001
|
|
||||||
-@@ -72,8 +72,8 @@
|
|
||||||
- CONFIG_HEADER = ./src/config.h
|
|
||||||
- CONFIG_CLEAN_FILES =
|
|
||||||
- DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
|
|
||||||
--Makefile.in NEWS TODO acconfig.h aclocal.m4 configure configure.in \
|
|
||||||
--install-sh missing mkinstalldirs src/config.h.in src/stamp-h.in
|
|
||||||
-+Makefile.in NEWS TODO aclocal.m4 configure configure.in install-sh \
|
|
||||||
-+missing mkinstalldirs
|
|
||||||
-
|
|
||||||
-
|
|
||||||
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
|
||||||
-@@ -83,9 +83,9 @@
|
|
||||||
- all: all-redirect
|
|
||||||
- .SUFFIXES:
|
|
||||||
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
||||||
-- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
|
|
||||||
-+ cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile
|
|
||||||
-
|
|
||||||
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
||||||
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
|
||||||
- cd $(top_builddir) \
|
|
||||||
- && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
||||||
-
|
|
||||||
-@@ -97,34 +97,6 @@
|
|
||||||
- $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
|
|
||||||
- cd $(srcdir) && $(AUTOCONF)
|
|
||||||
-
|
|
||||||
--src/config.h: src/stamp-h
|
|
||||||
-- @if test ! -f $@; then \
|
|
||||||
-- rm -f src/stamp-h; \
|
|
||||||
-- $(MAKE) src/stamp-h; \
|
|
||||||
-- else :; fi
|
|
||||||
--src/stamp-h: $(srcdir)/src/config.h.in $(top_builddir)/config.status
|
|
||||||
-- cd $(top_builddir) \
|
|
||||||
-- && CONFIG_FILES= CONFIG_HEADERS=src/config.h \
|
|
||||||
-- $(SHELL) ./config.status
|
|
||||||
-- @echo timestamp > src/stamp-h 2> /dev/null
|
|
||||||
--$(srcdir)/src/config.h.in: $(srcdir)/src/stamp-h.in
|
|
||||||
-- @if test ! -f $@; then \
|
|
||||||
-- rm -f $(srcdir)/src/stamp-h.in; \
|
|
||||||
-- $(MAKE) $(srcdir)/src/stamp-h.in; \
|
|
||||||
-- else :; fi
|
|
||||||
--$(srcdir)/src/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
|
|
||||||
-- cd $(top_srcdir) && $(AUTOHEADER)
|
|
||||||
-- @echo timestamp > $(srcdir)/src/stamp-h.in 2> /dev/null
|
|
||||||
--
|
|
||||||
--mostlyclean-hdr:
|
|
||||||
--
|
|
||||||
--clean-hdr:
|
|
||||||
--
|
|
||||||
--distclean-hdr:
|
|
||||||
-- -rm -f src/config.h
|
|
||||||
--
|
|
||||||
--maintainer-clean-hdr:
|
|
||||||
--
|
|
||||||
- # This directory's subdirectories are mostly independent; you can cd
|
|
||||||
- # into them and run `make' without going through this Makefile.
|
|
||||||
- # To change the values of `make' variables: instead of editing Makefiles,
|
|
||||||
-@@ -252,6 +224,11 @@
|
|
||||||
- -rm -rf $(distdir)
|
|
||||||
- mkdir $(distdir)
|
|
||||||
- -chmod 777 $(distdir)
|
|
||||||
-+ here=`cd $(top_builddir) && pwd`; \
|
|
||||||
-+ top_distdir=`cd $(distdir) && pwd`; \
|
|
||||||
-+ distdir=`cd $(distdir) && pwd`; \
|
|
||||||
-+ cd $(top_srcdir) \
|
|
||||||
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Makefile
|
|
||||||
- $(mkinstalldirs) $(distdir)/dist $(distdir)/init
|
|
||||||
- @for file in $(DISTFILES); do \
|
|
||||||
- d=$(srcdir); \
|
|
||||||
-@@ -309,32 +286,32 @@
|
|
||||||
- -rm -f config.cache config.log stamp-h stamp-h[0-9]*
|
|
||||||
-
|
|
||||||
- maintainer-clean-generic:
|
|
||||||
--mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic
|
|
||||||
-+mostlyclean-am: mostlyclean-tags mostlyclean-generic
|
|
||||||
-
|
|
||||||
- mostlyclean: mostlyclean-recursive
|
|
||||||
-
|
|
||||||
--clean-am: clean-hdr clean-tags clean-generic mostlyclean-am
|
|
||||||
-+clean-am: clean-tags clean-generic mostlyclean-am
|
|
||||||
-
|
|
||||||
- clean: clean-recursive
|
|
||||||
-
|
|
||||||
--distclean-am: distclean-hdr distclean-tags distclean-generic clean-am
|
|
||||||
-+distclean-am: distclean-tags distclean-generic clean-am
|
|
||||||
-
|
|
||||||
- distclean: distclean-recursive
|
|
||||||
- -rm -f config.status
|
|
||||||
-
|
|
||||||
--maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \
|
|
||||||
-- maintainer-clean-generic distclean-am
|
|
||||||
-+maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \
|
|
||||||
-+ distclean-am
|
|
||||||
- @echo "This command is intended for maintainers to use;"
|
|
||||||
- @echo "it deletes files that may require special tools to rebuild."
|
|
||||||
-
|
|
||||||
- maintainer-clean: maintainer-clean-recursive
|
|
||||||
- -rm -f config.status
|
|
||||||
-
|
|
||||||
--.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
|
|
||||||
--install-data-recursive uninstall-data-recursive install-exec-recursive \
|
|
||||||
--uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
|
|
||||||
--all-recursive check-recursive installcheck-recursive info-recursive \
|
|
||||||
--dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
|
|
||||||
-+.PHONY: install-data-recursive uninstall-data-recursive \
|
|
||||||
-+install-exec-recursive uninstall-exec-recursive installdirs-recursive \
|
|
||||||
-+uninstalldirs-recursive all-recursive check-recursive \
|
|
||||||
-+installcheck-recursive info-recursive dvi-recursive \
|
|
||||||
-+mostlyclean-recursive distclean-recursive clean-recursive \
|
|
||||||
- maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
|
|
||||||
- distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
|
|
||||||
- dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
|
|
||||||
-diff -urN oftpd-0.3.6-orig/man/Makefile.in oftpd-0.3.6/man/Makefile.in
|
|
||||||
---- oftpd-0.3.6-orig/man/Makefile.in Mon May 28 00:53:44 2001
|
|
||||||
-+++ oftpd-0.3.6/man/Makefile.in Fri Jun 8 19:09:50 2001
|
|
||||||
-@@ -84,9 +84,9 @@
|
|
||||||
- all: all-redirect
|
|
||||||
- .SUFFIXES:
|
|
||||||
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
||||||
-- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile
|
|
||||||
-+ cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
|
|
||||||
-
|
|
||||||
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
||||||
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
|
||||||
- cd $(top_builddir) \
|
|
||||||
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
||||||
-
|
|
||||||
-@@ -138,6 +138,11 @@
|
|
||||||
- subdir = man
|
|
||||||
-
|
|
||||||
- distdir: $(DISTFILES)
|
|
||||||
-+ here=`cd $(top_builddir) && pwd`; \
|
|
||||||
-+ top_distdir=`cd $(top_distdir) && pwd`; \
|
|
||||||
-+ distdir=`cd $(distdir) && pwd`; \
|
|
||||||
-+ cd $(top_srcdir) \
|
|
||||||
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile
|
|
||||||
- @for file in $(DISTFILES); do \
|
|
||||||
- d=$(srcdir); \
|
|
||||||
- if test -d $$d/$$file; then \
|
|
||||||
+Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
|
|
||||||
+Date: 2010-01-05
|
|
||||||
+Initial Package Version: 0.3.6
|
|
||||||
+Origin: ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
|
|
||||||
+Upstream Status: unknown
|
|
||||||
+Description: add better ipv6 support to oftpd
|
|
||||||
+
|
|
||||||
diff -urN oftpd-0.3.6-orig/src/Makefile.am oftpd-0.3.6/src/Makefile.am
|
|
||||||
--- oftpd-0.3.6-orig/src/Makefile.am Wed Apr 18 01:05:16 2001
|
|
||||||
+++ oftpd-0.3.6/src/Makefile.am Fri Jun 8 19:09:45 2001
|
|
||||||
@@ -148,158 +12,6 @@
|
|
||||||
bin_PROGRAMS = oftpd
|
|
||||||
-oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h daemon_assert.c daemon_assert.h
|
|
||||||
+oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h af_portability.c daemon_assert.c daemon_assert.h
|
|
||||||
-diff -urN oftpd-0.3.6-orig/src/Makefile.in oftpd-0.3.6/src/Makefile.in
|
|
||||||
---- oftpd-0.3.6-orig/src/Makefile.in Mon May 28 00:53:42 2001
|
|
||||||
-+++ oftpd-0.3.6/src/Makefile.in Fri Jun 8 19:09:50 2001
|
|
||||||
-@@ -66,7 +66,7 @@
|
|
||||||
- VERSION = @VERSION@
|
|
||||||
-
|
|
||||||
- bin_PROGRAMS = oftpd
|
|
||||||
--oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h daemon_assert.c daemon_assert.h
|
|
||||||
-+oftpd_SOURCES = file_list.c file_list.h ftp_command.c ftp_command.h ftp_listener.c ftp_listener.h ftp_session.c ftp_session.h oftpd.c oftpd.h telnet_session.c telnet_session.h watchdog.c watchdog.h error.c error.h af_portability.h af_portability.c daemon_assert.c daemon_assert.h
|
|
||||||
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
|
||||||
- CONFIG_HEADER = config.h
|
|
||||||
- CONFIG_CLEAN_FILES =
|
|
||||||
-@@ -78,7 +78,8 @@
|
|
||||||
- LDFLAGS = @LDFLAGS@
|
|
||||||
- LIBS = @LIBS@
|
|
||||||
- oftpd_OBJECTS = file_list.o ftp_command.o ftp_listener.o ftp_session.o \
|
|
||||||
--oftpd.o telnet_session.o watchdog.o error.o daemon_assert.o
|
|
||||||
-+oftpd.o telnet_session.o watchdog.o error.o af_portability.o \
|
|
||||||
-+daemon_assert.o
|
|
||||||
- oftpd_LDADD = $(LDADD)
|
|
||||||
- oftpd_DEPENDENCIES =
|
|
||||||
- oftpd_LDFLAGS =
|
|
||||||
-@@ -93,6 +94,10 @@
|
|
||||||
-
|
|
||||||
- TAR = gtar
|
|
||||||
- GZIP_ENV = --best
|
|
||||||
-+DEP_FILES = .deps/af_portability.P .deps/daemon_assert.P .deps/error.P \
|
|
||||||
-+.deps/file_list.P .deps/ftp_command.P .deps/ftp_listener.P \
|
|
||||||
-+.deps/ftp_session.P .deps/oftpd.P .deps/telnet_session.P \
|
|
||||||
-+.deps/watchdog.P
|
|
||||||
- SOURCES = $(oftpd_SOURCES)
|
|
||||||
- OBJECTS = $(oftpd_OBJECTS)
|
|
||||||
-
|
|
||||||
-@@ -100,9 +105,9 @@
|
|
||||||
- .SUFFIXES:
|
|
||||||
- .SUFFIXES: .S .c .o .s
|
|
||||||
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
|
|
||||||
-- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
|
|
||||||
-+ cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile
|
|
||||||
-
|
|
||||||
--Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
|
|
||||||
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
|
|
||||||
- cd $(top_builddir) \
|
|
||||||
- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
|
|
||||||
-
|
|
||||||
-@@ -160,9 +165,6 @@
|
|
||||||
- rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
|
|
||||||
- done
|
|
||||||
-
|
|
||||||
--.c.o:
|
|
||||||
-- $(COMPILE) -c $<
|
|
||||||
--
|
|
||||||
- .s.o:
|
|
||||||
- $(COMPILE) -c $<
|
|
||||||
-
|
|
||||||
-@@ -217,6 +219,11 @@
|
|
||||||
- subdir = src
|
|
||||||
-
|
|
||||||
- distdir: $(DISTFILES)
|
|
||||||
-+ here=`cd $(top_builddir) && pwd`; \
|
|
||||||
-+ top_distdir=`cd $(top_distdir) && pwd`; \
|
|
||||||
-+ distdir=`cd $(distdir) && pwd`; \
|
|
||||||
-+ cd $(top_srcdir) \
|
|
||||||
-+ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu src/Makefile
|
|
||||||
- @for file in $(DISTFILES); do \
|
|
||||||
- d=$(srcdir); \
|
|
||||||
- if test -d $$d/$$file; then \
|
|
||||||
-@@ -228,6 +235,37 @@
|
|
||||||
- fi; \
|
|
||||||
- done
|
|
||||||
-
|
|
||||||
-+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
|
|
||||||
-+
|
|
||||||
-+-include $(DEP_FILES)
|
|
||||||
-+
|
|
||||||
-+mostlyclean-depend:
|
|
||||||
-+
|
|
||||||
-+clean-depend:
|
|
||||||
-+
|
|
||||||
-+distclean-depend:
|
|
||||||
-+ -rm -rf .deps
|
|
||||||
-+
|
|
||||||
-+maintainer-clean-depend:
|
|
||||||
-+
|
|
||||||
-+%.o: %.c
|
|
||||||
-+ @echo '$(COMPILE) -c $<'; \
|
|
||||||
-+ $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
|
||||||
-+ @-cp .deps/$(*F).pp .deps/$(*F).P; \
|
|
||||||
-+ tr ' ' '\012' < .deps/$(*F).pp \
|
|
||||||
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
|
||||||
-+ >> .deps/$(*F).P; \
|
|
||||||
-+ rm .deps/$(*F).pp
|
|
||||||
-+
|
|
||||||
-+%.lo: %.c
|
|
||||||
-+ @echo '$(LTCOMPILE) -c $<'; \
|
|
||||||
-+ $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
|
|
||||||
-+ @-sed -e 's/^\([^:]*\)\.o[ ]*:/\1.lo \1.o :/' \
|
|
||||||
-+ < .deps/$(*F).pp > .deps/$(*F).P; \
|
|
||||||
-+ tr ' ' '\012' < .deps/$(*F).pp \
|
|
||||||
-+ | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
|
|
||||||
-+ >> .deps/$(*F).P; \
|
|
||||||
-+ rm -f .deps/$(*F).pp
|
|
||||||
- info-am:
|
|
||||||
- info: info-am
|
|
||||||
- dvi-am:
|
|
||||||
-@@ -268,24 +306,26 @@
|
|
||||||
-
|
|
||||||
- maintainer-clean-generic:
|
|
||||||
- mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \
|
|
||||||
-- mostlyclean-compile mostlyclean-tags \
|
|
||||||
-+ mostlyclean-compile mostlyclean-tags mostlyclean-depend \
|
|
||||||
- mostlyclean-generic
|
|
||||||
-
|
|
||||||
- mostlyclean: mostlyclean-am
|
|
||||||
-
|
|
||||||
- clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-tags \
|
|
||||||
-- clean-generic mostlyclean-am
|
|
||||||
-+ clean-depend clean-generic mostlyclean-am
|
|
||||||
-
|
|
||||||
- clean: clean-am
|
|
||||||
-
|
|
||||||
- distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \
|
|
||||||
-- distclean-tags distclean-generic clean-am
|
|
||||||
-+ distclean-tags distclean-depend distclean-generic \
|
|
||||||
-+ clean-am
|
|
||||||
-
|
|
||||||
- distclean: distclean-am
|
|
||||||
-
|
|
||||||
- maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \
|
|
||||||
- maintainer-clean-compile maintainer-clean-tags \
|
|
||||||
-- maintainer-clean-generic distclean-am
|
|
||||||
-+ maintainer-clean-depend maintainer-clean-generic \
|
|
||||||
-+ distclean-am
|
|
||||||
- @echo "This command is intended for maintainers to use;"
|
|
||||||
- @echo "it deletes files that may require special tools to rebuild."
|
|
||||||
-
|
|
||||||
-@@ -296,10 +336,11 @@
|
|
||||||
- maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
|
|
||||||
- mostlyclean-compile distclean-compile clean-compile \
|
|
||||||
- maintainer-clean-compile tags mostlyclean-tags distclean-tags \
|
|
||||||
--clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
|
|
||||||
--check-am installcheck-am installcheck all-recursive-am install-exec-am \
|
|
||||||
--install-exec install-data-am install-data install-am install \
|
|
||||||
--uninstall-am uninstall all-redirect all-am all installdirs \
|
|
||||||
-+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
|
|
||||||
-+distclean-depend clean-depend maintainer-clean-depend info-am info \
|
|
||||||
-+dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
|
|
||||||
-+install-exec-am install-exec install-data-am install-data install-am \
|
|
||||||
-+install uninstall-am uninstall all-redirect all-am all installdirs \
|
|
||||||
- mostlyclean-generic distclean-generic clean-generic \
|
|
||||||
- maintainer-clean-generic clean mostlyclean distclean maintainer-clean
|
|
||||||
-
|
|
||||||
diff -urN oftpd-0.3.6-orig/src/af_portability.c oftpd-0.3.6/src/af_portability.c
|
|
||||||
--- oftpd-0.3.6-orig/src/af_portability.c Thu Jan 1 01:00:00 1970
|
|
||||||
+++ oftpd-0.3.6/src/af_portability.c Fri Jun 8 19:01:31 2001
|
|
||||||
@@ -376,7 +88,7 @@
|
|
||||||
diff -urN oftpd-0.3.6-orig/src/config.h.in oftpd-0.3.6/src/config.h.in
|
|
||||||
--- oftpd-0.3.6-orig/src/config.h.in Sun May 27 23:04:05 2001
|
|
||||||
+++ oftpd-0.3.6/src/config.h.in Fri Jun 8 19:03:43 2001
|
|
||||||
-@@ -100,14 +100,14 @@
|
|
||||||
+@@ -97,15 +97,15 @@
|
|
||||||
/* Define if you have the <limits.h> header file. */
|
|
||||||
#undef HAVE_LIMITS_H
|
|
||||||
|
|
||||||
@@ -388,12 +100,13 @@
|
|
||||||
|
|
||||||
/* Define if you have the <sys/types.h> header file. */
|
|
||||||
#undef HAVE_SYS_TYPES_H
|
|
||||||
--
|
|
||||||
+
|
|
||||||
-/* Define if you have the <syslog.h> header file. */
|
|
||||||
-#undef HAVE_SYSLOG_H
|
|
||||||
-
|
|
||||||
+-
|
|
||||||
/* Define if you have the <unistd.h> header file. */
|
|
||||||
#undef HAVE_UNISTD_H
|
|
||||||
+
|
|
||||||
diff -urN oftpd-0.3.6-orig/src/error.c oftpd-0.3.6/src/error.c
|
|
||||||
--- oftpd-0.3.6-orig/src/error.c Wed Apr 18 23:41:04 2001
|
|
||||||
+++ oftpd-0.3.6/src/error.c Thu Jun 21 20:57:09 2001
|
|
||||||
@@ -1436,7 +1149,7 @@
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
if (memcmp(&f->client_addr.sin_addr,
|
|
||||||
-@@ -1803,20 +1893,69 @@
|
|
||||||
+@@ -1811,20 +1901,69 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
in order for pthread_cancel to work (which oftpd uses to close inactive
|
|
||||||
connections), most ports need to load libgcc_s.so.1. but when oftpd uses
|
|
||||||
a chroot, that file is no longer available (in fact, it'll try to load it
|
|
||||||
from the chroot itself which is kind of a security issue). so have the
|
|
||||||
code proactively link against libgcc_s when it is found so that the lib
|
|
||||||
is already loaded when we cancel.
|
|
||||||
|
|
||||||
--- a/configure.in
|
|
||||||
+++ b/configure.in
|
|
||||||
@@ -39,6 +39,7 @@ AC_FUNC_STRFTIME
|
|
||||||
AC_CHECK_FUNCS(getcwd gettimeofday select socket strerror localtime_r gmtime_r)
|
|
||||||
dnl AC_CHECK_LIB(pthread, pthread_create)
|
|
||||||
dnl AC_SEARCH_LIBS(pthread_create, [ pthread pthreads thread threads ])
|
|
||||||
+AC_CHECK_LIB(gcc_s, _Unwind_Resume)
|
|
||||||
AC_SEARCH_LIBS(socket, socket)
|
|
||||||
AC_SEARCH_LIBS(inet_ntoa, nsl)
|
|
||||||
AC_CHECK_FUNCS(inet_aton)
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
--- oftpd-0.3.7/src/daemon_assert.c
|
|
||||||
+++ oftpd-0.3.7/src/daemon_assert.c
|
|
||||||
@@ -3,6 +3,7 @@
|
|
||||||
#include <pthread.h>
|
|
||||||
#include <syslog.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
+#include <unistd.h>
|
|
||||||
|
|
||||||
#ifndef NDEBUG
|
|
||||||
void daemon_assert_fail(const char *assertion,
|
|
||||||
@@ -13,7 +13,7 @@
|
|
||||||
{
|
|
||||||
syslog(LOG_CRIT, "%s:%d: %s: %s", file, line, function, assertion);
|
|
||||||
fprintf(stderr, "%s:%d: %s: %s\n", file, line, function, assertion);
|
|
||||||
- exit(1);
|
|
||||||
+ _exit(1);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@ -1,9 +0,0 @@
|
|||||||
[Unit]
|
|
||||||
Description=oftpd is designed to be as secure as an anonymous FTP server can possibly be.
|
|
||||||
After=syslog.target network.target
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
ExecStart=/usr/sbin/oftpd --daemon --no-fork --user nobody --group nobody $TFTPD_ROOT
|
|
||||||
|
|
||||||
[Install]
|
|
||||||
WantedBy=multi-user.target
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
[Service]
|
|
||||||
Environment="TPD_ROOT=/tftproot"
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
|
||||||
<pkgmetadata>
|
|
||||||
<!-- maintainer-needed -->
|
|
||||||
</pkgmetadata>
|
|
||||||
@ -1,55 +0,0 @@
|
|||||||
# Copyright 1999-2018 Gentoo Foundation
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
EAPI=4
|
|
||||||
|
|
||||||
inherit autotools eutils
|
|
||||||
|
|
||||||
DESCRIPTION="Secure, small, anonymous only ftpd"
|
|
||||||
HOMEPAGE="http://www.time-travellers.org/oftpd"
|
|
||||||
SRC_URI="http://www.time-travellers.org/oftpd/${P}.tar.gz
|
|
||||||
ftp://ftp.deepspace6.net/pub/ds6/sources/${PN}/${PN}-0.3.6-ipv6rel2.patch.gz
|
|
||||||
http://flashback.sorbs.net/packages/ports/ftp/oftpd/files/patch-ftp_session.c -> ${PN}-ftp_session.patch"
|
|
||||||
|
|
||||||
LICENSE="BSD-2"
|
|
||||||
SLOT="0"
|
|
||||||
KEYWORDS="amd64 arm ppc ppc64 sh sparc x86"
|
|
||||||
IUSE="ipv6"
|
|
||||||
|
|
||||||
DEPEND="net-ftp/ftpbase"
|
|
||||||
RDEPEND="${DEPEND}"
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
cd "${WORKDIR}" || die
|
|
||||||
epatch "${FILESDIR}"/oftpd-0.3.7-ipv6rel2-0.3.6-to-0.3.7.patch
|
|
||||||
|
|
||||||
cd "${S}" || die
|
|
||||||
epatch "${WORKDIR}"/${PN}-0.3.6-ipv6rel2.patch
|
|
||||||
epatch "${DISTDIR}"/${PN}-ftp_session.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-0.3.7-delay-root-check.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-0.3.7-error-output.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-0.3.7-pthread-cancel.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-0.3.7-configure-ipv6.patch
|
|
||||||
epatch "${FILESDIR}"/${PN}-0.3.7-ipv4.patch
|
|
||||||
|
|
||||||
# Don't crash when using an unsupported address family, #159178.
|
|
||||||
# updated in bug #157005
|
|
||||||
epatch "${FILESDIR}"/${P}-family-1.patch
|
|
||||||
|
|
||||||
# htons patch #371963
|
|
||||||
epatch "${FILESDIR}"/${P}-htons.patch
|
|
||||||
|
|
||||||
epatch "${FILESDIR}"/${P}-unistd.patch
|
|
||||||
eautoreconf
|
|
||||||
}
|
|
||||||
|
|
||||||
src_configure() {
|
|
||||||
econf --bindir=/usr/sbin $(use_enable ipv6)
|
|
||||||
}
|
|
||||||
|
|
||||||
src_install() {
|
|
||||||
default
|
|
||||||
keepdir /home/ftp
|
|
||||||
newinitd "${FILESDIR}"/init.d.oftpd-r7 oftpd
|
|
||||||
newconfd "${FILESDIR}"/conf.d.oftpd-r7 oftpd
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue
Block a user