Update to tdb-1.3.18
This commit is contained in:
jca
parent
87fdce8787
commit
1bbf783120
@ -1,12 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.30 2019/11/08 19:44:31 jca Exp $
|
||||
# $OpenBSD: Makefile,v 1.31 2019/12/04 00:14:45 jca Exp $
|
||||
|
||||
COMMENT= trivial database library
|
||||
|
||||
# Keep in sync with the version bundled in net/samba
|
||||
DISTNAME= tdb-1.3.16
|
||||
REVISION= 1
|
||||
DISTNAME= tdb-1.3.18
|
||||
|
||||
SHARED_LIBS+= tdb 4.3
|
||||
SHARED_LIBS+= tdb 4.4
|
||||
|
||||
CATEGORIES= databases
|
||||
|
||||
@ -19,8 +18,9 @@ PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB += c intl m pthread util ${MODPY_WANTLIB}
|
||||
|
||||
MASTER_SITES= https://filedump.se.rit.edu/pub/distfiles/ \
|
||||
https://download.samba.org/pub/tdb/
|
||||
MASTER_SITES= https://download.samba.org/pub/tdb/
|
||||
|
||||
DEBUG_PACKAGES= ${BUILD_PACKAGES}
|
||||
|
||||
MODULES= lang/python
|
||||
MODPY_RUNDEP= No
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (tdb-1.3.16.tar.gz) = aj/CYWVn8jmTmEraPOqX2VOidmn/0b+76WHybgz5bMU=
|
||||
SIZE (tdb-1.3.16.tar.gz) = 504330
|
||||
SHA256 (tdb-1.3.18.tar.gz) = wVa0Doi8gqU4iTQ3zXY9JvvtU3mHHg9yGf0CHmDTNrc=
|
||||
SIZE (tdb-1.3.18.tar.gz) = 697970
|
||||
|
||||
@ -1,11 +1,13 @@
|
||||
$OpenBSD: patch-Makefile,v 1.1 2015/07/18 02:11:13 jca Exp $
|
||||
--- Makefile.orig Thu Jul 16 12:58:06 2015
|
||||
+++ Makefile Thu Jul 16 12:58:16 2015
|
||||
@@ -1,6 +1,6 @@
|
||||
# simple makefile wrapper to run waf
|
||||
$OpenBSD: patch-Makefile,v 1.2 2019/12/04 00:14:45 jca Exp $
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
-WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf
|
||||
+WAF=WAF_MAKE=1 PATH=buildtools/bin:../../buildtools/bin:$$PATH waf $(WAF_ARGS)
|
||||
WAF_BIN=`PATH=buildtools/bin:../../buildtools/bin:$$PATH which waf`
|
||||
WAF_BINARY=$(PYTHON) $(WAF_BIN)
|
||||
-WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
|
||||
+WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY) $(WAF_ARGS)
|
||||
|
||||
all:
|
||||
$(WAF) build
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
$OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.4 2016/04/25 08:13:41 jca Exp $
|
||||
$OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.5 2019/12/04 00:14:45 jca Exp $
|
||||
|
||||
- respect OpenBSD shared libraries versioning
|
||||
- --version-script fails if specified multipled times
|
||||
|
||||
--- buildtools/wafsamba/samba_install.py.orig Thu Dec 10 12:01:40 2015
|
||||
+++ buildtools/wafsamba/samba_install.py Sat Apr 23 18:40:25 2016
|
||||
Index: buildtools/wafsamba/samba_install.py
|
||||
--- buildtools/wafsamba/samba_install.py.orig
|
||||
+++ buildtools/wafsamba/samba_install.py
|
||||
@@ -117,11 +117,15 @@ def install_library(self):
|
||||
else:
|
||||
inst_name = bld.make_libname(t.target)
|
||||
@ -24,7 +25,7 @@ $OpenBSD: patch-buildtools_wafsamba_samba_install_py,v 1.4 2016/04/25 08:13:41 j
|
||||
# only generate the dev link for non-bundled libs
|
||||
dev_link = bld.make_libname(target_name)
|
||||
elif getattr(self, 'soname', ''):
|
||||
@@ -171,7 +175,7 @@ def apply_vscript(self):
|
||||
@@ -172,7 +176,7 @@ def apply_vscript(self):
|
||||
'''add version-script arguments to library build'''
|
||||
|
||||
if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self, 'version_script', ''):
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
$OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.7 2018/08/12 22:57:21 jca Exp $
|
||||
$OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.8 2019/12/04 00:14:45 jca Exp $
|
||||
|
||||
- allow the library version to be overriden
|
||||
- make sure we don't clobber the version that ends up in tdb.pc
|
||||
@ -6,7 +6,7 @@ $OpenBSD: patch-buildtools_wafsamba_wafsamba_py,v 1.7 2018/08/12 22:57:21 jca Ex
|
||||
Index: buildtools/wafsamba/wafsamba.py
|
||||
--- buildtools/wafsamba/wafsamba.py.orig
|
||||
+++ buildtools/wafsamba/wafsamba.py
|
||||
@@ -222,6 +222,13 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
@@ -214,6 +214,13 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
realname = bld.map_shlib_extension(realname, python=(target_type=='PYTHON'))
|
||||
link_name = bld.map_shlib_extension(link_name, python=(target_type=='PYTHON'))
|
||||
|
||||
@ -20,10 +20,10 @@ Index: buildtools/wafsamba/wafsamba.py
|
||||
# we don't want any public libraries without version numbers
|
||||
if (not private_library and target_type != 'PYTHON' and not realname):
|
||||
if vnum is None and soname is None:
|
||||
@@ -331,9 +338,9 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
@@ -325,9 +332,9 @@ def SAMBA_LIBRARY(bld, libname, source,
|
||||
|
||||
if pc_files is not None and not private_library:
|
||||
if pyembed and bld.env['IS_EXTRA_PYTHON']:
|
||||
if pyembed:
|
||||
- bld.PKG_CONFIG_FILES(pc_files, vnum=vnum, extra_name=bld.env['PYTHON_SO_ABI_FLAG'])
|
||||
+ bld.PKG_CONFIG_FILES(pc_files, vnum=saved_lib_version, extra_name=bld.env['PYTHON_SO_ABI_FLAG'])
|
||||
else:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.9 2019/06/22 23:04:49 jca Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.10 2019/12/04 00:14:45 jca Exp $
|
||||
@conflict samba-<3.5.0
|
||||
@bin bin/tdbbackup
|
||||
@bin bin/tdbdump
|
||||
@ -9,7 +9,7 @@ include/tdb.h
|
||||
lib/pkgconfig/tdb.pc
|
||||
lib/python${MODPY_VERSION}/site-packages/_tdb_text.py
|
||||
lib/python${MODPY_VERSION}/site-packages/_tdb_text.pyc
|
||||
lib/python${MODPY_VERSION}/site-packages/tdb.so
|
||||
@so lib/python${MODPY_VERSION}/site-packages/tdb.so
|
||||
@man man/man8/tdbbackup.8
|
||||
@man man/man8/tdbdump.8
|
||||
@man man/man8/tdbrestore.8
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user