Bug 107395

Summary: [PATCH] net-p2p/py-bittorrent stale patches break build
Product: Ports & Packages Reporter: Emil Mikulic <emil>
Component: Individual Port(s)Assignee: Mario Sergio Fujikawa Ferreira <lioux>
Status: Closed FIXED    
Severity: Affects Only Me CC: lioux
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description Emil Mikulic 2007-01-01 14:10:16 UTC 
	Some of the psyco patches in /usr/ports/net-p2p/py-bittorrent/files
	don't apply because the vendor sources have changed.

	Patch to fix the patches attached in Fix section.  CC'd maintainer.

How-To-Repeat: 	# portsnap extract net-p2p/py-bittorrent
	# cd /usr/ports/net-p2p/py-bittorrent/
	# make
	===> Define WITHOUT_GUI to disable GUI installation
	===> Define WITHOUT_PSYCO to disable devel/py-psyco optimization
	===>  Vulnerability check disabled, database not found
	===>  Extracting for py24-BitTorrent-4.26.0,1
	=> MD5 Checksum OK for BitTorrent-4.26.0.tar.gz.
	=> SHA256 Checksum OK for BitTorrent-4.26.0.tar.gz.
	===>  Patching for py24-BitTorrent-4.26.0,1
	===>  Applying extra patch /usr/ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-console.py
	1 out of 1 hunks failed--saving rejects to bittorrent-console.py.rej
	*** Error code 1
	#
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2007-01-01 14:10:29 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->lioux

Over to maintainer
Comment 2 Emil Mikulic 2007-01-01 14:24:38 UTC 
On Mon, Jan 01, 2007 at 02:10:16PM +0000, FreeBSD-gnats-submit@FreeBSD.org wrote:
> Thank you very much for your problem report.
> It has the internal identification `ports/107395'.
> The individual assigned to look at your
> report is: freebsd-ports-bugs. 
> 
> You can access the state of your problem report at any time
> via this link:
> 
> http://www.freebsd.org/cgi/query-pr.cgi?pr=107395
> 
> >Category:       ports
> >Responsible:    freebsd-ports-bugs
> >Synopsis:       [PATCH] net-p2p/py-bittorrent stale patches break build
> >Arrival-Date:   Mon Jan 01 14:10:16 GMT 2007

Additionally, the following is needed to fix two problematic imports in
the upstream sources:

diff -ur BitTorrent-4.26.0/bittorrent-console.py BitTorrent-4.26.0-task/bittorrent-console.py
--- BitTorrent-4.26.0/bittorrent-console.py	Wed Oct 11 08:24:11 2006
+++ BitTorrent-4.26.0-task/bittorrent-console.py	Tue Jan  2 01:19:15 2007
@@ -39,7 +39,7 @@
 from BTL import GetTorrent
 from BTL.ConvertedMetainfo import ConvertedMetainfo
 from BitTorrent.MultiTorrent import TorrentNotInitialized
-from BitTorrent.RawServer_twisted import RawServer, task
+from BitTorrent.RawServer_twisted import RawServer
 from BitTorrent.UI import Size, Duration
 inject_main_logfile()
 from BitTorrent import console
diff -ur BitTorrent-4.26.0/bittorrent-curses.py BitTorrent-4.26.0-task/bittorrent-curses.py
--- BitTorrent-4.26.0/bittorrent-curses.py	Wed Oct 11 08:24:14 2006
+++ BitTorrent-4.26.0-task/bittorrent-curses.py	Tue Jan  2 01:19:28 2007
@@ -42,7 +42,7 @@
 from BitTorrent import BTFailure, UserFailure
 from BitTorrent import version
 from BTL import GetTorrent
-from BitTorrent.RawServer_twisted import RawServer, task
+from BitTorrent.RawServer_twisted import RawServer
 from BTL.ConvertedMetainfo import ConvertedMetainfo
 from BTL.yielddefer import launch_coroutine, _wrap_task
 from BitTorrent import inject_main_logfile
Comment 3 dfilter service freebsd_committer freebsd_triage 2007-01-20 13:39:06 UTC 
pav         2007-01-20 13:39:00 UTC

  FreeBSD ports repository

  Modified files:
    net-p2p/py-bittorrent Makefile 
    net-p2p/py-bittorrent/files 
                                extra-psyco-patch-bittorrent-console.py 
                                extra-psyco-patch-bittorrent-curses.py 
                                extra-psyco-patch-bittorrent-tracker.py 
                                extra-psyco-patch-bittorrent.py 
                                extra-psyco-patch-changetracker-console.py 
                                extra-psyco-patch-launchmany-curses.py 
                                extra-psyco-patch-maketorrent.py 
                                extra-psyco-patch-torrentinfo-console.py 
                                patch-bittorrent-console.py 
                                patch-bittorrent-curses.py 
  Log:
  - Fix patch with psyco
  - Fix two problematic imports in vendor code
  - Unbreak
  
  PR:             ports/107395
  Submitted by:   Emil Mikulic <emil@cs.rmit.edu.au>
  Approved by:    maintainer timeout (lioux; 19 days)
  
  Revision  Changes    Path
  1.49      +0 -2      ports/net-p2p/py-bittorrent/Makefile
  1.3       +2 -2      ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-console.py
  1.3       +1 -1      ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-curses.py
  1.2       +2 -2      ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent-tracker.py
  1.3       +1 -1      ports/net-p2p/py-bittorrent/files/extra-psyco-patch-bittorrent.py
  1.3       +1 -1      ports/net-p2p/py-bittorrent/files/extra-psyco-patch-changetracker-console.py
  1.3       +4 -4      ports/net-p2p/py-bittorrent/files/extra-psyco-patch-launchmany-curses.py
  1.3       +2 -2      ports/net-p2p/py-bittorrent/files/extra-psyco-patch-maketorrent.py
  1.3       +2 -2      ports/net-p2p/py-bittorrent/files/extra-psyco-patch-torrentinfo-console.py
  1.2       +9 -0      ports/net-p2p/py-bittorrent/files/patch-bittorrent-console.py
  1.2       +9 -0      ports/net-p2p/py-bittorrent/files/patch-bittorrent-curses.py
_______________________________________________
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 4 Pav Lucistnik freebsd_committer freebsd_triage 2007-01-20 13:39:14 UTC 
State Changed
From-To: open->closed

Committed, thanks!