diff options
author | drochner <drochner@pkgsrc.org> | 2012-10-30 13:24:31 +0000 |
---|---|---|
committer | drochner <drochner@pkgsrc.org> | 2012-10-30 13:24:31 +0000 |
commit | 0dc65720affcf22bfe410275cd653d3d203e9c0c (patch) | |
tree | 557d2df69ad832a20883c6fa89094f37577b91c1 | |
parent | cf907018cb5af5dad549fe8b059e88420db557f8 (diff) | |
download | pkgsrc-0dc65720affcf22bfe410275cd653d3d203e9c0c.tar.gz |
resolve the CONFLICT between tdb and samba - make sambe use
an external libtdb instead of the internal duplicate
-rw-r--r-- | databases/tdb/Makefile | 17 | ||||
-rw-r--r-- | databases/tdb/PLIST | 24 | ||||
-rw-r--r-- | databases/tdb/distinfo | 11 | ||||
-rw-r--r-- | databases/tdb/patches/patch-aa | 100 | ||||
-rw-r--r-- | databases/tdb/patches/patch-ab | 32 | ||||
-rw-r--r-- | databases/tdb/patches/patch-ac | 45 | ||||
-rw-r--r-- | net/samba/Makefile | 15 | ||||
-rw-r--r-- | net/samba/PLIST | 16 | ||||
-rw-r--r-- | net/samba/buildlink3.mk | 3 |
9 files changed, 40 insertions, 223 deletions
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index 14d398a105a..ba55bdfddb4 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -1,20 +1,25 @@ -# $NetBSD: Makefile,v 1.15 2012/10/02 21:25:54 asau Exp $ +# $NetBSD: Makefile,v 1.16 2012/10/30 13:24:31 drochner Exp $ # -DISTNAME= tdb-1.0.6 -PKGREVISION= 2 +DISTNAME= tdb-1.2.10 CATEGORIES= databases -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tdb/} +MASTER_SITES= http://www.samba.org/ftp/tdb/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/tdb/ COMMENT= Small database system which uses files to store data # both install tdbtool and tdbdump -CONFLICTS+= samba-[0-9]* +CONFLICTS+= samba<3.6.6nb3 GNU_CONFIGURE= YES +CONFIGURE_ARGS+= --disable-python USE_TOOLS+= gmake -USE_LIBTOOL= YES +PKGCONFIG_OVERRIDE= tdb.pc.in + +PYTHON_FOR_BUILD_ONLY= yes +REPLACE_PYTHON+= buildtools/bin/waf + +.include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/tdb/PLIST b/databases/tdb/PLIST index aeb16a1cfb7..7a14b258505 100644 --- a/databases/tdb/PLIST +++ b/databases/tdb/PLIST @@ -1,16 +1,14 @@ -@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:23 jlam Exp $ +@comment $NetBSD: PLIST,v 1.3 2012/10/30 13:24:31 drochner Exp $ +bin/tdbbackup bin/tdbdump +bin/tdbrestore bin/tdbtool include/tdb.h -lib/libtdb.la -man/man3/tdb.3 -man/man3/tdb_chainlock.3 -man/man3/tdb_close.3 -man/man3/tdb_delete.3 -man/man3/tdb_error.3 -man/man3/tdb_exists.3 -man/man3/tdb_fetch.3 -man/man3/tdb_firstkey.3 -man/man3/tdb_open.3 -man/man3/tdb_store.3 -man/man3/tdb_traverse.3 +lib/libtdb.so +lib/libtdb.so.1 +lib/libtdb.so.${PKGVERSION} +lib/pkgconfig/tdb.pc +man/man8/tdbbackup.8 +man/man8/tdbdump.8 +man/man8/tdbrestore.8 +man/man8/tdbtool.8 diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo index c91fae995a2..0558af92727 100644 --- a/databases/tdb/distinfo +++ b/databases/tdb/distinfo @@ -1,8 +1,5 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 16:33:10 agc Exp $ +$NetBSD: distinfo,v 1.4 2012/10/30 13:24:31 drochner Exp $ -SHA1 (tdb-1.0.6.tar.gz) = d1876522f1b8ffa8cf844a1f6605e0c32d387a7a -RMD160 (tdb-1.0.6.tar.gz) = 5163caf1cc76c9f3a69e88f7438ecd98ec5e52cf -Size (tdb-1.0.6.tar.gz) = 139948 bytes -SHA1 (patch-aa) = 7af794ccbaeab55f4d44f41212ca881dd169506e -SHA1 (patch-ab) = dbe92ea1facfb3d601a7ce1a9b7f9a25e0c879cc -SHA1 (patch-ac) = 3a8da4fd18724ba54f593a27adbe9cdfd012f255 +SHA1 (tdb-1.2.10.tar.gz) = 0f2bb5f9a633ca1a8e172152a031e1dacc26a118 +RMD160 (tdb-1.2.10.tar.gz) = 651ec3b898d6e115bc9ca284eeede0b93b269e68 +Size (tdb-1.2.10.tar.gz) = 497924 bytes diff --git a/databases/tdb/patches/patch-aa b/databases/tdb/patches/patch-aa deleted file mode 100644 index a9d60d2c51f..00000000000 --- a/databases/tdb/patches/patch-aa +++ /dev/null @@ -1,100 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/11/29 19:19:12 jmmv Exp $ - ---- configure.orig Tue Dec 11 05:06:33 2001 -+++ configure -@@ -1592,95 +1592,8 @@ else - fi - - --echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 --echo "configure:1597: checking for gdbm_open in -lgdbm" >&5 --ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-lgdbm $LIBS" --cat > conftest.$ac_ext <<EOF --#line 1605 "configure" --#include "confdefs.h" --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char gdbm_open(); -- --int main() { --gdbm_open() --; return 0; } --EOF --if { (eval echo configure:1616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- have_gdbm=true --else -- echo "$ac_t""no" 1>&6 - have_gdbm=false --fi -- --if test "x$have_gdbm" = "xfalse";then -- echo "configure: warning: WARNING: tdbtest is disabled. It needs gdbm." 1>&2 --fi --echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:1641: checking for dlopen in -ldl" >&5 --ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- ac_save_LIBS="$LIBS" --LIBS="-ldl $LIBS" --cat > conftest.$ac_ext <<EOF --#line 1649 "configure" --#include "confdefs.h" --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dlopen(); -- --int main() { --dlopen() --; return 0; } --EOF --if { (eval echo configure:1660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" --fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- have_dllib=true --else -- echo "$ac_t""no" 1>&6 - have_dllib=false --fi -- --if test "x$have_dllib" = "xfalse";then -- echo "configure: warning: WARNING: tdbtorture is disabled. It needs libdl." 1>&2 --fi -- - - - if $have_gdbm; then diff --git a/databases/tdb/patches/patch-ab b/databases/tdb/patches/patch-ab deleted file mode 100644 index 3490d465e09..00000000000 --- a/databases/tdb/patches/patch-ab +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/11/29 19:19:12 jmmv Exp $ - ---- Makefile.in.orig Tue Dec 11 05:08:49 2001 -+++ Makefile.in -@@ -80,7 +80,6 @@ LDADD = libtdb.la - @BUILD_TDBTORTURE_TRUE@TDBTORTURE = tdbtorture - @BUILD_TDBTORTURE_FALSE@TDBTORTURE = - --noinst_PROGRAMS = tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE) - bin_PROGRAMS = tdbtool tdbdump - - lib_LTLIBRARIES = libtdb.la -@@ -115,7 +114,7 @@ LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ - libtdb_la_LIBADD = - libtdb_la_OBJECTS = tdb.lo spinlock.lo --PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -+PROGRAMS = $(bin_PROGRAMS) - - tdbtool_OBJECTS = tdbtool.o - tdbtool_LDADD = $(LDADD) -@@ -159,8 +158,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $( - - TAR = tar - GZIP_ENV = --best --SOURCES = $(libtdb_la_SOURCES) $(tdbtool_SOURCES) $(tdbdump_SOURCES) $(tdbspeed_SOURCES) $(tdbiterate_SOURCES) $(tdbtest_SOURCES) $(tdbtorture_SOURCES) --OBJECTS = $(libtdb_la_OBJECTS) $(tdbtool_OBJECTS) $(tdbdump_OBJECTS) $(tdbspeed_OBJECTS) $(tdbiterate_OBJECTS) $(tdbtest_OBJECTS) $(tdbtorture_OBJECTS) -+SOURCES = $(libtdb_la_SOURCES) $(tdbtool_SOURCES) $(tdbdump_SOURCES) -+OBJECTS = $(libtdb_la_OBJECTS) $(tdbtool_OBJECTS) $(tdbdump_OBJECTS) - - all: all-redirect - .SUFFIXES: diff --git a/databases/tdb/patches/patch-ac b/databases/tdb/patches/patch-ac deleted file mode 100644 index 9583091b0ef..00000000000 --- a/databases/tdb/patches/patch-ac +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2003/07/17 20:37:51 jmmv Exp $ - ---- tdbtool.c.orig 2001-12-11 04:45:47.000000000 +0100 -+++ tdbtool.c -@@ -169,23 +169,23 @@ static void print_data(unsigned char *bu - - static void help(void) - { -- printf(" --tdbtool: -- create dbname : create a database -- open dbname : open an existing database -- erase : erase the database -- dump dumpname : dump the database as strings -- insert key data : insert a record -- store key data : store a record (replace) -- show key : show a record by key -- delete key : delete a record by key -- list : print the database hash table and freelist -- free : print the database freelist -- 1 | first : print the first record -- n | next : print the next record -- q | quit : terminate -- \\n : repeat 'next' command --"); -+ printf("\n" \ -+"tdbtool:\n" \ -+" create dbname : create a database\n" \ -+" open dbname : open an existing database\n" \ -+" erase : erase the database\n" \ -+" dump dumpname : dump the database as strings\n" \ -+" insert key data : insert a record\n" \ -+" store key data : store a record (replace)\n" \ -+" show key : show a record by key\n" \ -+" delete key : delete a record by key\n" \ -+" list : print the database hash table and freelist\n" \ -+" free : print the database freelist\n" \ -+" 1 | first : print the first record\n" \ -+" n | next : print the next record\n" \ -+" q | quit : terminate\n" \ -+" \\n : repeat 'next' command\n" \ -+); - } - - static void terror(char *why) diff --git a/net/samba/Makefile b/net/samba/Makefile index dd8bf5ae4ae..617df90bff4 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.223 2012/10/23 17:19:07 asau Exp $ +# $NetBSD: Makefile,v 1.224 2012/10/30 13:24:32 drochner Exp $ .include "../../net/samba/Makefile.mirrors" DISTNAME= samba-${VERSION} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= net MASTER_SITES= ${SAMBA_MIRRORS:=stable/} @@ -13,7 +13,7 @@ COMMENT= SMB/CIFS protocol server suite LICENSE= gnu-gpl-v3 VERSION= 3.6.6 -CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* tdb-[0-9]* winbind-[0-9]* +CONFLICTS+= ja-samba-[0-9]* pam-smbpass-[0-9]* winbind-[0-9]* FILESDIR= ${PKGDIR}/../../net/samba/files DESCR_SRC= ${PKGDIR}/../../net/samba/DESCR @@ -46,7 +46,7 @@ FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q} # mktemp is useful for the replacement adduser script, but don't require # a full dependency since it's not actually needed by samba. -USE_TOOLS+= gmake mktemp perl:run +USE_TOOLS+= gmake mktemp perl:run pkg-config REPLACE_PERL= script/findsmb.in BROKEN_GETTEXT_DETECTION=yes @@ -65,6 +65,7 @@ CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR} CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR} CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat +CONFIGURE_ARGS+= --enable-external-libtdb # # Explicitly disable samba4 merged-build option which is broken. # @@ -117,6 +118,10 @@ SUBST_SED.paths+= -e 's,@SH@,${SH},g' post-extract: ${CP} ${FILESDIR}/adduser.sh ${FILESDIR}/deluser.sh ${WRKDIR} + for n in tdbbackup.8 tdbdump.8 tdbtool.8; do \ + ${RM} ${WRKSRC}/../docs/manpages/$$n; \ + ${RM} ${WRKSRC}/../docs/htmldocs/manpages/$$n.html; \ + done post-install: ${RMDIR} ${DESTDIR}${PREFIX}/share/samba/swat/js @@ -154,6 +159,8 @@ post-install: .include "../../devel/libuuid/buildlink3.mk" .endif .include "../../converters/libiconv/buildlink3.mk" +BUILDLINK_API_DEPENDS.tdb+= tdb>=1.2.10 +.include "../../databases/tdb/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/popt/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" diff --git a/net/samba/PLIST b/net/samba/PLIST index 872866797b7..91925af6261 100644 --- a/net/samba/PLIST +++ b/net/samba/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.50 2012/07/06 23:32:59 asau Exp $ +@comment $NetBSD: PLIST,v 1.51 2012/10/30 13:24:32 drochner Exp $ bin/eventlogadm bin/findsmb bin/net @@ -19,17 +19,12 @@ bin/smbstatus bin/smbta-util bin/smbtar bin/smbtree -bin/tdbbackup -bin/tdbdump -bin/tdbrestore -bin/tdbtool bin/testparm ${PLIST.winbind}bin/wbinfo include/libsmbclient.h include/netapi.h include/smb_share_modes.h include/talloc.h -include/tdb.h ${PLIST.winbind}include/wbclient.h lib/libnetapi.${LIBEXT} lib/libnetapi.${LIBEXT}.0 @@ -40,9 +35,6 @@ lib/libsmbsharemodes.${LIBEXT}.0 lib/libtalloc.${LIBEXT} lib/libtalloc.${LIBEXT}.2 lib/libtalloc.${LIBEXT}.2.0.5 -lib/libtdb.${LIBEXT} -lib/libtdb.${LIBEXT}.1 -lib/libtdb.${LIBEXT}.1.2.9 ${PLIST.winbind}lib/libwbclient.${LIBEXT} ${PLIST.winbind}lib/libwbclient.${LIBEXT}.0 ${PLIST.winbind}${NSS_WINBIND} @@ -139,9 +131,6 @@ man/man8/smbpasswd.8 man/man8/smbspool.8 man/man8/smbta-util.8 man/man8/swat.8 -man/man8/tdbbackup.8 -man/man8/tdbdump.8 -man/man8/tdbtool.8 man/man8/vfs_acl_tdb.8 man/man8/vfs_acl_xattr.8 man/man8/vfs_aio_fork.8 @@ -506,9 +495,6 @@ share/samba/swat/help/manpages/smbta-util.8.html share/samba/swat/help/manpages/smbtar.1.html share/samba/swat/help/manpages/smbtree.1.html share/samba/swat/help/manpages/swat.8.html -share/samba/swat/help/manpages/tdbbackup.8.html -share/samba/swat/help/manpages/tdbdump.8.html -share/samba/swat/help/manpages/tdbtool.8.html share/samba/swat/help/manpages/testparm.1.html share/samba/swat/help/manpages/vfs_acl_tdb.8.html share/samba/swat/help/manpages/vfs_acl_xattr.8.html diff --git a/net/samba/buildlink3.mk b/net/samba/buildlink3.mk index 2da55eeeee6..21576db1d6f 100644 --- a/net/samba/buildlink3.mk +++ b/net/samba/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2012/01/30 15:44:02 adam Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2012/10/30 13:24:32 drochner Exp $ BUILDLINK_TREE+= samba @@ -10,6 +10,7 @@ BUILDLINK_ABI_DEPENDS.samba+= samba>=3.0.34nb1 BUILDLINK_PKGSRCDIR.samba?= ../../net/samba .include "../../converters/libiconv/buildlink3.mk" +.include "../../databases/tdb/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .endif # SAMBA_BUILDLINK3_MK |