~olbohlen/oi-userland.git

parent: 970a826d | patch | commit | ignore whitespace

Michal Nowak

2018-08-01 c52e52d29287a860dbd43533b909aae765d2bd57

FreeTDS: update to 1.00.94

2 files added

4 files modified

	components/database/freetds/Makefile	27 ●●●●● patch \| view \| raw \| blame \| history
	components/database/freetds/freetds.p5m	38 ●●●●● patch \| view \| raw \| blame \| history
	components/database/freetds/library-freetds.p5m	1 ●●●●● patch \| view \| raw \| blame \| history
	components/database/freetds/manifests/sample-manifest.p5m	4031 ●●●●● patch \| view \| raw \| blame \| history
	components/database/freetds/test/results-32.master	41 ●●●●● patch \| view \| raw \| blame \| history
	components/database/freetds/test/results-64.master	41 ●●●●● patch \| view \| raw \| blame \| history

 components/database/freetds/Makefile

@@ -10,20 +10,23 @@

#
# Copyright 2016 Alexander Pyhalov
# Copyright 2018 Michal Nowak
#

PREFERRED_BITS=64

include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        freetds
COMPONENT_VERSION=    1.00.6
IPS_COMPONENT_VERSION=    1.0.6
COMPONENT_VERSION=    1.00.94
IPS_COMPONENT_VERSION=    1.0.94
COMPONENT_PROJECT_URL=    http://www.freetds.org/
COMPONENT_SUMMARY=    FreeTDS command-line utilities
COMPONENT_CLASSIFICATION=    System/Databases
COMPONENT_SRC=        $(COMPONENT_NAME)-$(COMPONENT_VERSION)
COMPONENT_ARCHIVE=    $(COMPONENT_SRC).tar.bz2
COMPONENT_ARCHIVE_HASH=    \
    sha256:b59cf0b48ea53095657a99583b853205df4e9dc295119cfbf4b1cdc0da9ba828
    sha256:5fcf59a554eb3e72a09cc49c8dba5db8ad6dced07315ed775c4b8b2b81b603e4
COMPONENT_ARCHIVE_URL=    ftp://ftp.freetds.org/pub/freetds/stable/$(COMPONENT_ARCHIVE)
COMPONENT_FMRI=        database/freetds
COMPONENT_LICENSE=    LGPLv2
@@ -36,23 +39,31 @@
LDFLAGS += -lsocket -lnsl
CFLAGS += -I/usr/include/odbc

CONFIGURE_OPTIONS+=    --sysconfdir=/etc

CONFIGURE_BINDIR.32 =   $(CONFIGURE_PREFIX)/bin/$(MACH32)
CONFIGURE_OPTIONS +=    --sysconfdir=/etc
CONFIGURE_OPTIONS +=    --disable-static
CONFIGURE_OPTIONS +=    --enable-threadsafe
CONFIGURE_OPTIONS +=    --with-gnutls=$(CONFIGURE_PREFIX)/include/gnutls-3
CONFIGURE_OPTIONS +=    --with-unixodbc=$(CONFIGURE_PREFIX)

COMPONENT_POST_INSTALL_ACTION= \
    (cd $(PROTOUSRDIR) ;  \
     $(MV) include/tds_sysdep_public.h include/tds_sysdep_public-$(BITS).h )

# Some tests require SQL server to talk to (which we don't have), so they
# fail in our case: http://www.freetds.org/userguide/confirminstall.htm#TESTS
COMPONENT_TEST_TRANSFORMER = $(NAWK)
COMPONENT_TEST_TRANSFORMS = "'/TOTAL|PASS|FAIL|XFAIL|SKIP|XPASS|ERROR/'"

# common targets
build:        $(BUILD_32_and_64)

install:    $(INSTALL_32_and_64)

test:        $(NO_TESTS)
test:        $(TEST_32_and_64)

REQUIRED_PACKAGES += SUNWcs
# Auto-generated dependencies
REQUIRED_PACKAGES += library/readline
REQUIRED_PACKAGES += library/security/openssl
REQUIRED_PACKAGES += library/unixodbc
REQUIRED_PACKAGES += SUNWcs
REQUIRED_PACKAGES += system/library

 components/database/freetds/freetds.p5m

@@ -11,6 +11,7 @@

#
# Copyright 2016 Alexander Pyhalov
# Copyright 2018 Michal Nowak
#

set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -26,34 +27,15 @@
file etc/locales.conf path=usr/share/doc/freetds/locales.conf.sample
file etc/pool.conf path=usr/share/doc/freetds/pools.conf.sample

hardlink path=usr/bin/bsqldb target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/bsqlodbc target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/datacopy target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/defncopy target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/fisql target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/freebcp target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/osql target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/tdspool target=../lib/isaexec pkg.linted.userland.action002.0=true
hardlink path=usr/bin/tsql target=../lib/isaexec pkg.linted.userland.action002.0=true

file path=usr/bin/$(MACH32)/bsqldb
file path=usr/bin/$(MACH32)/bsqlodbc
file path=usr/bin/$(MACH32)/datacopy
file path=usr/bin/$(MACH32)/defncopy
file path=usr/bin/$(MACH32)/fisql
file path=usr/bin/$(MACH32)/freebcp
file path=usr/bin/$(MACH32)/osql
file path=usr/bin/$(MACH32)/tdspool
file path=usr/bin/$(MACH32)/tsql
file path=usr/bin/$(MACH64)/bsqldb
file path=usr/bin/$(MACH64)/bsqlodbc
file path=usr/bin/$(MACH64)/datacopy
file path=usr/bin/$(MACH64)/defncopy
file path=usr/bin/$(MACH64)/fisql
file path=usr/bin/$(MACH64)/freebcp
file path=usr/bin/$(MACH64)/osql
file path=usr/bin/$(MACH64)/tdspool
file path=usr/bin/$(MACH64)/tsql
file path=usr/bin/bsqldb
file path=usr/bin/bsqlodbc
file path=usr/bin/datacopy
file path=usr/bin/defncopy
file path=usr/bin/fisql
file path=usr/bin/freebcp
file path=usr/bin/osql
file path=usr/bin/tdspool
file path=usr/bin/tsql
file path=usr/share/man/man1/bsqldb.1
file path=usr/share/man/man1/bsqlodbc.1
file path=usr/share/man/man1/datacopy.1

 components/database/freetds/library-freetds.p5m

@@ -11,6 +11,7 @@

#
# Copyright 2016 Alexander Pyhalov
# Copyright 2018 Michal Nowak
#

set name=pkg.fmri value=pkg:/library/freetds@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)

 components/database/freetds/manifests/sample-manifest.p5m

Diff too large

 components/database/freetds/test/results-32.master

New file
@@ -0,0 +1,41 @@
PASS: mutex1
PASS: condition
PASS: strings
PASS: passarg
PASS: strtok_r
# TOTAL: 5
# PASS:  5
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
FAIL: t0001
FAIL: t0002
FAIL: t0003
FAIL: t0004
FAIL: t0005
FAIL: t0006
PASS: t0007
PASS: t0008
FAIL: dynamic1
PASS: convert
FAIL: dataread
FAIL: utf8_1
FAIL: utf8_2
FAIL: utf8_3
PASS: numeric
PASS: iconv_fread
FAIL: toodynamic
PASS: readconf
PASS: charconv
FAIL: nulls
FAIL: corrupt
PASS: challenge
# TOTAL: 22
# PASS:  8
# SKIP:  0
# XFAIL: 0
# FAIL:  14
# XPASS: 0
# ERROR: 0

 components/database/freetds/test/results-64.master

New file
@@ -0,0 +1,41 @@
PASS: mutex1
PASS: condition
PASS: strings
PASS: passarg
PASS: strtok_r
# TOTAL: 5
# PASS:  5
# SKIP:  0
# XFAIL: 0
# FAIL:  0
# XPASS: 0
# ERROR: 0
FAIL: t0001
FAIL: t0002
FAIL: t0003
FAIL: t0004
FAIL: t0005
FAIL: t0006
PASS: t0007
PASS: t0008
FAIL: dynamic1
PASS: convert
FAIL: dataread
FAIL: utf8_1
FAIL: utf8_2
FAIL: utf8_3
PASS: numeric
PASS: iconv_fread
FAIL: toodynamic
PASS: readconf
PASS: charconv
FAIL: nulls
FAIL: corrupt
PASS: challenge
# TOTAL: 22
# PASS:  8
# SKIP:  0
# XFAIL: 0
# FAIL:  14
# XPASS: 0
# ERROR: 0

			@@ -10,20 +10,23 @@

			#
			# Copyright 2016 Alexander Pyhalov
			# Copyright 2018 Michal Nowak
			#

			PREFERRED_BITS=64

			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME= freetds
			COMPONENT_VERSION= 1.00.6
			IPS_COMPONENT_VERSION= 1.0.6
			COMPONENT_VERSION= 1.00.94
			IPS_COMPONENT_VERSION= 1.0.94
			COMPONENT_PROJECT_URL= http://www.freetds.org/
			COMPONENT_SUMMARY= FreeTDS command-line utilities
			COMPONENT_CLASSIFICATION= System/Databases
			COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION)
			COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2
			COMPONENT_ARCHIVE_HASH= \
			sha256:b59cf0b48ea53095657a99583b853205df4e9dc295119cfbf4b1cdc0da9ba828
			sha256:5fcf59a554eb3e72a09cc49c8dba5db8ad6dced07315ed775c4b8b2b81b603e4
			COMPONENT_ARCHIVE_URL= ftp://ftp.freetds.org/pub/freetds/stable/$(COMPONENT_ARCHIVE)
			COMPONENT_FMRI= database/freetds
			COMPONENT_LICENSE= LGPLv2
			@@ -36,23 +39,31 @@
			LDFLAGS += -lsocket -lnsl
			CFLAGS += -I/usr/include/odbc

			CONFIGURE_OPTIONS+= --sysconfdir=/etc

			CONFIGURE_BINDIR.32 = $(CONFIGURE_PREFIX)/bin/$(MACH32)
			CONFIGURE_OPTIONS += --sysconfdir=/etc
			CONFIGURE_OPTIONS += --disable-static
			CONFIGURE_OPTIONS += --enable-threadsafe
			CONFIGURE_OPTIONS += --with-gnutls=$(CONFIGURE_PREFIX)/include/gnutls-3
			CONFIGURE_OPTIONS += --with-unixodbc=$(CONFIGURE_PREFIX)

			COMPONENT_POST_INSTALL_ACTION= \
			(cd $(PROTOUSRDIR) ; \
			$(MV) include/tds_sysdep_public.h include/tds_sysdep_public-$(BITS).h )

			# Some tests require SQL server to talk to (which we don't have), so they
			# fail in our case: http://www.freetds.org/userguide/confirminstall.htm#TESTS
			COMPONENT_TEST_TRANSFORMER = $(NAWK)
			COMPONENT_TEST_TRANSFORMS = "'/TOTAL\|PASS\|FAIL\|XFAIL\|SKIP\|XPASS\|ERROR/'"

			# common targets
			build: $(BUILD_32_and_64)

			install: $(INSTALL_32_and_64)

			test: $(NO_TESTS)
			test: $(TEST_32_and_64)

			REQUIRED_PACKAGES += SUNWcs
			# Auto-generated dependencies
			REQUIRED_PACKAGES += library/readline
			REQUIRED_PACKAGES += library/security/openssl
			REQUIRED_PACKAGES += library/unixodbc
			REQUIRED_PACKAGES += SUNWcs
			REQUIRED_PACKAGES += system/library

			@@ -11,6 +11,7 @@

			#
			# Copyright 2016 Alexander Pyhalov
			# Copyright 2018 Michal Nowak
			#

			set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
			@@ -26,34 +27,15 @@
			file etc/locales.conf path=usr/share/doc/freetds/locales.conf.sample
			file etc/pool.conf path=usr/share/doc/freetds/pools.conf.sample

			hardlink path=usr/bin/bsqldb target=../lib/isaexec pkg.linted.userland.action002.0=true
			hardlink path=usr/bin/bsqlodbc target=../lib/isaexec pkg.linted.userland.action002.0=true
			hardlink path=usr/bin/datacopy target=../lib/isaexec pkg.linted.userland.action002.0=true
			hardlink path=usr/bin/defncopy target=../lib/isaexec pkg.linted.userland.action002.0=true
			hardlink path=usr/bin/fisql target=../lib/isaexec pkg.linted.userland.action002.0=true
			hardlink path=usr/bin/freebcp target=../lib/isaexec pkg.linted.userland.action002.0=true
			hardlink path=usr/bin/osql target=../lib/isaexec pkg.linted.userland.action002.0=true
			hardlink path=usr/bin/tdspool target=../lib/isaexec pkg.linted.userland.action002.0=true
			hardlink path=usr/bin/tsql target=../lib/isaexec pkg.linted.userland.action002.0=true

			file path=usr/bin/$(MACH32)/bsqldb
			file path=usr/bin/$(MACH32)/bsqlodbc
			file path=usr/bin/$(MACH32)/datacopy
			file path=usr/bin/$(MACH32)/defncopy
			file path=usr/bin/$(MACH32)/fisql
			file path=usr/bin/$(MACH32)/freebcp
			file path=usr/bin/$(MACH32)/osql
			file path=usr/bin/$(MACH32)/tdspool
			file path=usr/bin/$(MACH32)/tsql
			file path=usr/bin/$(MACH64)/bsqldb
			file path=usr/bin/$(MACH64)/bsqlodbc
			file path=usr/bin/$(MACH64)/datacopy
			file path=usr/bin/$(MACH64)/defncopy
			file path=usr/bin/$(MACH64)/fisql
			file path=usr/bin/$(MACH64)/freebcp
			file path=usr/bin/$(MACH64)/osql
			file path=usr/bin/$(MACH64)/tdspool
			file path=usr/bin/$(MACH64)/tsql
			file path=usr/bin/bsqldb
			file path=usr/bin/bsqlodbc
			file path=usr/bin/datacopy
			file path=usr/bin/defncopy
			file path=usr/bin/fisql
			file path=usr/bin/freebcp
			file path=usr/bin/osql
			file path=usr/bin/tdspool
			file path=usr/bin/tsql
			file path=usr/share/man/man1/bsqldb.1
			file path=usr/share/man/man1/bsqlodbc.1
			file path=usr/share/man/man1/datacopy.1

New file
			@@ -0,0 +1,41 @@
			PASS: mutex1
			PASS: condition
			PASS: strings
			PASS: passarg
			PASS: strtok_r
			# TOTAL: 5
			# PASS: 5
			# SKIP: 0
			# XFAIL: 0
			# FAIL: 0
			# XPASS: 0
			# ERROR: 0
			FAIL: t0001
			FAIL: t0002
			FAIL: t0003
			FAIL: t0004
			FAIL: t0005
			FAIL: t0006
			PASS: t0007
			PASS: t0008
			FAIL: dynamic1
			PASS: convert
			FAIL: dataread
			FAIL: utf8_1
			FAIL: utf8_2
			FAIL: utf8_3
			PASS: numeric
			PASS: iconv_fread
			FAIL: toodynamic
			PASS: readconf
			PASS: charconv
			FAIL: nulls
			FAIL: corrupt
			PASS: challenge
			# TOTAL: 22
			# PASS: 8
			# SKIP: 0
			# XFAIL: 0
			# FAIL: 14
			# XPASS: 0
			# ERROR: 0