November 2014 - openSUSE Commits - openSUSE Mailing Lists

commit ypserv for openSUSE:Factory
by root＠hilbert.suse.de 29 Nov '14

29 Nov '14

Hello community, here is the log from the commit of package ypserv for openSUSE:Factory checked in at 2014-11-29 08:39:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ypserv (Old) and /work/SRC/openSUSE:Factory/.ypserv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ypserv" Changes: -------- --- /work/SRC/openSUSE:Factory/ypserv/ypserv.changes 2014-10-25 08:33:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ypserv.new/ypserv.changes 2014-11-29 08:39:26.000000000 +0100 @@ -1,0 +2,24 @@ +Wed Nov 5 14:58:41 CET 2014 - kukuk(a)suse.de + +- Update to version 3.0 + - evyerthing is now ported + +------------------------------------------------------------------- +Mon Nov 3 11:04:15 CET 2014 - kukuk(a)suse.de + +- Update to version 2.99.3 + - Implement -p option for ypserv + +------------------------------------------------------------------- +Sat Nov 1 20:48:26 CET 2014 - kukuk(a)suse.de + +- Update to version 2.99.2 + - At least everything compiles now + +------------------------------------------------------------------- +Fri Oct 31 16:43:58 CET 2014 - kukuk(a)suse.de + +- Update to version 2.99.1 + - Start porting to use ti-rpc interfaces for IPv6 support + +------------------------------------------------------------------- Old: ---- ypserv-2.32.1.tar.bz2 New: ---- yppasswdd.init ypserv-3.0.tar.bz2 ypserv.init ypxfrd.init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ypserv.spec ++++++ --- /var/tmp/diff_new_pack.0MWcwa/_old 2014-11-29 08:39:28.000000000 +0100 +++ /var/tmp/diff_new_pack.0MWcwa/_new 2014-11-29 08:39:28.000000000 +0100 @@ -17,22 +17,20 @@ Name: ypserv -BuildRequires: gdbm-devel -BuildRequires: openslp-devel -BuildRequires: pkgconfig(libsystemd-daemon) -%{?systemd_requires} -Requires: gawk -Requires: make -Requires: rpcbind -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Version: 2.32.1 +Version: 3.0 Release: 0 Url: http://www.linux-nis.org/nis/ypserv/ Summary: YP - (NIS)-Server License: GPL-2.0 Group: Productivity/Networking/NIS PreReq: %fillup_prereq +%if %{suse_version} < 1310 +PreReq: %insserv_prereq +%endif Source: ypserv-%{version}.tar.bz2 +Source1: ypserv.init +Source2: yppasswdd.init +Source3: ypxfrd.init Source4: sysconfig.ypserv Source5: SuSEfirewall2.ypserv Source6: ypserv.service @@ -40,6 +38,22 @@ Source8: ypxfrd.service Source9: yppasswdd-systemd-exec Patch: ypserv-2.32.diff +BuildRequires: gdbm-devel +BuildRequires: openslp-devel +BuildRequires: pkgconfig +%if %{suse_version} >= 1310 +BuildRequires: pkgconfig(libnis) >= 2.99.8 +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libtirpc) +%{?systemd_requires} +%else +BuildRequires: libnis-devel >= 2.99.8 +BuildRequires: libtirpc-devel +%endif +Requires: gawk +Requires: make +Requires: rpcbind +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Network Information Service (NIS) provides a simple network @@ -70,8 +84,12 @@ %install mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates -mkdir -p $RPM_BUILD_ROOT%{_libexecdir}/yp +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/yp +%if %{suse_version} >= 1310 mkdir -p $RPM_BUILD_ROOT%{_unitdir} +%else +mkdir -p $RPM_BUILD_ROOT/etc/init.d +%endif DOCDIR=%{_defaultdocdir}/yp install -d -m 755 $RPM_BUILD_ROOT${DOCDIR} install -d -m 755 $RPM_BUILD_ROOT${DOCDIR}/ypserv @@ -83,18 +101,30 @@ install -m 644 %SOURCE4 $RPM_BUILD_ROOT/var/adm/fillup-templates/ # install SuSEfirewall2 service script install -m 644 %SOURCE5 $RPM_BUILD_ROOT/etc/sysconfig/SuSEfirewall2.d/services/ypserv +%if %{suse_version} >= 1310 # install systemd files install -m 644 %SOURCE6 $RPM_BUILD_ROOT%{_unitdir}/ypserv.service install -m 644 %SOURCE7 $RPM_BUILD_ROOT%{_unitdir}/yppasswdd.service install -m 644 %SOURCE8 $RPM_BUILD_ROOT%{_unitdir}/ypxfrd.service -install -m 755 %SOURCE9 $RPM_BUILD_ROOT%{_libexecdir}/yp/yppasswdd-systemd-exec -# Remove files which should not be included: -rm $RPM_BUILD_ROOT%{_libexecdir}/yp/match_printcap +install -m 755 %SOURCE9 $RPM_BUILD_ROOT%{_prefix}/lib/yp/yppasswdd-systemd-exec # create symlink for rcypserv, rcyppasswdd, rcypxfrd ln -s /sbin/service $RPM_BUILD_ROOT%{_sbindir}/rcypserv ln -s /sbin/service $RPM_BUILD_ROOT%{_sbindir}/rcyppasswdd ln -s /sbin/service $RPM_BUILD_ROOT%{_sbindir}/rcypxfrd +%else +# install init scripts +install -m 755 %SOURCE1 $RPM_BUILD_ROOT/etc/init.d/ypserv +install -m 755 %SOURCE2 $RPM_BUILD_ROOT/etc/init.d/yppasswdd +install -m 755 %SOURCE3 $RPM_BUILD_ROOT/etc/init.d/ypxfrd +ln -sf ../../etc/init.d/yppasswdd $RPM_BUILD_ROOT/usr/sbin/rcyppasswdd +ln -sf ../../etc/init.d/ypxfrd $RPM_BUILD_ROOT/usr/sbin/rcypxfrd +ln -sf ../../etc/init.d/ypserv $RPM_BUILD_ROOT/usr/sbin/rcypserv +%endif +# Remove files which should not be included: +rm $RPM_BUILD_ROOT%{_prefix}/lib/yp/match_printcap +%if %{suse_version} >= 1310 +# Systemd services %pre %service_add_pre ypserv.service %service_add_pre yppasswdd.service @@ -116,6 +146,20 @@ %service_del_postun yppasswdd.service %service_del_postun ypxfrd.service +%else +# LSB init script +%post +%{fillup_and_insserv ypserv ypxfrd yppasswdd} + +%preun +%stop_on_removal ypserv ypxfrd yppasswdd + +%postun +%restart_on_update ypserv ypxfrd yppasswdd +%insserv_cleanup + +%endif + %files %defattr(-,root,root) %doc NEWS README TODO COPYING ChangeLog @@ -124,11 +168,18 @@ %config(noreplace) /var/yp/securenets %config(noreplace) /etc/ypserv.conf %config /etc/sysconfig/SuSEfirewall2.d/services/ypserv -%dir %{_libexecdir}/yp +%dir %{_prefix}/lib/yp %dir /var/yp +%if %{suse_version} >= 1310 %{_unitdir}/ypserv.service %{_unitdir}/yppasswdd.service %{_unitdir}/ypxfrd.service +%{_prefix}/lib/yp/yppasswdd-systemd-exec +%else +%config /etc/init.d/yppasswdd +%config /etc/init.d/ypserv +%config /etc/init.d/ypxfrd +%endif %doc %{_mandir}/man5/netgroup.5.gz %doc %{_mandir}/man5/ypserv.conf.5.gz %doc %{_mandir}/man8/makedbm.8.gz @@ -145,16 +196,15 @@ %doc %{_mandir}/man8/ypxfr.8.gz %doc %{_mandir}/man8/ypxfrd.8.gz /usr/include/rpcsvc/ypxfrd.x -%{_libexecdir}/yp/makedbm -%{_libexecdir}/yp/create_printcap -%{_libexecdir}/yp/mknetid -%{_libexecdir}/yp/pwupdate -%{_libexecdir}/yp/revnetgroup -%{_libexecdir}/yp/yphelper -%{_libexecdir}/yp/ypinit -%{_libexecdir}/yp/ypxfr -%{_libexecdir}/yp/ypxfr_* -%{_libexecdir}/yp/yppasswdd-systemd-exec +%{_prefix}/lib/yp/makedbm +%{_prefix}/lib/yp/create_printcap +%{_prefix}/lib/yp/mknetid +%{_prefix}/lib/yp/pwupdate +%{_prefix}/lib/yp/revnetgroup +%{_prefix}/lib/yp/yphelper +%{_prefix}/lib/yp/ypinit +%{_prefix}/lib/yp/ypxfr +%{_prefix}/lib/yp/ypxfr_* %{_sbindir}/rpc.ypxfrd %{_sbindir}/rpc.yppasswdd %{_sbindir}/yppush ++++++ yppasswdd.init ++++++ #! /bin/bash # Copyright (c) 2002, 2004 SuSE Linux AG # Copyright (c) 2000, 2001 SuSE GmbH # # Author: Thorsten Kukuk <feedback(a)suse.de> # # /etc/init.d/yppasswdd # # and its symbolic link # # /usr/sbin/rcyppasswdd # # System startup script for the yppasswd daemon # ### BEGIN INIT INFO # Provides: yppasswdd # Required-Start: $remote_fs $portmap ypserv # Required-Stop: $remote_fs $portmap # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Start ypppasswd daemon # Description: Start yppasswd daemon to allow NIS users # to change the password ### END INIT INFO YPPASSWDD_BIN=/usr/sbin/rpc.yppasswdd test -x $YPPASSWDD_BIN || { echo "$YPPASSWDD_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } YPPASSWDD_CONFIG=/etc/sysconfig/ypserv test -r $YPPASSWDD_CONFIG || { echo "$YPPASSWDD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $YPPASSWDD_CONFIG ypflags= if test "$YPPWD_CHFN" = yes; then ypflags="$ypflags -e chfn" fi if test "$YPPWD_CHSH" = yes; then ypflags="$ypflags -e chsh" fi . /etc/rc.status # First reset status of this service rc_reset case "$1" in start) echo -n "Starting rpc.yppasswdd" startproc $YPPASSWDD_BIN -D $YPPWD_SRCDIR $ypflags rc_status -v ;; stop) echo -n "Shutting down rpc.yppasswdd" killproc -TERM $YPPASSWDD_BIN rc_status -v ;; try-restart|condrestart) if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi rc_status ;; restart) $0 stop $0 start rc_status ;; force-reload) echo -n "Reload service rpc.yppasswdd" $0 try-restart rc_status ;; reload) echo -n "Reload service rpc.yppasswdd" rc_failed 3 rc_status -v ;; status) echo -n "Checking for rpc.yppasswdd: " checkproc $YPPASSWDD_BIN rc_status -v ;; probe) test /etc/sysconfig/ypserv -nt /var/run/yppasswdd.pid && echo restart ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ ypserv-2.32.1.tar.bz2 -> ypserv-3.0.tar.bz2 ++++++ ++++ 13435 lines of diff (skipped) ++++++ ypserv.init ++++++ #! /bin/bash # Copyright (c) 2002, 2004 SuSE Linux AG # Copyright (c) 2000, 2001 SuSE GmbH # # Author: Thorsten Kukuk <feedback(a)suse.de> # # /etc/init.d/ypserv # # and its symbolic link # # /usr/sbin/rcypserv # # System startup script for the NIS daemon # ### BEGIN INIT INFO # Provides: ypserv # Required-Start: $remote_fs $portmap # Should-Start: slpd # Should-Stop: $null # Required-Stop: $remote_fs $portmap # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Start ypserv daemon # Description: Start ypserv to distribute NIS maps ### END INIT INFO YPSERV_BIN=/usr/sbin/ypserv test -x $YPSERV_BIN || { echo "$YPSERV_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } . /etc/rc.status # First reset status of this service rc_reset case "$1" in start) echo -n "Starting ypserv" startproc $YPSERV_BIN rc_status -v ;; stop) echo -n "Shutting down ypserv" killproc -TERM $YPSERV_BIN rc_status -v ;; try-restart|condrestart) ## RH has a similar command named condrestart. if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi rc_status ;; restart) $0 stop $0 start rc_status ;; force-reload) $0 stop $0 start rc_status ;; reload) echo -n "Reload service ypserv" rc_failed 3 rc_status -v ;; status) echo -n "Checking for ypserv: " checkproc $YPSERV_BIN rc_status -v ;; probe) test /etc/ypserv.conf -nt /var/run/ypserv.pid && echo reload test /var/run/securenets -nt /var/run/ypserv.pid && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit ++++++ ypxfrd.init ++++++ #! /bin/bash # Copyright (c) 2002, 2004 SuSE Linux AG # Copyright (c) 2000, 2001 SuSE GmbH # # Author: Thorsten Kukuk <feedback(a)suse.de> # # /etc/init.d/ypxfrd # # and its symbolic link # # /sbin/rcypxfrd # # System startup script for the rpc.ypxfrd daemon # ### BEGIN INIT INFO # Provides: ypxfrd # Required-Start: $remote_fs $portmap ypserv # Required-Stop: $remote_fs $portmap # Default-Start: 3 5 # Default-Stop: 0 1 2 6 # Short-Description: Start rpc.ypxfrd daemon # Description: Start rpc.ypxfrd to allow faster NIS map transfers ### END INIT INFO YPXFRD_BIN=/usr/sbin/rpc.ypxfrd test -x $YPXFRD_BIN || { echo "$YPXFRD_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } . /etc/rc.status # First reset status of this service rc_reset case "$1" in start) echo -n "Starting rpc.ypxfrd" startproc $YPXFRD_BIN rc_status -v ;; stop) echo -n "Shutting down rpc.ypxfrd" killproc -TERM $YPXFRD_BIN rc_status -v ;; try-restart|condrestart) if test "$1" = "condrestart"; then echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}" fi $0 status if test $? = 0; then $0 restart else rc_reset # Not running is not a failure. fi rc_status ;; restart) $0 stop $0 start rc_status ;; force-reload) echo -n "Reload service rpc.ypxfrd" killproc -HUP $YPXFRD_BIN rc_status -v ;; reload) echo -n "Reload service rpc.ypxfrd" killproc -HUP $YPXFRD_BIN rc_status -v ;; status) echo -n "Checking for rpc.ypxfrd: " checkproc $YPXFRD_BIN rc_status -v ;; probe) test /etc/ypserv.conf -nt /var/run/ypxfrd.pid && echo reload test /var/run/securenets -nt /var/run/ypxfrd.pid && echo reload ;; *) echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}" exit 1 ;; esac rc_exit -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libksba for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package libksba for openSUSE:Factory checked in at 2014-11-28 09:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksba (Old) and /work/SRC/openSUSE:Factory/.libksba.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libksba" Changes: -------- --- /work/SRC/openSUSE:Factory/libksba/libksba.changes 2014-09-24 13:09:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libksba.new/libksba.changes 2014-11-28 09:32:42.000000000 +0100 @@ -1,0 +2,12 @@ +Wed Nov 26 08:20:23 UTC 2014 - andreas.stieger(a)gmx.de + +- libksba 1.3.2 [boo#907074] [CVE-2014-9087] + This version contains a security update which fixes a buffer + overflow in OID to string conversion code that can be triggered + by a specially crafted S/MIME message or ECC based OpenPGP data. + Users of GnuPG 2.x should install this version and restart the + dirmgr process. + * Fixed a buffer overflow in ksba_oid_to_str. +- verify source signature + +------------------------------------------------------------------- Old: ---- libksba-1.3.1.tar.bz2 New: ---- libksba-1.3.2.tar.bz2 libksba-1.3.2.tar.bz2.sig libksba.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksba.spec ++++++ --- /var/tmp/diff_new_pack.gp3J1m/_old 2014-11-28 09:32:43.000000000 +0100 +++ /var/tmp/diff_new_pack.gp3J1m/_new 2014-11-28 09:32:43.000000000 +0100 @@ -16,18 +16,21 @@ # +%define soname 8 Name: libksba -Version: 1.3.1 +Version: 1.3.2 Release: 0 -%define soname 8 Summary: A X.509 Library License: (LGPL-3.0+ or GPL-2.0+) and GPL-3.0+ and MIT Group: Development/Libraries/C and C++ Url: http://www.gnupg.org/aegypten/ -Source: ftp://ftp.gnupg.org/gcrypt/libksba//libksba-%{version}.tar.bz2 +Source: ftp://ftp.gnupg.org/gcrypt/libksba/%{name}-%{version}.tar.bz2 +Source2: ftp://ftp.gnupg.org/gcrypt/libksba/%{name}-%{version}.tar.bz2.sig +Source3: libksba.keyring BuildRequires: libgpg-error-devel >= 1.8 BuildRequires: libtool -PreReq: %install_info_prereq +# FIXME: use proper Requires(pre/post/preun/...) +PreReq: %{install_info_prereq} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -49,7 +52,7 @@ Group: Development/Libraries/C and C++ Requires: libgpg-error-devel Requires: libksba = %{version} -Provides: libksba:/usr/include/ksba.h +Provides: libksba:%{_includedir}/ksba.h %description devel KSBA is a library to simplify the task of working with X.509 @@ -66,19 +69,16 @@ make %{?_smp_mflags} %check -make check +make %{?_smp_mflags} check %install -%make_install -rm -fv %{buildroot}%{_libdir}/*.la +make DESTDIR=%{buildroot} install %{?_smp_mflags} +find %{buildroot} -type f -name "*.la" -delete -print %post -n %{name}%{soname} -p /sbin/ldconfig %postun -n %{name}%{soname} -p /sbin/ldconfig -%clean -rm -rf %{buildroot} - %files -n %{name}%{soname} %defattr(-,root,root) %doc README AUTHORS COPYING ChangeLog NEWS THANKS TODO ++++++ libksba-1.3.1.tar.bz2 -> libksba-1.3.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/ChangeLog new/libksba-1.3.2/ChangeLog --- old/libksba-1.3.1/ChangeLog 2014-09-18 09:35:35.000000000 +0200 +++ new/libksba-1.3.2/ChangeLog 2014-11-25 12:38:13.000000000 +0100 @@ -1,3 +1,27 @@ +2014-11-25 Werner Koch <wk(a)gnupg.org> + + Release 1.3.2. + * configure.ac: Set LT version to C19/A11/R3. + + build: Update version number magic. + * autogen.sh: Update from gnupg master. + * configure.ac: Change for new init style. Create VERSION. + * Makefile.am (dist-hook): Do no create VERSION + + Fix buffer overflow in ksba_oid_to_str. + * src/oid.c (ksba_oid_to_str): Fix unsigned underflow. + + * tests/Makefile.am (noinst_PROGRAMS): Move t-oid to .. + (TESTS): here. + * tests/t-oid.c (test_oid_to_str): New. + (main): Run the new tests by default. The former functionality + requires the use of one of the new options. + +2014-09-25 Werner Koch <wk(a)gnupg.org> + + Strip CRs while building the oid translation table. + * tests/Makefile.am (oidtranstbl.h): Strip CRs + 2014-09-18 Werner Koch <wk(a)gnupg.org> Release 1.3.1. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/Makefile.am new/libksba-1.3.2/Makefile.am --- old/libksba-1.3.1/Makefile.am 2014-01-10 12:56:56.000000000 +0100 +++ new/libksba-1.3.2/Makefile.am 2014-11-25 12:22:47.000000000 +0100 @@ -41,7 +41,6 @@ SUBDIRS = m4 gl src ${tests} doc dist-hook: gen-ChangeLog - @set -e; echo "$(VERSION)" > $(distdir)/VERSION gen_start_date = 2011-12-01T00:00:00 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/Makefile.in new/libksba-1.3.2/Makefile.in --- old/libksba-1.3.1/Makefile.in 2014-09-18 09:34:45.000000000 +0200 +++ new/libksba-1.3.2/Makefile.in 2014-11-25 12:37:47.000000000 +0100 @@ -197,6 +197,8 @@ GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@ GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ +GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ +GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -828,7 +830,6 @@ dist-hook: gen-ChangeLog - @set -e; echo "$(VERSION)" > $(distdir)/VERSION .PHONY: gen-ChangeLog gen-ChangeLog: if test -d $(top_srcdir)/.git; then \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/NEWS new/libksba-1.3.2/NEWS --- old/libksba-1.3.1/NEWS 2014-09-18 09:33:28.000000000 +0200 +++ new/libksba-1.3.2/NEWS 2014-11-25 12:32:57.000000000 +0100 @@ -1,3 +1,9 @@ +Noteworthy changes in version 1.3.2 (2014-11-25) [C19/A11/R3] +------------------------------------------------ + + * Fixed a buffer overflow in ksba_oid_to_str. + + Noteworthy changes in version 1.3.1 (2014-09-18) ------------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/VERSION new/libksba-1.3.2/VERSION --- old/libksba-1.3.1/VERSION 2014-09-18 09:35:35.000000000 +0200 +++ new/libksba-1.3.2/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -1.3.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/autogen.sh new/libksba-1.3.2/autogen.sh --- old/libksba-1.3.1/autogen.sh 2014-01-10 13:31:26.000000000 +0100 +++ new/libksba-1.3.2/autogen.sh 2014-11-25 12:18:29.000000000 +0100 @@ -15,7 +15,7 @@ # configure it for the respective package. It is maintained as part of # GnuPG and source copied by other packages. # -# Version: 2014-01-10 +# Version: 2014-06-06 configure_ac="configure.ac" @@ -41,7 +41,7 @@ info () { if [ -z "${SILENT}" ]; then - echo "autogen.sh:" "$*" + echo "autogen.sh:" "$*" >&2 fi } @@ -70,8 +70,11 @@ DIE=no FORCE= SILENT= +PRINT_HOST=no +PRINT_BUILD=no tmp=$(dirname "$0") tsdir=$(cd "${tmp}"; pwd) +version_parts=3 if [ -n "${AUTOGEN_SH_SILENT}" ]; then SILENT=" --silent" @@ -88,6 +91,14 @@ FORCE=" --force" shift fi +if test x"$1" = x"--print-host"; then + PRINT_HOST=yes + shift +fi +if test x"$1" = x"--print-build"; then + PRINT_BUILD=yes + shift +fi # Reject unsafe characters in $HOME, $tsdir and cwd. We consider spaces @@ -133,6 +144,11 @@ myhost="" myhostsub="" case "$1" in + --find-version) + myhost="find-version" + SILENT=" --silent" + shift + ;; --build-w32) myhost="w32" shift @@ -172,16 +188,74 @@ . "$HOME/.gnupg-autogen.rc" fi + +# **** FIND VERSION **** +# This is a helper for the configure.ac M4 magic +# Called +# ./autogen.sh --find-version PACKAGE MAJOR MINOR [MICRO] +# returns a complete version string with automatic beta numbering. +if [ "$myhost" = "find-version" ]; then + package="$1" + major="$2" + minor="$3" + micro="$4" + + case "$version_parts" in + 2) + matchstr1="$package-$major.[0-9]*" + matchstr2="$package-$major-base" + vers="$major.$minor" + ;; + *) + matchstr1="$package-$major.$minor.[0-9]*" + matchstr2="$package-$major.$minor-base" + vers="$major.$minor.$micro" + ;; + esac + + beta=no + if [ -d .git ]; then + ingit=yes + tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null) + if [ -n "$tmp" ]; then + tmp=$(echo "$tmp"|awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}') + else + tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \ + | awk -F- '$4!=0{print"-beta"$4}') + fi + [ -n "$tmp" ] && beta=yes + rev=$(git rev-parse --short HEAD | tr -d '\n\r') + rvd=$((0x$(echo ${rev} | head -c 4))) + else + ingit=no + beta=yes + tmp="-unknown" + rev="0000000" + rvd="0" + fi + + echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:" + exit 0 +fi +# **** end FIND VERSION **** + + +if [ ! -f "$tsdir/build-aux/config.guess" ]; then + fatal "$tsdir/build-aux/config.guess not found" + exit 1 +fi +build=`$tsdir/build-aux/config.guess` +if [ $PRINT_BUILD = yes ]; then + echo "$build" + exit 0 +fi + + + # ****************** # W32 build script # ****************** if [ "$myhost" = "w32" ]; then - if [ ! -f "$tsdir/build-aux/config.guess" ]; then - fatal "$tsdir/build-aux/config.guess not found" - exit 1 - fi - build=`$tsdir/build-aux/config.guess` - case $myhostsub in ce) w32root="$w32ce_root" @@ -189,6 +263,12 @@ toolprefixes="$w32ce_toolprefixes arm-mingw32ce" extraoptions="$extraoptions $w32ce_extraoptions" ;; + 64) + w32root="$w64root" + [ -z "$w32root" ] && w32root="$HOME/w64root" + toolprefixes="$w64_toolprefixes x86_64-w64-mingw32" + extraoptions="$extraoptions $w64_extraoptions" + ;; *) [ -z "$w32root" ] && w32root="$HOME/w32root" toolprefixes="$w32_toolprefixes i686-w64-mingw32 i586-mingw32msvc" @@ -216,6 +296,10 @@ fi die_p fi + if [ $PRINT_HOST = yes ]; then + echo "$host" + exit 0 + fi if [ -f "$tsdir/config.log" ]; then if ! head $tsdir/config.log | grep "$host" >/dev/null; then @@ -226,7 +310,7 @@ $tsdir/configure --enable-maintainer-mode ${SILENT} \ --prefix=${w32root} \ - --host=${host} --build=${build} \ + --host=${host} --build=${build} SYSROOT=${w32root} \ ${configure_opts} ${extraoptions} "$@" rc=$? exit $rc @@ -236,13 +320,6 @@ # ***** AMD64 cross build script ******* # Used to cross-compile for AMD64 (for testing) if [ "$myhost" = "amd64" ]; then - shift - if [ ! -f $tsdir/build-aux/config.guess ]; then - echo "$tsdir/build-aux/config.guess not found" >&2 - exit 1 - fi - build=`$tsdir/build-aux/config.guess` - [ -z "$amd64root" ] && amd64root="$HOME/amd64root" info "Using $amd64root as standard install directory" replace_sysroot @@ -263,6 +340,10 @@ echo "Stop." >&2 exit 1 fi + if [ $PRINT_HOST = yes ]; then + echo "$host" + exit 0 + fi if [ -f "$tsdir/config.log" ]; then if ! head $tsdir/config.log | grep "$host" >/dev/null; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/configure new/libksba-1.3.2/configure --- old/libksba-1.3.1/configure 2014-09-18 09:34:46.000000000 +0200 +++ new/libksba-1.3.2/configure 2014-11-25 12:37:48.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libksba 1.3.1. +# Generated by GNU Autoconf 2.69 for libksba 1.3.2. # # Report bugs to <http://bugs.gnupg.org>. # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='libksba' PACKAGE_TARNAME='libksba' -PACKAGE_VERSION='1.3.1' -PACKAGE_STRING='libksba 1.3.1' +PACKAGE_VERSION='1.3.2' +PACKAGE_STRING='libksba 1.3.2' PACKAGE_BUGREPORT='http://bugs.gnupg.org' PACKAGE_URL='' @@ -649,6 +649,8 @@ ALLOCA_H ALLOCA LTALLOCA +GPG_ERROR_MT_LIBS +GPG_ERROR_MT_CFLAGS GPG_ERROR_LIBS GPG_ERROR_CFLAGS GPG_ERROR_CONFIG @@ -1352,7 +1354,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libksba 1.3.1 to adapt to many kinds of systems. +\`configure' configures libksba 1.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1422,7 +1424,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libksba 1.3.1:";; + short | recursive ) echo "Configuration of libksba 1.3.2:";; esac cat <<\_ACEOF @@ -1543,7 +1545,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libksba configure 1.3.1 +libksba configure 1.3.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2149,7 +2151,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libksba $as_me 1.3.1, which was +It was created by libksba $as_me 1.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2505,7 +2507,7 @@ # Please remember to document interface changes in the NEWS file. LIBKSBA_LT_CURRENT=19 LIBKSBA_LT_AGE=11 -LIBKSBA_LT_REVISION=2 +LIBKSBA_LT_REVISION=3 #------------------- # If the API is changed in an incompatible way: increment the next counter. KSBA_CONFIG_API_VERSION=1 @@ -13749,12 +13751,11 @@ # Checks for libraries. # + gpg_error_config_prefix="" # Check whether --with-libgpg-error-prefix was given. if test "${with_libgpg_error_prefix+set}" = set; then : withval=$with_libgpg_error_prefix; gpg_error_config_prefix="$withval" -else - gpg_error_config_prefix="" fi @@ -13762,20 +13763,31 @@ # Check whether --with-gpg-error-prefix was given. if test "${with_gpg_error_prefix+set}" = set; then : withval=$with_gpg_error_prefix; gpg_error_config_prefix="$withval" -else - gpg_error_config_prefix="" fi - if test x$gpg_error_config_prefix != x ; then - if test x${GPG_ERROR_CONFIG+set} != xset ; then - GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config + if test x"${GPG_ERROR_CONFIG}" = x ; then + if test x"${gpg_error_config_prefix}" != x ; then + GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" + else + case "${SYSROOT}" in + /*) + if test -x "${SYSROOT}/bin/gpg-error-config" ; then + GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" + fi + ;; + '') + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&5 +$as_echo "$as_me: WARNING: Ignoring \$SYSROOT as it is not an absolute path." >&2;} + ;; + esac fi fi - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gpg-error-config", so it can be a program name with args. -set dummy ${ac_tool_prefix}gpg-error-config; ac_word=$2 + # Extract the first word of "gpg-error-config", so it can be a program name with args. +set dummy gpg-error-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_GPG_ERROR_CONFIG+:} false; then : @@ -13801,6 +13813,7 @@ done IFS=$as_save_IFS + test -z "$ac_cv_path_GPG_ERROR_CONFIG" && ac_cv_path_GPG_ERROR_CONFIG="no" ;; esac fi @@ -13814,68 +13827,12 @@ fi -fi -if test -z "$ac_cv_path_GPG_ERROR_CONFIG"; then - ac_pt_GPG_ERROR_CONFIG=$GPG_ERROR_CONFIG - # Extract the first word of "gpg-error-config", so it can be a program name with args. -set dummy gpg-error-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_ac_pt_GPG_ERROR_CONFIG+:} false; then : - $as_echo_n "(cached) " >&6 -else - case $ac_pt_GPG_ERROR_CONFIG in - [\\/]* | ?:[\\/]*) - ac_cv_path_ac_pt_GPG_ERROR_CONFIG="$ac_pt_GPG_ERROR_CONFIG" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ac_pt_GPG_ERROR_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - - ;; -esac -fi -ac_pt_GPG_ERROR_CONFIG=$ac_cv_path_ac_pt_GPG_ERROR_CONFIG -if test -n "$ac_pt_GPG_ERROR_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_GPG_ERROR_CONFIG" >&5 -$as_echo "$ac_pt_GPG_ERROR_CONFIG" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_pt_GPG_ERROR_CONFIG" = x; then - GPG_ERROR_CONFIG="no" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - GPG_ERROR_CONFIG=$ac_pt_GPG_ERROR_CONFIG - fi -else - GPG_ERROR_CONFIG="$ac_cv_path_GPG_ERROR_CONFIG" -fi - min_gpg_error_version="$NEED_GPG_ERROR_VERSION" { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GPG Error - version >= $min_gpg_error_version" >&5 $as_echo_n "checking for GPG Error - version >= $min_gpg_error_version... " >&6; } ok=no - if test "$GPG_ERROR_CONFIG" != "no" ; then + if test "$GPG_ERROR_CONFIG" != "no" \ + && test -f "$GPG_ERROR_CONFIG" ; then req_major=`echo $min_gpg_error_version | \ sed 's/$[0-9]*$\.$[0-9]*$/\1/'` req_minor=`echo $min_gpg_error_version | \ @@ -13898,6 +13855,8 @@ if test $ok = yes; then GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` + GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` + GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($gpg_error_config_version)" >&5 $as_echo "yes ($gpg_error_config_version)" >&6; } : @@ -13910,7 +13869,7 @@ *** built for $gpg_error_config_host and thus may not match the *** used host $host. *** You may want to use the configure option --with-gpg-error-prefix -*** to specify a matching config script. +*** to specify a matching config script or use \$SYSROOT. ***" >&5 $as_echo "$as_me: WARNING: *** @@ -13918,13 +13877,16 @@ *** built for $gpg_error_config_host and thus may not match the *** used host $host. *** You may want to use the configure option --with-gpg-error-prefix -*** to specify a matching config script. +*** to specify a matching config script or use \$SYSROOT. ***" >&2;} + gpg_config_script_warn="$gpg_config_script_warn libgpg-error" fi fi else GPG_ERROR_CFLAGS="" GPG_ERROR_LIBS="" + GPG_ERROR_MT_CFLAGS="" + GPG_ERROR_MT_LIBS="" { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } : @@ -13932,6 +13894,8 @@ + + if test "x$GPG_ERROR_LIBS" = "x"; then as_fn_error $? "libgpg-error is needed. See ftp://ftp.gnupg.org/gcrypt/libgpg-error/ ." "$LINENO" 5 @@ -14836,12 +14800,12 @@ if test "$have_w32_system" = yes; then BUILD_TIMESTAMP=`date --iso-8601=minutes` BUILD_FILEVERSION=`echo "$VERSION" | sed 's/$[0-9.]*$.*/\1./;s/\./,/g'` - BUILD_FILEVERSION="${BUILD_FILEVERSION}17527" + BUILD_FILEVERSION="${BUILD_FILEVERSION}519" fi -BUILD_REVISION="447784c" +BUILD_REVISION="02079b5" cat >>confdefs.h <<_ACEOF @@ -15399,7 +15363,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libksba $as_me 1.3.1, which was +This file was extended by libksba $as_me 1.3.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15465,7 +15429,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libksba config.status 1.3.1 +libksba config.status 1.3.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -17463,7 +17427,7 @@ echo " Libksba v${VERSION} has been configured as follows: - Revision: 447784c (17527) + Revision: 02079b5 (519) Platform: $host " diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/configure.ac new/libksba-1.3.2/configure.ac --- old/libksba-1.3.1/configure.ac 2014-09-18 09:33:28.000000000 +0200 +++ new/libksba-1.3.2/configure.ac 2014-11-25 12:30:38.000000000 +0100 @@ -27,23 +27,23 @@ # bump the version number immediately after the release and do another # commit and push so that the git magic is able to work. See below # for the LT versions. -m4_define(mym4_version, [1.3.1]) +m4_define([mym4_package],[libksba]) +m4_define([mym4_major], [1]) +m4_define([mym4_minor], [3]) +m4_define([mym4_micro], [2]) -# Below is m4 magic to extract and compute the revision number, the -# decimalized short revision number, a beta version string, and a flag -# indicating a development version (mym4_isgit). Note that the m4 -# processing is done by autoconf and not during the configure run. -m4_define([mym4_revision], - m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) -m4_define([mym4_revision_dec], - m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))])) -m4_define([mym4_betastring], - m4_esyscmd_s([git describe --match 'libksba-[0-9].*[0-9]' --long|\ - awk -F- '$3!=0{print"-beta"$3}'])) -m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) -m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) - -AC_INIT([libksba],[mym4_full_version],[http://bugs.gnupg.org]) +# Below is m4 magic to extract and compute the git revision number, +# the decimalized short revision number, a beta version string and a +# flag indicating a development version (mym4_isbeta). Note that the +# m4 processing is done by autoconf and not during the configure run. +m4_define([mym4_verslist], m4_split(m4_esyscmd([./autogen.sh --find-version] \ + mym4_package mym4_major mym4_minor mym4_micro),[:])) +m4_define([mym4_isbeta], m4_argn(2, mym4_verslist)) +m4_define([mym4_version], m4_argn(4, mym4_verslist)) +m4_define([mym4_revision], m4_argn(7, mym4_verslist)) +m4_define([mym4_revision_dec], m4_argn(8, mym4_verslist)) +m4_esyscmd([echo ]mym4_version[>VERSION]) +AC_INIT([mym4_package],[mym4_version], [http://bugs.gnupg.org]) # LT Version numbers: Remember to change them just *before* a release. # (Interfaces removed: CURRENT++, AGE=0, REVISION=0) @@ -52,7 +52,7 @@ # Please remember to document interface changes in the NEWS file. LIBKSBA_LT_CURRENT=19 LIBKSBA_LT_AGE=11 -LIBKSBA_LT_REVISION=2 +LIBKSBA_LT_REVISION=3 #------------------- # If the API is changed in an incompatible way: increment the next counter. KSBA_CONFIG_API_VERSION=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/doc/Makefile.in new/libksba-1.3.2/doc/Makefile.in --- old/libksba-1.3.1/doc/Makefile.in 2014-09-18 09:34:45.000000000 +0200 +++ new/libksba-1.3.2/doc/Makefile.in 2014-11-25 12:37:47.000000000 +0100 @@ -178,6 +178,8 @@ GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@ GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ +GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ +GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/doc/ksba.info new/libksba-1.3.2/doc/ksba.info --- old/libksba-1.3.1/doc/ksba.info 2014-09-18 09:35:34.000000000 +0200 +++ new/libksba-1.3.2/doc/ksba.info 2014-11-25 12:38:13.000000000 +0100 @@ -9,8 +9,8 @@ This file documents the KSBA library to access X.509 and CMS data structures. - This is edition 1.3.1, last updated 15 March 2013, of `The KSBA -Reference Manual', for Version 1.3.1. + This is edition 1.3.2, last updated 15 March 2013, of `The KSBA +Reference Manual', for Version 1.3.2. Copyright (C) 2002, 2003, 2004 g10 Code GmbH @@ -26,8 +26,8 @@ Main Menu ********* -This is edition 1.3.1, last updated 15 March 2013, of `The KSBA -Reference Manual', for Version 1.3.1 of the KSBA library. +This is edition 1.3.2, last updated 15 March 2013, of `The KSBA +Reference Manual', for Version 1.3.2 of the KSBA library. Copyright (C) 2002, 2003, 2004 g10 Code GmbH diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/doc/stamp-vti new/libksba-1.3.2/doc/stamp-vti --- old/libksba-1.3.1/doc/stamp-vti 2014-09-18 09:35:34.000000000 +0200 +++ new/libksba-1.3.2/doc/stamp-vti 2014-11-25 12:38:13.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 15 March 2013 @set UPDATED-MONTH March 2013 -@set EDITION 1.3.1 -@set VERSION 1.3.1 +@set EDITION 1.3.2 +@set VERSION 1.3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/doc/version.texi new/libksba-1.3.2/doc/version.texi --- old/libksba-1.3.1/doc/version.texi 2014-09-18 09:35:34.000000000 +0200 +++ new/libksba-1.3.2/doc/version.texi 2014-11-25 12:38:13.000000000 +0100 @@ -1,4 +1,4 @@ @set UPDATED 15 March 2013 @set UPDATED-MONTH March 2013 -@set EDITION 1.3.1 -@set VERSION 1.3.1 +@set EDITION 1.3.2 +@set VERSION 1.3.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/gl/Makefile.in new/libksba-1.3.2/gl/Makefile.in --- old/libksba-1.3.1/gl/Makefile.in 2014-09-18 09:34:45.000000000 +0200 +++ new/libksba-1.3.2/gl/Makefile.in 2014-11-25 12:37:47.000000000 +0100 @@ -158,6 +158,8 @@ GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@ GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ +GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ +GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/m4/Makefile.in new/libksba-1.3.2/m4/Makefile.in --- old/libksba-1.3.1/m4/Makefile.in 2014-09-18 09:34:45.000000000 +0200 +++ new/libksba-1.3.2/m4/Makefile.in 2014-11-25 12:37:47.000000000 +0100 @@ -117,6 +117,8 @@ GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@ GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ +GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ +GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/m4/gpg-error.m4 new/libksba-1.3.2/m4/gpg-error.m4 --- old/libksba-1.3.1/m4/gpg-error.m4 2013-03-15 20:26:38.000000000 +0100 +++ new/libksba-1.3.2/m4/gpg-error.m4 2014-11-25 12:15:20.000000000 +0100 @@ -1,5 +1,5 @@ # gpg-error.m4 - autoconf macro to detect libgpg-error. -# Copyright (C) 2002, 2003, 2004, 2011 g10 Code GmbH +# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH # # This file is free software; as a special exception the author gives # unlimited permission to copy and/or distribute it, with or without @@ -8,38 +8,64 @@ # This file is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Last-changed: 2014-10-02 + dnl AM_PATH_GPG_ERROR([MINIMUM-VERSION, dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl Test for libgpg-error and define GPG_ERROR_CFLAGS and GPG_ERROR_LIBS +dnl +dnl Test for libgpg-error and define GPG_ERROR_CFLAGS, GPG_ERROR_LIBS, +dnl GPG_ERROR_MT_CFLAGS, and GPG_ERROR_MT_LIBS. The _MT_ variants are +dnl used for programs requireing real multi thread support. +dnl +dnl If a prefix option is not used, the config script is first +dnl searched in $SYSROOT/bin and then along $PATH. If the used +dnl config script does not match the host specification the script +dnl is added to the gpg_config_script_warn variable. dnl AC_DEFUN([AM_PATH_GPG_ERROR], [ AC_REQUIRE([AC_CANONICAL_HOST]) + gpg_error_config_prefix="" dnl --with-libgpg-error-prefix=PFX is the preferred name for this option, dnl since that is consistent with how our three siblings use the directory/ dnl package name in --with-$dir_name-prefix=PFX. AC_ARG_WITH(libgpg-error-prefix, - AC_HELP_STRING([--with-libgpg-error-prefix=PFX], - [prefix where GPG Error is installed (optional)]), - gpg_error_config_prefix="$withval", gpg_error_config_prefix="") + AC_HELP_STRING([--with-libgpg-error-prefix=PFX], + [prefix where GPG Error is installed (optional)]), + [gpg_error_config_prefix="$withval"]) dnl Accept --with-gpg-error-prefix and make it work the same as dnl --with-libgpg-error-prefix above, for backwards compatibility, dnl but do not document this old, inconsistently-named option. AC_ARG_WITH(gpg-error-prefix,, - gpg_error_config_prefix="$withval", gpg_error_config_prefix="") + [gpg_error_config_prefix="$withval"]) - if test x$gpg_error_config_prefix != x ; then - if test x${GPG_ERROR_CONFIG+set} != xset ; then - GPG_ERROR_CONFIG=$gpg_error_config_prefix/bin/gpg-error-config + if test x"${GPG_ERROR_CONFIG}" = x ; then + if test x"${gpg_error_config_prefix}" != x ; then + GPG_ERROR_CONFIG="${gpg_error_config_prefix}/bin/gpg-error-config" + else + case "${SYSROOT}" in + /*) + if test -x "${SYSROOT}/bin/gpg-error-config" ; then + GPG_ERROR_CONFIG="${SYSROOT}/bin/gpg-error-config" + fi + ;; + '') + ;; + *) + AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) + ;; + esac fi fi - AC_PATH_TOOL(GPG_ERROR_CONFIG, gpg-error-config, no) + AC_PATH_PROG(GPG_ERROR_CONFIG, gpg-error-config, no) min_gpg_error_version=ifelse([$1], ,0.0,$1) AC_MSG_CHECKING(for GPG Error - version >= $min_gpg_error_version) ok=no - if test "$GPG_ERROR_CONFIG" != "no" ; then + if test "$GPG_ERROR_CONFIG" != "no" \ + && test -f "$GPG_ERROR_CONFIG" ; then req_major=`echo $min_gpg_error_version | \ sed 's/$[[0-9]]*$\.$[[0-9]]*$/\1/'` req_minor=`echo $min_gpg_error_version | \ @@ -62,6 +88,8 @@ if test $ok = yes; then GPG_ERROR_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --cflags` GPG_ERROR_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --libs` + GPG_ERROR_MT_CFLAGS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --cflags 2>/dev/null` + GPG_ERROR_MT_LIBS=`$GPG_ERROR_CONFIG $gpg_error_config_args --mt --libs 2>/dev/null` AC_MSG_RESULT([yes ($gpg_error_config_version)]) ifelse([$2], , :, [$2]) gpg_error_config_host=`$GPG_ERROR_CONFIG $gpg_error_config_args --host 2>/dev/null || echo none` @@ -73,16 +101,21 @@ *** built for $gpg_error_config_host and thus may not match the *** used host $host. *** You may want to use the configure option --with-gpg-error-prefix -*** to specify a matching config script. +*** to specify a matching config script or use \$SYSROOT. ***]]) + gpg_config_script_warn="$gpg_config_script_warn libgpg-error" fi fi else GPG_ERROR_CFLAGS="" GPG_ERROR_LIBS="" + GPG_ERROR_MT_CFLAGS="" + GPG_ERROR_MT_LIBS="" AC_MSG_RESULT(no) ifelse([$3], , :, [$3]) fi AC_SUBST(GPG_ERROR_CFLAGS) AC_SUBST(GPG_ERROR_LIBS) + AC_SUBST(GPG_ERROR_MT_CFLAGS) + AC_SUBST(GPG_ERROR_MT_LIBS) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/m4/libgcrypt.m4 new/libksba-1.3.2/m4/libgcrypt.m4 --- old/libksba-1.3.1/m4/libgcrypt.m4 2013-03-15 20:26:38.000000000 +0100 +++ new/libksba-1.3.2/m4/libgcrypt.m4 2014-11-25 12:15:33.000000000 +0100 @@ -1,13 +1,15 @@ -dnl Autoconf macros for libgcrypt -dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc. -dnl -dnl This file is free software; as a special exception the author gives -dnl unlimited permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl -dnl This file is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# libgcrypt.m4 - Autoconf macros to detect libgcrypt +# Copyright (C) 2002, 2003, 2004, 2011, 2014 g10 Code GmbH +# +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This file is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Last-changed: 2014-10-02 dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, @@ -20,19 +22,37 @@ dnl this features allows to prevent build against newer versions of libgcrypt dnl with a changed API. dnl +dnl If a prefix option is not used, the config script is first +dnl searched in $SYSROOT/bin and then along $PATH. If the used +dnl config script does not match the host specification the script +dnl is added to the gpg_config_script_warn variable. +dnl AC_DEFUN([AM_PATH_LIBGCRYPT], [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_ARG_WITH(libgcrypt-prefix, AC_HELP_STRING([--with-libgcrypt-prefix=PFX], [prefix where LIBGCRYPT is installed (optional)]), libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") - if test x$libgcrypt_config_prefix != x ; then - if test x${LIBGCRYPT_CONFIG+set} != xset ; then - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config + if test x"${LIBGCRYPT_CONFIG}" = x ; then + if test x"${libgcrypt_config_prefix}" != x ; then + LIBGCRYPT_CONFIG="${libgcrypt_config_prefix}/bin/libgcrypt-config" + else + case "${SYSROOT}" in + /*) + if test -x "${SYSROOT}/bin/libgcrypt-config" ; then + LIBGCRYPT_CONFIG="${SYSROOT}/bin/libgcrypt-config" + fi + ;; + '') + ;; + *) + AC_MSG_WARN([Ignoring \$SYSROOT as it is not an absolute path.]) + ;; + esac fi fi - AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) + AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no) tmp=ifelse([$1], ,1:1.2.0,$1) if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then req_libgcrypt_api=`echo "$tmp" | sed 's/$.*$:$.*$/\1/'` @@ -108,8 +128,9 @@ *** built for $libgcrypt_config_host and thus may not match the *** used host $host. *** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script. +*** to specify a matching config script or use \$SYSROOT. ***]]) + gpg_config_script_warn="$gpg_config_script_warn libgcrypt" fi fi else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/src/Makefile.in new/libksba-1.3.2/src/Makefile.in --- old/libksba-1.3.1/src/Makefile.in 2014-09-18 09:34:45.000000000 +0200 +++ new/libksba-1.3.2/src/Makefile.in 2014-11-25 12:37:47.000000000 +0100 @@ -231,6 +231,8 @@ GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@ GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ +GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ +GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/src/oid.c new/libksba-1.3.2/src/oid.c --- old/libksba-1.3.1/src/oid.c 2013-03-15 20:26:38.000000000 +0100 +++ new/libksba-1.3.2/src/oid.c 2014-11-25 10:11:20.000000000 +0100 @@ -94,6 +94,8 @@ val <<= 7; val |= buf[n] & 0x7f; } + if (val < 80) + goto badoid; val -= 80; sprintf (p, "2.%lu", val); p += strlen (p); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/tests/Makefile.am new/libksba-1.3.2/tests/Makefile.am --- old/libksba-1.3.1/tests/Makefile.am 2014-07-22 09:24:19.000000000 +0200 +++ new/libksba-1.3.2/tests/Makefile.am 2014-11-25 09:30:20.000000000 +0100 @@ -39,13 +39,13 @@ BUILT_SOURCES = oidtranstbl.h CLEANFILES = oidtranstbl.h -TESTS = cert-basic t-crl-parser t-dnparser +TESTS = cert-basic t-crl-parser t-dnparser t-oid AM_CFLAGS = $(GPG_ERROR_CFLAGS) AM_LDFLAGS = -no-install noinst_HEADERS = t-common.h -noinst_PROGRAMS = $(TESTS) t-cms-parser t-crl-parser t-dnparser t-ocsp t-oid +noinst_PROGRAMS = $(TESTS) t-cms-parser t-crl-parser t-dnparser t-ocsp LDADD = ../src/libksba.la $(GPG_ERROR_LIBS) t_ocsp_SOURCES = t-ocsp.c sha1.c @@ -59,6 +59,6 @@ for i in /etc/dumpasn1 /usr/local/bin /usr/local/share /usr/bin \ /usr/share ; do \ if test -f $$i/dumpasn1.cfg; then f=$$i/dumpasn1.cfg; break; fi; \ - done; $(AWK) -f $(srcdir)/mkoidtbl.awk $$f >$@ + done; tr -d '\r' <$$f | $(AWK) -f $(srcdir)/mkoidtbl.awk >$@ LOG_COMPILER = $(VALGRIND) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/tests/Makefile.in new/libksba-1.3.2/tests/Makefile.in --- old/libksba-1.3.1/tests/Makefile.in 2014-09-18 09:34:45.000000000 +0200 +++ new/libksba-1.3.2/tests/Makefile.in 2014-11-25 12:37:47.000000000 +0100 @@ -70,10 +70,10 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -TESTS = cert-basic$(EXEEXT) t-crl-parser$(EXEEXT) t-dnparser$(EXEEXT) -noinst_PROGRAMS = $(am__EXEEXT_1) t-cms-parser$(EXEEXT) \ - t-crl-parser$(EXEEXT) t-dnparser$(EXEEXT) t-ocsp$(EXEEXT) \ +TESTS = cert-basic$(EXEEXT) t-crl-parser$(EXEEXT) t-dnparser$(EXEEXT) \ t-oid$(EXEEXT) +noinst_PROGRAMS = $(am__EXEEXT_1) t-cms-parser$(EXEEXT) \ + t-crl-parser$(EXEEXT) t-dnparser$(EXEEXT) t-ocsp$(EXEEXT) subdir = tests DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -94,7 +94,7 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = am__EXEEXT_1 = cert-basic$(EXEEXT) t-crl-parser$(EXEEXT) \ - t-dnparser$(EXEEXT) + t-dnparser$(EXEEXT) t-oid$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) cert_basic_SOURCES = cert-basic.c cert_basic_OBJECTS = cert-basic.$(OBJEXT) @@ -200,6 +200,8 @@ GPG_ERROR_CFLAGS = @GPG_ERROR_CFLAGS@ GPG_ERROR_CONFIG = @GPG_ERROR_CONFIG@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ +GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ +GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ GREP = @GREP@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ @@ -740,7 +742,7 @@ for i in /etc/dumpasn1 /usr/local/bin /usr/local/share /usr/bin \ /usr/share ; do \ if test -f $$i/dumpasn1.cfg; then f=$$i/dumpasn1.cfg; break; fi; \ - done; $(AWK) -f $(srcdir)/mkoidtbl.awk $$f >$@ + done; tr -d '\r' <$$f | $(AWK) -f $(srcdir)/mkoidtbl.awk >$@ # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/tests/t-dnparser.c new/libksba-1.3.2/tests/t-dnparser.c --- old/libksba-1.3.1/tests/t-dnparser.c 2014-04-15 22:11:42.000000000 +0200 +++ new/libksba-1.3.2/tests/t-dnparser.c 2014-11-25 10:16:43.000000000 +0100 @@ -143,7 +143,7 @@ if (!feof (stdin)) fail ("read error or input too large"); - fail ("no yet implemented"); + fail ("not yet implemented"); } else if (argc == 2 && !strcmp (argv[1], "--to-der") ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksba-1.3.1/tests/t-oid.c new/libksba-1.3.2/tests/t-oid.c --- old/libksba-1.3.1/tests/t-oid.c 2013-03-15 20:26:38.000000000 +0100 +++ new/libksba-1.3.2/tests/t-oid.c 2014-11-25 11:36:11.000000000 +0100 @@ -27,6 +27,9 @@ #include "../src/ksba.h" +#define PGM "t-oid" +#define BADOID "1.3.6.1.4.1.11591.2.12242973" + static void * read_into_buffer (FILE *fp, size_t *r_length) @@ -68,23 +71,104 @@ } +static void +test_oid_to_str (void) +{ + struct { + unsigned int binlen; + unsigned char *bin; + char *str; + } tests[] = { + + { 7, "\x02\x82\x06\x01\x0A\x0C\x00", + "0.2.262.1.10.12.0" + }, + { 7, "\x02\x82\x06\x01\x0A\x0C\x01", + "0.2.262.1.10.12.1" + }, + { 7, "\x2A\x86\x48\xCE\x38\x04\x01", + "1.2.840.10040.4.1" + }, + { 7, "\x2A\x86\x48\xCE\x38\x04\x03", + "1.2.840.10040.4.3" + }, + { 10, "\x2B\x06\x01\x04\x01\xDA\x47\x02\x01\x01", + "1.3.6.1.4.1.11591.2.1.1" + }, + { 3, "\x55\x1D\x0E", + "2.5.29.14" + }, + { 9, "\x80\x02\x70\x50\x25\x46\xfd\x0c\xc0", + BADOID + }, + { 1, "\x80", + BADOID + }, + { 2, "\x81\x00", + "2.48" + }, + { 2, "\x81\x01", + "2.49" + }, + { 2, "\x81\x7f", + "2.175" + }, + { 2, "\x81\x80", /* legal encoding? */ + "2.48" + }, + { 2, "\x81\x81\x01", /* legal encoding? */ + "2.49" + }, + { 0, "", + "" + }, + + { 0, NULL, NULL } + }; + int tidx; + char *str; + + for (tidx=0; tests[tidx].bin; tidx++) + { + str = ksba_oid_to_str (tests[tidx].bin, tests[tidx].binlen); + if (!str) + { + perror ("ksba_oid_to_str failed"); + exit (1); + } + if (strcmp (tests[tidx].str, str)) + { + fprintf (stderr, "ksba_oid_to_str test %d failed\n", tidx); + fprintf (stderr, " got=%s\n", str); + fprintf (stderr, " want=%s\n", tests[tidx].str); + exit (1); + } + } +} + int main (int argc, char **argv) { gpg_error_t err; + if (argc) { argc--; argv++; } - if (argc) + + if (!argc) + { + test_oid_to_str (); + } + else if (!strcmp (*argv, "--from-str")) { unsigned char *buffer; size_t n, buflen; - for ( ;argc ; argc--, argv++) + for (argv++,argc-- ; argc; argc--, argv++) { err = ksba_oid_from_str (*argv, &buffer, &buflen); if (err) @@ -100,18 +184,25 @@ free (buffer); } } - else + else if (!strcmp (*argv, "--to-str")) { char *buffer; size_t buflen; char *result; + argv++;argc--; + buffer = read_into_buffer (stdin, &buflen); result = ksba_oid_to_str (buffer, buflen); free (buffer); printf ("%s\n", result? result:"[malloc failed]"); free (result); } + else + { + fputs ("usage: "PGM" [--from-str|--to-str]\n", stderr); + return 1; + } return 0; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit akonadi-runtime for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at 2014-11-28 08:48:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-runtime (Old) and /work/SRC/openSUSE:Factory/.akonadi-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "akonadi-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-runtime/akonadi-runtime.changes 2014-11-03 13:12:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.akonadi-runtime.new/akonadi-runtime.changes 2014-11-28 08:48:38.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Nov 09 21:11:00 UTC 2014 - Led <ledest(a)gmail.com> + +- fix bashisms in post/postun scripts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.uDmoek/_old 2014-11-28 08:48:39.000000000 +0100 +++ /var/tmp/diff_new_pack.uDmoek/_new 2014-11-28 08:48:39.000000000 +0100 @@ -88,11 +88,11 @@ %post /sbin/ldconfig -%{_kde4_bindir}/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : +%{_kde4_bindir}/update-mime-database %{_kde4_datadir}/mime > /dev/null 2>&1 || : %postun /sbin/ldconfig -%{_kde4_bindir}/update-mime-database %{_kde4_datadir}/mime &> /dev/null || : +%{_kde4_bindir}/update-mime-database %{_kde4_datadir}/mime > /dev/null 2>&1 || : %post -n libakonadiprotocolinternals1 -p /sbin/ldconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kdepim4 for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package kdepim4 for openSUSE:Factory checked in at 2014-11-28 08:48:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim4 (Old) and /work/SRC/openSUSE:Factory/.kdepim4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kdepim4" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim4/kdepim4.changes 2014-11-19 20:27:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim4.new/kdepim4.changes 2014-11-28 08:48:36.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 12 15:12:00 UTC 2014 - Led <ledest(a)gmail.com> + +- Fix BuildRequires of libkgapi-devel + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim4.spec ++++++ --- /var/tmp/diff_new_pack.0n75vo/_old 2014-11-28 08:48:37.000000000 +0100 +++ /var/tmp/diff_new_pack.0n75vo/_new 2014-11-28 08:48:37.000000000 +0100 @@ -36,7 +36,7 @@ BuildRequires: libassuan-devel BuildRequires: libbaloowidgets-devel BuildRequires: libkdepimlibs4-devel >= %version -BuildRequires: libkgapi-devel +BuildRequires: libkgapi-devel >= 2.2 BuildRequires: libprison-devel BuildRequires: libqca2-devel BuildRequires: xz -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit plasma-addons for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package plasma-addons for openSUSE:Factory checked in at 2014-11-28 08:48:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-addons (Old) and /work/SRC/openSUSE:Factory/.plasma-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma-addons" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-addons/plasma-addons.changes 2014-11-19 20:26:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.plasma-addons.new/plasma-addons.changes 2014-11-28 08:48:35.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 12 12:51:00 UTC 2014 - Led <ledest(a)gmail.com> + +- fix bashisms in post/postun scripts + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-addons.spec ++++++ --- /var/tmp/diff_new_pack.JZLbp2/_old 2014-11-28 08:48:36.000000000 +0100 +++ /var/tmp/diff_new_pack.JZLbp2/_new 2014-11-28 08:48:36.000000000 +0100 @@ -126,11 +126,11 @@ %post /sbin/ldconfig -%{_kde4_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : +%{_kde4_bindir}/update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||: %postun /sbin/ldconfig -%{_kde4_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || : +%{_kde4_bindir}/update-mime-database %{_datadir}/mime >/dev/null 2>&1 ||: %post akonadi -p /sbin/ldconfig %postun akonadi -p /sbin/ldconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gns3 for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package gns3 for openSUSE:Factory checked in at 2014-11-28 08:48:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gns3 (Old) and /work/SRC/openSUSE:Factory/.gns3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gns3" Changes: -------- --- /work/SRC/openSUSE:Factory/gns3/gns3.changes 2014-05-09 06:58:04.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gns3.new/gns3.changes 2014-11-28 08:48:33.000000000 +0100 @@ -1,0 +2,253 @@ +Tue Nov 25 12:30:44 UTC 2014 - andrea(a)opensuse.org + +- Fixed license tag + +------------------------------------------------------------------- +Thu Nov 20 08:15:53 UTC 2014 - andrea(a)opensuse.org + +- new upstream version 1.2 + * New VirtualBox support. + * New GUI styles: charcoal (default) & classic. Changing GUI Preferences + * Integration of GNS3 converter (allows old .net topologies to be opened). + * VirtualBox linked clones support (experimental, still some problems with temporary projects). + * Allow Qemu VM to have no interface. + * Option to allow console connections to any local IP address when using the local server. + * Automatically extract IOS configs when a project is closed. + * Fix "new project" bug when using the GNS3 IOU VM. + * qemu-system-i386 is the new default on 32-bit platforms. + * Option to deactivate the new project dialog at startup. + * Add "open a project" and "recent projects" buttons to the new project dialog. + * New host node (cloud with all available Ethernet & TAP interfaces added). + * Fix platform detection issue with some Cisco IOS image file name. + * Add delay (default 500 ms) when Console to all nodes. + * Check for duplicate node names in Preferences. + * Fix bug when editing a Qemu VM configured to run on a remote server. + * News dock widget is smaller. + * Add detection of qemu and qemu.exe binaries. + * New Telnet server for VirtualBox. +- added gns3-converter and python3-configobj as runtime dependencies + +------------------------------------------------------------------- +Sat Nov 08 05:34:00 UTC 2014 - Led <ledest(a)gmail.com> + +- fix bashisms in post/postun scripts + +------------------------------------------------------------------- +Thu Oct 23 09:06:12 UTC 2014 - andrea(a)opensuse.org + +- new upstream version 1.1 +- bug fixes + * Warning message when using a remote server with IOU + * Serial console for VirtualBox + * Fixes EtherSwitch router + * New Idle-PC dialog + * Fixes #123 (Qemu binaries list not showing up) + * Fixes #119 + * Fixes #126 (broken remote server feature) + * Fixes #120 (broken cloud) +- removed broken_cloud.patch and broken_server.patch now upstream + +------------------------------------------------------------------- +Wed Oct 22 18:44:54 UTC 2014 - andrea(a)opensuse.org + +- added broken_cloud.patch and broken_server.patch from upstream + gitcode to fix issue 120 and 121 + +------------------------------------------------------------------- +Tue Oct 21 20:52:35 UTC 2014 - andrea(a)opensuse.org + +- New upstream version 1.0 +- New features + * Snapshots support (currently only for local projects). + * Possibility to configure a category for nodes (routers, + switches, end devices or security devices). + * Added support for xfce4-terminal, for Xubuntu. + * Remote servers and load-balancing (some bugs, still + things to improve). + * Check for update feature. + * GNS3 Jungle dock widget. + * Getting started dialog. + * Added path lookup directory for Qemu on OSX. + * Bug fix when loading a project containing a remote server. +- Know issues and notes + * VirtualBox support doesn’t work on Mac OS X. + * VirtualBox support on other platforms hasn’t been fully tested + and bugs may still be present. + * Again, regarding VirtualBox integration, we have plans to rewrite + the back-end to add more features and remove the dependency + on vboxwrapper. + +------------------------------------------------------------------- +Mon Oct 20 20:56:56 UTC 2014 - andrea(a)opensuse.org + +- New upstream version 1.0 Beta 4 +- New features: + * Preferences has been completely re-vamped for the + various emulators: Dynamips, IOU, VirtualBox and Qemu. +-Know issues and notes + * VirtualBox/QEMU on Mac OS X hasn’t been tested at all. + * VirtualBox support on other platforms hasn’t been fully tested + and bugs may still be present. + * Regarding VirtualBox integration, we have plans to rewrite the + back-end to add more features and remove the dependency on vboxwrapper. + +------------------------------------------------------------------- +Thu Sep 25 08:31:21 UTC 2014 - andrea(a)opensuse.org + +- New upstream version 1.0 Beta 3 +- New features + * QEMU integration with ASA and IDS pre-configuration options. + * Solarwinds Response Time Viewer integration (Windows 64-bit only). +- know issues and notes + * VirtualBox support on other platforms hasn’t been fully tested and + bugs may still be present. + * Regarding VirtualBox integration, we have plans to rewrite the + back-end to add more features and remove the dependency on vboxwrapper. + * We still have a couple of beta releases planned before + our first release candidate. + +------------------------------------------------------------------- +Wed Sep 3 07:41:38 UTC 2014 - andrea(a)opensuse.org + +- New upstream version 1.0 Beta 2 + * Improved VirtualBox support on Windows and Linux. + * VirtualBox support on Linux/OSX requires VirtualBox wrapper version >= 9.1 + * New “enable console” option for VirtualBox VMs. + * New “start at” option for VirtualBox VMs (adapter start index, 0 by default). + * EtherSwitch support (based on a c3745 image). + * Multi-drop feature (use SHIFT key while dropping a new node on the drawing area). + * Default font and color for labels. + * Support for rectangle and ellipse color transparency. + * New topology summary options: filter devices with capture(s) and stop all captures. + * Commands for the GNS3 console (version, start, stop, suspend, reload, show device, show run, help and debug). + * Layers implementation (anything below layer 0 will be locked to the drawing area). + * Numeric sorting for Ethernet/hub ports. + * Restore default buttons for general, packet capture and GNS3 server preferences. + * Changed the default port ranges. + * Normalized capture file names. + * More checks on device names, especially for IOS and IOU which forbid some characters. + * Handles zoom in or out using the mouse wheel + CTRL. Resets the zoom using CTRL+0. + * Prevent node labels to be deleted. + * The sparse memory feature is off by default for c1700 and c2600 platforms (to prevent a bug on reboot). + +------------------------------------------------------------------- +Thu Jul 24 07:42:09 UTC 2014 - andrea(a)opensuse.org + +- New upstream version 1.0 Beta 1 + * Base VirtualBox support (still some issues, most of them on Linux and Mac OS X). + * Prevent users to set the port and VLAN settings to 0 on Ethernet swithes. + * Fixed issue when spaces are in capture file paths. + * Fixed bug with live capture on Windows. + * Work around for the c7200 reload bug in Dynamips <= 0.2.13. + * Fixed some inconsistencies when exporting configs. + * The early release dialog is gone! + + +------------------------------------------------------------------- +Thu Jul 10 09:45:26 UTC 2014 - andrea(a)opensuse.org + +- New upstream version 1.0 alpha 8 + * New feature: insert an image on the view. + * New feature: change node symbols. + * Default port configuration for Ethernet switch and hub devices. + * New feature: import/export device configs. + * Fixed issue when deleting note items that had parent items. + * Check the minimum required amount of RAM when adding IOS images. + * Start a packet capture from the device contextual menu. + * Improvements on the topology summary and link highlighting. + * Find an alternative IOS or IOU image if one cannot be found when importing a topology. + * Find an alternative Ethernet interface if one cannot be found when importing a topology. + * Use Windows interface names instead of their GUID (more user friendly). + * Fixed IOU and VPCS renaming issues. + * Fixed size restoration issues for rectangles and ellipses when loading a project. + * Check for VPCS version >= 0.5b1 + * Fixed errors when connecting an IOU device to a cloud. + * Packet capture for IOU works with the latest iouyap version (0.95) available here. + +------------------------------------------------------------------- +Tue Jul 1 07:08:30 UTC 2014 - andrea(a)opensuse.org + +- New upstream version 1.0 alpha 7 + * Packet capture for IOS routers. + * Packet capture for the Ethernet hub and Ethernet, + ATM and Frame relay switches. + * Packet capture for IOU (not working, issue with iouyap). + * Add notes, rectangles & ellipses to topologies. + * Show/hide interface labels. + * Contextual device menu. + * Recent file menu. + * Lab instructions support (automatically open any file named + instructions.* in the project directory or from the Help menu) + * Load a project by dropping the project file on the view. + * Duplicate option for notes, rectangles and ellipses. + * Style settings for note, rectangle and ellipse items. Possibility + to edit interface and node labels. + * Fix: use Dynamips, IOU and VPCS identifiers to correctly + load topologies. + * IOU: rename startup-config to initial-config (makes more + sense for IOU). + * Option to uncompress IOS images. + * Check for sticky bit when checking for executable access. + * Fix: IOS image relative path problems. + * Lots of small bug fixes. + +------------------------------------------------------------------- +Sat May 31 09:31:58 UTC 2014 - andrea(a)opensuse.org + +- New upstream version 1.0 alpha 6 ++++ 59 more lines (skipped) ++++ between /work/SRC/openSUSE:Factory/gns3/gns3.changes ++++ and /work/SRC/openSUSE:Factory/.gns3.new/gns3.changes Old: ---- GNS3-0.5-tutorial.pdf GNS3-0.8.7-src.tar.gz New: ---- gns3-gui-1.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gns3.spec ++++++ --- /var/tmp/diff_new_pack.xItvI3/_old 2014-11-28 08:48:34.000000000 +0100 +++ /var/tmp/diff_new_pack.xItvI3/_new 2014-11-28 08:48:34.000000000 +0100 @@ -15,50 +15,47 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if %{defined fedora} -# get python version -%global py_ver %(if [ -f "%{__python}" ]; then %{__python} -c "import sys; sys.stdout.write(sys.version[:3])"; else echo 0; fi;) +# get python versions +%global py3_ver %(if [ -f "%{__python3}" ]; then %{__python3} -c "import sys; sys.stdout.write(sys.version[:3])"; else echo 0; fi;) %endif Name: gns3 Summary: A graphical network simulator -License: GPL-2.0 +License: GPL-3.0+ Group: Productivity/Networking/Other -Version: 0.8.7 +Version: 1.2 Release: 0 Url: http://www.gns3.net/ -Source0: GNS3-%{version}-src.tar.gz +Source0: %{name}-gui-%{version}.tar.gz Source1: %{name}.png -Source2: http://kent.dl.sourceforge.net/sourceforge/gns-3/GNS3-0.5-tutorial.pdf -Source3: %{name}.xml -Source4: %{name}.desktop -Source5: application-x-%{name}.png +Source2: %{name}.xml +Source3: %{name}.desktop +Source4: application-x-%{name}.png +BuildArch: noarch BuildRequires: desktop-file-utils -BuildRequires: dos2unix -BuildRequires: hicolor-icon-theme -BuildRequires: libosip2-devel -BuildRequires: libqt4-devel -BuildRequires: python-devel -BuildRequires: python-qt4 -BuildRequires: python-sip +BuildRequires: python3-devel >= 3.3 +BuildRequires: python3-pip +BuildRequires: python3-qt4-devel +BuildRequires: python3-setuptools %if %{undefined fedora} BuildRequires: update-desktop-files -BuildRequires: fdupes -Recommends: wireshark -Recommends: qemu -Recommends: vde2 -Recommends: xdotool -Recommends: vpcs -%{py_requires} -%endif -Requires: python-qt4 -Requires: python-sip -Requires: dynamips -%if !0%{?sles_version} -BuildArch: noarch %endif +Requires: gns3-converter +Requires: gns3-server +Requires: gns3-server = %{version} +Requires: python3-apache-libcloud >= 0.14.1 +Requires: python3-configobj +Requires: python3-paramiko +Requires: python3-pip +Requires: python3-qt4 +Requires: python3-requests +Requires: python3-ws4py = 0.3.4 +Provides: gns3-gui > %{version} +Obsoletes: gns3-gui <= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -72,85 +69,47 @@ Important notice: users must provide their own Cisco IOS to use GNS3. %prep -%setup -q -n gns3-legacy-GNS3-%{version} +%setup -q -n %{name}-gui-%{version} %build -%__cp %SOURCE2 . -%{__python} setup.py build +python3 setup.py build %install -%{__python} setup.py install --root=%{buildroot} --prefix=%{_prefix} -%__mkdir_p %buildroot/%_datadir/%{name} -%__mkdir_p %buildroot/%_datadir/%{name}/examples -%__rm qemuwrapper/*.bat -%__cp -R qemuwrapper %buildroot/%_datadir/%{name}/ -%__mkdir_p %buildroot/%_datadir/icons/hicolor/48x48/mimetypes/ -%__mkdir_p %buildroot/%_datadir/mime/packages/ -%__mkdir_p %buildroot/%_datadir/applications/ -%__mkdir_p %buildroot/%_datadir/pixmaps -%__mkdir_p %buildroot/%_mandir/man1/ -%__mkdir_p %buildroot/%_libexecdir/%name -%__mv qemuwrapper/qemuwrapper.py %buildroot/%_libexecdir/%{name}/qemuwrapper.py -%__mv vboxwrapper/vboxcontroller_4_1.py %buildroot/%_libexecdir/%{name}/vboxcontroller_4_1.py -%__mv vboxwrapper/vboxwrapper.py %buildroot/%_libexecdir/%{name}/vboxwrapper.py -%__mv %buildroot/usr/local/share/examples/gns3/baseconfig.txt %buildroot/%_datadir/%{name}/examples/ -%__mv %buildroot/usr/local/share/examples/gns3/baseconfig_sw.txt %buildroot/%_datadir/%{name}/examples/ -%__cp %SOURCE1 %buildroot/%_datadir/pixmaps -%__cp %SOURCE3 %buildroot/%_datadir/mime/packages/%{name}.xml -%__cp %SOURCE4 %buildroot/%_datadir/applications/ -%__cp %SOURCE5 %buildroot/%_datadir/icons/hicolor/48x48/mimetypes/application-x-%{name}.png -%__cp docs/man/gns3.1 %buildroot/%_mandir/man1/ -%if %{undefined fedora} -%suse_update_desktop_file %{name} -%fdupes %{buildroot}/%{python_sitelib} -%endif -%__rm -rf %buildroot/usr/local/share/* -chmod -x CHANGELOG README TODO AUTHORS -chmod -x %buildroot/%{_mandir}/man1/* -chmod -x %buildroot/%_datadir/%{name}/examples/* -dos2unix README - -#make rpmlint happy -chmod +x %{buildroot}/%{_datadir}/%{name}/qemuwrapper/qemuwrapper.py -chmod +x %{buildroot}/%{_libexecdir}/%{name}/vboxcontroller_4_1.py -chmod +x %{buildroot}/%{_datadir}/%{name}/vboxcontroller_4_1.py -chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/portTracker_lib.py -chmod +x %{buildroot}/%{_datadir}/%{name}/qemuwrapper/make-qemuwrapper-exe.py -chmod +x %{buildroot}/%{python_sitelib}/GNS3/Export/ExportPDF.py -chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/dynamips_lib.py -chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/console.py -chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/dynagen.py -chmod +x %{buildroot}/%{_libexecdir}/%{name}/vboxwrapper.py -chmod +x %{buildroot}/%{_datadir}/%{name}/vboxwrapper.py -chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/qemu_lib.py -chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/dynagen_vbox_lib.py -chmod +x %{buildroot}/%{_datadir}/%{name}/tcp_pipe_proxy.py -chmod +x %{buildroot}/%{_libexecdir}/%{name}/qemuwrapper.py -chmod +x %{buildroot}/%{_datadir}/%{name}/qemuwrapper.py -chmod +x %{buildroot}/%{python_sitelib}/GNS3/Dynagen/confConsole.py +python3 setup.py install --root=%{buildroot} --prefix=%{_prefix} +chmod +x %{buildroot}/%{python3_sitelib}/%{name}/main.py +find %{buildroot}/%{python3_sitelib}/%{name} -name "*.ui" -exec chmod -x {} \; + +mkdir -p %buildroot/%{_datadir}/pixmaps +mkdir -p %buildroot/%{_datadir}/mime/packages +mkdir -p %buildroot/%{_datadir}/applications +mkdir -p %buildroot/%{_datadir}/icons/hicolor/48x48/mimetypes +%__cp %SOURCE1 %buildroot/%{_datadir}/pixmaps +%__cp %SOURCE2 %buildroot/%{_datadir}/mime/packages/ +%__cp %SOURCE3 %buildroot/%{_datadir}/applications/ +%__cp %SOURCE4 %buildroot/%{_datadir}/icons/hicolor/48x48/mimetypes/ %post -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +/usr/bin/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : /usr/bin/update-desktop-database %postun -/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || : +/usr/bin/update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : /usr/bin/update-desktop-database %files %defattr(-, root, root, 0755) -%doc CHANGELOG README TODO AUTHORS GNS3-0.5-tutorial.pdf +%doc AUTHORS LICENSE README.rst %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png -%{_datadir}/%{name} +%dir %{_datadir}/icons/hicolor +%dir %{_datadir}/icons/hicolor/48x48 +%dir %{_datadir}/icons/hicolor/48x48/mimetypes %{_datadir}/icons/hicolor/48x48/mimetypes/application-x-%{name}.png %{_datadir}/mime/packages/%{name}.xml -%{_mandir}/man1/* -%dir %_libexecdir/%{name} -%_libexecdir/%{name}/* -%dir %{python_sitelib}/GNS3 -%{python_sitelib}/GNS3/* -%{python_sitelib}/GNS3-%{version}-py%{py_ver}.egg-info +%{_datadir}/pixmaps/%{name}.png +%{python3_sitelib}/%{name} +%{python3_sitelib}/%{name}_gui-%{version}-py%{py3_ver}.egg-info +# to be soon removed +%{python3_sitelib}/tests %changelog ++++++ application-x-gns3.png ++++++ Files /var/tmp/diff_new_pack.xItvI3/_old and /var/tmp/diff_new_pack.xItvI3/_new differ ++++++ gns3.png ++++++ Files /var/tmp/diff_new_pack.xItvI3/_old and /var/tmp/diff_new_pack.xItvI3/_new differ ++++++ gns3.xml ++++++ --- /var/tmp/diff_new_pack.xItvI3/_old 2014-11-28 08:48:34.000000000 +0100 +++ /var/tmp/diff_new_pack.xItvI3/_new 2014-11-28 08:48:34.000000000 +0100 @@ -2,7 +2,7 @@ <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> <mime-type type="application/x-gns3"> <comment>GNS3 Project</comment> - <glob pattern="*.net"/> + <glob pattern="*.gns3"/> <sub-class-of type="application/xml"/> </mime-type> </mime-info> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit autoyast2 for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package autoyast2 for openSUSE:Factory checked in at 2014-11-28 08:47:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/autoyast2 (Old) and /work/SRC/openSUSE:Factory/.autoyast2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "autoyast2" Changes: -------- --- /work/SRC/openSUSE:Factory/autoyast2/autoyast2.changes 2014-10-15 16:26:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.autoyast2.new/autoyast2.changes 2014-11-28 08:47:18.000000000 +0100 @@ -1,0 +2,14 @@ +Wed Nov 26 17:02:27 CET 2014 - schubi(a)suse.de + +- Fixed too small dialog for autoyast profile location. + (bnc#897321) +- 3.1.68 + +------------------------------------------------------------------- +Tue Nov 25 10:33:04 UTC 2014 - schubi(a)suse.com + +- Fixed UI in partition configuration. + (bnc#901904; bnc#901739) +- 3.1.67 + +------------------------------------------------------------------- Old: ---- autoyast2-3.1.66.tar.bz2 New: ---- autoyast2-3.1.68.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ autoyast2.spec ++++++ --- /var/tmp/diff_new_pack.iWQ6j4/_old 2014-11-28 08:47:19.000000000 +0100 +++ /var/tmp/diff_new_pack.iWQ6j4/_new 2014-11-28 08:47:19.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.66 +Version: 3.1.68 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ autoyast2-3.1.66.tar.bz2 -> autoyast2-3.1.68.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/.travis.yml new/autoyast2-3.1.68/.travis.yml --- old/autoyast2-3.1.66/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.68/.travis.yml 2014-11-27 14:39:10.000000000 +0100 @@ -0,0 +1,16 @@ +language: cpp +compiler: + - gcc +before_install: + # disable rvm, use system Ruby + - rvm reset + - wget https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/tr… + - sh ./travis_setup.sh -p "rake yast2-devtools yast2-testsuite yast2 yast2-storage yast2-xml yast2-transfer yast2-services-manager yast2-installation-control" -g "rspec:2.14.1 yast-rake gettext" +script: + - rake check:syntax + - rake check:pot + - make -f Makefile.cvs + - make + - sudo make install + - make check + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/MAINTAINER new/autoyast2-3.1.68/MAINTAINER --- old/autoyast2-3.1.66/MAINTAINER 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/MAINTAINER 2014-11-27 14:39:10.000000000 +0100 @@ -1 +1 @@ -AutoYaST Maintainers <autoyast-maintainers(a)suse.de> +Deprecated file. Use `osc maintainer autoyast2` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/README.md new/autoyast2-3.1.68/README.md --- old/autoyast2-3.1.66/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/autoyast2-3.1.68/README.md 2014-11-27 14:39:10.000000000 +0100 @@ -0,0 +1,5 @@ +# YaST - The AutoYaST Framework # + +[![Travis Build](https://travis-ci.org/yast/yast-autoinstallation.svg?branch=master)]… +[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-autoinsta… + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/package/autoyast2.changes new/autoyast2-3.1.68/package/autoyast2.changes --- old/autoyast2-3.1.66/package/autoyast2.changes 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/package/autoyast2.changes 2014-11-27 14:39:10.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Nov 26 17:02:27 CET 2014 - schubi(a)suse.de + +- Fixed too small dialog for autoyast profile location. + (bnc#897321) +- 3.1.68 + +------------------------------------------------------------------- +Tue Nov 25 10:33:04 UTC 2014 - schubi(a)suse.com + +- Fixed UI in partition configuration. + (bnc#901904; bnc#901739) +- 3.1.67 + +------------------------------------------------------------------- Mon Oct 13 16:32:53 UTC 2014 - lslezak(a)suse.cz - Fixed "No base product found" error when evaluating diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/package/autoyast2.spec new/autoyast2-3.1.68/package/autoyast2.spec --- old/autoyast2-3.1.66/package/autoyast2.spec 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/package/autoyast2.spec 2014-11-27 14:39:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: autoyast2 -Version: 3.1.66 +Version: 3.1.68 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/src/include/autoinstall/PartitionDialog.rb new/autoyast2-3.1.68/src/include/autoinstall/PartitionDialog.rb --- old/autoyast2-3.1.66/src/include/autoinstall/PartitionDialog.rb 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/src/include/autoinstall/PartitionDialog.rb 2014-11-27 14:39:10.000000000 +0100 @@ -377,6 +377,7 @@ end def PartitionCheck + unchangedPartition = @currentPartition @currentPartition = updatePartitionDialogData(@currentPartition) Builtins.y2milestone( "PartitionCheck():\n" + @@ -386,9 +387,8 @@ @driveId, @partitionIdx ) - storedPartition = PartitionLoad(@driveId, @partitionIdx) - if !AutoinstPartition.areEqual(@currentPartition, storedPartition) || @dirty + if !AutoinstPartition.areEqual(@currentPartition, unchangedPartition) || @dirty if Popup.YesNo(_("Store unsaved changes to partition?")) @dirty = false if PartitionCheckSanity(@currentPartition) @@ -536,6 +536,9 @@ ) updatePartitionDialogGUI + # Setting currentPartition to some default entries made by + # the UI design. + @currentPartition = updatePartitionDialogData(@currentPartition) nil end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/src/include/autoinstall/autoinst_dialogs.rb new/autoyast2-3.1.68/src/include/autoinstall/autoinst_dialogs.rb --- old/autoyast2-3.1.66/src/include/autoinstall/autoinst_dialogs.rb 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/src/include/autoinstall/autoinst_dialogs.rb 2014-11-27 14:39:10.000000000 +0100 @@ -32,16 +32,18 @@ UI.OpenDialog( Opt(:decorated), HBox( - HWeight(50, RichText(helptext)), + HWeight(30, RichText(helptext)), HStretch(), HSpacing(1), HWeight( - 50, + 70, VBox( Heading(title), VSpacing(1), VStretch(), - Left(TextEntry(Id(:uri), _("&Profile Location:"), original)), + MinWidth(60, + Left(TextEntry(Id(:uri), _("&Profile Location:"), original)) + ), VSpacing(1), VStretch(), HBox( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/src/modules/AutoinstPartPlan.rb new/autoyast2-3.1.68/src/modules/AutoinstPartPlan.rb --- old/autoyast2-3.1.66/src/modules/AutoinstPartPlan.rb 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/src/modules/AutoinstPartPlan.rb 2014-11-27 14:39:10.000000000 +0100 @@ -680,26 +680,33 @@ def Summary summary = "" summary = Summary.AddHeader(summary, _("Drives")) - num = Builtins.size(@AutoPartPlan) - summary = Summary.AddLine( - summary, - Builtins.sformat(_("Total of %1 drive"), num) - ) - summary = Summary.OpenList(summary) - Builtins.foreach(@AutoPartPlan) do |drive| - driveDesc = AutoinstDrive.getNodeName(drive, true) - summary = Summary.AddListItem(summary, driveDesc) + unless @AutoPartPlan.empty? + # We are counting harddisks only (type CT_DISK) + num = @AutoPartPlan.count{|drive| drive["type"] == :CT_DISK } + summary = Summary.AddLine( + summary, + (n_("%s drive in total", "%s drives in total", num) % num) + ) summary = Summary.OpenList(summary) - Builtins.foreach(Ops.get_list(drive, "partitions", [])) do |part| - summary = Summary.AddListItem( - summary, - AutoinstPartition.getPartitionDescription(part, true) - ) + Builtins.foreach(@AutoPartPlan) do |drive| + driveDesc = AutoinstDrive.getNodeName(drive, true) + summary = Summary.AddListItem(summary, driveDesc) + summary = Summary.OpenList(summary) + Builtins.foreach(Ops.get_list(drive, "partitions", [])) do |part| + summary = Summary.AddListItem( + summary, + AutoinstPartition.getPartitionDescription(part, true) + ) + end + summary = Summary.CloseList(summary) + summary = Summary.AddNewLine(summary) end summary = Summary.CloseList(summary) - summary = Summary.AddNewLine(summary) + else + summary = Summary.AddLine( summary, + _("Not yet cloned.") + ) end - summary = Summary.CloseList(summary) summary end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/src/modules/AutoinstPartition.rb new/autoyast2-3.1.68/src/modules/AutoinstPartition.rb --- old/autoyast2-3.1.66/src/modules/AutoinstPartition.rb 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/src/modules/AutoinstPartition.rb 2014-11-27 14:39:10.000000000 +0100 @@ -20,6 +20,7 @@ Yast.import "AutoinstCommon" Yast.import "Partitions" Yast.import "FileSystems" + Yast.import "Storage" textdomain "autoinst" @@ -121,33 +122,32 @@ p = deep_copy(p) part_desc = Ops.get_string(p, "mount", "") if "" == part_desc - part_desc = Ops.get_string(p, "lvm_group", "") - if enableHTML - part_desc = Builtins.sformat( - "Physical volume for volume group <%1>", - part_desc - ) + if p["lvm_group"] && !p["lvm_group"].empty? + part_desc = p["lvm_group"] + if enableHTML + part_desc = "Physical volume for volume group <#{part_desc}>" + else + part_desc = "<#{part_desc}>" + end else - part_desc = Builtins.sformat("<%1>", part_desc) + part_desc = "Physical volume" end else if enableHTML - part_desc = Builtins.sformat("%1 Partition", part_desc) + part_desc = Builtins.sformat("%1 partition", part_desc) end end if Ops.get_boolean(p, "create", false) - part_desc = Builtins.sformat( - "%1 with %2", - part_desc, - Ops.get_string(p, "size", "") - ) + if p["size"] && !p["size"].empty? + part_desc += " with #{Storage.ByteToHumanString(p["size"].to_i)}" + end else if Ops.get_boolean(p, "resize", false) part_desc = Builtins.sformat( "%1 resize part.%2 to %3", part_desc, Ops.get_integer(p, "partition_nr", 999), - Ops.get_string(p, "size", "") + Storage.ByteToHumanString(p["size"].to_i) ) else part_desc = Builtins.sformat( @@ -258,6 +258,11 @@ Ops.get_symbol(part, "filesystem", :Empty) ) newPart = set(newPart, "format", true) + elsif Mode.config + # We are in the autoyast configuration mode. So if the parsed + # system partitions do not have a filesystem entry (E.G. Raids) + # we are not using the default entry (Partitions.DefaultFs). + newPart["filesystem"] = :Empty end if Ops.get_boolean(newPart, "format", false) && !Builtins.isempty(Ops.get_string(part, "mkfs_options", "")) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/autoyast2-3.1.66/test/AutoInstallRules_test.rb new/autoyast2-3.1.68/test/AutoInstallRules_test.rb --- old/autoyast2-3.1.66/test/AutoInstallRules_test.rb 2014-10-13 21:39:09.000000000 +0200 +++ new/autoyast2-3.1.68/test/AutoInstallRules_test.rb 2014-11-27 14:39:10.000000000 +0100 @@ -74,6 +74,7 @@ it "reads installed product properties from content file" do expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".probe.bios")).and_return([]) expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".probe.memory")).and_return([]) + expect(Yast::Arch).to receive(:architecture).and_return("x86_64") expect(Yast::Kernel).to receive(:GetPackages).and_return([]) expect(Yast::SCR).to receive(:Execute).with(Yast::Path.new(".target.bash_output"), "/bin/hostname") expect(Yast::SCR).to receive(:Read).with(Yast::Path.new(".etc.install_inf.Domain")) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit digikam for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package digikam for openSUSE:Factory checked in at 2014-11-28 08:47:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/digikam (Old) and /work/SRC/openSUSE:Factory/.digikam.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "digikam" Changes: -------- --- /work/SRC/openSUSE:Factory/digikam/digikam.changes 2014-11-14 09:18:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.digikam.new/digikam.changes 2014-11-28 08:47:16.000000000 +0100 @@ -1,0 +2,44 @@ +Wed Nov 26 10:44:01 UTC 2014 - nico.kruber(a)gmail.com + +- add obsoletes for libkface2 and libkgeomap1 + +------------------------------------------------------------------- +Sat Nov 22 01:41:03 UTC 2014 - nico.kruber(a)gmail.com + +- add digikam-4.5.0-reenable-libs.patch to use some internal + libraries not yet available as extra packages + (libkface, libkgeomap, libmediawiki) + +------------------------------------------------------------------- +Wed Nov 19 19:38:13 UTC 2014 - adrian(a)suse.de + +- update to 4.5.0 + kde#172295 digiKam has a hard dependency on Jasper library + kde#267789 Make face detection (kface) and geo tagging (kmap) optional features + kde#306767 ICONVIEW : thumb focus is lost after renaming + kde#315574 CORE : bad performance when Tag-related Sidebars (Tag management / Filter) are open + kde#326718 Clear text button on file rename does nothing + kde#326945 When build digikam from git and package libpgf is installed, no way to use internal digikam libpgf + kde#337422 EXIF thumbnail date information not updated when writing metadata to image + kde#337737 MYSQL : settings and installation windows freeze when valid mariadb/mysql db connection is available + kde#338407 Import not showing image thumbnails for certain Canon cameras + kde#339154 digiKam goes into infinite loop when working with tags/captions information tab templates + kde#339180 cmake and/or compiler pick up libkgeomap header files from previous version + kde#339524 Identity class miss d private container to improve binary compatibility + kde#339806 Compiler error: ambiguous reference to ratio variable + kde#339903 Select 'recent' albums containing MOV or .xcf(Gimp) files. Immediate crash occurs. + kde#340030 KIPI-plugins can not be deactivated on non-English locales + kde#340141 White Balance: Unable to specify exposure compensation > x.5 + kde#340186 GROUP : Wallet icon for grouped photos is conceptually confusing + kde#340295 make fails on imagedescedittab.cpp has no member named 'textEdit' + kde#340439 No auto-rotation/flip Images after download + kde#340443 Advanced slideshow shows not all pictures under certain conditions + kde#340487 Add Album Category as a search criteria + kde#340581 Ratings with rating == 0 cannot be selected on the left sidebar + kde#340476 Floating Cards brings digiKam with non-English locales to crash and missing parameter text + kde#340811 Wrap album caption +- remove upstream patches: + - kde#89156.patch + - digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch + +------------------------------------------------------------------- Old: ---- digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch digikam-4.4.0.tar.bz2 kde#89156.patch New: ---- digikam-4.5.0-reenable-libs.patch digikam-4.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ digikam.spec ++++++ --- /var/tmp/diff_new_pack.LgqWGW/_old 2014-11-28 08:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.LgqWGW/_new 2014-11-28 08:47:18.000000000 +0100 @@ -17,9 +17,9 @@ Name: digikam -Version: 4.4.0 +Version: 4.5.0 Release: 0 -%define rversion 4.4.0 +%define rversion 4.5.0 Summary: A KDE Photo Manager License: GPL-2.0+ Group: Productivity/Graphics/Viewers @@ -33,10 +33,8 @@ Patch5: digikam_no_build_vkontakte.diff # PATCH-FIX-UPSTREAM digikam-4.4.0.no-kdcraw.version-check.patch -- version check for libkdcraw currently broken Patch6: digikam-4.4.0.no-kdcraw.version-check.patch -# PATCH-FIX-UPSTREAM digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch -- fix libkexiv2 version for AltLangStrEdit::textEdit() -Patch7: digikam-4.4.0-fix-libkexiv2-version-for-AltLangStrEdit-textEdit.patch -# PATCH-FIX-UPSTREAM kde#89156.patch -- avoid deadlocks with external MySQL/MariaDB, kde#89156 -Patch8: kde#89156.patch +# PATCH-FIX-OPENSUSE digikam-4.5.0-reenable-libs.patch nkruber(a)gmail.com -- use some of the internal libraries (libkface, libkgeomap, libmediawiki) +Patch7: digikam-4.5.0-reenable-libs.patch BuildRequires: ImageMagick-devel BuildRequires: bison BuildRequires: boost-devel @@ -164,12 +162,12 @@ Summary: Development files for libkgeomap License: GPL-2.0+ Group: Development/Libraries/KDE -Requires: libkgeomap1 = %{version} +Requires: libkgeomap2 = %{version} %description -n libkgeomap-devel This package contains development files for libkgeomap. -%package -n libkgeomap1 +%package -n libkgeomap2 Summary: World-Map Library interface for KDE License: GPL-2.0+ Group: System/Libraries @@ -178,8 +176,10 @@ # libkgeomap was last used at openSUSE 12.1 (version 2.2.0) Provides: libkgeomap = %{version} Obsoletes: libkgeomap < %{version} +# libkgeomap1 was last used at openSUSE 13.2 (version 4.4.0) +Obsoletes: libkgeomap1 -%description -n libkgeomap1 +%description -n libkgeomap2 Libkgeomap is a wrapper around different world-map components, to browse and arrange photos over a map. Currently supported map engine are: @@ -192,17 +192,19 @@ Summary: Development files for libkface License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT Group: Development/Libraries/KDE -Requires: libkface2 = %{version} +Requires: libkface3 = %{version} %description -n libkface-devel This package contains development files for libkface. -%package -n libkface2 +%package -n libkface3 Summary: Wrapper around LibFace to perform face recognition and detection over pictures License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT Group: System/Libraries +# libkface2 was last used at openSUSE 13.2 (version 4.4.0) +Obsoletes: libkface2 -%description -n libkface2 +%description -n libkface3 Libkface is a Qt/C++ wrapper around LibFace to perform face recognition and detection over pictures. @@ -242,8 +244,7 @@ %patch3 %patch5 %patch6 -p1 -%patch7 -d core -p1 -%patch8 -p1 +%patch7 -p1 # Remove build time references so build-compare can do its work FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y') @@ -326,13 +327,13 @@ %postun -n kipi-plugins -p /sbin/ldconfig -%post -n libkgeomap1 -p /sbin/ldconfig +%post -n libkgeomap2 -p /sbin/ldconfig -%postun -n libkgeomap1 -p /sbin/ldconfig +%postun -n libkgeomap2 -p /sbin/ldconfig -%post -n libkface2 -p /sbin/ldconfig +%post -n libkface3 -p /sbin/ldconfig -%postun -n libkface2 -p /sbin/ldconfig +%postun -n libkface3 -p /sbin/ldconfig %post -n libmediawiki1 -p /sbin/ldconfig @@ -340,7 +341,7 @@ %files %defattr(-,root,root,-) -%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README,TODO,TODO.FACE,TODO.MYSQLPORT,TODO.TABLEVIEW} +%doc core/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,ChangeLog,NEWS,README} %{_kde4_applicationsdir}/digikam.desktop %{_kde4_applicationsdir}/showfoto.desktop %{_kde4_appsdir}/digikam/ @@ -438,7 +439,7 @@ %files -n libkgeomap-devel %defattr(-,root,root,-) -%doc extra/libkgeomap/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO,kmap2kgeomap-TODO.txt} +%doc extra/libkgeomap/{AUTHORS,COPYING,COPYING-CMAKE-SCRIPTS,COPYING.LIB,README,TODO} %{_kde4_appsdir}/cmake/modules/FindKGeoMap.cmake %{_kde4_includedir}/libkgeomap/ %{_kde4_libdir}/pkgconfig/libkgeomap.pc @@ -447,15 +448,15 @@ %files -n libkgeomap-lang -f libkgeomap.lang %defattr(-,root,root,-) -%files -n libkgeomap1 +%files -n libkgeomap2 %defattr(-,root,root,-) %{_kde4_appsdir}/libkgeomap/ -%{_kde4_libdir}/libkgeomap.so.1* +%{_kde4_libdir}/libkgeomap.so.2* -%files -n libkface2 +%files -n libkface3 %defattr(-,root,root,-) %{_kde4_appsdir}/libkface -%{_kde4_libdir}/libkface.so.2* +%{_kde4_libdir}/libkface.so.3* %files -n libkface-devel %defattr(-,root,root,-) @@ -463,7 +464,8 @@ %{_kde4_libdir}/libkface.so %{_kde4_includedir}/libkface/ %{_kde4_libdir}/pkgconfig/libkface.pc -%{_kde4_appsdir}/cmake/modules/FindKface.cmake +%dir %{_kde4_libdir}/cmake/Kface-3.5.0/ +%{_kde4_libdir}/cmake/Kface-3.5.0/*.cmake %files -n libmediawiki1 %defattr(-,root,root,-) ++++++ digikam-4.4.0.no-kdcraw.version-check.patch ++++++ --- /var/tmp/diff_new_pack.LgqWGW/_old 2014-11-28 08:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.LgqWGW/_new 2014-11-28 08:47:18.000000000 +0100 @@ -1,80 +1,50 @@ -diff -U 3 -H -d -r -N -- digikam-4.4.0.orig/core/CMakeLists.txt digikam-4.4.0/core/CMakeLists.txt ---- digikam-4.4.0.orig/core/CMakeLists.txt 2014-10-08 14:32:43.000000000 +0200 -+++ digikam-4.4.0/core/CMakeLists.txt 2014-10-12 15:05:05.917642046 +0200 -@@ -115,21 +115,23 @@ - - # check the libkdcraw version - -+# Check is done by FindKdcraw.cmake in another way - this way does not seem valid any more -+# TODO: find a proper fix - SET(KDCRAW_MIN_VERSION "2.2.0") - --IF (KDCRAW_VERSION) -- -- MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})") -- IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) -- SET(KDCRAW_FOUND FALSE) -- ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) -- --ELSE (KDCRAW_VERSION) -- -- MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.") -- SET(KDCRAW_FOUND FALSE) -- --ENDIF (KDCRAW_VERSION) -+# IF (KDCRAW_VERSION) -+# -+# MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})") -+# IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) -+# SET(KDCRAW_FOUND FALSE) -+# ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) -+# -+# ELSE (KDCRAW_VERSION) -+# -+# MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.") -+# SET(KDCRAW_FOUND FALSE) -+# -+# ENDIF (KDCRAW_VERSION) - - # LCMS version 1 and 2 library handling - # See bug #294105 -diff -U 3 -H -d -r -N -- digikam-4.4.0.orig/extra/kipi-plugins/CMakeLists.txt digikam-4.4.0/extra/kipi-plugins/CMakeLists.txt ---- digikam-4.4.0.orig/extra/kipi-plugins/CMakeLists.txt 2014-10-08 14:33:05.000000000 +0200 -+++ digikam-4.4.0/extra/kipi-plugins/CMakeLists.txt 2014-10-12 15:05:05.917642046 +0200 -@@ -64,21 +64,23 @@ - - # Check the libkdcraw version - -+# Check is done by FindKdcraw.cmake in another way - this way does not seem valid any more -+# TODO: find a proper fix - SET(KDCRAW_MIN_VERSION "2.2.0") - --IF (KDCRAW_VERSION) -- -- MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})") -- IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) -- SET(KDCRAW_FOUND FALSE) -- ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) -- --ELSE (KDCRAW_VERSION) -- -- MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.") -- SET(KDCRAW_FOUND FALSE) -- --ENDIF (KDCRAW_VERSION) -+# IF (KDCRAW_VERSION) -+# -+# MESSAGE(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})") -+# IF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) -+# SET(KDCRAW_FOUND FALSE) -+# ENDIF (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) -+# -+# ELSE (KDCRAW_VERSION) -+# -+# MESSAGE(WARNING "libkdcraw: Version information not found, your version is probably too old.") -+# SET(KDCRAW_FOUND FALSE) -+# -+# ENDIF (KDCRAW_VERSION) +Index: digikam-4.5.0/core/CMakeLists.txt +=================================================================== +--- digikam-4.5.0.orig/core/CMakeLists.txt ++++ digikam-4.5.0/core/CMakeLists.txt +@@ -125,20 +125,6 @@ DETECT_OPENCV(${OPENCV_MIN_VERSION} cor - # Optional dependencies detection required by some plugins - MACRO_OPTIONAL_FIND_PACKAGE(EXPAT) # For DNGConverter: XMP SDK need Expat library to compile. + set(KDCRAW_MIN_VERSION "2.2.0") + +-if(KDCRAW_VERSION) +- +- message(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})") +- if(${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) +- set(KDCRAW_FOUND FALSE) +- endif() +- +-else() +- +- message(WARNING "libkdcraw: Version information not found, your version is probably too old.") +- set(KDCRAW_FOUND FALSE) +- +-endif() +- + # -- check the libkgeomap version ----------------------------------------------------------------- + + set(KGEOMAP_MIN_VERSION "3.0.0") +Index: digikam-4.5.0/extra/kipi-plugins/CMakeLists.txt +=================================================================== +--- digikam-4.5.0.orig/extra/kipi-plugins/CMakeLists.txt ++++ digikam-4.5.0/extra/kipi-plugins/CMakeLists.txt +@@ -75,20 +75,6 @@ if(KIPI_FOUND) + + set(KDCRAW_MIN_VERSION "2.2.0") + +- if(KDCRAW_VERSION) +- +- message(STATUS "libkdcraw: Found version ${KDCRAW_VERSION} (required: ${KDCRAW_MIN_VERSION})") +- if (${KDCRAW_VERSION} VERSION_LESS ${KDCRAW_MIN_VERSION}) +- set(KDCRAW_FOUND FALSE) +- endif() +- +- else() +- +- message(WARNING "libkdcraw: Version information not found, your version is probably too old.") +- set(KDCRAW_FOUND FALSE) +- +- endif() +- + # -- Optional dependencies detection required by some plugins ------------------------------------- + + MACRO_OPTIONAL_FIND_PACKAGE(EXPAT) # For DNGConverter: XMP SDK need Expat library to compile. ++++++ digikam-4.5.0-reenable-libs.patch ++++++ diff -U 3 -H -d -r -N -- digikam-4.5.0/CMakeLists.txt digikam-4.5.0.reenable-libs/CMakeLists.txt --- digikam-4.5.0/CMakeLists.txt 2014-11-22 02:32:49.000000000 +0100 +++ digikam-4.5.0.reenable-libs/CMakeLists.txt 2014-11-22 02:35:30.463073062 +0100 @@ -137,13 +137,13 @@ set(KIPI_LOCAL_DIR extra/libkipi) set(KEXIV2_LOCAL_DIR extra/libkexiv2) set(KDCRAW_LOCAL_DIR extra/libkdcraw) - set(KFACE_LOCAL_DIR extra/libkface) set(KSANE_LOCAL_DIR extra/libksane) #from extragear/libs - set(KGEOMAP_LOCAL_DIR extra/libkgeomap) - set(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) endif() +set(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) +set(KGEOMAP_LOCAL_DIR extra/libkgeomap) +set(KFACE_LOCAL_DIR extra/libkface) add_subdirectory(extra) add_subdirectory(core) diff -U 3 -H -d -r -N -- digikam-4.5.0/extra/CMakeLists.txt digikam-4.5.0.reenable-libs/extra/CMakeLists.txt --- digikam-4.5.0/extra/CMakeLists.txt 2014-11-22 02:35:41.679078762 +0100 +++ digikam-4.5.0.reenable-libs/extra/CMakeLists.txt 2014-11-22 02:36:00.840088484 +0100 @@ -13,13 +13,14 @@ add_subdirectory(libkipi) add_subdirectory(libkexiv2) add_subdirectory(libkdcraw) - add_subdirectory(libkface) MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane) # from extragear/libs - add_subdirectory(libkgeomap) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) endif() +MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) + +add_subdirectory(libkgeomap) +add_subdirectory(libkface) add_subdirectory(kipi-plugins) ++++++ digikam-4.4.0.tar.bz2 -> digikam-4.5.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/digikam/digikam-4.4.0.tar.bz2 /work/SRC/openSUSE:Factory/.digikam.new/digikam-4.5.0.tar.bz2 differ: char 11, line 1 ++++++ digikam_no_build_vkontakte.diff ++++++ --- /var/tmp/diff_new_pack.LgqWGW/_old 2014-11-28 08:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.LgqWGW/_new 2014-11-28 08:47:18.000000000 +0100 @@ -2,31 +2,31 @@ =================================================================== --- CMakeLists.txt.orig +++ CMakeLists.txt -@@ -134,7 +134,6 @@ SET(CMAKE_MODULE_PATH - ${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules - ${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules - ${CMAKE_SOURCE_DIR}/extra/libkface/cmake/modules -- ${CMAKE_SOURCE_DIR}/extra/libkvkontakte/cmake/modules - ${CMAKE_SOURCE_DIR}/cmake/modules - ${CMAKE_MODULE_PATH} - ) -@@ -149,7 +148,6 @@ ENDIF() - SET(KFACE_LOCAL_DIR extra/libkface) - SET(KGEOMAP_LOCAL_DIR extra/libkgeomap) - SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) --SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) +@@ -128,7 +128,6 @@ endif() + set(CMAKE_MODULE_PATH + ${CMAKE_SOURCE_DIR}/extra/libkgeomap/cmake/modules + ${CMAKE_SOURCE_DIR}/extra/libmediawiki/cmake/modules +- ${CMAKE_SOURCE_DIR}/extra/libkvkontakte/cmake/modules + ${CMAKE_SOURCE_DIR}/cmake/modules + ${CMAKE_MODULE_PATH} + ) +@@ -144,7 +143,6 @@ if(ENABLE_PRIVATE_SHAREDLIBS) + #from extragear/libs + set(KGEOMAP_LOCAL_DIR extra/libkgeomap) + set(MEDIAWIKI_LOCAL_DIR extra/libmediawiki) +- set(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte) + endif() - ADD_SUBDIRECTORY(extra) - ADD_SUBDIRECTORY(core) + add_subdirectory(extra) Index: extra/CMakeLists.txt =================================================================== --- extra/CMakeLists.txt.orig +++ extra/CMakeLists.txt -@@ -33,7 +33,6 @@ IF(${ENABLE_PRIVATE_KDEGRAPHICS}) - ENDIF() +@@ -19,7 +19,6 @@ if(${ENABLE_PRIVATE_SHAREDLIBS}) + # from extragear/libs + add_subdirectory(libkgeomap) + MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) +- MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte) - MACRO_OPTIONAL_ADD_SUBDIRECTORY(libmediawiki) --MACRO_OPTIONAL_ADD_SUBDIRECTORY(libkvkontakte) + endif() - ADD_SUBDIRECTORY(libkgeomap) - ADD_SUBDIRECTORY(libkface) ++++++ remove-gplv2-only.patch ++++++ --- /var/tmp/diff_new_pack.LgqWGW/_old 2014-11-28 08:47:18.000000000 +0100 +++ /var/tmp/diff_new_pack.LgqWGW/_new 2014-11-28 08:47:18.000000000 +0100 @@ -1,10 +1,12 @@ ---- extra/kipi-plugins/gpssync/CMakeLists.txt.orig 2014-08-05 16:19:57.369791501 +0200 -+++ extra/kipi-plugins/gpssync/CMakeLists.txt 2014-08-05 16:20:37.535336329 +0200 -@@ -37,7 +37,6 @@ - #ADD_DEFINITIONS(-DGPSSYNC_MODELTEST) - SET(kipiplugin_gpssync_PART_SRCS +Index: extra/kipi-plugins/gpssync/CMakeLists.txt +=================================================================== +--- extra/kipi-plugins/gpssync/CMakeLists.txt.orig ++++ extra/kipi-plugins/gpssync/CMakeLists.txt +@@ -43,7 +43,6 @@ if(KDE4_BUILD_TESTS) + #add_definitions(-DGPSSYNC_MODELTEST) + set(kipiplugin_gpssync_PART_SRCS ${kipiplugin_gpssync_PART_SRCS} - ${CMAKE_CURRENT_SOURCE_DIR}/borrowed/modeltest.cpp ) - ENDIF(KDE4_BUILD_TESTS) + endif() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit pm-utils for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package pm-utils for openSUSE:Factory checked in at 2014-11-28 08:47:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pm-utils (Old) and /work/SRC/openSUSE:Factory/.pm-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pm-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/pm-utils/pm-utils.changes 2014-07-21 10:35:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pm-utils.new/pm-utils.changes 2014-11-28 08:47:12.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 25 19:05:08 UTC 2014 - wbauer(a)tmo.at + +- Added fix-99Zgrub-resume.patch: fix removal of set boot entry on + resume in 99Zgrub (boo#856391) + +------------------------------------------------------------------- New: ---- fix-99Zgrub-resume.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pm-utils.spec ++++++ --- /var/tmp/diff_new_pack.e2whY3/_old 2014-11-28 08:47:13.000000000 +0100 +++ /var/tmp/diff_new_pack.e2whY3/_new 2014-11-28 08:47:13.000000000 +0100 @@ -33,6 +33,8 @@ Source0: %{name}-%{version}-suse-%{gitversion}.tar.bz2 # http://gitorious.org/opensuse/pm-utils Source1: http://pm-utils.freedesktop.org/releases/pm-quirks-20100316.tar.bz2 +# PATCH-FIX-OPENSUSE fix-99Zgrub-resume.patch boo#856391 wbauer(a)tmo.at -- fix removal of set boot entry on resume in 99Zgrub +Patch: fix-99Zgrub-resume.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # hooks requires some external tools @@ -67,6 +69,7 @@ %prep %setup -n %{name} -a 1 +%patch -p1 %build %{configure} \ ++++++ fix-99Zgrub-resume.patch ++++++ diff -ur pm-utils.orig/pm/sleep.d/99Zgrub pm-utils/pm/sleep.d/99Zgrub --- pm-utils.orig/pm/sleep.d/99Zgrub 2013-10-24 16:28:13.000000000 +0200 +++ pm-utils/pm/sleep.d/99Zgrub 2014-07-05 01:00:51.000000000 +0200 @@ -175,6 +175,7 @@ grub-once-restore() { echo "INFO: running grub-once-restore" + prepare-parameters rm -f "$GRUBDEFAULT" if [ -e "$GRUBDEFSAVE" ]; then echo " restoring original $GRUBDEFAULT" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit DirectFB for openSUSE:Factory
by root＠hilbert.suse.de 28 Nov '14

28 Nov '14

Hello community, here is the log from the commit of package DirectFB for openSUSE:Factory checked in at 2014-11-28 08:47:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/DirectFB (Old) and /work/SRC/openSUSE:Factory/.DirectFB.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "DirectFB" Changes: -------- --- /work/SRC/openSUSE:Factory/DirectFB/DirectFB.changes 2014-11-18 22:55:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.DirectFB.new/DirectFB.changes 2014-11-28 08:47:10.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 26 13:50:33 UTC 2014 - dimstar(a)opensuse.org + +- Update baselibs.conf: we build libdirectfb-1_7-6. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.7mPeXZ/_old 2014-11-28 08:47:11.000000000 +0100 +++ /var/tmp/diff_new_pack.7mPeXZ/_new 2014-11-28 08:47:11.000000000 +0100 @@ -1,4 +1,4 @@ -libdirectfb-1_7-5 +libdirectfb-1_7-6 DirectFB-devel requires -DirectFB-<targettype> - requires "libdirectfb-1_7-5-<targettype> = <version>" + requires "libdirectfb-1_7-6-<targettype> = <version>" -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0