[freetds/el5/master] update to latest stable snapshot of 0.82.1
Dmitry Butskoy
buc at fedoraproject.org
Tue May 10 13:45:03 UTC 2011
commit 8b1cc6b94fc3815615136f33983bc1862080bd0d
Author: Dmitry Butskoy <Dmitry at Butskoy.name>
Date: Tue May 10 17:44:26 2011 +0400
update to latest stable snapshot of 0.82.1
freetds-0.64-makefile-doc.patch | 104 -----------------------
freetds-0.82.1-shared-libtds.patch | 125 +++++++++++++++++++++++++++
freetds-0.82.1-version.patch | 33 +++++++
freetds-tds_sysdep_public.h | 15 ++++
freetds.spec | 163 +++++++++++++++++++++++++++++-------
sources | 2 +-
6 files changed, 305 insertions(+), 137 deletions(-)
---
diff --git a/freetds-0.82.1-shared-libtds.patch b/freetds-0.82.1-shared-libtds.patch
new file mode 100644
index 0000000..b2314a7
--- /dev/null
+++ b/freetds-0.82.1-shared-libtds.patch
@@ -0,0 +1,125 @@
+diff -Nrbu freetds-0.82.1.dev.20100810/include/Makefile.am freetds-0.82.1.dev.20100810-OK/include/Makefile.am
+--- freetds-0.82.1.dev.20100810/include/Makefile.am 2008-08-07 15:26:55.000000000 +0400
++++ freetds-0.82.1.dev.20100810-OK/include/Makefile.am 2011-02-10 19:08:29.000000000 +0300
+@@ -3,6 +3,7 @@
+ include_HEADERS = bkpublic.h cspublic.h cstypes.h ctpublic.h \
+ sqldb.h sqlfront.h \
+ sybdb.h sybfront.h \
++ tds.h tdsver.h tdsconvert.h \
+ syberror.h
+
+ nodist_include_HEADERS = tds_sysdep_public.h
+@@ -19,7 +20,6 @@
+ tdsthread.h \
+ tdsbytes.h \
+ replacements/readpassphrase.h \
+- tds.h tdsver.h tdsconvert.h \
+ tdssrv.h
+
+ DISTCLEANFILES = tds_sysdep_public.h freetds_sysconfdir.h
+diff -Nrbu freetds-0.82.1.dev.20100810/src/apps/Makefile.am freetds-0.82.1.dev.20100810-OK/src/apps/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/apps/Makefile.am 2010-07-28 16:35:50.000000000 +0400
++++ freetds-0.82.1.dev.20100810-OK/src/apps/Makefile.am 2011-02-10 19:12:08.000000000 +0300
+@@ -19,7 +19,7 @@
+ freebcp_LDADD = ../dblib/libsybdb.la ../replacements/libreplacements.la $(LIBICONV) $(NETWORK_LIBS)
+ freebcp_SOURCES = freebcp.c freebcp.h
+
+-tsql_LDADD = ../tds/libtds.la \
++tsql_LDADD = ../tds/libtds_objects.la \
+ ../replacements/libreplacements.la \
+ $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC) $(READLINE_LIBS)
+
+diff -Nrbu freetds-0.82.1.dev.20100810/src/ctlib/Makefile.am freetds-0.82.1.dev.20100810-OK/src/ctlib/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/ctlib/Makefile.am 2007-11-22 11:44:54.000000000 +0300
++++ freetds-0.82.1.dev.20100810-OK/src/ctlib/Makefile.am 2011-02-10 19:08:29.000000000 +0300
+@@ -18,5 +18,5 @@
+ endif
+ libct_la_LDFLAGS= -version-info 4:0:0 $(SYMBOLS) $(FREETDS_SYMBOLIC)
+
+-libct_la_LIBADD = ../tds/libtds.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
++libct_la_LIBADD = ../tds/libtds_objects.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+
+diff -Nrbu freetds-0.82.1.dev.20100810/src/dblib/Makefile.am freetds-0.82.1.dev.20100810-OK/src/dblib/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/dblib/Makefile.am 2007-11-22 11:44:54.000000000 +0300
++++ freetds-0.82.1.dev.20100810-OK/src/dblib/Makefile.am 2011-02-10 19:08:29.000000000 +0300
+@@ -20,5 +20,5 @@
+ SYMBOLS = -export-symbols-regex '^(db|bcp_|tdsdump_open|tdsdbopen|.*_xact|close_commit|open_commit|.?asprintf).*'
+ endif
+ libsybdb_la_LDFLAGS= -version-info 5:0:0 $(SYMBOLS) $(FREETDS_SYMBOLIC)
+-libsybdb_la_LIBADD= ../tds/libtds.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
++libsybdb_la_LIBADD= ../tds/libtds_objects.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+
+diff -Nrbu freetds-0.82.1.dev.20100810/src/odbc/Makefile.am freetds-0.82.1.dev.20100810-OK/src/odbc/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/odbc/Makefile.am 2007-12-03 21:55:09.000000000 +0300
++++ freetds-0.82.1.dev.20100810-OK/src/odbc/Makefile.am 2011-02-10 19:08:29.000000000 +0300
+@@ -13,14 +13,14 @@
+ descriptor.c prepare_query.c odbc_util.c \
+ native.c sql2tds.c error.c odbc_checks.c $(MINGW_SOURCES)
+ if MINGW32
+-libtdsodbc_la_LIBADD= ../../win32/setup.res ../tds/libtds.la ../replacements/libreplacements.la $(ODBCINSTLIB) \
++libtdsodbc_la_LIBADD= ../../win32/setup.res ../tds/libtds_objects.la ../replacements/libreplacements.la $(ODBCINSTLIB) \
+ $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+ libtdsodbc_la_LDFLAGS = -Wl,--enable-stdcall-fixup -Wl,-s -Wl,../../win32/FreeTDS.def -Wl,../../win32/setup.res $(FREETDS_SYMBOLIC)
+
+ .rc.res:
+ $(RC) -i $< --input-format=rc -o $@ -O coff
+ else
+-libtdsodbc_la_LIBADD= ../tds/libtds.la ../replacements/libreplacements.la $(ODBCINSTLIB) $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
++libtdsodbc_la_LIBADD= ../tds/libtds_objects.la ../replacements/libreplacements.la $(ODBCINSTLIB) $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+ if MACOSX
+ SYMBOLS =
+ else
+diff -Nrbu freetds-0.82.1.dev.20100810/src/server/Makefile.am freetds-0.82.1.dev.20100810-OK/src/server/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/server/Makefile.am 2010-07-28 16:35:50.000000000 +0400
++++ freetds-0.82.1.dev.20100810-OK/src/server/Makefile.am 2011-02-10 19:11:09.000000000 +0300
+@@ -2,7 +2,7 @@
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+ noinst_LTLIBRARIES = libtdssrv.la
+ libtdssrv_la_SOURCES= query.c server.c login.c
+-libtdssrv_la_LIBADD = ../tds/libtds.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
++libtdssrv_la_LIBADD = ../tds/libtds_objects.la ../replacements/libreplacements.la $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
+ noinst_PROGRAMS = tdssrv
+ tdssrv_LDADD = libtdssrv.la $(LIBICONV) $(NETWORK_LIBS)
+ tdssrv_SOURCES = unittest.c
+diff -Nrbu freetds-0.82.1.dev.20100810/src/tds/Makefile.am freetds-0.82.1.dev.20100810-OK/src/tds/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/tds/Makefile.am 2008-08-07 15:26:59.000000000 +0400
++++ freetds-0.82.1.dev.20100810-OK/src/tds/Makefile.am 2011-02-10 19:14:45.000000000 +0300
+@@ -3,15 +3,24 @@
+ SUBDIRS = unittests
+ AM_CPPFLAGS = -I$(top_srcdir)/include
+
+-noinst_LTLIBRARIES = libtds.la
+-libtds_la_SOURCES= mem.c token.c util.c login.c read.c \
++noinst_LTLIBRARIES = libtds_objects.la
++libtds_objects_la_SOURCES= mem.c token.c util.c login.c read.c \
+ write.c convert.c numeric.c config.c query.c iconv.c \
+ locale.c challenge.c threadsafe.c vstrbuild.c md4.c md5.c \
+ des.c tdsstring.c getmac.c data.c net.c \
+ tds_checks.c tds_checks.h enum_cap.h log.c \
+ gssapi.c hmac_md5.c
+-libtds_la_LDFLAGS=
+-libtds_la_LIBADD=
++libtds_objects_la_LDFLAGS=
++libtds_objects_la_LIBADD=
++
++
++lib_LTLIBRARIES = libtds.la
++libtds_la_SOURCES =
++libtds_la_LDFLAGS = -version-info 6:0:0 \
++ -export-symbols-regex '^(tds_|tdsdump_|tds5_|tds7_).*'
++libtds_la_LIBADD = libtds_objects.la ../replacements/libreplacements.la \
++ $(NETWORK_LIBS) $(LIBICONV) $(FREETDS_LIBGCC)
++
+
+ noinst_HEADERS = tds_willconvert.h encodings.h num_limits.h
+ EXTRA_DIST = tds_willconvert.h encodings.h num_limits.h
+diff -Nrbu freetds-0.82.1.dev.20100810/src/tds/unittests/Makefile.am freetds-0.82.1.dev.20100810-OK/src/tds/unittests/Makefile.am
+--- freetds-0.82.1.dev.20100810/src/tds/unittests/Makefile.am 2010-07-31 12:05:20.000000000 +0400
++++ freetds-0.82.1.dev.20100810-OK/src/tds/unittests/Makefile.am 2011-02-10 19:15:31.000000000 +0300
+@@ -35,5 +35,5 @@
+ else
+ AM_LDFLAGS = -no-install
+ endif
+-LIBS = ../libtds.la ../../replacements/libreplacements.la $(LIBICONV) @NETWORK_LIBS@
++LIBS = ../libtds_objects.la ../../replacements/libreplacements.la $(LIBICONV) @NETWORK_LIBS@
+ CLEANFILES = tdsdump.out
diff --git a/freetds-0.82.1-version.patch b/freetds-0.82.1-version.patch
new file mode 100644
index 0000000..38f6a10
--- /dev/null
+++ b/freetds-0.82.1-version.patch
@@ -0,0 +1,33 @@
+diff -Nrbu freetds-0.82.1.dev.20110306/configure freetds-0.82.1.dev.20110306-OK/configure
+--- freetds-0.82.1.dev.20110306/configure 2011-03-07 02:25:18.000000000 +0300
++++ freetds-0.82.1.dev.20110306-OK/configure 2011-03-07 02:25:18.000000000 +0300
+@@ -699,7 +699,7 @@
+ # Identity of this package.
+ PACKAGE_NAME='FreeTDS'
+ PACKAGE_TARNAME='freetds'
+-PACKAGE_VERSION='0.82.1.dev.20110306'
++PACKAGE_VERSION='0.82.1'
+ PACKAGE_STRING='FreeTDS 0.82.1.dev.20110306'
+ PACKAGE_BUGREPORT=''
+ PACKAGE_URL=''
+@@ -3199,7 +3199,7 @@
+
+ # Define the identity of the package.
+ PACKAGE='freetds'
+- VERSION='0.82.1.dev.20110306'
++ VERSION='0.82.1'
+
+
+ cat >>confdefs.h <<_ACEOF
+diff -Nrbu freetds-0.82.1.dev.20110306/configure.ac freetds-0.82.1.dev.20110306-OK/configure.ac
+--- freetds-0.82.1.dev.20110306/configure.ac 2011-03-07 02:25:06.000000000 +0300
++++ freetds-0.82.1.dev.20110306-OK/configure.ac 2011-03-07 02:25:06.000000000 +0300
+@@ -12,7 +12,7 @@
+ # ------------------------------------------------------------
+ # Initialization
+ # ------------------------------------------------------------
+-AC_INIT(FreeTDS, 0.82.1.dev.esyscmd(echo -n $(date +"%Y%m%d")))
++AC_INIT(FreeTDS, 0.82.1)
+ AC_CONFIG_SRCDIR(src/dblib/dblib.c)
+ AC_PREREQ(2.53)
+ AC_REVISION($Revision: 1.29.2.15 $)
diff --git a/freetds-tds_sysdep_public.h b/freetds-tds_sysdep_public.h
new file mode 100644
index 0000000..02824c0
--- /dev/null
+++ b/freetds-tds_sysdep_public.h
@@ -0,0 +1,15 @@
+/*
+ * To avoid multiarch conflicts, we differentiate the 32/64 bit length
+ * specific header names. This file is a wrapper to include the proper
+ * arch-specific header at compile time.
+ */
+
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include <tds_sysdep_public_32.h>
+#elif __WORDSIZE == 64
+#include <tds_sysdep_public_64.h>
+#else
+#error "Unknown word size"
+#endif
diff --git a/freetds.spec b/freetds.spec
index 268a256..f2e1c4c 100644
--- a/freetds.spec
+++ b/freetds.spec
@@ -1,16 +1,33 @@
+%define devdate 20110306
+
+%bcond_with libtds
+
+%ifarch alpha ia64 x86_64 ppc64 sparc64 s390x
+%define bits 64
+%else
+%define bits 32
+%endif
+
Name: freetds
Summary: Implementation of the TDS (Tabular DataStream) protocol
-Version: 0.64
-Release: 6%{?dist}
+Version: 0.82.1
+Release: 0.3.%{devdate}dev%{?dist}
Group: System Environment/Libraries
-License: LGPL
+License: LGPLv2+ and GPLv2+
URL: http://www.freetds.org/
-Source: ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-%{version}.tar.gz
+Source0: ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-patched.tgz
+Source1: freetds-tds_sysdep_public.h
+Patch0: freetds-0.82.1-version.patch
+Patch1: freetds-0.82.1-shared-libtds.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: unixODBC-devel
-BuildRequires: doxygen, docbook-style-dsssl
-Patch0: freetds-0.64-makefile-doc.patch
+BuildRequires: unixODBC-devel, readline-devel, gnutls-devel, libtool
+
+%define fullversion %{version}.dev.%{devdate}
+# required for patch0
+%define _default_patch_flags -s -Z
+
%description
FreeTDS is a project to document and implement the TDS (Tabular
@@ -20,48 +37,56 @@ level interfaces for DB-Lib, CT-Lib, and ODBC.
%package devel
-Summary: Header files, libraries and development documentation for %{name}
+Summary: Header files and development libraries for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
-This package contains the header files and development documentation
+This package contains the header files and development libraries
for %{name}. If you like to develop programs using %{name}, you will need
to install %{name}-devel.
+%package doc
+Summary: Development documentation for %{name}
+Group: Documentation
+
+%description doc
+This package contains the development documentation for %{name}.
+If you like to develop programs using %{name}, you will need to install
+%{name}-doc.
+
+
%prep
-%setup -q
+%setup -q -n %{name}-%{fullversion}
%patch0 -p1
+%{?_with_libtds:%patch1 -p1}
-# cleanup the initial source
-sed -i 's/\r//' doc/tds_ssl.html
-sed -i '1 s,#!.*/perl,#!%{__perl},' samples/*.pl doc/api_status.txt
+mv doc/doc/freetds-%{fullversion} doc/doc/freetds-%{version}
-find doc/ samples/ COPYING* -type f -print0 | xargs -0 chmod -x
-find . -name "*.[ch]" -print0 | xargs -0 chmod -x
+# correct perl path
+sed -i '1 s,#!.*/perl,#!%{__perl},' samples/*.pl
-# cause to rebuild docs
-rm doc/doc/freetds-%{version}/reference/index.html
-rm doc/doc/freetds-%{version}/userguide/index.htm
+chmod -x samples/*.sh
+%if %{with libtds}
+rm -f m4/lib-*.m4 # remove bogus libtool-related macros
+autoreconf -f -i
+%endif
+
%build
%configure \
--disable-dependency-tracking \
+ --disable-rpath \
%{!?_with_static: --disable-static} \
--with-tdsver="4.2" \
--with-unixodbc="%{_prefix}" \
--enable-msdblib \
- --enable-sybase-compat
-
-# avoid any rpath
-sed -i -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
- -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-make %{?_smp_mflags} DOCBOOK_DSL="`rpm -ql docbook-style-dsssl | fgrep html/docbook.dsl`"
+ --enable-sybase-compat \
+ --with-gnutls
-chmod -x samples/*.template
+make %{?_smp_mflags}
%install
@@ -71,13 +96,22 @@ make install DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+mv -f $RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public.h \
+ $RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public_%{bits}.h
+install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_includedir}/tds_sysdep_public.h
+
rm -f samples/Makefile* samples/*.in samples/README
+rm -f doc/doc/freetds-%{version}/reference/installdox
+
+mv -f samples/unixodbc.freetds.driver.template \
+ samples/unixodbc.freetds.driver.template-%{bits}
+
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -88,20 +122,85 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/*
%{_libdir}/*.so.*
%config(noreplace) %{_sysconfdir}/*.conf
-%doc AUTHORS BUGS COPYING* NEWS README TODO
-%doc doc/*.html doc/doc/freetds-%{version}/userguide
+%doc AUTHORS BUGS COPYING* NEWS README TODO doc/*.html
+%doc doc/doc/freetds-%{version}/userguide doc/images
%{_mandir}/*/*
%files devel
-%defattr (-, root, root)
-%doc samples doc/doc/freetds-%{version}/reference
+%defattr (-, root, root, -)
+%doc samples
%{?_with_static: %{_libdir}/*.a}
%{_libdir}/*.so
%{_includedir}/*
+
+
+%files doc
+%defattr (-, root, root, -)
+%doc doc/doc/freetds-%{version}/reference
-%changelog
+%changelog
+* Wed Mar 9 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82.1-0.3.20110306dev
+- update to the latest stable snapshot 0.82.1.dev.20110306
+- make build with shared-libtds conditional
+- disable shared-libtds patch by default (seems noone uses it for now)
+
+* Mon Feb 14 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82.1-0.2.20100810dev
+- fix again shared-libtds patch to provide increased library version
+
+* Thu Feb 10 2011 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82.1-0.1.20100810dev
+- update to the latest stable snapshot 0.82.1.dev.20100810
+- fix shared-libtds patch to provide properly library names
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.82-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.82-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Thu Mar 26 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82-5
+- add upstream patch cspublic.BLK_VERSION_150.patch (#492393)
+
+* Tue Feb 24 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82-4
+- fix autoconf data for libtool2 (patch by Tom Lane <tgl at redhat.com>)
+
+* Fri Jan 30 2009 Karsten Hopp <karsten at redhat.com> 0.82-3
+- add s390x to 64 bit archs
+
+* Sun Jan 11 2009 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82-3
+- Use gnutls for SSL (#479148)
+
+* Tue Jun 17 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82-2
+- Continue to provide an internal libtds library as public
+ (patch from Hans de Goede, #451021). This shared library is needed
+ for some existing applications (libgda etc.), which still use it directly.
+
+* Mon Jun 9 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.82-1
+- Upgrade to 0.82
+
+* Tue Feb 26 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.64-11
+- fix "64 or 32 bit" test (#434975)
+
+* Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.64-10
+- Autorebuild for GCC 4.3
+
+* Mon Jan 28 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.64-9
+- drop "Obsoletes:" from -doc subpackage to avoid extra complexity.
+
+* Fri Jan 25 2008 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.64-8
+- resolve multiarch conflicts (#341181):
+ - split references to separate freetds-doc subpackage
+ - add arch-specific suffixes for arch-specific filenames in -devel
+ - add wrapper for tds_sysdep_public.h
+- add readline support (#430196)
+
+* Tue Aug 28 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 0.64-7
+- Rebuild for selinux ppc32 issue.
+
+* Thu Aug 16 2007 Dmitry Butskoy <Dmitry at Butskoy.name>
+- Change License tag to "LGPLv2+ and GPLv2+"
+
* Fri Jun 15 2007 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.64-6
- bump release to provide update path over Livna
diff --git a/sources b/sources
index 9f65aad..9b1838b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ecfee5d6c96932172a1f29fb215c9d23 freetds-0.64.tar.gz
+4db449f5ac99ba7ec5bb331a7de7abe7 freetds-patched.tgz
More information about the scm-commits
mailing list