diff --git a/yaz-2.1.48.tar.gz b/yaz-2.1.48.tar.gz deleted file mode 100644 index 2939d23..0000000 --- a/yaz-2.1.48.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:36e7844ab99bfa140d667c7ee2a73d31a66d55f8e010b72401b463444d479879 -size 1599345 diff --git a/yaz-3.0.2-client.diff b/yaz-3.0.2-client.diff new file mode 100644 index 0000000..7643ddd --- /dev/null +++ b/yaz-3.0.2-client.diff @@ -0,0 +1,31 @@ +--- yaz-3.0.2/client/client.c.~1~ 2007-05-08 10:22:35.000000000 +0200 ++++ yaz-3.0.2/client/client.c 2007-05-10 14:07:38.000000000 +0200 +@@ -2335,6 +2335,7 @@ + int noread = 0; + Odr_oid *oid; + char oid_str[51]; ++ union { unsigned char **ucp; char **cp; }pun; + Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest); + Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; + +@@ -2346,7 +2347,7 @@ + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_octet; +- ext->u.single_ASN1_type = (Odr_oct *) odr_malloc (out, sizeof(Odr_oct)); ++ ext->u.single_ASN1_type = (Odr_oct *) odr_malloc (out, sizeof(Odr_oct)); + sscanf(arg, "%50s%n", oid_str, &noread); + if (noread == 0) + { +@@ -2354,7 +2355,8 @@ + return 0; + } + arg += noread; +- if (parse_cmd_doc(&arg, out, &asn_buf, ++ pun.ucp = &ext->u.single_ASN1_type->buf; ++ if (parse_cmd_doc(&arg, out, pun.ucp, + &ext->u.single_ASN1_type->len, 0) == 0) + return 0; + + +Diff finished. Thu May 10 14:07:51 2007 diff --git a/yaz-3.0.2.tar.gz b/yaz-3.0.2.tar.gz new file mode 100644 index 0000000..de1da5e --- /dev/null +++ b/yaz-3.0.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:23b77b7466526382d48a2e491b8a698f69e0492361bf43e9524792372f240880 +size 1771958 diff --git a/yaz-codecleanup.36.diff b/yaz-codecleanup.36.diff index 0f9a6be..bdfcc26 100644 --- a/yaz-codecleanup.36.diff +++ b/yaz-codecleanup.36.diff @@ -1,36 +1,3 @@ -diff -ur yaz-2.1.36/client/client.c yaz-2.1.36.new/client/client.c ---- yaz-2.1.36/client/client.c 2006-10-04 09:26:00.000000000 +0200 -+++ yaz-2.1.36.new/client/client.c 2006-10-25 07:19:51.000000000 +0200 -@@ -2297,6 +2297,7 @@ - char *asn_buf = 0; - int noread = 0; - char oid_str[51]; -+ union { unsigned char **ucp; char **cp; }pun; - int oid_value_xmles = VAL_XMLES; - Z_APDU *apdu = zget_APDU(out, Z_APDU_extendedServicesRequest); - Z_ExtendedServicesRequest *req = apdu->u.extendedServicesRequest; -@@ -2309,7 +2310,7 @@ - ext->indirect_reference = 0; - ext->descriptor = 0; - ext->which = Z_External_octet; -- ext->u.single_ASN1_type = (Odr_oct *) odr_malloc (out, sizeof(Odr_oct)); -+ ext->u.single_ASN1_type = (Odr_oct *) odr_malloc (out, sizeof(Odr_oct)); - sscanf(arg, "%50s%n", oid_str, &noread); - if (noread == 0) - { -@@ -2324,7 +2325,8 @@ - return 0; - } - -- if (parse_cmd_doc(&arg, out, &asn_buf, -+ pun.ucp = &ext->u.single_ASN1_type->buf; -+ if (parse_cmd_doc(&arg, out, pun.ucp, - &ext->u.single_ASN1_type->len, 0) == 0) - return 0; - -Only in yaz-2.1.36.new/client: client.c.orig -Only in yaz-2.1.36.new/client: client.c.rej -Only in yaz-2.1.36.new/client: client.c.~1~ diff -ur yaz-2.1.36/src/cqltransform.c yaz-2.1.36.new/src/cqltransform.c --- yaz-2.1.36/src/cqltransform.c 2006-10-05 18:12:23.000000000 +0200 +++ yaz-2.1.36.new/src/cqltransform.c 2006-10-25 07:16:57.000000000 +0200 diff --git a/yaz.changes b/yaz.changes index 491d295..51ad9ad 100644 --- a/yaz.changes +++ b/yaz.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu May 10 14:21:02 CEST 2007 - ke@suse.de + +- Version 3.0.2, which is binary incompatible (from the NEWS file since + 3.0.0 resp. 2.1.48): + * Split YAZ library into libyaz and libyaz_server. + * CCL and other enhancements: partial support for ISO5428-1984 + (Greek). + * Bug fixes. +- Adjust yaz-codecleanup.36.diff for version 3.0.2 (see + yaz-3.0.2-client.diff). +- Add -fno-strict-aliasing because of query-charset.c: 47 + ------------------------------------------------------------------- Thu Jan 25 16:40:15 CET 2007 - lrupp@suse.de diff --git a/yaz.spec b/yaz.spec index e121c82..83731d0 100644 --- a/yaz.spec +++ b/yaz.spec @@ -1,5 +1,5 @@ # -# spec file for package yaz (Version 2.1.48) +# spec file for package yaz (Version 3.0.2) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -13,13 +13,14 @@ Name: yaz BuildRequires: libpcap libxml2-devel libxslt-devel openssl-devel readline-devel tcpd-devel # libxml2-devel -Version: 2.1.48 +Version: 3.0.2 Release: 1 License: BSD License and BSD-like, GNU General Public License (GPL) Group: Development/Libraries/C and C++ Source: http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.gz Patch0: yaz-codecleanup.36.diff Patch1: yaz-codecleanup.44.diff +Patch2: yaz-3.0.2-client.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://www.indexdata.dk/yaz/ Summary: Z39.50/SRW/SRU Programs @@ -71,11 +72,12 @@ Authors: %setup -q %patch0 -p 1 %patch1 -p 1 +%patch2 -p 1 %build # --with-dsssl=/usr/share/sgml/docbook/dsssl-stylesheets \ # --with-dtd=/usr/share/sgml/db41xml -export CFLAGS="%{optflags} -W" +export CFLAGS="%{optflags} -W -fno-strict-aliasing" %configure --enable-shared \ --enable-tcpd \ --with-xslt \ @@ -163,8 +165,19 @@ rm -fr ${RPM_BUILD_ROOT} %{_datadir}/aclocal/yaz.m4 %{_mandir}/man8/yaz-config.* %{_mandir}/man1/yaz-asncomp.* +%{_libdir}/pkgconfig/yaz.pc -%changelog -n yaz +%changelog +* Thu May 10 2007 - ke@suse.de +- Version 3.0.2, which is binary incompatible (from the NEWS file since + 3.0.0 resp. 2.1.48): + * Split YAZ library into libyaz and libyaz_server. + * CCL and other enhancements: partial support for ISO5428-1984 + (Greek). + * Bug fixes. +- Adjust yaz-codecleanup.36.diff for version 3.0.2 (see + yaz-3.0.2-client.diff). +- Add -fno-strict-aliasing because of query-charset.c: 47 * Thu Jan 25 2007 - lrupp@suse.de - updated to 2.1.48 - enabled with-xslt (add: libxml2-devel to BuildRequires)