From nobody@FreeBSD.org  Mon Jun  6 10:42:09 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED2211065678
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  6 Jun 2011 10:42:09 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id C45C58FC0C
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  6 Jun 2011 10:42:09 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p56Ag9oq061234
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 6 Jun 2011 10:42:09 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p56Ag9Ao061233;
	Mon, 6 Jun 2011 10:42:09 GMT
	(envelope-from nobody)
Message-Id: <201106061042.p56Ag9Ao061233@red.freebsd.org>
Date: Mon, 6 Jun 2011 10:42:09 GMT
From: Ovidiu <ovip1985@yahoo.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: update ports
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         157656
>Category:       ports
>Synopsis:       failing to update port net/samba35
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    timur
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 06 10:50:03 UTC 2011
>Closed-Date:    Mon Jun 20 01:39:19 UTC 2011
>Last-Modified:  Mon Jun 20 01:39:19 UTC 2011
>Originator:     Ovidiu
>Release:        8.2
>Organization:
none
>Environment:
FreeBSD date.local 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011     root@almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC  i386

>Description:
Hi
I'm tried to update samba
http://www.freebsd.org/cgi/query-pr.cgi?pr=157513

I tried to apply the patch but i have this error




patch -p1 < patch.txt
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|
|diff -urN /usr/ports/net/samba35/Makefile samba35/Makefile
|--- /usr/ports/net/samba35/Makefile    2011-02-24 20:32:01.000000000 -0500
|+++ samba35/Makefile   2011-06-01 19:06:28.000000000 -0400
--------------------------
Patching file Makefile using Plan A...
Hunk #1 succeeded at 6.
Hunk #2 succeeded at 73.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urN /usr/ports/net/samba35/distinfo samba35/distinfo
|--- /usr/ports/net/samba35/distinfo    2010-11-15 07:29:21.000000000 -0500
|+++ samba35/distinfo   2011-06-01 18:34:50.000000000 -0400
--------------------------
Patching file distinfo using Plan A...
Hunk #1 succeeded at 1.
Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff -urN /usr/ports/net/samba35/files/sernet.patch samba35/files/sernet.patch
|--- /usr/ports/net/samba35/files/sernet.patch  2010-10-25 22:41:58.000000000
-0400
|+++ samba35/files/sernet.patch 2011-06-01 18:43:00.000000000 -0400
--------------------------
Patching file files/sernet.patch using Plan A...
Hunk #1 failed at 1.
1 out of 1 hunks failed--saving rejects to files/sernet.patch.rej
Hmm...  Ignoring the trailing garbage.
done





If I try to install samba i have this errors:


===>  Applying extra patch /usr/ports/net/samba35/files/sernet.patch
Ignoring previously applied (or reversed) patch.
2 out of 2 hunks ignored--saving rejects to source3/passdb/pdb_ldap.c.rej
*** Error code 2

Stop in /usr/ports/net/samba35.
*** Error code 1

Stop in /usr/ports/net/samba35.
>How-To-Repeat:

>Fix:


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-i386->freebsd-ports-bugs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Mon Jun 13 06:49:30 UTC 2011 
Responsible-Changed-Why:  
ports PR. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157656 
State-Changed-From-To: open->feedback 
State-Changed-By: crees 
State-Changed-When: Sun Jun 19 10:22:08 UTC 2011 
State-Changed-Why:  
Ask for feedback on suggestion 


Class-Changed-From-To: update->sw-bug 
Class-Changed-By: crees 
Class-Changed-When: Sun Jun 19 10:22:08 UTC 2011 
Class-Changed-Why:  
Correct class 


Responsible-Changed-From-To: freebsd-ports-bugs->timur 
Responsible-Changed-By: crees 
Responsible-Changed-When: Sun Jun 19 10:22:08 UTC 2011 
Responsible-Changed-Why:  
Assign to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157656 

From: Chris Rees <crees@freebsd.org>
To: bug-followup@freebsd.org, Ovidiu <ovip1985@yahoo.com>
Cc:  
Subject: Re: ports/157656: failing to update port net/samba35
Date: Sun, 19 Jun 2011 11:21:30 +0100

 Hi,
 
 That patchfile should have been removed.
 
 In your port directory:
 
 # find . -name '*.orig' -delete
 # find . -name '*.rej' -delete
 # rm files/sernet.patch
 
 Does that help?
 
 Chris
State-Changed-From-To: feedback->closed 
State-Changed-By: timur 
State-Changed-When: Mon Jun 20 01:39:18 UTC 2011 
State-Changed-Why:  
Wait for the new port. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157656 
>Unformatted:
