OBS User unknown 2008-07-09 00:37:08 +00:00 committed by Git OBS Bridge
parent a5536c0005
commit 30a18ccaeb
6 changed files with 156 additions and 93 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:43c19b80808322eed2f02030f2406550cd737176a8e5aed8ae6aab30c3bb129e
size 1415309

View File

@ -1,31 +0,0 @@
--- 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

22
yaz-3.0.34-client.diff Normal file
View File

@ -0,0 +1,22 @@
--- yaz-3.0.34/client/client.c.orig 2008-06-09 17:07:21.000000000 +0200
+++ yaz-3.0.34/client/client.c 2008-07-03 10:27:57.000000000 +0200
@@ -2379,6 +2379,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;
@@ -2398,7 +2399,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)
return 0;
Diff finished. Thu Jul 3 10:29:21 2008

3
yaz-3.0.34.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:88cceab979e6984db964178193237f8a81b393dbd19c88898127ccd4b60e7356
size 1573466

View File

@ -1,3 +1,39 @@
-------------------------------------------------------------------
Thu Jul 3 12:39:34 CEST 2008 - ke@suse.de
- Version 3.0.34 (extract from the NEWS file since 3.0.16):
* License issues:
** yaz-ziffy is no longer part of YAZ. It is distributed separately by
Index Data because ziffy's license is GPL2 rather then 'Revised BSD'.
** Changed license of CCL module to 'Revised BSD'. After consultation with
remaining members of the original EUROPAGATE consortium, we are re-issuing
the CCL module without a separate license. The software was developed by
Index Data as part of a research project. The special license was included
to help feed usage information back to the project consortium to support
project evaluation. At this time, the project consortium has long-since
disbanded, and the majority of the original principals have retired. At the
same time, we have significantly modified the software during the following
years, to the point where very practically no original code remains. To
simplify re-use of the software, we have contacted those members of the
consortium who could be reached, and agreed to re-issue the module as a
proper part of the YAZ package.
* New features:
** Implement SSL sockets using GNU TLS (not enabled).
** yaz-ztest returns OPAC records if a client asks for OPAC.
** Improve speed of MARC-8 encoding.
** Add support for lossy and loss-less MARC-8 encoding.
** yaz-client's itemorder command may now send a file.
** Fixed yaz-marcdump to allow the use of NS prefix for record element.
** Add OPAC XML XSD (etc/opacxml.xsd).
** CQL closer to being version 1.2 compliant.
** Tcl scripts uses /usr/bin/tclsh as preferred shell.
* Bug fixes:
** Handle G1 sequneces in MARC-8 decoding. Bug #2115.
** Bug #395: ZOOM_record / OPAC record encoding problems.
** Fix error handling in cs_listen. Bug #2037.
- Enable ICU support.
- Cleanup spec file.
-------------------------------------------------------------------
Tue Nov 20 10:10:19 CET 2007 - ke@suse.de

154
yaz.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package yaz (Version 3.0.16)
# spec file for package yaz (Version 3.0.34)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@ -10,17 +10,18 @@
# norootforbuild
Name: yaz
BuildRequires: libpcap-devel libxml2-devel libxslt-devel openssl-devel readline-devel tcpd-devel
BuildRequires: libicu-devel libpcap-devel libxslt-devel openssl-devel readline-devel tcpd-devel
# libxml2-devel
Version: 3.0.16
Version: 3.0.34
Release: 1
License: BSD 3-Clause; GPL v2 or later
Group: Development/Libraries/C and C++
Source: http://ftp.indexdata.dk/pub/yaz/%{name}-%{version}.tar.bz2
Patch0: yaz-codecleanup.36.diff
Patch1: yaz-codecleanup.44.diff
Patch2: yaz-3.0.2-client.diff
Patch2: yaz-3.0.34-client.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.indexdata.dk/yaz/
Summary: Z39.50/SRW/SRU Programs
@ -37,6 +38,7 @@ Authors:
Adam Dickmeiss <adam@indexdata.dk>
%package -n libyaz
License: BSD 3-Clause
Summary: Z39.50 Library
Group: Development/Libraries/C and C++
# Requires: libxml2
@ -53,10 +55,11 @@ Authors:
Adam Dickmeiss <adam@indexdata.dk>
%package -n libyaz-devel
License: BSD 3-Clause
Summary: Z39.50 Library
Group: Development/Libraries/C and C++
Requires: libyaz = %{version}
Requires: libxslt-devel tcpd-devel libopenssl-devel
Requires: libxslt-devel tcpd-devel libopenssl-devel libicu-devel
%description -n libyaz-devel
YAZ is a C library for developing client - and server applications
@ -114,15 +117,14 @@ ln -sf introduction.html html/index.html
echo "</li></body></html>"
} >index.html
/sbin/ldconfig -n $RPM_BUILD_ROOT%{_libdir}
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
%clean
rm -fr ${RPM_BUILD_ROOT}
%post -n libyaz
%run_ldconfig
%post -n libyaz -p /sbin/ldconfig
%postun -n libyaz
%run_ldconfig
%postun -n libyaz -p /sbin/ldconfig
%files
%defattr(-,root,root)
@ -133,12 +135,12 @@ rm -fr ${RPM_BUILD_ROOT}
%{_bindir}/yaz-icu
%{_bindir}/yaz-marcdump
%{_bindir}/zoomsh
#%%ifarch %ix86 ia64 s390 ppc hppa
%{_bindir}/ziffy
#%%endif
# #%%ifarch %ix86 ia64 s390 ppc hppa
# %{_bindir}/ziffy
# #%%endif
%{_mandir}/*/yaz-illclient.*
%{_mandir}/*/yaz-client.*
%{_mandir}/*/ziffy.*
# %{_mandir}/*/ziffy.*
%{_mandir}/*/zoomsh.*
%{_mandir}/*/yaz-ztest.*
%{_mandir}/*/yaz-iconv.*
@ -163,15 +165,49 @@ rm -fr ${RPM_BUILD_ROOT}
%{_includedir}/yaz
%{_libdir}/*.so
%{_libdir}/*.a
%{_libdir}/*.la
# %{_libdir}/*.la
%{_datadir}/yaz/z39.50
%{_datadir}/yaz/ill
%{_datadir}/aclocal/yaz.m4
%{_mandir}/man8/yaz-config.*
%{_mandir}/man1/yaz-asncomp.*
%{_libdir}/pkgconfig/yaz.pc
%changelog
* Tue Nov 20 2007 - ke@suse.de
* Thu Jul 03 2008 ke@suse.de
- Version 3.0.34 (extract from the NEWS file since 3.0.16):
* License issues:
** yaz-ziffy is no longer part of YAZ. It is distributed separately by
Index Data because ziffy's license is GPL2 rather then 'Revised BSD'.
** Changed license of CCL module to 'Revised BSD'. After consultation with
remaining members of the original EUROPAGATE consortium, we are re-issuing
the CCL module without a separate license. The software was developed by
Index Data as part of a research project. The special license was included
to help feed usage information back to the project consortium to support
project evaluation. At this time, the project consortium has long-since
disbanded, and the majority of the original principals have retired. At the
same time, we have significantly modified the software during the following
years, to the point where very practically no original code remains. To
simplify re-use of the software, we have contacted those members of the
consortium who could be reached, and agreed to re-issue the module as a
proper part of the YAZ package.
* New features:
** Implement SSL sockets using GNU TLS (not enabled).
** yaz-ztest returns OPAC records if a client asks for OPAC.
** Improve speed of MARC-8 encoding.
** Add support for lossy and loss-less MARC-8 encoding.
** yaz-client's itemorder command may now send a file.
** Fixed yaz-marcdump to allow the use of NS prefix for record element.
** Add OPAC XML XSD (etc/opacxml.xsd).
** CQL closer to being version 1.2 compliant.
** Tcl scripts uses /usr/bin/tclsh as preferred shell.
* Bug fixes:
** Handle G1 sequneces in MARC-8 decoding. Bug #2115.
** Bug #395: ZOOM_record / OPAC record encoding problems.
** Fix error handling in cs_listen. Bug #2037.
- Enable ICU support.
- Cleanup spec file.
* Tue Nov 20 2007 ke@suse.de
- Version 3.0.16 (extract from the NEWS file since 3.0.6):
* Add yaz_poll. This allows more than 1024 sockets to be in use.
* Add ICU wrapper library which exposes ICU http://www.icu-project.org/
@ -181,11 +217,11 @@ rm -fr ${RPM_BUILD_ROOT}
* Add support for HTTP Basic authentication in clients.
* More MARC-8/UTF-8 conversion fixes and other bug fixes.
- Package ziffy on all architectures.
* Thu Oct 04 2007 - bg@suse.de
* Thu Oct 04 2007 bg@suse.de
- package ziffy also for hppa
* Thu Jul 26 2007 - prusnak@suse.cz
* Thu Jul 26 2007 prusnak@suse.cz
- changed libpcap to libpcap-devel in BuildRequires
* Mon Jun 11 2007 - ke@suse.de
* Mon Jun 11 2007 ke@suse.de
- Version 3.0.6 (from the NEWS file since 3.0.2):
* Fixed bug in character set conversion of BER strings. Bug introduced
in 3.0.0.
@ -197,7 +233,7 @@ rm -fr ${RPM_BUILD_ROOT}
* Extensions.
- Start with spec file fixes and cleanup: move ldconfig calls to the
libyaz package, remove explicit libxml2 requirement, etc.
* Thu May 10 2007 - ke@suse.de
* 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.
@ -207,19 +243,19 @@ rm -fr ${RPM_BUILD_ROOT}
- 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
* Thu Jan 25 2007 lrupp@suse.de
- updated to 2.1.48
- enabled with-xslt (add: libxml2-devel to BuildRequires)
- build parallel
- add libxml2 to requires for libyaz
- package ziffy only on %%ix86 ia64 s390 ppc (needs more improvement)
* Wed Jan 10 2007 - ke@suse.de
* Wed Jan 10 2007 ke@suse.de
- Version 2.1.44 (from the NEWS file since 2.1.36):
* Bug fixes.
* Rename yaz-marcdump options.
* Add ziffy, the promiscuous Z39.50 APDU sniffer (GPL v2).
* Updates for SRU Update,
* Wed Oct 25 2006 - ke@suse.de
* Wed Oct 25 2006 ke@suse.de
- Version 2.1.36 (from the NEWS file since 2.1.32):
* Implemented yaz_filepath_comp which splits a path into file path
components (required by Zebra 2.0.3+).
@ -232,13 +268,13 @@ rm -fr ${RPM_BUILD_ROOT}
* Add support for specifying the max log file size for the Generic
Frontend Server. The size is given with option -r.
- Update yaz-codecleanup.diff as yaz-codecleanup.36.diff
* Wed Oct 18 2006 - pth@suse.de
* Wed Oct 18 2006 pth@suse.de
- Cleaned up the code a bit.
- Fix an off-by-one error (#207880).
* Thu Sep 21 2006 - ke@suse.de
* Thu Sep 21 2006 ke@suse.de
- Version 2.1.32 (from the NEWS file):
* Fix problem WRT unix sockets in the ZOOM code.
* Tue Sep 19 2006 - ke@suse.de
* Tue Sep 19 2006 ke@suse.de
- Version 2.1.30 (for more information see the NEWS file):
* Fix bug in Generic Frontend Server that could cause a server to stop
accepting new connections.
@ -253,11 +289,11 @@ rm -fr ${RPM_BUILD_ROOT}
* ZOOM-C reads option extraArgs. If set the value of extraArgs is
appended to SRU URI (POST/GET). Value must be URL encoded, such as
x-id-a=v1&x-id-b=v2 .
* Thu Aug 17 2006 - ke@suse.de
* Thu Aug 17 2006 ke@suse.de
- Version 2.1.26: Two bug fixes.
* Mon Aug 14 2006 - ke@suse.de
* Mon Aug 14 2006 ke@suse.de
- yaz-devel: Requires libxslt-devel.
* Thu Aug 10 2006 - ke@suse.de
* Thu Aug 10 2006 ke@suse.de
- Update to 2.1.24 (from NEWS since 2.1.18):
* Fixed MARC ISO2709 encoding routines
* Change cql2pqf transformation to use a different evaluation order.
@ -277,21 +313,21 @@ rm -fr ${RPM_BUILD_ROOT}
that it converts combined characters to single Unicode characters in the
Latin-1 range (when possible).
* And more bug fixes and new features.
* Thu Jun 01 2006 - ke@suse.de
* Thu Jun 01 2006 ke@suse.de
- Update to version 2.1.18 (from NEWS):
* Improve MARC, ZOOM, and CQL; MARC-8 support.
* Better localization.
* Add ZiNG Update Support.
* Various Bug fixes.
* Wed Jan 25 2006 - mls@suse.de
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Wed Jun 08 2005 - ke@suse.de
* Wed Jun 08 2005 ke@suse.de
- Update to version 2.1.8.
* Fri May 27 2005 - ke@suse.de
* Fri May 27 2005 ke@suse.de
- Update to version 2.1.6 (from NEWS):
* Add support for SRW sort in Generic Frontend Server.
* Bugfixes (for more info see NEWS).
* Thu Apr 28 2005 - ke@suse.de
* Thu Apr 28 2005 ke@suse.de
- Update to version 2.1.4 (from NEWS):
* Change include/yaz/diagbib1.h and added include/yaz/diagsrw.h with
diagnostic messages+codes for Bib-1 and SRW.
@ -301,7 +337,7 @@ rm -fr ${RPM_BUILD_ROOT}
* Program yaz-client now exits and produces an error message if multiple
Z39.50 servers are specified on the command line.
- Remove expat from neededforbuild.
* Tue Apr 05 2005 - ke@suse.de
* Tue Apr 05 2005 ke@suse.de
- Update to version 2.1.2 (from NEWS):
* Add support for virtual hosts and multiple backend servers for
the YAZ frontend server. The configution is XML based and
@ -309,36 +345,36 @@ rm -fr ${RPM_BUILD_ROOT}
information. See section "Virtual Hosts" in the YAZ manual.
* Extended OPAC display utility. OPAC display utility renders
bibliographic (MARC) record as well.
* Thu Feb 10 2005 - ke@suse.de
* Thu Feb 10 2005 ke@suse.de
- Update to version 2.0.34:
* Fix bugs in the MARC-8 to UTF-8 conversion.
* Add support for the proposed MarcXchange format.
* Wed Jan 12 2005 - ke@suse.de
* Wed Jan 12 2005 ke@suse.de
- Update to version 2.0.32:
* Add support for SRW scan in yaz-client and Generic Frontend Server.
* Tue Jan 04 2005 - ke@suse.de
* Tue Jan 04 2005 ke@suse.de
- Update to version 2.0.30:
* Bug fixes.
* Change logging behavior.
* Tue Nov 16 2004 - ke@suse.de
* Tue Nov 16 2004 ke@suse.de
- Update to version 2.0.28; changes since 2.0.26:
* Various bug fixes.
* Improve documentation.
- Add tcpd and tcpd-devel to neededforbuild.
* Fri Oct 08 2004 - ke@suse.de
* Fri Oct 08 2004 ke@suse.de
- Update to version 2.0.26; changes since 2.0.22:
* Various bug fixes.
* Add YAZ GFS support for conversion from Z39.50 surrogate diagnostics
to SRW surrogate diagnostics.
* Fixes for MARC-8 in yaz_iconv character set utilies. The MARC-8
to UTF-8/UCS conversion is now only based on codetables.xml.
* Mon Aug 09 2004 - ke@suse.de
* Mon Aug 09 2004 ke@suse.de
- Update to version 2.0.22; changes:
* Add support for more "commit changes" in ZOOM (uses Extended
Services).
* For yaz-client, command set_marcdump <file> / -m <file> dumps
SUTRS/XML/.. records as well.
* Fri May 28 2004 - ke@suse.de
* Fri May 28 2004 ke@suse.de
- Update to version 2.0.21; changes:
* SSL comstack now uses yaz.pem certificate file on server side
by default. Certificate filename can be configured by calling
@ -361,9 +397,9 @@ rm -fr ${RPM_BUILD_ROOT}
* Another fix for decoding of XML packed records.
* Fixes for Chunked encoding. White space not ignored after length spec.
* Implement chunked HTTP transfer.
* Wed May 12 2004 - ro@suse.de
* Wed May 12 2004 ro@suse.de
- added -fno-strict-aliasing
* Tue Feb 17 2004 - ke@suse.de
* Tue Feb 17 2004 ke@suse.de
- Update to version 2.0.12; changes:
* Various enhancements to yaz-client.
* Fix various bugs (encoding related, memory leak, etc.).
@ -374,9 +410,9 @@ rm -fr ${RPM_BUILD_ROOT}
* ZOOM-C enhancements.
* New utilities: yaz-iconv and yaz-marcdump.
* Enhancements to the generic front-end server.
* Sat Jan 10 2004 - adrian@suse.de
* Sun Jan 11 2004 adrian@suse.de
- add %%defattr and %%run_ldconfig
* Thu Oct 16 2003 - ke@suse.de
* Thu Oct 16 2003 ke@suse.de
- Update to version 2.0.4; changes:
- Allow any CQL relation (not just all,any,exact,scr).
- Fixes for OCLC UI ASN.1 to make it work with SilverPlatter targets
@ -412,7 +448,7 @@ rm -fr ${RPM_BUILD_ROOT}
- Fix the OID of the Index Data-local "admin" Extended Service from
1.2.840.10003.9.81.1 to 1.2.840.10003.9.1000.81.1. The omission of
the 1000, which indicates a locally-defined OID, was a mistake.
* Mon Jun 23 2003 - ke@suse.de
* Mon Jun 23 2003 ke@suse.de
- Update to version 2.0.3; changes:
- Fix CCL directive @case handling so that it affects string match for
both CCL keywords and qualifiers.
@ -443,13 +479,13 @@ rm -fr ${RPM_BUILD_ROOT}
converts it into a type-1 query which is sent to the server. This
makes CQL available for use with all Z-servers, as opposed to the tiny
minority that can handle CQL queries themselves.
* Thu Jun 12 2003 - kukuk@suse.de
* Thu Jun 12 2003 kukuk@suse.de
- Add missing directory to filelist
* Mon May 26 2003 - ke@suse.de
* Mon May 26 2003 ke@suse.de
- Remove unwanted files from $RPM_BUILD_ROOT.
* Thu May 22 2003 - ke@suse.de
* Thu May 22 2003 ke@suse.de
- Split subpackage libyaz into libyaz and libyaz-devel.
* Thu May 22 2003 - ke@suse.de
* Thu May 22 2003 ke@suse.de
- Update to version 2.0.2; changes:
- New ZOOM events ZOOM_EVENT_RECV_{RECORD,SEARCH} for receiving a record
and search result respectively.
@ -469,7 +505,7 @@ rm -fr ${RPM_BUILD_ROOT}
- Added scan for the ZOOM shell (zoomsh).
- Bugfix: CQL lex buffer overflow.
- Split package into yaz and libyaz.
* Wed Mar 26 2003 - ke@suse.de
* Wed Mar 26 2003 ke@suse.de
- Update to version 2.0; changes:
Possible compatibility problems with earlier versions marked with '*'.
- * String Identifers for Schemas (Amendment 5).
@ -512,14 +548,14 @@ rm -fr ${RPM_BUILD_ROOT}
strerror/strerror_r/GetLastMessage.
- * ZOOM_record_get supports type "xml" in which case MARC XML (from LOC)
is returned for MARC. If type is "oai", then OAI MARC is returned.
* Fri Nov 29 2002 - ke@suse.de
* Fri Nov 29 2002 ke@suse.de
- Update to version 1.9.2; changes:
* yaz_marc_decode uses OAI MARC as XML format for ISO2709 records.
* Fix bad race conditions on SIGTERM and terminate gracefully in
frontend server.
* Move retrieval (data1) module to Zebra (now package "idzebra").
* Add GRS-1 render for ZOOM using same format as yaz-client.
* Fri Nov 22 2002 - ke@suse.de
* Fri Nov 22 2002 ke@suse.de
- Update to version 1.9.1; changes since 1.8.8:
* Add man pages: yaz-client(1), yaz-ztest(8), yaz(7), zoomsh(1).
* Bugfixes: ESpec handling in data1 module; handle PDU encoding
@ -534,7 +570,7 @@ rm -fr ${RPM_BUILD_ROOT}
error information for bad queries (see yaz/pquery.h).
* Use iconv.
* Remov XML reader (d1_expat.c). It's part of Zebra instead.
* Mon Aug 05 2002 - ke@suse.de
* Mon Aug 05 2002 ke@suse.de
- Update to version 1.8.8:
* Bug fixes.
* Modify data1 to handle XML and character set encodings.
@ -542,13 +578,13 @@ rm -fr ${RPM_BUILD_ROOT}
a local service and/or want extreme performance.
- Add expat and readline-devel to #neededforbuild to link against expat
and readline.
* Mon May 27 2002 - ke@suse.de
* Mon May 27 2002 ke@suse.de
- Update to version 1.8.7:
- Bug fixes.
- Better i18n support (ZOOM API and YAZ client).
* Wed May 08 2002 - ke@suse.de
* Wed May 08 2002 ke@suse.de
- Use %%_libdir macro.
* Mon Apr 08 2002 - ke@suse.de
* Mon Apr 08 2002 ke@suse.de
- Update to version 1.8.6.
* Mon Mar 11 2002 - ke@suse.de
* Mon Mar 11 2002 ke@suse.de
- New package: version 1.8.5.