September 2016 - openSUSE Commits - openSUSE Mailing Lists

commit argus for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package argus for openSUSE:Factory checked in at 2016-09-30 15:33:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/argus (Old) and /work/SRC/openSUSE:Factory/.argus.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "argus" Changes: -------- --- /work/SRC/openSUSE:Factory/argus/argus.changes 2015-09-08 17:44:40.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.argus.new/argus.changes 2016-09-30 15:33:25.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Sep 28 09:09:08 UTC 2016 - p.drouand(a)gmail.com + +- Update to version 3.0.8.2 + * Upstream doesn't publish a short changelog; please read the + ChangeLog file + +------------------------------------------------------------------- Old: ---- argus-3.0.8.1.tar.gz New: ---- argus-3.0.8.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ argus.spec ++++++ --- /var/tmp/diff_new_pack.BXN9o7/_old 2016-09-30 15:33:27.000000000 +0200 +++ /var/tmp/diff_new_pack.BXN9o7/_new 2016-09-30 15:33:27.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package argus # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,67 +17,67 @@ Name: argus -BuildRequires: bison -BuildRequires: flex -BuildRequires: libpcap-devel -BuildRequires: tcpd-devel -BuildRequires: tcsh +Version: 3.0.8.2 +Release: 0 Summary: Network Monitoring Tool License: GPL-2.0 and LGPL-2.1 and BSD-3-Clause and MIT Group: Productivity/Networking/Diagnostic -Version: 3.0.8.1 -Release: 0 Url: http://www.qosient.com/argus/ Source: http://qosient.com/argus/src/%{name}-%{version}.tar.gz Source3: README.SUSE Source4: argus_linux.8.gz Source5: argus.service Patch1: %{name}-3.0.6.1-libpcap.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: bison +BuildRequires: flex +BuildRequires: libpcap-devel BuildRequires: systemd-rpm-macros +BuildRequires: tcpd-devel +BuildRequires: tcsh +BuildRoot: %{_tmppath}/%{name}-%{version}-build %package server Summary: Daemon for Network Monitoring Tool Group: Productivity/Networking/Diagnostic Requires: argus +Provides: argus:%{_sbindir}/argus %{?systemd_requires} -Provides: argus:/usr/sbin/argus %description Argus is a network monitoring tool. -Documentation can be found in /usr/share/doc/packages/argus. +Documentation can be found in %{_docdir}/argus. %description server Daemon for Argus network monitoring tool. %prep -%setup -n argus-%{version} +%setup -q -n argus-%{version} %patch1 -p1 -cp %{S:3} . -cp %{S:4} man/man8/ +cp %{SOURCE3} . +cp %{SOURCE4} man/man8/ %build #autoreconf -fiv -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" +export CFLAGS="%{optflags} -fno-strict-aliasing" %configure --with-pic make %{?_smp_mflags} %install -install -d -m 755 $RPM_BUILD_ROOT{/etc,/usr/{sbin,bin,share/man},%{_docdir}} -install -m 700 bin/argus $RPM_BUILD_ROOT/usr/sbin/argus -install -m 700 bin/arg* $RPM_BUILD_ROOT/usr/bin/ +install -d -m 755 $RPM_BUILD_ROOT{/etc,%{_prefix}/{sbin,bin,share/man},%{_docdir}} +install -m 700 bin/argus %{buildroot}%{_sbindir}/argus +install -m 700 bin/arg* %{buildroot}%{_bindir}/ install -D -m 0644 %{SOURCE5} %{buildroot}/%{_unitdir}/argus.service # alread in sbin -rm -f $RPM_BUILD_ROOT/usr/bin/argus -rm -f $RPM_BUILD_ROOT/usr/bin/argus_linux +rm -f %{buildroot}%{_bindir}/argus +rm -f %{buildroot}%{_bindir}/argus_linux ( cd man - cp -a man* $RPM_BUILD_ROOT%{_mandir} - chmod a-x $RPM_BUILD_ROOT%{_mandir}/*/* ) -rm -f $RPM_BUILD_ROOT%{_mandir}/man1/tcpdump.1* + cp -a man* %{buildroot}%{_mandir} + chmod a-x %{buildroot}%{_mandir}/*/* ) +rm -f %{buildroot}%{_mandir}/man1/tcpdump.1* rm -rf `find -type f -name ._*` -install -m 600 support/Config/argus.conf $RPM_BUILD_ROOT/etc/argus.conf -install -m 755 support/Archive/argusarchive $RPM_BUILD_ROOT/usr/bin/ +install -m 600 support/Config/argus.conf %{buildroot}%{_sysconfdir}/argus.conf +install -m 755 support/Archive/argusarchive %{buildroot}%{_bindir}/ find support -type f -exec chmod 0644 {} \; #chmod a+x support/{Archive/argusarchive,Startup/argus,System/magic} chmod a+x support/{Archive/argusarchive,Startup/argus} @@ -101,8 +101,8 @@ %files server %defattr(-,root,root) %doc doc COPYING MANIFEST README.* support -%doc %{_mandir}/man*/* -%config /etc/argus.conf +%{_mandir}/man*/* +%config %{_sysconfdir}/argus.conf %{_unitdir}/argus.service %{_sbindir}/* ++++++ argus-3.0.8.1.tar.gz -> argus-3.0.8.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/ChangeLog new/argus-3.0.8.2/ChangeLog --- old/argus-3.0.8.1/ChangeLog 2015-04-17 14:14:48.000000000 +0200 +++ new/argus-3.0.8.2/ChangeLog 2016-06-01 18:26:00.000000000 +0200 @@ -1,3 +1,15 @@ +Mon Mar 21 14:08:52 EDT 2016 +Snap encapsulation header processing fixes + +Wed Jan 13 09:32:04 EST 2016 +ICMPv6 processing fixes + +Thu Oct 1 12:19:11 EDT 2015 +Mods for duplicate processing in TCP + +Mon Jun 29 16:16:11 EDT 2015 +Mods to remove use of ArgusLog(LOG_ERR, ...) in ArgusUdt.c + Fri Apr 17 08:11:43 EDT 2015 Modify outer header parsing to deal with GRE arp packets. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/MANIFEST new/argus-3.0.8.2/MANIFEST --- old/argus-3.0.8.1/MANIFEST 2015-04-17 14:15:21.000000000 +0200 +++ new/argus-3.0.8.2/MANIFEST 2016-06-01 20:31:25.000000000 +0200 @@ -19,299 +19,300 @@ * */ -Argus 3.0.8.1 distribution +Argus 3.0.8.2 distribution total 896 --r--r--r-- 1 carter staff 515 Apr 14 10:48 AUTHORS --r--r--r-- 1 carter staff 32477 Apr 14 10:32 COPYING --r--r--r-- 1 carter staff 6720 Apr 14 10:32 CREDITS --r--r--r-- 1 carter staff 8777 Apr 17 08:14 ChangeLog --r--r--r-- 1 carter staff 12570 Apr 14 10:32 INSTALL --rw-r--r-- 1 carter staff 13004 Apr 17 08:15 MANIFEST --r--r--r-- 1 carter staff 5054 Apr 14 10:32 Makefile.in --r--r--r-- 1 carter staff 3480 Apr 14 10:32 README --r--r--r-- 1 carter staff 8 Apr 14 10:32 VERSION --r--r--r-- 1 carter staff 609 Apr 14 10:32 aclocal.m4 --r--r--r-- 1 carter staff 52979 Apr 14 10:32 acsite.m4 -drwxr-xr-x 33 carter staff 1122 Apr 17 08:14 argus -drwxr-xr-x 4 carter staff 136 Apr 17 08:14 bin -drwxr-xr-x 9 carter staff 306 Apr 17 08:14 common -drwxr-xr-x 6 carter staff 204 Apr 14 10:32 config --r-xr-xr-x 1 carter staff 281305 Apr 14 10:45 configure --r--r--r-- 1 carter staff 10959 Apr 14 10:32 configure.ac -drwxr-xr-x 15 carter staff 510 Apr 14 10:52 debian -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 doc -drwxr-xr-x 7 carter staff 238 Apr 17 08:14 events -drwxr-xr-x 34 carter staff 1156 Apr 17 08:14 include -drwxr-xr-x 3 carter staff 102 Apr 17 08:14 lib -drwxr-xr-x 4 carter staff 136 Apr 14 10:32 man -drwxr-xr-x 5 carter staff 170 Apr 14 10:32 pkg -drwxr-xr-x 8 carter staff 272 Apr 14 10:32 support +-r--r--r-- 1 carter staff 515 Apr 14 2015 AUTHORS +-r--r--r-- 1 carter staff 32477 Apr 14 2015 COPYING +-r--r--r-- 1 carter staff 6720 Apr 14 2015 CREDITS +-r--r--r-- 1 carter staff 9060 Jun 1 12:26 ChangeLog +-r--r--r-- 1 carter staff 12570 Apr 14 2015 INSTALL +-r--r--r-- 1 carter staff 13066 Jun 1 14:31 MANIFEST +-r--r--r-- 1 carter staff 5054 Apr 14 2015 Makefile.in +-r--r--r-- 1 carter staff 3480 Apr 14 2015 README +-r--r--r-- 1 carter staff 8 Jun 1 12:26 VERSION +-r--r--r-- 1 carter staff 609 Apr 14 2015 aclocal.m4 +-r--r--r-- 1 carter staff 52979 Apr 14 2015 acsite.m4 +drwxr-xr-x 33 carter staff 1122 Jun 1 14:28 argus +drwxr-xr-x 4 carter staff 136 Jun 1 14:03 bin +drwxr-xr-x 9 carter staff 306 Jun 1 14:28 common +drwxr-xr-x 6 carter staff 204 Apr 14 2015 config +-rwxr-xr-x 1 carter staff 281305 Jun 1 14:29 configure +-r--r--r-- 1 carter staff 10959 Apr 14 2015 configure.ac +drwxr-xr-x 15 carter staff 510 Apr 14 2015 debian +drwxr-xr-x 3 carter staff 102 Apr 14 2015 doc +drwxr-xr-x 8 carter staff 272 Jun 1 14:28 events +drwxr-xr-x 34 carter staff 1156 Jun 1 14:28 include +drwxr-xr-x 3 carter staff 102 Jun 1 14:28 lib +drwxr-xr-x 4 carter staff 136 Apr 14 2015 man +drwxr-xr-x 5 carter staff 170 Apr 14 2015 pkg +drwxr-xr-x 8 carter staff 272 Apr 14 2015 support ./argus: -total 2048 --r--r--r-- 1 carter staff 9801 Apr 14 10:32 Argus802.11.c --r--r--r-- 1 carter staff 21312 Apr 14 10:32 ArgusApp.c --r--r--r-- 1 carter staff 9225 Apr 17 08:11 ArgusArp.c --r--r--r-- 1 carter staff 9373 Apr 14 10:32 ArgusAuth.c --r--r--r-- 1 carter staff 5201 Apr 14 10:32 ArgusEsp.c --r--r--r-- 1 carter staff 14156 Apr 14 10:32 ArgusEvents.c --r--r--r-- 1 carter staff 2762 Apr 14 10:32 ArgusEvents.h --r--r--r-- 1 carter staff 19495 Apr 14 10:32 ArgusFrag.c --r--r--r-- 1 carter staff 14837 Apr 14 10:32 ArgusIcmp.c --r--r--r-- 1 carter staff 4205 Apr 14 10:32 ArgusIgmp.c --r--r--r-- 1 carter staff 31630 Apr 14 10:32 ArgusIsis.c --r--r--r-- 1 carter staff 3288 Apr 14 10:32 ArgusLcp.c --r--r--r-- 1 carter staff 1573 Apr 14 10:32 ArgusMac.c --r--r--r-- 1 carter staff 174063 Apr 17 08:11 ArgusModeler.c --r--r--r-- 1 carter staff 27857 Apr 14 10:32 ArgusModeler.h --r--r--r-- 1 carter staff 85700 Apr 14 14:06 ArgusNetflow.c --r--r--r-- 1 carter staff 2255 Apr 14 10:32 ArgusNetflow.h --r--r--r-- 1 carter staff 67138 Apr 14 10:32 ArgusOutput.c --r--r--r-- 1 carter staff 6081 Apr 14 10:32 ArgusOutput.h --r--r--r-- 1 carter staff 46626 Apr 14 10:32 ArgusSflow.c --r--r--r-- 1 carter staff 1185 Apr 14 10:32 ArgusSflow.h --r--r--r-- 1 carter staff 152221 Apr 15 07:56 ArgusSource.c --r--r--r-- 1 carter staff 34985 Apr 14 10:32 ArgusSource.h --r--r--r-- 1 carter staff 40852 Apr 14 18:22 ArgusTcp.c --r--r--r-- 1 carter staff 2206 Apr 14 10:32 ArgusUdp.c --r--r--r-- 1 carter staff 29541 Apr 14 10:32 ArgusUdt.c --r--r--r-- 1 carter staff 81037 Apr 14 10:32 ArgusUtil.c --r--r--r-- 1 carter staff 12345 Apr 14 10:32 ArgusUtil.h --r--r--r-- 1 carter staff 3837 Apr 14 10:32 Makefile.in --r--r--r-- 1 carter staff 65906 Apr 14 10:32 argus.c --r--r--r-- 1 carter staff 3950 Apr 14 10:32 argus.h +total 2056 +-r--r--r-- 1 carter staff 9801 Apr 14 2015 Argus802.11.c +-r--r--r-- 1 carter staff 21537 Jun 29 2015 ArgusApp.c +-r--r--r-- 1 carter staff 9225 Apr 17 2015 ArgusArp.c +-r--r--r-- 1 carter staff 9373 Apr 14 2015 ArgusAuth.c +-r--r--r-- 1 carter staff 5201 Apr 14 2015 ArgusEsp.c +-rw-r--r-- 1 carter staff 14155 Jun 1 11:21 ArgusEvents.c +-r--r--r-- 1 carter staff 2762 Apr 14 2015 ArgusEvents.h +-r--r--r-- 1 carter staff 19495 Apr 14 2015 ArgusFrag.c +-r--r--r-- 1 carter staff 14838 Aug 5 2015 ArgusIcmp.c +-r--r--r-- 1 carter staff 4205 Apr 14 2015 ArgusIgmp.c +-r--r--r-- 1 carter staff 31630 Apr 14 2015 ArgusIsis.c +-r--r--r-- 1 carter staff 3288 Apr 14 2015 ArgusLcp.c +-r--r--r-- 1 carter staff 1573 Apr 14 2015 ArgusMac.c +-rw-r--r-- 1 carter staff 175781 Jun 1 13:27 ArgusModeler.c +-r--r--r-- 1 carter staff 28091 Jun 1 12:53 ArgusModeler.h +-rw-r--r-- 1 carter staff 85787 Jun 1 11:42 ArgusNetflow.c +-r--r--r-- 1 carter staff 2255 Apr 14 2015 ArgusNetflow.h +-rw-r--r-- 1 carter staff 67242 Jun 1 11:50 ArgusOutput.c +-r--r--r-- 1 carter staff 6081 Apr 14 2015 ArgusOutput.h +-r--r--r-- 1 carter staff 46626 Apr 14 2015 ArgusSflow.c +-r--r--r-- 1 carter staff 1185 Apr 14 2015 ArgusSflow.h +-r--r--r-- 1 carter staff 152326 Apr 5 12:00 ArgusSource.c +-r--r--r-- 1 carter staff 34985 Apr 14 2015 ArgusSource.h +-rw-r--r-- 1 carter staff 41321 Jun 1 12:06 ArgusTcp.c +-r--r--r-- 1 carter staff 2206 Apr 14 2015 ArgusUdp.c +-r--r--r-- 1 carter staff 29329 Jun 29 2015 ArgusUdt.c +-r--r--r-- 1 carter staff 81043 Aug 6 2015 ArgusUtil.c +-r--r--r-- 1 carter staff 12345 Apr 14 2015 ArgusUtil.h +-r--r--r-- 1 carter staff 3837 Apr 14 2015 Makefile.in +-r--r--r-- 1 carter staff 65847 Jul 2 2015 argus.c +-r--r--r-- 1 carter staff 3950 Apr 14 2015 argus.h ./bin: total 32 --r-xr-xr-x 1 carter staff 10073 Apr 14 10:32 argusbug --r-xr-xr-x 1 carter staff 2395 Apr 14 10:32 mkdep +-r-xr-xr-x 1 carter staff 10073 Apr 14 2015 argusbug +-r-xr-xr-x 1 carter staff 2395 Apr 14 2015 mkdep ./common: total 784 --r--r--r-- 1 carter staff 3659 Apr 14 10:32 Makefile.in --r--r--r-- 1 carter staff 14197 Apr 14 10:32 argus_auth.c --r--r--r-- 1 carter staff 147274 Apr 14 18:22 argus_code.c --r--r--r-- 1 carter staff 87217 Apr 14 10:32 argus_filter.c --r--r--r-- 1 carter staff 114412 Apr 14 10:32 argus_util.c --r-xr-xr-x 1 carter staff 14718 Apr 14 10:32 grammar.y --r-xr-xr-x 1 carter staff 11783 Apr 14 10:32 scanner.l +-r--r--r-- 1 carter staff 3659 Apr 14 2015 Makefile.in +-r--r--r-- 1 carter staff 14197 Apr 14 2015 argus_auth.c +-r--r--r-- 1 carter staff 147274 Apr 14 2015 argus_code.c +-r--r--r-- 1 carter staff 87217 Apr 14 2015 argus_filter.c +-r--r--r-- 1 carter staff 114617 Aug 5 2015 argus_util.c +-r-xr-xr-x 1 carter staff 14718 Apr 14 2015 grammar.y +-r-xr-xr-x 1 carter staff 11783 Apr 14 2015 scanner.l ./config: total 184 --r-xr-xr-x 1 carter staff 42856 Apr 14 10:32 config.guess --r-xr-xr-x 1 carter staff 35740 Apr 14 10:32 config.sub --r-xr-xr-x 1 carter staff 5585 Apr 14 10:32 install-sh --r-xr-xr-x 1 carter staff 616 Apr 14 10:32 mkinstalldirs +-r-xr-xr-x 1 carter staff 42856 Apr 14 2015 config.guess +-r-xr-xr-x 1 carter staff 35740 Apr 14 2015 config.sub +-r-xr-xr-x 1 carter staff 5585 Apr 14 2015 install-sh +-r-xr-xr-x 1 carter staff 616 Apr 14 2015 mkinstalldirs ./debian: total 96 --rwxr-xr-x 1 carter staff 1058 Apr 14 10:32 argus.postinst --rwxr-xr-x 1 carter staff 181 Apr 14 10:32 argus.postrm --rwxr-xr-x 1 carter staff 719 Apr 14 10:32 argus.preinst --rwxr-xr-x 1 carter staff 151 Apr 14 10:32 argus.prerm --rw-r--r-- 1 carter staff 153 Apr 14 10:32 changelog --rw-r--r-- 1 carter staff 2 Apr 14 10:32 compat --rw-r--r-- 1 carter staff 611 Apr 14 10:32 control --rw-r--r-- 1 carter staff 1812 Apr 14 10:40 copyright --rw-r--r-- 1 carter staff 7 Apr 14 10:32 docs --rw-r--r-- 1 carter staff 180 Apr 14 10:32 install --rw-r--r-- 1 carter staff 64 Apr 14 10:52 manpages --rwxr-xr-x 1 carter staff 538 Apr 14 10:32 rules -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 source +-rwxr-xr-x 1 carter staff 1058 Apr 14 2015 argus.postinst +-rwxr-xr-x 1 carter staff 181 Apr 14 2015 argus.postrm +-rwxr-xr-x 1 carter staff 719 Apr 14 2015 argus.preinst +-rwxr-xr-x 1 carter staff 151 Apr 14 2015 argus.prerm +-rw-r--r-- 1 carter staff 153 Apr 14 2015 changelog +-rw-r--r-- 1 carter staff 2 Apr 14 2015 compat +-rw-r--r-- 1 carter staff 611 Apr 14 2015 control +-rw-r--r-- 1 carter staff 1812 Apr 14 2015 copyright +-rw-r--r-- 1 carter staff 7 Apr 14 2015 docs +-rw-r--r-- 1 carter staff 180 Apr 14 2015 install +-rw-r--r-- 1 carter staff 64 Apr 14 2015 manpages +-rwxr-xr-x 1 carter staff 538 Apr 14 2015 rules +drwxr-xr-x 3 carter staff 102 Apr 14 2015 source ./debian/source: total 8 --rw-r--r-- 1 carter staff 12 Apr 14 10:32 format +-rw-r--r-- 1 carter staff 12 Apr 14 2015 format ./doc: total 8 --r--r--r-- 1 carter staff 1333 Apr 14 10:32 README +-r--r--r-- 1 carter staff 1333 Apr 14 2015 README ./events: -total 40 --r--r--r-- 1 carter staff 3113 Apr 14 10:32 Makefile.in --r--r--r-- 1 carter staff 3217 Apr 14 10:32 README --r-xr-xr-x 1 carter staff 596 Apr 14 10:32 argus-lsof.pl --r-xr-xr-x 1 carter staff 1599 Apr 14 10:32 argus-snmp.sh --r-xr-xr-x 1 carter staff 842 Apr 14 10:32 argus-vmstat.sh +total 48 +-r--r--r-- 1 carter staff 3371 Dec 2 2015 Makefile.in +-r--r--r-- 1 carter staff 3217 Apr 14 2015 README +-r-xr-xr-x 1 carter staff 735 Dec 2 2015 argus-extip.pl +-r-xr-xr-x 1 carter staff 596 Apr 14 2015 argus-lsof.pl +-r-xr-xr-x 1 carter staff 1599 Apr 14 2015 argus-snmp.sh +-r-xr-xr-x 1 carter staff 842 Apr 14 2015 argus-vmstat.sh ./include: total 832 --r--r--r-- 1 carter staff 17917 Apr 14 10:32 CflowdFlowPdu.h -drwxr-xr-x 16 carter staff 544 Apr 14 10:32 argus --r--r--r-- 1 carter staff 3974 Apr 14 10:32 argus-namedb.h --r--r--r-- 1 carter staff 12168 Apr 14 10:32 argus_client.h --r--r--r-- 1 carter staff 6414 Apr 14 10:32 argus_compat.h --r--r--r-- 1 carter staff 16500 Apr 14 10:32 argus_config.h.in --r--r--r-- 1 carter staff 2326 Apr 14 10:32 argus_dag.h --r--r--r-- 1 carter staff 2166 Apr 14 10:32 argus_debug.h --r--r--r-- 1 carter staff 98944 Apr 14 10:32 argus_def.h --r--r--r-- 1 carter staff 120 Apr 14 10:32 argus_def_v2.h --r--r--r-- 1 carter staff 2987 Apr 14 10:32 argus_dscodepoints.h --r--r--r-- 1 carter staff 3726 Apr 14 10:32 argus_encapsulations.h --r--r--r-- 1 carter staff 11827 Apr 14 10:32 argus_ethernames.h --r--r--r-- 1 carter staff 4386 Apr 14 10:32 argus_ethertype.h --r--r--r-- 1 carter staff 8927 Apr 14 10:32 argus_filter.h --r--r--r-- 1 carter staff 1039 Apr 14 10:32 argus_gmpls.h --r--r--r-- 1 carter staff 1878 Apr 14 10:32 argus_gre.h --r--r--r-- 1 carter staff 2704 Apr 14 10:32 argus_int.h --r--r--r-- 1 carter staff 18623 Apr 14 10:32 argus_isis.h --r--r--r-- 1 carter staff 4248 Apr 14 10:32 argus_llc.h --r--r--r-- 1 carter staff 4010 Apr 14 10:32 argus_namedb.h --r--r--r-- 1 carter staff 4559 Apr 14 10:32 argus_os.h --r--r--r-- 1 carter staff 29477 Apr 14 10:32 argus_out.h --r--r--r-- 1 carter staff 52784 Apr 14 10:32 argus_parse.h --r--r--r-- 1 carter staff 4615 Apr 14 10:32 argus_parser.h --r--r--r-- 1 carter staff 3237 Apr 14 10:32 argus_udt.h --r--r--r-- 1 carter staff 5174 Apr 14 10:32 argus_util.h --r--r--r-- 1 carter staff 43120 Apr 14 10:32 argus_v3_def.h -drwxr-xr-x 7 carter staff 238 Apr 14 10:32 cygwin-include -drwxr-xr-x 8 carter staff 272 Apr 14 10:32 net -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 netbsd-include -drwxr-xr-x 4 carter staff 136 Apr 14 10:32 netinet +-r--r--r-- 1 carter staff 17917 Apr 14 2015 CflowdFlowPdu.h +drwxr-xr-x 16 carter staff 544 Apr 14 2015 argus +-r--r--r-- 1 carter staff 3974 Apr 14 2015 argus-namedb.h +-r--r--r-- 1 carter staff 12168 Apr 14 2015 argus_client.h +-r--r--r-- 1 carter staff 6414 Apr 14 2015 argus_compat.h +-r--r--r-- 1 carter staff 16500 Apr 14 2015 argus_config.h.in +-r--r--r-- 1 carter staff 2326 Apr 14 2015 argus_dag.h +-r--r--r-- 1 carter staff 2166 Apr 14 2015 argus_debug.h +-r--r--r-- 1 carter staff 99194 Jul 2 2015 argus_def.h +-r--r--r-- 1 carter staff 120 Apr 14 2015 argus_def_v2.h +-r--r--r-- 1 carter staff 2987 Apr 14 2015 argus_dscodepoints.h +-r--r--r-- 1 carter staff 3837 Jun 1 13:54 argus_encapsulations.h +-r--r--r-- 1 carter staff 11827 Apr 14 2015 argus_ethernames.h +-r--r--r-- 1 carter staff 4457 Jun 1 12:37 argus_ethertype.h +-r--r--r-- 1 carter staff 8927 Apr 14 2015 argus_filter.h +-r--r--r-- 1 carter staff 1039 Apr 14 2015 argus_gmpls.h +-r--r--r-- 1 carter staff 1878 Apr 14 2015 argus_gre.h +-r--r--r-- 1 carter staff 2704 Apr 14 2015 argus_int.h +-r--r--r-- 1 carter staff 18623 Apr 14 2015 argus_isis.h +-r--r--r-- 1 carter staff 4248 Apr 14 2015 argus_llc.h +-r--r--r-- 1 carter staff 4010 Apr 14 2015 argus_namedb.h +-r--r--r-- 1 carter staff 4559 Apr 14 2015 argus_os.h +-r--r--r-- 1 carter staff 29477 Aug 5 2015 argus_out.h +-r--r--r-- 1 carter staff 52784 Apr 14 2015 argus_parse.h +-r--r--r-- 1 carter staff 4615 Apr 14 2015 argus_parser.h +-r--r--r-- 1 carter staff 3237 Apr 14 2015 argus_udt.h +-r--r--r-- 1 carter staff 5174 Apr 14 2015 argus_util.h +-r--r--r-- 1 carter staff 43120 Apr 14 2015 argus_v3_def.h +drwxr-xr-x 7 carter staff 238 Apr 14 2015 cygwin-include +drwxr-xr-x 8 carter staff 272 Apr 14 2015 net +drwxr-xr-x 3 carter staff 102 Apr 14 2015 netbsd-include +drwxr-xr-x 4 carter staff 136 Apr 14 2015 netinet ./include/argus: total 248 --r--r--r-- 1 carter staff 23545 Apr 14 10:32 CflowdFlowPdu.h --r--r--r-- 1 carter staff 3786 Apr 14 10:32 bootp.h --r--r--r-- 1 carter staff 3262 Apr 14 10:32 cflowd.h --r--r--r-- 1 carter staff 4553 Apr 14 10:32 cons_def.h --r--r--r-- 1 carter staff 4368 Apr 14 10:32 cons_out.h --r--r--r-- 1 carter staff 8596 Apr 14 10:32 extract.h --r--r--r-- 1 carter staff 3781 Apr 14 10:32 fddi.h --r--r--r-- 1 carter staff 9916 Apr 14 10:32 gencode.h --r--r--r-- 1 carter staff 956 Apr 14 10:32 global.h --r--r--r-- 1 carter staff 18685 Apr 14 10:32 ieee802_11.h --r--r--r-- 1 carter staff 1470 Apr 14 10:32 md5.h --r--r--r-- 1 carter staff 2424 Apr 14 10:32 ppp.h --r--r--r-- 1 carter staff 4827 Apr 14 10:32 saslint.h --r--r--r-- 1 carter staff 5667 Apr 14 10:32 sll.h +-r--r--r-- 1 carter staff 23545 Apr 14 2015 CflowdFlowPdu.h +-r--r--r-- 1 carter staff 3786 Apr 14 2015 bootp.h +-r--r--r-- 1 carter staff 3262 Apr 14 2015 cflowd.h +-r--r--r-- 1 carter staff 4553 Apr 14 2015 cons_def.h +-r--r--r-- 1 carter staff 4368 Apr 14 2015 cons_out.h +-r--r--r-- 1 carter staff 8596 Apr 14 2015 extract.h +-r--r--r-- 1 carter staff 3781 Apr 14 2015 fddi.h +-r--r--r-- 1 carter staff 9916 Apr 14 2015 gencode.h +-r--r--r-- 1 carter staff 956 Apr 14 2015 global.h +-r--r--r-- 1 carter staff 18685 Apr 14 2015 ieee802_11.h +-r--r--r-- 1 carter staff 1470 Apr 14 2015 md5.h +-r--r--r-- 1 carter staff 2424 Apr 14 2015 ppp.h +-r--r--r-- 1 carter staff 4827 Apr 14 2015 saslint.h +-r--r--r-- 1 carter staff 5667 Apr 14 2015 sll.h ./include/cygwin-include: total 0 -drwxr-xr-x 4 carter staff 136 Apr 14 10:32 linux -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 net -drwxr-xr-x 11 carter staff 374 Apr 14 10:32 netinet -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 protocols -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 sys +drwxr-xr-x 4 carter staff 136 Apr 14 2015 linux +drwxr-xr-x 3 carter staff 102 Apr 14 2015 net +drwxr-xr-x 11 carter staff 374 Apr 14 2015 netinet +drwxr-xr-x 3 carter staff 102 Apr 14 2015 protocols +drwxr-xr-x 3 carter staff 102 Apr 14 2015 sys ./include/cygwin-include/linux: total 16 --r--r--r-- 1 carter staff 1728 Apr 14 10:32 if_arp.h --r--r--r-- 1 carter staff 3092 Apr 14 10:32 igmp.h +-r--r--r-- 1 carter staff 1728 Apr 14 2015 if_arp.h +-r--r--r-- 1 carter staff 3092 Apr 14 2015 igmp.h ./include/cygwin-include/net: total 8 --r--r--r-- 1 carter staff 1734 Apr 14 10:32 if_arp.h +-r--r--r-- 1 carter staff 1734 Apr 14 2015 if_arp.h ./include/cygwin-include/netinet: total 104 --r--r--r-- 1 carter staff 8866 Apr 14 10:32 icmp6.h --r--r--r-- 1 carter staff 1984 Apr 14 10:32 if_ether.h --r--r--r-- 1 carter staff 3480 Apr 14 10:32 igmp.h --r--r--r-- 1 carter staff 3729 Apr 14 10:32 ip6.h --r--r--r-- 1 carter staff 5013 Apr 14 10:32 ip_icmp.h --r--r--r-- 1 carter staff 3198 Apr 14 10:32 ip_var.h --r--r--r-- 1 carter staff 6380 Apr 14 10:32 tcp_var.h --r--r--r-- 1 carter staff 1033 Apr 14 10:32 tcpip.h --r--r--r-- 1 carter staff 1086 Apr 14 10:32 udp_var.h +-r--r--r-- 1 carter staff 8866 Apr 14 2015 icmp6.h +-r--r--r-- 1 carter staff 1984 Apr 14 2015 if_ether.h +-r--r--r-- 1 carter staff 3480 Apr 14 2015 igmp.h +-r--r--r-- 1 carter staff 3729 Apr 14 2015 ip6.h +-r--r--r-- 1 carter staff 5013 Apr 14 2015 ip_icmp.h +-r--r--r-- 1 carter staff 3198 Apr 14 2015 ip_var.h +-r--r--r-- 1 carter staff 6380 Apr 14 2015 tcp_var.h +-r--r--r-- 1 carter staff 1033 Apr 14 2015 tcpip.h +-r--r--r-- 1 carter staff 1086 Apr 14 2015 udp_var.h ./include/cygwin-include/protocols: total 8 --r--r--r-- 1 carter staff 2340 Apr 14 10:32 routed.h +-r--r--r-- 1 carter staff 2340 Apr 14 2015 routed.h ./include/cygwin-include/sys: total 8 --r--r--r-- 1 carter staff 49 Apr 14 10:32 mbuf.h +-r--r--r-- 1 carter staff 49 Apr 14 2015 mbuf.h ./include/net: total 72 --r--r--r-- 1 carter staff 3222 Apr 14 10:32 arcnet.h --r--r--r-- 1 carter staff 2172 Apr 14 10:32 etherdefs.h --r--r--r-- 1 carter staff 12674 Apr 14 10:32 nff.h --r--r--r-- 1 carter staff 3563 Apr 14 10:32 ppp.h --r--r--r-- 1 carter staff 3873 Apr 14 10:32 slcompress.h --r--r--r-- 1 carter staff 1103 Apr 14 10:32 slip.h +-r--r--r-- 1 carter staff 3222 Apr 14 2015 arcnet.h +-r--r--r-- 1 carter staff 2172 Apr 14 2015 etherdefs.h +-r--r--r-- 1 carter staff 12674 Apr 14 2015 nff.h +-r--r--r-- 1 carter staff 3563 Apr 14 2015 ppp.h +-r--r--r-- 1 carter staff 3873 Apr 14 2015 slcompress.h +-r--r--r-- 1 carter staff 1103 Apr 14 2015 slip.h ./include/netbsd-include: total 0 -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 netinet +drwxr-xr-x 3 carter staff 102 Apr 14 2015 netinet ./include/netbsd-include/netinet: total 8 --r--r--r-- 1 carter staff 1570 Apr 14 10:32 rtp.h +-r--r--r-- 1 carter staff 1570 Apr 14 2015 rtp.h ./include/netinet: total 24 --r--r--r-- 1 carter staff 4892 Apr 14 10:32 rtp.h --r--r--r-- 1 carter staff 2182 Apr 14 10:32 tcp_fsm.h +-r--r--r-- 1 carter staff 4892 Apr 14 2015 rtp.h +-r--r--r-- 1 carter staff 2182 Apr 14 2015 tcp_fsm.h ./lib: total 8 --r--r--r-- 1 carter staff 2000 Apr 14 10:32 argus.spec +-r--r--r-- 1 carter staff 2000 Jun 1 12:26 argus.spec ./man: total 0 -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 man5 -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 man8 +drwxr-xr-x 3 carter staff 102 Apr 14 2015 man5 +drwxr-xr-x 3 carter staff 102 Apr 14 2015 man8 ./man/man5: total 40 --r-xr-xr-x 1 carter staff 19826 Apr 14 10:32 argus.conf.5 +-r-xr-xr-x 1 carter staff 19826 Apr 14 2015 argus.conf.5 ./man/man8: total 24 --r-xr-xr-x 1 carter staff 11249 Apr 14 10:32 argus.8 +-r-xr-xr-x 1 carter staff 11249 Apr 14 2015 argus.8 ./pkg: total 64 --r--r--r-- 1 carter staff 4201 Apr 14 10:32 README --r--r--r-- 1 carter staff 21769 Apr 14 10:32 argus.conf -drwxr-xr-x 4 carter staff 136 Apr 14 10:32 rhel +-r--r--r-- 1 carter staff 4201 Apr 14 2015 README +-r--r--r-- 1 carter staff 21769 Apr 14 2015 argus.conf +drwxr-xr-x 4 carter staff 136 Apr 14 2015 rhel ./pkg/rhel: total 0 -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 init.d -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 sysconfig +drwxr-xr-x 3 carter staff 102 Apr 14 2015 init.d +drwxr-xr-x 3 carter staff 102 Apr 14 2015 sysconfig ./pkg/rhel/init.d: total 8 --r-xr-xr-x 1 carter staff 2796 Apr 14 10:32 argus +-r-xr-xr-x 1 carter staff 2796 Apr 14 2015 argus ./pkg/rhel/sysconfig: total 8 --r--r--r-- 1 carter staff 551 Apr 14 10:32 argus +-r--r--r-- 1 carter staff 551 Apr 14 2015 argus ./support: total 8 -drwxr-xr-x 4 carter staff 136 Apr 14 10:32 Archive -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 Config -drwxr-xr-x 3 carter staff 102 Apr 14 10:32 Deployment --r--r--r-- 1 carter staff 2026 Apr 14 10:32 README -drwxr-xr-x 6 carter staff 204 Apr 14 10:32 Startup -drwxr-xr-x 4 carter staff 136 Apr 14 10:32 System +drwxr-xr-x 4 carter staff 136 Apr 14 2015 Archive +drwxr-xr-x 3 carter staff 102 Apr 14 2015 Config +drwxr-xr-x 3 carter staff 102 Apr 14 2015 Deployment +-r--r--r-- 1 carter staff 2026 Apr 14 2015 README +drwxr-xr-x 6 carter staff 204 Apr 14 2015 Startup +drwxr-xr-x 4 carter staff 136 Apr 14 2015 System ./support/Archive: total 48 --r--r--r-- 1 carter staff 5181 Apr 14 10:32 README.argusarchive --r-xr-xr-x 1 carter staff 14629 Apr 14 10:32 argusarchive +-r--r--r-- 1 carter staff 5181 Apr 14 2015 README.argusarchive +-r-xr-xr-x 1 carter staff 14629 Apr 14 2015 argusarchive ./support/Config: total 48 --r-xr-xr-x 1 carter staff 21756 Apr 14 10:32 argus.conf +-r-xr-xr-x 1 carter staff 21756 Apr 14 2015 argus.conf ./support/Deployment: total 16 --r-xr-xr-x 1 carter staff 7623 Apr 14 10:32 sample +-r-xr-xr-x 1 carter staff 7623 Apr 14 2015 sample ./support/Startup: total 32 --r--r--r-- 1 carter staff 3693 Apr 14 10:32 README --r--r--r-- 1 carter staff 3104 Apr 14 10:32 argus --r--r--r-- 1 carter staff 559 Apr 14 10:32 argus.service --r--r--r-- 1 carter staff 723 Apr 14 10:32 com.qosient.argus.plist +-r--r--r-- 1 carter staff 3693 Apr 14 2015 README +-r--r--r-- 1 carter staff 3104 Apr 14 2015 argus +-r--r--r-- 1 carter staff 559 Apr 14 2015 argus.service +-r--r--r-- 1 carter staff 723 Apr 14 2015 com.qosient.argus.plist ./support/System: total 16 --r-xr-xr-x 1 carter staff 1170 Apr 14 10:32 crontab --r-xr-xr-x 1 carter staff 1094 Apr 14 10:32 magic +-r-xr-xr-x 1 carter staff 1170 Apr 14 2015 crontab +-r-xr-xr-x 1 carter staff 1094 Apr 14 2015 magic diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/VERSION new/argus-3.0.8.2/VERSION --- old/argus-3.0.8.1/VERSION 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/VERSION 2016-06-01 18:26:31.000000000 +0200 @@ -1 +1 @@ -3.0.8.1 +3.0.8.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/ArgusApp.c new/argus-3.0.8.2/argus/ArgusApp.c --- old/argus-3.0.8.1/argus/ArgusApp.c 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/argus/ArgusApp.c 2015-06-29 22:17:25.000000000 +0200 @@ -20,9 +20,9 @@ */ /* - * $Id: //depot/argus/argus/argus/ArgusApp.c#28 $ - * $DateTime: 2015/04/06 10:38:44 $ - * $Change: 2973 $ + * $Id: //depot/argus/argus/argus/ArgusApp.c#29 $ + * $DateTime: 2015/06/29 16:17:25 $ + * $Change: 3027 $ */ #ifdef HAVE_CONFIG_H @@ -276,7 +276,8 @@ } } else { if ((sport == ARGUS_UDT_PORT) || (dport == ARGUS_UDT_PORT)) { - if (ArgusParseUDTHeader (model, (struct udt_header *) model->ArgusThisUpHdr)) { + unsigned int status = 0; + if (ArgusParseUDTHeader (model, (struct udt_header *) model->ArgusThisUpHdr, &status)) { struct ArgusNetworkStruct *net = (struct ArgusNetworkStruct *) flowstr->dsrs[ARGUS_NETWORK_INDEX]; if (net == NULL) { @@ -293,6 +294,9 @@ struct ArgusUDTObject *udtObject = (struct ArgusUDTObject *)(&net->hdr + 1); bcopy (ArgusThisUdtHshake, &udtObject->hshake, sizeof(*ArgusThisUdtHshake)); } + + if (status != 0) + net->net_union.udt.status |= status; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/ArgusEvents.c new/argus-3.0.8.2/argus/ArgusEvents.c --- old/argus-3.0.8.1/argus/ArgusEvents.c 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/argus/ArgusEvents.c 2016-06-01 17:21:42.000000000 +0200 @@ -416,7 +416,7 @@ trans->hdr.type = ARGUS_TRANSPORT_DSR; trans->hdr.subtype = ARGUS_SRCID | ARGUS_SEQ; - trans->hdr.argus_dsrvl8.qual = events->ArgusSrc->type;; + trans->hdr.argus_dsrvl8.qual = events->ArgusSrc->type; trans->hdr.argus_dsrvl8.len = 3; tlen += trans->hdr.argus_dsrvl8.len; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/ArgusIcmp.c new/argus-3.0.8.2/argus/ArgusIcmp.c --- old/argus-3.0.8.1/argus/ArgusIcmp.c 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/argus/ArgusIcmp.c 2015-08-06 04:33:18.000000000 +0200 @@ -20,9 +20,9 @@ */ /* - * $Id: //depot/argus/argus/argus/ArgusIcmp.c#22 $ - * $DateTime: 2015/04/06 10:38:44 $ - * $Change: 2973 $ + * $Id: //depot/argus/argus/argus/ArgusIcmp.c#23 $ + * $DateTime: 2015/08/05 22:33:18 $ + * $Change: 3042 $ */ #ifdef HAVE_CONFIG_H @@ -46,7 +46,7 @@ struct ArgusSystemFlow *retn = NULL; if (STRUCTCAPTURED(model, *icmp)) { - struct ArgusICMPv6Flow *icmpv6Flow = &model->ArgusThisFlow->icmp6_flow; + struct ArgusICMPv6Flow *icmpv6Flow = &model->ArgusThisFlow->icmpv6_flow; icmpv6Flow->type = icmp->icmp6_type; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/ArgusModeler.c new/argus-3.0.8.2/argus/ArgusModeler.c --- old/argus-3.0.8.1/argus/ArgusModeler.c 2015-04-17 14:11:20.000000000 +0200 +++ new/argus-3.0.8.2/argus/ArgusModeler.c 2016-06-01 19:27:04.000000000 +0200 @@ -23,9 +23,9 @@ */ /* - * $Id: //depot/argus/argus/argus/ArgusModeler.c#135 $ - * $DateTime: 2015/04/17 08:10:46 $ - * $Change: 3011 $ + * $Id: //depot/argus/argus/argus/ArgusModeler.c#137 $ + * $DateTime: 2016/04/05 12:00:14 $ + * $Change: 3135 $ */ #ifdef HAVE_CONFIG_H @@ -175,13 +175,13 @@ model->ArgusQueueInterval.tv_usec = 50000; model->ArgusListenInterval.tv_usec = 250000; - model->ArgusIPTimeout = ARGUS_IPTIMEOUT; - model->ArgusTCPTimeout = ARGUS_TCPTIMEOUT; - model->ArgusICMPTimeout = ARGUS_ICMPTIMEOUT; - model->ArgusIGMPTimeout = ARGUS_IGMPTIMEOUT; - model->ArgusFRAGTimeout = ARGUS_FRAGTIMEOUT; - model->ArgusARPTimeout = ARGUS_ARPTIMEOUT; - model->ArgusOtherTimeout = ARGUS_OTHERTIMEOUT; + model->ArgusIPTimeout = (model->ArgusIPTimeout == 0) ? ARGUS_IPTIMEOUT : model->ArgusIPTimeout; + model->ArgusTCPTimeout = (model->ArgusTCPTimeout == 0) ? ARGUS_TCPTIMEOUT : model->ArgusTCPTimeout; + model->ArgusICMPTimeout = (model->ArgusICMPTimeout == 0) ? ARGUS_ICMPTIMEOUT : model->ArgusICMPTimeout; + model->ArgusIGMPTimeout = (model->ArgusIGMPTimeout == 0) ? ARGUS_IGMPTIMEOUT : model->ArgusIGMPTimeout; + model->ArgusFRAGTimeout = (model->ArgusFRAGTimeout == 0) ? ARGUS_FRAGTIMEOUT : model->ArgusFRAGTimeout; + model->ArgusARPTimeout = (model->ArgusARPTimeout == 0) ? ARGUS_ARPTIMEOUT : model->ArgusARPTimeout; + model->ArgusOtherTimeout = (model->ArgusOtherTimeout == 0) ? ARGUS_OTHERTIMEOUT : model->ArgusOtherTimeout; if ((tvp = getArgusFarReportInterval(model)) != NULL) model->ArgusStatusQueue->timeout = tvp->tv_sec; @@ -594,6 +594,7 @@ int ArgusProcessLLCHdr (struct ArgusModelerStruct *, char *, int); int ArgusProcess80211Hdr (struct ArgusModelerStruct *, char *, int); int ArgusProcessUDToEHdr (struct ArgusModelerStruct *, char *, int); +int ArgusProcessErspanIIHdr (struct ArgusModelerStruct *, char *, int); int @@ -602,6 +603,12 @@ int retn = 0; switch (type) { + case ETHERTYPE_ERSPAN_II: + model->ArgusThisNetworkFlowType = ETHERTYPE_ERSPAN_II; + if ((retn = ArgusProcessErspanIIHdr(model, p, length)) < 0) + model->ArgusThisUpHdr = (void *)p; + break; + case ETHERTYPE_TRANS_BRIDGE: case ARGUS_ETHER_HDR: model->ArgusThisNetworkFlowType = ARGUS_ETHER_HDR; @@ -690,8 +697,12 @@ struct ip *ip = (struct ip *) p; if (STRUCTCAPTURED(model,*ip)) { - if (((ntohs(ip->ip_len)) >= 20) && ((ip->ip_v == 4) || (ip->ip_v == 6))) { - model->ArgusThisNetworkFlowType = type; + if ((ntohs(ip->ip_len)) >= 20) { + if (ip->ip_v == 4) + model->ArgusThisNetworkFlowType = ETHERTYPE_IP; + else if (ip->ip_v == 6) + model->ArgusThisNetworkFlowType = ETHERTYPE_IPV6; + model->ArgusThisIpHdr = (void *)ip; switch (ip->ip_p) { case IPPROTO_TTP: { /* Preparation for Juniper TTP */ @@ -912,6 +923,8 @@ #define GRE_VERS_MASK 0x0007 /* protocol version */ +#define GRESRE_IP 0x0800 /* IP */ +#define GRESRE_ASN 0xfffe /* ASN */ #define GRE_CP 0x8000 /* checksum present */ #define GRE_RP 0x4000 /* routing present */ #define GRE_KP 0x2000 /* key present */ @@ -1310,6 +1323,10 @@ case PPP_MP: break; } + + model->ArgusThisUpHdr += hdr_len; + model->ArgusThisLength -= hdr_len; + model->ArgusSnapLength -= hdr_len; } #ifdef ARGUSDEBUG @@ -1443,6 +1460,28 @@ } +int ArgusProcessErspanIIHdr(struct ArgusModelerStruct *model, char *p, int length) +{ + int retn = 0; + struct erspan_ii_header *erspan; + + if ((erspan = (struct erspan_ii_header *) p) != NULL) { + if (length <= sizeof (struct erspan_ii_header)) + return retn; + + if ( ERSPAN_VER(erspan) != 0x1) + return retn; + + model->ArgusThisEncaps |= ARGUS_ENCAPS_ERSPAN_II; + model->ArgusThisUpHdr = (unsigned char *)p + sizeof(struct erspan_ii_header); + model->ArgusThisLength -= sizeof(struct erspan_ii_header); + model->ArgusSnapLength -= sizeof(struct erspan_ii_header); + retn = ARGUS_ETHER_HDR; + } + return retn; +} + + int ArgusProcessLcpPacket (struct ArgusSourceStruct *, struct lcp_hdr *, int, struct timeval *); int diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/ArgusModeler.h new/argus-3.0.8.2/argus/ArgusModeler.h --- old/argus-3.0.8.1/argus/ArgusModeler.h 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/argus/ArgusModeler.h 2016-06-01 18:53:36.000000000 +0200 @@ -20,9 +20,9 @@ */ /* - * $Id: //depot/argus/argus/argus/ArgusModeler.h#59 $ - * $DateTime: 2015/04/06 10:38:44 $ - * $Change: 2973 $ + * $Id: //depot/argus/argus/argus/ArgusModeler.h#60 $ + * $DateTime: 2015/06/29 16:17:25 $ + * $Change: 3027 $ */ @@ -387,6 +387,14 @@ struct ArgusCanonRecord canon; }; +struct erspan_ii_header { + u_int16_t ver_vlan; + u_int16_t cos_ent_session; + u_int32_t resvert_index; +}; + +#define ERSPAN_VER(x) ( ntohs(((struct erspan_ii_header *) x)->ver_vlan) >> 12 ) + #if defined(ArgusModeler) @@ -478,7 +486,7 @@ extern struct udt_control_handshake *ArgusThisUdtHshake; -extern int ArgusParseUDTHeader (struct ArgusModelerStruct *, struct udt_header *); +extern int ArgusParseUDTHeader (struct ArgusModelerStruct *, struct udt_header *, unsigned int *); int getArgusdflag(struct ArgusModelerStruct *); void setArgusdflag(struct ArgusModelerStruct *, int); @@ -660,7 +668,7 @@ extern struct timeval *getArgusListenInterval(void); extern struct udt_control_handshake *ArgusThisUdtHshake; -extern int ArgusParseUDTHeader (struct ArgusModelerStruct *, struct udt_header *); +extern int ArgusParseUDTHeader (struct ArgusModelerStruct *, struct udt_header *, unsigned int *); extern int getArgusGenerateTime(struct ArgusModelerStruct *); extern void setArgusGenerateTime(struct ArgusModelerStruct *, int); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/ArgusNetflow.c new/argus-3.0.8.2/argus/ArgusNetflow.c --- old/argus-3.0.8.1/argus/ArgusNetflow.c 2015-04-14 20:06:04.000000000 +0200 +++ new/argus-3.0.8.2/argus/ArgusNetflow.c 2016-06-01 17:42:48.000000000 +0200 @@ -1266,9 +1266,10 @@ break; } case k_CiscoV9IpV6IcmpType: { - flow->canon.icmp.icmp_type = value.val8[0]; - flow->dsrindex |= 1 << ARGUS_ICMP_INDEX; - flow->dsrs[ARGUS_ICMP_INDEX] = &flow->canon.icmp.hdr; + struct ArgusICMPv6Flow *icmpv6Flow = &flow->canon.flow.icmpv6_flow; + icmpv6Flow->type = value.val8[0]; + flow->dsrindex |= 1 << ARGUS_FLOW_INDEX; + flow->dsrs[ARGUS_FLOW_INDEX] = &flow->canon.flow.hdr; break; } case k_CiscoV9IpV6MulIgmpType: { @@ -1473,14 +1474,14 @@ break; } case k_CiscoV9IcmpTypeV6: { - struct ArgusICMPv6Flow *icmpv6Flow = &flow->canon.flow.icmp6_flow; + struct ArgusICMPv6Flow *icmpv6Flow = &flow->canon.flow.icmpv6_flow; icmpv6Flow->type = value.val8[0]; flow->dsrindex |= 1 << ARGUS_FLOW_INDEX; flow->dsrs[ARGUS_FLOW_INDEX] = &flow->canon.flow.hdr; break; } case k_CiscoV9IcmpCodeV6: { - struct ArgusICMPv6Flow *icmpv6Flow = &flow->canon.flow.icmp6_flow; + struct ArgusICMPv6Flow *icmpv6Flow = &flow->canon.flow.icmpv6_flow; icmpv6Flow->code = value.val8[0]; flow->dsrindex |= 1 << ARGUS_FLOW_INDEX; flow->dsrs[ARGUS_FLOW_INDEX] = &flow->canon.flow.hdr; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/ArgusOutput.c new/argus-3.0.8.2/argus/ArgusOutput.c --- old/argus-3.0.8.1/argus/ArgusOutput.c 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/argus/ArgusOutput.c 2016-06-01 17:50:43.000000000 +0200 @@ -520,6 +520,12 @@ sigfillset(&blocked_signals); pthread_sigmask(SIG_BLOCK, &blocked_signals, NULL); +#if defined(HAVE_SOLARIS) + sigignore(SIGPIPE); +#else + (void) signal (SIGPIPE, SIG_IGN); +#endif + while ((list = output->ArgusInputList) == NULL) { struct timespec tsbuf = {0, 10000000}, *ts = &tsbuf; #ifdef ARGUSDEBUG @@ -870,7 +876,7 @@ char *baddr = NULL; int s = -1; - if (port) { + if (port > 0) { if (output->ArgusListens > 0) { int i = output->ArgusListens; for (i = 0; i < output->ArgusListens; i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/ArgusSource.c new/argus-3.0.8.2/argus/ArgusSource.c --- old/argus-3.0.8.1/argus/ArgusSource.c 2015-04-15 13:56:23.000000000 +0200 +++ new/argus-3.0.8.2/argus/ArgusSource.c 2016-04-05 18:00:14.000000000 +0200 @@ -20,9 +20,9 @@ */ /* - * $Id: //depot/argus/argus/argus/ArgusSource.c#132 $ - * $DateTime: 2015/04/15 07:55:45 $ - * $Change: 3008 $ + * $Id: //depot/argus/argus/argus/ArgusSource.c#134 $ + * $DateTime: 2016/04/05 12:00:14 $ + * $Change: 3135 $ */ /* @@ -307,7 +307,9 @@ case PCAP_ERROR_ACTIVATED: case PCAP_ERROR_NO_SUCH_DEVICE: case PCAP_ERROR_PERM_DENIED: +#if defined(PCAP_ERROR_PROMISC_PERM_DENIED) case PCAP_ERROR_PROMISC_PERM_DENIED: +#endif case PCAP_ERROR: { ArgusLog (LOG_WARNING, "ArgusOpenInterface %s: %s\n", device->name, pcap_geterr(inf->ArgusPd)); pcap_close(inf->ArgusPd); @@ -318,7 +320,9 @@ case PCAP_ERROR_IFACE_NOT_UP: case PCAP_WARNING_PROMISC_NOTSUP: +#if defined(PCAP_WARNING_TSTAMP_TYPE_NOTSUP) case PCAP_WARNING_TSTAMP_TYPE_NOTSUP: +#endif case PCAP_WARNING: default: retn = 1; @@ -3735,7 +3739,9 @@ src->type = stask->type; } src->type = device->type; + ArgusPushBackList(src->ArgusDeviceList, (struct ArgusListRecord *) device, ARGUS_LOCK); + if (ArgusInitSource (src) > 0) { stask->srcs[ArgusThreads] = src; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/ArgusTcp.c new/argus-3.0.8.2/argus/ArgusTcp.c --- old/argus-3.0.8.1/argus/ArgusTcp.c 2015-04-15 00:22:14.000000000 +0200 +++ new/argus-3.0.8.2/argus/ArgusTcp.c 2016-06-01 18:06:32.000000000 +0200 @@ -20,9 +20,9 @@ */ /* - * $Id: //depot/argus/argus/argus/ArgusTcp.c#50 $ - * $DateTime: 2015/04/14 18:22:14 $ - * $Change: 3006 $ + * $Id: //depot/argus/argus/argus/ArgusTcp.c#51 $ + * $DateTime: 2015/07/02 10:42:46 $ + * $Change: 3030 $ */ #ifdef HAVE_CONFIG_H @@ -274,35 +274,34 @@ } } - ArgusUpdateTCPSequence(model, flowstr, tcp); - - switch (ArgusUpdateTCPStateMachine(model, flowstr, tcp)) { - case TCPS_LISTEN: - if (flags == TH_SYN) { - ArgusThisTCPsrc->bytes -= model->ArgusThisLength; - model->ArgusThisUpHdr -= tcphlen; - model->ArgusThisLength = tcplen; - model->ArgusSnapLength += tcphlen; - - ArgusRemoveFromQueue (flowstr->qhdr.queue, &flowstr->qhdr, ARGUS_LOCK); - ArgusSendFlowRecord (model, flowstr, ARGUS_STOP); - ArgusInitializeTCP (model, flowstr); - ArgusPushQueue(model->ArgusStatusQueue, &flowstr->qhdr, ARGUS_LOCK); - return; - } - break; + if (ArgusUpdateTCPSequence(model, flowstr, tcp)) { + switch (ArgusUpdateTCPStateMachine(model, flowstr, tcp)) { + case TCPS_LISTEN: + if (flags == TH_SYN) { + ArgusThisTCPsrc->bytes -= model->ArgusThisLength; + model->ArgusThisUpHdr -= tcphlen; + model->ArgusThisLength = tcplen; + model->ArgusSnapLength += tcphlen; + + ArgusRemoveFromQueue (flowstr->qhdr.queue, &flowstr->qhdr, ARGUS_LOCK); + ArgusSendFlowRecord (model, flowstr, ARGUS_STOP); + ArgusInitializeTCP (model, flowstr); + ArgusPushQueue(model->ArgusStatusQueue, &flowstr->qhdr, ARGUS_LOCK); + return; + } + break; - case TCPS_CLOSED: - case TCPS_TIME_WAIT: - if (!(tcpExt->status & ARGUS_RESET)) - tcpExt->status |= ARGUS_NORMAL_CLOSE; - flowstr->timeout = 10; - break; + case TCPS_CLOSED: + case TCPS_TIME_WAIT: + if (!(tcpExt->status & ARGUS_RESET)) + tcpExt->status |= ARGUS_NORMAL_CLOSE; + flowstr->timeout = 10; + break; + } } - - ArgusThisTCPsrc->lasttime.tv_sec = model->ArgusGlobalTime.tv_sec; - ArgusThisTCPsrc->lasttime.tv_usec = model->ArgusGlobalTime.tv_usec; } + ArgusThisTCPsrc->lasttime.tv_sec = model->ArgusGlobalTime.tv_sec; + ArgusThisTCPsrc->lasttime.tv_usec = model->ArgusGlobalTime.tv_usec; } } } @@ -523,7 +522,7 @@ unsigned char flags = tcp->th_flags; int len = model->ArgusThisLength; - int retn = 1, win; + int retn = 1, win, ArgusDuplicatePacket = 0; unsigned int maxseq = 0; unsigned int seq = tcp->th_seq; unsigned int newseq = seq + len; @@ -595,14 +594,15 @@ ArgusThisTCPsrc->seqbase = seq; ArgusThisTCPsrc->seq = newseq; } else { + if (len) { if (model->ArgusTrackDuplicates && (tipid && ((ipid != 0) && (*tipid == ipid)))) { -/* if (model->ArgusThisDir) - tcpExt->sdups++; + ArgusThisTCPsrc->status |= ARGUS_SRC_DUPLICATES; else - tcpExt->ddups++; -*/ + ArgusThisTCPdst->status |= ARGUS_DST_DUPLICATES; + ArgusDuplicatePacket = 1; + } else { if (ArgusThisTCPdst->win != 0) { /* not first packet seen in this direction */ if (tcp->th_seq < ArgusThisTCPdst->ack) { @@ -657,34 +657,37 @@ } - if (tcp->th_ack && (flags & TH_ACK)) { - if (ArgusThisTCPsrc->ack) { - if (ArgusThisTCPdst->seq > ArgusThisTCPsrc->ack) - ArgusThisTCPdst->winbytes = (ArgusThisTCPdst->seq - 1) - ArgusThisTCPsrc->ack; - } + if (!(ArgusDuplicatePacket)) { + if (tcp->th_ack && (flags & TH_ACK)) { + if (ArgusThisTCPsrc->ack) { + if (ArgusThisTCPdst->seq > ArgusThisTCPsrc->ack) + ArgusThisTCPdst->winbytes = (ArgusThisTCPdst->seq - 1) - ArgusThisTCPsrc->ack; + } - if (!(ArgusThisTCPsrc->ack == (tcp->th_ack - 1))) { - if (!(ArgusThisTCPsrc->ack) || (ArgusThisTCPdst->seq == tcp->th_ack)) { - - ArgusThisTCPdst->winbytes = 0; - if (!(ArgusThisTCPsrc->ack == (tcp->th_ack - 1))) - if (ArgusThisTCPdst->seq == tcp->th_ack) - ArgusThisTCPdst->winnum++; + if (!(ArgusThisTCPsrc->ack == (tcp->th_ack - 1))) { + if (!(ArgusThisTCPsrc->ack) || (ArgusThisTCPdst->seq == tcp->th_ack)) { - } else { - if (!(flags & TH_SYN)) - if (ArgusThisTCPsrc->ack) { - win = (tcp->th_ack - 1) - ArgusThisTCPsrc->ack; - win = (ArgusThisTCPdst->winbytes < win) ? ArgusThisTCPdst->winbytes : win; - ArgusThisTCPdst->winbytes -= win; - ArgusThisTCPdst->winnum++; - } - } + ArgusThisTCPdst->winbytes = 0; + if (!(ArgusThisTCPsrc->ack == (tcp->th_ack - 1))) + if (ArgusThisTCPdst->seq == tcp->th_ack) + ArgusThisTCPdst->winnum++; + + } else { + if (!(flags & TH_SYN)) + if (ArgusThisTCPsrc->ack) { + win = (tcp->th_ack - 1) - ArgusThisTCPsrc->ack; + win = (ArgusThisTCPdst->winbytes < win) ? ArgusThisTCPdst->winbytes : win; + ArgusThisTCPdst->winbytes -= win; + ArgusThisTCPdst->winnum++; + } + } - ArgusThisTCPsrc->ack = tcp->th_ack - 1; + ArgusThisTCPsrc->ack = tcp->th_ack - 1; + } } - } + } else + retn = 0; /* ArgusInProtocol = 1; */ @@ -939,30 +942,33 @@ net->hdr.argus_dsrvl8.qual = 0; - tcp->status &= ~ARGUS_RESET; + tcp->status &= ~(ARGUS_RESET | ARGUS_PKTS_RETRANS | ARGUS_WINDOW_SHUT | ARGUS_OUTOFORDER | ARGUS_DUPLICATES); + if (tcp->src.status & ARGUS_RESET) tcp->status |= ARGUS_SRC_RESET; if (tcp->dst.status & ARGUS_RESET) tcp->status |= ARGUS_DST_RESET; - tcp->status &= ~ARGUS_PKTS_RETRANS; if (tcp->src.status & ARGUS_PKTS_RETRANS) tcp->status |= ARGUS_SRC_PKTS_RETRANS; if (tcp->dst.status & ARGUS_PKTS_RETRANS) tcp->status |= ARGUS_DST_PKTS_RETRANS; - tcp->status &= ~ARGUS_WINDOW_SHUT; if (tcp->src.status & ARGUS_WINDOW_SHUT) tcp->status |= ARGUS_SRC_WINDOW_SHUT; if (tcp->dst.status & ARGUS_WINDOW_SHUT) tcp->status |= ARGUS_DST_WINDOW_SHUT; - tcp->status &= ~ARGUS_OUTOFORDER; if (tcp->src.status & ARGUS_OUTOFORDER) tcp->status |= ARGUS_SRC_OUTOFORDER; if (tcp->dst.status & ARGUS_OUTOFORDER) tcp->status |= ARGUS_DST_OUTOFORDER; + if (tcp->src.status & ARGUS_DUPLICATES) + tcp->status |= ARGUS_SRC_DUPLICATES; + if (tcp->dst.status & ARGUS_DUPLICATES) + tcp->status |= ARGUS_DST_DUPLICATES; + switch (net->hdr.subtype) { case ARGUS_TCP_INIT: net->hdr.argus_dsrvl8.len = ((sizeof(struct ArgusTCPInitStatus)+3))/4 + 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/ArgusUdt.c new/argus-3.0.8.2/argus/ArgusUdt.c --- old/argus-3.0.8.1/argus/ArgusUdt.c 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/argus/ArgusUdt.c 2015-06-29 22:17:25.000000000 +0200 @@ -20,9 +20,9 @@ */ /* - * $Id: //depot/argus/argus/argus/ArgusUdt.c#9 $ - * $DateTime: 2015/04/06 10:38:44 $ - * $Change: 2973 $ + * $Id: //depot/argus/argus/argus/ArgusUdt.c#10 $ + * $DateTime: 2015/06/29 16:17:25 $ + * $Change: 3027 $ */ #ifdef HAVE_CONFIG_H @@ -176,9 +176,6 @@ hshake->wsize = ntohl(hshake->wsize); hshake->conntype = ntohl(hshake->conntype); hshake->sockid = ntohl(hshake->sockid); - - } else { -// ArgusLog(LOG_ERR, "ArgusUpdateUDToEState: hshake version is %d", ntohl(hshake->version)); } #ifdef ARGUSDEBUG ArgusDebug (4, "ArgusUpdateUDToEState(%p, %d) UDT_CONTROL_HANDSHAKE type %d seqNum %d size %d maxWin %d conn %d sockid 0x%x\n", @@ -285,7 +282,8 @@ case UDTOE_CONTROL_DROPREQ: { struct udt_control_dropreq *drop = (void *)(udtc + 1); if (drop->firstseqnum == 0) - ArgusLog(LOG_ERR, "drop request firstseqnum is 0"); + if (net != NULL) + net->net_union.udt.status |= ARGUS_UDT_FIRSTDROPZERO; #ifdef ARGUSDEBUG ArgusDebug (4, "ArgusUpdateUDToEState(%p, %d) UDT_CONTROL_DROPREQ\n", flowstr, *state); #endif @@ -534,7 +532,8 @@ case UDT_CONTROL_DROPREQ: { struct udt_control_dropreq *drop = (void *)(udtc + 1); if (drop->firstseqnum == 0) - ArgusLog(LOG_ERR, "drop request firstseqnum is 0"); + if (net != NULL) + net->net_union.udt.status |= ARGUS_UDT_FIRSTDROPZERO; #ifdef ARGUSDEBUG ArgusDebug (4, "ArgusUpdateUDTState(%p, %d) UDT_CONTROL_DROPREQ\n", flowstr, *state); #endif @@ -648,10 +647,10 @@ struct udt_control_handshake *ArgusThisUdtHshake = NULL; -int ArgusParseUDToEHeader (struct ArgusModelerStruct *, struct udt_header *); +int ArgusParseUDToEHeader (struct ArgusModelerStruct *, struct udt_header *, unsigned int *); int -ArgusParseUDToEHeader (struct ArgusModelerStruct *model, struct udt_header *udt) +ArgusParseUDToEHeader (struct ArgusModelerStruct *model, struct udt_header *udt, unsigned int *status) { int retn = 0; @@ -667,8 +666,8 @@ if (ntohl(hshake->version) == 4) { ArgusThisUdtHshake = hshake; retn = 1; - } else -// ArgusLog(LOG_ERR, "ArgusParseUDToEHeader: hshake version is %d", ntohl(hshake->version)); + } else + *status |= ARGUS_UDT_BADVERSION; break; } case UDTOE_CONTROL_KEEPALIVE: @@ -676,9 +675,6 @@ break; case UDTOE_CONTROL_ACK: { -/* - struct udt_control_ack *ack = (void *) (udtc + 1); -*/ retn = 1; break; } @@ -695,7 +691,7 @@ case UDTOE_CONTROL_DROPREQ: { struct udt_control_dropreq *drop = (void *)(udtc + 1); if (drop->firstseqnum == 0) - ArgusLog(LOG_ERR, "drop request firstseqnum is 0"); + *status |= ARGUS_UDT_FIRSTDROPZERO; retn = 1; break; } @@ -713,7 +709,7 @@ int -ArgusParseUDTHeader (struct ArgusModelerStruct *model, struct udt_header *udt) +ArgusParseUDTHeader (struct ArgusModelerStruct *model, struct udt_header *udt, unsigned int *status) { int retn = 0; @@ -730,7 +726,7 @@ ArgusThisUdtHshake = hshake; retn = 1; } else -// ArgusLog(LOG_ERR, "ArgusParseUDTHeader: hshake version is %d", ntohl(hshake->version)); + *status |= ARGUS_UDT_BADVERSION; break; } case UDT_CONTROL_KEEPALIVE: @@ -757,7 +753,7 @@ case UDT_CONTROL_DROPREQ: { struct udt_control_dropreq *drop = (void *)(udt + 1); if (drop->firstseqnum == 0) - ArgusLog(LOG_ERR, "drop request firstseqnum is 0"); + *status |= ARGUS_UDT_FIRSTDROPZERO; retn = 1; break; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/ArgusUtil.c new/argus-3.0.8.2/argus/ArgusUtil.c --- old/argus-3.0.8.1/argus/ArgusUtil.c 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/argus/ArgusUtil.c 2015-08-06 22:48:45.000000000 +0200 @@ -20,9 +20,9 @@ */ /* - * $Id: //depot/argus/argus/argus/ArgusUtil.c#87 $ - * $DateTime: 2015/04/06 10:38:44 $ - * $Change: 2973 $ + * $Id: //depot/argus/argus/argus/ArgusUtil.c#88 $ + * $DateTime: 2015/08/06 16:35:55 $ + * $Change: 3044 $ */ /* ArgusUtil.c */ @@ -169,9 +169,9 @@ } case ARGUS_BIND_ADDR_LIST: { - struct ArgusListObjectStruct *lobj = (struct ArgusListObjectStruct *) retn; - if (lobj->obj != NULL) { - free(lobj); + struct ArgusBindAddrStruct *baddr = (struct ArgusBindAddrStruct *) retn; + if (baddr->addr != NULL) { + free(baddr->addr); } ArgusFree(retn); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/argus/argus.c new/argus-3.0.8.2/argus/argus.c --- old/argus-3.0.8.1/argus/argus.c 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/argus/argus.c 2015-07-02 16:42:46.000000000 +0200 @@ -20,9 +20,9 @@ */ /* - * $Id: //depot/argus/argus/argus/argus.c#100 $ - * $DateTime: 2015/04/13 00:43:29 $ - * $Change: 2982 $ + * $Id: //depot/argus/argus/argus/argus.c#101 $ + * $DateTime: 2015/07/02 10:42:46 $ + * $Change: 3030 $ */ /* @@ -1408,12 +1408,12 @@ } case ARGUS_CAPTURE_FULL_CONTROL_DATA: - if ((strncasecmp(optarg, "yes", 3)) != 0) { - setArgusCaptureFlag (ArgusSourceTask, 1); - setArgusSnapLen (ArgusSourceTask, (getArgusUserDataLen(ArgusModel) + ARGUS_MINSNAPLEN)); + if (!(strncasecmp(optarg, "yes", 3))) { + setArgusCaptureFlag(ArgusSourceTask, 1); + setArgusControlMonitor(ArgusModel); + setArgusSnapLen(ArgusSourceTask, ARGUS_MAXSNAPLEN); } else { setArgusCaptureFlag (ArgusSourceTask, 0); - setArgusSnapLen (ArgusSourceTask, ARGUS_MAXSNAPLEN); } break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/common/argus_util.c new/argus-3.0.8.2/common/argus_util.c --- old/argus-3.0.8.1/common/argus_util.c 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/common/argus_util.c 2015-08-06 04:33:18.000000000 +0200 @@ -20,9 +20,9 @@ */ /* - * $Id: //depot/argus/argus/common/argus_util.c#84 $ - * $DateTime: 2015/04/06 10:38:44 $ - * $Change: 2973 $ + * $Id: //depot/argus/argus/common/argus_util.c#85 $ + * $DateTime: 2015/08/05 22:33:18 $ + * $Change: 3042 $ */ #ifdef HAVE_CONFIG_H @@ -948,6 +948,11 @@ flow->ipv6_flow.sport = htons(flow->ipv6_flow.sport); flow->ipv6_flow.dport = htons(flow->ipv6_flow.dport); break; + + case IPPROTO_ICMPV6: + flow->icmpv6_flow.id = htons(flow->icmpv6_flow.id); + break; + case IPPROTO_ESP: flow->esp6_flow.spi = htonl(flow->esp6_flow.spi); break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/events/Makefile.in new/argus-3.0.8.2/events/Makefile.in --- old/argus-3.0.8.1/events/Makefile.in 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/events/Makefile.in 2015-12-02 17:46:39.000000000 +0100 @@ -77,14 +77,18 @@ @rm -f $@ $(CC) $(CFLAGS) -c $< -SRC = argus-lsof.pl argus-snmp.sh argus-vmstat.sh +SRC = argus-extip.pl argus-lsof.pl argus-snmp.sh argus-vmstat.sh -PROG = @INSTALL_BIN@/argus-lsof @INSTALL_BIN@/argus-snmp @INSTALL_BIN@/argus-vmstat +PROG = @INSTALL_BIN@/argus-extip @INSTALL_BIN@/argus-lsof @INSTALL_BIN@/argus-snmp @INSTALL_BIN@/argus-vmstat CLEANFILES = $(PROG) all: $(PROG) +@INSTALL_BIN@/argus-extip: argus-extip.pl + sed 's+@PERLBIN@+$(PERL)+' argus-extip.pl > $@ + chmod +x $@ + @INSTALL_BIN@/argus-lsof: argus-lsof.pl sed 's+@PERLBIN@+$(PERL)+' argus-lsof.pl > $@ chmod +x $@ @@ -98,11 +102,13 @@ install: all force [ -d $(DESTDIR)$(SBINDIR) ] || \ (mkdir -p $(DESTDIR)$(SBINDIR); chmod 755 $(DESTDIR)$(SBINDIR)) + $(INSTALL) $(srcdir)/../bin/argus-extip $(DESTDIR)$(BINDIR)/argus-extip $(INSTALL) $(srcdir)/../bin/argus-lsof $(DESTDIR)$(BINDIR)/argus-lsof $(INSTALL) $(srcdir)/../bin/argus-snmp $(DESTDIR)$(BINDIR)/argus-snmp $(INSTALL) $(srcdir)/../bin/argus-vmstat $(DESTDIR)$(BINDIR)/argus-vmstat uninstall: all force + rm -f $(DESTDIR)$(BINDIR)/argus-extip rm -f $(DESTDIR)$(BINDIR)/argus-lsof rm -f $(DESTDIR)$(BINDIR)/argus-snmp rm -f $(DESTDIR)$(BINDIR)/argus-vmstat diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/events/argus-extip.pl new/argus-3.0.8.2/events/argus-extip.pl --- old/argus-3.0.8.1/events/argus-extip.pl 1970-01-01 01:00:00.000000000 +0100 +++ new/argus-3.0.8.2/events/argus-extip.pl 2015-12-02 17:43:45.000000000 +0100 @@ -0,0 +1,39 @@ +#!@PERLBIN@ +# +# Argus Software +# Copyright (c) 2006-2015 QoSient, LLC +# All rights reserved. +# +# argus-lsof - Report open inet sockets and provide application names as +# XML oriented argus events. +# +# Carter Bullard +# QoSient, LLC +# + +use POSIX; +use strict; + +my $wget = `which wget`; +my $host = "qosient.com/argus/argusPublicIP.php"; +my $options = "-q -O -"; + +chomp($wget); + +my @args = "$wget $host $options"; +my $data; + +print "<ArgusEvent>\n"; +print " <ArgusEventData Type = \"Program: $wget $host $options\">\n"; + +open(SESAME, "@args |"); + +while ($data = <SESAME>) { + $data =~ s/</ </gs; + $data =~ s/>/>\n/gs; + print "$data"; +} +close(SESAME); + +print " </ArgusEventData>\n"; +print "</ArgusEvent>\n"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/include/argus_def.h new/argus-3.0.8.2/include/argus_def.h --- old/argus-3.0.8.1/include/argus_def.h 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/include/argus_def.h 2015-07-02 15:02:44.000000000 +0200 @@ -20,9 +20,9 @@ */ /* - * $Id: //depot/argus/argus/include/argus_def.h#47 $ - * $DateTime: 2015/04/06 10:38:44 $ - * $Change: 2973 $ + * $Id: //depot/argus/argus/include/argus_def.h#49 $ + * $DateTime: 2015/07/02 09:02:44 $ + * $Change: 3029 $ */ /* Argus_def.h */ @@ -1595,6 +1595,10 @@ #define ARGUS_SRC_OUTOFORDER 0x00010000 #define ARGUS_DST_OUTOFORDER 0x00020000 +#define ARGUS_DUPLICATES 0x000C0000 +#define ARGUS_SRC_DUPLICATES 0x00040000 +#define ARGUS_DST_DUPLICATES 0x00080000 + #define ARGUS_TCP_OPTIONS 0xFFF00000 #define ARGUS_TCP_MAXSEG 0x00100000 #define ARGUS_TCP_WSCALE 0x00200000 @@ -1609,6 +1613,10 @@ #define ARGUS_TCP_SRC_ECN 0x40000000 #define ARGUS_TCP_DST_ECN 0x80000000 +#define ARGUS_UDT_OPTIONS 0xFFF00000 +#define ARGUS_UDT_BADVERSION 0x00100000 +#define ARGUS_UDT_FIRSTDROPZERO 0x01000000 + /* ESP State Constatans and Reporting Values */ #define ARGUS_ESP_ROLLOVER 0x1000 #define ARGUS_ESP_SEQFAILURE 0x2000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/include/argus_encapsulations.h new/argus-3.0.8.2/include/argus_encapsulations.h --- old/argus-3.0.8.1/include/argus_encapsulations.h 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/include/argus_encapsulations.h 2016-06-01 19:54:34.000000000 +0200 @@ -41,33 +41,41 @@ char *label, *desc; }; -#define ARGUS_ENCAPS_TYPE 25 +#define ARGUS_ENCAPS_TYPE 28 + #define ARGUS_ENCAPS_MPLS 0x01 #define ARGUS_ENCAPS_ETHER 0x02 #define ARGUS_ENCAPS_8021Q 0x04 #define ARGUS_ENCAPS_LLC 0x08 #define ARGUS_ENCAPS_PPP 0x10 + #define ARGUS_ENCAPS_ISL 0x20 #define ARGUS_ENCAPS_GRE 0x40 #define ARGUS_ENCAPS_AH 0x80 #define ARGUS_ENCAPS_IP 0x100 #define ARGUS_ENCAPS_IPV6 0x200 + #define ARGUS_ENCAPS_HDLC 0x400 #define ARGUS_ENCAPS_CHDLC 0x800 #define ARGUS_ENCAPS_ATM 0x1000 #define ARGUS_ENCAPS_SLL 0x2000 #define ARGUS_ENCAPS_FDDI 0x4000 + #define ARGUS_ENCAPS_SLIP 0x8000 #define ARGUS_ENCAPS_ARCNET 0x10000 #define ARGUS_ENCAPS_802_11 0x20000 #define ARGUS_ENCAPS_PRISM 0x40000 #define ARGUS_ENCAPS_AVS 0x80000 + #define ARGUS_ENCAPS_IB_LRH 0x100000 #define ARGUS_ENCAPS_IB_GRH 0x200000 #define ARGUS_ENCAPS_TEREDO 0x400000 #define ARGUS_ENCAPS_UDT 0x800000 #define ARGUS_ENCAPS_SPI 0x1000000 + #define ARGUS_ENCAPS_JUNIPER 0x2000000 +#define ARGUS_ENCAPS_ERSPAN_II 0x4000000 + #if defined(ArgusUtil) struct ArgusEncapsulationStruct argus_encapsulations [] = { @@ -96,6 +104,7 @@ { ARGUS_ENCAPS_TEREDO,"teredo", "Teredo IPV6 Tunneling"}, { ARGUS_ENCAPS_SPI, "enc", "IPsec Tunnel"}, { ARGUS_ENCAPS_JUNIPER, "juniper", "Juniper Ethernet"}, + { ARGUS_ENCAPS_ERSPAN_II, "erspan_ii", "Cisco ERSPAN II"}, { 0, (char *) NULL, (char *) NULL }, }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/include/argus_ethertype.h new/argus-3.0.8.2/include/argus_ethertype.h --- old/argus-3.0.8.1/include/argus_ethertype.h 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/include/argus_ethertype.h 2016-06-01 18:37:50.000000000 +0200 @@ -159,6 +159,9 @@ #ifndef ETHERTYPE_PPPOES #define ETHERTYPE_PPPOES 0x8864 #endif +#ifndef ETHERTYPE_ERSPAN_II +#define ETHERTYPE_ERSPAN_II 0x88BE +#endif #ifndef ETHERTYPE_LOOPBACK #define ETHERTYPE_LOOPBACK 0x9000 #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/include/argus_out.h new/argus-3.0.8.2/include/argus_out.h --- old/argus-3.0.8.1/include/argus_out.h 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/include/argus_out.h 2015-08-06 04:33:18.000000000 +0200 @@ -20,9 +20,9 @@ */ /* - * $Id: //depot/argus/argus/include/argus_out.h#52 $ - * $DateTime: 2015/04/06 10:38:44 $ - * $Change: 2973 $ + * $Id: //depot/argus/argus/include/argus_out.h#53 $ + * $DateTime: 2015/08/05 22:33:18 $ + * $Change: 3042 $ */ @@ -527,7 +527,7 @@ #define ipv6_flow flow_un.ipv6 #define ip_flow flow_un.ip -#define icmp6_flow flow_un.icmpv6 +#define icmpv6_flow flow_un.icmpv6 #define icmp_flow flow_un.icmp #define igmp_flow flow_un.igmp #define igmp6_flow flow_un.igmpv6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/argus-3.0.8.1/lib/argus.spec new/argus-3.0.8.2/lib/argus.spec --- old/argus-3.0.8.1/lib/argus.spec 2015-04-14 16:32:33.000000000 +0200 +++ new/argus-3.0.8.2/lib/argus.spec 2016-06-01 18:26:14.000000000 +0200 @@ -1,6 +1,6 @@ %define ver 3.0 %if %{?rel:0}%{!?rel:1} -%define rel 8.1 +%define rel 8.2 %endif %if %{?srcext:0}%{!?srcext:1} %define srcext .gz

1 0

commit epymc for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package epymc for openSUSE:Factory checked in at 2016-09-30 15:33:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/epymc (Old) and /work/SRC/openSUSE:Factory/.epymc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "epymc" Changes: -------- --- /work/SRC/openSUSE:Factory/epymc/epymc.changes 2015-11-05 11:35:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.epymc.new/epymc.changes 2016-09-30 15:33:20.000000000 +0200 @@ -1,0 +2,74 @@ +Wed Sep 28 08:50:40 UTC 2016 - simonf.lees(a)suse.com + +- %lang_package is now not in description + +------------------------------------------------------------------- +Sun Sep 18 08:27:09 UTC 2016 - sflees(a)suse.de + +- Add fix-desktop-file.patch + +------------------------------------------------------------------- +Sun Sep 18 07:28:11 UTC 2016 - sflees(a)suse.de + +- 1.2.0 Release +New features: + * New Photo module + * New PosterGrid/CoverGrid views + * New South Park Studios online video channel + * New themoviedb.org online video channel (with movie trailers) + * Added a new secret online channel + * Virtual keyboard is now also usable with the real keyboard + * Virtual keyboard now support multiple layouts + * Show the status of the downloads in progress (with ability to +start/abort) + * Thumbnailing ability, using a custom Ethumb slave process + * Automatically (and manually) download and update youtube-dl + * New Watchdog module (sadly gstreamer1 sometimes hang the mainloop for me) + * Cache to file remote images for faster reloading + * Support remote urls also in the mediaplayer cover image + * Show current folders in the file-manager + * Option to hide the mouse cursor when not needed (not move or video +playing) + * Support for subtitles embedded in the video files + * New check_po setup command, give translations stats with a nice bar + +Improvements: + * Initial music library scan is now 10 times faster (measured with the +library + and the config folder on the same slow HDD) see Issue #2 for more info. + * Lots of improvements in the Music module and the AudioPlayer itself: + playlist is now visible and browsable, player/playlist controls are +always + reachable in the UI, ability to set loop and shuffle. + * Better zapiks video schannel + +New Translations: + * Finnish + +Changes: + * Dropped python 2 support, you MUST use python 3 from now on + * Removed broken traileraddict channel (use the new tmdb instead) + * Use elm focus in place of the custom EmcFocusManager + * We now use ecore_con.Url for fetching data from the net (instead of + ecore.file_download + file read + file delete) + +Bug fixed: + * Fixed poster hiding (and console errors) for efl >= 1.16 + * Fixed posters for the vimeo channel + * Fixed tmdb language selector in config + * Fixed (hopefully) subs decoding + * Fixed video download to work again + * Fixed a bug that was causing fileman buttons to be clickable also when +hidden + * Removed usage of elm deprecated ObjectItem.data_get() function + * Removed edc warning about "fixed: 1 1" + * Fixed compatibility with python 3.5 (os.path.exists no more accept +unicode) + * Updated yt scraper to latest web changes + +------------------------------------------------------------------- +Wed Feb 3 07:40:49 UTC 2016 - sleep_walker(a)opensuse.org + +- use python3 sitelib + +------------------------------------------------------------------- Old: ---- epymc-1.1.0.1.tar.gz New: ---- fix-desktop-file.patch v1.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epymc.spec ++++++ --- /var/tmp/diff_new_pack.bafWzu/_old 2016-09-30 15:33:25.000000000 +0200 +++ /var/tmp/diff_new_pack.bafWzu/_new 2016-09-30 15:33:25.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package epymc # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,52 +17,65 @@ Name: epymc -Version: 1.1.0.1 +Version: 1.2.0 Release: 0 Summary: A Media Center designed to run on a large number of devices License: GPL-3.0+ Group: Productivity/Multimedia/Video/Players Url: https://github.com/DaveMDS/epymc -Source0: %{name}-%{version}.tar.gz +Source0: v%{version}.tar.gz +Patch0: fix-desktop-file.patch BuildArch: noarch BuildRequires: efl-devel BuildRequires: intltool -BuildRequires: python-distutils-extra -BuildRequires: python-efl +BuildRequires: python3-distutils-extra +BuildRequires: python3-efl BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} BuildRequires: fdupes BuildRequires: update-desktop-files %endif -Requires: python-efl +Requires: python3-efl %description - EpyMC is a Media Center application written in python that use the Enlightenment Foundation Library as the living base. + +%lang_package + %prep %setup -q -n %{name}-%{version} +%patch0 -p1 %build -python setup.py build +python3 setup.py build %install -python setup.py install --root "%{buildroot}" +python3 setup.py install --root "%{buildroot}" %if 0%{?suse_version} %fdupes %{buildroot}/%{_datadir} %suse_update_desktop_file epymc "Video;Player" %endif +%find_lang %{name} %files %defattr(-,root,root,-) %doc README.md COPYING TODO +%doc README.md COPYING TODO %{_bindir}/epymc %{_bindir}/epymc_standalone -%{python_sitelib}/epymc* -%{python_sitelib}/EpyMC* +%{_bindir}/epymc_thumbnailer +%{_bindir}/epymc_watchdog + +%{python3_sitelib}/epymc* +%exclude %{python3_sitelib}/epymc/locale/*/LC_MESSAGES/epymc.mo +%{python3_sitelib}/EpyMC* %{_datadir}/icons/* %{_datadir}/applications/epymc.desktop %{_datadir}/xsessions/epymc_xsession.desktop +%files lang -f %{name}.lang +%defattr(-,root,root) + %changelog ++++++ fix-desktop-file.patch ++++++ Index: epymc-1.2.0/data/desktop/epymc.desktop =================================================================== --- epymc-1.2.0/data/desktop/epymc.desktop +++ epymc-1.2.0/data/desktop/epymc.desktop @@ -10,7 +10,7 @@ Type=Application Categories=AudioVideo;Player; StartupWMClass=epymc MimeType=application/mxf;application/ogg;application/ram;application/sdp;application/smil;application/smil+xml;application/vnd.ms-wpl;application/vnd.rn-realmedia;application/x-extension-m4a;application/x-extension-mp4;application/x-flac;application/x-flash-video;application/x-matroska;application/x-netshow-channel;application/x-ogg;application/x-quicktime-media-link;application/x-quicktimeplayer;application/x-shorten;application/x-smil;application/xspf+xml;audio/3gpp;audio/ac3;audio/AMR;audio/AMR-WB;audio/basic;audio/midi;audio/mp4;audio/mpeg;audio/mpegurl;audio/ogg;audio/prs.sid;audio/vnd.rn-realaudio;audio/x-aiff;audio/x-ape;audio/x-flac;audio/x-gsm;audio/x-it;audio/x-m4a;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asf;audio/x-ms-asx;audio/x-ms-wax;audio/x-ms-wma;audio/x-musepack;audio/x-pn-aiff;audio/x-pn-au;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-pn-wav;audio/x-pn-windows-acm;audio/x-realaudio;audio/x-real-audio;audio/x-sbc;audio/x-scpls;audio/x-speex;audio/x-tta;audio/x-wav;audio/x-wavpack;audio/x-vorbis;audio/x-vorbis+ogg;audio/x-xm;image/vnd.rn-realpix;image/x-pict;misc/ultravox;text/google-video-pointer;text/x-google-video-pointer;video/3gpp;video/dv;video/fli;video/flv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vivo;video/vnd.divx;video/vnd.rn-realvideo;video/vnd.vivo;video/webm;video/x-anim;video/x-avi;video/x-flc;video/x-fli;video/x-flic;video/x-flv;video/x-m4v;video/x-matroska;video/x-mpeg;video/x-ms-asf;video/x-ms-asx;video/x-msvideo;video/x-ms-wm;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvx;video/x-nsv;video/x-ogm+ogg;video/x-theora+ogg;video/x-totem-stream;x-content/video-dvd;x-content/video-vcd;x-content/video-svcd; -Actions=Movies;TvShows;OnlineChannels;Music;Mame;Photo +Actions=Movies;TvShows;OnlineChannels;Music;Mame;Photo; [Desktop Action Movies] Exec=epymc --activity movies

1 0

commit python-salt-testing for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package python-salt-testing for openSUSE:Factory checked in at 2016-09-30 15:33:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-salt-testing (Old) and /work/SRC/openSUSE:Factory/.python-salt-testing.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-salt-testing" Changes: -------- --- /work/SRC/openSUSE:Factory/python-salt-testing/python-salt-testing.changes 2015-10-17 16:39:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-salt-testing.new/python-salt-testing.changes 2016-09-30 15:33:18.000000000 +0200 @@ -1,0 +2,12 @@ +Tue Sep 27 18:44:23 UTC 2016 - tampakrap(a)opensuse.org + +- Update to 2016.9.7 + - No changelog, see https://github.com/saltstack/salt-testing/compare/v2016.7.22...v2016.9.7 + +------------------------------------------------------------------- +Sat Jul 30 08:13:49 UTC 2016 - tampakrap(a)opensuse.org + +- Update to 2016.7.22 + - No changelog, see https://github.com/saltstack/salt-testing/compare/v2015.7.10...v2016.7.22 + +------------------------------------------------------------------- Old: ---- SaltTesting-2015.7.10.tar.gz New: ---- SaltTesting-2016.9.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-salt-testing.spec ++++++ --- /var/tmp/diff_new_pack.tU2m9e/_old 2016-09-30 15:33:20.000000000 +0200 +++ /var/tmp/diff_new_pack.tU2m9e/_new 2016-09-30 15:33:20.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package python-salt-testing # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,13 @@ Name: python-salt-testing -Version: 2015.7.10 +Version: 2016.9.7 Release: 0 Summary: Testing tools needed in the several Salt Stack projects License: Apache-2.0 Group: Development/Libraries/Python Url: http://saltstack.org/ -Source0: https://pypi.python.org/packages/source/S/SaltTesting/SaltTesting-%{version… +Source0: https://pypi.io/packages/source/S/SaltTesting/SaltTesting-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: fdupes ++++++ SaltTesting-2015.7.10.tar.gz -> SaltTesting-2016.9.7.tar.gz ++++++ ++++ 2061 lines of diff (skipped)

1 0

commit duply for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package duply for openSUSE:Factory checked in at 2016-09-30 15:33:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/duply (Old) and /work/SRC/openSUSE:Factory/.duply.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "duply" Changes: -------- --- /work/SRC/openSUSE:Factory/duply/duply.changes 2015-10-02 09:23:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.duply.new/duply.changes 2016-09-30 15:33:15.000000000 +0200 @@ -1,0 +2,31 @@ +Mon Sep 26 01:42:40 UTC 2016 - malcolmlewis(a)opensuse.org + +- Update to version 1.11.3: + + Fix wrong "WARNING: No running gpg-agent ..." when sign key was + not set. +- Changes from version 1.11.2: + + Fix "gpg: unsafe" version print out. + + Bugfix 91: v1.11 [r47] broke asymmetric encryption when using + GPG_KEYS_ENC. + + Bugfix 90: S3: TARGET_USER/PASS have no effect, added + additional documentation about needed env vars to template + conf file. +- Changes from version 1.11.1: + + Reverted duply's default PYTHON to 'python'. +- Changes from version 1.11: + + Remove obsolete --ssh-askpass routine. + + Add PYTHON conf var to allow global override of used python + interpreter. + + Enforced usage of "python2" in PATH as default interpreter for + internal use _and_ to run duplicity (setup.py changed the + shebang to the fixed path /usr/bin/python until 0.7.05, which + we circumvent this way). + + Feature 36: Support gpg-connect-agent as a means to detect if + an agent is running, used gpg-agent for detection though. + + Quotewrapped run_cmd parameters to protect it from spaces eg. + in TMP path. + + Key export routine respects gpg-agent usage now. +- Update copyright year. +- Add ChangeLog to package. + +------------------------------------------------------------------- Old: ---- duply_1.10.1.tgz New: ---- duply_1.11.3.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ duply.spec ++++++ --- /var/tmp/diff_new_pack.Hpz7kC/_old 2016-09-30 15:33:17.000000000 +0200 +++ /var/tmp/diff_new_pack.Hpz7kC/_new 2016-09-30 15:33:17.000000000 +0200 @@ -1,8 +1,8 @@ # # spec file for package duply # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2011-2015 Malcolm J Lewis <malcolmlewis(a)opensuse.org> +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2011-2016 Malcolm J Lewis <malcolmlewis(a)opensuse.org> # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,13 +18,13 @@ Name: duply -Version: 1.10.1 +Version: 1.11.3 Release: 0 Summary: A frontend for the mighty duplicity magic License: GPL-2.0 Group: Productivity/Archiving/Compression Url: http://duply.net/ -Source0: http://downloads.sourceforge.net/ftplicity/duply%20%28simple%20duplicity%29… +Source0: http://downloads.sourceforge.net/ftplicity/duply%20%28simple%20duplicity%29… # MANUAL BEGIN Requires: duplicity # MANUAL END @@ -47,7 +47,7 @@ %files %defattr(-,root,root,-) -%doc gpl-2.0.txt +%doc CHANGELOG.txt gpl-2.0.txt %{_bindir}/%{name} %changelog ++++++ duply_1.10.1.tgz -> duply_1.11.3.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duply_1.10.1/CHANGELOG.txt new/duply_1.11.3/CHANGELOG.txt --- old/duply_1.10.1/CHANGELOG.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/duply_1.11.3/CHANGELOG.txt 2016-05-29 13:16:04.000000000 +0200 @@ -0,0 +1,394 @@ +############################################################################### +TODO/IDEAS/KNOWN PROBLEMS: +- possibility to restore time frames (incl. deleted files) + realizable by listing each backup and restore from + oldest to the newest, problem: not performant +- search file in all backups function and show available + versions with backups date (list old avail since 0.6.06) +- edit profile opens conf file in vi +- implement log-fd interpretation +- add a duplicity option check against the options pending + deprecation since 0.5.10 namely --time-separator + --short-filenames + --old-filenames +- add 'exclude_<command>' list usage eg. exclude_verify +- featreq 25: a download/install duplicity option +- hint on install software if a piece is missing +- import/export profile from/to .tgz function !!! + +CHANGELOG: +1.11.3 (29.5.2016) +- fix wrong "WARNING: No running gpg-agent ..." when sign key was not set + +1.11.2 (11.2.2016) +- fix "gpg: unsafe" version print out +- bugfix 91: v1.11 [r47] broke asymmetric encryption when using GPG_KEYS_ENC +- bugfix 90: S3: TARGET_USER/PASS have no effect, added additional + documentation about needed env vars to template conf file + +1.11.1 (18.12.2015) +- bugfix 89: "Duply has trouble with PYTHON-interpreter" on OSX homebrew +- reverted duply's default PYTHON to 'python' + +1.11 (24.11.2015) +- remove obsolete --ssh-askpass routine +- add PYTHON conf var to allow global override of used python interpreter +- enforced usage of "python2" in PATH as default interpreter for internal + use _and_ to run duplicity (setup.py changed the shebang to the fixed + path /usr/bin/python until 0.7.05, which we circumvent this way) +- featreq 36: support gpg-connect-agent as a means to detect if an agent is + running (thx Thomas Harning Jr.), used gpg-agent for detection though +- quotewrapped run_cmd parameters to protect it from spaces eg. in TMP path +- key export routine respects gpg-agent usage now + +1.10.1 (19.8.2015) +- bugfix 86: Duply+Swift outputs warning +- bugfix 87: Swift fails without BACKEND_URL + +1.10 (31.7.2015) +- featreq 37: busybox issues - fix awk, grep version detection, + fix grep failure because --color=never switch is unsupported + (thx Thomas Harning Jr. for reporting and helping to debug/fix it) +- bugfix 81: --exclude-globbing-filelist is deprecated since 0.7.03 + (thx Joachim Wiedorn, also for maintaining the debian package) +- implemented base-/dirname as bash functions +- featreq 31 " Support for duplicity Azure backend " - ignored a + contributed patch by Scott McKenzie and instead opted for removing almost + all code that deals with special env vars required by backends. + adding and modifying these results in too much overhead so i dropped this + feature. the future alternative for users is to consult the duplicity + manpage and add the needed export definitions to the conf file. + appended a commented example to the template conf below the auth section. + +1.9.2 (21.6.2015) +- bugfix: exporting keys with gpg2.1 works now (thx Philip Jocks) +- documented GPG_OPTS needed for gpg2.1 to conf template (thx Troy Engel) +- bugfix 82: GREP_OPTIONS=--color=always disrupted time calculation +- added GPG conf var (see conf template for details) +- added grep version output as it is an integral needed binary +- added PYTHONPATH printout in version output + +1.9.1 (13.10.2014) +- export CMD_ERR now for scripts to detect if CMD_PREV failed/succeeded +- bugfix: CMD_PREV contained command even if it was skipped + +1.9.0 (24.8.2014) +- bugfix: env vars were not exported when external script was executable +- rework GPG_KEY handling, allow virtually anything now (uid, keyid etc.) + see gpg manpage, section "How to specify a user ID" + let gpg complain when the delivered values are invalid for whatever reason +- started to rework tmp space checking, exposed folder & writable check + TODO: reimplement enough file space available checking + +1.8.0 (13.7.2014) +- add command verifyPath to expose 'verify --file-to-restore' action +- add time parameter support to verify command +- add section time formats to usage output + +1.7.4 (24.6.2014) +- remove ubuntu one support, service is discontinued +- featreq 31: add authenticated swift (contributed by Justus Seifert) + +1.7.3 (3.4.2014) +- bugfix: test routines, gpg2 asked for passphrase although GPG_PW was set + +1.7.2 (1.4.2014 "April,April") +- bugfix: debian Bug#743190 "duply no longer allows restoration without + gpg passphrase in conf file" + GPG_AGENT_INFO env var is now needed to trigger --use-agent +- bugfix: gpg keyenc test routines didn't work if GPG_PW was not set + +1.7.1 (30.3.2014) +- bugfix: purge-* commands renamed to purgeFull, purgeIncr due to + incompatibility with new minus batch separator + +1.7.0 (20.3.2014) +- disabled gpg key id plausibility check, too many valid possibilities +- featreq 7 "Halt if precondition fails": + added and(+), or(-) batch command(separator) support +- featreq 26 "pre/post script with shebang line": + if a script is flagged executable it's executed in a subshell + now as opposed to sourced to bash, which is the default +- bugfix: do not check if dpbx, swift credentials are set anymore +- bugfix: properly escape profile name, archdir if used as arguments +- add DUPL_PRECMD conf setting for use with e.g. trickle + +1.6.0 (1.1.2014) +- support gs backend +- support dropbox backend +- add gpg-agent support to gpg test routines +- autoenable --use-agent if passwords were not defined in config +- GPG_OPTS are now honored everywhere, keyrings or complete gpg + homedir can thus be configured to be located anywhere +- always import both secret and public key if avail from config profile +- new explanatory comments in initial exclude file +- bugfix 7: Duply only imports one key at a time + +1.5.11 (19.07.2013) +- purge-incr command for remove-all-inc-of-but-n-full feature added + patch provided by Moritz Augsburger, thanks! +- documented version command in man page + +1.5.10 (26.03.2013) +- minor indent and documentation fixes +- bugfix: exclude filter failed on ubuntu, mawk w/o posix char class support +- bugfix: fix url_decoding generally and for python3 +- bugfix 3609075: wrong script results in status line (thx David Epping) + +1.5.9 (22.11.2012) +- bugfix 3588926: filter --exclude* params for restore/fetch ate too much +- restore/fetch now also ignores --include* or --exclude='foobar' + +1.5.8 (26.10.2012) +- bugfix 3575487: implement proper cloud files support + +1.5.7 (10.06.2012) +- bugfix 3531450: Cannot use space in target URL (file:///) anymore + +1.5.6 (24.5.2012) +- commands purge, purge-full have no default value anymore for security + reasons; instead max value can be given via cmd line or must be set + in profile; else an error is shown. +- minor man page modifications + +versioning scheme will be simplified to [major].[minor].[patch] version +with the next version raise + +1.5.5.5 (4.2.2012) +- bugfix 3479605: SEL context confused profile folder's permission check +- colon ':' in url passphrase got ignored, added python driven url_decoding + for user & pass to better process special chars + +1.5.5.4 (16.10.2011) +- bugfix 3421268: SFTP passwords from conf ignored and always prompted for +- add support for separate sign passphrase (needs duplicity 0.6.14+) + +1.5.5.3 (1.10.2011) +- bugfix 3416690: preview threw echo1 error +- fix unknown cmds error usage & friends if more than 2 params were given + +1.5.5.2 (23.9.2011) +- bugfix 3409643: ssh key auth did ask for passphrase (--ssh-askpass ?) +- bugfix: mawk does not support \W and did not split multikey definitions +- all parameters should survive single (') and double (") quotes now + +1.5.5.1 (7.6.2011) +- featreq 3311881: add ftps as supported by duplicity 0.6.13 (thx mape2k) +- bugfix 3312208: signing detection broke symmetric gpg test routine + +1.5.5 (2.5.2011) +- bugfix: fetch problem with space char in path, escape all params + containing non word chars +- list available profiles, if given profile cannot be found +- added --use-agent configuration hint +- bugfix 3174133: --exclude* params in conf DUPL_PARAMS broke + fetch/restore +- version command now prints out 'using installed' info +- featreq 3166169: autotrust imported keys, based on code submitted by + Martin Ellis - imported keys are now automagically trusted ultimately +- new txt2man feature to create manpages for package maintainers + +1.5.4.2 (6.1.2011) +- new command changelog +- bugfix 3109884: freebsd awk segfaulted on printf '%*', use print again +- bugfix: freebsd awk hangs on 'awk -W version' +- bugfix 3150244: mawk does not know '--version' +- minor help text improvements +- new env vars CMD_PREV,CMD_NEXT replacing CMD env var for scripts + +1.5.4.1 (4.12.2010) +- output awk, python, bash version now in prolog +- shebang uses /usr/bin/env now for freebsd compatibility, + bash not in /bin/bash +- new --disable-encryption parameter, + to override profile encr settings for one run +- added exclude-if-present setting to conf template +- bug 3126972: GPG_PW only needed for signing/symmetric encryption + (even though duplicity still needs it) + +1.5.4 (15.11.2010) +- as of 1.5.3 already, new ARCH_DIR config option +- multiple key support +- ftplicity-Feature Requests-2994929: separate encryption and signing key +- key signing of symmetric encryption possible (duplicity patch committed) +- gpg tests disable switch +- gpg tests now previewable and more intelligent + +1.5.3 (1.11.2010) +- bugfix 3056628: improve busybox compatibility, grep did not have -m param +- bugfix 2995408: allow empty password for PGP key +- bugfix 2996459: Duply erroneously escapes '-' symbol in username +- url_encode function is now pythonized +- rsync uses FTP_PASSWORD now if duplicity 0.6.10+ , else issue warning +- feature 3059262: Make pre and post aware of parameters, + internal parameters + CMD of pre or post + +1.5.2.3 (16.4.2010) +- bugfix: date again, should now work virtually anywhere + +1.5.2.2 (3.4.2010) +- minor bugfix: duplicity 0.6.8b version string now parsable +- added INSTALL.txt + +1.5.2.1 (23.3.2010) +- bugfix: date formatting is awked now and should work on all platforms + +1.5.2 (2.3.2010) +- bugfix: errors print to STD_ERR now, failed tasks print an error message +- added --name=duply_<profile> for duplicity 0.6.01+ to name cache folder +- simplified & cleaned profileless commands, removed second instance +- generalized separator time routines +- added support for --no-encryption (GPG_KEY='disabled'), see conf examples +- minor fixes + +1.5.1.5 (5.2.2010) +- bugfix: added special handling of credentials for rsync, imap(s) + +1.5.1.4 (7.1.2010) +- bugfix: nsecs defaults now to zeroes if date does not deliver [0-9]{9} +- check if ncftp binary is available if url protocol is ftp +- bugfix: duplicity output is now printed to screen directly to resolve + 'mem alloc problem' bug report +- bugfix: passwords will not be in the url anymore to solve the 'duply shows + sensitive data in process listing' bug report + +1.5.1.3 (24.12.2009) 'merry xmas' +- bugfix: gpg pass now apostrophed to allow space and friends +- bugfix: credentials are now url encoded to allow special chars in them + a note about url encoding has been added to the conf template + +1.5.1.2 (1.11.2009) +- bugfix: open parenthesis in password broke duplicity execution +- bugfix: ssh/scp backend does not always need credentials e.g. key auth + +1.5.1.1 (21.09.2009) +- bugfix: fixed s3[+http] TARGET_PASS not needed routine +- bugfix: TYPO in duply 1.5.1 prohibited the use of /etc/duply + see https://sourceforge.net/tracker/index.php?func=detail& + aid=2864410&group_id=217745&atid=1041147 + +1.5.1 (21.09.2009) - duply (fka. ftplicity) +- first things first: ftplicity (being able to support all backends since + some time) will be called duply (fka. ftplicity) from now on. The addendum + is for the time being to circumvent confusion. +- bugfix: exit code is 1 (error) not 0 (success), if at least on duplicity + command failed +- s3[+http] now supported natively by translating user/pass to access_key/ + secret_key environment variables needed by duplicity s3 boto backend +- bugfix: additional output lines do not confuse version check anymore +- list command supports now age parameter (patch by stefan on feature + request tracker) +- bugfix: option/param pairs are now correctly passed on to duplicity +- bugfix: s3[+http] needs no TARGET_PASS if command is read only + +1.5.0.2 (31.07.1009) +- bugfix: insert password in target url didn't work with debian mawk + related to previous bug report + +1.5.0.1 (23.07.2009) +- bugfix: gawk gensub dependency raised an error on debian's default mawk + replaced with match/substr command combination (bug report) + https://sf.net/tracker/?func=detail&atid=1041147&aid=2825388& + group_id=217745 + +1.5.0 (01.07.2009) +- removed ftp limitation, all duplicity backends should work now +- bugfix: date for separator failed on openwrt busybox date, added a + detecting workaround, milliseconds are not available w/ busybox date + +1.4.2.1 (14.05.2009) +- bugfix: free temp space detection failed with lvm, fixed awk parse routine + +1.4.2 (22.04.2009) +- gpg keys are now exported as gpgkey.[id].asc , the suffix reflects the + armored ascii nature, the id helps if the key is switched for some reason + im/export routines are updated accordingly (import is backward compatible + to the old profile/gpgkey files) +- profile argument is treated as path if it contains slashes + (for details see usage) +- non-ftplicity options (all but --preview currently) are now passed + on to duplicity +- removed need for stat in secure_conf, it is ls based now +- added profile folder readable check +- added gpg version & home info output +- awk utility availability is now checked, because it was mandatory already +- tmp space is now checked on writability and space requirement + test fails on less than 25MB or configured $VOLSIZE, + test warns if there is less than two times $VOLSIZE because + that's required for --asynchronous-upload option +- gpg functionality is tested now before executing duplicity + test drive contains encryption, decryption, comparison, cleanup + this is meant to detect non trusted or other gpg errors early +- added possibility of doing symmetric encryption with duplicity + set GPG_KEY="" or simply comment it out +- added hints in config template on the depreciation of + --short-filenames, --time-separator duplicity options + +new versioning scheme 1.4.2b => 1.4.2, +beta b's are replaced by a patch count number e.g. 1.4.2.1 will be assigned +to the first bug fixing version and 1.4.2.2 to the second and so on +also the releases will now have a release date formatted (Day.Month.Year) + +1.4.1b1 - bugfix: ftplicity changed filesystem permission of a folder + named exactly as the profile if existing in executing dir + - improved plausibility checking of config and profile folder + - secure_conf only acts if needed and prints a warning now + +1.4.1b - introduce status (duplicity collection-status) command + - pre/post script output printed always now, not only on errors + - new config parameter GPG_OPTS to pass gpg options + added examples & comments to profile template conf + - reworked separator times, added duration display + - added --preview switch, to preview generated command lines + - disabled MAX_AGE, MAX_FULL_BACKUPS, VERBOSITY in generated + profiles because they have reasonable defaults now if not set + +1.4.0b1 - bugfix: incr forces incremental backups on duplicity, + therefore backup translates to pre_bkp_post now + - bugfix: new command bkp, which represents duplicity's + default action (incr or full if full_if_older matches + or no earlier backup chain is found) + +new versioning scheme 1.4 => 1.4.0, added new minor revision number +this is meant to slow down the rapid version growing but still keep +versions cleanly separated. +only additional features will raise the new minor revision number. +all releases start as beta, each bugfix release will raise the beta +count, usually new features arrive before a version 'ripes' to stable + +1.4.0b + 1.4b - added startup info on version, time, selected profile + - added time output to separation lines + - introduced: command purge-full implements duplicity's + remove-all-but-n-full functionality (patch by unknown), + uses config variable $MAX_FULL_BACKUPS (default = 1) + - purge config var $MAX_AGE defaults to 1M (month) now + - command full does not execute pre/post anymore + use batch command pre_full_post if needed + - introduced batch mode cmd1_cmd2_etc + (in turn removed the bvp command) + - unknown/undefined command issues a warning/error now + - bugfix: version check works with 0.4.2 and older now + 1.3b3 - introduced pre/post commands to execute/debug scripts + - introduced bvp (backup, verify, purge) + - bugfix: removed need for awk gensub, now mawk compatible + 1.3b2 - removed pre/post need executable bit set + - profiles now under ~/.ftplicity as folders + - root can keep profiles in /etc/ftplicity, folder must be + created by hand, existing profiles must be moved there + - removed ftplicity in path requirement + - bugfix: bash < v.3 did not know '=~' + - bugfix: purge works again + 1.3 - introduces multiple profiles support + - modified some script errors/docs + - reordered gpg key check import routine + - added 'gpg key id not set' check + - added error_gpg (adds how to setup gpg key howto) + - bugfix: duplicity 0.4.4RC4+ parameter syntax changed + - duplicity_version_check routine introduced + - added time separator, shortnames, volsize, full_if_older + duplicity options to config file (inspired by stevie + from http://weareroot.de) + 1.1.1 - bugfix: encryption reactivated + 1.1 - introduced config directory + 1.0 - first release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/duply_1.10.1/duply new/duply_1.11.3/duply --- old/duply_1.10.1/duply 2015-08-19 16:57:44.000000000 +0200 +++ new/duply_1.11.3/duply 2016-05-29 13:16:04.000000000 +0200 @@ -1,20 +1,20 @@ #!/usr/bin/env bash # -############################################################################### -# duply (grown out of ftplicity), is a shell front end to duplicity that # -# simplifies the usage by managing settings for backup jobs in profiles. # -# It supports executing multiple commands in a batch mode to enable single # -# line cron entries and executes pre/post backup scripts. # -# Since version 1.5.0 all duplicity backends are supported. Hence the name # -# changed from ftplicity to duply. # -# See http://duply.net or http://ftplicity.sourceforge.net/ for more info. # -# (c) 2006 Christiane Ruetten, Heise Zeitschriften Verlag, Germany # -# (c) 2008-2015 Edgar Soldin (changes since version 1.3) # -############################################################################### -# LICENSE: # -# This program is licensed under GPLv2. # -# Please read the accompanying license information in gpl.txt. # -############################################################################### +################################################################################ +# duply (grown out of ftplicity), is a shell front end to duplicity that # +# simplifies the usage by managing settings for backup jobs in profiles. # +# It supports executing multiple commands in a batch mode to enable single # +# line cron entries and executes pre/post backup scripts. # +# Since version 1.5.0 all duplicity backends are supported. Hence the name # +# changed from ftplicity to duply. # +# See http://duply.net or http://ftplicity.sourceforge.net/ for more info. # +# (c) 2006 Christiane Ruetten, Heise Zeitschriften Verlag, Germany # +# (c) 2008-2016 Edgar Soldin (changes since version 1.3) # +################################################################################ +# LICENSE: # +# This program is licensed under GPLv2. # +# Please read the accompanying license information in gpl.txt. # +################################################################################ # TODO/IDEAS/KNOWN PROBLEMS: # - possibility to restore time frames (incl. deleted files) # realizable by listing each backup and restore from @@ -32,14 +32,37 @@ # - hint on install software if a piece is missing # - import/export profile from/to .tgz function !!! # -# # CHANGELOG: +# 1.11.3 (29.5.2016) +# - fix wrong "WARNING: No running gpg-agent ..." when sign key was not set +# +# 1.11.2 (11.2.2016) +# - fix "gpg: unsafe" version print out +# - bugfix 91: v1.11 [r47] broke asymmetric encryption when using GPG_KEYS_ENC +# - bugfix 90: S3: TARGET_USER/PASS have no effect, added additional +# documentation about needed env vars to template conf file +# +# 1.11.1 (18.12.2015) +# - bugfix 89: "Duply has trouble with PYTHON-interpreter" on OSX homebrew +# - reverted duply's default PYTHON to 'python' +# +# 1.11 (24.11.2015) +# - remove obsolete --ssh-askpass routine +# - add PYTHON conf var to allow global override of used python interpreter +# - enforced usage of "python2" in PATH as default interpreter for internal +# use _and_ to run duplicity (setup.py changed the shebang to the fixed +# path /usr/bin/python until 0.7.05, which we circumvent this way) +# - featreq 36: support gpg-connect-agent as a means to detect if an agent is +# running (thx Thomas Harning Jr.), used gpg-agent for detection though +# - quotewrapped run_cmd parameters to protect it from spaces eg. in TMP path +# - key export routine respects gpg-agent usage now +# # 1.10.1 (19.8.2015) # - bugfix 86: Duply+Swift outputs warning # - bugfix 87: Swift fails without BACKEND_URL # # 1.10 (31.7.2015) -# - featreq 36: busybox issues - fix awk, grep version detection, +# - featreq 37: busybox issues - fix awk, grep version detection, # fix grep failure because --color=never switch is unsupported # (thx Thomas Harning Jr. for reporting and helping to debug/fix it) # - bugfix 81: --exclude-globbing-filelist is deprecated since 0.7.03 @@ -385,7 +408,7 @@ # 1.1.1 - bugfix: encryption reactivated # 1.1 - introduced config directory # 1.0 - first release -############################################################################### +################################################################################ # utility functions overriding binaries @@ -404,9 +427,16 @@ echo ${1%/*} } -# a lookup function for executables working with names or file paths +# implement basic which in plain bash +function which { + type -p "$@" +} + +# check availability of executables via file name or file paths function lookup { local bin="$1" + # look for file names in path via bash hash OR + # look for executables at given relative/absolute location ( [ "${bin##*/}" == "$bin" ] && hash "$bin" 2>/dev/null ) || [ -x "$bin" ] } @@ -415,7 +445,7 @@ ME_LONG="$0" ME="$(basename $0)" ME_NAME="${ME%%.*}" -ME_VERSION="1.10.1" +ME_VERSION="1.11.3" ME_WEBSITE="http://duply.net" # default config values @@ -426,6 +456,7 @@ DEFAULT_GPG='gpg' DEFAULT_GPG_KEY='_KEY_ID_' DEFAULT_GPG_PW='_GPG_PASSWORD_' +DEFAULT_PYTHON='python' # function definitions ########################## @@ -486,14 +517,19 @@ END } +function python_binary { + echo "${PYTHON-$DEFAULT_PYTHON}" +} + function using_info { lookup duplicity && duplicity_version_get local NOTFOUND="MISSING" # freebsd awk (--version only), debian mawk (-W version only), deliver '' so awk does not wait for input local AWK_VERSION=$( lookup awk && (awk --version 2>/dev/null || awk -W version 2>&1) | awk 'NR<=2&&tolower($0)~/(busybox|awk)/{success=1;print;exit} END{if(success<1) print "unknown"}' || echo "$NOTFOUND" ) local GREP_VERSION=$( lookup grep && grep --version 2>&1 | awk 'NR<=2&&tolower($0)~/(busybox|grep.*[0-9]+\.[0-9]+)/{success=1;print;exit} END{if(success<1) print "unknown"}' || echo "$NOTFOUND" ) - local PYTHON_VERSION=$(lookup python && python -V 2>&1| awk '{print tolower($0);exit}' || echo "python $NOTFOUND" ) - local GPG_INFO=$(gpg_avail && gpg --version 2>&1| awk 'NR==1{v=$1" "$3};/^Home:/{print v" ("$0")"}' || echo "gpg $NOTFOUND") + local PYTHON_RUNNER=$(python_binary) + local PYTHON_VERSION=$(lookup "$PYTHON_RUNNER" && "$PYTHON_RUNNER" -V 2>&1| awk '{print tolower($0);exit}' || echo "'$PYTHON_RUNNER' $NOTFOUND" ) + local GPG_INFO=$(gpg_avail && gpg --version 2>&1| awk '/^gpg.*[0-9\.]+$/&&length(v)<1{v=$1" "$3}/^Home:/{h=" ("$0")"}END{print v""h}' || echo "gpg $NOTFOUND") local BASH_VERSION=$(bash --version | awk 'NR==1{IGNORECASE=1;sub(/GNU bash, version[ ]+/,"",$0);print $0}') echo -e "Using installed duplicity version ${DUPL_VERSION:-$NOTFOUND}\ ${PYTHON_VERSION+, $PYTHON_VERSION${PYTHONPATH:+ 'PYTHONPATH=$PYTHONPATH'}}\ @@ -512,8 +548,9 @@ It simplifies running duplicity with cron or on command line by: - keeping recurring settings in profiles per backup job - - enabling batch operations eg. backup_verify_purge - - executing pre/post scripts for every command + - enabling batch operations eg. backup_verify+purge + - executing pre/post scripts (different actions possible + depending on previous or next command or it's exit status) - precondition checking for flawless duplicity operation For each backup job one configuration profile must be created. @@ -748,9 +785,9 @@ # sftp://bob:secret@backupserver.com//home/bob/dupbkp # for details and available backends see duplicity manpage, section URL Format # http://duplicity.nongnu.org/duplicity.1.html#sect7 -# NOTE: -# some backends (eg. cloudfiles) need additional env vars to be set to -# work properly, when in doubt consult the man page mentioned above. +# BE AWARE: +# some backends (cloudfiles, S3 etc.) need additional env vars to be set to +# work properly, read after the TARGET definition for more details. # ATTENTION: # characters other than A-Za-z0-9.-_.~ in the URL have to be # replaced by their url encoded pendants, see @@ -760,15 +797,25 @@ TARGET='${DEFAULT_TARGET}' # optionally the username/password can be defined as extra variables # setting them here _and_ in TARGET results in an error +# ATTENTION: +# there are backends that do not support the user/pass auth scheme. +# prominent examples are S3, Azure, Cloudfiles. when in doubt consult the +# duplicity manpage. usually there is a NOTE section explaining if and which +# env vars should be set. #TARGET_USER='${DEFAULT_TARGET_USER}' #TARGET_PASS='${DEFAULT_TARGET_PASS}' -# alternatively you might export the auth env vars for your backend here -# when in doubt consult (if existing) the NOTE section of your backend on -# http://duplicity.nongnu.org/duplicity.1.html for details # eg. for cloud files backend it might look like this (uncomment for use!) #export CLOUDFILES_USERNAME='someuser' #export CLOUDFILES_APIKEY='somekey' #export CLOUDFILES_AUTHURL ='someurl' +# the following is an incomplete list (<backend>: comma separated env vars list) +# Azure: AZURE_ACCOUNT_NAME, AZURE_ACCOUNT_KEY +# Cloudfiles: CLOUDFILES_USERNAME, CLOUDFILES_APIKEY, CLOUDFILES_AUTHURL +# Google Cloud Storage: GS_ACCESS_KEY_ID, GS_SECRET_ACCESS_KEY +# Pydrive: GOOGLE_DRIVE_ACCOUNT_KEY, GOOGLE_DRIVE_SETTINGS +# S3: AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY +# Swift: SWIFT_USERNAME, SWIFT_PASSWORD, SWIFT_AUTHURL, +# SWIFT_TENANTNAME OR SWIFT_PREAUTHURL, SWIFT_PREAUTHTOKEN # base directory to backup SOURCE='${DEFAULT_SOURCE}' @@ -778,6 +825,10 @@ # "trickle -s -u 640 -d 5120" # 5Mb up, 40Mb down" #DUPL_PRECMD="" +# override the used python interpreter, defaults to "python" +# e.g. "python2" or "/usr/bin/python2.7" +#PYTHON="python" + # exclude folders containing exclusion file (since duplicity 0.5.14) # Uncomment the following two lines to enable this setting. #FILENAME='.duplicity-ignore' @@ -1049,12 +1100,13 @@ elif [ -n "$CMD_DISABLED" ]; then CMD_MSG="$CMD_MSG (DISABLED) - $CMD_DISABLED" else + echo -n -e "$CMD_MSG" CMD_OUT=` eval "$@" 2>&1 ` CMD_ERR=$? if [ "$CMD_ERR" = "0" ]; then - CMD_MSG="$CMD_MSG (OK)" + CMD_MSG=" (OK)" else - CMD_MSG="$CMD_MSG (FAILED)" + CMD_MSG=" (FAILED)" fi fi echo -e "$CMD_MSG" @@ -1147,9 +1199,18 @@ # init global duplicity parameters same for all tasks duplicity_params_global - var_isset 'PREVIEW' && local RUN=echo || local RUN=eval + local RUN=eval BIN=duplicity DUPL_BIN + # run in cmd line preview mode if requested + var_isset 'PREVIEW' && RUN=echo + # try to resolve duplicity path for usage with python interpreter + DUPL_BIN=$(which "$BIN") || DUPL_BIN="$BIN" + # only run with a user specific python if configured (running by default + # breaks homebrew as they place a shell wrapper for duplicity in path) + [ -n "$PYTHON" ] && [ "$PYTHON" != "$DEFAULT_PYTHON" ] &&\ + BIN="$(qw "$(python_binary)") $(qw "$DUPL_BIN")" + $RUN ${DUPL_VARS_GLOBAL} ${BACKEND_PARAMS} \ - ${DUPL_PRECMD} duplicity $DUPL_CMD $DUPL_PARAMS_GLOBAL $(duplicity_params_conf)\ +${DUPL_PRECMD} $BIN $DUPL_CMD $DUPL_PARAMS_GLOBAL $(duplicity_params_conf)\ $GPG_USEAGENT $(gpg_custom_binary) $DUPL_CMD_PARAMS ${PREVIEW:+} local ERR=$? @@ -1181,7 +1242,7 @@ echo $date && return ## some date commands do not support giving a time w/o setting it systemwide (irix,solaris,others?) # python fallback - date=$(python -c "import time;print time.strftime('${1:-$DEFAULTFORMAT}',time.localtime(${2}))" 2> /dev/null) && \ + date=$("$(python_binary)" -c "import time;print time.strftime('${1:-$DEFAULTFORMAT}',time.localtime(${2}))" 2> /dev/null) && \ echo $date && return # awk fallback date=$(awk "BEGIN{print strftime(\"${1:-$DEFAULTFORMAT}\"${2:+,$2})}" 2> /dev/null) && \ @@ -1227,7 +1288,7 @@ function url_encode { # utilize python, silently do nothing on error - because no python no duplicity - OUT=$(python -c " + OUT=$("$(python_binary)" -c " try: import urllib.request as urllib except ImportError: import urllib print(urllib.${2}quote('$1')); @@ -1316,7 +1377,7 @@ FOUND=1 CMD_MSG="Import keyfile '$FILE' to keyring" - run_cmd gpg $GPG_OPTS --batch --import "$FILE" + run_cmd gpg $GPG_OPTS --batch --import $(qw "$FILE") if [ "$?" != "0" ]; then warning "Import failed.${CMD_OUT:+\n$CMD_OUT}" ERR=1 @@ -1343,7 +1404,7 @@ with the command \"trust\" to \"ultimate\" (5) now. Exit the edit mode of gpg with \"quit\"." CMD_MSG="Running gpg to manually edit key '$KEY_ID'" - run_cmd sleep 5\; gpg $GPG_OPTS --edit-key "$KEY_ID" + run_cmd sleep 5\; gpg $GPG_OPTS --edit-key $(qw "$KEY_ID") return $ERR } @@ -1364,15 +1425,15 @@ FILE="$(gpg_keyfile "$KEY_ID" $KEY_TYPE)" if [ ! -f "$FILE" ] && eval gpg_$(tolower $KEY_TYPE)_avail \"$KEY_ID\"; then # exporting - CMD_MSG="Export $KEY_TYPE key '$KEY_ID'" + CMD_MSG="Backup $KEY_TYPE key '$KEY_ID' to profile." # gpg2.1 insists on passphrase here, gpg2.0- happily exports w/o it # we pipe an empty string when GPG_PW is not set to avoid gpg silently waiting for input - run_cmd echo $(qw $GPG_PW) \| gpg $GPG_OPTS --passphrase-fd 0 --armor --export"$(test "SEC" = "$KEY_TYPE" && echo -secret-keys)"" $(qw $KEY_ID) >> \"$TMPFILE\"" + run_cmd $(gpg_pass_pipein GPG_PW_SIGN GPG_PW) gpg $GPG_OPTS $GPG_USEAGENT $(gpg_param_passwd GPG_PW_SIGN GPG_PW) --armor --export"$(test "SEC" = "$KEY_TYPE" && echo -secret-keys)" $(qw "$KEY_ID") '>>' $(qw "$TMPFILE") CMD_ERR=$? if [ "$CMD_ERR" = "0" ]; then CMD_MSG="Write file '"$(basename "$FILE")"'" - run_cmd " mv \"$TMPFILE\" \"$FILE\"" + run_cmd mv $(qw "$TMPFILE") $(qw "$FILE") fi if [ "$CMD_ERR" != "0" ]; then @@ -1382,7 +1443,7 @@ fi # cleanup - rm "$TMPFILE" 1>/dev/null 2>&1 + rm $(qw "$TMPFILE") 1>/dev/null 2>&1 fi done done @@ -1432,13 +1493,8 @@ echo $1 | grep -q '^[0-9a-fA-F]\{8\}$' } -#function gpg_split_keyset { -# return -# awk "BEGIN{ keys=toupper(\"$@\"); gsub(/[^A-Z0-9]/,\" \",keys); print keys }" -#} - # splits a comma separated line into lines, respects escaped commas -function gpg_split_keyset2 { +function gpg_split_keyset { local LIST LIST=$(echo "$@" | awk '{ gsub(/,/,"\n",$0); gsub(/\\\n/,",",$0); print $0 }') echo -e "$LIST" @@ -1503,13 +1559,18 @@ # 0 on success # 1 if GPG_AGENT_INFO is not set # 2 if GPG_AGENT_INFO is stale +# 3 cannot connect to gpg-agent function gpg_agent_avail { local ERR=1 if var_isset GPG_AGENT_INFO; then - ps -p $(echo $GPG_AGENT_INFO|awk -F: '{print $2}') > /dev/null 2>&1 &&\ - ERR=0 || ERR=2 + ps -p $(echo $GPG_AGENT_INFO|awk -F: '{print $2}') > /dev/null 2>&1 && \ + ERR=0 || ERR=2 + else + # GPG_AGENT_INFO is deprecated in gpg2.1, + # so we try to connect to a possibly running agent here + gpg-agent > /dev/null 2>&1 && ERR=0 || ERR=3 fi - + return $ERR } @@ -1525,12 +1586,12 @@ } function gpg_avail { - lookup $(gpg_binary) + lookup "$(gpg_binary)" } # enforce the use our selected gpg binary function gpg { - command $(gpg_binary) "$@" + command "$(gpg_binary)" "$@" } export -f gpg @@ -1621,7 +1682,7 @@ duplicity_version_check # check for certain important helper programs -for f in awk grep; do +for f in awk grep "$(python_binary)"; do lookup "$f" || \ error_path "$f missing. installed und available in path?" done @@ -1784,10 +1845,13 @@ # GPG create key settings, config check2 (needs gpg) ########################## if gpg_disabled; then - : # the following tests are not necessary + : # the following tests are not necessary else -# key set? +# we test this early as any invocation gpg2.1+ starts gpg-agent automatically +GPG_AGENT_ERR=$(gpg_agent_avail ; echo $?) + +# enc key still default? if [ "$GPG_KEY" == "${DEFAULT_GPG_KEY}" ]; then error_gpg "Encryption Key GPG_KEY still default in conf file '$CONF'." @@ -1795,9 +1859,30 @@ # create array of gpg encr keys, for further processing OIFS="$IFS" IFS=$'\n' -GPG_KEYS_ENC_ARRAY=( $( gpg_split_keyset2 ${GPG_KEY},${GPG_KEYS_ENC} ) ) +GPG_KEYS_ENC_ARRAY=( $( gpg_split_keyset ${GPG_KEY},${GPG_KEYS_ENC} ) ) IFS="$OIFS" +# pw set? +# symmetric needs one, always +if gpg_symmetric && ( [ -z "$GPG_PW" ] || [ "$GPG_PW" == "${DEFAULT_GPG_PW}" ] ) \ + ; then + error_gpg "Encryption passphrase GPG_PW (needed for symmetric encryption) +is empty/not set or still default value in conf file +'$CONF'." +fi +# this is a technicality, we can only pump one pass via pipe into gpg +# but symmetric already always needs one for encryption +if gpg_symmetric && var_isset GPG_PW && var_isset GPG_PW_SIGN &&\ + [ -n "$GPG_PW_SIGN" ] && [ "$GPG_PW" != "$GPG_PW_SIGN" ]; then + error_gpg "GPG_PW _and_ GPG_PW_SIGN are defined but not identical in config +'$CONF'. +This is unfortunately impossible. For details see duplicity manpage, +section 'A Note On Symmetric Encryption And Signing'. + +Tip: Separate signing keys may have empty passwords e.g. GPG_PW_SIGN=''. +Tip2: Use gpg-agent." +fi + # check gpg encr public keys availability for (( i = 0 ; i < ${#GPG_KEYS_ENC_ARRAY[@]} ; i++ )); do KEY_ID="${GPG_KEYS_ENC_ARRAY[$i]}" @@ -1850,26 +1935,7 @@ fi fi -# pw set? -# symmetric needs one, always -if gpg_symmetric && ( [ -z "$GPG_PW" ] || [ "$GPG_PW" == "${DEFAULT_GPG_PW}" ] ) \ - ; then - error_gpg "Encryption passphrase GPG_PW (needed for symmetric encryption) -is empty/not set or still default value in conf file -'$CONF'." -fi -# this is a technicality, we can only pump one pass via pipe into gpg -# but symmetric already always needs one for encryption -if gpg_symmetric && var_isset GPG_PW && var_isset GPG_PW_SIGN &&\ - [ -n "$GPG_PW_SIGN" ] && [ "$GPG_PW" != "$GPG_PW_SIGN" ]; then - error_gpg "GPG_PW _and_ GPG_PW_SIGN are defined but not identical in config -'$CONF'. -This is unfortunately impossible. For details see duplicity manpage, -section 'A Note On Symmetric Encryption And Signing'. - -Tip: Separate signing keys may have empty passwords e.g. GPG_PW_SIGN=''. -Tip2: Use gpg-agent." -fi +# using GPG_AGENT_ERR set early above, try to autoenable gpg-agent or issue some warnings # key enc can deal without, but might profit from gpg-agent # if GPG_PW is not set alltogether # if signing key is different from first (main) enc key (we can only pipe one pass into gpg) @@ -1877,13 +1943,14 @@ ( ! var_isset GPG_PW || \ ( gpg_signing && ! var_isset GPG_PW_SIGN && [ "$GPG_KEY_SIGN" != "${GPG_KEYS_ENC_ARRAY[0]}" ] ) ); then - GPG_AGENT_ERR=$(gpg_agent_avail ; echo $?) if [ "$GPG_AGENT_ERR" -eq 1 ]; then - echo "Cannot use gpg-agent. GPG_AGENT_INFO not set." + warning "Cannot use gpg-agent. GPG_AGENT_INFO not set." elif [ "$GPG_AGENT_ERR" -eq 2 ]; then - echo "Cannot use gpg-agent! GPG_AGENT_INFO contains stale pid." + warning "Cannot use gpg-agent! GPG_AGENT_INFO contains stale pid." + elif [ "$GPG_AGENT_ERR" -eq 3 ]; then + warning "No running gpg-agent found although GPG_PW or GPG_PW_SIGN (enc != sign key) not set." else - echo "Autoenable use of gpg-agent. GPG_PW or GPG_PW_SIGN (enc != sign key) not set." + echo "Enable gpg-agent usage. Running gpg-agent instance found and GPG_PW or GPG_PW_SIGN (enc != sign key) not set." GPG_USEAGENT="--use-agent" fi fi @@ -1893,17 +1960,11 @@ # config plausibility check - SPACE ########################################### -# is tmp is a folder -CMD_MSG="Checking TEMP_DIR '${TEMP_DIR}' is a folder" -run_cmd test -d "$TEMP_DIR" -if [ "$?" != "0" ]; then - error "Temporary file space '$TEMP_DIR' is not a directory." -fi -# is tmp writeable -CMD_MSG="Checking TEMP_DIR '${TEMP_DIR}' is writable" -run_cmd test -w "$TEMP_DIR" +# is tmp is a folder and writable +CMD_MSG="Checking TEMP_DIR '${TEMP_DIR}' is a folder and writable" +run_cmd test -d $(qw "$TEMP_DIR") '&&' test -w $(qw "$TEMP_DIR") if [ "$?" != "0" ]; then - error "Temporary file space '$TEMP_DIR' not writable." + error "Temporary file space '$TEMP_DIR' is not a directory or writable." fi @@ -1928,7 +1989,7 @@ GPG_TEST="$TEMP_DIR/${ME_NAME}.$$.$(date_fix %s)" function cleanup_gpgtest { echo -en "Cleanup - Delete '${GPG_TEST}_*'" - rm ${GPG_TEST}_* 2>/dev/null && echo "(OK)" || echo "(FAILED)" + rm "${GPG_TEST}"_* 2>/dev/null && echo "(OK)" || echo "(FAILED)" } # signing enabled? @@ -1945,7 +2006,7 @@ done # check encrypting CMD_MSG="Test - Encrypt to '$(join "','" "${GPG_KEYS_ENC_ARRAY[@]}")'${CMD_MSG_SIGN:+ & $CMD_MSG_SIGN}" - run_cmd $(gpg_pass_pipein GPG_PW_SIGN GPG_PW) gpg $CMD_PARAM_SIGN $(gpg_param_passwd GPG_PW_SIGN GPG_PW) $CMD_PARAMS $GPG_USEAGENT --status-fd 1 $GPG_OPTS -o "${GPG_TEST}_ENC" -e "$ME_LONG" + run_cmd $(gpg_pass_pipein GPG_PW_SIGN GPG_PW) gpg $CMD_PARAM_SIGN $(gpg_param_passwd GPG_PW_SIGN GPG_PW) $CMD_PARAMS $GPG_USEAGENT --status-fd 1 $GPG_OPTS -o $(qw "${GPG_TEST}_ENC") -e $(qw "$ME_LONG") CMD_ERR=$? if [ "$CMD_ERR" != "0" ]; then @@ -1959,7 +2020,7 @@ # check decrypting CMD_MSG="Test - Decrypt" gpg_key_decryptable || CMD_DISABLED="No matching secret key available." - run_cmd $(gpg_pass_pipein GPG_PW) gpg $(gpg_param_passwd GPG_PW) $GPG_OPTS -o "${GPG_TEST}_DEC" $GPG_USEAGENT -d "${GPG_TEST}_ENC" + run_cmd $(gpg_pass_pipein GPG_PW) gpg $(gpg_param_passwd GPG_PW) $GPG_OPTS -o $(qw "${GPG_TEST}_DEC") $GPG_USEAGENT -d $(qw "${GPG_TEST}_ENC") CMD_ERR=$? if [ "$CMD_ERR" != "0" ]; then @@ -1970,7 +2031,7 @@ else # check encrypting CMD_MSG="Test - Encryption with passphrase${CMD_MSG_SIGN:+ & $CMD_MSG_SIGN}" - run_cmd $(gpg_pass_pipein GPG_PW) gpg $GPG_OPTS $CMD_PARAM_SIGN --passphrase-fd 0 -o "${GPG_TEST}_ENC" --batch -c "$ME_LONG" + run_cmd $(gpg_pass_pipein GPG_PW) gpg $GPG_OPTS $CMD_PARAM_SIGN --passphrase-fd 0 -o $(qw "${GPG_TEST}_ENC") --batch -c $(qw "$ME_LONG") CMD_ERR=$? if [ "$CMD_ERR" != "0" ]; then error_gpg_test "Encryption failed.${CMD_OUT:+\n$CMD_OUT}" @@ -1978,7 +2039,7 @@ # check decrypting CMD_MSG="Test - Decryption with passphrase" - run_cmd $(gpg_pass_pipein GPG_PW) gpg $GPG_OPTS --passphrase-fd 0 -o "${GPG_TEST}_DEC" --batch -d "${GPG_TEST}_ENC" + run_cmd $(gpg_pass_pipein GPG_PW) gpg $GPG_OPTS --passphrase-fd 0 -o $(qw "${GPG_TEST}_DEC") --batch -d $(qw "${GPG_TEST}_ENC") CMD_ERR=$? if [ "$CMD_ERR" != "0" ]; then error_gpg_test "Decryption failed.${CMD_OUT:+\n$CMD_OUT}" @@ -2055,15 +2116,6 @@ var_isset 'TARGET_URL_PASS' && BACKEND_PARAMS="IMAP_PASSWORD=$(qw "${TARGET_URL_PASS}")" ;; *) - # add needed param for ssh backend - case "$(tolower "${TARGET_URL_PROT%%:*}")" in - 'ssh'|'sftp'|'scp') - # ssh backend wants to be told that there is a pass to use - var_isset 'TARGET_URL_PASS' && \ - DUPL_PARAMS="$DUPL_PARAMS --ssh-askpass" && \ - BACKEND_PARAMS="FTP_PASSWORD=$(qw "${TARGET_URL_PASS}")" - ;; - esac # rest uses FTP_PASS var var_isset 'TARGET_URL_PASS' && \ BACKEND_PARAMS="FTP_PASSWORD=$(qw "${TARGET_URL_PASS}")"

1 0

commit ghc for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package ghc for openSUSE:Factory checked in at 2016-09-30 15:33:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc (Old) and /work/SRC/openSUSE:Factory/.ghc.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ghc" Changes: -------- --- /work/SRC/openSUSE:Factory/ghc/ghc.changes 2016-08-22 10:07:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc.new/ghc.changes 2016-09-30 15:33:10.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Sep 27 11:53:54 UTC 2016 - peter.trommler(a)ohm-hochschule.de + +- add D2495.patch +* missing memory barrier on PowerPC, ARM +- add 0001-StgCmmPrim-Add-missing-write-barrier.patch +* another issing memory barrier on PowerPC, ARM +- add 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch +* fix bug in code generator +* fixes build of ghc-zeromq4-haskell on powerpc64[le] + +------------------------------------------------------------------- New: ---- 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch 0001-StgCmmPrim-Add-missing-write-barrier.patch D2495.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc.spec ++++++ --- /var/tmp/diff_new_pack.PPPE4X/_old 2016-09-30 15:33:14.000000000 +0200 +++ /var/tmp/diff_new_pack.PPPE4X/_new 2016-09-30 15:33:14.000000000 +0200 @@ -88,6 +88,12 @@ Patch25: D2214.patch # PATCH-FIX-UPSTREAM D2225.patch peter.trommler(a)ohm-hochschule.de -- Fix SMP imlementation in Haskell runtime on PPC[64[le]]. Backport of upstreamed patch. See Haskell trac #12070 and https://phabricator.haskell.org/D2225 for details. Patch26: D2225.patch +# PATCH-FIX-UPSTREAM D2495.patch peter.trommler(a)ohm-hochschule.de -- Add missing memory barrier on mutable variables. See https://ghc.haskell.org/trac/ghc/ticket/12469 for details. Backport of upstream fix for ghc 8.0.2. +Patch27: D2495.patch +# PATCH-FIX_UPSTREAM 0001-StgCmmPrim-Add-missing-write-barrier.patch peter.trommler(a)ohm-hochschule.de -- Add missing write barrier on mutable arrays. +Patch28: 0001-StgCmmPrim-Add-missing-write-barrier.patch +# PATCH-FIX-UPSTREAM 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch peter.trommler(a)ohm-hochschule.de -- Fix PPC codegen: Fixes ghc-zeromq4-haskell build on 64-bit PowerPCs +Patch30: 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -188,6 +194,9 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 +%patch27 -p1 +%patch28 -p1 +%patch30 -p1 %build # Patch 19 modifies build system ++++++ 0001-PPC-CodeGen-fix-lwa-instruction-generation.patch ++++++ >From ff48b3e3fd90e0328921f5e86460aba3ff217002 Mon Sep 17 00:00:00 2001 From: Peter Trommler <ptrommler(a)acm.org> Date: Mon, 25 Jan 2016 20:32:44 +0100 Subject: [PATCH] PPC/CodeGen: fix lwa instruction generation --- compiler/nativeGen/PPC/CodeGen.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: ghc-7.10.3/compiler/nativeGen/PPC/CodeGen.hs =================================================================== --- ghc-7.10.3.orig/compiler/nativeGen/PPC/CodeGen.hs +++ ghc-7.10.3/compiler/nativeGen/PPC/CodeGen.hs @@ -464,7 +464,7 @@ getRegister' _ (CmmMachOp (MO_UU_Conv W3 return (Any II64 (\dst -> addr_code `snocOL` LD II32 dst addr)) getRegister' _ (CmmMachOp (MO_SS_Conv W32 W64) [CmmLoad mem _]) = do - Amode addr addr_code <- getAmode D mem + Amode addr addr_code <- getAmode DS mem -- lwa is DS-form return (Any II64 (\dst -> addr_code `snocOL` LA II32 dst addr)) getRegister' dflags (CmmMachOp mop [x]) -- unary MachOps ++++++ 0001-StgCmmPrim-Add-missing-write-barrier.patch ++++++ >From ca2e649101f250e444b4ac7c5204d28f236660e6 Mon Sep 17 00:00:00 2001 From: Peter Trommler <ptrommler(a)acm.org> Date: Fri, 9 Sep 2016 10:55:58 +0200 Subject: [PATCH] StgCmmPrim: Add missing write barrier. --- compiler/codeGen/StgCmmPrim.hs | 1 + 1 file changed, 1 insertion(+) Index: ghc-7.10.3/compiler/codeGen/StgCmmPrim.hs =================================================================== --- ghc-7.10.3.orig/compiler/codeGen/StgCmmPrim.hs +++ ghc-7.10.3/compiler/codeGen/StgCmmPrim.hs @@ -1324,6 +1324,7 @@ doWritePtrArrayOp addr idx val emit (setInfo addr (CmmLit (CmmLabel mkMAP_DIRTY_infoLabel))) -- the write barrier. We must write a byte into the mark table: -- bits8[a + header_size + StgMutArrPtrs_size(a) + x >> N] + emitPrimCall [] MO_WriteBarrier [] emit $ mkStore ( cmmOffsetExpr dflags (cmmOffsetExprW dflags (cmmOffsetB dflags addr (arrPtrsHdrSize dflags)) ++++++ D2495.patch ++++++ Index: ghc-8.0.1/compiler/codeGen/StgCmmPrim.hs =================================================================== --- ghc-8.0.1.orig/compiler/codeGen/StgCmmPrim.hs +++ ghc-8.0.1/compiler/codeGen/StgCmmPrim.hs @@ -310,8 +310,11 @@ emitPrimOp _ [res] GetCurrentCCSOp [_dum emitPrimOp dflags [res] ReadMutVarOp [mutv] = emitAssign (CmmLocal res) (cmmLoadIndexW dflags mutv (fixedHdrSizeW dflags) (gcWord dflags)) -emitPrimOp dflags [] WriteMutVarOp [mutv,var] - = do emitStore (cmmOffsetW dflags mutv (fixedHdrSizeW dflags)) var +emitPrimOp dflags res@[] WriteMutVarOp [mutv,var] + = do -- Without this write barrier, other CPUs may see this pointer before + -- the writes for the closure it points to have occurred. + emitPrimCall res MO_WriteBarrier [] + emitStore (cmmOffsetW dflags mutv (fixedHdrSizeW dflags)) var emitCCall [{-no results-}] (CmmLit (CmmLabel mkDirty_MUT_VAR_Label))

1 0

commit unbound for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package unbound for openSUSE:Factory checked in at 2016-09-30 15:32:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/unbound (Old) and /work/SRC/openSUSE:Factory/.unbound.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "unbound" Changes: -------- --- /work/SRC/openSUSE:Factory/unbound/libunbound-devel-mini.changes 2016-07-12 23:56:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.unbound.new/libunbound-devel-mini.changes 2016-09-30 15:33:02.000000000 +0200 @@ -1,0 +2,107 @@ +Tue Sep 27 12:41:57 UTC 2016 - michael(a)stroeder.com + +- update to 1.5.10 + +Features + * Create a pkg-config file for libunbound in contrib. + * TCP Fast open patch from Sara Dickinson. + * Finegrained localzone control with define-tag, access-control-tag, + access-control-tag-action, access-control-tag-data, local-zone-tag, and + local-zone-override. And added types always_transparent, always_refuse, + always_nxdomain with that. + * If more than half of tcp connections are in use, a shorter timeout + is used (200 msec, vs 2 minutes) to pressure tcp for new connects. + * [bugzilla: 787 ] Fix #787: outgoing-interface netblock/64 ipv6 + option to use linux freebind to use 64bits of entropy for every query + with random local part. + * For #787: prefer-ip6 option for unbound.conf prefers to send + upstream queries to ipv6 servers. + * Add default root hints for IPv6 E.ROOT-SERVERS.NET, 2001:500:a8::e. + * keep debug symbols in windows build. + +Bug Fixes + * [bugzilla: 778 ] Fix unbound 1.5.9: -h segfault (null deref). + * Fix unbound-anchor.exe file location defaults to Program Files with + (x86) appended. + * Fix to not ignore return value of chown() in daemon startup. + * Better help text from -h (from Ray Griffith). + * [bugzilla: 773 ] Fix Non-standard Python location build failure with + pyunbound. + * Improve threadsafety for openssl 0.9.8 ecdsa dnssec signatures. + * Revert fix for NetworkService account on windows due to breakage it + causes. + * Fix that windows install will not overwrite existing service.conf + file (and ignore gui config choices if it exists). + * And delete service.conf.shipped on uninstall. + * In unbound.conf directory: dir immediately changes to that + directory, so that include: file below that is relative to that + directory. With chroot, make the directory an absolute path inside chroot. + * do not delete service.conf on windows uninstall. + * document directory immediate fix and allow EXECUTABLE syntax in it + on windows. + * Fix directory: fix for unbound-checkconf, it restores cwd. + * Use QTYPE=A for QNAME minimisation. + * Keep track of number of time-outs when performing QNAME + minimisation. Stop minimising when number of time-outs for a QNAME/QTYPE + pair is more than three. + * [bugzilla: 775 ] Fix unbound-host and unbound-anchor crash on + windows, ignore null delete for wsaevent. + * Fix spelling in freebind option man page text. + * Fix windows link of ssl with crypt32. + * [bugzilla: 779 ] Fix Union casting is non-portable. + * [bugzilla: 780 ] Fix MAP_ANON not defined in HP-UX 11.31. + * [bugzilla: 781 ] Fix prealloc() is an HP-UX system library call. + * Decrease dp attempts at each QNAME minimisation iteration + * [bugzilla: 784 ] Fix Build configure assumess that having getpwnam + means there is endpwent function available. + * Updated repository with newer flex and bison output. + * Fix static compile on windows missing gdi32. + * Fix dynamic link of anchor-update.exe on windows. + * Fix detect of mingw for MXE package build. + * Fixes for 64bit windows compile. + * [bugzilla: 788 ] Fix for nettle 3.0: Failed to build with Nettle >= + 3.0 and --with-libunbound-only --with-nettle. + * Fixed unbound.doxygen for 1.8.11. + * [bugzilla: 798 ] Fix Client-side TCP fast open fails (Linux). + * [bugzilla: 801 ] Fix missing error condition handling in + daemon_create_workers(). + * [bugzilla: 802 ] Fix workaround for function parameters that are + "unused" without log_assert. + * [bugzilla: 803 ] Fix confusing (and incorrect) code comment in + daemon_cleanup(). + * [bugzilla: 806 ] Fix wrong comment removed. + * use sendmsg instead of sendto for TFO. + * [bugzilla: 807 ] Fix workaround for possible some "unused" function + parameters in test code, from Jinmei Tatuya. + * Note that OPENPGPKEY type is RFC 7929. + * [bugzilla: 804 ] Fix #804: unbound stops responding after outage. + Fixes queries that attempt to wait for an empty list of subqueries. + * Fix for #804: lower num_target_queries for iterator also for failed + lookups. + * [bugzilla: 820 ] Fix set sldns_str2wire_rr_buf() dual meaning len + parameter in each iteration in find_tag_datas(). + * [bugzilla: 777 ] Fix OpenSSL 1.1.0 compatibility, patch from + Sebastian A. Siewior. + * RFC 7958 is now out, updated docs for unbound-anchor. + * Fix for compile without warnings with openssl 1.1.0. + * [bugzilla: 826 ] Fix refuse_non_local could result in a broken response. + * iana portlist update. + * Fix compile with openssl 1.1.0 with api=1.1.0. + * [bugzilla: 829 ] Fix doc of sldns_wire2str_rdata_buf() return value + has an off-by-one typo, from Jinmei Tatuya (Infoblox). + * Fix incomplete prototypes reported by Dag-Erling Smørgrav. + * [bugzilla: 828 ] Fix missing type in access-control-tag-action + redirect results in NXDOMAIN. + * Take configured minimum TTL into consideration when reducing TTL to + original TTL from RRSIG. + * [bugzilla: 831 ] Fix workaround for spurious fread_chk warning + against petal.c + * Silenced flex-generated sign-unsigned warning print with gcc + diagnostic pragma. + * Fix for new splint on FreeBSD. Fix cast for sockaddr_un.sun_len. + * fix potential memory leak in daemon/remote.c and nullpointer + dereference in validator/autotrust. + * [bugzilla: 883 ] Fix error for duplicate local zone entry. + * [bugzilla: 835 ] Fix --disable-dsa with nettle verify. + +------------------------------------------------------------------- unbound.changes: same change Old: ---- unbound-1.5.9.tar.gz New: ---- unbound-1.5.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libunbound-devel-mini.spec ++++++ --- /var/tmp/diff_new_pack.iCt2qk/_old 2016-09-30 15:33:08.000000000 +0200 +++ /var/tmp/diff_new_pack.iCt2qk/_new 2016-09-30 15:33:08.000000000 +0200 @@ -24,7 +24,7 @@ # Name: libunbound-devel-mini -Version: 1.5.9 +Version: 1.5.10 Release: 0 # # ++++++ unbound.spec ++++++ --- /var/tmp/diff_new_pack.iCt2qk/_old 2016-09-30 15:33:08.000000000 +0200 +++ /var/tmp/diff_new_pack.iCt2qk/_new 2016-09-30 15:33:08.000000000 +0200 @@ -53,7 +53,7 @@ %endif Name: unbound -Version: 1.5.9 +Version: 1.5.10 Release: 0 # # ++++++ unbound-1.5.9.tar.gz -> unbound-1.5.10.tar.gz ++++++ ++++ 15173 lines of diff (skipped)

1 0

commit emacs-auctex for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package emacs-auctex for openSUSE:Factory checked in at 2016-09-30 15:32:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs-auctex (Old) and /work/SRC/openSUSE:Factory/.emacs-auctex.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "emacs-auctex" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs-auctex/emacs-auctex.changes 2015-12-09 22:15:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.emacs-auctex.new/emacs-auctex.changes 2016-09-30 15:33:00.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 20 14:20:47 UTC 2016 - werner(a)suse.de + +- Add patch 0001-Fix_bug_in_subfigure_style_filee.patch + to fix build with GNU Emacs 25.1 + +------------------------------------------------------------------- New: ---- 0001-Fix_bug_in_subfigure_style_filee.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs-auctex.spec ++++++ --- /var/tmp/diff_new_pack.zlSTqN/_old 2016-09-30 15:33:02.000000000 +0200 +++ /var/tmp/diff_new_pack.zlSTqN/_new 2016-09-30 15:33:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package emacs-auctex # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -45,6 +45,8 @@ # Allows to select printer instance # PATCH-FEATURE-UPSTREAM dvips.patch Patch0: dvips.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Fix_bug_in_subfigure_style_filee.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -68,6 +70,7 @@ %prep %setup -n auctex-%{version} %patch0 +%patch1 -p1 %build unset ${!LC_*} @@ -121,6 +124,11 @@ ;; (load "preview-latex.el" nil t t) EOF + for el in auctex.el preview-latex.el + do + test -e %{buildroot}%{_sitedir}/$el || continue + mv %{buildroot}%{_sitedir}/$el %{buildroot}%{_sitedir}/site-start.d/ + done # # Preview is part of te_latex # ++++++ 0001-Fix_bug_in_subfigure_style_filee.patch ++++++ >From d2c7bb3aa56930c45722482fd64174b2504bb9a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <mose(a)gnu.org> Date: Wed, 20 Jan 2016 23:00:03 +0100 Subject: Fix bug in subfigure style file * style/subfigure.el ("subfigure"): Move `TeX-complete-list' inside append argument. Fixes bug#22417. --- style/subfigure.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/style/subfigure.el b/style/subfigure.el index e129e62..5d7525b 100644 --- a/style/subfigure.el +++ b/style/subfigure.el @@ -47,8 +47,8 @@ ;; Install completion for labels: (setq TeX-complete-list (append - '(("\\\\[Ss]ubref{\$[^{}\n\r\\%,]*\$" 1 LaTeX-label-list "}"))) - TeX-complete-list) + '(("\\\\[Ss]ubref{\$[^{}\n\r\\%,]*\$" 1 LaTeX-label-list "}")) + TeX-complete-list)) ;; Fontification (when (and (featurep 'font-latex) -- cgit v1.0

1 0

commit xfce4-vala for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package xfce4-vala for openSUSE:Factory checked in at 2016-09-30 15:32:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-vala (Old) and /work/SRC/openSUSE:Factory/.xfce4-vala.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfce4-vala" Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-vala/xfce4-vala.changes 2016-04-05 10:43:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-vala.new/xfce4-vala.changes 2016-09-30 15:32:57.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Sep 23 18:32:25 UTC 2016 - zaitor(a)opensuse.org + +- Add support for vala 0.34 in Factory, replacing vala 0.32. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-vala.spec ++++++ --- /var/tmp/diff_new_pack.aLD3hR/_old 2016-09-30 15:32:59.000000000 +0200 +++ /var/tmp/diff_new_pack.aLD3hR/_new 2016-09-30 15:32:59.000000000 +0200 @@ -35,7 +35,7 @@ %define vala_version 0.26 %endif %if 0%{?suse_version} > 1320 -%define vala_version 0.32 +%define vala_version 0.34 %endif %define vala_libname libvala-%{vala_version}

1 0

commit nemo for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package nemo for openSUSE:Factory checked in at 2016-09-30 15:32:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nemo (Old) and /work/SRC/openSUSE:Factory/.nemo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nemo" Changes: -------- --- /work/SRC/openSUSE:Factory/nemo/nemo.changes 2016-06-25 02:24:02.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.nemo.new/nemo.changes 2016-09-30 15:32:54.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 27 12:38:17 UTC 2016 - sor.alexei(a)meowr.ru + +- Add nemo-fix-desktop-redraw.patch from upstream commit 4e5a103: + fix a GTK+ 3.21.3+ desktop (boo#1001431, gh#linuxmint/nemo#1231). + +------------------------------------------------------------------- New: ---- nemo-fix-desktop-redraw.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nemo.spec ++++++ --- /var/tmp/diff_new_pack.4yWqhD/_old 2016-09-30 15:32:57.000000000 +0200 +++ /var/tmp/diff_new_pack.4yWqhD/_new 2016-09-30 15:32:57.000000000 +0200 @@ -31,6 +31,8 @@ Patch1: %{name}-implicit-pointer-decl.patch # PATCH-FIX-UPSTREAM nemo-void-return-no-return.patch margueirte(a)opensuse.org -- Fix OBS gcc checks. Patch2: %{name}-void-return-no-return.patch +# PATCH-FIX-UPSTREAM nemo-fix-desktop-redraw.patch boo#1001431 gh#linuxmint/nemo#1231 -- Fix a GTK+ 3.21.3+ desktop redraw issue (commit 4e5a103). +Patch3: %{name}-fix-desktop-redraw.patch BuildRequires: cinnamon-translations BuildRequires: fdupes BuildRequires: gnome-common @@ -109,6 +111,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build NOCONFIGURE=1 gnome-autogen.sh ++++++ nemo-fix-desktop-redraw.patch ++++++ --- a/libnemo-private/nemo-icon-container.c +++ b/libnemo-private/nemo-icon-container.c @@ -4249,11 +4249,13 @@ realize (GtkWidget *widget) container = NEMO_ICON_CONTAINER (widget); +#if !GTK_CHECK_VERSION(3, 21, 0) /* Ensure that the desktop window is native so the background set on it is drawn by X. */ if (container->details->is_desktop) { gdk_x11_window_get_xid (gtk_layout_get_bin_window (GTK_LAYOUT (widget))); } +#endif /* Set up DnD. */ nemo_icon_dnd_init (container); --- a/src/nemo-desktop-icon-view.c +++ b/src/nemo-desktop-icon-view.c @@ -155,6 +155,10 @@ nemo_desktop_icon_view_class_init (NemoD vclass->update_menus = real_update_menus; vclass->get_view_id = real_get_id; +#if GTK_CHECK_VERSION(3, 21, 0) + GtkWidgetClass *wclass = GTK_WIDGET_CLASS (class); + gtk_widget_class_set_css_name (wclass, "nemo-desktop-icon-view"); +#endif g_type_class_add_private (class, sizeof (NemoDesktopIconViewDetails)); } --- a/src/nemo-style-application.css +++ b/src/nemo-style-application.css @@ -1,5 +1,10 @@ /* Desktop text stuff */ +.nemo-window.nemo-desktop-window notebook, +.nemo-window.nemo-desktop-window paned { + background-color: transparent; +} + .nemo-canvas-item { border-radius: 3px; }

1 0

commit netcdf-cxx4 for openSUSE:Factory
by root＠hilbert.suse.de 30 Sep '16

30 Sep '16

Hello community, here is the log from the commit of package netcdf-cxx4 for openSUSE:Factory checked in at 2016-09-30 15:32:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcdf-cxx4 (Old) and /work/SRC/openSUSE:Factory/.netcdf-cxx4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "netcdf-cxx4" Changes: -------- --- /work/SRC/openSUSE:Factory/netcdf-cxx4/netcdf-cxx4.changes 2016-09-20 13:25:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.netcdf-cxx4.new/netcdf-cxx4.changes 2016-09-30 15:32:52.000000000 +0200 @@ -1,0 +2,6 @@ +Mon Jul 25 13:10:20 UTC 2016 - jengelh(a)inai.de + +- Summary/RPM group update. +- Rename soname macro because it really just contains the version. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf-cxx4.spec ++++++ --- /var/tmp/diff_new_pack.fOSEGA/_old 2016-09-30 15:32:54.000000000 +0200 +++ /var/tmp/diff_new_pack.fOSEGA/_new 2016-09-30 15:32:54.000000000 +0200 @@ -16,14 +16,14 @@ # -%define soname 1 +%define sover 1 Name: netcdf-cxx4 Version: 4.3.0 Release: 0 Summary: C++ library for the Unidata network Common Data Form version 4 License: NetCDF -Group: System/Libraries +Group: Productivity/Scientific/Other Url: http://www.unidata.ucar.edu/software/netcdf/ Source0: http://www.unidata.ucar.edu/downloads/netcdf/ftp/netcdf-cxx4-%{version}.tar… BuildRequires: gcc-c++ @@ -50,12 +50,12 @@ This package provides tools for working with the C++ API. -%package -n libnetcdf_c++4-%{soname} -Summary: C++ library for for the Unidata network Common Data Form version 4 +%package -n libnetcdf_c++4-%{sover} +Summary: C++ library for the Unidata network Common Data Form version 4 Group: System/Libraries -Provides: libnetcdf%{soname}:%{_libdir}/libnetcdf_c++.so.%{soname} +Provides: libnetcdf%{sover}:%{_libdir}/libnetcdf_c++.so.%{sover} -%description -n libnetcdf_c++4-%{soname} +%description -n libnetcdf_c++4-%{sover} NetCDF4 (network Common Data Form) is a set of software libraries and machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. @@ -65,7 +65,7 @@ %package -n libnetcdf_c++4-devel Summary: Development files for netcdf_c++ Group: Development/Libraries/C and C++ -Requires: libnetcdf_c++4-%{soname} = %{version} +Requires: libnetcdf_c++4-%{sover} = %{version} Provides: libnetcdf-devel:%{_libdir}/libnetcdf_c++.so %description -n libnetcdf_c++4-devel @@ -85,20 +85,20 @@ %check make check -%post -n libnetcdf_c++4-%{soname} -p /sbin/ldconfig +%post -n libnetcdf_c++4-%{sover} -p /sbin/ldconfig -%postun -n libnetcdf_c++4-%{soname} -p /sbin/ldconfig +%postun -n libnetcdf_c++4-%{sover} -p /sbin/ldconfig %files tools %defattr(-,root,root) %doc COPYRIGHT %{_bindir}/ncxx4-config -%files -n libnetcdf_c++4-%{soname} +%files -n libnetcdf_c++4-%{sover} %defattr(-,root,root) %doc COPYRIGHT -%{_libdir}/libnetcdf_c++4.so.%{soname} -%{_libdir}/libnetcdf_c++4.so.%{soname}.* +%{_libdir}/libnetcdf_c++4.so.%{sover} +%{_libdir}/libnetcdf_c++4.so.%{sover}.* %files -n libnetcdf_c++4-devel %defattr(-,root,root)

1 0