Attachment 115718 Details for Bug 157513 – file.diff

[patch] file.diff

file.diff (text/plain), 3.56 KB, created by Ryan Steinmetz on 2011-06-02 01:00:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan Steinmetz

Created: 2011-06-02 01:00:19 UTC

Size: 3.56 KB

patch

obsolete

>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
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=		${SAMBA_BASENAME}35
>-PORTVERSION=		3.5.6
>-PORTREVISION?=	2
>+PORTVERSION=		3.5.8
> CATEGORIES?=		net
> MASTER_SITES=		${MASTER_SITE_SAMBA}
> MASTER_SITE_SUBDIR=	. old-versions rc pre
>@@ -74,7 +73,7 @@
> CPPFLAGS+=		-I${LOCALBASE}/include
> LDFLAGS+=		-L${LOCALBASE}/lib
> 
>-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
>+CONFIGURE_ENV+=		CPPFLAGS+="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
> 			PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
> 			PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
> # pkg-config is used to find talloc
>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
>@@ -1,2 +1,2 @@
>-SHA256 (samba-3.5.6.tar.gz) = 466410868375d19a286ac3fc5d9f3c267ce359189f8e0d76e72ec10bd54247da
>-SIZE (samba-3.5.6.tar.gz) = 30803319
>+SHA256 (samba-3.5.8.tar.gz) = 331e3f2806edcad853b48f4b1e653367ad9a6ce1ab5ed486c03a6bf614882796
>+SIZE (samba-3.5.8.tar.gz) = 30721269
>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
>@@ -1,60 +1,6 @@
>-0001-s3-Fix-another-aspect-of-bug-7262.patch
>-samba3-3.4-honor-all-loopback-ips.patch
>-
>-From 325f03d3df7afb758b6815d327739fc121dbbe71 Mon Sep 17 00:00:00 2001
>-From: Volker Lendecke <vl@samba.org>
>-Date: Tue, 6 Jul 2010 16:55:14 +0200
>-Subject: [PATCH] s3: Fix another aspect of bug 7262 and make paged results work again
>----
>- source3/passdb/pdb_ldap.c |    8 ++++----
>- 1 files changed, 4 insertions(+), 4 deletions(-)
>-
>-diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
>-index 6ac8f0d..f4c8dbe 100644
>---- a/source3/passdb/pdb_ldap.c
>-+++ b/source3/passdb/pdb_ldap.c
>-@@ -4483,10 +4483,6 @@ static bool ldapsam_search_next_entry(struct pdb_search *search,
>- 	bool result;
>- 
>-  retry:
>--	if (state->current_entry == NULL) {
>--		return false;
>--	}
>--
>- 	if ((state->entries == NULL) && (state->pagedresults_cookie == NULL))
>- 		return False;
>- 
>-@@ -4494,6 +4490,10 @@ static bool ldapsam_search_next_entry(struct pdb_search *search,
>- 	    !ldapsam_search_nextpage(search))
>- 		    return False;
>- 
>-+	if (state->current_entry == NULL) {
>-+		return false;
>-+	}
>-+
>- 	result = state->ldap2displayentry(state, search,
>- 					  state->connection->ldap_struct,
>- 					  state->current_entry, entry);
>--- 
>-1.6.0.4
>-
>-commit b6afe7ef236a454d8a6abf104b8846f817378f73
>-Author: BjÃ¶rn Jacke <bj@sernet.de>
>-Date:   Thu Oct 15 02:02:30 2009 +0200
>-
>-    util: cope the all loopback addresses IPv4 knows
>-    
>-    The fact that we just recogniced 127.0.0.1 as loopback IP address and not the
>-    rest of the 127.0.0.0/8 IP address range we used the lo interface for sending
>-    packages even though we should send them to some more physical interface. This
>-    way we ended up with failing WINS registration and so on like in #6348.
>-    On the lo interface sendto() returned "Invalid Argument" (EINVAL).
>-
>-diff --git a/lib/util/util_net.c b/lib/util/util_net.c
>-index 0ce495e..0511a28 100644
>---- a/lib/util/util_net.c
>-+++ b/lib/util/util_net.c
>-@@ -351,13 +351,11 @@ bool is_broadcast_addr(const struct sockaddr *pss)
>+--- a/lib/util/util_net.c	2011-03-06 13:48:05.000000000 -0500
>++++ b/lib/util/util_net.c	2011-06-01 18:35:34.000000000 -0400
>+@@ -351,13 +351,11 @@
>  }
>  
>  /**

Actions: View | Diff

Attachments on bug 157513: 115718 | 115719