From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Oct 27 01:00:13 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9EC39106566C for ; Wed, 27 Oct 2010 01:00:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 4EFD58FC17 for ; Wed, 27 Oct 2010 01:00:13 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o9R10DWw081340 for ; Wed, 27 Oct 2010 01:00:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o9R10D2l081329; Wed, 27 Oct 2010 01:00:13 GMT (envelope-from gnats) Resent-Date: Wed, 27 Oct 2010 01:00:13 GMT Resent-Message-Id: <201010270100.o9R10D2l081329@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, takefu@airport.fm Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8E98B106566B; Wed, 27 Oct 2010 00:51:44 +0000 (UTC) (envelope-from takefu@airport.fm) Received: from ae-osaka.co.jp (unknown [IPv6:2001:3e0:4ec:a000::1]) by mx1.freebsd.org (Postfix) with ESMTP id 0CD308FC08; Wed, 27 Oct 2010 00:51:44 +0000 (UTC) Received: from ae-osaka.co.jp (localhost.ae-osaka.co.jp [127.0.0.1]) by ae-osaka.co.jp (Postfix) with ESMTP id 513C51146A; Wed, 27 Oct 2010 09:51:43 +0900 (JST) Received: from ae-osaka.co.jp ([127.0.0.1]) by ae-osaka.co.jp (ae-osaka.co.jp [127.0.0.1]) (amavisd-new, port 10024) with LMTP id Q2Pd5AzggEOl; Wed, 27 Oct 2010 09:51:43 +0900 (JST) Received: from [IPv6:2001:3e0:4ec:a011:9c90:6f7e:94a8:3e0f] (unknown [IPv6:2001:3e0:4ec:a011:9c90:6f7e:94a8:3e0f]) by ae-osaka.co.jp (Postfix) with ESMTPSA id 1A6B211469; Wed, 27 Oct 2010 09:51:43 +0900 (JST) Message-Id: <4CC7779E.9010901@airport.fm> Date: Wed, 27 Oct 2010 09:51:42 +0900 From: Takefu To: freebsd-gnats-submit@FreeBSD.org Cc: timur@FreeBSD.org Subject: ports/151768: [UPDATE] databases/tdb: update to 1.2.2 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: takefu@airport.fm List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Oct 2010 01:00:13 -0000 >Number: 151768 >Category: ports >Synopsis: [UPDATE] databases/tdb: update to 1.2.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Wed Oct 27 01:00:12 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Takefu >Release: FreeBSD 8.1-RELEASE-p1 amd64 >Organization: FOX Amateur Radio Club >Environment: >Description: - Update to 1.2.2 Removed file(s): - files/tdbbackup.8 - files/tdbdump.8 - files/tdbtool.8 Port maintainer (timur@FreeBSD.org) is cc'd. >How-To-Repeat: >Fix: --- tdb-1.2.2,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/databases/tdb/Makefile databases/tdb/Makefile --- /usr/ports/databases/tdb/Makefile 2010-10-27 07:41:48.000000000 +0900 +++ databases/tdb/Makefile 2010-10-27 08:29:53.000000000 +0900 @@ -6,13 +6,16 @@ # PORTNAME= tdb -PORTVERSION= 1.2.1 +PORTVERSION= 1.2.2 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= ftp://ftp.samba.org/pub/%SUBDIR%/ \ ftp://ca.samba.org/pub/%SUBDIR%/ \ ftp://de.samba.org/pub/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTNAME} +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}\ + ${DISTNAME}${EXTRACT_SUFX}.asc +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= timur@FreeBSD.org COMMENT= Trivial Database @@ -25,8 +28,12 @@ GNU_CONFIGURE= yes USE_GNOME= pkgconfig USE_AUTOTOOLS= autoconf:268 autoheader:268 +BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt\ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl -IPATHS= -I${WRKSRC}/libreplace +MAKE_JOBS_SAFE= yes + +IPATHS= -I${WRKSRC}/lib/replace AUTOHEADER_ARGS= ${IPATHS} AUTOCONF_ARGS= ${IPATHS} @@ -34,8 +41,6 @@ PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||} PYTHON_SITELIBDIR_REL?= ${PYTHONPREFIX_SITELIBDIR:S|^${PREFIX}/||} -CONFIGURE_ENV+= XSLTPROC="/usr/bin/true" - MAN8= tdbbackup.8 \ tdbdump.8 \ tdbtool.8 @@ -50,12 +55,12 @@ ${PKGCONFIGDIR_REL}/tdb.pc \ ${PYTHON_SITELIBDIR_REL}/tdb.so -pre-install: -.for man in ${MAN8} - @${CP} ${FILESDIR}/${man} ${WRKSRC}/manpages -.endfor +verify: checksum + gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc post-install: - @${LN} -sf libtdb.so.1 ${PREFIX}/lib/libtdb.so + ${STRIP_CMD} ${PREFIX}/bin/tdbbackup\ + ${PREFIX}/bin/tdbdump\ + ${PREFIX}/bin/tdbtool .include diff -ruN --exclude=CVS /usr/ports/databases/tdb/distinfo databases/tdb/distinfo --- /usr/ports/databases/tdb/distinfo 2010-10-27 07:41:48.000000000 +0900 +++ databases/tdb/distinfo 2010-10-26 19:48:30.000000000 +0900 @@ -1,3 +1,6 @@ -MD5 (tdb-1.2.1.tar.gz) = 73ea81282a82e5c959d9c082af2d0215 -SHA256 (tdb-1.2.1.tar.gz) = ef423b934c5ddfeddaa3d3b1567072b0d6f7243bbae5fd363a1b090b0573cdfa -SIZE (tdb-1.2.1.tar.gz) = 268142 +MD5 (tdb-1.2.2.tar.gz) = d93f31e1585971f12cbd259323c54432 +SHA256 (tdb-1.2.2.tar.gz) = faee3dbb5c0af896c98f5edf3ab68b2ed9bc4992376666f2cd502873a1b2f892 +SIZE (tdb-1.2.2.tar.gz) = 372672 +MD5 (tdb-1.2.2.tar.gz.asc) = b76e252c074e648b2b4f1c3145024b4c +SHA256 (tdb-1.2.2.tar.gz.asc) = 0e33b91d1a1122edfa294bef82a67fd97295eb225ee845db1e5a3ace9bec99fe +SIZE (tdb-1.2.2.tar.gz.asc) = 933 diff -ruN --exclude=CVS /usr/ports/databases/tdb/files/patch-tdb.mk databases/tdb/files/patch-tdb.mk --- /usr/ports/databases/tdb/files/patch-tdb.mk 2010-07-21 16:53:38.000000000 +0900 +++ databases/tdb/files/patch-tdb.mk 2010-10-26 19:41:17.000000000 +0900 @@ -1,5 +1,5 @@ ---- ./tdb.mk.orig 2010-01-09 02:39:48.000000000 +0000 -+++ ./tdb.mk 2010-01-09 02:42:49.000000000 +0000 +--- tdb.mk.orig 2010-08-22 11:53:50.000000000 +0900 ++++ tdb.mk 2010-10-26 19:37:35.000000000 +0900 @@ -6,7 +6,7 @@ ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL) @@ -9,7 +9,16 @@ TDB_STLIB = libtdb.a TDB_LIB = $(TDB_STLIB) -@@ -67,7 +67,7 @@ +@@ -58,7 +58,7 @@ + .SUFFIXES: .8.xml .8 + + .8.xml.8: +- -test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< ++ -test -z "$(XSLTPROC)" || $(XSLTPROC) -o $@ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl $< + + installdocs:: + ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man8 +@@ -80,7 +80,7 @@ mkdir -p $(DESTDIR)$(bindir) mkdir -p $(DESTDIR)$(includedir) mkdir -p $(DESTDIR)$(libdir) @@ -18,16 +27,22 @@ installbin:: all installdirs cp $(PROGS) $(DESTDIR)$(bindir) -@@ -76,7 +76,7 @@ +@@ -89,18 +89,15 @@ cp $(srcdir)/include/tdb.h $(DESTDIR)$(includedir) installlibs:: all installdirs - cp tdb.pc $(DESTDIR)$(libdir)/pkgconfig + cp tdb.pc $(DESTDIR)$(prefix)/libdata/pkgconfig cp $(TDB_STLIB) $(TDB_SOLIB) $(DESTDIR)$(libdir) + rm -f $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) + ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/libtdb.$(SHLIBEXT) +- rm -f $(DESTDIR)$(libdir)/$(TDB_SONAME) +- ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/$(TDB_SONAME) ++# rm -f $(DESTDIR)$(libdir)/$(TDB_SONAME) ++# ln -s $(TDB_SOLIB) $(DESTDIR)$(libdir)/$(TDB_SONAME) $(TDB_STLIB): $(TDB_OBJ) -@@ -84,6 +84,3 @@ + ar -rv $(TDB_STLIB) $(TDB_OBJ) libtdb.$(SHLIBEXT): $(TDB_SOLIB) ln -fs $< $@ diff -ruN --exclude=CVS /usr/ports/databases/tdb/files/tdbbackup.8 databases/tdb/files/tdbbackup.8 --- /usr/ports/databases/tdb/files/tdbbackup.8 2010-10-26 22:07:59.000000000 +0900 +++ databases/tdb/files/tdbbackup.8 1970-01-01 09:00:00.000000000 +0900 @@ -1,115 +0,0 @@ -'\" t -.\" Title: tdbbackup -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 10/26/2010 -.\" Manual: System Administration tools -.\" Source: Samba 3.6 -.\" Language: English -.\" -.TH "TDBBACKUP" "8" "10/26/2010" "Samba 3\&.6" "System Administration tools" -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -tdbbackup \- tool for backing up and for validating the integrity of samba \&.tdb files -.SH "SYNOPSIS" -.HP \w'\fBtdbbackup\fR\ 'u -\fBtdbbackup\fR [\-s\ suffix] [\-v] [\-h] -.SH "DESCRIPTION" -.PP -This tool is part of the -\fBsamba\fR(1) -suite\&. -.PP -\fBtdbbackup\fR -is a tool that may be used to backup samba \&.tdb files\&. This tool may also be used to verify the integrity of the \&.tdb files prior to samba startup or during normal operation\&. If it finds file damage and it finds a prior backup the backup file will be restored\&. -.SH "OPTIONS" -.PP -\-h -.RS 4 -Get help information\&. -.RE -.PP -\-s suffix -.RS 4 -The -\fB\-s\fR -option allows the adminisistrator to specify a file backup extension\&. This way it is possible to keep a history of tdb backup files by using a new suffix for each backup\&. -.RE -.PP -\-v -.RS 4 -The -\fB\-v\fR -will check the database for damages (currupt data) which if detected causes the backup to be restored\&. -.RE -.SH "COMMANDS" -.PP -\fIGENERAL INFORMATION\fR -.PP -The -\fBtdbbackup\fR -utility can safely be run at any time\&. It was designed so that it can be used at any time to validate the integrity of tdb files, even during Samba operation\&. Typical usage for the command will be: -.PP -tdbbackup [\-s suffix] *\&.tdb -.PP -Before restarting samba the following command may be run to validate \&.tdb files: -.PP -tdbbackup \-v [\-s suffix] *\&.tdb -.PP -Samba \&.tdb files are stored in various locations, be sure to run backup all \&.tdb file on the system\&. Important files includes: -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} - -\fBsecrets\&.tdb\fR -\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} - -\fBpassdb\&.tdb\fR -\- usual location is in the /usr/local/samba/private directory, or on some systems in /etc/samba\&. -.RE -.sp -.RS 4 -.ie n \{\ -\h'-04'\(bu\h'+03'\c -.\} -.el \{\ -.sp -1 -.IP \(bu 2.3 -.\} - -\fB*\&.tdb\fR -located in the /usr/local/samba/var directory or on some systems in the /var/cache or /var/lib/samba directories\&. -.RE -.SH "VERSION" -.PP -This man page is correct for version 3 of the Samba suite\&. -.SH "AUTHOR" -.PP -The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&. -.PP -The tdbbackup man page was written by John H Terpstra\&. diff -ruN --exclude=CVS /usr/ports/databases/tdb/files/tdbdump.8 databases/tdb/files/tdbdump.8 --- /usr/ports/databases/tdb/files/tdbdump.8 2010-10-26 22:07:59.000000000 +0900 +++ databases/tdb/files/tdbdump.8 1970-01-01 09:00:00.000000000 +0900 @@ -1,43 +0,0 @@ -'\" t -.\" Title: tdbdump -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 10/26/2010 -.\" Manual: System Administration tools -.\" Source: Samba 3.6 -.\" Language: English -.\" -.TH "TDBDUMP" "8" "10/26/2010" "Samba 3\&.6" "System Administration tools" -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -tdbdump \- tool for printing the contents of a TDB file -.SH "SYNOPSIS" -.HP \w'\fBtdbdump\fR\ 'u -\fBtdbdump\fR {filename} -.SH "DESCRIPTION" -.PP -This tool is part of the -\fBsamba\fR(1) -suite\&. -.PP -\fBtdbdump\fR -is a very simple utility that \'dumps\' the contents of a TDB (Trivial DataBase) file to standard output in a human\-readable format\&. -.PP -This tool can be used when debugging problems with TDB files\&. It is intended for those who are somewhat familiar with Samba internals\&. -.SH "VERSION" -.PP -This man page is correct for version 3 of the Samba suite\&. -.SH "AUTHOR" -.PP -The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&. -.PP -The tdbdump man page was written by Jelmer Vernooij\&. diff -ruN --exclude=CVS /usr/ports/databases/tdb/files/tdbtool.8 databases/tdb/files/tdbtool.8 --- /usr/ports/databases/tdb/files/tdbtool.8 2010-10-26 22:07:59.000000000 +0900 +++ databases/tdb/files/tdbtool.8 1970-01-01 09:00:00.000000000 +0900 @@ -1,150 +0,0 @@ -'\" t -.\" Title: tdbtool -.\" Author: [see the "AUTHOR" section] -.\" Generator: DocBook XSL Stylesheets v1.75.2 -.\" Date: 10/26/2010 -.\" Manual: System Administration tools -.\" Source: Samba 3.6 -.\" Language: English -.\" -.TH "TDBTOOL" "8" "10/26/2010" "Samba 3\&.6" "System Administration tools" -.\" ----------------------------------------------------------------- -.\" * set default formatting -.\" ----------------------------------------------------------------- -.\" disable hyphenation -.nh -.\" disable justification (adjust text to left margin only) -.ad l -.\" ----------------------------------------------------------------- -.\" * MAIN CONTENT STARTS HERE * -.\" ----------------------------------------------------------------- -.SH "NAME" -tdbtool \- manipulate the contents TDB files -.SH "SYNOPSIS" -.HP \w'\fBtdbtool\fR\ 'u -\fBtdbtool\fR -.HP \w'\fBtdbtool\fR\ 'u -\fBtdbtool\fR \fITDBFILE\fR [\fICOMMANDS\fR...] -.SH "DESCRIPTION" -.PP -This tool is part of the -\fBsamba\fR(1) -suite\&. -.PP -\fBtdbtool\fR -a tool for displaying and altering the contents of Samba TDB (Trivial DataBase) files\&. Each of the commands listed below can be entered interactively or provided on the command line\&. -.SH "COMMANDS" -.PP -\fBcreate\fR \fITDBFILE\fR -.RS 4 -Create a new database named -\fITDBFILE\fR\&. -.RE -.PP -\fBopen\fR \fITDBFILE\fR -.RS 4 -Open an existing database named -\fITDBFILE\fR\&. -.RE -.PP -\fBerase\fR -.RS 4 -Erase the current database\&. -.RE -.PP -\fBdump\fR -.RS 4 -Dump the current database as strings\&. -.RE -.PP -\fBcdump\fR -.RS 4 -Dump the current database as connection records\&. -.RE -.PP -\fBkeys\fR -.RS 4 -Dump the current database keys as strings\&. -.RE -.PP -\fBhexkeys\fR -.RS 4 -Dump the current database keys as hex values\&. -.RE -.PP -\fBinfo\fR -.RS 4 -Print summary information about the current database\&. -.RE -.PP -\fBinsert\fR \fIKEY\fR \fIDATA\fR -.RS 4 -Insert a record into the current database\&. -.RE -.PP -\fBmove\fR \fIKEY\fR \fITDBFILE\fR -.RS 4 -Move a record from the current database into -\fITDBFILE\fR\&. -.RE -.PP -\fBstore\fR \fIKEY\fR \fIDATA\fR -.RS 4 -Store (replace) a record in the current database\&. -.RE -.PP -\fBshow\fR \fIKEY\fR -.RS 4 -Show a record by key\&. -.RE -.PP -\fBdelete\fR \fIKEY\fR -.RS 4 -Delete a record by key\&. -.RE -.PP -\fBlist\fR -.RS 4 -Print the current database hash table and free list\&. -.RE -.PP -\fBfree\fR -.RS 4 -Print the current database and free list\&. -.RE -.PP -\fB!\fR \fICOMMAND\fR -.RS 4 -Execute the given system command\&. -.RE -.PP -\fBfirst\fR -.RS 4 -Print the first record in the current database\&. -.RE -.PP -\fBnext\fR -.RS 4 -Print the next record in the current database\&. -.RE -.PP -\fBcheck\fR -.RS 4 -Check the integrity of the current database\&. -.RE -.PP -\fBquit\fR -.RS 4 -Exit -\fBtdbtool\fR\&. -.RE -.SH "CAVEATS" -.PP -The contents of the Samba TDB files are private to the implementation and should not be altered with -\fBtdbtool\fR\&. -.SH "VERSION" -.PP -This man page is correct for version 3\&.0\&.25 of the Samba suite\&. -.SH "AUTHOR" -.PP -The original Samba software and related utilities were created by Andrew Tridgell\&. Samba is now developed by the Samba Team as an Open Source project similar to the way the Linux kernel is developed\&. --- tdb-1.2.2,1.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: