Archives
Archives
| From: | "Markos Chandras (hwoarang)" <hwoarang@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-ftp/vsftpd/files: vsftpd-2.3.2-as-needed.patch vsftpd-2.3.2-kerberos.patch |
| Date: | Mon, 27 Sep 2010 17:19:39 |
| Message-Id: | 20100927171935.DFEBF20054@flycatcher.gentoo.org |
| 1 | hwoarang 10/09/27 17:19:35 |
| 2 | |
| 3 | Added: vsftpd-2.3.2-as-needed.patch |
| 4 | vsftpd-2.3.2-kerberos.patch |
| 5 | Log: |
| 6 | Revbump to fix bug #335977 and bug #335980. Thanks to Joakim Tjernlund <Joakim.Tjernlund@×××××××××.se> |
| 7 | |
| 8 | (Portage version: 2.2_rc86/cvs/Linux x86_64) |
| 9 | |
| 10 | Revision Changes Path |
| 11 | 1.1 net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch |
| 12 | |
| 13 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch?rev=1.1&view=markup |
| 14 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch?rev=1.1&content-type=text/plain |
| 15 | |
| 16 | Index: vsftpd-2.3.2-as-needed.patch |
| 17 | =================================================================== |
| 18 | Index: vsftpd-2.3.2/Makefile |
| 19 | =================================================================== |
| 20 | --- vsftpd-2.3.2.orig/Makefile |
| 21 | +++ vsftpd-2.3.2/Makefile |
| 22 | @@ -21,7 +21,7 @@ OBJS = main.o utility.o prelogin.o ftpcm |
| 23 | $(CC) -c $*.c $(CFLAGS) $(IFLAGS) |
| 24 | |
| 25 | vsftpd: $(OBJS) |
| 26 | - $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS) |
| 27 | + $(CC) -o vsftpd $(LDFLAGS) $(OBJS) $(LINK) $(LIBS) |
| 28 | |
| 29 | install: |
| 30 | if [ -x /usr/local/sbin ]; then \ |
| 31 | |
| 32 | |
| 33 | |
| 34 | 1.1 net-ftp/vsftpd/files/vsftpd-2.3.2-kerberos.patch |
| 35 | |
| 36 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.3.2-kerberos.patch?rev=1.1&view=markup |
| 37 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.3.2-kerberos.patch?rev=1.1&content-type=text/plain |
| 38 | |
| 39 | Index: vsftpd-2.3.2-kerberos.patch |
| 40 | =================================================================== |
| 41 | Index: vsftpd-2.3.2/twoprocess.c |
| 42 | =================================================================== |
| 43 | --- vsftpd-2.3.2.orig/twoprocess.c |
| 44 | +++ vsftpd-2.3.2/twoprocess.c |
| 45 | @@ -284,6 +284,7 @@ process_login_req(struct vsf_session* p_ |
| 46 | { |
| 47 | enum EVSFPrivopLoginResult e_login_result = kVSFLoginNull; |
| 48 | char cmd; |
| 49 | + vsf_sysutil_install_null_sighandler(kVSFSysUtilSigCHLD); |
| 50 | /* Blocks */ |
| 51 | cmd = priv_sock_get_cmd(p_sess->parent_fd); |
| 52 | if (cmd != PRIV_SOCK_LOGIN) |
| 53 | @@ -363,7 +364,6 @@ common_do_login(struct vsf_session* p_se |
| 54 | int was_anon = anon; |
| 55 | const struct mystr* p_orig_user_str = p_user_str; |
| 56 | int newpid; |
| 57 | - vsf_sysutil_install_null_sighandler(kVSFSysUtilSigCHLD); |
| 58 | /* Tells the pre-login child all is OK (it may exit in response) */ |
| 59 | priv_sock_send_result(p_sess->parent_fd, PRIV_SOCK_RESULT_OK); |
| 60 | if (!p_sess->control_use_ssl) |