Date: Thu, 30 Sep 2010 13:45:10 -0700 (PDT) From: Renato Botelho <garga@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: timur@FreeBSD.org Subject: ports/151125: [PATCH] net/samba-pdbsql: update to 34 Message-ID: <20100930204506.25837.qmail@botelhor.bplab.local> Resent-Message-ID: <201009302050.o8UKo1iB045975@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 151125
>Category: ports
>Synopsis: [PATCH] net/samba-pdbsql: update to 34
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Sep 30 20:50:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Renato Botelho
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
FreeBSD.org
>Environment:
System: FreeBSD botelhor.bplab.local 9.0-CURRENT FreeBSD 9.0-CURRENT #3 r213276M: Wed Sep 29 18:44:08 BRT
>Description:
- Update to 34, this version builds fine with samba 3.4
- Unhide install commands
Added file(s):
- files/patch-Makefile.in
Removed file(s):
- files/patch-pdb_pgsql.c
Port maintainer (timur@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- samba-pdbsql-34.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net/samba-pdbsql/Makefile,v
retrieving revision 1.11
diff -u -u -r1.11 Makefile
--- Makefile 15 Sep 2010 18:35:01 -0000 1.11
+++ Makefile 30 Sep 2010 20:44:27 -0000
@@ -6,24 +6,21 @@
#
PORTNAME= pdbsql
-PORTVERSION= 0.3.1
-PORTREVISION= 2
+PORTVERSION= 34
CATEGORIES= net
-MASTER_SITES= SF
+MASTER_SITES= SF/${PORTNAME}/${PORTNAME}_${PORTVERSION}/
PKGNAMEPREFIX= samba-
DISTNAME= ${PORTNAME}-${PORTVERSION}
MAINTAINER= timur@FreeBSD.org
COMMENT= Multiplexor, MySQL and PostgeSQL passdb backends for Samba3
-USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
# Add a build dependency for Samba port
USE_AUTOTOOLS= autoconf:267 autoheader:267
-WRKSRC= ${WRKDIR}/${DISTNAME}-samba
-SAMBA_PORT= net/samba3
+SAMBA_PORT?= net/samba34
OPTIONS= MYSQL "With MySQL passdb backend" on \
PGSQL "With PostgreSQL passdb backend" on
@@ -45,6 +42,9 @@
CONFIGURE_ARGS+= --libdir=${SAMBA_PDBDIR} \
--with-samba-dir=${SAMBA_WRKSRC}
+PLIST_SUB+= SAMBA_PDBDIR=${SAMBA_PDBDIR:S/${PREFIX}\///} \
+ SAMBA_MODULEDIR=${SAMBA_MODULEDIR:S/${PREFIX}\///}
+
.if exists(${LOCALBASE}/bin/mysql)
WITH_MYSQL= yes
. undef WITHOUT_MYSQL
@@ -77,22 +77,18 @@
do-install:
@${MKDIR} ${EXAMPLESDIR}
@${MKDIR} ${SAMBA_PDBDIR}
- @${INSTALL_PROGRAM} ${WRKSRC}/multi.so ${SAMBA_PDBDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/multi.so ${SAMBA_PDBDIR}
.if !defined(WITHOUT_MYSQL)
- @${INSTALL_PROGRAM} ${WRKSRC}/mysql.so ${SAMBA_PDBDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/mysql.so ${SAMBA_PDBDIR}
. for f in mysql.dump smb.conf.mysql
- @${INSTALL_DATA} ${WRKSRC}/docs/${f} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${EXAMPLESDIR}
. endfor
.endif
.if !defined(WITHOUT_PGSQL)
- @${INSTALL_PROGRAM} ${WRKSRC}/pgsql.so ${SAMBA_PDBDIR}
+ ${INSTALL_PROGRAM} ${WRKSRC}/pgsql.so ${SAMBA_PDBDIR}
. for f in pgsql.dump smb.conf.pgsql
- @${INSTALL_DATA} ${WRKSRC}/docs/${f} ${EXAMPLESDIR}
+ ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${EXAMPLESDIR}
. endfor
.endif
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/docs/pdb_mysql.xml ${DOCSDIR}
-.endif
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/net/samba-pdbsql/distinfo,v
retrieving revision 1.2
diff -u -u -r1.2 distinfo
--- distinfo 1 May 2008 13:06:37 -0000 1.2
+++ distinfo 30 Sep 2010 20:44:27 -0000
@@ -1,3 +1,3 @@
-MD5 (pdbsql-0.3.1.tar.bz2) = ff111de303d55c1a6777b48f1b963151
-SHA256 (pdbsql-0.3.1.tar.bz2) = db67ba994b7536f72d8674606670a9a59f41a24901322262891819d10e558938
-SIZE (pdbsql-0.3.1.tar.bz2) = 85554
+MD5 (pdbsql-34.tar.gz) = f6fe0040970affa5b55410173e28b12d
+SHA256 (pdbsql-34.tar.gz) = bc31091a4cbdf6c66505dc5e9789e4091aa3dd6a12d438b4534f92f194cd5b4d
+SIZE (pdbsql-34.tar.gz) = 64098
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/net/samba-pdbsql/pkg-plist,v
retrieving revision 1.1
diff -u -u -r1.1 pkg-plist
--- pkg-plist 31 Aug 2006 19:36:53 -0000 1.1
+++ pkg-plist 30 Sep 2010 20:44:27 -0000
@@ -1,12 +1,10 @@
-lib/samba/pdb/multi.so
-%%MYSQL%%lib/samba/pdb/mysql.so
-%%PGSQL%%lib/samba/pdb/pgsql.so
+%%SAMBA_PDBDIR%%/multi.so
+%%MYSQL%%%%SAMBA_PDBDIR%%/mysql.so
+%%PGSQL%%%%SAMBA_PDBDIR%%/pgsql.so
%%MYSQL%%%%EXAMPLESDIR%%/mysql.dump
%%MYSQL%%%%EXAMPLESDIR%%/smb.conf.mysql
%%PGSQL%%%%EXAMPLESDIR%%/pgsql.dump
%%PGSQL%%%%EXAMPLESDIR%%/smb.conf.pgsql
-%%PORTDOCS%%%%DOCSDIR%%/pdb_mysql.xml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%EXAMPLESDIR%%
-@dirrmtry lib/samba/pdb
-@dirrmtry lib/samba
+@dirrmtry %%SAMBA_PDBDIR%%
+@dirrmtry %%SAMBA_MODULEDIR%%
Index: files/patch-Makefile.in
===================================================================
RCS file: files/patch-Makefile.in
diff -N files/patch-Makefile.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-Makefile.in 30 Sep 2010 20:44:27 -0000
@@ -0,0 +1,15 @@
+--- Makefile.in.orig 2010-09-30 16:53:15.000000000 -0300
++++ Makefile.in 2010-09-30 16:53:47.000000000 -0300
+@@ -9,10 +9,10 @@
+
+ MYSQL_LIBS = @MYSQL_LIBS@
+ PGSQL_LIBS = @PGSQL_LIBS@
+-TALLOC_LIBS = -ltalloc
++TALLOC_LIBS =
+ SOURCEDIR = @SOURCEDIR@
+ LIBDIR = @LIBDIR@
+-CFLAGS = @CFLAGS@ -I$(SOURCEDIR)/source3 -I$(SOURCEDIR)/source3/include -I$(SOURCEDIR)/source3/librpc -I$(SOURCEDIR)/lib/replace -I$(SOURCEDIR)/lib/tdb/include -I$(SOURCEDIR)/lib/tevent -I$(SOURCEDIR)/ -I$(SOURCEDIR)/lib/talloc
++CFLAGS = @CFLAGS@ -I$(SOURCEDIR)/source3 -I$(SOURCEDIR)/source3/include -I$(SOURCEDIR)/source3/librpc -I$(SOURCEDIR)/lib/replace -I$(SOURCEDIR)/lib/tdb/include -I$(SOURCEDIR)/lib/tevent -I$(SOURCEDIR)/ -I$(SOURCEDIR)/lib/talloc -I$(LOCALBASE)/include -L$(LOCALBASE)/lib
+
+ all: $(addsuffix .$(SHLIBEXT), $(modules))
+
Index: files/patch-pdb_pgsql.c
===================================================================
RCS file: files/patch-pdb_pgsql.c
diff -N files/patch-pdb_pgsql.c
--- files/patch-pdb_pgsql.c 1 May 2008 13:06:37 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
---- pdb_pgsql.c.orig 2008-05-01 12:30:43.000000000 +0200
-+++ pdb_pgsql.c 2008-05-01 12:41:38.000000000 +0200
-@@ -164,7 +164,7 @@
- pdb_set_profile_path (u, PQgetvalue(r, row, 13), PDB_SET);
- pdb_set_acct_desc (u, PQgetvalue(r, row, 14), PDB_SET);
- pdb_set_workstations (u, PQgetvalue(r, row, 15), PDB_SET);
-- pdb_set_commemt (u, PQgetvalue(r, row, 16), PDB_SET);
-+ pdb_set_comment (u, PQgetvalue(r, row, 16), PDB_SET);
- pdb_set_munged_dial (u, PQgetvalue(r, row, 17), PDB_SET);
-
- pdb_set_acct_ctrl (u, PQgetlong (r, row, 23), PDB_SET);
-@@ -551,8 +551,13 @@
- static NTSTATUS pgsqlsam_init (struct pdb_methods **pdb_method, const char *location)
- {
- NTSTATUS nt_status;
-- struct pdb_pgsql_data *data = malloc_p(struct pdb_pgsql_data);
--
-+ struct pdb_pgsql_data *data = malloc(sizeof(struct pdb_pgsql_data));
-+
-+ if (data == NULL) {
-+ DEBUG(0, ("Can't allocate memory to data\n"));
-+ return NT_STATUS_NO_MEMORY;
-+ }
-+
- if (!NT_STATUS_IS_OK(nt_status = make_pdb_method(pdb_method))) {
- return nt_status;
- }
--- samba-pdbsql-34.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100930204506.25837.qmail>