ports/102713: [PATCH] net/samba4wins: update to 1.0.4.r1
Timur I. Bakeyev
timur at gnu.org
Thu Aug 31 01:50:21 UTC 2006
>Number: 102713
>Category: ports
>Synopsis: [PATCH] net/samba4wins: update to 1.0.4.r1
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Thu Aug 31 01:50:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Timur I. Bakeyev
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD timur.home.bat.ru 6.1-STABLE FreeBSD 6.1-STABLE #0: Sun Jul 2 02:36:16 CEST
>Description:
- Update to 1.0.4.r1
Added file(s):
- files/patch-lib_ldb_config.mk
- files/patch-scripting_ejs_config.mk
- files/patch-torture_config.mk
- files/smbd4wins.in
Removed file(s):
- files/smbd4wins.sh.in
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- samba4wins-1.0.4.r1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/samba4wins/Makefile,v
retrieving revision 1.1
diff -u -w -u -r1.1 Makefile
--- Makefile 18 Apr 2006 13:05:06 -0000 1.1
+++ Makefile 29 Aug 2006 00:13:42 -0000
@@ -6,7 +6,7 @@
#
PORTNAME= samba4wins
-PORTVERSION= 1.0.3.r1
+PORTVERSION= 1.0.4.r1
CATEGORIES= net
MASTER_SITES= http://ftp.sernet.de/pub/samba4WINS/debian/pool/
DISTNAME= ${PORTNAME}_${PORTVERSION:S/.r/-/}
@@ -16,13 +16,15 @@
CONFLICTS= ja-samba-2.* ja-samba-4.* samba-2.* samba-4.* sharity-light-1.*
+USE_ICONV= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
+USE_AUTOTOOLS= autoconf:259 autoheader:259
WRKSRC= ${WRKDIR}/${PORTNAME}/source
# directories
-VARDIR= ${DESTDIR}/var
+VARDIR?= ${DESTDIR}/var
S4W_DATADIR= ${PREFIX}/share/${PORTNAME}
S4W_LOGDIR= ${VARDIR}/log/${PORTNAME}
S4W_RUNDIR= ${VARDIR}/run
@@ -48,12 +50,18 @@
--with-libiconv=${LOCALBASE} --without-sqlite3 \
--without-pthreads --without-python
-USE_RC_SUBR= smbd4wins.sh
+USE_RC_SUBR= smbd4wins
SUB_LIST+= S4W_RUNDIR=${S4W_RUNDIR}
PLIST_SUB+= S4W_LOGDIR=${S4W_LOGDIR} \
S4W_LOCKDIR=${S4W_LOCKDIR}
+pre-install:
+ @for f in ${WRKSRC}/scripting/bin/*; do \
+ ${REINPLACE_CMD} -e 's|smbscript|${PREFIX}/bin/smbscript4|' \
+ $${f} && ${MV} $${f} $${f}4; \
+ done
+
post-install:
@${MKDIR} ${S4W_CONFDIR}
${INSTALL_DATA} ${FILESDIR}/samba4wins.conf.sample ${S4W_CONFDIR}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/net/samba4wins/distinfo,v
retrieving revision 1.1
diff -u -w -u -r1.1 distinfo
--- distinfo 18 Apr 2006 13:05:06 -0000 1.1
+++ distinfo 15 Aug 2006 20:47:42 -0000
@@ -1,3 +1,3 @@
-MD5 (samba4wins_1.0.3-1.tar.gz) = 97d3de004859230c7550ed8858d356ea
-SHA256 (samba4wins_1.0.3-1.tar.gz) = 8613e61093d078de3b1c19de1bc242ded4f6a0502e4b44c5ef9077f1028a9c54
-SIZE (samba4wins_1.0.3-1.tar.gz) = 18788362
+MD5 (samba4wins_1.0.4-1.tar.gz) = 01c4bcc09b63d2da33e199ffc5cccafd
+SHA256 (samba4wins_1.0.4-1.tar.gz) = d5b7eff16a76c0812f6d5389cf5621de3114e9d987ba83e265ce69df7d02c07a
+SIZE (samba4wins_1.0.4-1.tar.gz) = 7230074
Index: pkg-descr
===================================================================
RCS file: /home/ncvs/ports/net/samba4wins/pkg-descr,v
retrieving revision 1.1
diff -u -w -u -r1.1 pkg-descr
--- pkg-descr 18 Apr 2006 13:05:06 -0000 1.1
+++ pkg-descr 29 Aug 2006 00:15:25 -0000
@@ -1,6 +1,6 @@
The Samba4WINS project provides a full featured replicating WINS server
-for UNIX. It is a spinoff of the Samba 4 project, the upcoming version
-of the Samba software suite and will also be available as part of the
-Samba suite as soon as Samba 4 is released.
+for UNIX. It is a spinoff of the Samba4 project, the upcoming version of
+the Samba software suite and will also be available as part of the Samba
+suite as soon as Samba4 is released.
WWW: http://enterprisesamba.org/index.php?id=88
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/net/samba4wins/pkg-plist,v
retrieving revision 1.1
diff -u -w -u -r1.1 pkg-plist
--- pkg-plist 18 Apr 2006 13:05:06 -0000 1.1
+++ pkg-plist 29 Aug 2006 00:13:56 -0000
@@ -1,18 +1,17 @@
- at unexec %D/etc/rc.d/samba4wins.sh forcestop 2>/dev/null || true
etc/samba4wins.conf.sample
bin/nmblookup4
-bin/ldbadd
-bin/ldbdel
-bin/ldbedit
-bin/ldbmodify
-bin/ldbrename
-bin/ldbsearch
-bin/samba3dump
-bin/smbscript
-bin/smbstatus
-bin/smbtorture
-bin/testparm
-bin/winreg
+bin/ldbadd4
+bin/ldbdel4
+bin/ldbedit4
+bin/ldbmodify4
+bin/ldbrename4
+bin/ldbsearch4
+bin/samba3dump4
+bin/smbscript4
+bin/smbstatus4
+bin/smbtorture4
+bin/testparm4
+bin/winreg4
sbin/smbd4wins
lib/samba4wins/lowcase.dat
lib/samba4wins/upcase.dat
@@ -21,6 +20,7 @@
%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%DATADIR%%/js/auth.js
%%DATADIR%%/js/base.js
%%DATADIR%%/js/encoder.js
@@ -40,12 +40,11 @@
%%DATADIR%%/setup/provision_users.ldif
%%DATADIR%%/setup/schema.ldif
%%DATADIR%%/setup/secrets.ldif
- at dirrmtry lib/samba4wins/pkgconfig
- at dirrmtry private/tls
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm %%DATADIR%%/setup
@dirrm %%DATADIR%%/js
@dirrm %%DATADIR%%
+ at dirrmtry lib/samba4wins/pkgconfig
@dirrm lib/samba4wins
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %%S4W_LOCKDIR%%/* manually."
@unexec echo "Warning: If you will *NOT* use this package anymore, please remove %%S4W_LOGDIR%%/* manually."
+ at unexec %D/etc/rc.d/samba4wins.sh forcestop 2>/dev/null || true
Index: files/patch-lib_ldb_config.mk
===================================================================
RCS file: files/patch-lib_ldb_config.mk
diff -N files/patch-lib_ldb_config.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-lib_ldb_config.mk 28 Aug 2006 02:23:38 -0000
@@ -0,0 +1,56 @@
+--- lib/ldb/config.mk.orig Mon Aug 28 04:22:54 2006
++++ lib/ldb/config.mk Mon Aug 28 04:23:33 2006
+@@ -179,7 +179,7 @@
+
+ ################################################
+ # Start BINARY ldbadd
+-[BINARY::ldbadd]
++[BINARY::ldbadd4]
+ INSTALLDIR = BINDIR
+ OBJ_FILES = \
+ tools/ldbadd.o
+@@ -191,7 +191,7 @@
+
+ ################################################
+ # Start BINARY ldbdel
+-[BINARY::ldbdel]
++[BINARY::ldbdel4]
+ INSTALLDIR = BINDIR
+ OBJ_FILES= \
+ tools/ldbdel.o
+@@ -203,7 +203,7 @@
+
+ ################################################
+ # Start BINARY ldbmodify
+-[BINARY::ldbmodify]
++[BINARY::ldbmodify4]
+ INSTALLDIR = BINDIR
+ OBJ_FILES= \
+ tools/ldbmodify.o
+@@ -215,7 +215,7 @@
+
+ ################################################
+ # Start BINARY ldbsearch
+-[BINARY::ldbsearch]
++[BINARY::ldbsearch4]
+ INSTALLDIR = BINDIR
+ OBJ_FILES= \
+ tools/ldbsearch.o
+@@ -227,7 +227,7 @@
+
+ ################################################
+ # Start BINARY ldbedit
+-[BINARY::ldbedit]
++[BINARY::ldbedit4]
+ INSTALLDIR = BINDIR
+ OBJ_FILES= \
+ tools/ldbedit.o
+@@ -239,7 +239,7 @@
+
+ ################################################
+ # Start BINARY ldbrename
+-[BINARY::ldbrename]
++[BINARY::ldbrename4]
+ INSTALLDIR = BINDIR
+ OBJ_FILES= \
+ tools/ldbrename.o
Index: files/patch-scripting_ejs_config.mk
===================================================================
RCS file: files/patch-scripting_ejs_config.mk
diff -N files/patch-scripting_ejs_config.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-scripting_ejs_config.mk 28 Aug 2006 23:38:09 -0000
@@ -0,0 +1,11 @@
+--- scripting/ejs/config.mk.orig Tue Aug 29 01:37:15 2006
++++ scripting/ejs/config.mk Tue Aug 29 01:37:25 2006
+@@ -37,7 +37,7 @@
+
+ #######################
+ # Start BINARY SMBSCRIPT
+-[BINARY::smbscript]
++[BINARY::smbscript4]
+ INSTALLDIR = BINDIR
+ OBJ_FILES = \
+ smbscript.o
Index: files/patch-torture_config.mk
===================================================================
RCS file: files/patch-torture_config.mk
diff -N files/patch-torture_config.mk
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-torture_config.mk 28 Aug 2006 21:34:55 -0000
@@ -0,0 +1,11 @@
+--- torture/config.mk.orig Mon Aug 28 23:34:14 2006
++++ torture/config.mk Mon Aug 28 23:34:27 2006
+@@ -198,7 +198,7 @@
+
+ #################################
+ # Start BINARY smbtorture
+-[BINARY::smbtorture]
++[BINARY::smbtorture4]
+ INSTALLDIR = BINDIR
+ PRIVATE_PROTO_HEADER = torture.h
+ OBJ_FILES = \
Index: files/patch-utils_config.mk
===================================================================
RCS file: /home/ncvs/ports/net/samba4wins/files/patch-utils_config.mk,v
retrieving revision 1.1
diff -u -w -u -r1.1 patch-utils_config.mk
--- files/patch-utils_config.mk 18 Apr 2006 13:05:06 -0000 1.1
+++ files/patch-utils_config.mk 28 Aug 2006 00:55:56 -0000
@@ -1,5 +1,5 @@
---- utils/config.mk.orig Sun Apr 9 23:55:42 2006
-+++ utils/config.mk Sun Apr 9 23:56:16 2006
+--- utils/config.mk.orig Mon Jul 3 09:48:15 2006
++++ utils/config.mk Mon Aug 28 02:13:42 2006
@@ -77,7 +77,7 @@
#################################
@@ -9,3 +9,12 @@
INSTALLDIR = BINDIR
OBJ_FILES = \
nmblookup.o
+@@ -92,7 +92,7 @@
+
+ #################################
+ # Start BINARY testparm
+-[BINARY::testparm]
++[BINARY::testparm4]
+ INSTALLDIR = BINDIR
+ OBJ_FILES = \
+ testparm.o
Index: files/smbd4wins.in
===================================================================
RCS file: files/smbd4wins.in
diff -N files/smbd4wins.in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/smbd4wins.in 28 Aug 2006 23:36:12 -0000
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: smbd4wins
+# REQUIRE: NETWORKING SERVERS named ldconfig
+# BEFORE: DAEMON
+# KEYWORD: shutdown
+
+#
+# Add the following lines to /etc/rc.conf to enable smbd:
+#
+#smbd4wins_enable="YES"
+#
+
+. %%RC_SUBR%%
+
+name="smbd4wins"
+rcvar=`set_rcvar`
+command="%%PREFIX%%/sbin/${name}"
+pidfile="%%S4W_RUNDIR%%/${name}.pid"
+
+load_rc_config $name
+run_rc_command "$1"
Index: files/smbd4wins.sh.in
===================================================================
RCS file: files/smbd4wins.sh.in
diff -N files/smbd4wins.sh.in
--- files/smbd4wins.sh.in 18 Apr 2006 13:05:06 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/net/samba4wins/files/smbd4wins.sh.in,v 1.1 2006/04/18 13:05:06 sem Exp $
-#
-
-# PROVIDE: smbd2wins
-# REQUIRE: NETWORKING SERVERS named ldconfig
-# BEFORE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following lines to /etc/rc.conf to enable smbd:
-#
-#smbd4wins_enable="YES"
-#
-
-. %%RC_SUBR%%
-
-name="smbd4wins"
-rcvar=`set_rcvar`
-command="%%PREFIX%%/sbin/${name}"
-pidfile="%%S4W_RUNDIR%%/${name}.pid"
-
-load_rc_config $name
-run_rc_command "$1"
--- samba4wins-1.0.4.r1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list