Hello community, here is the log from the commit of package openct checked in at Mon Apr 23 23:26:50 CEST 2007. -------- --- openct/openct.changes 2006-10-23 19:13:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/openct/openct.changes 2007-04-23 17:07:20.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Apr 23 17:06:20 CEST 2007 - sbrabec@suse.cz + +- Updated to version 0.6.11: + * add usb reset for non-linux too (dummy code only). + * fix three small bugs/warnings + * fix etc/Makefile installation + * bsd compile fixed + * include string.h in utils.c + * fix 'BUS="pcmcia"' match in udev rules file. + * improve egate reset logic + * implement usb reset + +------------------------------------------------------------------- Old: ---- openct-0.6.9.tar.bz2 openct-64bit.diff New: ---- openct-0.6.11.tar.bz2 openct-strict-aliasing.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openct.spec ++++++ --- /var/tmp/diff_new_pack.k11434/_old 2007-04-23 23:26:33.000000000 +0200 +++ /var/tmp/diff_new_pack.k11434/_new 2007-04-23 23:26:33.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package openct (Version 0.6.9) +# spec file for package openct (Version 0.6.11) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 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. # @@ -11,9 +11,9 @@ # norootforbuild Name: openct -Version: 0.6.9 -Release: 8 -BuildRequires: db-devel krb5-devel openldap2-devel pcsc-lite-devel pkgconfig +Version: 0.6.11 +Release: 1 +BuildRequires: db-devel krb5-devel openldap2-devel pcsc-lite-devel pkg-config # NOTE: We prefer multiple RPM directory ownership here, because # dependency on hal increases bootstrap build time. #BuildRequires: hal @@ -24,10 +24,10 @@ License: BSD License and BSD-like, GNU Library General Public License v. 2.0 and 2.1 (LGPL) URL: http://www.opensc-project.org/ Summary: OpenCT Library for Smart Card Readers -Source0: http://www.opensc.org/files/%name-%{version}.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Source1: openct.init Source2: hald-addon-openct -Patch0: %{name}-64bit.diff +Patch: openct-strict-aliasing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ## Only for directory ownership: #Requires: hal @@ -65,34 +65,22 @@ %prep %setup -q -n %{name}-%{version} -%patch0 +%patch +cp -a /usr/share/gettext/config.rpath . %build -#autoreconf --install --force -#aclocal --force -#libtoolize --force -#autoconf --force -#autoheader --force -#automake -afc -%{?suse_update_config:%{suse_update_config -f}} -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ - ./configure \ - --prefix=%{_prefix} \ - --includedir=%{_includedir} \ - --sysconfdir=%{_sysconfdir} \ - --mandir=%{_mandir} \ - --without-pcsclite \ - --libdir=%{_libdir} -make %{?jobs:-j %jobs} +ACLOCAL="aclocal -I aclocal" autoreconf -f -i +%configure\ + --without-pcsclite +make %{?jobs:-j%jobs} %install -export DESTDIR=$RPM_BUILD_ROOT -make install DESTDIR=$DESTDIR -mkdir -p $DESTDIR/%{_sysconfdir} -cp etc/openct.conf $DESTDIR/%{_sysconfdir} +%makeinstall +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} +cp etc/openct.conf $RPM_BUILD_ROOT/%{_sysconfdir} # # Convert hotplug stuff to hal -mkdir -p $DESTDIR%{_datadir}/hal/fdi/information/10freedesktop +mkdir -p $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop { cat <<-EOF <?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> @@ -118,19 +106,19 @@ </device> </deviceinfo> EOF -} > $DESTDIR%{_datadir}/hal/fdi/information/10freedesktop/10-usb-openct.fdi -cp %{SOURCE2} $DESTDIR/usr/sbin +} > $RPM_BUILD_ROOT%{_datadir}/hal/fdi/information/10freedesktop/10-usb-openct.fdi +cp %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir} # # Create directory -mkdir -p $DESTDIR/var/run/openct +mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/openct # # Install init script -mkdir -p $DESTDIR/etc/init.d -cp %SOURCE1 $DESTDIR/etc/init.d/openct -ln -s ../../etc/init.d/openct $DESTDIR/usr/sbin/rcopenct +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/init.d +cp %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/init.d/openct +ln -s ../..%{_sysconfdir}/init.d/openct $RPM_BUILD_ROOT%{_sbindir}/rcopenct # -rm -f $DESTDIR/usr/sbin/hotplug.openct -rm -f $DESTDIR%{_libdir}/openct-ctapi* +rm -f $RPM_BUILD_ROOT%{_sbindir}/hotplug.openct +rm -f $RPM_BUILD_ROOT%{_libdir}/openct-ctapi* # # Prepare HTML docs mkdir -p html @@ -143,20 +131,19 @@ %{insserv_cleanup} %clean -export DESTDIR=$RPM_BUILD_ROOT -[ "$DESTDIR" -a "$DESTDIR" != "/" ] && rm -rf $DESTDIR +rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc LGPL-2.1 NEWS TODO html -%attr(755,root,root)/etc/init.d/openct -%config(noreplace) /etc/openct.conf -/usr/bin/* -/usr/sbin/* -%{_libdir}/*.so.* -%dir /var/run/openct -%{_mandir}/man?/* +%{_bindir}/* %{_datadir}/hal/fdi/information/10freedesktop/10-usb-openct.fdi +%{_libdir}/*.so.* +%dir %{_localstatedir}/run/openct +%doc %{_mandir}/man?/* +%{_sbindir}/* +%attr(755,root,root)%{_sysconfdir}/init.d/openct +%config(noreplace) %{_sysconfdir}/openct.conf # NOTE: These directories logically belong to hal. # To prevent dependency on hal, add it to the file list. %dir %{_datadir}/hal @@ -166,13 +153,22 @@ %files devel %defattr(-,root,root) +%{_includedir}/openct %{_libdir}/*.so %{_libdir}/*.*a -%dir /usr/include/openct -/usr/include/openct/* %{_libdir}/pkgconfig/libopenct.pc -%changelog -n openct +%changelog +* Mon Apr 23 2007 - sbrabec@suse.cz +- Updated to version 0.6.11: + * add usb reset for non-linux too (dummy code only). + * fix three small bugs/warnings + * fix etc/Makefile installation + * bsd compile fixed + * include string.h in utils.c + * fix 'BUS="pcmcia"' match in udev rules file. + * improve egate reset logic + * implement usb reset * Mon Oct 23 2006 - mjancar@suse.cz - make /etc/init.d/openct executable (#212507) - add syslog to Requires (#214298) ++++++ openct-0.6.9.tar.bz2 -> openct-0.6.11.tar.bz2 ++++++ ++++ 20455 lines of diff (skipped) ++++++ openct-strict-aliasing.patch ++++++ process.c: In function 'do_memory_read': process.c:456: warning: dereferencing type-punned pointer will break strict-aliasing rules https://www.opensc-project.org/opensc/ticket/136 ================================================================================ --- src/ifd/process.c +++ src/ifd/process.c @@ -445,15 +445,14 @@ ct_tlv_builder_t * resp) { unsigned char data[CT_SOCKET_BUFSIZ]; - size_t data_len; - unsigned int address; + unsigned int address, data_len; int rc; if (unit > reader->nslots) return IFD_ERROR_INVALID_SLOT; if (ct_tlv_get_int(args, CT_TAG_ADDRESS, &address) == 0 - || !ct_tlv_get_int(args, CT_TAG_COUNT, (unsigned int *)&data_len)) + || !ct_tlv_get_int(args, CT_TAG_COUNT, &data_len)) return IFD_ERROR_MISSING_ARG; if (data_len > sizeof(data)) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org