Bug 122355 - ftp/proftpd: cannot apply pathset with some combination options
Summary: ftp/proftpd: cannot apply pathset with some combination options
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Beech Rintoul
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2008-04-01 21:20 UTC by admin
Modified: 2008-04-02 02:20 UTC (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description admin 2008-04-01 21:20:02 UTC 
PORTNAME=       proftpd
DISTVERSION=    1.3.1
PORTREVISION=   11
===========
if I set both
[X] CYRFIX           Patch to fix cyrillic encoding  
[X] CODECONV         Use charset conversion (mod_codeconv) 
I have:
make
===>  Vulnerability check disabled, database not found
===>  Found saved configuration for proftpd-1.3.1_11
===>  Extracting for proftpd-1.3.1_11
=> MD5 Checksum OK for proftpd-1.3.1.tar.bz2.
=> SHA256 Checksum OK for proftpd-1.3.1.tar.bz2.
===>  Patching for proftpd-1.3.1_11
===>  Applying extra patch /usr/ports/ftp/proftpd/files/extra-patch-cyrillic-fix-netio.c
===>  Applying extra patch /usr/ports/ftp/proftpd/files/extra-patch-mod-codeconv
1 out of 3 hunks failed--saving rejects to src/netio.c.rej
*** Error code 1

Stop in /usr/ports/ftp/proftpd.
*** Error code 1

Stop in /usr/ports/ftp/proftpd.

Fix: 

include patch CYRFIX to CODECONV?
How-To-Repeat: always with both options
Comment 1 Mark Linimon freebsd_committer freebsd_triage 2008-04-02 01:07:45 UTC 
Responsible Changed
From-To: freebsd-bugs->beech

Make this a ports PR and assign.
Comment 2 dfilter service freebsd_committer freebsd_triage 2008-04-02 02:15:51 UTC 
beech       2008-04-02 01:15:47 UTC

  FreeBSD ports repository

  Modified files:
    ftp/proftpd          Makefile 
    ftp/proftpd/files    extra-patch-mod-codeconv 
  Removed files:
    ftp/proftpd/files    extra-patch-cyrillic-fix-netio.c 
  Log:
  - Remove cyrillic-fix-netio.c (handled by CODECONV)
  - Bump portrevision
  
  PR:             ports/122355
  Submitted by:   Alex Keda <admin@lissyara.su>
  
  Revision  Changes    Path
  1.132     +1 -6      ports/ftp/proftpd/Makefile
  1.2       +0 -50     ports/ftp/proftpd/files/extra-patch-cyrillic-fix-netio.c (dead)
  1.5       +1 -131    ports/ftp/proftpd/files/extra-patch-mod-codeconv
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 3 Beech Rintoul freebsd_committer freebsd_triage 2008-04-02 02:18:00 UTC 
State Changed
From-To: open->closed

Committed (fixed), Thanks!