openSUSE Commits
Threads by month
- ----- 2024 -----
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
March 2013
- 1 participants
- 1893 discussions
Hello community,
here is the log from the commit of package enchant for openSUSE:Factory checked in at 2013-03-28 13:10:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/enchant (Old)
and /work/SRC/openSUSE:Factory/.enchant.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "enchant", Maintainer is "gnome-maintainers(a)suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/enchant/enchant.changes 2011-10-13 12:18:34.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.enchant.new/enchant.changes 2013-03-28 13:10:38.000000000 +0100
@@ -1,0 +2,11 @@
+Tue Mar 26 13:04:28 UTC 2013 - mmeister(a)suse.com
+
+- Added url as source.
+ Please see http://en.opensuse.org/SourceUrls
+
+-------------------------------------------------------------------
+Fri Mar 1 12:42:43 UTC 2013 - dimstar(a)opensuse.org
+
+- Spec-cleanup using format_spec_file service.
+
+-------------------------------------------------------------------
Old:
----
enchant-1.6.0.tar.bz2
New:
----
enchant-1.6.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ enchant.spec ++++++
--- /var/tmp/diff_new_pack.DiZUVs/_old 2013-03-28 13:10:39.000000000 +0100
+++ /var/tmp/diff_new_pack.DiZUVs/_new 2013-03-28 13:10:39.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package enchant
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,15 +16,14 @@
#
-
Name: enchant
Version: 1.6.0
-Release: 6
-License: LGPL-2.1+
+Release: 0
Summary: Generic Spell Checking Library
+License: LGPL-2.1+
Group: Productivity/Text/Spell
Url: http://www.abisource.com/
-Source: %{name}-%{version}.tar.bz2
+Source: http://www.abisource.com/downloads/%{name}/%{version}/%{name}-%{version}.ta…
Source1: baselibs.conf
BuildRequires: aspell-devel
BuildRequires: dbus-1-glib-devel
@@ -39,7 +38,6 @@
with different spell checking libraries.
%package tools
-License: LGPL-2.1+
Summary: Generic Spell Checking Library - Command Line Tools
Group: Productivity/Text/Spell
@@ -50,7 +48,6 @@
This package provides command-line tools to interact with enchant.
%package voikko
-License: LGPL-2.1+
Summary: Generic Spell Checking Library - Voikko Plugin
Group: Productivity/Text/Spell
Provides: locale(%{name}:fi)
@@ -61,7 +58,6 @@
libraries.
%package zemberek
-License: LGPL-2.1+
Summary: Generic Spell Checking Library - Zemberek Plugin
Group: Productivity/Text/Spell
Provides: locale(%{name}:az)
@@ -78,7 +74,6 @@
different spell checking libraries.
%package -n libenchant1
-License: LGPL-2.1+
Summary: Generic Spell Checking Library
Group: System/Libraries
Provides: %{name} = %{version}
@@ -89,10 +84,11 @@
with different spell checking libraries.
%package devel
-License: LGPL-2.1+
Summary: Include Files and Libraries mandatory for Development
Group: Development/Libraries/C and C++
-Requires: %{name} = %{version} glib2-devel libstdc++-devel
+Requires: %{name} = %{version}
+Requires: glib2-devel
+Requires: libstdc++-devel
%description devel
This package contains all necessary include files and libraries needed
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package elfutils for openSUSE:Factory checked in at 2013-03-28 13:10:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/elfutils (Old)
and /work/SRC/openSUSE:Factory/.elfutils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "elfutils", Maintainer is "TonyJ(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/elfutils/elfutils.changes 2012-12-05 13:49:39.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.elfutils.new/elfutils.changes 2013-03-28 13:10:32.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Mar 26 12:56:03 UTC 2013 - mmeister(a)suse.com
+
+- Added url as source.
+ Please see http://en.opensuse.org/SourceUrls
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ elfutils.spec ++++++
--- /var/tmp/diff_new_pack.PJ8AwF/_old 2013-03-28 13:10:34.000000000 +0100
+++ /var/tmp/diff_new_pack.PJ8AwF/_new 2013-03-28 13:10:34.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package elfutils
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
License: SUSE-GPL-2.0-with-OSI-exception
Group: System/Libraries
Url: http://elfutils.fedorahosted.org
-Source: elfutils-%{version}.tar.bz2
+Source: https://fedorahosted.org/releases/e/l/%{name}/%{version}/%{name}-%{version}…
Source1: README-BEFORE-ADDING-PATCHES
Source2: baselibs.conf
Patch1: elfutils-portability.patch
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package dpkg for openSUSE:Factory checked in at 2013-03-28 13:10:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dpkg (Old)
and /work/SRC/openSUSE:Factory/.dpkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dpkg", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/dpkg/dpkg.changes 2012-10-12 14:22:00.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dpkg.new/dpkg.changes 2013-03-28 13:10:26.000000000 +0100
@@ -1,0 +2,26 @@
+Tue Mar 26 13:22:40 UTC 2013 - frank.lichtenheld(a)sophos.com
+
+- Enable test suite
+- Fix dpkg-source for SLES 11. Quilt.pm was depending on a
+ newer API of File::Path.
+
+-------------------------------------------------------------------
+Mon Mar 25 20:25:54 UTC 2013 - frank.lichtenheld(a)sophos.com
+
+- update to dpkg-1.16.10
+* Add missing @LIBLZMA_LIBS@ to Libs.Private in libdpkg.pc.in
+* Fix OpenPGP armored signature parsing, to be resilient against doctored
+ input, including source package control files. deb#695919
+* Fix warning in Dpkg::Source::Archive with «perl -w» due to redefinition
+ of getcwd() by removing unused POSIX modules usage. deb#700978
+- update to dpkg-1.16.9
+* Fix regression on old-style binNMUs for packages that specify an
+ explicit binary version to dpkg-gencontrol, by always fixing up the
+ source version. deb#690823
+* Fix dpkg-source regression in "3.0 (quilt)" source packages while
+ unapplying patches that remove all files in a directory. deb#683547
+* Fix segfault in field format parsing on empty strings, affecting
+ «dpkg-query -W -f ''» and «dpkg-deb -W --showformat=''». lp#1035512
+- see /usr/share/doc/packages/dpkg/changelog for details
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/dpkg/update-alternatives.changes 2012-10-08 20:28:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.dpkg.new/update-alternatives.changes 2013-03-28 13:10:26.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Mar 25 20:35:24 UTC 2013 - frank.lichtenheld(a)sophos.com
+
+- update to 1.16.10
+* Fix update-alternatives test suite to behave correctly on non-Debian
+ binary paths. Known to be affecting at least Gentoo and Mac OS X.
+* Do not leak subcall command arguments in update-alternatives.
+* Fix segfault on update-alternatives when passing --slave without any
+ action at all. lp#1037431
+
+-------------------------------------------------------------------
Old:
----
dpkg_1.16.8.tar.xz
New:
----
dpkg-old-File-Path.patch
dpkg-old-Test-More.patch
dpkg_1.16.10.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dpkg.spec ++++++
--- /var/tmp/diff_new_pack.Jp6GQ4/_old 2013-03-28 13:10:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Jp6GQ4/_new 2013-03-28 13:10:28.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dpkg
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define admindir %{_localstatedir}/lib/rpm/
Name: dpkg
-Version: 1.16.8
+Version: 1.16.10
Release: 0
Summary: Debian package management system
License: GPL-2.0+
@@ -28,17 +28,23 @@
Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz
Source3: sensible-editor
# PATCH-FIX-OPENSUSE replace debian with opensuse. replace macros. update-alternatives temp directories' path and name from dpkg* to rpm*.
-Patch1: update-alternatives-%{version}-suse.patch
+Patch1: update-alternatives-1.16.8-suse.patch
# PATCH-FIX-OPENSUSE add openSUSE supported architectures
Patch2: dpkg-archtable-suse.patch
# PATCH-FIX-UPSTREAM remove --utf8 since we only build En manpages.
Patch3: dpkg-pod2man-no-utf8.patch
+# PATCH-FIX-SUSE support for old File::Path (SLES11)
+Patch4: dpkg-old-File-Path.patch
+# PATCH-FIX-SUSE support for old Test::More (SLES11)
+Patch5: dpkg-old-Test-More.patch
BuildRequires: gcc-c++
BuildRequires: libselinux-devel
%define use_selinux 1
BuildRequires: ncurses-devel
BuildRequires: xz
BuildRequires: zlib-devel
+BuildRequires: perl(Date::Parse)
+BuildRequires: perl(IO::String)
Requires: cpio
Requires: make
Requires: patch
@@ -106,6 +112,8 @@
%patch2 -p1
%if 0%{?suse_version} && 0%{?suse_version} < 1130
%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%endif
%build
@@ -161,6 +169,9 @@
# extras
install -m 755 %{SOURCE3} %{buildroot}%{_bindir}
+%check
+%{__make} check
+
%post
cd %{_localstatedir}/lib/dpkg
for f in diversions statoverride status ; do
++++++ update-alternatives.spec ++++++
--- /var/tmp/diff_new_pack.Jp6GQ4/_old 2013-03-28 13:10:28.000000000 +0100
+++ /var/tmp/diff_new_pack.Jp6GQ4/_new 2013-03-28 13:10:28.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package update-alternatives
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
%define admindir %{_localstatedir}/lib/rpm/
Name: update-alternatives
-Version: 1.16.8
+Version: 1.16.10
Release: 0
Summary: Maintain symbolic links determining default commands
License: GPL-2.0+
@@ -27,7 +27,7 @@
Url: http://ftp.de.debian.org/debian/pool/main/d/dpkg/
Source0: http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_%{version}.tar.xz
Source3: sensible-editor
-Patch0: update-alternatives-%{version}-suse.patch
+Patch0: update-alternatives-1.16.8-suse.patch
Patch1: dpkg-archtable-suse.patch
BuildRequires: ncurses-devel
BuildRequires: xz
++++++ dpkg-old-File-Path.patch ++++++
Index: dpkg-1.16.10/scripts/Dpkg/Source/Quilt.pm
===================================================================
--- dpkg-1.16.10.orig/scripts/Dpkg/Source/Quilt.pm
+++ dpkg-1.16.10/scripts/Dpkg/Source/Quilt.pm
@@ -29,7 +29,7 @@ use Dpkg::Vendor qw(get_current_vendor);
use File::Spec;
use File::Copy;
use File::Find;
-use File::Path qw(make_path);
+use File::Path qw(mkpath);
use File::Basename;
sub new {
@@ -289,7 +289,7 @@ sub restore_quilt_backup_files {
my $target = File::Spec->catfile($self->{'dir'}, $relpath_in_srcpkg);
if (-s $_) {
unlink($target);
- make_path(dirname($target));
+ mkpath(dirname($target));
unless (link($_, $target)) {
copy($_, $target) ||
syserr(_g("failed to copy %s to %s"), $_, $target);
++++++ dpkg-old-Test-More.patch ++++++
Index: dpkg-1.16.10/src/t/100_dpkg_divert.t
===================================================================
--- dpkg-1.16.10.orig/src/t/100_dpkg_divert.t
+++ dpkg-1.16.10/src/t/100_dpkg_divert.t
@@ -148,7 +148,7 @@ sub diversions_eq {
cleanup();
-note("Command line parsing testing");
+#note("Command line parsing testing");
my $usagere = qr/.*Usage.*dpkg-divert.*Commands.*Options.*/s;
@@ -191,7 +191,7 @@ call([@dd, '--admindir'], [],
cleanup();
-note("Querying information from diverts db (empty one)");
+#note("Querying information from diverts db (empty one)");
install_diversions('');
@@ -201,7 +201,7 @@ call_divert_sort(['--list', 'baz'], expe
cleanup();
-note("Querying information from diverts db (1)");
+#note("Querying information from diverts db (1)");
install_diversions(<<EOF);
/bin/sh
@@ -237,7 +237,7 @@ call_divert_sort(['--list', '/bin/sh', '
cleanup();
-note("Querying information from diverts db (2)");
+#note("Querying information from diverts db (2)");
install_diversions(<<EOF);
/bin/sh
@@ -259,7 +259,7 @@ call_divert(['--truename', '/bin/somethi
cleanup();
-note("Adding diversion");
+#note("Adding diversion");
my $diversions_added_foo_local = <<EOF;
$testdir/foo
@@ -279,7 +279,7 @@ diversions_eq($diversions_added_foo_loca
cleanup();
-note("Adding diversion (2)");
+#note("Adding diversion (2)");
install_diversions('');
@@ -293,7 +293,7 @@ diversions_eq($diversions_added_foo_loca
cleanup();
-note("Adding diversion (3)");
+#note("Adding diversion (3)");
install_diversions('');
@@ -306,7 +306,7 @@ diversions_eq($diversions_added_foo_loca
cleanup();
-note("Adding diversion (4)");
+#note("Adding diversion (4)");
install_diversions('');
system("touch $testdir/foo");
@@ -318,7 +318,7 @@ diversions_eq('');
cleanup();
-note("Adding diversion (5)");
+#note("Adding diversion (5)");
install_diversions('');
call_divert(['--quiet', '--rename', "$testdir/foo"],
@@ -328,7 +328,7 @@ ok(!-e "$testdir/foo.distrib", "foo was
cleanup();
-note("Adding diversion (6)");
+#note("Adding diversion (6)");
install_diversions('');
system("touch $testdir/foo");
@@ -341,7 +341,7 @@ diversions_eq($diversions_added_foo_loca
cleanup();
-note("Adding diversion (7)");
+#note("Adding diversion (7)");
install_diversions('');
call_divert(['--quiet', '--rename', '--package', 'bash', "$testdir/foo"],
@@ -352,7 +352,7 @@ $testdir/foo.distrib
bash
EOF
-note("Adding diversion (8)");
+#note("Adding diversion (8)");
install_diversions('');
system("touch $testdir/foo; ln $testdir/foo $testdir/foo.distrib");
@@ -363,7 +363,7 @@ ok(-e "$testdir/foo.distrib", "foo diver
cleanup();
-note("Adding diversion (9)");
+#note("Adding diversion (9)");
install_diversions('');
system("touch $testdir/foo $testdir/foo.distrib");
@@ -373,7 +373,7 @@ diversions_eq('');
cleanup();
-note("Adding second diversion");
+#note("Adding second diversion");
install_diversions('');
call_divert(["$testdir/foo"]);
@@ -393,7 +393,7 @@ call_divert(['--divert', "$testdir/foo",
cleanup();
-note("Adding third diversion");
+#note("Adding third diversion");
install_diversions('');
call_divert(["$testdir/foo"]);
@@ -405,7 +405,7 @@ call_divert(['--package', 'foobar', "$te
cleanup();
-note("Adding diversion in non-existing directory");
+#note("Adding diversion in non-existing directory");
install_diversions('');
@@ -419,7 +419,7 @@ EOF
cleanup();
-note("Adding diversion of file owned by --package");
+#note("Adding diversion of file owned by --package");
install_filelist("coreutils", "i386", "$testdir/foo");
install_diversions('');
@@ -437,7 +437,7 @@ EOF
cleanup();
-note("Remove diversions");
+#note("Remove diversions");
install_diversions('');
@@ -446,7 +446,7 @@ call_divert(['--remove', '--quiet', '/bi
cleanup();
-note("Remove diversion (2)");
+#note("Remove diversion (2)");
install_diversions('');
call_divert(["$testdir/foo"]);
@@ -473,7 +473,7 @@ EOF
cleanup();
-note("Remove diversion (3)");
+#note("Remove diversion (3)");
install_diversions('');
@@ -494,7 +494,7 @@ EOF
cleanup();
-note("Remove diversion (4)");
+#note("Remove diversion (4)");
install_diversions('');
@@ -515,7 +515,7 @@ EOF
cleanup();
-note("Remove diversion(5)");
+#note("Remove diversion(5)");
install_diversions('');
system("touch $testdir/foo");
@@ -535,7 +535,7 @@ diversions_eq('');
cleanup();
-note("Corrupted divertions db handling");
+#note("Corrupted divertions db handling");
SKIP: {
skip "running as root or similar", 3, if (defined($ENV{FAKEROOTKEY}) or $> == 0);
@@ -569,7 +569,7 @@ cleanup();
SKIP: {
skip "running as root or similar", 10, if (defined($ENV{FAKEROOTKEY}) or $> == 0);
- note("R/O directory");
+ #note("R/O directory");
install_diversions('');
system("mkdir $testdir/rodir && touch $testdir/rodir/foo $testdir/bar && chmod 500 $testdir/rodir");
@@ -582,7 +582,7 @@ SKIP: {
system("chmod 755 $testdir/rodir");
cleanup();
- note("Unavailable file");
+ #note("Unavailable file");
install_diversions('');
system("mkdir $testdir/nadir && chmod 000 $testdir/nadir");
@@ -596,7 +596,7 @@ SKIP: {
cleanup();
}
-note("Errors during saving diversions db");
+#note("Errors during saving diversions db");
install_diversions('');
++++++ dpkg_1.16.8.tar.xz -> dpkg_1.16.10.tar.xz ++++++
++++ 156508 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package djvulibre-djview4 for openSUSE:Factory checked in at 2013-03-28 13:10:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/djvulibre-djview4 (Old)
and /work/SRC/openSUSE:Factory/.djvulibre-djview4.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "djvulibre-djview4", Maintainer is "PGajdos(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/djvulibre-djview4/djvulibre-djview4.changes 2012-01-20 20:23:20.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.djvulibre-djview4.new/djvulibre-djview4.changes 2013-03-28 13:10:22.000000000 +0100
@@ -1,0 +2,12 @@
+Wed Mar 27 07:04:09 UTC 2013 - pgajdos(a)suse.com
+
+- updated to 4.9:
+ * Added language selection in preference.
+ * Added option to override printing and saving restrictions.
+ * Automatic reloading of djvu documents when the file is changed.
+ * New chinese translations.
+ * Improved network code (needs Qt>=4.4.)
+ * Remember the last visited position for the last 50 documents.
+- dropped qt-4.8.patch, upstream is using qSwap()
+
+-------------------------------------------------------------------
Old:
----
djview-4.8.tar.bz2
djview4-qt-4.8.patch
New:
----
djview-4.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ djvulibre-djview4.spec ++++++
--- /var/tmp/diff_new_pack.BPOaqB/_old 2013-03-28 13:10:23.000000000 +0100
+++ /var/tmp/diff_new_pack.BPOaqB/_new 2013-03-28 13:10:23.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package djvulibre-djview4
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,22 @@
#
-
Name: djvulibre-djview4
-BuildRequires: gcc-c++ glibc-devel libdjvulibre-devel libjpeg-devel libqt4-devel >= 4.1 libtiff-devel update-desktop-files xorg-x11-devel
+BuildRequires: gcc-c++
+BuildRequires: glibc-devel
+BuildRequires: libdjvulibre-devel
+BuildRequires: libjpeg-devel
+BuildRequires: libqt4-devel >= 4.1
+BuildRequires: libtiff-devel
+BuildRequires: update-desktop-files
+BuildRequires: xorg-x11-devel
+Version: 4.9
+Release: 0
+Url: http://djvu.sourceforge.net/djview4.html
+Summary: Portable DjVu Qt4 Based Viewer and Browser Plugin
License: GPL-2.0+
Group: Productivity/Graphics/Other
-Version: 4.8
-Release: 1
-Url: http://djvu.sourceforge.net
-Summary: Portable DjVu Qt4 Based Viewer and Browser Plugin
Source: djview-%{version}.tar.bz2
-Patch0: djview4-qt-4.8.patch
# This patch is Suse specific.
Patch1: djview4-nsplugin_manpage.patch
# This patch is Suse specific.
@@ -40,8 +45,7 @@
DjVuLibre-3.5 library and the Qt4 toolkit.
%prep
-%setup -n djview-%{version}
-%patch0 -p1
+%setup -n djview4-%{version}
%patch1
%patch2
++++++ djview-4.8.tar.bz2 -> djview-4.9.tar.bz2 ++++++
++++ 24693 lines of diff (skipped)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package djvulibre for openSUSE:Factory checked in at 2013-03-28 13:10:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/djvulibre (Old)
and /work/SRC/openSUSE:Factory/.djvulibre.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "djvulibre", Maintainer is "PGajdos(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/djvulibre/djvulibre.changes 2012-03-26 11:00:55.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.djvulibre.new/djvulibre.changes 2013-03-28 13:10:18.000000000 +0100
@@ -1,0 +2,9 @@
+Wed Mar 27 06:33:47 UTC 2013 - pgajdos(a)suse.com
+
+- updated to 3.5.25.3:
+ * minor fixes
+ * call autoreconf
+ * do not cp not existing prebuilt icons
+ * not-existing-icons.patch
+
+-------------------------------------------------------------------
Old:
----
djvulibre-3.5.25.tar.bz2
New:
----
djvulibre-3.5.25.3.tar.gz
djvulibre-not-existing-icons.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ djvulibre.spec ++++++
--- /var/tmp/diff_new_pack.Fy4Zi5/_old 2013-03-28 13:10:19.000000000 +0100
+++ /var/tmp/diff_new_pack.Fy4Zi5/_new 2013-03-28 13:10:19.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package djvulibre
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products 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,20 +17,24 @@
Name: djvulibre
+BuildRequires: autoconf
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
+BuildRequires: libtool
# pkg-config is required for pkgconfig() provides and requires.
BuildRequires: pkgconfig
-Version: 3.5.25
+Version: 3.5.25.3
Release: 0
Url: http://djvu.sourceforge.net
Summary: An Open Source Implementation of DjVu
License: GPL-2.0+
Group: Productivity/Graphics/Other
-Source: %{name}-%{version}.tar.bz2
+Source: %{name}-%{version}.tar.gz
Patch0: %{name}-filepath.patch
+# following reported upstream, should not be needed in future update
+Patch1: %{name}-not-existing-icons.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -70,12 +74,14 @@
This package contains the documentation for the DjVu - djvulibre
%prep
-%setup
+%setup -n %{name}-3.5.25
%patch0
+%patch1 -p1
%build
-# specifying --x-libraries and -includes is needed due to new paths in X.org 7.x
-# delete them if builds against X.org 6.9 or lower
+# run autoreconf otherwise @INKSCAPE@ is undefined (not replaced by false);
+# try to remove in the next update
+autoreconf -fi
CFLAGS="$RPM_OPT_FLAGS" \
CXXFLAGS="$RPM_OPT_FLAGS" \
./configure \
++++++ djvulibre-not-existing-icons.patch ++++++
Index: djvulibre-3.5.25/desktopfiles/Makefile.in
===================================================================
--- djvulibre-3.5.25.orig/desktopfiles/Makefile.in
+++ djvulibre-3.5.25/desktopfiles/Makefile.in
@@ -58,7 +58,7 @@ ${PNGICONS}: djvu.svg
|| ${CONVERT} -geometry $${s}x$${s} -depth 8 -background none $< $@ \
|| ${INKSCAPE} --without-gui --export-width=$${s} \
--export-height=$${s} --export-png=$@ $< \
- || cp ${srcdir}/prebuilt-$@ $@
+ || if [ -e ${srcdir}/prebuilt-$@ ]; then cp ${srcdir}/prebuilt-$@ $@; fi
hi-djvu.svgz: djvu.svg
cat $< | gzip >$@
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package bsd-games for openSUSE:Factory checked in at 2013-03-28 13:10:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bsd-games (Old)
and /work/SRC/openSUSE:Factory/.bsd-games.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bsd-games", Maintainer is "nadvornik(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bsd-games/bsd-games.changes 2013-01-31 16:25:30.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bsd-games.new/bsd-games.changes 2013-03-28 13:10:15.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Mar 27 14:07:06 UTC 2013 - meissner(a)suse.com
+
+- use Source URL.
+- remove factor as it exists in coreutils.
+
+-------------------------------------------------------------------
Old:
----
bsd-games-2.17.tar.bz2
New:
----
bsd-games-2.17.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bsd-games.spec ++++++
--- /var/tmp/diff_new_pack.ePeXan/_old 2013-03-28 13:10:16.000000000 +0100
+++ /var/tmp/diff_new_pack.ePeXan/_new 2013-03-28 13:10:16.000000000 +0100
@@ -23,7 +23,7 @@
License: BSD-3-Clause
Group: Amusements/Games/Other
Url: http://www.advogato.org/proj/bsd-games/
-Source: %{name}-%{version}.tar.bz2
+Source: ftp://metalab.unc.edu/pub/Linux/games/%{name}-%{version}.tar.gz
Source1: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM bsd-games-2.17.diff
Patch0: %{name}-%{version}.diff
@@ -54,7 +54,7 @@
%description
This package copies these games into /usr/games: arithmetic, atc,
backgammon, battlestar, bcd, bog, caesar, canfield, cfscores, cribbage,
-factor, fish, fortune, hangman, hunt, mille, monop, morse, number,
+fish, fortune, hangman, hunt, mille, monop, morse, number,
paranoia, pom, ppt, primes, rain, robots, sail, snake, snscore,
teachgammon, trek, wargames, worm, worms, and wump.
@@ -84,6 +84,10 @@
make INSTALL_PREFIX=%{buildroot} install
# get rid of dm functionality as it needs a setgid, dm is only used to restrict which games may be played
rm %{buildroot}%{_prefix}/games/dm
+
+# factor is contained also in coreutils, prefer the version there
+rm %{buildroot}%{_prefix}/games/factor
+
rm -rf %{buildroot}%{_mandir}/man5
rm -rf %{buildroot}%{_mandir}/man8
# move the programs into /usr/bin as this is the proper location
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package bind for openSUSE:Factory checked in at 2013-03-28 13:09:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bind (Old)
and /work/SRC/openSUSE:Factory/.bind.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bind", Maintainer is "max(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bind/bind.changes 2012-12-07 14:06:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bind.new/bind.changes 2013-03-28 13:10:01.000000000 +0100
@@ -1,0 +2,13 @@
+Wed Mar 27 12:33:34 UTC 2013 - meissner(a)suse.com
+
+- Updated to 9.9.2-P2 (bnc#811876)
+ Fix for: https://kb.isc.org/article/AA-00871 CVE-2013-2266
+
+ * Security Fixes
+ Removed the check for regex.h in configure in order to disable regex
+ syntax checking, as it exposes BIND to a critical flaw in libregex
+ on some platforms. [RT #32688]
+
+- added gpg key source verification
+
+-------------------------------------------------------------------
Old:
----
bind-9.9.2-P1.tar.gz
New:
----
bind-9.9.2-P2.tar.gz
bind-9.9.2-P2.tar.gz.asc
bind.keyring
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bind.spec ++++++
--- /var/tmp/diff_new_pack.QfIuKI/_old 2013-03-28 13:10:14.000000000 +0100
+++ /var/tmp/diff_new_pack.QfIuKI/_new 2013-03-28 13:10:14.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bind
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: bind
%define pkg_name bind
-%define pkg_vers 9.9.2-P1
+%define pkg_vers 9.9.2-P2
BuildRequires: krb5-devel
BuildRequires: libcap
BuildRequires: libcap-devel
@@ -44,6 +44,9 @@
PreReq: %fillup_prereq %insserv_prereq bind-utils /bin/grep /bin/sed /bin/mkdir /usr/bin/tee /bin/chmod /bin/chown /bin/mv /bin/cat /usr/bin/dirname /usr/bin/diff /usr/bin/old /usr/sbin/groupadd /usr/sbin/useradd /usr/sbin/usermod
Url: http://isc.org/sw/bind/
Source: ftp://ftp.isc.org/isc/bind9/%{pkg_vers}/bind-%{pkg_vers}.tar.gz
+Source3: ftp://ftp.isc.org/isc/bind9/%{pkg_vers}/bind-%{pkg_vers}.tar.gz.asc
+# from http://www.isc.org/about/openpgp/ ... changes yearly apparently.
+Source4: %name.keyring
Source1: vendor-files.tar.bz2
Source2: baselibs.conf
Source9: ftp://ftp.internic.net/domain/named.root
@@ -56,6 +59,9 @@
Patch52: named-bootconf.diff
Patch100: configure.in.diff2
Patch110: workaround-compile-problem.diff
+%if 0%{?suse_version} > 1220
+BuildRequires: gpg-offline
+%endif
# Rate limiting patch by Paul Vixie et.al. for reflection DoS protection
# see http://www.redbarn.org/dns/ratelimits
@@ -185,6 +191,9 @@
Name Domain (BIND) DNS server is found in the package named bind.
%prep
+%if 0%{?suse_version} > 1220
+%gpg_verify %{S:3}
+%endif
%setup -q -n %{pkg_name}-%{pkg_vers}
#%setup -n %{pkg_name}-%{version} -T -D -a1 -a50
%setup -q -n %{pkg_name}-%{pkg_vers} -T -D -a1
++++++ bind-9.9.2-P1.tar.gz -> bind-9.9.2-P2.tar.gz ++++++
/work/SRC/openSUSE:Factory/bind/bind-9.9.2-P1.tar.gz /work/SRC/openSUSE:Factory/.bind.new/bind-9.9.2-P2.tar.gz differ: char 5, line 1
++++++ named.root ++++++
--- /var/tmp/diff_new_pack.QfIuKI/_old 2013-03-28 13:10:14.000000000 +0100
+++ /var/tmp/diff_new_pack.QfIuKI/_new 2013-03-28 13:10:14.000000000 +0100
@@ -9,8 +9,8 @@
; on server FTP.INTERNIC.NET
; -OR- RS.INTERNIC.NET
;
-; last update: Jun 8, 2011
-; related version of root zone: 2011060800
+; last update: Jan 3, 2013
+; related version of root zone: 2013010300
;
; formerly NS.INTERNIC.NET
;
@@ -31,7 +31,7 @@
; FORMERLY TERP.UMD.EDU
;
. 3600000 NS D.ROOT-SERVERS.NET.
-D.ROOT-SERVERS.NET. 3600000 A 128.8.10.90
+D.ROOT-SERVERS.NET. 3600000 A 199.7.91.13
D.ROOT-SERVERS.NET. 3600000 AAAA 2001:500:2D::D
;
; FORMERLY NS.NASA.GOV
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package arpwatch for openSUSE:Factory checked in at 2013-03-28 13:09:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/arpwatch (Old)
and /work/SRC/openSUSE:Factory/.arpwatch.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "arpwatch", Maintainer is "draht(a)suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/arpwatch/arpwatch.changes 2012-07-18 11:45:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.arpwatch.new/arpwatch.changes 2013-03-28 13:09:54.000000000 +0100
@@ -1,0 +2,5 @@
+Thu Mar 14 11:33:23 UTC 2013 - p.drouand(a)gmail.com
+
+- Drop sysvinit support and add systemd support for opensuse > 11.4
+
+-------------------------------------------------------------------
New:
----
arpwatch.service
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ arpwatch.spec ++++++
--- /var/tmp/diff_new_pack.H21oTp/_old 2013-03-28 13:09:59.000000000 +0100
+++ /var/tmp/diff_new_pack.H21oTp/_new 2013-03-28 13:09:59.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package arpwatch
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,19 +16,35 @@
#
+%if 0%{?suse_version} > 1140
+%define has_systemd 1
+%endif
+
Name: arpwatch
BuildRequires: libpcap-devel
BuildRequires: postfix
+%if 0%{?has_systemd}
+BuildRequires: systemd
+%{?systemd_requires}
+%endif
Url: http://www-nrg.ee.lbl.gov/nrg.html
Requires: arpwatch-ethercodes
+%if 0%{?suse_version} <= 1140
PreReq: /usr/bin/touch %insserv_prereq %fillup_prereq
+%else
+PreReq: /usr/bin/touch %fillup_prereq
+%endif
Summary: Arpwatch Keeps Track of Ethernet and IP Address Pairings
License: BSD-3-Clause
Group: Productivity/Networking/Diagnostic
Version: 2.1a15
Release: 0
Source: %{name}-%{version}.tar.bz2
+%if 0%{?has_systemd}
+Source10: arpwatch.service
+%else
Source10: arpwatch.init
+%endif
Source11: sysconfig.arpwatch
Patch0: arpwatch-2.1a11-chrootbuild.diff
Patch1: arpwatch-no-source-zero.dif
@@ -68,7 +84,11 @@
%install
mkdir -p \
+%if 0%{?has_systemd}
+ $RPM_BUILD_ROOT/%{_unitdir} \
+%else
$RPM_BUILD_ROOT/etc/init.d \
+%endif
$RPM_BUILD_ROOT/%{_sbindir} \
$RPM_BUILD_ROOT/%{_datadir}/arpwatch \
$RPM_BUILD_ROOT/%{_mandir}/man8 \
@@ -80,39 +100,60 @@
cp -p ${file} $RPM_BUILD_ROOT/%{_datadir}/arpwatch
done
make DESTDIR=$RPM_BUILD_ROOT install-man
+%if 0%{?has_systemd}
+install -m 0754 $RPM_SOURCE_DIR/arpwatch.service $RPM_BUILD_ROOT/%{_unitdir}
+%else
install -m 0754 $RPM_SOURCE_DIR/arpwatch.init $RPM_BUILD_ROOT/etc/init.d/arpwatch
ln -sf ../../etc/init.d/arpwatch $RPM_BUILD_ROOT/%{_sbindir}/rcarpwatch
+%endif
cp -p ${RPM_SOURCE_DIR}/sysconfig.arpwatch $RPM_BUILD_ROOT/var/adm/fillup-templates
# own the database files
touch $RPM_BUILD_ROOT/var/lib/arpwatch/arp.dat
touch $RPM_BUILD_ROOT/var/lib/arpwatch/arp.dat-
%preun
+%if 0%{?has_systemd}
+%service_del_preun arpwatch.service
+%else
%stop_on_removal arpwatch
+%endif
%post
+%if 0%{?has_systemd}
+%service_add_post arpwatch.service
+%fillup_only
+%else
%fillup_and_insserv
+%endif
if [ ! -f var/lib/arpwatch/arp.dat ]; then
touch var/lib/arpwatch/arp.dat
fi
%postun
+%if 0%{?has_systemd}
+%service_del_postun arpwatch.service
+%else
%restart_on_update arpwatch
%insserv_cleanup
+%endif
%files
%defattr(-,root,root)
+%if 0%{?has_systemd}
+%{_unitdir}/arpwatch.service
+%else
%config /etc/init.d/arpwatch
+%{_sbindir}/rcarpwatch
+%endif
%{_sbindir}/arpsnmp
%{_sbindir}/arpwatch
-%{_sbindir}/rcarpwatch
%dir /var/lib/arpwatch
%ghost %config(noreplace) /var/lib/arpwatch/arp.dat
%ghost %config(noreplace) /var/lib/arpwatch/arp.dat-
/var/adm/fillup-templates/sysconfig.arpwatch
%doc %{_mandir}/man8/arpsnmp.8.gz
%doc %{_mandir}/man8/arpwatch.8.gz
-%doc CHANGES FILES INSTALL README
+%doc CHANGES FILES README
%files ethercodes-build
%defattr(-,root,root)
++++++ arpwatch.service ++++++
[Unit]
Description=Arpwatch daemon which keeps track of ethernet/ip address pairings
After=syslog.target network.target
[Service]
Type=forking
EnvironmentFile=-/etc/sysconfig/arpwatch/sysconfig.arpwatch
PrivateTmp=yes
ExecStart=/usr/sbin/arpwatch $OPTIONS
[Install]
WantedBy=multi-user.target
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package clamav for openSUSE:12.3:Update checked in at 2013-03-28 12:55:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/clamav (Old)
and /work/SRC/openSUSE:12.3:Update/.clamav.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clamav", Maintainer is "max(a)suse.com"
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
_link
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
<link package='clamav.1472' cicount='copy' />
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package clamav.1472 for openSUSE:12.3:Update checked in at 2013-03-28 12:55:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3:Update/clamav.1472 (Old)
and /work/SRC/openSUSE:12.3:Update/.clamav.1472.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clamav.1472", Maintainer is ""
Changes:
--------
New Changes file:
--- /dev/null 2013-02-26 18:15:11.936010755 +0100
+++ /work/SRC/openSUSE:12.3:Update/.clamav.1472.new/clamav.changes 2013-03-28 12:55:19.000000000 +0100
@@ -0,0 +1,1034 @@
+-------------------------------------------------------------------
+Wed Mar 20 17:32:19 UTC 2013 - max(a)suse.com
+
+- Version 0.97.7 (bnc#809945)
+ * several hardening fixes.
+
+-------------------------------------------------------------------
+Mon Jan 14 14:42:03 UTC 2013 - mmeister(a)suse.com
+
+- pids and sockets of clamd and freshclam now reside in /var/run
+ instead of /var/lib (bnc#770395)
+- modified pid path in clamd's, freshclam's and clamav-milter's
+ init scripts
+
+-------------------------------------------------------------------
+Mon Jan 7 13:40:31 UTC 2013 - max(a)suse.com
+
+- Remove the clamav-db subpackage. ClamAV installations should
+ fetch current versions of the virus database directly from
+ upstream. If there really is need for a packaged database, it
+ should be in a separate package.
+- Remove scripts do deal with very old (before 2008) config and
+ database file formats.
+
+-------------------------------------------------------------------
+Sat Jan 5 01:53:56 UTC 2013 - andreas.stieger(a)gmx.de
+
+- update daily.cvd to ver. 16364
+ released on 04 Jan 2013 20:37 :0500 (sig count: 492103)
+- add cvd signature verification to %check section
+- make Release field of clamav-db package contain cvd file versions
+
+-------------------------------------------------------------------
+Fri Sep 28 09:30:25 UTC 2012 - max(a)suse.com
+
+- 0.97.6 also fixes bnc#780181.
+
+-------------------------------------------------------------------
+Wed Sep 19 08:07:55 UTC 2012 - toganm(a)opensuse.org
+
+- update to 0.97.6
+ * libclamav: bb#5751 - cl_scansis() may returan a file descriptor
+ instead of a valid return code
+
+-------------------------------------------------------------------
+Thu Jul 26 11:41:02 UTC 2012 - dmueller(a)suse.com
+
+- avoid make check on qemu build
+
+-------------------------------------------------------------------
+Thu Jun 21 16:09:25 UTC 2012 - max(a)suse.com
+
+- The CVEs below correspont to: bnc#753611, bnc#753613, bnc#753610.
+
+-------------------------------------------------------------------
+Tue Jun 19 00:31:03 UTC 2012 - andreas.stieger(a)gmx.de
+
+- update to 0.95.5 [bnc#767574]
+- addresses possible evasion cases in some archive formats
+- CVE-2012-1457: allows to bypass malware detection via a TAR archive
+ entry with a length field that exceeds the total TAR file size
+- CVE-2012-1458: allows to bypass malware detection via a crafted
+ reset interval in the LZXC header of a CHM file
+- CVE-2012-1459: allows to bypass malware detection via a TAR archive
+ entry with a length field corresponding to that entire entry, plus
+ part of the header of the next entry
+- also addresses stability issues in portions of the bytecode engine
+- update clamav-conf.patch for moved lines
+- add a definitions snapshot as {main,daily}.cvd no longer in tarball
+- fix file-contains-date-and-time rpmlint warning
+
+-------------------------------------------------------------------
+Sat Mar 17 19:36:17 UTC 2012 - dimstar(a)opensuse.org
+
+- Add clamav-gcc47.patch: Fix build with gcc 4.7.
+
+-------------------------------------------------------------------
+Sat Mar 17 14:18:48 UTC 2012 - toganm(a)opensuse.org
+
+- New version 0.97.4
+ * libclamav/bytecode.c: reset to BYTECODE_AUTO mode at db reload
+ so that we don't fail to re-enable or re-disable it again
+ (bb#3789)
+ * misc: performance improvement for HP-UX PA-RISC - patch from
+ Michael Pelletier <michael.v.pelletier*raytheon.com>
+ (bb#3926)
+ * libclamav/pe.c: parse vinfo where varfileinfo occours before
+ stringfileinfo (bb#3062)
+ * clamd: add support for on-access scanning on OS X with ClamAuth
+ (beta)
+ * libclamav/bytecode_api*: Fix Sparc crash (bb #4324)
+ * libclamav: fix bytecode whitelisting
+ * libclamav: fix macro detection in OLE2BlockMacros (bb#4269)
+ * libclamav/readdb.c: allow comments in all db files (bb#3930)
+ * libclamav/scanners.c: use lsigs when scanning vba data (bb#3922)
+ * libclamav/matcher-hash.c: Fix SIGBUS on PA-RISC (big-endian)
+ architectures (bb #3894).
+
+-------------------------------------------------------------------
+Tue Oct 18 09:17:51 UTC 2011 - max(a)suse.com
+
+- New version 0.97.3 (bnc#724856, CVE-2011-3627):
+ * freshclam/manager.c: fix error when compiling without DNS
+ support (bb#3056)
+ * libclamav/pdf.c: flag and dump PDF objects with /Launch
+ (bb #3514)
+ * libclamav/bytecode.c,bytecode_api.c: fix recursion level crash
+ (bb #3706).
+ * docs: clarify behavior of --scan-*/Scan* options (bb#3134)
+ * libclamav/bytecode_vm.c: fix opcode 20 error (bb #3100)
+ * freshclam: fix pidfile removal (bb#3499)
+ * libclamav/pdf.c: fix incorrect blocking of some encrypted PDF
+ with empty user passwords. (bb #3364)
+ * sigtool/sigtool.c: fix calculation of max signature length
+
+-------------------------------------------------------------------
+Tue Jul 26 08:55:27 UTC 2011 - max(a)novell.com
+
+- New version 0.97.2 (bnc#708263):
+ * libclamav/matcher-hash.c: off by one read in cli_hm_scan
+ (bb#2818, CVE-2011-2721).
+ * libclamav/pdf.c: fix encrypted pdf detection (bb #2988)
+ * clamav-milter/clamfi.c: fix typo in error message (bb#3040)
+ * libclamav/lzma_iface.c: shut up huge alloc warns for 7z/lzma
+ (bb#2913)
+ * libclamav/c++/bytecode2llvm.cpp: fix use of unaddressable data
+ in bytecode_watchdog.
+ * libclamav/phishcheck.c: fix safebrowsing detection on certain
+ URLs
+
+-------------------------------------------------------------------
+Thu Jun 9 10:04:22 UTC 2011 - max(a)novell.com
+
+- New version 0.97.1 (bnc#698999):
+ * libclamav/mew.c: harden boundary check on e8/e9 fixup
+ * libclamav/matcher-hash.c: in hm_sort don't swap an item with
+ itself (bb#2818)
+ * freshclam/manager.c: fix return code of Rfc2822DateTime()
+ (bb#2809)
+ * libclamav/pdf.c: better detection for encrypted PDFs
+ (bb #2448)
+ * libclamav/c++: add support for building with external LLVM 2.9,
+ and drop external 2.8 support
+ * clamd: log request ip address for instream scans #bb2592
+ * libclamav/c++/llvm/lib/Target/X86/X86InstrInfo.td: bb #2763
+ don't assert on AVX chips (Intel Core i5 and i7)
+ * sigtool: properly normalize html files (bb#2764)
+ * sigtool/sigtool.c: fix formatting of hash dbs (bb#2765)
+ * freshclam: add mirror statistics mechanism
+ * libclamav/pe_icons.c: don't sigbus on sparc (bb#2695)
+ * libclamav/pe.c: reset corrupted status before bytecode
+ hooks (bb#2544)
+ * sigtool, freshclam: put .info on top of container to speed
+ up loading
+ * sigtool: fix --verify-cdiff
+ * sigtool: allow arbitrary names for --build
+ * clamdscan: fix file exclusion (bb#2579)
+ * clamd: add new option ClamukoExcludeUID (bb#2260)
+ * libclamav/elf.c: fix incorrect detection of Broken.Executable
+ (bb#2580)
+ * shared/output.c: fix empty lines in syslog (bb#2578)
+ * clamd: update description of ReadTimeout (bb#2565)
+ * clamd: add new config option BytecodeUnsigned (bb#2537);
+ drop "None" from BytecodeSecurity
+ * clamscan: add new switch --bytecode-unsigned and drop
+ --bytecode-trust-all
+ * sigtool/sigtool.c: improve handling of bytecode.info (bb#2292)
+ * libclamav/others.c: make sure TLS key is initializer
+ (bb #2588).
+ * configure: check for enable_extended_FILE_stdio (bb #2542)
+ * sigtool/sigtool.c: handle all signature formats with
+ --(list|find)-sigs (bb#2534)
+
+-------------------------------------------------------------------
+Wed Feb 9 09:20:42 UTC 2011 - max(a)novell.com
+
+- Security update 0.9.7 (bnc#673753):
+ ClamAV 0.97 brings many improvements, including complete Windows
+ support, support for signatures based on SHA1 and SHA256, better
+ error detection, as well as speed and memory optimizations. The
+ complete list of changes is available in the ChangeLog file. For
+ upgrade notes and tips please see:
+ https://wiki.clamav.net/Main/UpgradeNotes097
+
+-------------------------------------------------------------------
+Wed Dec 1 17:42:03 UTC 2010 - max(a)novell.com
+
+- New version 0.96.5 (bnc#656548):
+ * libclamav/pdf.c: fix crashes (bb #2358, bb #2380, bb #2396).
+ * libclamav/pe_icons.c: off by one while (bb#2344)
+ * libclamav: fix detection of embedded executables
+ * libclamav/matcher-ac.c: fix offset handling for sigs with {x-y}
+ * freshclam/manager.c: fix error path infinite loop (bb#2389)
+ * freshclam: improve mirror management
+ * libclamav: fix possible use of uninitialized values (bb#2291)
+ * libclamav: Set the unreliability flag on (un)packed files
+ (bb#2307)
++++ 837 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:12.3:Update/.clamav.1472.new/clamav.changes
New:
----
clamav-0.97.7.tar.gz
clamav-conf.patch
clamav-gcc47.patch
clamav-rcclamd
clamav-rcfreshclam
clamav-rcmilter
clamav-rpmlintrc
clamav-sles9.patch
clamav-tmpfiles.conf
clamav-updateclamconf
clamav.changes
clamav.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ clamav.spec ++++++
#
# spec file for package clamav
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: clamav
BuildRequires: ncurses-devel
BuildRequires: sed
BuildRequires: sendmail
BuildRequires: sendmail-devel
%define llvm --disable-llvm
%if 0%{?suse_version} >= 1010
BuildRequires: bc
BuildRequires: pkgconfig
BuildRequires: zlib-devel
%ifarch %ix86 x86_64
%define llvm --enable-llvm
# Needed for compiling LLVM.
BuildRequires: gcc-c++
%endif
%endif
%if 0%{?suse_version} >= 1030
BuildRequires: check-devel
BuildRequires: libbz2-devel
BuildRequires: pwdutils
BuildRequires: python-devel
%define clamav_check --enable-check
%else
BuildRequires: bzip2
%define clamav_check --disable-check
%endif
Summary: Antivirus Toolkit
License: GPL-2.0
Group: Productivity/Security
Version: 0.97.7
Release: 0
Url: http://www.clamav.net
Requires: latex2html-pngicons
Obsoletes: clamav-db < 0.88.3
PreReq: %_sbindir/groupadd %_sbindir/useradd %_sbindir/usermod
PreReq: /usr/bin/awk /bin/sed /bin/tar
PreReq: %insserv_prereq
Source0: %{name}-%{version}.tar.gz
Source1: clamav-rcclamd
Source2: clamav-rcfreshclam
Source3: clamav-updateclamconf
Source4: clamav-rpmlintrc
Source5: clamav-rcmilter
Source6: clamav-tmpfiles.conf
Patch1: clamav-conf.patch
Patch2: clamav-sles9.patch
Patch3: clamav-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
ClamAV is an open source (GPL) antivirus engine designed for detecting
Trojans, viruses, malware and other malicious threats. It is the de
facto standard for mail gateway scanning. It provides a high
performance mutli-threaded scanning daemon, command line utilities for
on demand file scanning, and an intelligent tool for automatic
signature updates. The core ClamAV library provides numerous file
format detection mechanisms, file unpacking support, archive support,
and multiple signature languages for detecting threats.
%prep
%setup -q
%patch1
%if 0%{?suse_version} == 0910
# SLES9's libmilter doesn't have smfi_insheader()
%patch2
%endif
%patch3 -p1
%build
%if 0%{?suse_version} >= 1010
CFLAGS="-fstack-protector"
CXXFLAGS="-fstack-protector"
%endif
export CFLAGS="%optflags $CFLAGS"
export CXXFLAGS="%optflags $CXXFLAGS"
%if 0%{?suse_version} == 0910
# SLES9 needs this macro to enable the quarantine feature in libmilter
CFLAGS="$CFLAGS -D_FFR_QUARANTINE -D_FFR_SMFI_OPENSOCKET"
%endif
./configure \
--prefix=%_prefix \
--libdir=%_libdir \
--mandir=%_mandir \
--sysconfdir=%_sysconfdir \
--disable-clamav \
--disable-static \
--with-dbdir=/var/lib/clamav \
--with-user=vscan \
--with-group=vscan \
--enable-milter \
%clamav_check \
%llvm \
--disable-zlib-vcheck \
--enable-clamdtop \
--disable-timestamps
make %{?jobs:-j%jobs}
%install
%makeinstall
ln -sf docs/html/{clamdoc,index}.html
mkdir -p %buildroot/etc/init.d
install -m755 %SOURCE1 %buildroot/etc/init.d/clamd
ln -s /etc/init.d/clamd %buildroot%_sbindir/rcclamd
install -m755 %SOURCE2 %buildroot/etc/init.d/freshclam
ln -s /etc/init.d/freshclam %buildroot%_sbindir/rcfreshclam
install -m755 %SOURCE5 %buildroot/etc/init.d/clamav-milter
ln -s /etc/init.d/clamav-milter %buildroot%_sbindir/rcclamav-milter
install -m755 %SOURCE3 %buildroot%_sbindir/updateclamconf
install -d -m755 %buildroot/var/{lib,run}/clamav
install -d -m755 %buildroot/usr/lib/tmpfiles.d
install -m644 %SOURCE6 %buildroot/usr/lib/tmpfiles.d/clamav.conf
mkdir -p %buildroot/var/spool/amavis
%if 0%{?suse_version} > 1020
rm %buildroot/%_libdir/*.la
%endif
# Remove bogus dependencies from libclamav.pc
sed -i 's/^Libs: .*/Libs: -lclamav/' %buildroot%_libdir/pkgconfig/libclamav.pc
%check
# regressoin tests
%if !0%{?qemu_user_space_build:1}
VALGRIND_GENSUP=1 make check
%endif
%files
%defattr(-,root,root,-)
%config(noreplace) %_sysconfdir/*.conf
%config %attr(744,root,root)/etc/init.d/*
%dir /usr/lib/tmpfiles.d
/usr/lib/tmpfiles.d/clamav.conf
%doc AUTHORS BUGS ChangeLog COPYING FAQ NEWS README UPGRADE
%doc docs/*.pdf docs/html
%doc %_mandir/*/*
%_bindir/*
%_sbindir/*
%_includedir/*
%_libdir/lib*
%_libdir/pkgconfig/libclamav.pc
%defattr(-,vscan,vscan)
%dir %attr(700,vscan,root) /var/spool/amavis
%dir /var/lib/clamav
%dir %attr(755,vscan,vscan) /var/run/clamav
%pre
%_sbindir/groupadd -r vscan 2> /dev/null || :
%_sbindir/useradd -r -o -g vscan -u 65 -s /bin/false -c "Vscan account" -d /var/spool/amavis vscan 2> /dev/null || :
%_sbindir/usermod vscan -g vscan 2> /dev/null || :
%post
/sbin/ldconfig
# merge config files on update
test "0$1" -lt 2 && exit 0
umask 022
for f in /etc/clamd.conf /etc/freshclam.conf /etc/clamav-milter.conf; do
if test -e $f.rpmnew; then
echo "Merging $f and $f.rpmnew"
%_sbindir/updateclamconf -v override="$OVERRIDE" $f $f.rpmnew > $f.tmp
if test $? == 0; then
mv $f $f.old
mv $f.tmp $f
else
echo "Merging $f with $f.rpmnew failed"
fi
fi
done
%preun
%stop_on_removal clamd freshclam
%postun
/sbin/ldconfig
%restart_on_update clamd freshclam
%insserv_cleanup
%changelog
++++++ clamav-conf.patch ++++++
Index: etc/clamav-milter.conf
===================================================================
--- etc/clamav-milter.conf.orig 2012-06-12 14:36:05.000000000 +0100
+++ etc/clamav-milter.conf 2012-06-18 22:49:23.000000000 +0100
@@ -2,10 +2,6 @@
## Example config file for clamav-milter
##
-# Comment or remove the line below.
-Example
-
-
##
## Main options
##
@@ -17,8 +13,7 @@ Example
# inet6:port@[hostname|ip-address] - to specify an ipv6 socket
#
# Default: no default
-#MilterSocket /tmp/clamav-milter.socket
-#MilterSocket inet:7357
+MilterSocket /var/run/clamav/clamav-milter-socket
# Define the group ownership for the (unix) milter socket.
# Default: disabled (the primary group of the user running clamd)
@@ -36,7 +31,7 @@ Example
# Run as another user (clamav-milter must be started by root for this option to work)
#
# Default: unset (don't drop privileges)
-#User clamav
+User vscan
# Initialize supplementary group access (clamav-milter must be started by root).
#
@@ -64,7 +59,7 @@ Example
# daemon (main thread).
#
# Default: disabled
-#PidFile /var/run/clamav-milter.pid
+PidFile /var/run/clamav/clamav-milter.pid
# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
@@ -90,7 +85,7 @@ Example
# with the same socket: clamd servers will be selected in a round-robin fashion.
#
# Default: no default
-#ClamdSocket tcp:scanner.mydomain:7357
+ClamdSocket unix:/var/run/clamav/clamd-socket
##
@@ -238,13 +233,13 @@ Example
# Use system logger (can work together with LogFile).
#
# Default: no
-#LogSyslog yes
+LogSyslog yes
# Specify the type of syslog messages - please refer to 'man syslog'
# for facility names.
#
# Default: LOG_LOCAL6
-#LogFacility LOG_MAIL
+LogFacility LOG_MAIL
# Enable verbose logging.
#
Index: etc/clamd.conf
===================================================================
--- etc/clamd.conf.orig 2012-06-12 14:03:26.000000000 +0100
+++ etc/clamd.conf 2012-06-18 22:49:23.000000000 +0100
@@ -1,12 +1,8 @@
##
-## Example config file for the Clam AV daemon
+## Config file for the Clam AV daemon
## Please read the clamd.conf(5) manual before editing this file.
##
-
-# Comment or remove the line below.
-Example
-
# Uncomment this option to enable logging.
# LogFile must be writable for the user running daemon.
# A full path is required.
@@ -40,12 +36,12 @@ Example
# Use system logger (can work together with LogFile).
# Default: no
-#LogSyslog yes
+LogSyslog yes
# Specify the type of syslog messages - please refer to 'man syslog'
# for facility names.
# Default: LOG_LOCAL6
-#LogFacility LOG_MAIL
+LogFacility LOG_MAIL
# Enable verbose logging.
# Default: no
@@ -58,7 +54,7 @@ Example
# This option allows you to save a process identifier of the listening
# daemon (main thread).
# Default: disabled
-#PidFile /var/run/clamd.pid
+PidFile /var/run/clamav/clamd.pid
# Optional path to the global temporary directory.
# Default: system specific (usually /tmp or /var/tmp).
@@ -77,7 +73,7 @@ Example
# Path to a local socket file the daemon will listen on.
# Default: disabled (must be specified by a user)
-#LocalSocket /tmp/clamd.socket
+LocalSocket /var/run/clamav/clamd-socket
# Sets the group ownership on the unix socket.
# Default: disabled (the primary group of the user running clamd)
@@ -93,14 +89,14 @@ Example
# TCP port address.
# Default: no
-#TCPSocket 3310
+TCPSocket 3310
# TCP address.
# By default we bind to INADDR_ANY, probably not wise.
# Enable the following to provide some degree of protection
# from the outside world.
# Default: no
-#TCPAddr 127.0.0.1
+TCPAddr 127.0.0.1
# Maximum length the queue of pending connections may grow to.
# Default: 200
@@ -186,7 +182,7 @@ Example
# Run as another user (clamd must be started by root for this option to work)
# Default: don't drop privileges
-#User clamav
+User vscan
# Initialize supplementary group access (clamd must be started by root).
# Default: no
@@ -440,6 +436,10 @@ Example
# Enable Clamuko. Dazuko must be configured and running. Clamuko supports
# both Dazuko (/dev/dazuko) and DazukoFS (/dev/dazukofs.ctrl). DazukoFS
# is the preferred option. For more information please visit www.dazuko.org
+#
+# When enabling this, you most probably have to set "User root" above,
+# so that clamav can access the files to be scanned.
+#
# Default: no
#ClamukoScanOnAccess yes
Index: etc/freshclam.conf
===================================================================
--- etc/freshclam.conf.orig 2012-06-12 14:36:05.000000000 +0100
+++ etc/freshclam.conf 2012-06-18 22:49:23.000000000 +0100
@@ -1,12 +1,8 @@
##
-## Example config file for freshclam
+## Config file for freshclam
## Please read the freshclam.conf(5) manual before editing this file.
##
-
-# Comment or remove the line below.
-Example
-
# Path to the database directory.
# WARNING: It must match clamd.conf's directive!
# Default: hardcoded (depends on installation options)
@@ -34,21 +30,21 @@ Example
# Use system logger (can work together with UpdateLogFile).
# Default: no
-#LogSyslog yes
+LogSyslog yes
# Specify the type of syslog messages - please refer to 'man syslog'
# for facility names.
# Default: LOG_LOCAL6
-#LogFacility LOG_MAIL
+LogFacility LOG_MAIL
# This option allows you to save the process identifier of the daemon
# Default: disabled
-#PidFile /var/run/freshclam.pid
+PidFile /var/run/clamav/freshclam.pid
# By default when started freshclam drops privileges and switches to the
# "clamav" user. This directive allows you to change the database owner.
# Default: clamav (may depend on installation options)
-#DatabaseOwner clamav
+DatabaseOwner vscan
# Initialize supplementary group access (freshclam must be started by root).
# Default: no
@@ -118,7 +114,7 @@ DatabaseMirror database.clamav.net
# Send the RELOAD command to clamd.
# Default: no
-#NotifyClamd /path/to/clamd.conf
+NotifyClamd /etc/clamd.conf
# Run command after successful database update.
# Default: disabled
@@ -161,7 +157,7 @@ DatabaseMirror database.clamav.net
# detected in the field and in what geographic area they are.
# Freshclam will connect to clamd in order to get recent statistics.
# Default: no
-#SubmitDetectionStats /path/to/clamd.conf
+#SubmitDetectionStats /etc/clamd.conf
# Country of origin of malware/detection statistics (for statistical
# purposes only). The statistics collector at ClamAV.net will look up
++++++ clamav-gcc47.patch ++++++
Index: clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
===================================================================
--- clamav-0.97.3.orig/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
+++ clamav-0.97.3/libclamav/c++/llvm/lib/ExecutionEngine/JIT/Intercept.cpp
@@ -15,6 +15,7 @@
//
//===----------------------------------------------------------------------===//
+#include <unistd.h>
#include "JIT.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/System/DynamicLibrary.h"
++++++ clamav-rcclamd ++++++
#! /bin/sh
# Copyright (c) 1995-2003 SuSE Linux AG, Nuernberg, Germany.
# All rights reserved.
#
# Author: Kurt Garloff
# Please send feedback to http://www.suse.de/feedback/
#
# /etc/init.d/clamd
# and its symbolic link
# /(usr/)sbin/rcclamd
#
#
# LSB compatible service control script; see http://www.linuxbase.org/spec/
#
# Note: This template uses functions rc_XXX defined in /etc/rc.status on
# UnitedLinux (UL) based Linux distributions. If you want to base your
# script on this template and ensure that it works on non UL based LSB
# compliant Linux distributions, you either have to provide the rc.status
# functions from UL or change the script to work without them.
#
### BEGIN INIT INFO
# Provides: clamd
# Required-Start: $syslog $remote_fs
# Required-Stop: $syslog $remote_fs
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: virus scanner daemon
# Description: Start the clamd virus scanner daemon
### END INIT INFO
#
# Any extensions to the keywords given above should be preceeded by
# X-VendorTag- (X-UnitedLinux- for us) according to LSB.
#
# Notes on Required-Start/X-UnitedLinux-Should-Start:
# * There are two different issues that are solved by Required-Start
# and X-UnitedLinux-Should-Start
# (a) Hard dependencies: This is used by the runlevel editor to determine
# which services absolutely need to be started to make the start of
# this service make sense. Example: nfsserver should have
# Required-Start: $portmap
# Also, required services are started before the dependent ones.
# The runlevel editor will warn about such missing hard dependencies
# and suggest enabling. During system startup, you may expect an error,
# if the dependency is not fulfilled.
# (b) Specifying the init script ordering, not real (hard) dependencies.
# This is needed by insserv to determine which service should be
# started first (and at a later stage what services can be started
# in parallel). The tag X-UnitedLinux-Should-Start: is used for this.
# It tells, that if a service is available, it should be started
# before. If not, never mind.
# * When specifying hard dependencies or ordering requirements, you can
# use names of services (contents of their Provides: section)
# or pseudo names starting with a $. The following ones are available
# according to LSB (1.1):
# $local_fs all local file systems are mounted
# (most services should need this!)
# $remote_fs all remote file systems are mounted
# (note that /usr may be remote, so
# many services should Require this!)
# $syslog system logging facility up
# $network low level networking (eth card, ...)
# $named hostname resolution available
# $netdaemons all network daemons are running
# The $netdaemons pseudo service has been removed in LSB 1.2.
# For now, we still offer it for backward compatibility.
# These are new (LSB 1.2):
# $time the system time has been set correctly
# $portmap SunRPC portmapping service available
# UnitedLinux extensions:
# $ALL indicates that a script should be inserted
# at the end
# * The services specified in the stop tags
# (Required-Stop/X-UnitedLinux-Should-Stop)
# specify which services need to be still running when this service
# is shut down. Often the entries there are just copies or a subset
# from the respective start tag.
# * X-UnitedLinux-Should-Start/Stop are not part of LSB (as of 1.3)
# but official Should-Start/Stop tags are in discussion (1.9).
# insserv does support these as well.
# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time
# (%fillup_and_insserv macro in %post of many RPMs) to specify whether
# a startup script should default to be enabled after installation.
# It's not used by insserv.
#
# Note on runlevels:
# 0 - halt/poweroff 6 - reboot
# 1 - single user 2 - multiuser without network exported
# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm)
#
# Note on script names:
# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html
# A registry has been set up to manage the init script namespace.
# http://www.lanana.org/
# Please use the names already registered or register one or use a
# vendor prefix.
# Check for missing binaries (stale symlinks should not happen)
# Note: Special treatment of stop for LSB conformance
CLAMD_BIN=/usr/sbin/clamd
test -x $CLAMD_BIN || { echo "$CLAMD_BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }
CLAMD_DBDIR=$(clamconf | sed -n '/DatabaseDirectory = /{s///;s/"//g;p;q}')
CLAMD_PIDFILE=$(clamconf | sed -n '
/Config file: clamd.conf/,/^$/ {
/PidFile = / {
s///
s/"//g
p
q
}
}')
# Source LSB init functions
# providing start_daemon, killproc, pidofproc,
# log_success_msg, log_failure_msg and log_warning_msg.
# This is currently not used by UnitedLinux based distributions and
# not needed for init scripts for UnitedLinux only. If it is used,
# the functions from rc.status should not be sourced or used.
#. /lib/lsb/init-functions
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_status check and set local and overall rc status
# rc_status -v be verbose in local rc status and clear it afterwards
# rc_status -v -r ditto and clear both the local and overall rc status
# rc_status -s display "skipped" and exit with status 3
# rc_status -u display "unused" and exit with status 3
# rc_failed set local and overall rc status to failed
# rc_failed <num> set local and overall rc status to <num>
# rc_reset clear both the local and overall rc status
# rc_exit exit appropriate to overall rc status
# rc_active checks whether a service is activated by symlinks
# rc_splash arg sets the boot splash screen to arg (if active)
. /etc/rc.status
# Reset status of this service
rc_reset
# Return values acc. to LSB for all commands but status:
# 0 - success
# 1 - generic or unspecified error
# 2 - invalid or excess argument(s)
# 3 - unimplemented feature (e.g. "reload")
# 4 - user had insufficient privileges
# 5 - program is not installed
# 6 - program is not configured
# 7 - program is not running
# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
#
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
# with force-reload (in case signaling is not supported) are
# considered a success.
case "$1" in
start)
echo -n "Starting Clam AntiVirus daemon "
OUT=$(startproc -p $CLAMD_PIDFILE $CLAMD_BIN 2>&1)
rc_status -v && rc_exit
# If clamd failed to start, check if the reason is
# missing virus database files.
clamscan - < /dev/null &> /dev/null
if test "$?" -eq "50"; then
echo " !!"
echo " !! ClamAV Virus definition files are missing from $CLAMD_DBDIR."
echo " !! Plase run freshclam manually to download the latest version (>20MB)"
echo " !! or install the clamav-db package."
echo " !!"
else
echo "$OUT"
fi
;;
stop)
echo -n "Shutting down Clam AntiVirus daemon "
## Stop daemon with killproc(8) and if this fails
## killproc sets the return value according to LSB.
killproc -p $CLAMD_PIDFILE -TERM $CLAMD_BIN
# Remember status and be verbose
rc_status -v
;;
try-restart | condrestart)
## Do a restart only if the service was active before.
## Note: try-restart is now part of LSB (as of 1.9).
## RH has a similar command named condrestart.
if test "$1" = "condrestart"; then
echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
fi
$0 status
if test $? = 0; then
$0 restart
else
rc_reset # Not running is not a failure.
fi
# Remember status and be quiet
rc_status
;;
restart)
## Stop the service and regardless of whether it was
## running or not, start it again.
$0 stop
$0 start
# Remember status and be quiet
rc_status
;;
reload | force-reload)
## Signal the daemon to reload its config.
echo -n "Reloading Clam AntiVirus daemon "
checkproc -p $CLAMD_PIDFILE $CLAMD_BIN && echo RELOAD > /dev/tcp/127.0.0.1/3310
rc_status -v
;;
status)
echo -n "Checking for Clam AntiVirus daemon "
## Check status with checkproc(8), if process is running
## checkproc will return with exit status 0.
# Return value is slightly different for the status command:
# 0 - service up and running
# 1 - service dead, but /var/run/ pid file exists
# 2 - service dead, but /var/lock/ lock file exists
# 3 - service not running (unused)
# 4 - service status unknown :-(
# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
# NOTE: checkproc returns LSB compliant status values.
checkproc -p $CLAMD_PIDFILE $CLAMD_BIN
# NOTE: rc_status knows that we called this init script with
# "status" option and adapts its messages accordingly.
rc_status -v
;;
*)
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
exit 1
;;
esac
rc_exit
++++++ clamav-rcfreshclam ++++++
#! /bin/sh
# Copyright (c) 1995-2003 SuSE Linux AG, Nuernberg, Germany.
# All rights reserved.
#
# Author: Kurt Garloff
# Please send feedback to http://www.suse.de/feedback/
#
# /etc/init.d/freshclam
# and its symbolic link
# /(usr/)sbin/rcfreshclam
#
#
# LSB compatible service control script; see http://www.linuxbase.org/spec/
#
# Note: This template uses functions rc_XXX defined in /etc/rc.status on
# UnitedLinux (UL) based Linux distributions. If you want to base your
# script on this template and ensure that it works on non UL based LSB
# compliant Linux distributions, you either have to provide the rc.status
# functions from UL or change the script to work without them.
#
### BEGIN INIT INFO
# Provides: freshclam
# Required-Start: $syslog $remote_fs
# Should-Start: $time ypbind sendmail
# Required-Stop: $syslog $remote_fs
# Should-Stop: $time ypbind sendmail
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: virus scanner daemon
# Description: Start the freshclam virus database update daemon
### END INIT INFO
#
# Any extensions to the keywords given above should be preceeded by
# X-VendorTag- (X-UnitedLinux- for us) according to LSB.
#
# Notes on Required-Start/X-UnitedLinux-Should-Start:
# * There are two different issues that are solved by Required-Start
# and X-UnitedLinux-Should-Start
# (a) Hard dependencies: This is used by the runlevel editor to determine
# which services absolutely need to be started to make the start of
# this service make sense. Example: nfsserver should have
# Required-Start: $portmap
# Also, required services are started before the dependent ones.
# The runlevel editor will warn about such missing hard dependencies
# and suggest enabling. During system startup, you may expect an error,
# if the dependency is not fulfilled.
# (b) Specifying the init script ordering, not real (hard) dependencies.
# This is needed by insserv to determine which service should be
# started first (and at a later stage what services can be started
# in parallel). The tag X-UnitedLinux-Should-Start: is used for this.
# It tells, that if a service is available, it should be started
# before. If not, never mind.
# * When specifying hard dependencies or ordering requirements, you can
# use names of services (contents of their Provides: section)
# or pseudo names starting with a $. The following ones are available
# according to LSB (1.1):
# $local_fs all local file systems are mounted
# (most services should need this!)
# $remote_fs all remote file systems are mounted
# (note that /usr may be remote, so
# many services should Require this!)
# $syslog system logging facility up
# $network low level networking (eth card, ...)
# $named hostname resolution available
# $netdaemons all network daemons are running
# The $netdaemons pseudo service has been removed in LSB 1.2.
# For now, we still offer it for backward compatibility.
# These are new (LSB 1.2):
# $time the system time has been set correctly
# $portmap SunRPC portmapping service available
# UnitedLinux extensions:
# $ALL indicates that a script should be inserted
# at the end
# * The services specified in the stop tags
# (Required-Stop/X-UnitedLinux-Should-Stop)
# specify which services need to be still running when this service
# is shut down. Often the entries there are just copies or a subset
# from the respective start tag.
# * X-UnitedLinux-Should-Start/Stop are not part of LSB (as of 1.3)
# but official Should-Start/Stop tags are in discussion (1.9).
# insserv does support these as well.
# * X-UnitedLinux-Default-Enabled: yes/no is used at installation time
# (%fillup_and_insserv macro in %post of many RPMs) to specify whether
# a startup script should default to be enabled after installation.
# It's not used by insserv.
#
# Note on runlevels:
# 0 - halt/poweroff 6 - reboot
# 1 - single user 2 - multiuser without network exported
# 3 - multiuser w/ network (text mode) 5 - multiuser w/ network and X11 (xdm)
#
# Note on script names:
# http://www.linuxbase.org/spec/refspecs/LSB_1.3.0/gLSB/gLSB/scrptnames.html
# A registry has been set up to manage the init script namespace.
# http://www.lanana.org/
# Please use the names already registered or register one or use a
# vendor prefix.
# Check for missing binaries (stale symlinks should not happen)
# Note: Special treatment of stop for LSB conformance
FRESHCLAM_BIN=/usr/bin/freshclam
test -x $FRESHCLAM_BIN || {
echo "$FRESHCLAM_BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi;
}
FRESHCLAM_PIDFILE=$(clamconf | sed -n '
/Config file: freshclam.conf/,/^$/ {
/PidFile = / {
s///
s/"//g
p
q
}
}')
# Source LSB init functions
# providing start_daemon, killproc, pidofproc,
# log_success_msg, log_failure_msg and log_warning_msg.
# This is currently not used by UnitedLinux based distributions and
# not needed for init scripts for UnitedLinux only. If it is used,
# the functions from rc.status should not be sourced or used.
#. /lib/lsb/init-functions
# Shell functions sourced from /etc/rc.status:
# rc_check check and set local and overall rc status
# rc_status check and set local and overall rc status
# rc_status -v be verbose in local rc status and clear it afterwards
# rc_status -v -r ditto and clear both the local and overall rc status
# rc_status -s display "skipped" and exit with status 3
# rc_status -u display "unused" and exit with status 3
# rc_failed set local and overall rc status to failed
# rc_failed <num> set local and overall rc status to <num>
# rc_reset clear both the local and overall rc status
# rc_exit exit appropriate to overall rc status
# rc_active checks whether a service is activated by symlinks
# rc_splash arg sets the boot splash screen to arg (if active)
. /etc/rc.status
# Reset status of this service
rc_reset
# Return values acc. to LSB for all commands but status:
# 0 - success
# 1 - generic or unspecified error
# 2 - invalid or excess argument(s)
# 3 - unimplemented feature (e.g. "reload")
# 4 - user had insufficient privileges
# 5 - program is not installed
# 6 - program is not configured
# 7 - program is not running
# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
#
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
# with force-reload (in case signaling is not supported) are
# considered a success.
case "$1" in
start)
echo -n "Starting Clam AntiVirus database update daemon "
# Check if there is a virus definition file
startproc -p $FRESHCLAM_PIDFILE $FRESHCLAM_BIN -d
# Remember status and be verbose
rc_status -v
;;
stop)
echo -n "Shutting down Clam AntiVirus database update daemon "
## Stop daemon with killproc(8) and if this fails
## killproc sets the return value according to LSB.
killproc -p $FRESHCLAM_PIDFILE -TERM $FRESHCLAM_BIN
# Remember status and be verbose
rc_status -v
;;
try-restart | condrestart)
## Do a restart only if the service was active before.
## Note: try-restart is now part of LSB (as of 1.9).
## RH has a similar command named condrestart.
if test "$1" = "condrestart"; then
echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
fi
$0 status
if test $? = 0; then
$0 restart
else
rc_reset # Not running is not a failure.
fi
# Remember status and be quiet
rc_status
;;
restart)
## Stop the service and regardless of whether it was
## running or not, start it again.
$0 stop
$0 start
# Remember status and be quiet
rc_status
;;
reload | force-reload)
## Signal the daemon to reload its config.
echo -n "Reloading Clam AntiVirus database update daemon "
checkproc -p $FRESHCLAM_PIDFILE $FRESHCLAM_BIN &&
killproc -p $FRESHCLAM_PIDFILE -HUP $FRESHCLAM_BIN
rc_status -v
;;
status)
echo -n "Checking for Clam AntiVirus database update daemon "
## Check status with checkproc(8), if process is running
## checkproc will return with exit status 0.
# Return value is slightly different for the status command:
# 0 - service up and running
# 1 - service dead, but /var/run/ pid file exists
# 2 - service dead, but /var/lock/ lock file exists
# 3 - service not running (unused)
# 4 - service status unknown :-(
# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
# NOTE: checkproc returns LSB compliant status values.
checkproc -p $FRESHCLAM_PIDFILE $FRESHCLAM_BIN
# NOTE: rc_status knows that we called this init script with
# "status" option and adapts its messages accordingly.
rc_status -v
;;
*)
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
exit 1
;;
esac
rc_exit
++++++ clamav-rcmilter ++++++
#!/bin/sh
#
# SUSE system startup script for clamav-milter
# Copyright (C) 1995--2005 Kurt Garloff, SUSE / Novell Inc.
# Copyright (C) 2007 Reinhard Max, SUSE / Novell Inc.
#
# This library is free software; you can redistribute it and/or modify it
# under the terms of the GNU Lesser General Public License as published by
# the Free Software Foundation; either version 2.1 of the License, or (at
# your option) any later version.
#
# This library is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307,
# USA.
#
# /etc/init.d/clamav-milter
# and its symbolic link
# /(usr/)sbin/rcclamav-milter
#
### BEGIN INIT INFO
# Provides: clamav-milter
# Required-Start: clamd $syslog $remote_fs
# Required-Stop: clamd $syslog $remote_fs
# Default-Start: 3 5
# Default-Stop: 0 1 2 6
# Short-Description: milter compatible mail scanner
# Description: Start clamav-milter, which is needed to
# use ClamAV for virus scanning in a sendmail environment.
### END INIT INFO
# Check for missing binaries (stale symlinks should not happen)
# Note: Special treatment of stop for LSB conformance
BIN=/usr/sbin/clamav-milter
# Read the pidfile from the config
PIDFILE=$(clamconf | sed -n '
/Config file: clamav-milter.conf/,/^$/ {
/PidFile = / {
s///
s/"//g
p
q
}
}')
test -x $BIN || { echo "$BIN not installed";
if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; }
# Source LSB init functions
. /etc/rc.status
# Reset status of this service
rc_reset
# Return values acc. to LSB for all commands but status:
# 0 - success
# 1 - generic or unspecified error
# 2 - invalid or excess argument(s)
# 3 - unimplemented feature (e.g. "reload")
# 4 - user had insufficient privileges
# 5 - program is not installed
# 6 - program is not configured
# 7 - program is not running
# 8--199 - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
#
# Note that starting an already running service, stopping
# or restarting a not-running service as well as the restart
# with force-reload (in case signaling is not supported) are
# considered a success.
case "$1" in
start)
echo -n "Starting clamav-milter "
# make sure everybody can access the local socket
umask 0
## Start daemon with startproc(8). If this fails
## the return value is set appropriately by startproc.
/sbin/startproc ${PIDFILE:+-p $PIDFILE} $BIN
# Remember status and be verbose
rc_status -v
;;
stop)
echo -n "Shutting down clamav-milter "
## Stop daemon with killproc(8) and if this fails
## killproc sets the return value according to LSB.
/sbin/killproc -TERM ${PIDFILE:+-p $PIDFILE} -G $BIN
# Remember status and be verbose
rc_status -v
;;
try-restart|condrestart)
## Do a restart only if the service was active before.
## Note: try-restart is now part of LSB (as of 1.9).
## RH has a similar command named condrestart.
if test "$1" = "condrestart"; then
echo "${attn} Use try-restart ${done}(LSB)${attn} rather than condrestart ${warn}(RH)${norm}"
fi
$0 status
if test $? = 0; then
$0 restart
else
rc_reset # Not running is not a failure.
fi
# Remember status and be quiet
rc_status
;;
restart)
## Stop the service and regardless of whether it was
## running or not, start it again.
$0 stop
$0 start
# Remember status and be quiet
rc_status
;;
force-reload)
## Signal the daemon to reload its config. Most daemons
## do this on signal 1 (SIGHUP).
## If it does not support it, restart the service if it
## is running.
$0 try-restart
rc_status
;;
reload)
## Like force-reload, but if daemon does not support
## signaling, do nothing (!)
rc_failed 3
rc_status -v
;;
status)
echo -n "Checking for clamav-milter "
## Check status with checkproc(8), if process is running
## checkproc will return with exit status 0.
# Return value is slightly different for the status command:
# 0 - service up and running
# 1 - service dead, but /var/run/ pid file exists
# 2 - service dead, but /var/lock/ lock file exists
# 3 - service not running (unused)
# 4 - service status unknown :-(
# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
# NOTE: checkproc returns LSB compliant status values.
/sbin/checkproc ${PIDFILE:+-p $PIDFILE} $BIN
# NOTE: rc_status knows that we called this init script with
# "status" option and adapts its messages accordingly.
rc_status -v
;;
probe)
## Optional: Probe for the necessity of a reload, print out the
## argument to this init script which is required for a reload.
## Note: probe is not (yet) part of LSB (as of 1.9)
test /etc/clamd.conf -nt $PIDFILE -o \
/etc/sysconfig/clamav-milter -nt $PIDFILE \
&& echo restart
;;
*)
echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload|probe}"
exit 1
;;
esac
rc_exit
++++++ clamav-rpmlintrc ++++++
addFilter("non-standard-uid.*")
addFilter("devel-file-in-non-devel-package.*")
addFilter("obsolete-not-provided")
++++++ clamav-sles9.patch ++++++
Index: clamav-milter/clamfi.c
===================================================================
--- clamav-milter/clamfi.c.orig
+++ clamav-milter/clamfi.c
@@ -90,16 +90,11 @@ static void add_x_header(SMFICTX *ctx, c
while(status)
if(smfi_chgheader(ctx, (char *)"X-Virus-Status", status--, NULL) != MI_SUCCESS)
logg("^Failed to remove existing X-Virus-Status header\n");
+ }
if(smfi_addheader(ctx, (char *)"X-Virus-Scanned", xvirushdr) != MI_SUCCESS)
logg("^Failed to add X-Virus-Scanned header\n");
if(smfi_addheader(ctx, (char *)"X-Virus-Status", st) != MI_SUCCESS)
logg("^Failed to add X-Virus-Status header\n");
- } else { /* Add */
- if(smfi_insheader(ctx, 1, (char *)"X-Virus-Scanned", xvirushdr) != MI_SUCCESS)
- logg("^Failed to insert X-Virus-Scanned header\n");
- if(smfi_insheader(ctx, 1, (char *)"X-Virus-Status", st) != MI_SUCCESS)
- logg("^Failed to insert X-Virus-Status header\n");
- }
}
enum CFWHAT {
--- clamav-milter/clamav-milter.c
+++ clamav-milter/clamav-milter.c
@@ -282,7 +282,7 @@
}
opt = optget(opts, "FixStaleSocket");
umsk = umask(0777); /* socket is created with 000 to avoid races */
- if(smfi_opensocket(opt->enabled) == MI_FAILURE) {
+ if(smfi_opensocket() == MI_FAILURE) {
logg("!Failed to create socket %s\n", my_socket);
localnets_free();
whitelist_free();
++++++ clamav-tmpfiles.conf ++++++
# clamav needs a directory in /var/run:
d /var/run/clamav 0755 vscan vscan -
++++++ clamav-updateclamconf ++++++
#!/usr/bin/awk -f
#
# updateclamconf
#
# Merge two clamd.conf or freshclam.conf files and write the result to
# the standard output. The result file contains all comments from the
# second file with the active (i.e. not commented-out) settings from
# the first file merged into it. Settings which were only in the first
# file file and not mentioned in the second file any more, are appended
# at the end, but commented out.
#
# Any comment must start with a hash and a space:
# # comment
# while any commented out setting must start with a hash and no space:
# #settingname settingvalue
#
# The first file may optionally have the format that was used up to
# version 0.88.7. In that case the settings will be converted to the
# format that is used in version 0.90 and newer.
#
# Known issues:
#
# If an option exists more than once in eiter file, only the first
# occurance will be moved over from the first file. AFAIK this
# currently only applies to the DatabaseMirror option in
# freshclam.conf.
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# Authors: Reinhard Max <max(a)suse.de>
# Kurt Keller <Kurt(a)pinboard.com>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
BEGIN {
if (ARGC != 3) {
print "usage: updateclamconf oldfile newfile" > "/dev/stderr"
exit 1
}
# some options may be overridden from the command line
$0 = override
for (i=1; i<=NF; i+=2) {
options[$i] = $i " " $(i+1)
}
pass = 0
}
lastname != FILENAME {
lastname = FILENAME
pass++
}
# collect options from the first file
pass == 1 && $0 ~ /^[[:space:]]*[^#]/ {
if (NF == 1) {
$2 = "yes"
}
if (!($1 in options)) {
options[$1] = $0
}
}
# merge options into the content of the second file
pass == 2 {
# copy $1, so that sub() doesn't modify $0
o = $1
sub("^#", "", o)
if (o in options) {
if (o == "NotifyClamd" && options[o] ~ / yes$/) {
sub("^#", "")
options[o] = $0
}
print options[o]
delete options[o]
} else {
print
}
}
# print out any options that were only found in the first file
END {
for (o in options) {
print "\n# These options weren't found in the new config file"
for (o in options) {
print "# " o, options[o]
}
break
}
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0