Re: tdb-1.3.8, libtalloc-2.1.6, samba-4.4.2

2016-04-21 Thread Jeremie Courreges-Anglas 
Ian McWilliam  writes:

> Looks good so far.
>
> make lib-depends-check
>
> Create /usr/packages/amd64/all/samba-util-4.4.2.tgz
> LIB_DEPENDS STEM->=0.10.38:devel/gettext not needed for net/samba,-util ?
> LIB_DEPENDS converters/libiconv not needed for net/samba,-util ?

FWIW I'd prefer not to touch this for now.  I consider those warnings
are harmless, and I don't know yet what to do about the gettext module.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: tdb-1.3.8, libtalloc-2.1.6, samba-4.4.2

2016-04-19 Thread Vijay Sankar 

 Quoting Ian McWilliam :


Looks good so far.

make lib-depends-check

Create /usr/packages/amd64/all/samba-util-4.4.2.tgz
LIB_DEPENDS STEM->=0.10.38:devel/gettext not needed for net/samba,-util ?
LIB_DEPENDS converters/libiconv not needed for net/samba,-util ?
Link to /usr/packages/amd64/ftp/samba-util-4.4.2.tgz
Link to /usr/packages/amd64/cdrom/samba-util-4.4.2.tgz
`/usr/ports/pobj/samba-4.4.2/fake-amd64/.fake_done' is up to date.
===>  Building package for samba-docs-4.4.2
Create /usr/packages/amd64/no-arch/samba-docs-4.4.2.tgz
Link to /usr/packages/amd64/all/samba-docs-4.4.2.tgz
Link to /usr/packages/amd64/ftp/samba-docs-4.4.2.tgz
Link to /usr/packages/amd64/cdrom/samba-docs-4.4.2.tgz
Scanning: ok

ianm-openbsd:all {123} pkg_add samba-4.4.2.tgz
UNSIGNED PACKAGE file:./libffi-3.2.1p1.tgz: install anyway ? [y/N/a] a
samba-4.4.2:libffi-3.2.1p1: ok
samba-4.4.2:bzip2-1.0.6p7: ok
samba-4.4.2:python-2.7.11p0: ok
samba-4.4.2:samba-util-4.4.2: ok
samba-4.4.2:libtalloc-2.1.6: ok
samba-4.4.2:tevent-0.9.28: ok
samba-4.4.2:popt-1.16p1: ok
samba-4.4.2:ldb-1.1.26: ok
samba-4.4.2:libexecinfo-0.3v0: ok
samba-4.4.2:cyrus-sasl-2.1.26p16: ok
samba-4.4.2:openldap-client-2.4.44: ok
samba-4.4.2:openpam-20141014: ok
samba-4.4.2:libdaemon-0.14p1: ok
samba-4.4.2:dbus-1.10.8v0: ok
install-info: menu item `gdbm_load' already exists, for file `(none)'
system(/usr/bin/install-info, --info-dir=/usr/local/info, --,
/usr/local/info/gdbm.info) failed: exit(1)
samba-4.4.2:gdbm-1.11p1: ok
samba-4.4.2:dbus-daemon-launch-helper-1.10.8: ok
samba-4.4.2:pcre-8.38p0: ok
samba-4.4.2:libelf-0.8.13p3: ok
samba-4.4.2:glib2-2.48.0: ok
samba-4.4.2:avahi-0.6.31p24: ok
samba-4.4.2:gmp-5.0.2p3: ok
samba-4.4.2:libnettle-3.2: ok
samba-4.4.2:libidn-1.32p0: ok
samba-4.4.2:libtasn1-4.8: ok
samba-4.4.2:p11-kit-0.23.2p0: ok
samba-4.4.2:gnutls-3.4.11: ok
samba-4.4.2:gamin-0.1.10p21: ok
samba-4.4.2:py-dnspython-1.12.0p0: ok
samba-4.4.2:tdb-1.3.8: ok
samba-4.4.2:cups-libs-2.1.3p0: ok
samba-4.4.2: ok
The following new rcscripts were installed: /etc/rc.d/avahi_daemon
/etc/rc.d/avahi_dnsconfd /etc/rc.d/messagebus /etc/rc.d/nmbd
/etc/rc.d/samba /etc/rc.d/samba_ad_dc /etc/rc.d/saslauthd /etc/rc.d/smbd
/etc/rc.d/winbindd
See rcctl(8) for details.
Look in /usr/local/share/doc/pkg-readmes for extra documentation.
--- +python-2.7.11p0 ---
If you want to use this package as your default system python, as root
create symbolic links like so (overwriting any previous default):
ln -sf /usr/local/bin/python2.7 /usr/local/bin/python
ln -sf /usr/local/bin/python2.7-2to3 /usr/local/bin/2to3
ln -sf /usr/local/bin/python2.7-config /usr/local/bin/python-config
ln -sf /usr/local/bin/pydoc2.7  /usr/local/bin/pydoc
UNSIGNED PACKAGES: gnutls-3.4.11, popt-1.16p1, samba-util-4.4.2,
avahi-0.6.31p24, gdbm-1.11p1, tevent-0.9.28, gamin-0.1.10p21, ldb-1.1.26,
openldap-client-2.4.44, libexecinfo-0.3v0, pcre-8.38p0, libdaemon-0.14p1,
python-2.7.11p0, dbus-1.10.8v0, glib2-2.48.0, libtasn1-4.8,
dbus-daemon-launch-helper-1.10.8, libnettle-3.2, py-dnspython-1.12.0p0,
bzip2-1.0.6p7, libelf-0.8.13p3, samba-4.4.2, tdb-1.3.8, libffi-3.2.1p1,
cyrus-sasl-2.1.26p16, libtalloc-2.1.6, openpam-20141014, gmp-5.0.2p3,
libidn-1.32p0, p11-kit-0.23.2p0, cups-libs-2.1.3p0

install-info: menu item `gdbm_load' already exists, for file `(none)'
system(/usr/bin/install-info, --info-dir=/usr/local/info, --,
/usr/local/info/gdbm.info) failed: exit(1)
samba-4.4.2:gdbm-1.11p1: ok

/usr/local/info/dir

Programming & development tools
* gdbm_dump: gdbm_dump(gdbm).   Dump the GDBM database into a flat

file.

* gdbm_load: gdbm_load(gdbm).   Load the database from a flat file.

When the gdbm package is pkg_deleted these entires are not cleaned up and
are present in the info/dir file. When reinstalling the gdbm package it
errors out.

Manually removing those entries gives us no error.

ianm-openbsd:all {126} pkg_add samba-4.4.2.tgz
UNSIGNED PACKAGE file:./python-2.7.11p0.tgz: install anyway ? [y/N/a] a
samba-4.4.2:python-2.7.11p0: ok
samba-4.4.2:tdb-1.3.8: ok
samba-4.4.2:openpam-20141014: ok
samba-4.4.2:libtalloc-2.1.6: ok
samba-4.4.2:libexecinfo-0.3v0: ok
samba-4.4.2:popt-1.16p1: ok
samba-4.4.2:tevent-0.9.28: ok
samba-4.4.2:ldb-1.1.26: ok
samba-4.4.2:samba-util-4.4.2: ok
samba-4.4.2:dbus-daemon-launch-helper-1.10.8: ok
samba-4.4.2:libdaemon-0.14p1: ok
samba-4.4.2:gdbm-1.11p1: ok
samba-4.4.2:pcre-8.38p0: ok
samba-4.4.2:libelf-0.8.13p3: ok
samba-4.4.2:glib2-2.48.0: ok
samba-4.4.2:avahi-0.6.31p24: ok
samba-4.4.2:libtasn1-4.8: ok
samba-4.4.2:p11-kit-0.23.2p0: ok
samba-4.4.2:gmp-5.0.2p3: ok
samba-4.4.2:libnettle-3.2: ok
samba-4.4.2:libidn-1.32p0: ok
samba-4.4.2:gnutls-3.4.11: ok
samba-4.4.2:cups-libs-2.1.3p0: ok
samba-4.4.2:cyrus-sasl-2.1.26p16: ok
samba-4.4.2:openldap-client-2.4.44: ok
samba-4.4.2:gamin-0.1.10p21: ok
samba-4.4.2:py-dnspython-1.12.0p0: ok
samba-4.4.2: ok
The following new rcscripts were installed: /etc/rc.d/avahi_daemon
/etc/rc.d/avahi_dnsconfd /etc/rc.d/nmbd /etc/rc.d/samba

Re: tdb-1.3.8, libtalloc-2.1.6, samba-4.4.2

2016-04-18 Thread Ian McWilliam 
Looks good so far.

make lib-depends-check

Create /usr/packages/amd64/all/samba-util-4.4.2.tgz
LIB_DEPENDS STEM->=0.10.38:devel/gettext not needed for net/samba,-util ?
LIB_DEPENDS converters/libiconv not needed for net/samba,-util ?
Link to /usr/packages/amd64/ftp/samba-util-4.4.2.tgz
Link to /usr/packages/amd64/cdrom/samba-util-4.4.2.tgz
`/usr/ports/pobj/samba-4.4.2/fake-amd64/.fake_done' is up to date.
===>  Building package for samba-docs-4.4.2
Create /usr/packages/amd64/no-arch/samba-docs-4.4.2.tgz
Link to /usr/packages/amd64/all/samba-docs-4.4.2.tgz
Link to /usr/packages/amd64/ftp/samba-docs-4.4.2.tgz
Link to /usr/packages/amd64/cdrom/samba-docs-4.4.2.tgz
Scanning: ok


ianm-openbsd:all {123} pkg_add samba-4.4.2.tgz
UNSIGNED PACKAGE file:./libffi-3.2.1p1.tgz: install anyway ? [y/N/a] a
samba-4.4.2:libffi-3.2.1p1: ok
samba-4.4.2:bzip2-1.0.6p7: ok
samba-4.4.2:python-2.7.11p0: ok
samba-4.4.2:samba-util-4.4.2: ok
samba-4.4.2:libtalloc-2.1.6: ok
samba-4.4.2:tevent-0.9.28: ok
samba-4.4.2:popt-1.16p1: ok
samba-4.4.2:ldb-1.1.26: ok
samba-4.4.2:libexecinfo-0.3v0: ok
samba-4.4.2:cyrus-sasl-2.1.26p16: ok
samba-4.4.2:openldap-client-2.4.44: ok
samba-4.4.2:openpam-20141014: ok
samba-4.4.2:libdaemon-0.14p1: ok
samba-4.4.2:dbus-1.10.8v0: ok
install-info: menu item `gdbm_load' already exists, for file `(none)'
system(/usr/bin/install-info, --info-dir=/usr/local/info, --,
/usr/local/info/gdbm.info) failed: exit(1)
samba-4.4.2:gdbm-1.11p1: ok
samba-4.4.2:dbus-daemon-launch-helper-1.10.8: ok
samba-4.4.2:pcre-8.38p0: ok
samba-4.4.2:libelf-0.8.13p3: ok
samba-4.4.2:glib2-2.48.0: ok
samba-4.4.2:avahi-0.6.31p24: ok
samba-4.4.2:gmp-5.0.2p3: ok
samba-4.4.2:libnettle-3.2: ok
samba-4.4.2:libidn-1.32p0: ok
samba-4.4.2:libtasn1-4.8: ok
samba-4.4.2:p11-kit-0.23.2p0: ok
samba-4.4.2:gnutls-3.4.11: ok
samba-4.4.2:gamin-0.1.10p21: ok
samba-4.4.2:py-dnspython-1.12.0p0: ok
samba-4.4.2:tdb-1.3.8: ok
samba-4.4.2:cups-libs-2.1.3p0: ok
samba-4.4.2: ok
The following new rcscripts were installed: /etc/rc.d/avahi_daemon
/etc/rc.d/avahi_dnsconfd /etc/rc.d/messagebus /etc/rc.d/nmbd
/etc/rc.d/samba /etc/rc.d/samba_ad_dc /etc/rc.d/saslauthd /etc/rc.d/smbd
/etc/rc.d/winbindd
See rcctl(8) for details.
Look in /usr/local/share/doc/pkg-readmes for extra documentation.
--- +python-2.7.11p0 ---
If you want to use this package as your default system python, as root
create symbolic links like so (overwriting any previous default):
 ln -sf /usr/local/bin/python2.7 /usr/local/bin/python
 ln -sf /usr/local/bin/python2.7-2to3 /usr/local/bin/2to3
 ln -sf /usr/local/bin/python2.7-config /usr/local/bin/python-config
 ln -sf /usr/local/bin/pydoc2.7  /usr/local/bin/pydoc
UNSIGNED PACKAGES: gnutls-3.4.11, popt-1.16p1, samba-util-4.4.2,
avahi-0.6.31p24, gdbm-1.11p1, tevent-0.9.28, gamin-0.1.10p21, ldb-1.1.26,
openldap-client-2.4.44, libexecinfo-0.3v0, pcre-8.38p0, libdaemon-0.14p1,
python-2.7.11p0, dbus-1.10.8v0, glib2-2.48.0, libtasn1-4.8,
dbus-daemon-launch-helper-1.10.8, libnettle-3.2, py-dnspython-1.12.0p0,
bzip2-1.0.6p7, libelf-0.8.13p3, samba-4.4.2, tdb-1.3.8, libffi-3.2.1p1,
cyrus-sasl-2.1.26p16, libtalloc-2.1.6, openpam-20141014, gmp-5.0.2p3,
libidn-1.32p0, p11-kit-0.23.2p0, cups-libs-2.1.3p0


install-info: menu item `gdbm_load' already exists, for file `(none)'
system(/usr/bin/install-info, --info-dir=/usr/local/info, --,
/usr/local/info/gdbm.info) failed: exit(1)
samba-4.4.2:gdbm-1.11p1: ok

 /usr/local/info/dir

 Programming & development tools
* gdbm_dump: gdbm_dump(gdbm).   Dump the GDBM database into a flat file.
* gdbm_load: gdbm_load(gdbm).   Load the database from a flat file.

When the gdbm package is pkg_deleted these entires are not cleaned up and
are present in the info/dir file. When reinstalling the gdbm package it
errors out.

Manually removing those entries gives us no error.

ianm-openbsd:all {126} pkg_add samba-4.4.2.tgz
UNSIGNED PACKAGE file:./python-2.7.11p0.tgz: install anyway ? [y/N/a] a
samba-4.4.2:python-2.7.11p0: ok
samba-4.4.2:tdb-1.3.8: ok
samba-4.4.2:openpam-20141014: ok
samba-4.4.2:libtalloc-2.1.6: ok
samba-4.4.2:libexecinfo-0.3v0: ok
samba-4.4.2:popt-1.16p1: ok
samba-4.4.2:tevent-0.9.28: ok
samba-4.4.2:ldb-1.1.26: ok
samba-4.4.2:samba-util-4.4.2: ok
samba-4.4.2:dbus-daemon-launch-helper-1.10.8: ok
samba-4.4.2:libdaemon-0.14p1: ok
samba-4.4.2:gdbm-1.11p1: ok
samba-4.4.2:pcre-8.38p0: ok
samba-4.4.2:libelf-0.8.13p3: ok
samba-4.4.2:glib2-2.48.0: ok
samba-4.4.2:avahi-0.6.31p24: ok
samba-4.4.2:libtasn1-4.8: ok
samba-4.4.2:p11-kit-0.23.2p0: ok
samba-4.4.2:gmp-5.0.2p3: ok
samba-4.4.2:libnettle-3.2: ok
samba-4.4.2:libidn-1.32p0: ok
samba-4.4.2:gnutls-3.4.11: ok
samba-4.4.2:cups-libs-2.1.3p0: ok
samba-4.4.2:cyrus-sasl-2.1.26p16: ok
samba-4.4.2:openldap-client-2.4.44: ok
samba-4.4.2:gamin-0.1.10p21: ok
samba-4.4.2:py-dnspython-1.12.0p0: ok
samba-4.4.2: ok
The following new rcscripts were installed: /etc/rc.d/avahi_daemon
/etc/rc.d/avahi_dnsconfd /etc/rc.d/nmbd /etc/rc.d/samba
/etc/rc.d/samba_ad_dc /etc/rc.d/saslauthd

Re: tdb-1.3.8, libtalloc-2.1.6, samba-4.4.2

2016-04-18 Thread Vijay Sankar 
Thank you very much for the detailed answers. I will report back with usage 
reports before next Monday. 

Sent from my iPhone

> On Apr 18, 2016, at 13:16, Jeremie Courreges-Anglas  wrote:
> 
> Vijay Sankar  writes:
> 
>> Quoting j...@wxcvbn.org:
>> 
>>> Move to latest upstream versions.
>>> 
>>> - libtalloc tests now fail intermittently, upstream seems to have
>>> introduced an unstable comparison method in pytalloc
>>> - more libraries move to the private directory
>>> - shared lib bumps still hard to get right, some of them are not tracked
>>> upstream, thus some bumps come from upstream .sigs, some from
>>> abi-compliance-checker (confirmed with nm -g).
>>> - dbus added to BDEPS, needed to build vfs_snapper; not enforced in
>>> RDEPS but dbus is brought in by avahi anyway
>>> - LDEPS and WANTLIB cleanup
>>> 
>>> Build and test reports welcome!
> 
> [...]
> 
>> Thank you very much. Patches all worked for me -- I had to manually
>> download samba and tdb but once they were available in distfiles, there
>> were no issues building the packages.
> 
> Ok.  I'm also interested in usage reports, 'cause we haven't tested
> 4.4.x yet at $DAYJOB, only 4.3.
> 
>> -rw-r--r--  3 vijay  vijay   83018 Apr 18 09:49 tdb-1.3.8.tgz
>> -rw-r--r--  3 vijay  vijay   56656 Apr 18 09:50
>> libtalloc-2.1.6.tgz
>> -rw-r--r--  3 vijay  vijay18771661 Apr 18 10:19 samba-4.4.2.tgz
>> -rw-r--r--  3 vijay  vijay  193336 Apr 18 10:19 ldb-1.1.26.tgz
>> -rw-r--r--  3 vijay  vijay   50760 Apr 18 10:19
>> tevent-0.9.28.tgz
>> -rw-r--r--  3 vijay  vijay5865 Apr 18 10:19
>> samba-util-4.4.2.tgz
>> -rw-r--r--  4 vijay  vijay  174037 Apr 18 10:19
>> samba-docs-4.4.2.tgz
>> 
>> Most probably the problems are due to my network and firewall configuration
>> and nothing to do with the Makefile but noting this below just in case it
>> is relevant.
>> 
>> With tdb,  MASTER_SITES http://samba.org/ftp/tdb/ goes to
>> https://www.samba.org/ftp/tdb/ so I am not sure if that causes the problem
>> with downloading tdb.
> 
> No, only the directory listing is redirected.  But I'll move tdb and
> talloc to https://
> 
>> 
>> With samba-4.4.2, I had the error
>> 
>> ===>  Checking files for samba-4.4.2
 Fetch https://download.samba.org/pub/samba/stable/samba-4.4.2.tar.gz
>> ftp: connect: No route to host
> 
> The problem is the samba website, which is a bit overloaded to say the
> least...
> 
 Fetch
>> https://download.samba.org/pub/samba/old-versions/samba-4.4.2.tar.gz
>> ftp: Error retrieving file: 404 Not Found
 Fetch http://ftp.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
>> ftp: Error retrieving file: 404 Not Found
 Fetch
>> ftp://ftp.usa.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
>> samba-4.4.2.tar.gz: No such file or directory.
 Fetch
>> http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
>> ftp: Error retrieving file: 404 Not Found
>> 
>> Thanks again,
> 
> Well, thanks for your report! :)
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>

Re: tdb-1.3.8, libtalloc-2.1.6, samba-4.4.2

2016-04-18 Thread Jeremie Courreges-Anglas 
Vijay Sankar  writes:

>  Quoting j...@wxcvbn.org:
>
>> Move to latest upstream versions.
>>
>> - libtalloc tests now fail intermittently, upstream seems to have
>> introduced an unstable comparison method in pytalloc
>> - more libraries move to the private directory
>> - shared lib bumps still hard to get right, some of them are not tracked
>> upstream, thus some bumps come from upstream .sigs, some from
>> abi-compliance-checker (confirmed with nm -g).
>> - dbus added to BDEPS, needed to build vfs_snapper; not enforced in
>> RDEPS but dbus is brought in by avahi anyway
>> - LDEPS and WANTLIB cleanup
>>
>> Build and test reports welcome!

[...]

> Thank you very much. Patches all worked for me -- I had to manually
> download samba and tdb but once they were available in distfiles, there
> were no issues building the packages.

Ok.  I'm also interested in usage reports, 'cause we haven't tested
4.4.x yet at $DAYJOB, only 4.3.

> -rw-r--r--  3 vijay  vijay   83018 Apr 18 09:49 tdb-1.3.8.tgz
> -rw-r--r--  3 vijay  vijay   56656 Apr 18 09:50
> libtalloc-2.1.6.tgz
> -rw-r--r--  3 vijay  vijay    18771661 Apr 18 10:19 samba-4.4.2.tgz
> -rw-r--r--  3 vijay  vijay  193336 Apr 18 10:19 ldb-1.1.26.tgz
> -rw-r--r--  3 vijay  vijay   50760 Apr 18 10:19
> tevent-0.9.28.tgz
> -rw-r--r--  3 vijay  vijay    5865 Apr 18 10:19
> samba-util-4.4.2.tgz
> -rw-r--r--  4 vijay  vijay  174037 Apr 18 10:19
> samba-docs-4.4.2.tgz
>
> Most probably the problems are due to my network and firewall configuration
> and nothing to do with the Makefile but noting this below just in case it
> is relevant.
>
> With tdb,  MASTER_SITES http://samba.org/ftp/tdb/ goes to
> https://www.samba.org/ftp/tdb/ so I am not sure if that causes the problem
> with downloading tdb.

No, only the directory listing is redirected.  But I'll move tdb and
talloc to https://

>
> With samba-4.4.2, I had the error
>
> ===>  Checking files for samba-4.4.2
>>> Fetch https://download.samba.org/pub/samba/stable/samba-4.4.2.tar.gz
> ftp: connect: No route to host

The problem is the samba website, which is a bit overloaded to say the
least...

>>> Fetch
> https://download.samba.org/pub/samba/old-versions/samba-4.4.2.tar.gz
> ftp: Error retrieving file: 404 Not Found
>>> Fetch http://ftp.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
> ftp: Error retrieving file: 404 Not Found
>>> Fetch
> ftp://ftp.usa.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
> samba-4.4.2.tar.gz: No such file or directory.
>>> Fetch
> http://ftp.fr.openbsd.org/pub/OpenBSD/distfiles//samba-4.4.2.tar.gz
> ftp: Error retrieving file: 404 Not Found
>
> Thanks again,

Well, thanks for your report! :)

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Re: tdb-1.3.8, libtalloc-2.1.6, samba-4.4.2

2016-04-18 Thread Vijay Sankar 

 Quoting j...@wxcvbn.org:


Move to latest upstream versions.

- libtalloc tests now fail intermittently, upstream seems to have
introduced an unstable comparison method in pytalloc
- more libraries move to the private directory
- shared lib bumps still hard to get right, some of them are not tracked
upstream, thus some bumps come from upstream .sigs, some from
abi-compliance-checker (confirmed with nm -g).
- dbus added to BDEPS, needed to build vfs_snapper; not enforced in
RDEPS but dbus is brought in by avahi anyway
- LDEPS and WANTLIB cleanup

Build and test reports welcome!

Index: databases/tdb/Makefile
===
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- databases/tdb/Makefile        12 Apr 2016 17:38:15 -     

  1.18

+++ databases/tdb/Makefile        17 Apr 2016 20:08:11 -
@@ -2,8 +2,8 @@

COMMENT=        trivial database library

-# Keep in sync with the version bundled in net/samba4
-DISTNAME=        tdb-1.3.7
+# Keep in sync with the version bundled in net/samba
+DISTNAME=        tdb-1.3.8

SHARED_LIBS+=        tdb        4.1

@@ -32,8 +32,9 @@ LIB_DEPENDS=        ${MODPY_LIB_DEPENDS}
WAF_ARGS=        -v -j ${MAKE_JOBS}
MAKE_FLAGS=        WAF_ARGS="${WAF_ARGS}"
.for _l _v in ${SHARED_LIBS}
-MAKE_ENV +=             LIB${_l:S/-/_/g}_VERSION=${_v}
+MAKE_ENV +=        LIB${_l:S/-/_/g}_VERSION=${_v}
.endfor
+TEST_ENV=        LD_LIBRARY_PATH="${WRKSRC}/bin/default"

CONFIGURE_STYLE= simple
CONFIGURE_ARGS= --mandir="${PREFIX}/man" \
Index: databases/tdb/distinfo
===
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- databases/tdb/distinfo        12 Apr 2016 17:38:15 -     

  1.6

+++ databases/tdb/distinfo        17 Apr 2016 17:26:52 -
@@ -1,2 +1,2 @@
-SHA256 (tdb-1.3.7.tar.gz) = pk2VygzAaij+0kxulSrtdmDK4EmDEIc11rwwuSUTZBI=
-SIZE (tdb-1.3.7.tar.gz) = 493847
+SHA256 (tdb-1.3.8.tar.gz) = BgWsBCfqycI79h6/2CBqB9Xs4ZhJjqsXac0M+2595rE=
+SIZE (tdb-1.3.8.tar.gz) = 494106
Index: databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py
===
RCS file:


/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py,v

retrieving revision 1.2
diff -u -p -r1.2 patch-buildtools_wafsamba_samba_install_py
--- databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py   
    12 Apr 2016 17:38:15 -        1.2
+++ databases/tdb/patches/patch-buildtools_wafsamba_samba_install_py   
    17 Apr 2016 17:30:13 -
@@ -3,10 +3,13 @@ $OpenBSD: patch-buildtools_wafsamba_samb
- respect OpenBSD shared libraries versioning
- --version-script fails if specified multipled times

 buildtools/wafsamba/samba_install.py.orig        Sat Jun 13
03:00:10 2015
-+++ buildtools/wafsamba/samba_install.py        Sun Apr 10 12:24:17

2016

-@@ -117,9 +117,12 @@ def install_library(self):
+--- buildtools/wafsamba/samba_install.py.orig        Fri Nov  6
14:28:25 2015
 buildtools/wafsamba/samba_install.py        Sun Apr 17 19:30:08

2016

+@@ -116,11 +116,15 @@ def install_library(self):
+             else:
+                 inst_name    = bld.make_libname(t.target)
         elif self.vnum:
++            import sys
             vnum_base    = self.vnum.split('.')[0]
             install_name = bld.make_libname(target_name,
version=self.vnum)
-            install_link = bld.make_libname(target_name,
version=vnum_base)
@@ -21,7 +24,7 @@ $OpenBSD: patch-buildtools_wafsamba_samb
                 # only generate the dev link for non-bundled

libs

                 dev_link     = bld.make_libname(target_name)
         elif getattr(self, 'soname', ''):
-@@ -169,7 +172,7 @@ def apply_vscript(self):
+@@ -170,7 +174,7 @@ def apply_vscript(self):
     '''add version-script arguments to library build'''

     if self.env.HAVE_LD_VERSION_SCRIPT and getattr(self,
'version_script', ''):
Index: databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py
===
RCS file:
/cvs/ports/databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py,v
retrieving revision 1.3
diff -u -p -r1.3 patch-buildtools_wafsamba_wafsamba_py
--- databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py     

 

12 Apr 2016 17:38:15 -        1.3
+++ databases/tdb/patches/patch-buildtools_wafsamba_wafsamba_py     

 

17 Apr 2016 17:27:06 -
@@ -3,9 +3,9 @@ $OpenBSD: patch-buildtools_wafsamba_wafs
- allow the library version to be overriden
- make sure we don't clobber the version that ends up in tdb.pc

 buildtools/wafsamba/wafsamba.py.orig        Tue Jul 21 22:32:32

2015

-+++ buildtools/wafsamba/wafsamba.py        Sun Apr 10 12:53:36 2016
-@@ -215,6 +215,13 @@ def SAMBA_LIBRARY(bld, libname, source,
+--- buildtools/wafsamba/wafsamba.py.orig        Fri Nov  6