diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-06-24 06:03:54 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-06-24 06:03:54 +0000 |
| commit | 104e7811b8a334e54479c8994d23aa994792cbe0 (patch) | |
| tree | 80d2c3f621004e87edb01bece9c74b40fdcec605 /net-ftp/ftp | |
| parent | arm/hppa/ia64/s390/sh stable #137141 (diff) | |
| download | gentoo-2-104e7811b8a334e54479c8994d23aa994792cbe0.tar.gz gentoo-2-104e7811b8a334e54479c8994d23aa994792cbe0.tar.bz2 gentoo-2-104e7811b8a334e54479c8994d23aa994792cbe0.zip | |
fix building with USE=-ssl #137796
(Portage version: 2.1.1_pre1-r1)
Diffstat (limited to 'net-ftp/ftp')
| -rw-r--r-- | net-ftp/ftp/files/netkit-ftp-0.17-ssl-0.2.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/net-ftp/ftp/files/netkit-ftp-0.17-ssl-0.2.patch b/net-ftp/ftp/files/netkit-ftp-0.17-ssl-0.2.patch index 7f5558182188..2d45b7b1ff95 100644 --- a/net-ftp/ftp/files/netkit-ftp-0.17-ssl-0.2.patch +++ b/net-ftp/ftp/files/netkit-ftp-0.17-ssl-0.2.patch @@ -17,23 +17,21 @@ *) echo "Unrecognized option: $1"; exit 1;; esac shift -@@ -152,3 +155,17 @@ +@@ -152,3 +155,15 @@ rm -f __conftest* +################################################## +## Enable SSL +echo -n "Whether to enable SSL support... " +if [ x"$ENABLE_SSL" = x"yes" ]; then -+ echo yes -+ CFLAGS="$CFLAGS -DUSE_SSL" ++ echo yes ++ CFLAGS="$CFLAGS -DUSE_SSL" ++ ## we should do tests here, but screw it, i'm lazy :P ++ LIBS="$LIBS -lssl -lcrypto" +else -+ echo no ++ echo no +fi + -+## we should do tests here, but screw it, i'm lazy :P -+LIBS="$LIBS -lssl -lcrypto" -+ -+ ################################################## --- netkit-ftp-0.17/ftp/cmds.c +++ netkit-ftp-0.17+ssl-0.2/ftp/cmds.c @@ -42,7 +40,7 @@ port = ftp_port; if (argc > 2) { +#ifdef USE_SSL -+ /* not really an SSL enhancement but something that ++ /* not really an SSL enhancement but something that + * should have always been here --tjh + */ + if (!isdigit(argv[2][0])) { @@ -147,10 +145,10 @@ static sigjmp_buf ptabort; static int ptabflg = 0; static int abrtflag = 0; -+#ifdef USE_SSL -+static int pdata = -1; +static int +auth_user(char *u,char *p); ++#ifdef USE_SSL ++static int pdata = -1; +static int +ssl_getc(SSL *ssl_con); +static int |