January 2018 - Arch-excludes - Fedora mailing-lists

[Report] Packages Restricting Arches
by root 27 Jan '18

27 Jan '18

List of packages currently excluding arches (2668) =========================================== - 0ad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - GtkAda ExclusiveArch: %{GNAT_arches} - GtkAda3 ExclusiveArch: %{GPRbuild_arches} - LuxRender ExclusiveArch: x86_64 - OpenTK ExclusiveArch: %mono_arches - PragmARC ExclusiveArch: %{GNAT_arches} - R-DynDoc ExclusiveArch: armv7, ppc, go_arch - RdRand ExclusiveArch: %{ix86} x86_64 - SLOF ExclusiveArch: ppc64le - YafaRay ExclusiveArch: %{ix86} x86_64 - aboot ExclusiveArch: alpha - acpid ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 - ahven ExclusiveArch: %{GNAT_arches} - alleyoop ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64 - american-fuzzy-lop ExclusiveArch: %{ix86} x86_64 - anet ExclusiveArch: %{GNAT_arches} - apmd ExclusiveArch: %{ix86} - apmud ExclusiveArch: ppc - appstream-generator ExclusiveArch: x86_64 %{ix86} %{arm} - arduino ExclusiveArch: %{go_arches} - arduino-builder ExclusiveArch: %{go_arches} - arm-boot-config ExclusiveArch: %{arm} - arm-trusted-firmware ExclusiveArch: aarch64 - atomic ExclusiveArch: i386 i486 i586 i686 pentium3 pentium4 athlon geode x86_64 armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl aarch64 ppc64le s390x mips mipsel mipsr6 mipsr6el mips64 mips64el mips64r6 mips64r6el ExclusiveArch: x86_64 ppc64le - aunit ExclusiveArch: %GPRbuild_arches - avgtime ExclusiveArch: %{ldc_arches} - aws ExclusiveArch: %GPRbuild_arches - banshee ExclusiveArch: %{mono_arches} - banshee-community-extensions ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x - bareftp ExclusiveArch: %{mono_arches} - bcc ExclusiveArch: x86_64 %{power64} - bcm283x-firmware ExclusiveArch: %{arm} aarch64 - beignet ExclusiveArch: x86_64 %{ix86} - berusky2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips} - biosdevname ExclusiveArch: %{ix86} x86_64 ia64 - bless ExclusiveArch: %mono_arches - boo ExclusiveArch: %{mono_arches} - buildah ExclusiveArch: x86_64 aarch64 ppc64le s390x - bwa ExclusiveArch: x86_64 - caddy ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - cadvisor ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le - calamares ExclusiveArch: %{ix86} x86_64 - cargo ExclusiveArch: %{rust_arches} - carto ExclusiveArch: %{nodejs_arches} noarch - ccdciel ExclusiveArch: %{fpc_arches} - cdcollect ExclusiveArch: %{mono_arches} - ceph ExclusiveArch: x86_64 aarch64 ppc64 ppc64le ExclusiveArch: x86_64 aarch64 ppc64le s390x - chromium ExclusiveArch: x86_64 i686 ExclusiveArch: x86_64 i686 aarch64 - cjdns ExclusiveArch: %{nodejs_arches} - cmospwd ExclusiveArch: %{ix86} x86_64 - cmrt ExclusiveArch: %{ix86} x86_64 ia64 - coffee-script ExclusiveArch: %{nodejs_arches} noarch - colorful ExclusiveArch: %{fpc_arches} - compat-gcc-296 ExclusiveArch: %{ix86} ia64 ppc - consul ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - containerd ExclusiveArch: %{go_arches} - corosync ExclusiveArch: i686 x86_64 - cpuid ExclusiveArch: %{ix86} x86_64 - cqrlog ExclusiveArch: %{fpc_arches} - crash ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - criu ExclusiveArch: x86_64 %{arm} ppc64le aarch64 ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x - cryptlib ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le - cryptobone ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64 - daq ExclusiveArch: x86_64 aarch64 - darktable ExclusiveArch: x86_64 aarch64 - dbus-sharp ExclusiveArch: %mono_arches - dbus-sharp-glib ExclusiveArch: %mono_arches - dbxtool ExclusiveArch: i386 x86_64 aarch64 - deepin-api ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - deepin-daemon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-dbus-generator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-gir-generator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - derelict ExclusiveArch: %{ldc_arches} - direnv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - dlm ExclusiveArch: i686 x86_64 - dmidecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - dmtcp ExclusiveArch: %ix86 x86_64 aarch64 - docco ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - docker ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - docker-anaconda-addon ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - docker-distribution ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - docker-latest ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - dolphin-emu ExclusiveArch: x86_64 armv7l aarch64 - douceur ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - dpdk ExclusiveArch: x86_64 i686 aarch64 ppc64le - dssi-vst ExclusiveArch: %{ix86} x86_64 - dustmite ExclusiveArch: %{ldc_arches} - dyninst ExclusiveArch: %{ix86} x86_64 ppc ppc64 - e3 ExclusiveArch: %{ix86} x86_64 - edac-utils ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} - edb ExclusiveArch: %{ix86} x86_64 - edk2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: x86_64 aarch64 - efibootmgr ExclusiveArch: %{ix86} x86_64 aarch64 arm - efivar ExclusiveArch: %{ix86} x86_64 aarch64 - elasticdump ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - elk ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - embree ExclusiveArch: x86_64 - envytools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - etcd ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - exciting ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - exercism ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - expresso ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - extlinux-bootloader ExclusiveArch: %{arm} aarch64 - fcitx-libpinyin ExclusiveArch: %{qt5_qtwebengine_arches} - fedora-developer-portal ExclusiveArch: ix86 x86_64 - fedora-dockerfiles ExclusiveArch: %{go_arches} - fedora-gnat-project-common ExclusiveArch: noarch %{GNAT_arches} - fence-virt ExclusiveArch: i686 x86_64 - fes ExclusiveArch: x86_64 - ffcall ExclusiveArch: %{ffcall_arches} - firmware-addon-dell ExclusiveArch: x86_64 ia64 %{ix86} - flannel ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - florist ExclusiveArch: %GPRbuild_arches - fluxcapacitor ExclusiveArch: %{ix86} x86_64 %{arm} - fpc ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64 - freshmaker ExclusiveArch: %{ix86} x86_64 - frysk ExclusiveArch: %{ix86} x86_64 ppc64 - fst ExclusiveArch: i686 - fwts ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x %{power64} - fwupdate ExclusiveArch: x86_64 aarch64 - fzf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - ga ExclusiveArch: %{ix86} x86_64 - gbrainy ExclusiveArch: %mono_arches - gdata-sharp ExclusiveArch: %mono_arches - gdb-exploitable ExclusiveArch: x86_64 i386 ExclusiveArch: x86_64 noarch - gela-asis ExclusiveArch: %{GNAT_arches} - ghdl ExclusiveArch: %{GNAT_arches} - gio-sharp ExclusiveArch: %mono_arches - gir-to-d ExclusiveArch: %{ldc_arches} - git-lfs ExclusiveArch: %{go_arches} - git-octopus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - giver ExclusiveArch: %{mono_arches} - gkeyfile-sharp ExclusiveArch: %mono_arches - gl3n ExclusiveArch: %{ldc_arches} - glibc32 ExclusiveArch: x86_64 ppc64 s390x - glide ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gmqcc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - gnatcoll ExclusiveArch: %GPRbuild_arches - gnome-boxes ExclusiveArch: x86_64 - gnome-desktop-sharp ExclusiveArch: %mono_arches - gnome-do ExclusiveArch: %mono_arches - gnome-guitar ExclusiveArch: %{mono_arches} - gnome-keyring-sharp ExclusiveArch: %mono_arches - gnome-rdp ExclusiveArch: %{mono_arches} - gnome-sharp ExclusiveArch: %mono_arches - gnome-subtitles ExclusiveArch: %mono_arches - gnu-efi ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - gnu-smalltalk ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - go-bindata ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - go-compilers ExclusiveArch: %{go_arches} - go-i18n ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - gocomplete ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - godep ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gofed ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - golang ExclusiveArch: %{golang_arches} - golang-bazil-fuse ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-bitbucket-kardianos-osext ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-bitbucket-ww-goautoneg ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-deepin-go-lib ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-10gen-openssl ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - golang-github-3rf-mongo-lint ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-AdRoll-goamz ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-AudriusButkevicius-cli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-AudriusButkevicius-go-nat-pmp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-AudriusButkevicius-kcp-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-AudriusButkevicius-pfilter ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-Azure-azure-sdk-for-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-freetype-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-graphics-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-toml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-BurntSushi-toml-test ExclusiveArch: %{go_arches} - golang-github-BurntSushi-xgb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-xgbutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-DATA-DOG-go-sqlmock ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-DataDog-datadog-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Jeffail-gabs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-MakeNowJust-heredoc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Masterminds-semver ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Masterminds-vcs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-PuerkitoBio-goquery ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-PuerkitoBio-purell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-PuerkitoBio-urlesc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-RangelReale-osin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-RangelReale-osincli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-SAP-go-hdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-SeanDolphin-bqschema ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-SermoDigital-jose ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-Shopify-sarama ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Shopify-toxiproxy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Sirupsen-logrus ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-ThomsonReutersEikon-go-ntlm ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Unknwon-goconfig ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-VividCortex-ewma ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-abbot-go-http-auth ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-agl-ed25519 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-akrennmair-gopcap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-alecthomas-assert ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-chroma ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-alecthomas-colour ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-kingpin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-repr ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-template ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-units ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-andybalholm-cascadia ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-appc-spec ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-armon-circbuf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-armon-go-metrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-armon-go-proxyproto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-armon-go-radix ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-armon-gomdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-asaskevich-govalidator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-auth0-go-jwt-middleware ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-aws-aws-sdk-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-axgle-mahonia ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-beorn7-perks ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bep-gitmap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bep-inflect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bgentry-go-netrc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bgentry-speakeasy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-billziss-gh-cgofuse ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bitly-go-simplejson ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bkaradzic-go-lz4 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-blang-semver ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bmizerany-assert ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bmizerany-pat ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bmizerany-perks ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-boltdb-bolt ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-boombuler-barcode ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bradfitz-http2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bugsnag-bugsnag-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bugsnag-panicwrap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-calmh-du ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-calmh-luhn ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-calmh-xdr ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-ccding-go-stun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cenkalti-backoff ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-chaseadamsio-goorgeous ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cheggaaa-pb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-chmduquesne-rollinghash ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-chrismalek-oktasdk-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-chzyer-logex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-chzyer-test ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-circonus-labs-circonus-gometrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-circonus-labs-circonusllhist ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cloudfoundry-incubator-candiedyaml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cockroachdb-cmux ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cockroachdb-cockroach-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-codahale-aesnicheck ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-codegangsta-cli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-codegangsta-negroni ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-collectd-go-collectd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-coreos-gexpect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-coreos-go-etcd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-coreos-go-iptables ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-coreos-go-log ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-coreos-go-oidc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-coreos-go-semver ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-coreos-go-systemd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-coreos-pkg ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cpuguy83-go-md2man ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-cznic-b ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-fileutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-golex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-internal ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-lex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-lexer ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-lldb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-mathutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-ql ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-sortutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-strutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-zappy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-d2g-dhcp4 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-d2g-dhcp4client ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-d4l3k-messagediff ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-danwakefield-fnmatch ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-davecgh-go-spew ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-daviddengcn-go-colortext ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-dchest-cssmin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dchest-siphash ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-denisenkom-go-mssqldb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-denverdino-aliyungo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-dgnorton-goback ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-dgrijalva-jwt-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-digitalocean-godo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-disintegration-imaging ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-dlclark-regexp2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-docker-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-go-connections ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-go-units ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-libcontainer ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-libkv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-libtrust ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-spdystream ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docopt-docopt-go ExclusiveArch: %{go_arches} - golang-github-duosecurity-duo_api_golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dustin-go-humanize ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dvsekhvalnov-jose2go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-eapache-go-resiliency ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-eapache-queue ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-edsrzf-mmap-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-eknkc-amber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-elazarl-go-bindata-assetfs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-emicklei-go-restful ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-endophage-gotuf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-evanphx-json-patch ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fatih-color ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fatih-pool ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fatih-structs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-flynn-go-shlex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-flynn-json5 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fortytw2-leaktest ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fsnotify-fsnotify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fsouza-go-dockerclient ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fullsailor-pkcs7 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-garyburd-redigo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gdamore-encoding ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gdamore-tcell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gengo-grpc-gateway ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-getsentry-raven-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-ghodss-yaml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-glacjay-goini ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-asn1-ber-asn1-ber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-errors-errors ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-fsnotify-fsnotify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-go-ini-ini ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-go-ldap-ldap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-macaron-inject ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-go-mgo-mgo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-sql-driver-mysql ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-tomb-tomb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gobwas-glob ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gocql-gocql ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-godbus-dbus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-appengine ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-glog ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-groupcache ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-golang-image ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-sync ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-sys ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-time ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-blas ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-floats ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-graph ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-internal ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-lapack ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-matrix ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-google-btree ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-google-go-cmp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-google-go-genproto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-google-go-github ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-google-go-querystring ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-google-gofuzz ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-goraft-raft ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-context ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-css ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gorilla-handlers ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-mux ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-securecookie ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-sessions ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-websocket ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gosexy-gettext ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-grpc-ecosystem-go-grpc-prometheus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-grpc-ecosystem-grpc-gateway ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-grpc-grpc-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hailocab-go-hostpool ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-consul-migrate ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-errwrap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-checkpoint ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-cleanhttp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-hclog ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-immutable-radix ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-memdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-msgpack ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-multierror ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-plugin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-retryablehttp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-rootcerts ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-sockaddr ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-syslog ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-uuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-golang-lru ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-hcl ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-hil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-logutils ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-mdns ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-memberlist ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-net-rpc-msgpackrpc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-raft ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-raft-boltdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-raft-mdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-scada-client ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-serf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-yamux ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hawkular-hawkular-client-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-howeyc-fsnotify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-howeyc-gopass ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-imdario-mergo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-inconshreveable-mousetrap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-inconshreveable-muxado ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-influxdb-hyperleveldb-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-influxdb-influxdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-influxdb-rocksdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jackpal-gateway ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jacobsa-oglematchers ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jdkato-prose ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jdkato-syllables ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jefferai-jsonx ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jessevdk-go-flags ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jfrazelle-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jinzhu-gorm ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jlaffaye-ftp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jmespath-go-jmespath ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jmhodges-levigo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jonboulle-clockwork ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jtolds-gls ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-juju-ratelimit ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-julienschmidt-httprouter ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-karlseguin-ccache ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-karlseguin-expect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-kballard-go-shellquote ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-kdar-factorlog ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-keybase-go-crypto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-kimor79-gollectd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-klauspost-cpuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-klauspost-crc32 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-klauspost-reedsolomon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-knieriem-markdown ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-kr-fs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-kr-pretty ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-kr-pty ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-kr-text ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-kylelemons-godebug ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-kyokomi-emoji ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-lib-pq ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-linuxdeepin-go-x11-client ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-lpabon-godbc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-lsegal-gucumber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-lucasb-eyer-go-colorful ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-magiconair-properties ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-markbates-inflect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mattn-go-colorable ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mattn-go-isatty ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mattn-go-runewidth ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mattn-go-shellwords ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mattn-go-sqlite3 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-matttproud-golang_protobuf_extensions ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mesos-mesos-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mgutz-ansi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mgutz-logxi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-michaelklishin-rabbit-hole ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-miekg-dns ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-miekg-mmark ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-miekg-pkcs11 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-milochristiansen-axis2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-milochristiansen-lua ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-minio-sha256-simd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mistifyio-go-zfs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mitchellh-cli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-copystructure ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-go-homedir ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mitchellh-go-testing-interface ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-go-wordwrap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-goamz ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mitchellh-mapstructure ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-reflectwalk ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-montanaflynn-stats ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mreiferson-go-httpclient ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-msteinert-pam ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mvo5-goconfigparser ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mvo5-uboot-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mxk-go-flowrate ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-ncw-dropbox-sdk-go-unofficial ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-ncw-go-acd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-ncw-swift ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-neurosnap-sentences ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-nfnt-resize ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-noahdesu-go-ceph ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-nsf-termbox-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-nwidger-jsoncolor ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-ojii-gettext.go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-olekukonko-tablewriter ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-olekukonko-ts ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-olivere-elastic ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-onsi-ginkgo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-onsi-gomega ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-opencontainers-runtime-spec ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-opencontainers-specs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-openshift-go-json-rest ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-openshift-go-systemd ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-openshift-openshift-sdn ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-oschwald-geoip2-golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-oschwald-maxminddb-golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-patrickmn-go-cache ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-pelletier-go-buffruneio ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-pelletier-go-toml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-petar-GoLLRB ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-peterh-liner ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-petermattis-goid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-pkg-errors ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-pkg-profile ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-pkg-sftp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-pmezard-go-difflib ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-pquerna-otp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-prometheus-client_golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-prometheus-client_model ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-prometheus-common ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-prometheus-procfs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-prometheus-prometheus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-racker-perigee ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rackspace-gophercloud ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-rakyll-globalconf ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rakyll-pb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-rakyll-statik ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rcrowley-go-metrics ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-remyoudompheng-bigfft ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rfjakob-eme ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-robertkrimen-otto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-russross-blackfriday ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-ryanuber-columnize ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-ryanuber-go-glob ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-samalba-dockerclient ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-samuel-go-zookeeper ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-sasha-s-go-deadlock ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-seccomp-libseccomp-golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-sergi-go-diff ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-sethgrid-pester ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shiena-ansicolor ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shogo82148-go-shuffle ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shurcooL-sanitized_anchor_name ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-skarademir-naturalsort ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-skratchdot-open-golang ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-skynetservices-skydns ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-smartystreets-assertions ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-smartystreets-go-aws-auth ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-smartystreets-goconvey ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spacejam-loghisto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-spacemonkeygo-flagfile ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-spacemonkeygo-openssl ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm} ppc64le s390x} - golang-github-spacemonkeygo-spacelog ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-spf13-afero ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-cast ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-cobra ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-spf13-fsync ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-jWalterWeatherman ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-nitro ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-spf13-pflag ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-viper ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-sstarcher-go-okta ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stathat-go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-stevvooe-resumable ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-streadway-amqp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stretchr-objx ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stretchr-testify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-syndtr-gocapability ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-syndtr-goleveldb ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-syndtr-gosnappy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-templexxx-cpufeat ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-templexxx-reedsolomon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-templexxx-xor ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-tent-http-link-go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-thejerf-suture ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-tjfoc-gmsm ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-tonnerre-golang-pretty ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-ugorji-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-urfave-cli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-vaughan0-go-ini ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-vbatts-tar-split ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-vishvananda-netlink ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} aarch64 x86_64 %{arm}} - golang-github-vishvananda-netns ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-vitrun-qart ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-vjeantet-asn1-ber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-vmware-govcloudair ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-wsxiaoys-terminal ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xanzy-ssh-agent ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonpointer ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonreference ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonschema ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xiang90-probing ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-xtaci-kcp-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xtaci-smux ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yosssi-ace ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yosssi-gohtml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yuin-gopher-lua ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yvasiyarov-go-metrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-yvasiyarov-gorelic ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-yvasiyarov-newrelic_platform_go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-zillode-notify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-zyedidia-clipboard ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-zyedidia-glob ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-zyedidia-poller ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-zyedidia-tcell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-google-golangorg-cloud ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-gcfg ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-go-crypto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-go-decimal-inf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-go-exp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-googlecode-goauth2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-gogoprotobuf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-gomock ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-google-api-client ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-goprotobuf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-log4go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-net ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-sqlite ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-text ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-tools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-uuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-check ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-go-check-check ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-gopkg-go-macaroon-macaroon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-gopkg-readline ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-retry-v1 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-sourcemap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-yaml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-layeh-gopher-luar ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-torproject-pluggable-transports-goptlib ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golint ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gomtree ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gotags ExclusiveArch: %{go_arches} - gotun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: x86_64 - gprbuild ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch} - gprolog ExclusiveArch: x86_64 %{ix86} ppc alpha - gsf-sharp ExclusiveArch: %mono_arches - gtk-sharp-beans ExclusiveArch: %mono_arches - gtk-sharp2 ExclusiveArch: %mono_arches - gtk-sharp3 ExclusiveArch: %{mono_arches} - gtkd ExclusiveArch: %{ldc_arches} - gudev-sharp ExclusiveArch: %mono_arches - hedgewars ExclusiveArch: %{fpc_arches} - heketi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - hub ExclusiveArch: %{go_arches} - hugo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - hyena ExclusiveArch: %{mono_arches} - hyperscan ExclusiveArch: x86_64 - hyperv-daemons ExclusiveArch: i686 x86_64 - icaro ExclusiveArch: %{ix86} %{arm} x86_64 noarch - ikarus ExclusiveArch: %{ix86} - imvirt ExclusiveArch: %{ix86} x86_64 ia64 - indistarter ExclusiveArch: %{fpc_arches} - infinipath-psm ExclusiveArch: x86_64 - intel-cmt-cat ExclusiveArch: x86_64 i686 i586 ExclusiveArch: x86_64 i686 i586 - ioport ExclusiveArch: %{ix86} x86_64 - ipw2100-firmware ExclusiveArch: noarch i386 x86_64 - ipw2200-firmware ExclusiveArch: noarch i386 x86_64 - ispc ExclusiveArch: %{arm} %{ix86} x86_64 - iucode-tool ExclusiveArch: %{ix86} x86_64 - iwyu ExclusiveArch: %{ix86} x86_64 - ixpdimm_sw ExclusiveArch: x86_64 - jake ExclusiveArch: %{nodejs_arches} noarch - jasmine-node ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - java-1.8.0-openjdk-aarch32 ExclusiveArch: %{arm} - julia ExclusiveArch: %{ix86} x86_64 - keepass ExclusiveArch: %{mono_arches} - kernel ExclusiveArch: %{all_x86} x86_64 ppc64 s390x %{arm} aarch64 ppc64le - kicad ExclusiveArch: %{ix86} x86_64 %{arm} ppc64 ppc64le aarch64 - knot-resolver ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - kompose ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x - kosmtik ExclusiveArch: %{nodejs_arches} noarch - kubernetes ExclusiveArch: x86_64 aarch64 ppc64le s390x - latrace ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} - lazarus ExclusiveArch: %{fpc_arches} - ldc ExclusiveArch: %{ldc_arches} - libbsr ExclusiveArch: %{power64} - libclc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x - libcxl ExclusiveArch: %{power64} - libflatarray ExclusiveArch: %{ix86} x86_64 - libhfi1 ExclusiveArch: x86_64 - libica ExclusiveArch: s390 s390x - libinvm-cim ExclusiveArch: x86_64 - libinvm-cli ExclusiveArch: x86_64 - libinvm-i18n ExclusiveArch: x86_64 - libipt ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - libjingle ExclusiveArch: %{ix86} x86_64 %{arm} - libmfx ExclusiveArch: %{ix86} x86_64 - libpsm2 ExclusiveArch: x86_64 - librtas ExclusiveArch: ppc %{power64} - libseccomp ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x - libservicelog ExclusiveArch: ppc %{power64} - libsmbios ExclusiveArch: x86_64 ia64 %{ix86} - libunwind ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64 - libva-intel-hybrid-driver ExclusiveArch: %{ix86} x86_64 ia64 - libvmi ExclusiveArch: x86_64 - libvpd ExclusiveArch: ppc %{power64} - libxsmm ExclusiveArch: x86_64 - libzfcphbaapi ExclusiveArch: s390 s390x - lldb ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - lodash ExclusiveArch: %{nodejs_arches} noarch - log4net ExclusiveArch: %mono_arches - lrmi ExclusiveArch: %{ix86} - lsvpd ExclusiveArch: ppc %{power64} - luajit ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mactel-boot ExclusiveArch: x86_64 - manifest-tool ExclusiveArch: x86_64 aarch64 ppc64le s390x - marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - matreshka ExclusiveArch: %GPRbuild_arches - maven-eclipse-plugin ExclusiveArch: %{ix86} x86_64 - maxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - mcelog ExclusiveArch: i686 x86_64 - mediaconch ExclusiveArch: %{qt5_qtwebengine_arches} - mellowplayer ExclusiveArch: %{qt5_qtwebengine_arches} - memkind ExclusiveArch: x86_64 - memtest86+ ExclusiveArch: %{ix86} x86_64 - mesos ExclusiveArch: x86_64 - micro ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - microcode_ctl ExclusiveArch: %{ix86} x86_64 - micropython ExclusiveArch: %{arm} %{ix86} x86_64 - mine_detector ExclusiveArch: %{GNAT_arches} - minetest ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mingw-wine-gecko ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - mkbootdisk ExclusiveArch: %{ix86} sparc sparc64 x86_64 - mnemosyne ExclusiveArch: noarch %{qt5_qtwebengine_arches} - mocha ExclusiveArch: %{nodejs_arches} noarch - mod_mono ExclusiveArch: %mono_arches - module-build-service ExclusiveArch: %{ix86} x86_64 noarch - mokutil ExclusiveArch: %{ix86} x86_64 aarch64 - mongo-tools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - mono ExclusiveArch: %mono_arches - mono-addins ExclusiveArch: %mono_arches - mono-basic ExclusiveArch: %{mono_arches} - mono-bouncycastle ExclusiveArch: %mono_arches - mono-cecil ExclusiveArch: %mono_arches - mono-cecil-flowanalysis ExclusiveArch: %mono_arches - mono-debugger ExclusiveArch: %ix86 x86_64 - mono-reflection ExclusiveArch: %mono_arches - mono-tools ExclusiveArch: %mono_arches - mono-zeroconf ExclusiveArch: %mono_arches - monobristol ExclusiveArch: %{mono_arches} - monodevelop ExclusiveArch: %mono_arches - monodevelop-debugger-gdb ExclusiveArch: %{mono_arches} - monosim ExclusiveArch: %mono_arches - mrrescue ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - msr-tools ExclusiveArch: %{ix86} x86_64 - mustache-d ExclusiveArch: %{ldc_arches} - mysql-connector-net ExclusiveArch: %{mono_arches} - nacl-arm-binutils ExclusiveArch: x86_64 - nacl-arm-gcc ExclusiveArch: x86_64 - nacl-arm-newlib ExclusiveArch: x86_64 - nacl-binutils ExclusiveArch: x86_64 - nacl-gcc ExclusiveArch: x86_64 - nacl-newlib ExclusiveArch: x86_64 - nant ExclusiveArch: %mono_arches - nbc ExclusiveArch: %{fpc_arches} - nbdkit ExclusiveArch: x86_64 - ndesk-dbus ExclusiveArch: %{mono_arches} - ndesk-dbus-glib ExclusiveArch: %{mono_arches} - newtonsoft-json ExclusiveArch: %{mono_arches} - nim ExclusiveArch: %{nim_arches} - nini ExclusiveArch: %{mono_arches} - node-gyp ExclusiveArch: %{nodejs_arches} noarch - nodejs ExclusiveArch: %{nodejs_arches} - nodejs-Base64 ExclusiveArch: %{nodejs_arches} noarch - nodejs-abbrev ExclusiveArch: %{nodejs_arches} noarch - nodejs-accepts ExclusiveArch: %{nodejs_arches} noarch - nodejs-acorn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-acorn-object-spread ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-after ExclusiveArch: %{nodejs_arches} noarch - nodejs-agent-base ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-agentkeepalive ExclusiveArch: %{nodejs_arches} noarch - nodejs-ain2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-align-text ExclusiveArch: %{nodejs_arches} noarch - nodejs-alter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblack ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgcyan ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bggreen ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgmagenta ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgred ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgwhite ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgyellow ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-black ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-blue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bold ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-cyan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-dim ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-font ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-gray ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-green ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-grey ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-hidden ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-inverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-italic ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-magenta ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-red ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-reset ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-strikethrough ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-styles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-underline ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-white ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-wrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-yellow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansicolors ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansidiff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansistyles ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-any-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ap ExclusiveArch: %{nodejs_arches} noarch - nodejs-append-field ExclusiveArch: %{nodejs_arches} noarch - nodejs-append-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-aproba ExclusiveArch: %{nodejs_arches} noarch - nodejs-archiver ExclusiveArch: %{nodejs_arches} noarch - nodejs-archiver-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-archy ExclusiveArch: %{nodejs_arches} noarch - nodejs-are-we-there-yet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-argparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-argsparser ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-exclude ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-union ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-buffer-from-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-differ ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-find ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-find-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-foreach ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-ify ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-union ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-uniq ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-unique ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arraybuffer-dot-slice ExclusiveArch: %{nodejs_arches} noarch - nodejs-arraybuffer-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-arrify ExclusiveArch: %{nodejs_arches} noarch - nodejs-as-number ExclusiveArch: %{nodejs_arches} noarch - nodejs-asap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ascii-tree ExclusiveArch: %{nodejs_arches} noarch - nodejs-ascli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-asn1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-assert-plus ExclusiveArch: %{nodejs_arches} noarch - nodejs-assertion-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-assume ExclusiveArch: %{nodejs_arches} noarch - nodejs-ast-traverse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ast-types ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-astral ExclusiveArch: %{nodejs_arches} noarch - nodejs-astral-angular-annotate ExclusiveArch: %{nodejs_arches} noarch - nodejs-astral-pass ExclusiveArch: %{nodejs_arches} noarch - nodejs-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-async-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-limiter ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-queue ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-some ExclusiveArch: %{nodejs_arches} noarch - nodejs-asynckit ExclusiveArch: %{nodejs_arches} noarch - nodejs-atob ExclusiveArch: %{nodejs_arches} noarch - nodejs-auto-bind ExclusiveArch: %{nodejs_arches} noarch - nodejs-autoresolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-ava-init ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-aws-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws-sign2 ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws4 ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-messages ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-runtime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-backbone ExclusiveArch: %{nodejs_arches} noarch - nodejs-backoff ExclusiveArch: %{nodejs_arches} noarch - nodejs-balanced-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-base ExclusiveArch: %{nodejs_arches} noarch - nodejs-base-option ExclusiveArch: %{nodejs_arches} noarch - nodejs-base-plugins ExclusiveArch: %{nodejs_arches} noarch - nodejs-base32-encode ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-arraybuffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-base64-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-base64id ExclusiveArch: %{nodejs_arches} noarch - nodejs-bash-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-basic-auth ExclusiveArch: %{nodejs_arches} noarch - nodejs-basic-auth-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-basic-auth-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-batch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bcrypt ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-bcryptjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-beeper ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-benchmark ExclusiveArch: %{nodejs_arches} noarch - nodejs-better-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-better-than-before ExclusiveArch: %{nodejs_arches} noarch - nodejs-bignumber-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-bind-obj-methods ExclusiveArch: %{nodejs_arches} noarch - nodejs-bindings ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bl ExclusiveArch: %{nodejs_arches} noarch - nodejs-blob ExclusiveArch: %{nodejs_arches} noarch - nodejs-block-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-bluebird ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-body-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-boolbase ExclusiveArch: %{nodejs_arches} noarch - nodejs-boom ExclusiveArch: %{nodejs_arches} noarch - nodejs-brace-expansion ExclusiveArch: %{nodejs_arches} noarch - nodejs-braces ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-breakable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-browser-request ExclusiveArch: %{nodejs_arches} noarch - nodejs-browser-stdout ExclusiveArch: %{nodejs_arches} noarch - nodejs-bson ExclusiveArch: %{nodejs_arches} noarch - nodejs-buble ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buf-compare ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-crc32 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-equal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-shims ExclusiveArch: %{nodejs_arches} noarch - nodejs-buffer-writer ExclusiveArch: %{nodejs_arches} noarch - nodejs-buffertools ExclusiveArch: %{nodejs_arches} - nodejs-bufferutil ExclusiveArch: %{nodejs_arches} - nodejs-builtin-modules ExclusiveArch: %{nodejs_arches} noarch - nodejs-builtins ExclusiveArch: %{nodejs_arches} noarch - nodejs-bundle-dependencies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bunker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bunyan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-burrito ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-busboy ExclusiveArch: %{nodejs_arches} noarch - nodejs-byline ExclusiveArch: %{nodejs_arches} noarch - nodejs-bytes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cache-base ExclusiveArch: %{nodejs_arches} noarch - nodejs-caching-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-call-delayed ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-matcher ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-signature ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-callback-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsites ExclusiveArch: %{nodejs_arches} noarch - nodejs-camel-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-caniuse-db ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-capture-stack-trace ExclusiveArch: %{nodejs_arches} noarch - nodejs-carrier ExclusiveArch: %{nodejs_arches} noarch - nodejs-caseless ExclusiveArch: %{nodejs_arches} noarch - nodejs-center-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-connect-middleware ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-oauth2orize-grant ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-passport-strategy ExclusiveArch: %{nodejs_arches} noarch - nodejs-chainer ExclusiveArch: %{nodejs_arches} noarch - nodejs-chainsaw ExclusiveArch: %{nodejs_arches} noarch - nodejs-chalk ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-change-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-char-spinner ExclusiveArch: %{nodejs_arches} noarch - nodejs-character-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-charm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cheerio ExclusiveArch: %{nodejs_arches} noarch - nodejs-child-process-close ExclusiveArch: %{nodejs_arches} noarch - nodejs-chmodr ExclusiveArch: %{nodejs_arches} noarch - nodejs-chownr ExclusiveArch: %{nodejs_arches} noarch - nodejs-chroma-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-chrono ExclusiveArch: %{nodejs_arches} noarch - nodejs-circular-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-cjson ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-class-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-clean-css ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clean-yaml-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-spinner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-table ExclusiveArch: %{nodejs_arches} noarch - nodejs-cliui ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-stats ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-closure-compiler ExclusiveArch: %{nodejs_arches} noarch - nodejs-cls ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cmd-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-co ExclusiveArch: %{nodejs_arches} noarch - nodejs-co-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-co-with-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-coa ExclusiveArch: %{nodejs_arches} noarch - nodejs-code-point-at ExclusiveArch: %{nodejs_arches} noarch - nodejs-codemirror ExclusiveArch: %{nodejs_arches} noarch - nodejs-coffee-coverage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-collection-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-collections ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-color-support ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-colors ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-colour ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-columnify ExclusiveArch: %{nodejs_arches} noarch - nodejs-combined-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-commander ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-common-path-prefix ExclusiveArch: %{nodejs_arches} noarch - nodejs-commondir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-commoner ExclusiveArch: %{nodejs_arches} noarch - nodejs-commonmark ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-compare-func ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-emitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-inherit ExclusiveArch: %{nodejs_arches} noarch - nodejs-compress-commons ExclusiveArch: %{nodejs_arches} noarch - nodejs-compressible ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-compression ExclusiveArch: %{nodejs_arches} noarch - nodejs-concat-map ExclusiveArch: %{nodejs_arches} noarch - nodejs-concat-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-config-chain ExclusiveArch: %{nodejs_arches} noarch - nodejs-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-connect-livereload ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-connect-timeout ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-console-browserify ExclusiveArch: %{nodejs_arches} noarch - nodejs-console-dot-log ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-consolemd ExclusiveArch: %{nodejs_arches} noarch - nodejs-constant-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-constantinople ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-content-disposition ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-content-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-angular ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-writer ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-commits-filter ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-commits-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-convert-hex ExclusiveArch: %{nodejs_arches} noarch - nodejs-convert-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie-jar ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookie-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookie-session ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie-signature ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookiejar ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-copy-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-core-assert ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-core-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-core-util-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cors ExclusiveArch: %{nodejs_arches} noarch - nodejs-couch-login ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-coveralls ExclusiveArch: %{nodejs_arches} noarch - nodejs-crc ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-crc32-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-create-error-class ExclusiveArch: %{nodejs_arches} noarch - nodejs-cross-spawn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cross-spawn-async ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cryptiles ExclusiveArch: %{nodejs_arches} noarch - nodejs-csrf ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-select ExclusiveArch: %{nodejs_arches} noarch - nodejs-css-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-tree ExclusiveArch: %{nodejs_arches} noarch - nodejs-css-what ExclusiveArch: %{nodejs_arches} noarch - nodejs-csscomb-core ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csslint ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csso ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cssom ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csurf ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-generate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-spectrum ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ctype ExclusiveArch: %{nodejs_arches} noarch - nodejs-currently-unhandled ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cycle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cyclist ExclusiveArch: %{nodejs_arches} noarch - nodejs-d ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dargs ExclusiveArch: %{nodejs_arches} noarch - nodejs-dashdash ExclusiveArch: %{nodejs_arches} noarch - nodejs-data-uri-to-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-date-now ExclusiveArch: %{nodejs_arches} noarch - nodejs-dateformat ExclusiveArch: %{nodejs_arches} noarch - nodejs-death ExclusiveArch: %{nodejs_arches} noarch - nodejs-debug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-debug-fabulous ExclusiveArch: %{nodejs_arches} noarch - nodejs-debuglog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-decamelize ExclusiveArch: %{nodejs_arches} noarch - nodejs-decompress-response ExclusiveArch: %{nodejs_arches} noarch - nodejs-dedent ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-eql ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-equal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deep-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-default-require-extensions ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-default-resolution ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-defaults ExclusiveArch: %{nodejs_arches} noarch - nodejs-defence ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-defence-cli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deferred ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-properties ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-defined ExclusiveArch: %{nodejs_arches} noarch - nodejs-defs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-degenerator ExclusiveArch: %{nodejs_arches} noarch - nodejs-del ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-delayed-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-delegates ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-delete ExclusiveArch: %{nodejs_arches} noarch - nodejs-dep-graph ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-depd ExclusiveArch: %{nodejs_arches} noarch - nodejs-dependency-lister ExclusiveArch: %{nodejs_arches} noarch - nodejs-deprecated ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-indent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-newline ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-detective ExclusiveArch: %{nodejs_arches} noarch - nodejs-dezalgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-dicer ExclusiveArch: %{nodejs_arches} noarch - nodejs-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-difflet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-difflib ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-docopt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-doctrine ExclusiveArch: %{nodejs_arches} noarch - nodejs-dom-serializer ExclusiveArch: %{nodejs_arches} noarch - nodejs-domelementtype ExclusiveArch: %{nodejs_arches} noarch - nodejs-domhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-domutils ExclusiveArch: %{nodejs_arches} noarch - nodejs-dot-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-dot-prop ExclusiveArch: %{nodejs_arches} noarch - nodejs-dotfile-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dreamopt ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-dryice ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dtree ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplex ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplexer ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplexer2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-duplexer3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplexify ExclusiveArch: %{nodejs_arches} noarch - nodejs-duration ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-each ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-each-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-ebnf-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-echomd ExclusiveArch: %{nodejs_arches} noarch - nodejs-ecstatic ExclusiveArch: %{nodejs_arches} noarch - nodejs-editor ExclusiveArch: %{nodejs_arches} noarch - nodejs-ee-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-ejs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-emojione ExclusiveArch: %{nodejs_arches} noarch - nodejs-empty-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-encodeurl ExclusiveArch: %{nodejs_arches} noarch - nodejs-encoding ExclusiveArch: %{nodejs_arches} noarch - nodejs-end-of-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io-client ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-entities ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-ex ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-errorhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-errs ExclusiveArch: %{nodejs_arches} noarch - nodejs-es-abstract ExclusiveArch: %{nodejs_arches} noarch - nodejs-es-to-primitive ExclusiveArch: %{nodejs_arches} noarch - nodejs-es5-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es5-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-iterator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-promisify ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-set ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-weak-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escallmatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-escape-html ExclusiveArch: %{nodejs_arches} noarch - nodejs-escape-regexp-component ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escape-string-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-escodegen ExclusiveArch: %{nodejs_arches} noarch - nodejs-escope ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espower ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espower-location-detector ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima-fb ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima-harmony-jscs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espurify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-esrecurse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estraverse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estraverse-fb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-esutils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-etag ExclusiveArch: %{nodejs_arches} noarch - nodejs-event-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-event-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-eventemitter2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-eventemitter3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-events ExclusiveArch: %{nodejs_arches} noarch - nodejs-events-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-everything-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-execa ExclusiveArch: %{nodejs_arches} noarch - nodejs-exit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-brackets ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-tilde ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expect-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-express ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-express-session ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extend ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extend-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extsprintf ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-eyes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fake ExclusiveArch: %{nodejs_arches} noarch - nodejs-fancy-log ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-far ExclusiveArch: %{nodejs_arches} noarch - nodejs-fast-levenshtein ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fastfall ExclusiveArch: %{nodejs_arches} noarch - nodejs-faucet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-faye-websocket ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fd ExclusiveArch: %{nodejs_arches} noarch - nodejs-fd-slicer ExclusiveArch: %{nodejs_arches} noarch - nodejs-fg-lodash ExclusiveArch: %{nodejs_arches} noarch - nodejs-figures ExclusiveArch: %{nodejs_arches} noarch - nodejs-file-entry-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-file-sync-cmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-file-uri-to-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-filed ExclusiveArch: %{nodejs_arches} noarch - nodejs-filelist ExclusiveArch: %{nodejs_arches} noarch - nodejs-filename-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fileset ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fill-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-fill-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-finalhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-find-cache-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-find-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-findup-sync ExclusiveArch: %{nodejs_arches} noarch - nodejs-first-chunk-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flagged-respawn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flat-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flot ExclusiveArch: %{nodejs_arches} noarch - nodejs-flush-write-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fmix ExclusiveArch: %{nodejs_arches} noarch - nodejs-fn-dot-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-fn-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-follow ExclusiveArch: %{nodejs_arches} noarch - nodejs-follow-redirects ExclusiveArch: %{nodejs_arches} noarch - nodejs-for-in ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-for-own ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-foreach ExclusiveArch: %{nodejs_arches} noarch - nodejs-foreground-child ExclusiveArch: %{nodejs_arches} noarch - nodejs-forever-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-form-data ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-formatio ExclusiveArch: %{nodejs_arches} noarch - nodejs-formidable ExclusiveArch: %{nodejs_arches} noarch - nodejs-forwarded ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fragment-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-freetree ExclusiveArch: %{nodejs_arches} noarch - nodejs-fresh ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-from ExclusiveArch: %{nodejs_arches} noarch - nodejs-from2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-dot-notify ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-cached ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fs-ext ExclusiveArch: %{nodejs_arches} - nodejs-fs-extra ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-temp ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-vacuum ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-write-stream-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs2 ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-ignore ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-npm ExclusiveArch: %{nodejs_arches} noarch - nodejs-ftp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-function-bind ExclusiveArch: %{nodejs_arches} noarch - nodejs-function-loop ExclusiveArch: %{nodejs_arches} noarch - nodejs-gauge ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gaze ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gdal ExclusiveArch: %{nodejs_arches} - nodejs-generate-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-generate-object-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-generic-pool ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-get-pkg-repo ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-port ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-stdin ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-uri ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-get-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-getobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gettext-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-dummy-commit ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-remote-origin-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-gitconfiglocal ExclusiveArch: %{nodejs_arches} noarch - nodejs-github-url-from-git ExclusiveArch: %{nodejs_arches} noarch - nodejs-github-url-from-username-repo ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob-base ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-expand ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-parent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-global-modules ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-global-prefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globby ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globule ExclusiveArch: %{nodejs_arches} noarch - nodejs-glogg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gnode ExclusiveArch: %{nodejs_arches} noarch - nodejs-gonzales-pe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-got ExclusiveArch: %{nodejs_arches} noarch - nodejs-graceful-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-graceful-readlink ExclusiveArch: %{nodejs_arches} noarch - nodejs-grip ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-growl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-angular-templates ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-banner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-cli ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-compare-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-clean ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-concat ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-copy ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-csslint ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-cssmin ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-htmlmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-internal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-less ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-nodeunit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-requirejs ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-uglify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-watch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-git-authors ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-html-validation ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-init ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-known-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-log-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-lib-contrib ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-saucelabs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-sed ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-simple-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-svgmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-args ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-process ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-wrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-gulp-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gulp-util ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gzip-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-handle-thing ExclusiveArch: %{nodejs_arches} noarch - nodejs-handlebars ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-har-validator ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-has ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-cors ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-flag ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-unicode ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-yarn ExclusiveArch: %{nodejs_arches} noarch - nodejs-hash_file ExclusiveArch: %{nodejs_arches} noarch - nodejs-hawk ExclusiveArch: %{nodejs_arches} noarch - nodejs-he ExclusiveArch: %{nodejs_arches} noarch - nodejs-heap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-hex-to-array-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-highlight-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-hock ExclusiveArch: %{nodejs_arches} noarch - nodejs-hoek ExclusiveArch: %{nodejs_arches} noarch - nodejs-homedir-polyfill ExclusiveArch: %{nodejs_arches} noarch - nodejs-hook-std ExclusiveArch: %{nodejs_arches} noarch - nodejs-hooker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-hosted-git-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-hsluv ExclusiveArch: %{nodejs_arches} noarch - nodejs-html-minifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-htmlparser2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-deceiver ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-errors ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-http-proxy ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-http-server ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-signature ExclusiveArch: %{nodejs_arches} noarch - nodejs-http2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-https-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-humanize-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-i ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-i18n-transform ExclusiveArch: %{nodejs_arches} noarch - nodejs-i2c ExclusiveArch: %{nodejs_arches} - nodejs-iconv ExclusiveArch: %{nodejs_arches} - nodejs-iconv-lite ExclusiveArch: %{nodejs_arches} noarch - nodejs-iferr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ignore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-imul ExclusiveArch: %{nodejs_arches} noarch - nodejs-imurmurhash ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-indent-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-infinity-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-inflight ExclusiveArch: %{nodejs_arches} noarch - nodejs-info-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-inherit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-inherits ExclusiveArch: %{nodejs_arches} noarch - nodejs-inherits1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-ini ExclusiveArch: %{nodejs_arches} noarch - nodejs-init-package-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-inline-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-install ExclusiveArch: %{nodejs_arches} noarch - nodejs-int64-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-interpret ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-into-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-invert-kv ExclusiveArch: %{nodejs_arches} noarch - nodejs-ip ExclusiveArch: %{nodejs_arches} noarch - nodejs-ipaddr-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-irc-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-irregular-plurals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-absolute ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-accessor-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-arrayish ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-arrow-function ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-boolean-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-builtin-module ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-callable ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-data-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-date-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-dotfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-equal-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-extendable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-finite ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-fullwidth-code-point ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-generator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-function ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-lower-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-my-json-valid ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-negated-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-number ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-number-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-in-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-inside ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-plain-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-plain-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-primitive ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-redirect ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-registered ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-relative ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-retry-allowed ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-subset ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-text-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-typedarray ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-unc-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-upper-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-valid-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-valid-instance ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-windows ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isarray ExclusiveArch: %{nodejs_arches} noarch - nodejs-isexe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-iso8601 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isodate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jade ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jasmine-growl-reporter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jasmine-reporters ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jison ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jison-lex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jju ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joose ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joosex-namespace-depended ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joosex-simplerequest ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-base64 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-yaml ExclusiveArch: %{nodejs_arches} noarch - nodejs-jschardet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jscoverage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jshint ExclusiveArch: %{nodejs_arches} noarch - nodejs-json-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-localizer ExclusiveArch: %{nodejs_arches} noarch - nodejs-json-parse-helpfulerror ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stable-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stringify-safe ExclusiveArch: %{nodejs_arches} noarch - nodejs-json3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonm ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonpointer ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonselect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jwt-simple ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-keep-alive-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-keygrip ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-keypress ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-kind-of ExclusiveArch: %{nodejs_arches} noarch - nodejs-klaw ExclusiveArch: %{nodejs_arches} noarch - nodejs-kuler2gpl ExclusiveArch: %{nodejs_arches} noarch - nodejs-langdetect ExclusiveArch: %{nodejs_arches} noarch - nodejs-latest-version ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lazy-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lazystream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lcid ExclusiveArch: %{nodejs_arches} noarch - nodejs-lcov-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-leaflet ExclusiveArch: %{nodejs_arches} noarch - nodejs-leaflet-formbuilder ExclusiveArch: %{nodejs_arches} noarch - nodejs-leaflet-hash ExclusiveArch: %{nodejs_arches} noarch - nodejs-leche ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-left-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-less ExclusiveArch: %{nodejs_arches} noarch - nodejs-levn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lex-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-libxmljs ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-line-numbers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-line-reader ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linkify-it ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-load-grunt-tasks ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-load-json-file ExclusiveArch: %{nodejs_arches} noarch - nodejs-locate-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-lockfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-log-driver ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-ok ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-symbols ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-lolex ExclusiveArch: %{nodejs_arches} noarch - nodejs-longest ExclusiveArch: %{nodejs_arches} noarch - nodejs-loud-rejection ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lower-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-lower-case-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-lowercase-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-lru-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-lru-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ltx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-magic-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-make-arrow-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-generator-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-makedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-makeerror ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-mapnik ExclusiveArch: %{nodejs_arches} - nodejs-mapnik-pool ExclusiveArch: %{nodejs_arches} noarch - nodejs-mapnik-vector-tile ExclusiveArch: %{nodejs_arches} noarch - nodejs-markdown ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-markdown-it-testgen ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-matched ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-max-timeout ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-maxmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-mbtiles ExclusiveArch: %{nodejs_arches} noarch - nodejs-md5-hex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-md5-o-matic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mdn-data ExclusiveArch: %{nodejs_arches} noarch - nodejs-mdurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-media-typer ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoizee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-memwatch-next ExclusiveArch: %{nodejs_arches} - nodejs-meow ExclusiveArch: %{nodejs_arches} noarch - nodejs-merge-descriptors ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-merge-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-metascript ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-method-override ExclusiveArch: %{nodejs_arches} noarch - nodejs-methods ExclusiveArch: %{nodejs_arches} noarch - nodejs-millstone ExclusiveArch: %{nodejs_arches} noarch - nodejs-mime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mime-db ExclusiveArch: %{nodejs_arches} noarch - nodejs-mime-types ExclusiveArch: %{nodejs_arches} noarch - nodejs-mimeparse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-minimalistic-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-minstache ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-mkdirp ExclusiveArch: %{nodejs_arches} noarch - nodejs-mkfiletree ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-bin ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-git ExclusiveArch: %{nodejs_arches} noarch - nodejs-modify-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-module-not-found-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-moment ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-moment-timezone ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb-core ExclusiveArch: %{nodejs_arches} noarch - nodejs-monocle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-morgan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-muffin ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multiline ExclusiveArch: %{nodejs_arches} noarch - nodejs-multimatch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multiparty ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multipipe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-murmur-32 ExclusiveArch: %{nodejs_arches} noarch - nodejs-mustache ExclusiveArch: %{nodejs_arches} noarch - nodejs-mute-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-mv ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mysql ExclusiveArch: %{nodejs_arches} noarch - nodejs-mz ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nan ExclusiveArch: %{nodejs_arches} noarch - nodejs-nan0 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nan1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-nano ExclusiveArch: %{nodejs_arches} noarch - nodejs-nanoseconds ExclusiveArch: %{nodejs_arches} noarch - nodejs-native-or-bluebird ExclusiveArch: %{nodejs_arches} noarch - nodejs-ncp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-needle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-negotiator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nested-error-stacks ExclusiveArch: %{nodejs_arches} noarch - nodejs-net-browserify-alt ExclusiveArch: %{nodejs_arches} noarch - nodejs-netmask ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-next ExclusiveArch: %{nodejs_arches} noarch - nodejs-next-tick ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-node-expat ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-node-int64 ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-markdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-print ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-static ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-status-codes ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-stringprep ExclusiveArch: %{nodejs_arches} - nodejs-node-uuid ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nomnom ExclusiveArch: %{nodejs_arches} noarch - nodejs-noncharacters ExclusiveArch: %{nodejs_arches} noarch - nodejs-nopt ExclusiveArch: %{nodejs_arches} noarch - nodejs-nopt-usage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-noptify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-normalize-git-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-normalize-package-data ExclusiveArch: %{nodejs_arches} noarch - nodejs-normalize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-cache-filename ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-install-checks ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-license ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-npm-package-arg ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-registry-client ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-npm-run-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-stats ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-user-validate ExclusiveArch: %{nodejs_arches} noarch - nodejs-npmlog ExclusiveArch: %{nodejs_arches} noarch - nodejs-nsp-api ExclusiveArch: %{nodejs_arches} noarch - nodejs-nsp-audit-shrinkwrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-nth-check ExclusiveArch: %{nodejs_arches} noarch - nodejs-number-is-nan ExclusiveArch: %{nodejs_arches} noarch - nodejs-numeral ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth2orize ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-assign ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-copy ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-dot-entries ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-dot-omit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-dot-pick ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-inspect ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-observable-to-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-obuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-finished ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-headers ExclusiveArch: %{nodejs_arches} noarch - nodejs-once ExclusiveArch: %{nodejs_arches} noarch - nodejs-onetime ExclusiveArch: %{nodejs_arches} noarch - nodejs-only-shallow ExclusiveArch: %{nodejs_arches} noarch - nodejs-oop ExclusiveArch: %{nodejs_arches} noarch - nodejs-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-opener ExclusiveArch: %{nodejs_arches} noarch - nodejs-opn ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-option-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-option-chain ExclusiveArch: %{nodejs_arches} noarch - nodejs-optionator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-optjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-opts ExclusiveArch: %{nodejs_arches} noarch - nodejs-orchestrator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ordered-read-streams ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-os-homedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-locale ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-tmpdir ExclusiveArch: %{nodejs_arches} noarch - nodejs-osenv ExclusiveArch: %{nodejs_arches} noarch - nodejs-output-file-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-own-or ExclusiveArch: %{nodejs_arches} noarch - nodejs-own-or-env ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-finally ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-is-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-limit ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-locate ExclusiveArch: %{nodejs_arches} noarch - nodejs-pac-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pac-resolver ExclusiveArch: %{nodejs_arches} noarch - nodejs-package ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-package-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-package-json ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-package-license ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-packaging ExclusiveArch: %{nodejs_arches} noarch - nodejs-packet-reader ExclusiveArch: %{nodejs_arches} noarch - nodejs-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pad-left ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-paperboy ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-param-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-github-repo-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parse-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-passwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-parsejson ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseqs ExclusiveArch: %{nodejs_arches} noarch - nodejs-parserlib ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parseuri ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pascal-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-pascalcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-http-bearer ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth2-client-password ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-strategy ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-array ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-dirname ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-exists ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-extra ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-absolute ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-inside ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-key ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-to-regexp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-path2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pathval ExclusiveArch: %{nodejs_arches} noarch - nodejs-pause ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pause-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-pbkdf2-password ExclusiveArch: %{nodejs_arches} noarch - nodejs-pedding ExclusiveArch: %{nodejs_arches} noarch - nodejs-pegjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-pem ExclusiveArch: %{nodejs_arches} noarch - nodejs-pend ExclusiveArch: %{nodejs_arches} noarch - nodejs-pff ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pg-connection-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-escape ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-int8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-types ExclusiveArch: %{nodejs_arches} noarch - nodejs-pgpass ExclusiveArch: %{nodejs_arches} noarch - nodejs-pify ExclusiveArch: %{nodejs_arches} noarch - nodejs-pinkie ExclusiveArch: %{nodejs_arches} noarch - nodejs-pinkie-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-pkg-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pkg-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-pkginfo ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-platform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-plur ExclusiveArch: %{nodejs_arches} noarch - nodejs-portfinder ExclusiveArch: %{nodejs_arches} noarch - nodejs-portscanner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-posix-character-classes ExclusiveArch: %{nodejs_arches} noarch - nodejs-posix-getopt ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-bytea ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-date ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-interval ExclusiveArch: %{nodejs_arches} noarch - nodejs-precond ExclusiveArch: %{nodejs_arches} noarch - nodejs-prelude-ls ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-prepend-http ExclusiveArch: %{nodejs_arches} noarch - nodejs-preserve ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-bytes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-hrtime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-pretty-time ExclusiveArch: %{nodejs_arches} noarch - nodejs-private ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-process-nextick-args ExclusiveArch: %{nodejs_arches} noarch - nodejs-progress ExclusiveArch: %{nodejs_arches} noarch - nodejs-progress-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-promises-aplus-tests ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-prompt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-promzard ExclusiveArch: %{nodejs_arches} noarch - nodejs-propagate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-proto-list ExclusiveArch: %{nodejs_arches} noarch - nodejs-proxy ExclusiveArch: %{nodejs_arches} noarch - nodejs-proxy-addr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-proxyquire ExclusiveArch: %{nodejs_arches} noarch - nodejs-pruddy-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-pseudomap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pubcontrol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pump ExclusiveArch: %{nodejs_arches} noarch - nodejs-pumpify ExclusiveArch: %{nodejs_arches} noarch - nodejs-q ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-q-io ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-qs ExclusiveArch: %{nodejs_arches} noarch - nodejs-qtdatastream ExclusiveArch: %{nodejs_arches} noarch - nodejs-queue-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-quick-lru ExclusiveArch: %{nodejs_arches} noarch - nodejs-qunit-extras ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-qunitjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-rainbowsocks ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-random-bytes ExclusiveArch: %{nodejs_arches} noarch - nodejs-random-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-randomatic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-range-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-raw-body ExclusiveArch: %{nodejs_arches} noarch - nodejs-rc ExclusiveArch: %{nodejs_arches} noarch - nodejs-re-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-all-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-cmd-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-dir-files ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-installed ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-json-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-package-json ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-package-tree ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-pkg ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-pkg-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-readable-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-readdir-scoped-modules ExclusiveArch: %{nodejs_arches} noarch - nodejs-readdirp ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-realize-package-specifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-recast ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rechoir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-redent ExclusiveArch: %{nodejs_arches} noarch - nodejs-reduce-component ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regenerator ExclusiveArch: %{nodejs_arches} noarch - nodejs-regex-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regex-not ExclusiveArch: %{nodejs_arches} noarch - nodejs-registry-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-relateurl ExclusiveArch: %{nodejs_arches} noarch - nodejs-remove-trailing-separator ExclusiveArch: %{nodejs_arches} noarch - nodejs-repeat-element ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeat-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeating ExclusiveArch: %{nodejs_arches} noarch - nodejs-repl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-replace ExclusiveArch: %{nodejs_arches} noarch - nodejs-replace-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-replace-require-self ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-request ExclusiveArch: %{nodejs_arches} noarch - nodejs-requestretry ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-cs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-require-directory ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-inject ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-uncached ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-yaml ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-requirejs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-requires-port ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-cwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-from ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-pkg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-response-time ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resumer ExclusiveArch: %{nodejs_arches} noarch - nodejs-retry ExclusiveArch: %{nodejs_arches} noarch - nodejs-reusify ExclusiveArch: %{nodejs_arches} noarch - nodejs-revalidator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rewire ExclusiveArch: %{nodejs_arches} noarch - nodejs-rfile ExclusiveArch: %{nodejs_arches} noarch - nodejs-rhea ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-right-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-rimraf ExclusiveArch: %{nodejs_arches} noarch - nodejs-rndm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rollup ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ronn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-run-parallel-limit ExclusiveArch: %{nodejs_arches} noarch - nodejs-runforcover ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safe-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-safe-json-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safecb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-samsam ExclusiveArch: %{nodejs_arches} noarch - nodejs-sauce-tunnel ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-saucelabs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sax ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-scmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-secure-random ExclusiveArch: %{nodejs_arches} noarch - nodejs-seedrandom ExclusiveArch: %{nodejs_arches} noarch - nodejs-select-hose ExclusiveArch: %{nodejs_arches} noarch - nodejs-semver ExclusiveArch: %{nodejs_arches} noarch - nodejs-send ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sentence-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-sentiment ExclusiveArch: %{nodejs_arches} noarch - nodejs-seq ExclusiveArch: %{nodejs_arches} noarch - nodejs-sequencify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serialize-error ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serve-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serve-static ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-server-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-blocking ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-getter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-set-immediate ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-immediate-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-setimmediate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-setprototypeof ExclusiveArch: %{nodejs_arches} noarch - nodejs-sha ExclusiveArch: %{nodejs_arches} noarch - nodejs-shallow-clone ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-command ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-shelljs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-shelljs-nodecli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-should ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-should-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-format ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-http ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-showdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-sigmund ExclusiveArch: %{nodejs_arches} noarch - nodejs-signal-exit ExclusiveArch: %{nodejs_arches} noarch - nodejs-silent-npm-registry-client ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-asyncify ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-fmt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-markdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-single-line-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-sinon ExclusiveArch: %{nodejs_arches} noarch - nodejs-sinon-restore ExclusiveArch: %{nodejs_arches} noarch - nodejs-slide ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-smart-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-snake-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-capture ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-capture-set ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-snockets ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sntp ExclusiveArch: %{nodejs_arches} noarch - nodejs-socks-client ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-socks-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sort-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-sorted-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-fixtures ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map-support ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-sparkles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-spawn-sync ExclusiveArch: %{nodejs_arches} noarch - nodejs-spawn-wrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-correct ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-exceptions ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-expression-parse ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-license-ids ExclusiveArch: %{nodejs_arches} noarch - nodejs-spec ExclusiveArch: %{nodejs_arches} noarch - nodejs-speedometer ExclusiveArch: %{nodejs_arches} noarch - nodejs-split ExclusiveArch: %{nodejs_arches} noarch - nodejs-split-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-split2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-sqlite3 ExclusiveArch: %{nodejs_arches} - nodejs-srs ExclusiveArch: %{nodejs_arches} noarch - nodejs-ssri ExclusiveArch: %{nodejs_arches} noarch - nodejs-st ExclusiveArch: %{nodejs_arches} noarch - nodejs-stable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-trace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-utils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-static-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-static-favicon ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-statuses ExclusiveArch: %{nodejs_arches} noarch - nodejs-std-mocks ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-combiner ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-consume ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-counter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-pair ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-reduce ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-replace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-shift ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-spigot ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-streamsearch ExclusiveArch: %{nodejs_arches} noarch - nodejs-streamsink ExclusiveArch: %{nodejs_arches} noarch - nodejs-streamtest ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-dot-prototype-dot-repeat ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-dot-prototype-dot-trim ExclusiveArch: %{nodejs_arches} noarch - nodejs-string-width ExclusiveArch: %{nodejs_arches} noarch - nodejs-string_decoder ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringmap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringscanner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringset ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-ansi ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-bom-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-color ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-eof ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-indent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-json-comments ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strong-log-transformer ExclusiveArch: %{nodejs_arches} noarch - nodejs-strscanner ExclusiveArch: %{nodejs_arches} noarch - nodejs-stylus ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-success-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-superagent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-superagent-proxy ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-supertest ExclusiveArch: %{nodejs_arches} noarch - nodejs-supervisor ExclusiveArch: %{nodejs_arches} noarch - nodejs-supports-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-suspend ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-swap-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-symbol-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tap ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-mocha-reporter ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-out ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tap-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-spec ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tape ExclusiveArch: %{nodejs_arches} noarch - nodejs-tapes ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar-pack ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-temp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-temp-write ExclusiveArch: %{nodejs_arches} noarch - nodejs-temporary ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern-cordovajs ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern-liferay ExclusiveArch: %{nodejs_arches} noarch - nodejs-terst ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-test ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-testdata-w3c-json-form ExclusiveArch: %{nodejs_arches} noarch - nodejs-testjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-testswarm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-testutil ExclusiveArch: %{nodejs_arches} noarch - nodejs-text-extensions ExclusiveArch: %{nodejs_arches} noarch - nodejs-text-table ExclusiveArch: %{nodejs_arches} noarch - nodejs-thenify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thenify-all ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-through ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-through2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-through2-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thunkify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tildify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tilejson ExclusiveArch: %{nodejs_arches} noarch - nodejs-tilelive ExclusiveArch: %{nodejs_arches} noarch - nodejs-tilelive-mapnik ExclusiveArch: %{nodejs_arches} noarch - nodejs-tiletype ExclusiveArch: %{nodejs_arches} noarch - nodejs-time-diff ExclusiveArch: %{nodejs_arches} noarch - nodejs-time-stamp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-timed-out ExclusiveArch: %{nodejs_arches} noarch - nodejs-timekeeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-timers-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tiny-lr-fork ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-title-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-tlds ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tmatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-tmp ExclusiveArch: %{nodejs_arches} noarch - nodejs-tmpl ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-absolute-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-to-object-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-to-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-regex-range ExclusiveArch: %{nodejs_arches} noarch - nodejs-tough-cookie ExclusiveArch: %{nodejs_arches} noarch - nodejs-tracejs ExclusiveArch: %{nodejs_arches} noarch - nodejs-transformers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-traverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-treeify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tressa ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-trim-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim-off-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trivial-deferred ExclusiveArch: %{nodejs_arches} noarch - nodejs-try-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-try-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-tryor ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tsame ExclusiveArch: %{nodejs_arches} noarch - nodejs-tsscmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ttembed-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-tunnel-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-check ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-type-detect ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-name ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-typeahead.js ExclusiveArch: %{nodejs_arches} noarch - nodejs-typedarray ExclusiveArch: %{nodejs_arches} noarch - nodejs-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-uc-dot-micro ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uglify-to-browserify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uid-number ExclusiveArch: %{nodejs_arches} noarch - nodejs-uid-safe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uid2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ultron ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-umask ExclusiveArch: %{nodejs_arches} noarch - nodejs-unc-path-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-underscore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-underscore-dot-logger ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unicode-7.0.0 ExclusiveArch: %{nodejs_arches} noarch - nodejs-unicode-length ExclusiveArch: %{nodejs_arches} noarch - nodejs-union ExclusiveArch: %{nodejs_arches} noarch - nodejs-union-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-unique-filename ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-slug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-unpipe ExclusiveArch: %{nodejs_arches} noarch - nodejs-unset-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-unzip-response ExclusiveArch: %{nodejs_arches} noarch - nodejs-upper-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-upper-case-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-uri-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-urix ExclusiveArch: %{nodejs_arches} noarch - nodejs-url-join ExclusiveArch: %{nodejs_arches} noarch - nodejs-url-parse-lax ExclusiveArch: %{nodejs_arches} noarch - nodejs-url2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-use ExclusiveArch: %{nodejs_arches} noarch - nodejs-user-home ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-utfx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-deprecate ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-utile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-utilities ExclusiveArch: %{nodejs_arches} noarch - nodejs-utils-merge ExclusiveArch: %{nodejs_arches} noarch - nodejs-uuid ExclusiveArch: %{nodejs_arches} noarch - nodejs-vali-date ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-validate-npm-package-license ExclusiveArch: %{nodejs_arches} noarch - nodejs-validate-npm-package-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-vary ExclusiveArch: %{nodejs_arches} noarch - nodejs-vasync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-verror ExclusiveArch: %{nodejs_arches} noarch - nodejs-vhost ExclusiveArch: %{nodejs_arches} noarch - nodejs-vinyl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vlq ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-vow-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vows ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-w3cjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-walkdir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-walker ExclusiveArch: %{nodejs_arches} noarch - nodejs-ware ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-warning-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-watchit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-watershed ExclusiveArch: %{nodejs_arches} noarch - nodejs-wbuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-wcwidth ExclusiveArch: %{nodejs_arches} noarch - nodejs-weak-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-websocket-driver ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-when ExclusiveArch: %{nodejs_arches} noarch - nodejs-whet-dot-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-which ExclusiveArch: %{nodejs_arches} noarch - nodejs-win-spawn ExclusiveArch: %{nodejs_arches} noarch - nodejs-window-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-winston ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-with ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-woothee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wordwrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrap-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-wrap-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrappy ExclusiveArch: %{nodejs_arches} noarch - nodejs-write ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-write-file-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-write-json-file ExclusiveArch: %{nodejs_arches} noarch - nodejs-write-pkg ExclusiveArch: %{nodejs_arches} noarch - nodejs-ws ExclusiveArch: %{nodejs_arches} noarch - nodejs-xml2js ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlbuilder ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmldom ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlhttprequest-ssl ExclusiveArch: %{nodejs_arches} noarch - nodejs-xregexp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-xtend ExclusiveArch: %{nodejs_arches} noarch - nodejs-y18n ExclusiveArch: %{nodejs_arches} noarch - nodejs-yallist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yapool ExclusiveArch: %{nodejs_arches} noarch - nodejs-yargs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yargs-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-yauzl ExclusiveArch: %{nodejs_arches} noarch - nodejs-yeast ExclusiveArch: %{nodejs_arches} noarch - nodejs-zap ExclusiveArch: %{nodejs_arches} noarch - nodejs-zip-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-zipfile ExclusiveArch: %{nodejs_arches} - nodejs-zlib-browserify ExclusiveArch: %{nodejs_arches} noarch - nodejs-zlibjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodeunit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - notify-sharp ExclusiveArch: %{mono_arches} - notify-sharp3 ExclusiveArch: %{mono_arches} - nuget ExclusiveArch: %{mono_arches} - numatop ExclusiveArch: %{ix86} x86_64 - nunit ExclusiveArch: %{mono_arches} - nunit2 ExclusiveArch: %{mono_arches} - nvml ExclusiveArch: x86_64 - nwchem ExclusiveArch: x86_64 %{ix86} - obfs4 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-kvm-hook ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-register-machine ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - oci-umount ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - ocitools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - odcs ExclusiveArch: %{ix86} x86_64 - olpc-kbdshim ExclusiveArch: %{ix86} %{arm} - olpc-netutils ExclusiveArch: %{ix86} %{arm} - olpc-powerd ExclusiveArch: %{ix86} %{arm} - olpc-utils ExclusiveArch: %{ix86} %{arm} - onedrive ExclusiveArch: %{ldc_arches} - opal-prd ExclusiveArch: ppc64le - open-vm-tools ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 - openblas ExclusiveArch: %{openblas_arches} - openjfx ExclusiveArch: %{ix86} x86_64 - openlibm ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64} - openmx ExclusiveArch: x86_64 %{ix86} - openni ExclusiveArch: %{ix86} x86_64 %{arm} - openni-primesense ExclusiveArch: %{ix86} x86_64 %{arm} - openssl-ibmca ExclusiveArch: s390 s390x - origin ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 aarch64 ppc64le s390x - orion ExclusiveArch: %{qt5_qtwebengine_arches} - orocos-bfl ExclusiveArch: %{ix86} x86_64 - orthorobot ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - paflib ExclusiveArch: ppc %{power64} - pcc ExclusiveArch: %{ix86} x86_64 - pcmciautils ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm} - pdfmod ExclusiveArch: %mono_arches - perl-Dumbbench ExclusiveArch: %{ix86} x86_64 noarch - perl-Parse-DMIDecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - pesign ExclusiveArch: %{ix86} x86_64 ia64 aarch64 arm - pesign-test-app ExclusiveArch: i686 x86_64 ia64 aarch64 - pinta ExclusiveArch: %mono_arches - pioneer ExclusiveArch: %{ix86} x86_64 - playonlinux ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - plv8 ExclusiveArch: %v8_arches - poppler-sharp ExclusiveArch: %mono_arches - popub ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - powerline-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - powerpc-utils ExclusiveArch: ppc %{power64} - ppc64-diag ExclusiveArch: ppc %{power64} - ppc64-utils ExclusiveArch: ppc %{power64} - publican-jboss ExclusiveArch: i686 x86_64 - pvs-sbcl ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - python-afl ExclusiveArch: %{ix86} x86_64 - python-etcd ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - python-healpy ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-openoffice ExclusiveArch: noarch x86_64 - python-ovirt-register ExclusiveArch: %{ix86} x86_64 - python-pymoc ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-rpi-gpio ExclusiveArch: %{arm} aarch64 - q4wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - qcint ExclusiveArch: x86_64 - qclib ExclusiveArch: s390 s390x - qt4pas ExclusiveArch: %{fpc_arches} - qt5-qtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - quantum-espresso ExclusiveArch: x86_64 %{ix86} ExclusiveArch: %{openblas_arches} - rclone ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - rear ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 - redhat-lsb ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - reg ExclusiveArch: x86_64 - renderdoc ExclusiveArch: %{ix86} x86_64 - reptyr ExclusiveArch: %{ix86} x86_64 %{arm} - rescene ExclusiveArch: %{mono_arches} - restsharp ExclusiveArch: %{mono_arches} - rhythmbox-alternative-toolbar ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le - rkt ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - rssguard ExclusiveArch: %{qt5_qtwebengine_arches} - runc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x - rust ExclusiveArch: %{rust_arches} - rust-addr2line ExclusiveArch: %{rust_arches} - rust-adler32 ExclusiveArch: %{rust_arches} - rust-aho-corasick ExclusiveArch: %{rust_arches} - rust-ansi_term ExclusiveArch: %{rust_arches} - rust-arrayref ExclusiveArch: %{rust_arches} - rust-arrayvec ExclusiveArch: %{rust_arches} - rust-atk-sys ExclusiveArch: %{rust_arches} - rust-atty ExclusiveArch: %{rust_arches} - rust-backtrace ExclusiveArch: %{rust_arches} - rust-backtrace-sys ExclusiveArch: %{rust_arches} - rust-base100 ExclusiveArch: %{rust_arches} - rust-base64 ExclusiveArch: %{rust_arches} - rust-bencher ExclusiveArch: %{rust_arches} - rust-bincode ExclusiveArch: %{rust_arches} - rust-bincode0.8 ExclusiveArch: %{rust_arches} - rust-bitflags ExclusiveArch: %{rust_arches} - rust-bitflags0.9 ExclusiveArch: %{rust_arches} - rust-brev ExclusiveArch: %{rust_arches} - rust-build_const ExclusiveArch: %{rust_arches} - rust-bytecount ExclusiveArch: %{rust_arches} - rust-byteorder ExclusiveArch: %{rust_arches} - rust-bytes ExclusiveArch: %{rust_arches} - rust-bytes0.3 ExclusiveArch: %{rust_arches} - rust-c_vec ExclusiveArch: %{rust_arches} - rust-cairo-rs ExclusiveArch: %{rust_arches} - rust-cairo-sys-rs ExclusiveArch: %{rust_arches} - rust-cbindgen ExclusiveArch: %{rust_arches} - rust-cc ExclusiveArch: %{rust_arches} - rust-cfg-if ExclusiveArch: %{rust_arches} - rust-chrono ExclusiveArch: %{rust_arches} - rust-clap ExclusiveArch: %{rust_arches} - rust-cmake ExclusiveArch: %{rust_arches} - rust-coco ExclusiveArch: %{rust_arches} - rust-cpp_demangle ExclusiveArch: %{rust_arches} - rust-crc ExclusiveArch: %{rust_arches} - rust-crc-core ExclusiveArch: %{rust_arches} - rust-crossbeam ExclusiveArch: %{rust_arches} - rust-crypto-hash ExclusiveArch: %{rust_arches} - rust-cryptovec ExclusiveArch: %{rust_arches} - rust-cssparser-macros ExclusiveArch: %{rust_arches} - rust-ctrlc ExclusiveArch: %{rust_arches} - rust-curl ExclusiveArch: %{rust_arches} - rust-curl-sys ExclusiveArch: %{rust_arches} - rust-custom_derive ExclusiveArch: %{rust_arches} - rust-data-encoding ExclusiveArch: %{rust_arches} - rust-datetime ExclusiveArch: %{rust_arches} - rust-dbus ExclusiveArch: %{rust_arches} - rust-deque ExclusiveArch: %{rust_arches} - rust-devicemapper ExclusiveArch: %{rust_arches} - rust-diff ExclusiveArch: %{rust_arches} - rust-difference ExclusiveArch: %{rust_arches} - rust-docopt ExclusiveArch: %{rust_arches} - rust-downcast-rs ExclusiveArch: %{rust_arches} - rust-dtoa ExclusiveArch: %{rust_arches} - rust-dtoa-short ExclusiveArch: %{rust_arches} - rust-edit-distance ExclusiveArch: %{rust_arches} - rust-either ExclusiveArch: %{rust_arches} - rust-encoding ExclusiveArch: %{rust_arches} - rust-encoding-index-japanese ExclusiveArch: %{rust_arches} - rust-encoding-index-korean ExclusiveArch: %{rust_arches} - rust-encoding-index-simpchinese ExclusiveArch: %{rust_arches} - rust-encoding-index-singlebyte ExclusiveArch: %{rust_arches} - rust-encoding-index-tradchinese ExclusiveArch: %{rust_arches} - rust-encoding_index_tests ExclusiveArch: %{rust_arches} - rust-encoding_rs ExclusiveArch: %{rust_arches} - rust-enum_primitive ExclusiveArch: %{rust_arches} - rust-env_logger ExclusiveArch: %{rust_arches} - rust-env_logger0.4 ExclusiveArch: %{rust_arches} - rust-errln ExclusiveArch: %{rust_arches} - rust-errno ExclusiveArch: %{rust_arches} - rust-error-chain ExclusiveArch: %{rust_arches} - rust-exa ExclusiveArch: %{rust_arches} - rust-extprim ExclusiveArch: %{rust_arches} - rust-extprim_literals_macros ExclusiveArch: %{rust_arches} - rust-failure ExclusiveArch: %{rust_arches} - rust-failure_derive ExclusiveArch: %{rust_arches} - rust-fallible-iterator ExclusiveArch: %{rust_arches} - rust-fd-find ExclusiveArch: %{rust_arches} - rust-filetime ExclusiveArch: %{rust_arches} - rust-fixedbitset ExclusiveArch: %{rust_arches} - rust-flame ExclusiveArch: %{rust_arches} - rust-flate2 ExclusiveArch: %{rust_arches} - rust-float-cmp ExclusiveArch: %{rust_arches} - rust-fnv ExclusiveArch: %{rust_arches} - rust-foreign-types ExclusiveArch: %{rust_arches} - rust-foreign-types-shared ExclusiveArch: %{rust_arches} - rust-fs2 ExclusiveArch: %{rust_arches} - rust-futures ExclusiveArch: %{rust_arches} - rust-futures-cpupool ExclusiveArch: %{rust_arches} - rust-gdk ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf-sys ExclusiveArch: %{rust_arches} - rust-gdk-sys ExclusiveArch: %{rust_arches} - rust-getopts ExclusiveArch: %{rust_arches} - rust-gimli ExclusiveArch: %{rust_arches} - rust-gio ExclusiveArch: %{rust_arches} - rust-gio-sys ExclusiveArch: %{rust_arches} - rust-git2 ExclusiveArch: %{rust_arches} - rust-glib ExclusiveArch: %{rust_arches} - rust-glib-sys ExclusiveArch: %{rust_arches} - rust-glob ExclusiveArch: %{rust_arches} - rust-globset ExclusiveArch: %{rust_arches} - rust-gobject-sys ExclusiveArch: %{rust_arches} - rust-goblin ExclusiveArch: %{rust_arches} - rust-grep ExclusiveArch: %{rust_arches} - rust-gtk ExclusiveArch: %{rust_arches} - rust-gtk-rs-lgpl-docs ExclusiveArch: %{rust_arches} - rust-gtk-source-sys ExclusiveArch: %{rust_arches} - rust-gtk-sys ExclusiveArch: %{rust_arches} - rust-gzip-header ExclusiveArch: %{rust_arches} - rust-hamcrest ExclusiveArch: %{rust_arches} - rust-handlebars ExclusiveArch: %{rust_arches} - rust-heapsize ExclusiveArch: %{rust_arches} - rust-hex ExclusiveArch: %{rust_arches} - rust-home ExclusiveArch: %{rust_arches} - rust-horrorshow ExclusiveArch: %{rust_arches} - rust-httparse ExclusiveArch: %{rust_arches} - rust-idna ExclusiveArch: %{rust_arches} - rust-ignore ExclusiveArch: %{rust_arches} - rust-intervaltree ExclusiveArch: %{rust_arches} - rust-iovec ExclusiveArch: %{rust_arches} - rust-iso8601 ExclusiveArch: %{rust_arches} - rust-itertools ExclusiveArch: %{rust_arches} - rust-itoa ExclusiveArch: %{rust_arches} - rust-jobserver ExclusiveArch: %{rust_arches} - rust-lazy_static ExclusiveArch: %{rust_arches} - rust-lazycell ExclusiveArch: %{rust_arches} - rust-libc ExclusiveArch: %{rust_arches} - rust-libdbus-sys ExclusiveArch: %{rust_arches} - rust-libgit2-sys ExclusiveArch: %{rust_arches} - rust-libloading ExclusiveArch: %{rust_arches} - rust-libssh2-sys ExclusiveArch: %{rust_arches} - rust-libudev ExclusiveArch: %{rust_arches} - rust-libudev-sys ExclusiveArch: %{rust_arches} - rust-libz-sys ExclusiveArch: %{rust_arches} - rust-linked-hash-map ExclusiveArch: %{rust_arches} - rust-lipsum ExclusiveArch: %{rust_arches} - rust-locale ExclusiveArch: %{rust_arches} - rust-log ExclusiveArch: %{rust_arches} - rust-log0.3 ExclusiveArch: %{rust_arches} - rust-loopdev ExclusiveArch: %{rust_arches} - rust-lzma-sys ExclusiveArch: %{rust_arches} - rust-macro-attr ExclusiveArch: %{rust_arches} - rust-maplit ExclusiveArch: %{rust_arches} - rust-matches ExclusiveArch: %{rust_arches} - rust-md5 ExclusiveArch: %{rust_arches} - rust-memchr ExclusiveArch: %{rust_arches} - rust-memmap ExclusiveArch: %{rust_arches} - rust-metadeps ExclusiveArch: %{rust_arches} - rust-mime ExclusiveArch: %{rust_arches} - rust-miniz-sys ExclusiveArch: %{rust_arches} - rust-miniz_oxide ExclusiveArch: %{rust_arches} - rust-miniz_oxide_c_api ExclusiveArch: %{rust_arches} - rust-mio ExclusiveArch: %{rust_arches} - rust-mio-uds ExclusiveArch: %{rust_arches} - rust-mnt ExclusiveArch: %{rust_arches} - rust-modifier ExclusiveArch: %{rust_arches} - rust-multimap ExclusiveArch: %{rust_arches} - rust-natord ExclusiveArch: %{rust_arches} - rust-net2 ExclusiveArch: %{rust_arches} - rust-newtype_derive ExclusiveArch: %{rust_arches} - rust-nix ExclusiveArch: %{rust_arches} - rust-nodrop ExclusiveArch: %{rust_arches} - rust-nom ExclusiveArch: %{rust_arches} - rust-num ExclusiveArch: %{rust_arches} - rust-num-bigint ExclusiveArch: %{rust_arches} - rust-num-complex ExclusiveArch: %{rust_arches} - rust-num-integer ExclusiveArch: %{rust_arches} - rust-num-iter ExclusiveArch: %{rust_arches} - rust-num-rational ExclusiveArch: %{rust_arches} - rust-num-traits ExclusiveArch: %{rust_arches} - rust-num_cpus ExclusiveArch: %{rust_arches} - rust-number_prefix ExclusiveArch: %{rust_arches} - rust-object ExclusiveArch: %{rust_arches} - rust-openssl ExclusiveArch: %{rust_arches} - rust-openssl-probe ExclusiveArch: %{rust_arches} - rust-openssl-sys ExclusiveArch: %{rust_arches} - rust-ordermap ExclusiveArch: %{rust_arches} - rust-owning_ref ExclusiveArch: %{rust_arches} - rust-packaging ExclusiveArch: %{rust_arches} noarch - rust-pad ExclusiveArch: %{rust_arches} - rust-pager ExclusiveArch: %{rust_arches} - rust-pango ExclusiveArch: %{rust_arches} - rust-pango-sys ExclusiveArch: %{rust_arches} - rust-peeking_take_while ExclusiveArch: %{rust_arches} - rust-percent-encoding ExclusiveArch: %{rust_arches} - rust-permutate ExclusiveArch: %{rust_arches} - rust-permutohedron ExclusiveArch: %{rust_arches} - rust-pest ExclusiveArch: %{rust_arches} - rust-pest0.3 ExclusiveArch: %{rust_arches} - rust-pest_derive ExclusiveArch: %{rust_arches} - rust-phf ExclusiveArch: %{rust_arches} - rust-phf_codegen ExclusiveArch: %{rust_arches} - rust-phf_generator ExclusiveArch: %{rust_arches} - rust-phf_shared ExclusiveArch: %{rust_arches} - rust-pkg-config ExclusiveArch: %{rust_arches} - rust-plain ExclusiveArch: %{rust_arches} - rust-pretty_env_logger ExclusiveArch: %{rust_arches} - rust-proc-macro2 ExclusiveArch: %{rust_arches} - rust-procedural-masquerade ExclusiveArch: %{rust_arches} - rust-pulldown-cmark ExclusiveArch: %{rust_arches} - rust-quick-error ExclusiveArch: %{rust_arches} - rust-quickcheck ExclusiveArch: %{rust_arches} - rust-quickersort ExclusiveArch: %{rust_arches} - rust-quote ExclusiveArch: %{rust_arches} - rust-rand ExclusiveArch: %{rust_arches} - rust-rayon ExclusiveArch: %{rust_arches} - rust-rayon-core ExclusiveArch: %{rust_arches} - rust-regex ExclusiveArch: %{rust_arches} - rust-regex-syntax ExclusiveArch: %{rust_arches} - rust-relay ExclusiveArch: %{rust_arches} - rust-ripgrep ExclusiveArch: %{rust_arches} - rust-rustc-demangle ExclusiveArch: %{rust_arches} - rust-rustc-serialize ExclusiveArch: %{rust_arches} - rust-rustc-test ExclusiveArch: %{rust_arches} - rust-rustc_version ExclusiveArch: %{rust_arches} - rust-rustdoc-stripper ExclusiveArch: %{rust_arches} - rust-rustfilt ExclusiveArch: %{rust_arches} - rust-rustfmt ExclusiveArch: %{rust_arches} - rust-safemem ExclusiveArch: %{rust_arches} - rust-same-file ExclusiveArch: %{rust_arches} - rust-scoped-tls ExclusiveArch: %{rust_arches} - rust-scoped_threadpool ExclusiveArch: %{rust_arches} - rust-scopeguard ExclusiveArch: %{rust_arches} - rust-scroll ExclusiveArch: %{rust_arches} - rust-scroll_derive ExclusiveArch: %{rust_arches} - rust-seahash ExclusiveArch: %{rust_arches} - rust-semver ExclusiveArch: %{rust_arches} - rust-semver-parser ExclusiveArch: %{rust_arches} - rust-serde ExclusiveArch: %{rust_arches} - rust-serde0.8 ExclusiveArch: %{rust_arches} - rust-serde_bytes ExclusiveArch: %{rust_arches} - rust-serde_cbor ExclusiveArch: %{rust_arches} - rust-serde_derive ExclusiveArch: %{rust_arches} - rust-serde_derive_internals ExclusiveArch: %{rust_arches} - rust-serde_ignored ExclusiveArch: %{rust_arches} - rust-serde_json ExclusiveArch: %{rust_arches} - rust-serde_json0.8 ExclusiveArch: %{rust_arches} - rust-serde_test ExclusiveArch: %{rust_arches} - rust-serde_urlencoded ExclusiveArch: %{rust_arches} - rust-serde_yaml ExclusiveArch: %{rust_arches} - rust-sha1 ExclusiveArch: %{rust_arches} - rust-shell-escape ExclusiveArch: %{rust_arches} - rust-shlex ExclusiveArch: %{rust_arches} - rust-siphasher ExclusiveArch: %{rust_arches} - rust-slab ExclusiveArch: %{rust_arches} - rust-slab0.3 ExclusiveArch: %{rust_arches} - rust-smallvec ExclusiveArch: %{rust_arches} - rust-socket2 ExclusiveArch: %{rust_arches} - rust-sourceview ExclusiveArch: %{rust_arches} - rust-spin ExclusiveArch: %{rust_arches} - rust-spmc ExclusiveArch: %{rust_arches} - rust-stable_deref_trait ExclusiveArch: %{rust_arches} - rust-strings ExclusiveArch: %{rust_arches} - rust-strsim ExclusiveArch: %{rust_arches} - rust-syn ExclusiveArch: %{rust_arches} - rust-synom ExclusiveArch: %{rust_arches} - rust-synstructure ExclusiveArch: %{rust_arches} - rust-syntex_errors ExclusiveArch: %{rust_arches} - rust-syntex_pos ExclusiveArch: %{rust_arches} - rust-syntex_syntax ExclusiveArch: %{rust_arches} - rust-sys-info ExclusiveArch: %{rust_arches} - rust-tar ExclusiveArch: %{rust_arches} - rust-tempdir ExclusiveArch: %{rust_arches} - rust-tempfile ExclusiveArch: %{rust_arches} - rust-term ExclusiveArch: %{rust_arches} - rust-term_grid ExclusiveArch: %{rust_arches} - rust-term_size ExclusiveArch: %{rust_arches} - rust-termcolor ExclusiveArch: %{rust_arches} - rust-termion ExclusiveArch: %{rust_arches} - rust-test-assembler ExclusiveArch: %{rust_arches} - rust-textwrap ExclusiveArch: %{rust_arches} - rust-thread-id ExclusiveArch: %{rust_arches} - rust-thread_local ExclusiveArch: %{rust_arches} - rust-time ExclusiveArch: %{rust_arches} - rust-tokei ExclusiveArch: %{rust_arches} - rust-tokio-core ExclusiveArch: %{rust_arches} - rust-tokio-io ExclusiveArch: %{rust_arches} - rust-tokio-process ExclusiveArch: %{rust_arches} - rust-tokio-signal ExclusiveArch: %{rust_arches} - rust-toml ExclusiveArch: %{rust_arches} - rust-traitobject ExclusiveArch: %{rust_arches} - rust-typed-arena ExclusiveArch: %{rust_arches} - rust-unicase ExclusiveArch: %{rust_arches} - rust-unicode-bidi ExclusiveArch: %{rust_arches} - rust-unicode-normalization ExclusiveArch: %{rust_arches} - rust-unicode-segmentation ExclusiveArch: %{rust_arches} - rust-unicode-width ExclusiveArch: %{rust_arches} - rust-unicode-xid ExclusiveArch: %{rust_arches} - rust-unindent ExclusiveArch: %{rust_arches} - rust-unreachable ExclusiveArch: %{rust_arches} - rust-unsafe-any ExclusiveArch: %{rust_arches} - rust-untrusted ExclusiveArch: %{rust_arches} - rust-url ExclusiveArch: %{rust_arches} - rust-users ExclusiveArch: %{rust_arches} - rust-utf8-ranges ExclusiveArch: %{rust_arches} - rust-uuid ExclusiveArch: %{rust_arches} - rust-vec_map ExclusiveArch: %{rust_arches} - rust-version-sync ExclusiveArch: %{rust_arches} - rust-version_check ExclusiveArch: %{rust_arches} - rust-void ExclusiveArch: %{rust_arches} - rust-wait-timeout ExclusiveArch: %{rust_arches} - rust-walkdir ExclusiveArch: %{rust_arches} - rust-which ExclusiveArch: %{rust_arches} - rust-xattr ExclusiveArch: %{rust_arches} - rust-xz2 ExclusiveArch: %{rust_arches} - rust-yaml-rust ExclusiveArch: %{rust_arches} - rust-yaml-rust0.3 ExclusiveArch: %{rust_arches} - rust-yes ExclusiveArch: %{rust_arches} - rust-yubibomb ExclusiveArch: %{rust_arches} - rust-zoneinfo_compiled ExclusiveArch: %{rust_arches} - s390utils ExclusiveArch: s390 s390x - sagemath ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc sparcv9 - sbcl ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - sbd ExclusiveArch: i686 x86_64 s390x - seabios ExclusiveArch: x86_64 - seamonkey ExclusiveArch: %{ix86} x86_64 - servicelog ExclusiveArch: ppc %{power64} - sgabios ExclusiveArch: %{ix86} x86_64 - sharpfont ExclusiveArch: %mono_arches - sharpziplib ExclusiveArch: %{mono_arches} - shim ExclusiveArch: x86_64 - shim-signed ExclusiveArch: x86_64 aarch64 - shim-unsigned-aarch64 ExclusiveArch: aarch64 - shim-unsigned-x64 ExclusiveArch: x86_64 - sigul ExclusiveArch: x86_64 - skychart ExclusiveArch: %{fpc_arches} - slapi-nis ExclusiveArch: x86_64 %{ix86} - smuxi ExclusiveArch: %{ix86} x86_64 %{arm} ppc64le - snapd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - source-to-image ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - sparkleshare ExclusiveArch: %{mono_arches} - spicctrl ExclusiveArch: %{ix86} x86_64 - spice ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - spice-xpi ExclusiveArch: i686 x86_64 armv6l armv7l armv7hl aarch64 - spring ExclusiveArch: %{ix86} x86_64 - springlobby ExclusiveArch: %{ix86} x86_64 - startdde ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - statsd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - stratis-cli ExclusiveArch: %{rust_arches} noarch - stratisd ExclusiveArch: %{rust_arches} - stripesnoop ExclusiveArch: %{ix86} x86_64 - supermin ExclusiveArch: x86_64 - syncthing ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - sysbench ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - syslinux ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - taglib-sharp ExclusiveArch: %{mono_arches} - tarantool ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl aarch64 - tboot ExclusiveArch: %{ix86} x86_64 - templates_parser ExclusiveArch: %GPRbuild_arches - ternimal ExclusiveArch: %{rust_arches} - themonospot-base ExclusiveArch: %mono_arches - themonospot-console ExclusiveArch: %mono_arches - themonospot-gui-gtk ExclusiveArch: %mono_arches - themonospot-plugin-avi ExclusiveArch: %mono_arches - themonospot-plugin-mkv ExclusiveArch: %mono_arches - thermald ExclusiveArch: %{ix86} x86_64 - thunderbird-enigmail ExclusiveArch: %{ix86} %{arm} ppc64 ppc64le s390x x86_64 noarch - tilix ExclusiveArch: %{ldc_arches} - tmux-top ExclusiveArch: %{go_arches} - tomboy ExclusiveArch: %{mono_arches} - tpm2-abrmd ExclusiveArch: %{ix86} x86_64 - tpm2-tools ExclusiveArch: %{ix86} x86_64 - tpm2-tss ExclusiveArch: %{ix86} x86_64 - tuned ExclusiveArch: %{ix86} x86_64 - uClibc ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} - ucx ExclusiveArch: aarch64 ppc64le x86_64 - ugene ExclusiveArch: %{ix86} x86_64 - uglify-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - uglify-js1 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - unetbootin ExclusiveArch: %{ix86} x86_64 - v8 ExclusiveArch: %{ix86} x86_64 %{arm} ppc mipsel mips64el - v8-314 ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64 - valgrind ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 - vboot-utils ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - vdsm ExclusiveArch: x86_64 %{power64} aarch64 - vim-go ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}} - virtualplanet ExclusiveArch: %{fpc_arches} - vrq ExclusiveArch: %{ix86} x86_64 - warsow ExclusiveArch: %{ix86} x86_64 %{arm} - warsow-data ExclusiveArch: %{ix86} x86_64 %{arm} - webkit-sharp ExclusiveArch: %mono_arches - webkit2-sharp ExclusiveArch: %mono_arches - wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: %{ix86} %{arm} - winetricks ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - wiredtiger ExclusiveArch: x86_64 aarch64 ppc64le - wraplinux ExclusiveArch: %{ix86} x86_64 - wxMaxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 - x2goclient ExclusiveArch: x86_64 - x86info ExclusiveArch: %{ix86} x86_64 - xen ExclusiveArch: %{ix86} x86_64 armv7hl aarch64 - xmlada ExclusiveArch: %{GPRbuild_arches} - xorg-x11-drv-armsoc ExclusiveArch: %{arm} aarch64 - xorg-x11-drv-geode ExclusiveArch: %{ix86} - xorg-x11-drv-intel ExclusiveArch: %{ix86} x86_64 ia64 - xorg-x11-drv-omap ExclusiveArch: %{arm} - xorg-x11-drv-openchrome ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-opentegra ExclusiveArch: %{arm} - xorg-x11-drv-vesa ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-vmware ExclusiveArch: %{ix86} x86_64 ia64 - xsp ExclusiveArch: %mono_arches - xsupplicant ExclusiveArch: %{ix86} x86_64 ppc %{power64} - ycssmin ExclusiveArch: %{nodejs_arches} noarch - zeromq-ada ExclusiveArch: %{GNAT_arches} - zlib-ada ExclusiveArch: %{GNAT_arches}

1 0

Architecture specific change in rpms/clamav.git
by githook-noreply＠fedoraproject.org 27 Jan '18

27 Jan '18

The package rpms/clamav.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=f5659018a4a4a… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=162c660fd5b57… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=656658e8d6f02… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=1b188a1f3f19a… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=14d21bc46d3a5…. Change: -%ifnarch s390 s390x +%ifnarch s390 s390x +%ifnarch s390 s390x -%ifnarch s390 s390x +%ifnarch s390 s390x Thanks. Full change: ============ commit c93e477aa420f38a4421934d407eb576adb57473 Merge: c67bf0c 162c660 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Sat Jan 27 02:21:29 2018 +0000 Merge branch 'el6' commit 162c660fd5b57e919c56c0bd981e25adbb01d65d Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Fri Jan 26 22:54:22 2018 +0000 Clamav 0.99.3 with git "merge" master i.e.: git diff HEAD..master | patch -p1 and git add ChangeLog-rpm.old README.fedora clamav-0.98-umask.patch clamav-0.99-private.patch clamav-milter.systemd clamav-milter.sysv clamav-milter.upstart clamav-update.crond clamav-update.logrotate clamd-README clamd-gen clamd-wrapper clamd.SERVICE.init clamd.scan.upstart clamd.sysconfig clamd@.service clamd(a)scan.service freshclam-sleep freshclam.sysconfig llvm-glibc.patch and again git diff HEAD..master | patch -p1 patching file clamd-gen patching file freshclam-sleep diff --git a/.gitignore b/.gitignore index d87d52b..0c8b00b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/clamd-wrapper.tar.bz2 /clamav-*-norar.tar.xz /main*.cvd /daily*.cvd /bytecode-278.cvd +/bytecode-319.cvd diff --git a/ChangeLog-rpm.old b/ChangeLog-rpm.old new file mode 100644 index 0000000..44c8556 --- /dev/null +++ b/ChangeLog-rpm.old @@ -0,0 +1,279 @@ +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + +* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 +- updated to 0.88.6 + +* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 +- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 +- added patch to set '__attribute__ ((visibility("hidden")))' for + exported MD5_*() functions (fixes #202043) + +* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 +- splitted SysV initscripts of -milter and -server into own subpackages + +* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 +- rebuilt + +* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 +- updated to 0.88.4 (SECURITY) + +* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed the clamdscan(1) manpage from the -server subpackage + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed a superfluous '}' +- removed some code which was relevant for FC-3 only + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 +- updated to 0.88.3 +- updated to new fedora-usermgmt macros + +* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 +- cleanups: removed unneeded curlies, use plain command instead of + %%__XXX macro, whitespace cleanup, removed unneeded versioned + dependencies +- added a 'Requires(post): group(clamav)' dependencies for -update and + added the corresponding Provides: to -data +- removed the %%_without_milter conditional; you won't gain anything + when milter would be disabled at buildtime + +* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 +- updated to 0.88.2 (SECURITY) +- rediffed patches; most issues handled by 0.88.1-2 are fixed in + 0.88.2 + +* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 +- added patch which fixes some classes of compiler warnings; at least + the using of implicitly declared functions was reported to cause + segfaults on AMD64 (brought to my attention by Marc Perkel) +- added patch which fixes wrong usage of strncpy(3) in unrarlib.c + +* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 +- updated to 0.88.1 (SECURITY) + +* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 +- rebuilt for FC5 + +* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 +- updated to 0.88 +- added pseudo-versions for the 'init(...)' provides as a first step + for the support of alternative initmethods + +* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 +- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) +- ship 'clamd.conf.5' man page in the -server subpackage *too*. The + same file is contained in multiple packages now, but this man-page + can not be removed from the base package because it also applies to + 'clamdscan' there (#173221). + +* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 +- updated to 0.87.1 + +* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 +- updated to 0.87 (SECURITY) +- removed -timeout patch; it is solved upstream +- reverted the -exim changes; they add yet more complexity, their + functionality can go into an own package and they contained flaws + +* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 +- Add clamav-exim configuration package + +* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + +* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 +- updated to 0.86.2 (SECURITY) +- changed the freshclam updating mechanism (again); now, it consists + of a crontab which does not need to be changed and a helper script + (freshclam-sleep). This helper script is configured by + /etc/sysconfig/freshclam + +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 +- updated to 0.86.1 +- fixed randomization in %%post scriptlet: hour should be a range but + not a single number + +* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 +- updated to 0.86 +- randomize freshclam startup times in -update's %%post script (suggested + by Stephen Smoogen); this requires some more Requires(post): also + +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 +- fix dist tagging the way Enrico wants it + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 +- Rebuild + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 +- Update + +* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 +- updated to 0.85 + +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 +- updated to 0.84 + +* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> +- rebuilt + +* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 +- updated to 0.83 + +* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 +- updated to 0.82 +- minor spec cleanups + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 +- build the package with '--disable-zlib-vcheck' because RH is unable to + apply a fix for a 5 month old and solved security issue. Please fill + your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +- added 'BuildRequires: bc' (should work without also, but ./configure + gives out ugly warnings else) + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 +- updated to 0.81 +- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports + an internal mode now which is enabled by default +- updated -milter %%description + +* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 +- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update + subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) + +* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 +- updated to 0.80 +- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore +- buildrequire 'curl-devel' +- renamed clamav.conf to clamd.conf (upstream change) +- updated -initoff patch + +* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 +- updated to 0.75.1 +- use %%configure, the problems with the architecture specification + seem to have passed (probably because of an autoconf update) +- set mode 0600 for the cron-script (required by vixie-cron) +- made the cronjob a spambot and send mail about deactivated freshclam + service to nearly everybody... (root, postmaster, webmaster) +- other fixes in the notification cronjob + +* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 +- updated to 0.75 + +* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 +- moved /usr/bin/clamav-config from main into -devel + +* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 +- updated to 0.74 + +* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 +- updated to 0.73 +- added pkgconfig file + +* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 +- notify the user about a deactivated clamav-update service +- added clamd-gen script which generates template spec-files for + services using clamd +- copied template configuration files to %pkgdatadir/template (needed + for clamd-gen) +- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink + will be provided for compatibility reasons +- conditionalized building of the -milter subpackage ('--without + milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) + +* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 +- removed 'BuildRequires: dietlibc'; it was a leftover from the + pre-use-signal era (before 0.70) (bug #1716) + +* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 +- updated to 0.72 + +* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 +- removed the randomization in the cronjob; it seems to be impossible + to use the mod-operator (%%) there. Instead of, the user has to + replace some placeholders... + +* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 +- updated to 0.71 + +* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 +- quote 'EOF' to delay $RANDOM expansion + +* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 +- updated GECOS entry for the 'clamav' user to describe its purpose + more accurately +- use explicit '-m755' when creating directories with install + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 +- updated to 0.70; rediffed some patches +- updated logrotate script to use signals and documented the steps + which are needed to make it work +- adapted initscript to use signals instead of sockwrite +- removed sockwrite; signals can now be used to reload the database +- added logfile to the -milter subpackage + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 +- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets + +* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 +- split the double Requires(...,...): statements; see + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 +- require the recent fedora-usermgmt package (0.7) which fixes similar + ordering issues + +* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 +- updated to 0.68 (using the -1 version) +- ship milter-files in the -milter instead of the -server subpackage + +* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 +- fixed ':' vs. '.' in chown + +* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 +- randomize freshclam startup to prevent server peaks + +* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 +- updated to 0.67 (using the -1 version) + +* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 +- updated to 0.66; important, packaging-relevant changes are + freshclam: + * $http_proxy is not supported anymore; you have to configure it in + /etc/freshclam.conf + * the logfile has been renamed to /var/log/freshclam.log +- removed %%check section; buildroot check is implemented in local + testsuite already +- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew + files +- added some directory-Requires: +- activated milter-package and made it work +- added patch to disable clamav-milter service by default +- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this + makes things more consistently but can break backward compatibility. The + initscript should deal with the old version too, but I would not bet on + it... +- updated some descriptions +- fixed the update-mechanism; now it happens in two stages: at first, + the files will be downloaded as user 'clamav' and then, root initiates + the daemon-reload. + +* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 +- added security fix for + http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..8df192d --- /dev/null +++ b/README.fedora @@ -0,0 +1,116 @@ +A clamav-milter setup consists of the following three components: + +* the clamav-milter itself + + --> this is provided by the 'clamav-milter' package plus (alternatively) + 'clamav-milter-upstart' or 'clamav-milter-sysvinit' + + The main configuration is in /etc/mail/clamav-milter.conf and MUST + be changed before first use. + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamav-milter to + enable automatic startup. See comments there for more details. + +* a clamav scanner daemon + + --> this package is called 'clamav-scanner' plus (alternatively) + 'clamav-scanner-upstart' or 'clamav-scanner-sysvinit' + + The daemon is configured by /etc/clamd.d/scan.conf (which MUST be + edited before first use). + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamd.scan to enable + automatic startup. See comments there for more details. + +* the MTA (sendmail/postfix) + + --> you should know how to install this... + + When communicating across unix sockets with the clamav-milter, it is + suggested to use the /var/run/clamav-milter/clamav-milter.socket + path. You have to add something like + + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav-milter.socket, F=, T=S:4m;R:4m')dnl + + to your sendmail.mc. + + + +It is suggested that components communicate through TCP sockets as +this eases setup. Please add corresponding packet filter rules! + + +EXAMPLE +======= + +For clamav-milter, a possible setup might be created by + +A) On the MTA (assumed hostname 'host-mta') + + 1. Add to sendmail.mc + + | INPUT_MAIL_FILTER(`clamav', `S=inet:6666@host-milter, F=, T=S:4m;R:4m')dnl + + 2. Rebuild sendmail.cf + + +B) On the clamav-milter host (assumed hostname 'host-milter') + + 1. Install clamav-milter + clamav-milter-upstart packages + + 2. Set in /etc/mail/clamav-milter.conf + + | MilterSocket inet:6666 + | ClamdSocket tcp:host-scanner:6665 + + and all the other options which are required on your system + + 3. Edit /etc/event.d/clamav-milter and uncomment the + + | start on starting local + + line. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cmilt + | iptables -A IN-cmilt -s host-mta -j ACCEPT + | iptables -A IN-cmilt -j DROP + + | iptables -A INPUT -p tcp --dport 6666 -j IN-cmilt + + to your firewall setup + +C) On the clamav-scanner host (assumed hostname 'host-scanner') + + 1. Install clamav-scanner + clamav-scanner-upstart packages + + 2. Add to /etc/clamd.d/scan.conf + + | TCPSocket 6665 + | TCPAddr host-scanner + + comment out possible 'LocalSocket' lines and set all the other + options which are required on your system + + 3. Edit /etc/event.d/clamav-scanner and uncomment the + + | start on starting local + + line. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cscan + | iptables -A IN-cscan -s host-milter -j ACCEPT + | iptables -A IN-cscan -j DROP + + | iptables -A INPUT -p tcp --dport 6665 -j IN-csan + + to your firewall setup diff --git a/clamav-0.98-umask.patch b/clamav-0.98-umask.patch new file mode 100644 index 0000000..b9aa421 --- /dev/null +++ b/clamav-0.98-umask.patch @@ -0,0 +1,33 @@ +--- clamav-0.98/clamav-milter/clamav-milter.c 2013-09-16 21:28:14.000000000 +0200 ++++ clamav-0.98/clamav-milter/clamav-milter.c.umask 2013-10-06 20:39:08.000000000 +0200 +@@ -374,7 +374,7 @@ + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0002); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +--- clamav-0.98/shared/output.c 2013-09-16 21:28:14.000000000 +0200 ++++ clamav-0.98/shared/output.c.umask 2013-10-06 20:39:28.000000000 +0200 +@@ -348,7 +348,7 @@ + logg_open(); + + if(!logg_fp && logg_file) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +--- clamav-0.98/freshclam/freshclam.c 2013-09-16 21:28:14.000000000 +0200 ++++ clamav-0.98/freshclam/freshclam.c.umask 2013-10-06 20:39:47.000000000 +0200 +@@ -123,7 +123,7 @@ + { + FILE *fd; + int old_umask; +- old_umask = umask (0006); ++ old_umask = umask (0022); + if ((fd = fopen (pidfile, "w")) == NULL) + { + logg ("!Can't save PID to file %s: %s\n", pidfile, strerror (errno)); diff --git a/clamav-0.99-private.patch b/clamav-0.99-private.patch new file mode 100644 index 0000000..7f9f563 --- /dev/null +++ b/clamav-0.99-private.patch @@ -0,0 +1,27 @@ +--- clamav-0.99/libclamav.pc.in 2015-09-18 22:48:25.000000000 +0200 ++++ clamav-0.99/libclamav.pc.in.private 2015-12-02 01:30:30.055231319 +0100 +@@ -7,6 +7,6 @@ + Description: A GPL virus scanner + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lclamav +-Libs.private: @LIBCLAMAV_LIBS@ ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ + Cflags: -I${includedir} + +--- clamav-0.99/clamav-config.in 2015-05-28 23:56:25.000000000 +0200 ++++ clamav-0.99/clamav-config.in.private 2015-12-02 01:31:34.933705763 +0100 +@@ -54,12 +54,8 @@ + usage 0 + ;; + +- --cflags) +- echo -I@includedir@ @CFLAGS@ +- ;; +- +- --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ (--cflags|--libs) ++ ${PKG_CONFIG:-pkg-config} "$1" libclamav + ;; + + *) diff --git a/clamav-milter.init b/clamav-milter.init deleted file mode 100644 index d9fb037..0000000 --- a/clamav-milter.init +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# Startup script for the Clamav Milter Daemon -# -# chkconfig: - 77 23 -# description: clamav-milter is a daemon which hooks into sendmail \ -# and routes email messages to clamav. -# processname: clamav-milter -# pidfile: /var/run/clamav/clamav-milter.pid -# config: /etc/sysconfig/clamav-milter - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -[ -x /usr/sbin/clamav-milter ] || exit 0 - -# Local clamav-milter config -CLAMAV_FLAGS= -test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter - -# See how we were called. -case "$1" in - start) - echo -n "Starting Clamav Milter Daemon: " - daemon clamav-milter $CLAMAV_FLAGS - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamav-milter - ;; - stop) - echo -n "Stopping Clamav Milter Daemon: " - killproc clamav-milter - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamav-milter - ;; - status) - status clamav-milter - RETVAL=$? - ;; - restart|reload) - $0 stop - $0 start - RETVAL=$? - ;; - condrestart) - [ -e /var/lock/subsys/clamav-milter ] && $0 restart - RETVAL=$? - ;; - *) - echo "Usage: clamav-milter {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -exit $RETVAL diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig deleted file mode 100644 index 834b0cd..0000000 --- a/clamav-milter.sysconfig +++ /dev/null @@ -1,4 +0,0 @@ -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" diff --git a/clamav-milter.systemd b/clamav-milter.systemd new file mode 100644 index 0000000..7571038 --- /dev/null +++ b/clamav-milter.systemd @@ -0,0 +1,25 @@ +[Unit] +Description = Milter module for the Clam Antivirus scanner +After = syslog.target nss-lookup.target network.target +Before = sendmail.service +Before = postfix.service +After = clamd(a)scan.service + +[Service] +Type = forking +ExecStart = /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf +Restart = on-failure + +User=clamilt +Group=clamilt + +PrivateTmp=yes +PrivateDevices=yes +CapabilityBoundingSet=CAP_KILL + +ReadOnlyDirectories=/etc +ReadOnlyDirectories=/usr +ReadOnlyDirectories=/var/lib + +[Install] +WantedBy = multi-user.target diff --git a/clamav-milter.sysv b/clamav-milter.sysv new file mode 100644 index 0000000..3e37ae0 --- /dev/null +++ b/clamav-milter.sysv @@ -0,0 +1,93 @@ +#!/bin/bash +# +# clamav-milter Starts/stop the "clamav-milter" daemon +# +# chkconfig: - 79 31 +# description: A virus scanning milter + +# Source function library. +. /etc/rc.d/init.d/functions + +exec=/usr/sbin/clamav-milter +prog="clamav-milter" + +OPTS='-c /etc/mail/clamav-milter.conf' +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +pidfile=/var/run/clamav-milter/milter.pid +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + [ -f $config ] || exit 6 + echo -n $"Starting $prog: " + daemon --pidfile=${pidfile} $exec $OPTS --foreground=no --pid=${pidfile} + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -p "${pidfile}" $exec + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + # run checks to determine if the service is running or use generic status + status -p "${pidfile}" $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? diff --git a/clamav-milter.upstart b/clamav-milter.upstart new file mode 100644 index 0000000..1a10b8e --- /dev/null +++ b/clamav-milter.upstart @@ -0,0 +1,14 @@ +### !!! Uncomment only *one* of the 'start on' statements !!! + +### Uncomment these lines when you want clamav-milter to be a milter +### for a locally running MTA +#start on (starting sendmail or starting postfix) + +### Uncomment these lines when you want clamav-milter to be a milter +### for a remotely running MTA +#start on runlevel [345] and starting local + +stop on runlevel [!345] + +respawn +exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --foreground=yes diff --git a/clamav-update.crond b/clamav-update.crond new file mode 100644 index 0000000..dc85745 --- /dev/null +++ b/clamav-update.crond @@ -0,0 +1,6 @@ +## Adjust this line... +MAILTO=root + +## It is ok to execute it as root; freshclam drops privileges and becomes +## user 'clamupdate' as soon as possible +0 */3 * * * root /usr/share/clamav/freshclam-sleep diff --git a/clamav-update.logrotate b/clamav-update.logrotate new file mode 100644 index 0000000..0de6062 --- /dev/null +++ b/clamav-update.logrotate @@ -0,0 +1,4 @@ +/var/log/freshclam.log { + monthly + notifempty +} diff --git a/clamav.init b/clamav.init deleted file mode 100755 index 633c301..0000000 --- a/clamav.init +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# Startup script for the Clam AntiVirus Daemon -# -# chkconfig: - 61 39 -# description: Clam AntiVirus Daemon is a TCP/IP or socket protocol \ -# server. -# processname: clamd -# pidfile: /var/run/clamav/clamd.pid -# config: /etc/clamd.conf - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -[ -x /usr/sbin/clamd ] || exit 0 - -# Local clamd config -test -f /etc/sysconfig/clamd && . /etc/sysconfig/clamd - -# See how we were called. -case "$1" in - start) - echo -n "Starting Clam AntiVirus Daemon: " - daemon clamd - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd - ;; - stop) - echo -n "Stopping Clam AntiVirus Daemon: " - killproc clamd - rm -f /var/run/clamav/clamd.sock - rm -f /var/run/clamav/clamd.pid - RETVAL=$? - echo -### heres the fix... we gotta remove the stale files on restart - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamd - ;; - status) - status clamd - RETVAL=$? - ;; - restart|reload) - $0 stop - $0 start - RETVAL=$? - ;; - condrestart) - [ -e /var/lock/subsys/clamd ] && $0 restart - RETVAL=$? - ;; - *) - echo "Usage: clamd {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -exit $RETVAL diff --git a/clamav.spec b/clamav.spec index 2fd02bd..a44be34 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,762 +1,1418 @@ -### FIXME: Sysv script does not have condrestart option (redo sysv script) -### FIXME: amavisd-new requires clamd to run as user vscan, solution needed -### REMINDER: Look and sync with Petr Kristof's work - -Summary: Anti-virus software -Name: clamav -Version: 0.99.2 -Release: 3%{?dist} -License: GPLv2 -Group: Applications/System -URL: http://www.clamav.net/ +#global prerelease rc1 + +## Fedora Extras specific customization below... +%bcond_without fedora +%if 0%{?fedora} || 0%{?rhel} > 6 +%bcond_without systemd +%bcond_without tmpfiles +%bcond_with sysv +%bcond_with upstart +%else +%if 0%{?rhel} == 6 +%bcond_with systemd +%bcond_with tmpfiles +%bcond_without sysv +%bcond_without upstart +%else +%bcond_with systemd +%bcond_with tmpfiles +%bcond_without sysv +%bcond_with upstart +%endif +%endif +%bcond_with unrar +%bcond_without noarch +%bcond_without bytecode +## + +%global _hardened_build 1 +%ifnarch s390 s390x +%global have_ocaml 1 +%else +%global have_ocaml 0 +%endif + +%{!?_rundir:%global _rundir /var/run} + +%global updateuser clamupdate +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log +%global milterstatedir %_rundir/clamav-milter +%global pkgdatadir %_datadir/%name + +%global scanuser clamscan +%global scanstatedir %_rundir/clamd.scan + +%{?with_noarch:%global noarch BuildArch: noarch} +%{!?_unitdir:%global _unitdir /lib/systemd/system} +%{!?_initrddir:%global _initrddir /etc/rc.d/init.d} +%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} +%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ +%nil} +%{!?systemd_reqs:%global systemd_reqs \ +Requires(post): /bin/systemctl\ +Requires(preun): /bin/systemctl\ +Requires(postun): /bin/systemctl\ +%nil} +%{!?systemd_install:%global systemd_install()\ +%post %1\ +%systemd_post %2 \ +%preun %1\ +%systemd_preun %2 \ +%postun %1\ +%systemd_postun_with_restart %2 \ +%nil} + + +Summary: End-user tools for the Clam Antivirus scanner +Name: clamav +Version: 0.99.3 +Release: 1%{?dist} +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} +Group: Applications/File +URL: http://www.clamav.net +%if %{with unrar} +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +%else # Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. This +# incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by # make clean-sources NAME=clamav VERSION=<version> TARBALL=clamav-<version>.tar.gz TARBALL_CLEAN=clamav-<version>-norar.tar.xz -# Upstream: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-%{version}-norar.tar.xz -Source1: clamav.init -Source2: clamav-milter.init -Source3: clamd-wrapper.tar.bz2 - -Source7: freshclam.cron -Source8: freshclam.logrotate -Source9: clamd.logrotate -Source10: clamav-milter.sysconfig - +Source0: %name-%version%{?prerelease}-norar.tar.xz +%endif +#for server +Source2: clamd.sysconfig +Source3: clamd.logrotate +Source5: clamd-README +Source7: clamd.SERVICE.init # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). -Source11: http://db.local.clamav.net/main-57.cvd -Source12: http://db.local.clamav.net/daily-21723.cvd -Source13: http://db.local.clamav.net/bytecode-278.cvd +# Check the first line of the file for version, file is not working +# see https://bugzilla.redhat.com/show_bug.cgi?id=1539107 +Source10: http://db.local.clamav.net/main-58.cvd +Source11: http://db.local.clamav.net/daily-24253.cvd +Source12: http://db.local.clamav.net/bytecode-319.cvd +#for devel +Source100: clamd-gen +#for update +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.crond +Source203: clamav-update.logrotate +#for milter +Source300: README.fedora +#for clamav-milter.upstart +Source310: clamav-milter.upstart +#for milter-sysvinit +Source320: clamav-milter.sysv +#for clamav-milter.systemd +Source330: clamav-milter.systemd +#for scanner-upstart +Source410: clamd.scan.upstart +#for scanner-systemd +Source430: clamd(a)scan.service +#for server-sysvinit +Source520: clamd-wrapper +#for server-systemd +Source530: clamd@.service + +Patch24: clamav-0.99-private.patch +Patch27: clamav-0.98-umask.patch +# https://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Int… +Patch30: llvm-glibc.patch +Patch31: clamav-0.99.1-setsebool.patch +Patch33: clamav-0.99.2-temp-cleanup.patch + + + +BuildRequires: autoconf automake gettext-devel libtool libtool-ltdl-devel +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel openssl-devel libxml2-devel +BuildRequires: %_includedir/tcpd.h +%{?with_bytecode:BuildRequires: bc tcl groff graphviz} +%if %{have_ocaml} +%{?with_bytecode:BuildRequires: ocaml} +%endif +# nc reuqired for tests +BuildRequires: nc +%if %{with systemd} +BuildRequires: systemd +%endif +#for milter +BuildRequires: sendmail-devel -Patch31: clamav-0.99.1-setsebool.patch -Patch32: clamav-0.99.2-temp-cleanup.patch +Requires: clamav-lib = %version-%release +Requires: data(clamav) -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%description +Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this +software is the integration with mail servers (attachment scanning). The +package provides a flexible and scalable multi-threaded daemon, a command +line scanner, and a tool for automatic updating via Internet. The programs +are based on a shared library distributed with the Clam AntiVirus package, +which you can use with your own software. The virus database is based on +the virus database from OpenAntiVirus, but contains additional signatures +(including signatures for popular polymorphic viruses, too) and is KEPT UP +TO DATE. + +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(%updateuser) = 4 +Provides: group(%updateuser) = 4 +Provides: group(virusgroup) +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +Requires(pre): shadow-utils +%{?noarch} + +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. + + +%package lib +Summary: Dynamic libraries for the Clam Antivirus scanner +Group: System Environment/Libraries +Requires: data(clamav) + +%description lib +This package contains dynamic libraries shared between applications +using the Clam Antivirus scanner. -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel, pcre-devel -%{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} -Requires: clamav-db = %{version}-%{release} -Requires(pre): shadow-utils +%package devel +Summary: Header files and libraries for the Clam Antivirus scanner +Group: Development/Libraries +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release +Requires: openssl-devel -### Fedora Extras introduced them differently :( -Provides: libclamav -Obsoletes: libclamav < %{version}-%{release} -Provides: clamav-lib = %{version}-%{release} -Obsoletes: clamav-lib < %{version}-%{release} +%description devel +This package contains headerfiles and libraries which are needed to +build applications using clamav. + + +%package data +Summary: Virus signature data for the Clam Antivirus scanner +Group: Applications/File +Requires: clamav-filesystem = %version-%release +Requires: clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full +%{?noarch} + +%description data +This package contains the virus-database needed by clamav. This +database should be updated regularly; the 'clamav-update' package +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty +%{?noarch} + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%package update +Summary: Auto-updater for the Clam Antivirus scanner data-files +Group: Applications/File +Requires: clamav-filesystem = %version-%release +Requires: crontabs +Requires: /etc/cron.d +Requires(post): %__chown %__chmod +Requires(post): group(%updateuser) + +%description update +This package contains programs which can be used to update the clamav +anti-virus database automatically. It uses the freshclam(1) utility for +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. + + +%package server +Summary: Clam Antivirus scanner server +Group: System Environment/Daemons +Requires: data(clamav) +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release +Requires: coreutils +%if ! %{with sysv} +Obsoletes: clamav-server-sysvinit < %version-%release +%endif + +%description server +ATTENTION: most users do not need this package; the main package has +everything (or depends on it) which is needed to scan for virii on +workstations. + +This package contains files which are needed to execute the clamd-daemon. +This daemon does not provide a system-wide service. Instead of, an instance +of this daemon should be started for each service requiring it. + +See the README file how this can be done with a minimum of effort. + + +%package server-sysvinit +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release +Requires: %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} + +%description server-sysvinit +SysV initscripts template for the clamav server + + +%package server-systemd +Summary: Systemd initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = systemd +Requires: clamav-server = %version-%release +%{?systemd_reqs} +%{?noarch} + +%description server-systemd +Systemd template for the clamav server + + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 +Requires: clamav-server = %version-%release +Requires(pre): shadow-utils +Requires(pre): group(virusgroup) +%if ! %{with sysv} +Obsoletes: clamav-scanner-sysvinit < %version-%release +%endif +%if ! %{with upstart} +Obsoletes: clamav-scanner-upstart < %version-%release +%endif +%{?noarch} + +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + + +# Remove me after EOL of RHEL5 +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires: %_initrddir +Requires(postun): initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +%{?noarch} + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + + +# Remove me after EOL of RHEL6 +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +Requires: /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + + +%package scanner-systemd +Summary: Systemd initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = systemd +Requires: clamav-scanner = %version-%release +Requires: clamav-server-systemd = %version-%release +%{?systemd_reqs} +%{?noarch} + +%description scanner-systemd +The systemd initscripts for clamav-scanner. -%description -Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of -this software is the integration with mail servers (attachment scanning). -The package provides a flexible and scalable multi-threaded daemon, a -command line scanner, and a tool for automatic updating via Internet. - -The programs are based on a shared library distributed with the Clam -AntiVirus package, which you can use with your own software. Most -importantly, the virus database is kept up to date - -%package -n clamd -Summary: The Clam AntiVirus Daemon -Group: System Environment/Daemons -Requires: clamav = %{version}-%{release} - -### Fedora Extras introduced them differently :( -Provides: clamav-server = %{version}-%{release} -Obsoletes: clamav-server < %{version}-%{release} -Provides: clamav-server-sysv = %{version}-%{release} -Obsoletes: clamav-server-sysv < %{version}-%{release} -Provides: clamav-scanner = %{version}-%{release} -Obsoletes: clamav-scanner < %{version}-%{release} -Provides: clamav-scanner-upstart = %{version}-%{release} -Obsoletes: clamav-scanner-upstart < %{version}-%{release} -Provides: clamav-server-sysvinit = %{version}-%{release} -Obsoletes: clamav-server-sysvinit < %{version}-%{release} - - -%description -n clamd -The Clam AntiVirus Daemon %package milter -Summary: The Clam AntiVirus sendmail-milter Daemon -Group: Applications/System -Requires: clamd = %{version}-%{release} -Requires: /usr/sbin/sendmail -Provides: clamav-milter-sysv = %{version}-%{release} -Obsoletes: clamav-milter-sysv < %{version}-%{release} -Provides: clamav-milter-sysvinit = %{version}-%{release} -Obsoletes: clamav-milter-sysvinit < %{version}-%{release} +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Requires: init(clamav-milter) +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 +Requires(post): coreutils +Requires(pre): shadow-utils +Requires(pre): group(virusgroup) + +Provides: milter(clamav) = sendmail +Provides: milter(clamav) = postfix + +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release +%if ! %{with sysv} +Obsoletes: clamav-milter-sysvinit < %version-%release +%endif +%if ! %{with upstart} +Obsoletes: clamav-milter-upstart < %version-%release +%endif %description milter -The Clam AntiVirus sendmail-milter Daemon - -%package db -Summary: Virus database for %{name} -Group: Applications/Databases -### Remove circular dependency -#Requires: clamav = %{version}-%{release} - -### Fedora Extras introduced them differently :( -Provides: clamav-update = %{version}-%{release} -Obsoletes: clamav-update < %{version}-%{release} -Provides: clamav-data = %{version}-%{release} -Obsoletes: clamav-data < %{version}-%{release} -Obsoletes: clamav-data-empty <= %{version}-%{release} -# Ugly to put these in the db-package, but needed -# here to handle upgrades on EL5. -Provides: clamav-filesystem = %{version}-%{release} -Obsoletes: clamav-filesystem < %{version}-%{release} - -%description db -The actual virus database for %{name} +This package contains files which are needed to run the clamav-milter. + + +# Remove me after EOL of RHEL5 +%package milter-sysvinit +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter +Requires: %_initrddir +Requires(postun): initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} + +%description milter-sysvinit +The SysV initscripts for clamav-milter. + + +# Remove me after EOL of RHEL6 +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +Requires: /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%description milter-upstart +The Upstart initscripts for clamav-milter. + + +%package milter-systemd +Summary: Systemd initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = systemd +Requires: clamav-milter = %version-%release +%{?systemd_reqs} +%{?noarch} + +%description milter-systemd +The systemd initscripts for clamav-scanner. +## ------------------------------------------------------------ -%package devel -Summary: Header files, libraries and development documentation for %{name} -Group: Development/Libraries -Requires: clamav = %{version}-%{release}, openssl-devel +%prep +%setup -q -n %{name}-%{version}%{?prerelease} -### Fedora Extras introduced them differently :( -Obsoletes: libclamav-static-devel <= %{version}-%{release} -Obsoletes: libclamav-devel <= %{version}-%{release} -Provides: libclamav-static-devel, libclamav-devel +%apply -n24 -p1 -b .private +%apply -n27 -p1 -b .umask +%apply -n30 -p1 +%apply -n31 -p1 -b .setsebool +%apply -n33 -p1 -b .temp-cleanup +%{?apply_end} -%description devel -This package contains the header files, static libraries and development -documentation for %{name}. If you like to develop programs using %{name}, -you will need to install %{name}-devel. +install -p -m0644 %SOURCE300 clamav-milter/ + +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} + +sed -ri \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf.sample + +sed -ri \ + -e 's!^Example!#Example!' \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%updateuser!g' etc/freshclam.conf.sample -%prep -# Handle that rpmbuild in RHEL < 6 doesn't handle xz archives automatically. -%setup -q -T -c -xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) -%patch31 -p1 -b .setsebool -%patch32 -p1 -b .temp-cleanup - -%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure - -%{__perl} -pi.orig -e ' - s|\@DBDIR\@|\$(localstatedir)/lib/clamav|g; - s|\@DBINST\@|\$(localstatedir)/lib/clamav|g; - s|\@CFGDIR\@|\$(sysconfdir)|g; - s|\@CFGINST\@|\$(sysconfdir)|g; - s|^\@INSTALL_CLAMAV_CONF_TRUE\@|\t|g; - s|^\@INSTALL_FRESHCLAM_CONF_TRUE\@|\t|g; - ' database/Makefile.in etc/Makefile.in - -%{__perl} -pi.orig -e ' - s|^(Example)|#$1|; - s|^#(LogFile) .+$|$1 %{_localstatedir}/log/clamav/clamd.log|; - s|^#(LogFileMaxSize) .*|$1 0|; - s|^#(LogTime)|$1|; - s|^#(LogSyslog)|$1|; - s|^#(PidFile) .+$|$1 %{_localstatedir}/run/clamav/clamd.pid|; - s|^#(TemporaryDirectory) .+$|$1 %{_localstatedir}/tmp|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; - s|^#(LocalSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; - s|^#(FixStaleSocket)|$1|; - s|^#(TCPSocket) .+$|$1 3310|; - s|^#(TCPAddr) .+$|$1 127.0.0.1|; - s|^#(MaxConnectionQueueLength) .+$|$1 30|; - s|^#(StreamSaveToDisk)|$1|; - s|^#(MaxThreads) .+$|$1 50|; - s|^#(ReadTimeout) .+$|$1 300|; - s|^#(User) .+$|$1 clam|; - s|^#(AllowSupplementaryGroups).*$|$1 yes|; - s|^#(ScanPE) .+$|$1 yes|; - s|^#(ScanELF) .+$|$1 yes|; - s|^#(DetectBrokenExecutables)|$1|; - s|^#(ScanOLE2) .+$|$1 yes|; - s|^#(ScanMail)|$1|; - s|^#(ScanArchive) .+$|$1 yes|; - s|^#(ArchiveMaxCompressionRatio) .+|$1 300|; - s|^#(ArchiveBlockEncrypted)|$1|; - s|^#(ArchiveBlockMax)|$1|; - ' etc/clamd.conf.sample - -%{__perl} -pi.orig -e ' - s|^(Example)|#$1|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; - s|^#(UpdateLogFile) .+$|$1 %{_localstatedir}/log/clamav/freshclam.log|; - s|^#(LogSyslog)|$1|; - s|^#(DatabaseOwner) .+$|$1 clam|; - s|^(Checks) .+$|$1 24|; - ' etc/freshclam.conf.sample - -%{__perl} -pi.orig -e ' - s|^(Example)|#$1|; - s|^#(User) .+$|$1 clam|; - s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|; - s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|; - s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf.sample + +## ------------------------------------------------------------ %build -%configure \ - --program-prefix="%{?_program_prefix}" \ -%{!?_without_milter:--enable-milter} \ - --disable-clamav \ - --disable-static \ - --disable-zlib-vcheck \ - --disable-unrar \ - --enable-id-check \ - --enable-dns \ - --with-dbdir="%{_localstatedir}/lib/clamav" \ - --with-group="clam" \ - --with-libcurl=%{_prefix} \ - --with-user="clam" \ -# --disable-llvm - -make %{?_smp_mflags} +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98" +export LDFLAGS='%{?__global_ldflags} -Wl,--as-needed' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes + +rm -rf libltdl autom4te.cache Makefile.in +autoreconf -i +%configure \ + --disable-static \ + --disable-rpath \ + --disable-silent-rules \ + --disable-clamav \ + --with-user=%updateuser \ + --with-group=%updateuser \ + --with-libcurl=%{_prefix} \ + --with-dbdir=%homedir \ + --enable-milter \ + --enable-clamdtop \ + --disable-zlib-vcheck \ + %{!?with_bytecode:--disable-llvm} \ + %{!?with_unrar:--disable-unrar} + +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool + +%make_build + + +## ------------------------------------------------------------ %install -rm -rf %{buildroot} -make install DESTDIR="%{buildroot}" +rm -rf "$RPM_BUILD_ROOT" _doc* +%make_install + +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + +install -d -m 0755 \ + $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,logrotate.d} \ + $RPM_BUILD_ROOT%_tmpfilesdir \ + $RPM_BUILD_ROOT%_rundir \ + $RPM_BUILD_ROOT%_var/log \ + $RPM_BUILD_ROOT%milterstatedir \ + $RPM_BUILD_ROOT%pkgdatadir/template \ + $RPM_BUILD_ROOT%_initrddir \ + $RPM_BUILD_ROOT%homedir \ + $RPM_BUILD_ROOT%scanstatedir + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf.sample \ + $RPM_BUILD_ROOT%_libdir/*.la + + +%{?with_bytecode:touch $RPM_BUILD_ROOT%homedir/bytecode.cld} +touch $RPM_BUILD_ROOT%homedir/{daily,main}.cld +touch $RPM_BUILD_ROOT%homedir/mirrors.dat + +install -D -m 0644 -p %SOURCE10 $RPM_BUILD_ROOT%homedir/main.cvd +install -D -m 0644 -p %SOURCE11 $RPM_BUILD_ROOT%homedir/daily.cvd +%{?with_bytecode:install -D -m 0644 -p %SOURCE12 $RPM_BUILD_ROOT%homedir/bytecode.cvd} + +## prepare the server-files +install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate +%if %{with sysv} +install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init +%endif +install -D -m 0644 -p %SOURCE5 _doc_server/README +install -D -m 0644 -p etc/clamd.conf.sample _doc_server/clamd.conf -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd -install -Dp -m0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav +%if %{with sysv} +install -m 0644 -p %SOURCE520 $RPM_BUILD_ROOT%pkgdatadir/ +%endif +install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template -mv -f %{buildroot}%{_sysconfdir}/clamd.conf{.sample,} -mv -f %{buildroot}%{_sysconfdir}/freshclam.conf{.sample,} +%if %{with sysv} +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper +%endif +install -D -p -m 0644 %SOURCE530 $RPM_BUILD_ROOT%_unitdir/clamd@.service -# now rewrite scripts and config files in-place -sed -i \ - -e 's!%%{_sbindir}!%{_sbindir}!g' \ - -e 's!%%{_bindir}!%{_bindir}!g' \ - -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ - %{buildroot}%{_sysconfdir}/cron.daily/freshclam \ - %{buildroot}%{_sysconfdir}/logrotate.d/* - -%if %{!?_without_milter:1}0 -install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter -mv -f %{buildroot}%{_sysconfdir}/clamav-milter.conf{.sample,} -%else -rm %{buildroot}%{_mandir}/man8/clamav-milter.8* + +## prepare the update-files +install -D -m 0644 -p %SOURCE203 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update +touch $RPM_BUILD_ROOT%freshclamlog + +install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update +mv -f $RPM_BUILD_ROOT%_sysconfdir/freshclam.conf{.sample,} + +smartsubst 's!webmaster,clamav!webmaster,%updateuser!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep + + +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf.sample > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf + +%if %{with sysv} +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan %endif -# Install clamav-wrapper: -tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share -install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ -touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log -touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log +install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf +install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd(a)scan.service + +cat << EOF > $RPM_BUILD_ROOT%_tmpfilesdir/clamd.scan.conf +d %scanstatedir 0710 %scanuser %scanuser +EOF + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} -install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ -install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd -install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd -install -Dp -m0644 %{SOURCE13} %{buildroot}%{_localstatedir}/lib/clamav/bytecode.cvd -touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/bytecode.cld -touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/{daily,main}.cld -touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/mirrors.dat +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /var/run/clamd/clamd.socket! %scanstatedir/clamd.sock!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf.sample > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf + +install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf +%if %{with sysv} +install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +%endif +install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service +cat << EOF > $RPM_BUILD_ROOT%_tmpfilesdir/clamav-milter.conf +d %milterstatedir 0710 %milteruser %milteruser +EOF -# Clean up for later usage in documentation -for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf.sample +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} -%post -/sbin/ldconfig +%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} +%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} +%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} +%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_rundir/*/*.pid} +%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_tmpfilesdir} -ZONES="/usr/share/zoneinfo/zone.tab" -CONFIG="/etc/sysconfig/clock" +%if %{with systemd} +# TODO: Evaluate using upstream's unit files +rm $RPM_BUILD_ROOT%_unitdir/clamav-{daemon,freshclam}.* +%endif -if [ -r "$CONFIG" -a -r "$ZONES" -a -n "$ZONE" ]; then - source "$CONFIG" - export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | grep -v ^# | head -1 | cut -f1 | tr [A-Z] [a-z])" -fi +%if %{with sysv} +# keep clamd-wrapper in every case because it might be needed by other +# packages +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper +%endif -if [ -z "$CODE" ]; then - export CODE="local" -fi +## ------------------------------------------------------------ -%{__perl} -pi -e ' - s|^(DatabaseMirror) database\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; - s|^(DatabaseMirror) db\.\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; - ' %{_sysconfdir}/freshclam.conf{,.rpmnew} &>/dev/null || : +%check +make check -%postun -p /sbin/ldconfig +## ------------------------------------------------------------ -%pre -getent group clam >/dev/null || groupadd -r clam -getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ - -c "Clam Anti Virus Checker" clam +%pre filesystem +getent group %{updateuser} >/dev/null || groupadd -r %{updateuser} +getent passwd %{updateuser} >/dev/null || \ + useradd -r -g %{updateuser} -d %{homedir} -s /sbin/nologin \ + -c "Clamav database update user" %{updateuser} +getent group virusgroup >/dev/null || groupadd -r virusgroup +usermod %{updateuser} -a -G virusgroup exit 0 -%pre -n clamd -getent group clam >/dev/null || groupadd -r clam -getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ - -c "Clam Anti Virus Checker" clam + +%pre scanner +getent group %{scanuser} >/dev/null || groupadd -r %{scanuser} +getent passwd %{scanuser} >/dev/null || \ + useradd -r -g %{scanuser} -d / -s /sbin/nologin \ + -c "Clamav scanner user" %{scanuser} +usermod %{scanuser} -a -G virusgroup exit 0 -%post -n clamd -/sbin/chkconfig --add clamd -%preun -n clamd -if [ $1 -eq 0 ]; then - /sbin/service clamd stop &>/dev/null || : - /sbin/chkconfig --del clamd -fi +%{?with_tmpfiles: +%post scanner +%{?with_systemd:/bin/systemd-tmpfiles --create %_tmpfilesdir/clamd.scan.conf || :}} + + +%post server-systemd +test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || : + +%postun server-systemd +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + +%systemd_install scanner-systemd clamd(a)scan.service + + +%post update +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%updateuser %freshclamlog + ! test -x /sbin/restorecon || /sbin/restorecon %freshclamlog +} + +%triggerin update -- %name-update < 0.97.3-1704 +# remove me after F19 +! test -x /sbin/restorecon || /sbin/restorecon %freshclamlog &>/dev/null || : + + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : + +%pre milter +getent group %{milteruser} >/dev/null || groupadd -r %{milteruser} +getent passwd %{milteruser} >/dev/null || \ + useradd -r -g %{milteruser} -d %{milterstatedir} -s /sbin/nologin \ + -c "Clamav Milter user" %{milteruser} +usermod %{milteruser} -a -G virusgroup +exit 0 -%postun -n clamd -/sbin/service clamd condrestart &>/dev/null || : %post milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog + ! test -x /sbin/restorecon || /sbin/restorecon %milterlog +} +%{?with_systemd:/bin/systemd-tmpfiles --create %_tmpfilesdir/clamav-milter.conf || :} + + +%triggerin milter -- %name-milter < 0.97.3-1704 +# remove me after F19 +! test -x /sbin/restorecon || /sbin/restorecon %milterlog &>/dev/null || : + + +%post milter-sysvinit /sbin/chkconfig --add clamav-milter -%preun milter -if [ $1 -eq 0 ]; then - /sbin/service clamav-milter stop &>/dev/null || : - /sbin/chkconfig --del clamav-milter -fi +%preun milter-sysvinit +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter -%postun milter -/sbin/service clamav-milter condrestart &>/dev/null || : +%postun milter-sysvinit +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : -%pre db -getent group clam >/dev/null || groupadd -r clam -getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ - -c "Clam Anti Virus Checker" clam -exit 0 -%post db -# Remove old mirrors.dat, mostly because it will have the wrong -# owner after upgrading from clamav < 0.97: -test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat -exit 0 +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : -%clean -rm -rf %{buildroot} +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : -%files -%defattr(-, root, root, 0755) -%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README -%doc docs/*.pdf etc/freshclam.conf -%doc %{_mandir}/man1/sigtool.1* -%doc %{_mandir}/man1/clamscan.1* -%doc %{_mandir}/man1/freshclam.1* -%doc %{_mandir}/man1/clamsubmit.1* -%doc %{_mandir}/man5/freshclam.conf.5* -%config(noreplace) %{_sysconfdir}/freshclam.conf -%{_bindir}/clamscan -%{_bindir}/freshclam -%{_bindir}/sigtool -%{_bindir}/clambc -%{_bindir}/clamsubmit -%{_libdir}/libclamav.so.* - -%files -n clamd -%defattr(-, root, root, 0755) -%doc etc/clamd.conf -%doc %{_mandir}/man1/clamdscan.1* -%doc %{_mandir}/man1/clamconf.1* -%doc %{_mandir}/man1/clamdtop.1* -%doc %{_mandir}/man1/clambc.1* -%doc %{_mandir}/man5/clamd.conf.5* -%doc %{_mandir}/man8/clamd.8* -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd-wrapper -%config(noreplace) %{_sysconfdir}/clamd.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/clamav -%{_sysconfdir}/clamd.d -%config %{_initrddir}/clamd -%{_sbindir}/clamd -%{_bindir}/clamconf -%{_bindir}/clamdscan -%{_bindir}/clamdtop - -%defattr(0644, clam, clam, 0755) -%{_localstatedir}/run/clamav/ -%dir %{_localstatedir}/lib/clamav/ -%dir %{_localstatedir}/log/clamav/ -%ghost %{_localstatedir}/log/clamav/clamd.log -%exclude %{_localstatedir}/lib/clamav/* - -%if %{!?_without_milter:1}0 -%files milter -%defattr(-, root, root, 0755) -%doc %{_mandir}/man5/clamav-milter.conf.5* -%doc %{_mandir}/man8/clamav-milter.8* -%config(noreplace) %{_sysconfdir}/sysconfig/clamav-milter -%config %{_initrddir}/clamav-milter -%{_sbindir}/clamav-milter -%config(noreplace) %{_sysconfdir}/clamav-milter.conf -%endif -%files db -%defattr(-, root, root, 0755) -%config(noreplace) %{_sysconfdir}/cron.daily/freshclam -%config(noreplace) %{_sysconfdir}/logrotate.d/freshclam +%systemd_install milter-systemd clamav-milter.service -%defattr(0644, clam, clam, 0755) -%config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ -%dir %{_localstatedir}/log/clamav/ -%ghost %{_localstatedir}/log/clamav/freshclam.log -%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/*.cld -%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/mirrors.dat +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig -%files devel -%defattr(-, root, root, 0755) -%{_bindir}/clamav-config -%{_includedir}/clamav.h -%{_libdir}/libclamav.so -%{_libdir}/pkgconfig/libclamav.pc -#%{_libdir}/libclamav.a -%exclude %{_libdir}/libclamav.la -%changelog -* Sun Nov 26 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-3 -- Backported upstream patch to unbreak e2guardian vs. temp files +%files +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE +%doc docs/*.pdf +%_bindir/* +%_mandir/man[15]/* +%exclude %_bindir/clamav-config +%exclude %_bindir/freshclam +%exclude %_mandir/*/freshclam* -* Tue Mar 28 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-2 -- Ensure that missing or invalid timezone configuration does not - mangle /etc/freshclam.conf in %%post (#1154756) +## ----------------------- -* Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 -- Update to 0.99.2 -- Enable llvm -- Drop cliopts patch fixed upstream, use upstream's "--forground" option name -- Fix main.cvd (fedora #1325482, epel #1325717) -- Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd -- Update daily.cvd -- Fixup Requires(pre) usage (#1319151) +%files lib +%_libdir/*.so.* -* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 -- Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) +## ----------------------- -* Mon Dec 07 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-3 -- Added missing build-time requirement to pcre-devel +%files devel +%_includedir/* +%_libdir/*.so +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config -* Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 -- Require openssl-devel for clamav-devel +## ----------------------- -* Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 -- Upgrade to 0.99 and updated daily.cvd (#1287327) +%files filesystem +%attr(-,%updateuser,%updateuser) %dir %homedir +%attr(-,root,root) %dir %pkgdatadir +%dir %_sysconfdir/clamd.d -* Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 -- Upgrade to 0.98.7 and updated daily.cvd (#1217014) +## ----------------------- -* Tue Feb 24 2015 Joel Smith <joelsmith(a)fedoraproject.org> - 0.98.6-2 -- Make init script source /etc/sysconfig/clamd if present (#1195864) +%files data +%defattr(-,%updateuser,%updateuser,-) +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. +%config %verify(not size md5 mtime) %homedir/*.cvd -* Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 -- Upgrade to 0.98.6 and updated daily.cvd (#1187050) -* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 -- Upgrade to 0.98.5 and updated daily.cvd (#1138101) +%files data-empty +%defattr(-,%updateuser,%updateuser,-) +%ghost %attr(0664,%updateuser,%updateuser) %homedir/*.cvd -* Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 -- Upgrade to 0.98.4 and updated daily.cvd (#1111811) -- Add build requirement to libxml2 for DMG, OpenIOC and XAR -* Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 -- Upgrade to 0.98.3 -- Fix --with-libcurl parameter to avoid automatic path detection breakage -- openssl-devel is now required for hashing code. -- Added clamsubmit to main package -- Re-enabled --with-llvm as this speeds up deployment a lot. -- Fixed older changelog dates +## ----------------------- -* Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 -- Upgrade to 0.98.1 and updated daily.cvd (#1053400) +%files update +%_bindir/freshclam +%_mandir/*/freshclam* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/clamav-update +%config(noreplace) %_sysconfdir/sysconfig/freshclam -* Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 -- Really fix all discrepancies between clamd initscript and clamd - config file (#960923, thanks to John Horne) -- Ensure that a clamd and clamav-milter condrestart via initscript - works (#1018312, thanks to Filippo Carletti) +%ghost %attr(0664,root,%updateuser) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%updateuser,%updateuser) %homedir/*.cld +%ghost %attr(0664,%updateuser,%updateuser) %homedir/mirrors.dat -* Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 -- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) -- Fixed discrepancies between clamd initscript and clamd config - file (#960923, thanks to John Horne) -- Added build requirement to ncurses-devel for clamdtop (again) -- Moved clamd wrapper script and documentation into correct sub- - package (#782596, thanks to Philip Prindeville) - -* Tue Apr 23 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.8-1 -- Upgrade to 0.97.8 -- Updated daily.cvd - -* Mon Mar 18 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.7-1 -- Upgrade to 0.97.7 - -* Tue Sep 18 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.6-1 -- Upgrade to 0.97.6 - -* Wed Jun 20 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.5-1 -- Upgrade to 0.97.5 -- Fix CVE-2012-1419 clamav: specially-crafted POSIX tar files evade detection -- Fix CVE-2012-1457 clamav: overly long length field in tar files evade detection -- Fix CVE-2012-1443 clamav: specially-crafted RAR files evade detection -- Fix CVE-2012-1458 clamav: specially-crafted CHM files evade detection -- Fix CVE-2012-1459 clamav: specially-crafted length field in tar files evade detection -- Ship local copy of virus database; it was removed by accident from 0.97.5 tarball - -* Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 -- Split files out into SCM instead of in the spec - -* Sun Jan 1 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-3 -- Revert patch from 0.97.3-2 - -* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 -- Update to 0.97.3 -- Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 - -* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-5 -- Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. - (bz#727894) - -* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-3 -- include updated clamd-wrapper which get the PidFile setting from the - service configuration file. -- updated to 0.97.2 -- Build-require xz -- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) -* Wed Jun 29 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97-14 -- Require /usr/sbin/sendmail instead of sendmail +## ----------------------- -* Tue Apr 26 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-13 -- Obsolete and provide clamav-milter-sysvinit (bz#696856) +%files server +%doc _doc_server/* +%_mandir/man5/clamd.conf.5* +%_mandir/man8/clamd.8* +%_sbindir/clamd -* Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 -- Move deletion of /var/lib/clamav/mirrors.dat to db package. -- Don't enable NotifyClamd in freshclam config and cronjob, as not - everybody is running clamd. Running clamd's will anyway notice - when db is updated. +%if %{with sysv} +%files server-sysvinit +%_initrddir/clamd-wrapper +%pkgdatadir/clamd-wrapper +%endif + +%if %{with systemd} +%files server-systemd + %_unitdir/clamd@.service +%endif -* Fri Mar 18 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-11 -- Delete /var/lib/clamav/mirrors.dat, it will be recreated on first run. -- clamav-milter config cleanups. +## ----------------------- -* Wed Mar 16 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-10 -- Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. -- Don't start clamd or milter service by default. +%files scanner +%config(noreplace) %_sysconfdir/clamd.d/scan.conf +%ghost %scanstatedir/clamd.sock -* Tue Mar 15 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-7 -- rpm-provide all old package names that are now obsoleted +%if %{with tmpfiles} + %_tmpfilesdir/clamd.scan.conf + %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%else + %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%endif -* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-6 -- clam-db obsoletes old clamav-data-empty. +%if %{with sysv} +%files scanner-sysvinit + %attr(0755,root,root) %config %_initrddir/clamd.scan + %ghost %scanstatedir/clamd.pid +%endif -* Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 -- Add back clamd-wrapper to stay compatible with users - of old packaging (amavisd-new). +%if %{with upstart} +%files scanner-upstart + %config(noreplace) %_sysconfdir/init/clamd.scan* +%endif -* Wed Feb 23 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.097-3 -- Move db to /var/lib/clamav -- Ship empty directory /etc/clamd.d for amavisd-new +%if %{with systemd} +%files scanner-systemd + %_unitdir/clamd(a)scan.service +%endif -* Thu Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 -- Disable llvm. +## ----------------------- -* Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 -- Update to 0.97 -- Fix up for current guidelines. +%files milter +%doc clamav-milter/README.fedora +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%dir %_sysconfdir/mail +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%ghost %milterstatedir/clamav-milter.socket + +%if %{with tmpfiles} + %_tmpfilesdir/clamav-milter.conf + %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%else + %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%endif -* Fri Nov 23 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-3 -- Change username to get upgrades from fedora versions working. +%if %{with sysv} +%files milter-sysvinit + %config %_initrddir/clamav-milter + %ghost %milterstatedir/clamav-milter.pid +%endif -* Thu Nov 22 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-2 -- Initial changes for EPEL version. +%if %{with upstart} +%files milter-upstart + %config(noreplace) %_sysconfdir/init/clamav-milter* +%endif -* Tue Aug 21 2007 Dag Wieers <dag(a)wieers.com> - 0.91.2-1 -- Updated to release 0.91.2. +%if %{with systemd} +%files milter-systemd + %_unitdir/clamav-milter.service +%endif -* Tue Jul 17 2007 Dag Wieers <dag(a)wieers.com> - 0.91.1-1 -- Updated to release 0.91.1. -* Wed Jul 11 2007 Dag Wieers <dag(a)wieers.com> - 0.91-1 -- Updated to release 0.91. +%changelog +* Fri Jan 26 2018 Orion Poplawski <orion(a)nwra.com> - 0.99.3-1 +- Update to 0.99.3 +- Security fixes CVE-2017-12374 CVE-2017-12375 CVE-2017-12376 CVE-2017-12377 + CVE-2017-12378 CVE-2017-12379 CVE-2017-12380 (bug #1539030) +- Drop clamav-notify-servers and it's dependency on ncat (bug #1530678) + +* Wed Jan 17 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-18 +- Fix type of clamd@ service +- Fix packages name of Obsoletes directives +- Also fix type of clamav-milter.service + +* Thu Jan 11 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-17 +- Security fixes CVE-2017-6420 (#1483910), CVE-2017-6418 (#1483908) + +* Tue Jan 09 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-16 +- Make sure that Obsoletes sysv and upstart for Epel upgrade and update + +* Mon Jan 08 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-15 +- Fix rundir path (#1126595) +- Update main.cvd, daily.cvd and bytecode.cvd +- Fixes for rhbz 1464269 and rhbz 1126625 +- Move Sources and BuildRequires to the beginning +- Build systemd for F22+ and el7+ +- Build sysv and upstart for el6 else build only sysv +- Only enable tmpfiles with systemd enabled +- Move descritions to near the package macro and remove his build + conditionals, this also fix the generation of src.rpm +- Remove hack from 2010 (git show e1a9be60) +- Use autoreconf without --force + +* Thu Jan 04 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-14 +- Use 4 spaces instead tabs +- Fix rhbz #1530678 +- Fix rhbz #1518016 +- Simplify conditional builds reference: /usr/lib/rpm/macros +- use make_build and make install macros + +* Sun Nov 26 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-13 +- Backported upstream patch to unbreak e2guardian vs. temp files -* Thu May 31 2007 Dag Wieers <dag(a)wieers.com> - 0.90.3-1 -- Updated to release 0.90.3. +* Fri Sep 15 2017 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-12 +- Try fix rhbz #1473642 -* Fri Apr 27 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-2 -- Added clamav-milter support for EL2.1 now that it comes with a newer sendmail. (Tom G. Christensen) +* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild -* Sun Apr 15 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-1 -- Updated to release 0.90.2. +* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild -* Fri Mar 09 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-4 -- Removed circular dependency. +* Mon Jul 17 2017 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-9 +- Add patch for openssl-1.1 -* Thu Mar 08 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-3 -- Cleaned up default options to clamav-milter. (Adam T. Bowen) -- Removed -b/--bounce as it is no longer recognized. (Gerald Teschl) +* Mon Mar 27 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-8 +- Create virusgroup group and add the various clam* users to it -* Mon Mar 05 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-2 -- Removed the erroneous --dont-clean-log from the clamav-milter sysconfig. (Gerald Teschl) +* Sun Mar 26 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-7 +- Fix clamav-milter startup under selinux (bug #1434176) +- Move /etc/clam.d to clamav-filesystem (bug #1275630) +- Make clamav-milter own /etc/mail (bug #1175473) -* Fri Mar 02 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-1 -- Updated to release 0.90.1. +* Sun Mar 26 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-6 +- Start clamav-milter after clamd@scan (bug #1356507)) -* Tue Feb 20 2007 Dag Wieers <dag(a)wieers.com> - 0.90-3 -- Do the right thing... +* Sun Mar 26 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-5 +- Allow freshclam to run automatically on install (bug #1408649) -* Mon Feb 19 2007 Dag Wieers <dag(a)wieers.com> - 0.90-2 -- The tarball was re-rolled before public release. Sigh. +* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -* Tue Feb 13 2007 Dag Wieers <dag(a)wieers.com> - 0.90-1 -- Updated to release 0.90. +* Mon Nov 07 2016 Richard W.M. Jones <rjones(a)redhat.com> - 0.99.2-3 +- Rebuild for OCaml 4.04.0. -* Tue Dec 12 2006 Dag Wieers <dag(a)wieers.com> - 0.88.7-1 -- Updated to release 0.88.7. +* Tue Oct 18 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-2 +- Also send logrotate script stdout to /dev/null (bug #1376815) -* Sun Nov 05 2006 Dag Wieers <dag(a)wieers.com> - 0.88.6-1 -- Updated to release 0.88.6. -- Added condrestart to sysv scripts. (Tsai Li Ming) +* Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 +- Update to 0.99.2 +- Drop cliopts patch fixed upstream, use upstream's "--forground" option name +- Fix main.cvd (fedora #1325482, epel #1325717) +- Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd +- Update daily.cvd +- Fixup Requires(pre) usage (#1319151) -* Sat Oct 28 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-2 -- Added missing clamav dependency to clamav-db. +* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 +- Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) +- Complain about antivirus_use_jit rather clamd_use_jit (#1295473) -* Sun Oct 15 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-1 -- Updated to release 0.88.5. +* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99-4 +- Link using %%{?__global_ldflags} for hardened builds (#1321173) +- Build using -std=gnu++98 (#1307378, thanks to Yaakov Selkowitz) -* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.4-1 -- Updated to release 0.88.4. +* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-2 -- Incorporated UPX heap overflow fix. +* Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 +- Require openssl-devel for clamav-devel +- Change clamav-milter unit for upstream changes (#1287795) -* Sat Jul 01 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-1 -- Updated to release 0.88.3. +* Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 +- Upgrade to 0.99 and updated daily.cvd (#1287327) -* Sun Apr 30 2006 Dag Wieers <dag(a)wieers.com> - 0.88.2-1 -- Updated to release 0.88.2. +* Tue Jun 30 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-3 +- Move /etc/tmpfiles.d/ to /usr/lib/tmpfiles.d/ (#1126595) -* Tue Apr 04 2006 Dag Wieers <dag(a)wieers.com> - 0.88.1-1 -- Updated to release 0.88.1. +* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -* Mon Jan 09 2006 Dag Wieers <dag(a)wieers.com> - 0.88-1 -- Updated to release 0.88. +* Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 +- Upgrade to 0.98.7 and updated daily.cvd (#1217014) -* Sun Nov 13 2005 Dries Verachtert <dries(a)ulyssis.org> - 0.87.1-1 -- Updated to release 0.87.1. +* Tue Mar 10 2015 Adam Jackson <ajax(a)redhat.com> 0.98.6-2 +- Drop sysvinit subpackages in F23+ -* Sat Sep 17 2005 Dag Wieers <dag(a)wieers.com> - 0.87-1 -- Updated to release 0.87. +* Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 +- Upgrade to 0.98.6 and updated daily.cvd (#1187050) -* Mon Jul 25 2005 Dag Wieers <dag(a)wieers.com> - 0.86.2-1 -- Updated to release 0.86.2. +* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-2 +- Corrected summary of clamav-server-systemd package (#1165672) -* Mon Jul 11 2005 Dag Wieers <dag(a)wieers.com> - 0.86.1-1 -- Updated to release 0.86.1. +* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 +- Upgrade to 0.98.5 and updated daily.cvd (#1138101) -* Mon May 16 2005 Dag Wieers <dag(a)wieers.com> - 0.85.1-1 -- Updated to release 0.85.1. +* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild -* Fri Apr 29 2005 Dag Wieers <dag(a)wieers.com> - 0.84-1 -- Updated to release 0.84. +* Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 +- Upgrade to 0.98.4 and updated daily.cvd (#1111811) +- Add build requirement to libxml2 for DMG, OpenIOC and XAR -* Mon Feb 14 2005 Dag Wieers <dag(a)wieers.com> - 0.83-1 -- Updated to release 0.83. +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Thu Feb 10 2005 Dag Wieers <dag(a)wieers.com> - 0.82-2 -- Fix for false positive on RIFF files. (Roger Jochem) +* Sat May 10 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.3-1 +- Upgrade to 0.98.3 and updated daily.cvd (#1095614) +- Avoid automatic path detection breakage regarding curl +- Added build requirement to openssl-devel for hasing code +- Added clamsubmit to main package -* Mon Feb 07 2005 Dag Wieers <dag(a)wieers.com> - 0.82-1 -- Updated to release 0.82. +* Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 +- Upgrade to 0.98.1 and updated daily.cvd (#1053400) -* Thu Jan 27 2005 Dag Wieers <dag(a)wieers.com> - 0.81-1 -- Improved logrotate scripts. (Filippo Grassilli) -- Updated to release 0.81. +* Wed Oct 09 2013 Dan Horák <dan[at]danny.cz> - 0.98-2 +- Use fanotify from glibc instead of the limited hand-crafted version -* Wed Dec 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-2 -- Added %%dir /var/clamav/log. (Adam Bowns) -- Changed logrotate script to use clamd.log. (Stuart Schneider) -- Added curl dependency. (Petr Kristof) -- Synchronized some options from Petr. (Petr Kristof) -- Fixed another clamav.conf reference. (Michael Best) +* Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 +- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) -* Mon Nov 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-1 -- Updated package description. (Arvin Troels) -- Incorporated fixes from Jima. (Jima) -- Config clamav.conf renamed to clamd.conf. -- Removed obsolete patch. -- Added macros for building without milter. -- Updated to release 0.80. +* Wed Aug 07 2013 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 0.97.8-4 +- Add a missing requirement on crontabs to spec file +- Fix RHBZ#988605 -* Fri Jul 30 2004 Dag Wieers <dag(a)wieers.com> - 0.75.1-1 -- Added obsoletes for fedora.us. -- Updated to release 0.75.1. +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.97.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Mon Jul 26 2004 Dag Wieers <dag(a)wieers.com> - 0.75-2 -- Fixed a problem where $CODE was empty. +* Thu May 2 2013 Nick Bebout <nb(a)fedoraproject.org> - 0.97.8-1 +- Update to 0.97.8 -* Fri Jul 23 2004 Dag Wieers <dag(a)wieers.com> - 0.75-1 -- Updated to release 0.75. +* Wed Apr 10 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.97.7-2 +- Migrate from fedora-usermgmt to guideline scriptlets. -* Wed Jun 30 2004 Dag Wieers <dag(a)wieers.com> - 0.74-1 -- Updated to release 0.74. +* Sat Mar 23 2013 Nick Bebout <nb(a)fedoraproject.org> - 0.97.7-1 +- Update to 0.97.7 -* Tue Jun 15 2004 Dag Wieers <dag(a)wieers.com> - 0.73-1 -- Updated to release 0.73. +* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.97.6-1901 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Thu Jun 03 2004 Dag Wieers <dag(a)wieers.com> - 0.72-1 -- Updated to release 0.72. +* Sat Sep 22 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.6-1900 +- updated to 0.97.6 +- use %%systemd macros -* Thu May 20 2004 Dag Wieers <dag(a)wieers.com> - 0.71-1 -- Updated to release 0.71. +* Tue Aug 14 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.5-1900 +- disabled upstart support -* Sun May 02 2004 Dag Wieers <dag(a)wieers.com> - 0.70-2 -- Fixed the installation check for conf files. (Richard Soderberg, Udo Ruecker) -- Changed the init-order of the sysv scripts. (Will McCutcheon) -- Changes to the default configuration files. +* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.97.5-1801 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Wed Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 -- Updated to release 0.70. +* Sat Jun 16 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.5-1800 +- updated to 0.97.5 +- 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 +- ship local copy of virus database; it was removed by accident from + 0.97.5 tarball +- removed sysv compat stuff -* Tue Mar 16 2004 Dag Wieers <dag(a)wieers.com> - 0.68-1 -- Updated to release 0.68. +* Fri Apr 13 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.4-1801 +- build with -fPIE -* Fri Mar 12 2004 Dag Wieers <dag(a)wieers.com> - 0.67.1-1 -- Updated to release 0.67-1. -- Added clamdwatch and trashcan to clamd. +* Fri Mar 16 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.4-1800 +- updated to 0.97.4 -* Mon Mar 08 2004 Dag Wieers <dag(a)wieers.com> - 0.67-1 -- Personalized SPEC file. +* Sun Feb 5 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.3-1703 +- fixed SELinux restorecon invocation +- added trigger to fix SELinux contexts of logfiles created by old + packages +- fixed build with recent gcc/glibc toolchain -* Fri Aug 22 2003 Matthias Saou/Che -- Added "--without milter" build option. (Matthias Saou) -- Fixed freshclam cron (Matthias Saou) -- Built the new package. (Che) +* Sat Jan 21 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.3-1703 +- rewrote clamav-notify-servers to be init system neutral +- set PrivateTmp systemd option (#782488) -* Tue Jun 24 2003 Che -- clamav-milter introduced. -- a few more smaller fixes. +* Sun Jan 8 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.3-1702 +- set correct SELinux context for logfiles generated in %%post (#754555) +- create systemd tmpfiles in %%post +- created -server-systemd subpackage providing a clamd@.service template +- made script in -scanner-systemd an instance of clamd@.service -* Sun Jun 22 2003 Che -- version upgrade +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 +- updated to 0.97.3 +- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 -* Mon Jun 16 2003 Che -- rh9 build -- various fixes -- got rid of rpm-helper prereq +* Thu Aug 4 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1700 +- moved sysv wrapper script into -sysv subpackage +- start systemd services after network.target and nss-lookup.target -* Mon Mar 24 2003 Che -- some cleanups and fixes -- new patch added +* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 +- updated to 0.97.2 +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) +- fixed systemd scripts and their installation + +* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 +- updated to 0.97.1 +- fixed Requires(preun) vs. Requires(postun) inconsistency -* Fri Nov 22 2002 Che -- fixed a config patch issue +* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 +- fixed tmpfiles.d syntax (#696812) -* Fri Nov 22 2002 Che -- version upgrade and some fixes +* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 +- updated to 0.97 +- rediffed some patches -* Sat Nov 02 2002 Che -- version upgrade +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 +- fixed signal specifier in clamd-wrapper (#668131, James Ralston) -* Thu Oct 24 2002 Che -- some important changes for lsb compliance +* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 +- added systemd init scripts which obsolete to old sysvinit ones +- added tmpfiles.d/ descriptions -* Wed Oct 23 2002 Che -- initial rpm release +* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 +- updated to 0.96.5 +- CVE-2010-4260 Multiple errors within the processing of PDF files can + be exploited to e.g. cause a crash. +- CVE-2010-4261 An off-by-one error within the "icon_cb()" function + can be exploited to cause a memory corruption. + +* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 +- updated to 0.96.4 +- execute 'make check' (#640347) but ignore errors for now because + four checks are failing on f13 + +* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 +- lowered stop priority of sysv initscripts (#629435) + +* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 +- updated to 0.96.3 +- fixes CVE-2010-0405 in shipped bzlib.c copy + +* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 +- updated to 0.96.2 +- rediffed patches +- removed the -jit-disable patch which is replaced upstream by a more + detailed configuration option. + +* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed old %%trigger which renamed the 'clamav' user- and groupnames + to 'clamupdate' +- use 'groupmems', not 'usermod' to add a user to a group because + 'usermod' does not work when user does not exist in local /etc/passwd + +* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 +- ocaml not available (at least) on s390(x) + +* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 +- updated to 0.96.1 +- rediffed patches + +* Sat May 29 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 +- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) + +* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 +- updated to final 0.96 +- applied upstream patch which allows to disable JIT compiler (#573191) +- build JIT compiler again +- disabled JIT compiler by default +- removed explicit 'pkgconfig' requirements in -devel (#533956) + +* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 +- do not build the bytecode JIT compiler for now until it can be disabled + at runtime (#573191) + +* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 +- updated to 0.96rc1 +- added some BRs + +* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 +- updated -upstart to upstart 0.6.3 + +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) +- use %%apply instead of %%patch + +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 +- updated to 0.95.3 + +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches + +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam diff --git a/clamd-README b/clamd-README new file mode 100644 index 0000000..fa6eea5 --- /dev/null +++ b/clamd-README @@ -0,0 +1,59 @@ +To create individual clamd-instance take the following files and +modify/copy them in the suggested way: + +clamd.conf: + * set LocalSocket (or better: TCPSocket) and User to suitable values; + avoid PidFile unless it is required by system monitoring or something + else. Logging through syslog is usually better than an individual + Logfile. + * place this file into /etc/clamd.d with an unique service-name; + e.g. as /etc/clamd.d/<SERVICE>.conf + + When using TCPSocket, create iptables rules which are limiting the + access by source and/or by using '-m owner'. + + When LogFile feature is wanted, it must be writable for the assigned + User. Recommended way to reach this, is to: + * make it owned by the User's *group* + * assign at least 0620 (u+rw,g+w) permissions + + A suitable command might be + | # touch <logfile> + | # chgrp <user> <logfile> + | # chmod 0620 <logfile> + | # restorecon <logfile> + + NEVER use 'clamav' as the user since he can modify the database. + This is the user who is running the application; e.g. for mimedefang + (http://www.roaringpenguin.com/mimedefang) the user might be + 'defang'.Theoretically, distinct users could be used, but it must be + made sure that the application-user can write into the socket-file, + and that the clamd-user can access the files asked by the + application to be checked. + +clamd.logrotate: (only when LogFile feature is used) + * set the correct value for the logfile + * place it into /etc/logrotate.d + +clamd@<SERVICE>.service: (systemd instance) + * instance of clamd@.service + +Additionally, when using LocalSocket instead of TCPSocket, the directory +for the socket file must be created. For tmpfiles based systems, you +might want to create a file /usr/lib/tmpfiles.d/clamd.<SERVICE>.conf +with a content of + + | d /var/run/clamd.<SERVICE> <MODE> <USER> <GROUP> + +Adjust <MODE> (0710 should suffice for most cases) and <USER> + <GROUP> +so that the socket can be accessed by clamd and by the applications +using clamd. Make sure that the socket is not world accessible; else, +DOS attacks or worse are trivial. + + +[Disclaimer: + this file and the script/configfiles are not part of the official + clamav package. + + Please send complaints and comments to + mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamd-gen b/clamd-gen new file mode 100755 index 0000000..ac5dae2 --- /dev/null +++ b/clamd-gen @@ -0,0 +1,269 @@ +#! /bin/bash + +# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +function showHelp() +{ + echo \ +$"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> + --license=<LICENSE> --username=>USERNAME> +" + exit 0 +} + +function rpm.generatePreamble() +{ + cat <<EOF +%{!?release_func:%define release_func() %1%{?dist}} +# The name of the minit service +%define minitsvcdir %minitdir/services/%name +# The configuration file for the SysV initservice +%define conffile %_sysconfdir/clamd.d/%service.conf +# The directory, where the milter socket will be placed into; this +# socket will be named clamd.sock +%define rundir /var/run/clamd.%service +# The name of the logfile +%define logfile /var/log/clamd.%service +# The user under whose id, the clamd shall be running. This user must +# be able to read the files from the base-service and is usually +# created there. +%define username $USERNAME +# The packagename of the service +%define service $SERVICE +# The service name as used by the system's initscripts; usually this +# is %service +%define baseservice %service + +%define __chkconfig /sbin/chkconfig +%define minitdir %_sysconfdir/minit + + +EOF +} + +function rpm.generateHeader() +{ + cat <<EOF +Summary: Clamav server for '%service' +Name: clamd.%service +Version: $VERSION +Release: %release_func $RELEASE +Epoch: 0 +License: $LICENSE +Group: System Environment/Daemons +BuildRoot: %_tmppath/%name-%version-%release-root +BuildArch: noarch +Requires: init(%name) +Requires(pre): %service +Requires: clamav-server +BuildRequires: clamav-devel + +%package sysv +Summary: SysV initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = sysv +Conflicts: init(%name) < sysv +Conflicts: init(%name) > sysv +Requires: clamav-server-sysv +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp %__chkconfig +Requires(preun): %__chkconfig +Requires(pre): %_initrddir +Requires(postun): %_initrddir + +%package minit +Summary: minit initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = minit +Conflicts: init(%name) < minit +Conflicts: init(%name) > minit +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp +Requires(pre): minit-setup +Requires(postun): minit-setup +Requires(triggers): minit-tools + + +%description +Basic setup for a clamav server for '%service'. + + +%description sysv +Basic setup for a clamav server for '%service'. + +This package contains initscripts for SysV based systems. + + +%description minit +Basic setup for a clamav server for '%service'. + +This package contains initscripts for minit based systems. + +EOF +} + + +function rpm.genBody() +{ + cat <<"XEOFX" +%prep +%build + +%install +rm -rf $RPM_BUILD_ROOT +%__install -d -m755 $RPM_BUILD_ROOT{%minitsvcdir,%_sbindir,%rundir,/var/log} + +d=/usr/share/clamav/template + +function subst +{ + src=$d/$1 + dst=$RPM_BUILD_ROOT$2 + + %__install -d -m755 $(dirname "$dst") + sed -e 's!^$#?LogFile $.*!\1%logfile!g; + s!^#?$LocalSocket $.*!\1%rundir/clamd.sock!g; + s!^#?$PidFile $.*!\1%rundir/clamd.pid!g; + s!<SERVICE>!%service!g; + s!<USER>!%username!g;' "$src" >"$dst" + chmod --reference "$src" "$dst" +} + +subst clamd.conf %conffile +subst clamd.logrotate %_sysconfdir/logrotate.d/clamd.%service + +%if 0%{!?_without_sysv:1} +subst clamd.sysconfig %_sysconfdir/sysconfig/clamd.%service +subst clamd.init %_initrddir/clamd.%service +%endif + +ln -s clamd $RPM_BUILD_ROOT%_sbindir/clamd.%service + +touch $RPM_BUILD_ROOT%logfile +touch $RPM_BUILD_ROOT%rundir/clamd.sock + +%if 0%{!?_without_minit:1} +ln -s %_sbindir/clamd.%service $RPM_BUILD_ROOT%minitsvcdir/run +touch $RPM_BUILD_ROOT%minitsvcdir/respawn +cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params +-c +%conffile +EOF +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + + +%triggerin minit -- %baseservice +minit-svc add services/clamd.%service services/%baseservice/ + +%triggerun minit -- %baseservice +test "$1" != 0 -a "$2" != 0 || \ + minit-svc del services/clamd.%service services/%baseservice/ + + +%post minit +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^#Foreground!Foreground!' "%conffile" >"$d" +grep -q '^Foreground' $d || echo 'Foreground' >>$d +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%post sysv +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^Foreground!#Foreground!' "%conffile" >"$d" +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%__chkconfig --add %name + + +%preun sysv +test "$1" != 0 || %__chkconfig --del %name + +XEOFX +} + + +function rpm.genFiles +{ + cat <<"EOF" +%files +%defattr(-,root,root,-) +%doc +%config(noreplace) %verify(not size md5 mtime) %attr(0620,root,%username) %logfile +%config(noreplace) %verify(not mtime) %conffile +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/clamd.%service +%_sbindir/clamd.%service +%dir %attr(0700,%username,root) %rundir +%ghost %rundir/clamd.sock + + +%if 0%{!?_without_sysv:1} +%files sysv +%defattr(-,root,root,-) +%config %verify(not mtime) %_initrddir/clamd.%service +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamd.%service +%endif + + +%if 0%{!?_without_minit:1} +%files minit +%defattr(-,root,root,-) +%dir %minitsvcdir +%config(noreplace) %verify(not mtime) %minitsvcdir/params +%config %minitsvcdir/run + %minitsvcdir/respawn +%endif +EOF +} + + +SERVICE= +VERSION= +RELEASE= +LICENSE= +USERNAME= +tmp=$(getopt -o '' --long service:,version:,release:,license:,username:,help -n "$0" -- "$@") || exit 1 +eval set -- "$tmp" + +while true; do + case "$1" in + (--help) showHelp $0;; + (--service) SERVICE=$2; shift;; + (--version) VERSION=$2; shift;; + (--release) RELEASE=$2; shift;; + (--license) LICENSE=$2; shift;; + (--username) USERNAME=$2; shift;; + (--) shift; break;; + esac + shift +done + +for i in SERVICE VERSION RELEASE LICENSE USERNAME; do + eval tmp=\$${i} + test "$tmp" || { + echo $"No value for $i specified; assuming @${i}@" >&2; + eval $i=@${i}@; + } +done + + +rpm.generatePreamble +rpm.generateHeader +rpm.genBody +rpm.genFiles diff --git a/clamd-wrapper b/clamd-wrapper new file mode 100644 index 0000000..0a30628 --- /dev/null +++ b/clamd-wrapper @@ -0,0 +1,90 @@ +#!/bin/bash +# +# Xchkconfig: - 75 35 +# Xdescription: The clamd daemon listens for incoming connections on \ +# Unix or TCP socket and scans files or directories on demand. + +test "$CLAMD_SERVICE" || { + echo $"*** $0 can not be called in this way" + echo $"*** Please see /usr/share/doc/clamav-server-*/README how" + echo $"*** the clamav-server can be configured" + exit 6 +} + +# Source function library. +. /etc/init.d/functions + +# Get config. +test -r /etc/sysconfig/network && . /etc/sysconfig/network + +# Check that networking is up. +test "$NETWORKING" != "no" || exit 6 + +lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} +sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} +procname=clamd.${CLAMD_SERVICE} + +CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf +CLAMD_OPTIONS= +CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid +## backward-compatibility check... +for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ + /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do + CLAMD_SOCKET=$i + test ! -e "$i" || break +done +test -f "$sysconffile" && . "$sysconffile" + + +RETVAL=0 +prog="clamd.${CLAMD_SERVICE}" + +start () { + echo -n $"Starting $prog: " + daemon --pidfile=${CLAMD_PIDFILE} \ + exec -a $procname /usr/sbin/clamd \ + ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch $lockfile + return $RETVAL +} + +stop () { + echo -n $"Stopping $prog: " + killproc -p ${CLAMD_PIDFILE} $procname + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $lockfile + return $RETVAL +} + +reload() { + rc=0 + echo -n $"Reloading $prog: " + killproc -p ${CLAMD_PIDFILE} $procname -HUP || rc=$? + echo + echo -n $"Loading new virus-database: " + killproc -p ${CLAMD_PIDFILE} $procname -USR2 || rc=$? + echo + return $rc +} + +restart () { + stop + start +} + +# See how we were called. +case "$1" in + start|stop|restart|reload) + $1 ;; + status) + status -p ${CLAMD_PIDFILE} $procname ;; + condrestart) + test ! -f $lockfile || restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" + exit 2 +esac diff --git a/clamd.SERVICE.init b/clamd.SERVICE.init new file mode 100644 index 0000000..f2f9191 --- /dev/null +++ b/clamd.SERVICE.init @@ -0,0 +1,7 @@ +#!/bin/bash +# +# chkconfig: - 75 35 +# description: The clamd server running for <SERVICE> + +CLAMD_SERVICE=<SERVICE> +. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate index b233f3a..315f352 100644 --- a/clamd.logrotate +++ b/clamd.logrotate @@ -1,8 +1,9 @@ -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript +/var/log/clamd.<SERVICE> { + monthly + notifempty + missingok + + postrotate + killall -HUP clamd.<SERVICE> >/dev/null 2>&1 || : + endscript } diff --git a/clamd.scan.upstart b/clamd.scan.upstart new file mode 100644 index 0000000..54482e6 --- /dev/null +++ b/clamd.scan.upstart @@ -0,0 +1,14 @@ +### !!! Uncomment only *one* of the 'start on' statements !!! + +### Uncomment this line when you want clamd.scan to be a scanner for a +### locally running clamav-milter +#start on starting clamav-milter + +### Uncomment this line when you want clamd.scan to be a generic +### scanner service +#start on runlevel [345] and starting local + +stop on runlevel [!345] + +respawn +exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --foreground=yes diff --git a/clamd.sysconfig b/clamd.sysconfig new file mode 100644 index 0000000..4933e7e --- /dev/null +++ b/clamd.sysconfig @@ -0,0 +1,3 @@ +#CLAMD_CONFIGFILE=/etc/clamd.d/<SERVICE>.conf +#CLAMD_SOCKET=/var/run/clamd.<SERVICE>/clamd.sock +#CLAMD_OPTIONS= diff --git a/clamd@.service b/clamd@.service new file mode 100644 index 0000000..4e3556f --- /dev/null +++ b/clamd@.service @@ -0,0 +1,8 @@ +[Unit] +Description = clamd scanner (%i) daemon +After = syslog.target nss-lookup.target network.target + +[Service] +Type = forking +ExecStart = /usr/sbin/clamd -c /etc/clamd.d/%i.conf +Restart = on-failure diff --git a/clamd(a)scan.service b/clamd(a)scan.service new file mode 100644 index 0000000..c329612 --- /dev/null +++ b/clamd(a)scan.service @@ -0,0 +1,7 @@ +.include /lib/systemd/system/clamd@.service + +[Unit] +Description = Generic clamav scanner daemon + +[Install] +WantedBy = multi-user.target diff --git a/freshclam-sleep b/freshclam-sleep new file mode 100755 index 0000000..fddb922 --- /dev/null +++ b/freshclam-sleep @@ -0,0 +1,52 @@ +#! /bin/bash +# Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +FRESHCLAM_MOD=$[ 3*60 ] # 3 hours + +f=/etc/sysconfig/freshclam +test ! -e "$f" || . "$f" + + +case x"$1" in + (xnow) FRESHCLAM_DELAY=0;; + (x|xrandom) : ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};; + (*) FRESHCLAM_DELAY=$1;; +esac + +set -e + +case $FRESHCLAM_DELAY in + (disabled-warn) + echo $"\ +WARNING: update of clamav database is disabled; please see + '$f' + for information how to enable the periodic update resp. how to turn + off this message." >&2 + exit 1 + ;; + + (disabled) + exit 0 + ;; + + (*) + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] + ;; +esac + +/usr/bin/freshclam --quiet diff --git a/freshclam.cron b/freshclam.cron deleted file mode 100644 index e40d8ef..0000000 --- a/freshclam.cron +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate deleted file mode 100644 index 272d220..0000000 --- a/freshclam.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} diff --git a/freshclam.sysconfig b/freshclam.sysconfig new file mode 100644 index 0000000..417dafc --- /dev/null +++ b/freshclam.sysconfig @@ -0,0 +1,18 @@ +## When changing the periodicity of freshclam runs in the crontab, +## this value must be adjusted also. Its value is the timespan between +## two subsequent freshclam runs in minutes. E.g. for the default +## +## | 0 */3 * * * ... +## +## crontab line, the value is 180 (minutes). +# FRESHCLAM_MOD= + +## A predefined value for the delay in seconds. By default, the value is +## calculated by the 'hostid' program. This predefined value guarantees +## constant timespans of 3 hours between two subsequent freshclam runs. +## +## This option accepts two special values: +## 'disabled-warn' ... disables the automatic freshclam update and +## gives out a warning +## 'disabled' ... disables the automatic freshclam silently +# FRESHCLAM_DELAY= diff --git a/llvm-glibc.patch b/llvm-glibc.patch new file mode 100644 index 0000000..67dbdd7 --- /dev/null +++ b/llvm-glibc.patch @@ -0,0 +1,12 @@ +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 +@@ -52,6 +52,7 @@ static void runAtExitHandlers() { + #include <sys/stat.h> + #endif + #include <fcntl.h> ++#include <unistd.h> + /* stat functions are redirecting to __xstat with a version number. On x86-64 + * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat' + * available as an exported symbol, so we have to add it explicitly. diff --git a/sources b/sources index 0573f02..113ca26 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ -a4517adbd9c72a3fec3fbb1384dd3234 clamav-0.99.2-norar.tar.xz -d71fbb44799945970f2c2b75e40ec105 daily-21723.cvd -f13ead862171f50019c15c946d25e91f main-57.cvd -c545b6a9775ccb72a293d259335589be bytecode-278.cvd -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +SHA512 (clamav-0.99.3-norar.tar.xz) = d80b20c982d35eecd2719af325bc774a5a5fe63a97f3d855c74919f6cfac6fe3f12c51479e49d96031ae0e9a3dedcf446dd22426cceba22ec4b641e9ea1f250a +SHA512 (bytecode-319.cvd) = 1b2785fde078e0dae5a4b8a5161a0da55b26b010deda9fd9dc5edb7113d46d6eb45f644c16b4cb3882e7192d0b389d7b1826fbb718377aa40e1bac3485829acc +SHA512 (daily-24253.cvd) = cef70a86f7989ec330c0479f6070e735181168c0331e981cfcd8d9a5aebdd6be42d772167c701f6f33219a4b41aced806e70c156e9a2a060c30ba55e73743fcd +SHA512 (main-58.cvd) = 71309a7ea26f0fbfe329252c728173c895b107b7ea2e0bd613b12475db1d0270a496d707c4d80c842bf8b6f21680e86edfa7fa3b8aea075e93d67c91d696603a commit 4f3fd81e6aff2829d95ecf971feb5ba34b761c76 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Nov 26 03:55:21 2017 +0100 Backported upstream patch to unbreak e2guardian vs. temp files diff --git a/clamav-0.99.2-temp-cleanup.patch b/clamav-0.99.2-temp-cleanup.patch new file mode 100644 index 0000000..1b01341 --- /dev/null +++ b/clamav-0.99.2-temp-cleanup.patch @@ -0,0 +1,137 @@ +https://github.com/vrtadmin/clamav-devel/commit/f5bc94cf01e6a19d5255c0e5f9a5bc2336f5a2b1 +backported (re-merge). See also: + + - https://bugzilla.clamav.net/show_bug.cgi?id=11549 + - https://github.com/e2guardian/e2guardian/issues/159 + +--- clamav-0.99.2/libclamav/scanners.c 2016-04-22 17:02:19.000000000 +0200 ++++ clamav-0.99.2/libclamav/scanners.c.temp-cleanup 2017-11-17 00:59:14.295670694 +0100 +@@ -1342,37 +1342,33 @@ + return CL_CLEAN; + } + +- /* dump to disk only if explicitly asked to +- * or if necessary to check relative offsets, +- * otherwise we can process just in-memory */ +- if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) { +- if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) { +- cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n"); +- return ret; +- } +- if (ctx->engine->keeptmp) +- cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname); +- } +- + if(!(normalized = cli_malloc(SCANBUFF + maxpatlen))) { + cli_dbgmsg("cli_scanscript: Unable to malloc %u bytes\n", SCANBUFF); +- free(tmpname); + return CL_EMEM; + } +- + text_normalize_init(&state, normalized, SCANBUFF + maxpatlen); +- ret = CL_CLEAN; +- + + if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) { +- free(tmpname); +- return ret; ++ free(normalized); ++ return ret; + } + + if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) { +- cli_ac_freedata(&tmdata); +- free(tmpname); +- return ret; ++ cli_ac_freedata(&tmdata); ++ free(normalized); ++ return ret; ++ } ++ ++ /* dump to disk only if explicitly asked to ++ * or if necessary to check relative offsets, ++ * otherwise we can process just in-memory */ ++ if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) { ++ if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) { ++ cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n"); ++ goto done; ++ } ++ if (ctx->engine->keeptmp) ++ cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname); + } + + mdata[0] = &tmdata; +@@ -1387,10 +1383,9 @@ + map_off += written; + + if (write(ofd, state.out, state.out_pos) == -1) { +- cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname); +- close(ofd); +- free(tmpname); +- return CL_EWRITE; ++ cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname); ++ ret = CL_EWRITE; ++ goto done; + } + text_normalize_reset(&state); + } +@@ -1409,11 +1404,6 @@ + funmap(*ctx->fmap); + } + *ctx->fmap = map; +- +- /* If we aren't keeping temps, delete the normalized file after scan. */ +- if(!(ctx->engine->keeptmp)) +- if (cli_unlink(tmpname)) ret = CL_EUNLINK; +- + } else { + /* Since the above is moderately costly all in all, + * do the old stuff if there's no relative offsets. */ +@@ -1421,11 +1411,8 @@ + if (troot) { + cli_targetinfo(&info, 7, map); + ret = cli_ac_caloff(troot, &tmdata, &info); +- if (ret) { +- cli_ac_freedata(&tmdata); +- free(tmpname); +- return ret; +- } ++ if (ret) ++ goto done; + } + + while(1) { +@@ -1466,13 +1453,6 @@ + + } + +- if(ctx->engine->keeptmp) { +- free(tmpname); +- if (ofd >= 0) +- close(ofd); +- } +- free(normalized); +- + if(ret != CL_VIRUS || SCAN_ALL) { + if ((ret = cli_exp_eval(ctx, troot, &tmdata, NULL, NULL)) == CL_VIRUS) + viruses_found++; +@@ -1481,9 +1461,19 @@ + viruses_found++; + } + ++done: ++ free(normalized); + cli_ac_freedata(&tmdata); + cli_ac_freedata(&gmdata); + ++ if (ofd != -1) ++ close(ofd); ++ if (tmpname != NULL) { ++ if (!ctx->engine->keeptmp) ++ cli_unlink(tmpname); ++ free(tmpname); ++ } ++ + if (SCAN_ALL && viruses_found) + return CL_VIRUS; + diff --git a/clamav.spec b/clamav.spec index edf30f2..2fd02bd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -32,6 +32,7 @@ Source12: http://db.local.clamav.net/daily-21723.cvd Source13: http://db.local.clamav.net/bytecode-278.cvd Patch31: clamav-0.99.1-setsebool.patch +Patch32: clamav-0.99.2-temp-cleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -131,6 +132,7 @@ you will need to install %{name}-devel. %setup -q -T -c xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %patch31 -p1 -b .setsebool +%patch32 -p1 -b .temp-cleanup %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure @@ -410,6 +412,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Nov 26 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-3 +- Backported upstream patch to unbreak e2guardian vs. temp files + * Tue Mar 28 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-2 - Ensure that missing or invalid timezone configuration does not mangle /etc/freshclam.conf in %%post (#1154756) commit f7d8e9087c523eb46dce29552fcb37c2a69e0ffc Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Mar 28 21:54:37 2017 +0200 Ensure that missing or invalid timezone configuration does not mangle /etc/freshclam.conf in %post (#1154756) diff --git a/clamav.spec b/clamav.spec index 315b839..edf30f2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -262,9 +262,9 @@ for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done ZONES="/usr/share/zoneinfo/zone.tab" CONFIG="/etc/sysconfig/clock" -if [ -r "$CONFIG" -a -r "$ZONES" ]; then +if [ -r "$CONFIG" -a -r "$ZONES" -a -n "$ZONE" ]; then source "$CONFIG" - export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | head -1 | cut -f1 | tr [A-Z] [a-z])" + export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | grep -v ^# | head -1 | cut -f1 | tr [A-Z] [a-z])" fi if [ -z "$CODE" ]; then @@ -410,6 +410,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Mar 28 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-2 +- Ensure that missing or invalid timezone configuration does not + mangle /etc/freshclam.conf in %%post (#1154756) + * Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 - Update to 0.99.2 - Enable llvm commit 0577117bb2cb0095605995c4ad488e03951e809a Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Mon Jun 13 11:36:38 2016 -0600 Update to 0.99.2 - Enable llvm - Drop cliopts patch fixed upstream, use upstream's "--forground" option name - Fix main.cvd (fedora #1325482, epel #1325717) - Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd - Update daily.cvd - Fixup Requires(pre) usage (#1319151) Conflicts: clamav-milter.systemd clamav-milter.sysv clamav-milter.upstart clamav.spec clamd.scan.upstart clamd@.service sources diff --git a/.gitignore b/.gitignore index cdb6045..d87d52b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /clamav-*-norar.tar.xz /main*.cvd /daily*.cvd +/bytecode-278.cvd diff --git a/clamav-0.99.1-setsebool.patch b/clamav-0.99.1-setsebool.patch new file mode 100644 index 0000000..f168b55 --- /dev/null +++ b/clamav-0.99.1-setsebool.patch @@ -0,0 +1,15 @@ +Patch by Robert Scheck <robert(a)fedoraproject.org> for clamav >= 0.99.1 which changes the SELinux +boolean name from the obsolete (and former alias) clamd_use_jit to the current antivirus_use_jit. +See also: https://bugzilla.redhat.com/show_bug.cgi?id=1295473 + +--- clamav-0.99.1/libclamav/builtin_bytecodes.h 2015-12-11 17:26:02.000000000 +0100 ++++ clamav-0.99.1/libclamav/builtin_bytecodes.h.setsebool 2016-03-29 23:32:03.000000000 +0200 +@@ -139,7 +139,7 @@ + if (env.os_features & (1 << feature_selinux)) + /* all SELinux versions deny RWX mapping when policy says so */ + disable_jit_if("^SELinux is preventing 'execmem' access.\n" +- "Run 'setsebool -P clamd_use_jit on'.", 0, 1); ++ "Run 'setsebool -P antivirus_use_jit on'.", 0, 1); + else if (env.os_features & (1 << feature_pax)) + /* recent versions of PaX deny RWX mapping */ + disable_jit_if("^PaX is preventing 'mprotect' access.\n" diff --git a/clamav.spec b/clamav.spec index 0f0f118..315b839 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.99.1 +Version: 0.99.2 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,12 +28,16 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-57.cvd -Source12: http://db.local.clamav.net/daily-21478.cvd +Source12: http://db.local.clamav.net/daily-21723.cvd +Source13: http://db.local.clamav.net/bytecode-278.cvd + +Patch31: clamav-0.99.1-setsebool.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel, pcre-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} + Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -126,6 +130,7 @@ you will need to install %{name}-devel. # Handle that rpmbuild in RHEL < 6 doesn't handle xz archives automatically. %setup -q -T -c xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) +%patch31 -p1 -b .setsebool %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure @@ -199,7 +204,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) --with-group="clam" \ --with-libcurl=%{_prefix} \ --with-user="clam" \ - --disable-llvm +# --disable-llvm make %{?_smp_mflags} @@ -242,6 +247,11 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +install -Dp -m0644 %{SOURCE13} %{buildroot}%{_localstatedir}/lib/clamav/bytecode.cvd +touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/bytecode.cld +touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/{daily,main}.cld +touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/mirrors.dat + # Clean up for later usage in documentation for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done @@ -387,6 +397,9 @@ rm -rf %{buildroot} %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log +%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/*.cld +%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/mirrors.dat + %files devel %defattr(-, root, root, 0755) %{_bindir}/clamav-config @@ -397,6 +410,15 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 +- Update to 0.99.2 +- Enable llvm +- Drop cliopts patch fixed upstream, use upstream's "--forground" option name +- Fix main.cvd (fedora #1325482, epel #1325717) +- Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd +- Update daily.cvd +- Fixup Requires(pre) usage (#1319151) + * Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 - Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) diff --git a/sources b/sources index c0744a1..0573f02 100644 --- a/sources +++ b/sources @@ -1,4 +1,5 @@ -6bf23527691890664c66e62e7bee44ff clamav-0.99.1-norar.tar.xz -85b8dd2229ba4a0ddd8bf048fe2b2078 main-57.cvd -b82f2fc713069d378d79b8e4e3db0b74 daily-21478.cvd +a4517adbd9c72a3fec3fbb1384dd3234 clamav-0.99.2-norar.tar.xz +d71fbb44799945970f2c2b75e40ec105 daily-21723.cvd +f13ead862171f50019c15c946d25e91f main-57.cvd +c545b6a9775ccb72a293d259335589be bytecode-278.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit ea28252658542e37209d2a5ef1b1c1ef58ac7b0b Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Mar 30 00:14:00 2016 +0200 Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) diff --git a/clamav.spec b/clamav.spec index b381569..0f0f118 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,8 +4,8 @@ Summary: Anti-virus software Name: clamav -Version: 0.99 -Release: 3%{?dist} +Version: 0.99.1 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -27,8 +27,8 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). -Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-21123.cvd +Source11: http://db.local.clamav.net/main-57.cvd +Source12: http://db.local.clamav.net/daily-21478.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 +- Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) + * Mon Dec 07 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-3 - Added missing build-time requirement to pcre-devel diff --git a/sources b/sources index 2d52233..c0744a1 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -a972a59e09ef86fdfaaf028f714996e5 clamav-0.99-norar.tar.xz -06f660f474d1a6863de4a00eb02521e3 main-55.cvd -547dca19d7c3f1bfb51a3e0dad4ad52e daily-21123.cvd +6bf23527691890664c66e62e7bee44ff clamav-0.99.1-norar.tar.xz +85b8dd2229ba4a0ddd8bf048fe2b2078 main-57.cvd +b82f2fc713069d378d79b8e4e3db0b74 daily-21478.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 22de990d883ff79a5b7465d9cdb256036839e87c Author: Robert Scheck <robert(a)fedoraproject.org> Date: Mon Dec 7 21:26:22 2015 +0100 Added missing build-time requirement to pcre-devel diff --git a/clamav.spec b/clamav.spec index 2943bcc..b381569 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -32,7 +32,7 @@ Source12: http://db.local.clamav.net/daily-21123.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel, pcre-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Dec 07 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-3 +- Added missing build-time requirement to pcre-devel + * Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 - Require openssl-devel for clamav-devel commit f889ba1f96dfdcf315ae3c6dfb575be290b79571 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Dec 6 18:09:17 2015 +0100 Require openssl-devel for clamav-devel diff --git a/clamav.spec b/clamav.spec index 8021b31..2943bcc 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -110,7 +110,7 @@ The actual virus database for %{name} %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries -Requires: clamav = %{version}-%{release} +Requires: clamav = %{version}-%{release}, openssl-devel ### Fedora Extras introduced them differently :( Obsoletes: libclamav-static-devel <= %{version}-%{release} @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 +- Require openssl-devel for clamav-devel + * Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 - Upgrade to 0.99 and updated daily.cvd (#1287327) commit 685f0bd46bb139c57518ca0c418d262bc8acd9d1 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Dec 2 01:53:02 2015 +0100 Upgrade to 0.99 and updated daily.cvd (#1287327) diff --git a/clamav.spec b/clamav.spec index fe3e9a2..8021b31 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.7 +Version: 0.99 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-20394.cvd +Source12: http://db.local.clamav.net/daily-21123.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 +- Upgrade to 0.99 and updated daily.cvd (#1287327) + * Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 - Upgrade to 0.98.7 and updated daily.cvd (#1217014) diff --git a/sources b/sources index 78b4995..2d52233 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -2dd003807614ef53c5ab6c811273ff4e clamav-0.98.7-norar.tar.xz +a972a59e09ef86fdfaaf028f714996e5 clamav-0.99-norar.tar.xz 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -223a4a02a3b8486ce01b44ea4bb56291 daily-20394.cvd +547dca19d7c3f1bfb51a3e0dad4ad52e daily-21123.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 21917faf8969ba61e367a567fa46900728e0d382 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Apr 29 20:34:24 2015 +0200 Upgrade to 0.98.7 and updated daily.cvd (#1217014) diff --git a/clamav.spec b/clamav.spec index 8b41064..fe3e9a2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,8 +4,8 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.6 -Release: 2%{?dist} +Version: 0.98.7 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-19995.cvd +Source12: http://db.local.clamav.net/daily-20394.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 +- Upgrade to 0.98.7 and updated daily.cvd (#1217014) + * Tue Feb 24 2015 Joel Smith <joelsmith(a)fedoraproject.org> - 0.98.6-2 - Make init script source /etc/sysconfig/clamd if present (#1195864) diff --git a/sources b/sources index c1532aa..78b4995 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -a158e74b3741a4b928bcbc17ab171690 clamav-0.98.6-norar.tar.xz +2dd003807614ef53c5ab6c811273ff4e clamav-0.98.7-norar.tar.xz 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -d58cb68afd94e61caab919d6bfd34fcb daily-19995.cvd +223a4a02a3b8486ce01b44ea4bb56291 daily-20394.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 865529f4ffc69c765e572d951f1407c414c458c1 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Fri Apr 10 18:44:47 2015 +0200 Make init script source /etc/sysconfig/clamd if present (#1195864) diff --git a/clamav.init b/clamav.init index dacb403..633c301 100755 --- a/clamav.init +++ b/clamav.init @@ -17,6 +17,9 @@ [ -x /usr/sbin/clamd ] || exit 0 +# Local clamd config +test -f /etc/sysconfig/clamd && . /etc/sysconfig/clamd + # See how we were called. case "$1" in start) diff --git a/clamav.spec b/clamav.spec index b70ab17..8b41064 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.98.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Feb 24 2015 Joel Smith <joelsmith(a)fedoraproject.org> - 0.98.6-2 +- Make init script source /etc/sysconfig/clamd if present (#1195864) + * Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 - Upgrade to 0.98.6 and updated daily.cvd (#1187050) commit 1e9ece70df82b7e69409fe05d090570af80ee073 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Jan 29 22:44:11 2015 +0100 Really update daily.cvd diff --git a/clamav.spec b/clamav.spec index b1e1e60..b70ab17 100644 --- a/clamav.spec +++ b/clamav.spec @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-19651.cvd +Source12: http://db.local.clamav.net/daily-19995.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) commit ba56519d00748db57cbf148b363f8ed95ebe817b Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Jan 29 22:31:21 2015 +0100 Upgrade to 0.98.6 and updated daily.cvd (#1187050) diff --git a/clamav.spec b/clamav.spec index d87084a..b1e1e60 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.5 +Version: 0.98.6 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 +- Upgrade to 0.98.6 and updated daily.cvd (#1187050) + * Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 - Upgrade to 0.98.5 and updated daily.cvd (#1138101) diff --git a/sources b/sources index 90d8e3a..c1532aa 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ +a158e74b3741a4b928bcbc17ab171690 clamav-0.98.6-norar.tar.xz 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -f83334a2cb2510cc8f9ec9750beaeada daily-19651.cvd -6455c6ce50b56ba1f545c759129f2ad1 clamav-0.98.5-norar.tar.xz +d58cb68afd94e61caab919d6bfd34fcb daily-19995.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 4548304dd3c0924b4c358097eee31b27933fb241 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Nov 19 13:13:01 2014 +0100 Upgrade to 0.98.5 and updated daily.cvd (#1138101) diff --git a/clamav.spec b/clamav.spec index 902fe8a..d87084a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.4 +Version: 0.98.5 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-19120.cvd +Source12: http://db.local.clamav.net/daily-19651.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 +- Upgrade to 0.98.5 and updated daily.cvd (#1138101) + * Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 - Upgrade to 0.98.4 and updated daily.cvd (#1111811) - Add build requirement to libxml2 for DMG, OpenIOC and XAR diff --git a/sources b/sources index bb4d1f0..90d8e3a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -14939dd869178d9c934bd2b7026104f5 daily-19120.cvd -22bca4a49928a883c90c549a93b9bcde clamav-0.98.4-norar.tar.xz +f83334a2cb2510cc8f9ec9750beaeada daily-19651.cvd +6455c6ce50b56ba1f545c759129f2ad1 clamav-0.98.5-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 242037ee812fed4dbd5eefd4e6cb9ab82ce82beb Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Jun 21 19:20:28 2014 +0200 Add build requirement to libxml2 for DMG, OpenIOC and XAR diff --git a/clamav.spec b/clamav.spec index 3b452fa..902fe8a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -32,7 +32,7 @@ Source12: http://db.local.clamav.net/daily-19120.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -399,6 +399,7 @@ rm -rf %{buildroot} %changelog * Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 - Upgrade to 0.98.4 and updated daily.cvd (#1111811) +- Add build requirement to libxml2 for DMG, OpenIOC and XAR * Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 - Upgrade to 0.98.3 commit 22850e6fbd532abf7dce4bf0ddf160b81aff3fac Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Jun 21 19:10:05 2014 +0200 Upgrade to 0.98.4 and updated daily.cvd (#1111811) diff --git a/clamav.spec b/clamav.spec index c8bc466..3b452fa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.3 +Version: 0.98.4 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-18354.cvd +Source12: http://db.local.clamav.net/daily-19120.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 +- Upgrade to 0.98.4 and updated daily.cvd (#1111811) + * Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 - Upgrade to 0.98.3 - Fix --with-libcurl parameter to avoid automatic path detection breakage diff --git a/sources b/sources index 05ea68b..bb4d1f0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -5a7d62d7d8ee4b237d6e08f5bc02037c daily-18354.cvd -e9210784829725bf716fda7ca536bbb0 clamav-0.98.3-norar.tar.xz +14939dd869178d9c934bd2b7026104f5 daily-19120.cvd +22bca4a49928a883c90c549a93b9bcde clamav-0.98.4-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 5db0137e5a5bd88d1ca992d9376a0e6cbfb6d1ed Author: Paul Wouters <pwouters(a)redhat.com> Date: Fri May 9 16:01:41 2014 -0400 update sources, use latest daily cvd diff --git a/clamav.spec b/clamav.spec index 49eedbf..c8bc466 100644 --- a/clamav.spec +++ b/clamav.spec @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-18353.cvd +Source12: http://db.local.clamav.net/daily-18354.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/sources b/sources index b26e5b2..05ea68b 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ +06f660f474d1a6863de4a00eb02521e3 main-55.cvd +5a7d62d7d8ee4b237d6e08f5bc02037c daily-18354.cvd e9210784829725bf716fda7ca536bbb0 clamav-0.98.3-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit e7e53f9ced1d1f2babecad82953cfb613109cf35 Author: Paul Wouters <pwouters(a)redhat.com> Date: Fri May 9 13:10:48 2014 -0400 * Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 - Upgrade to 0.98.3 - Fix --with-libcurl parameter to avoid automatic path detection breakage - openssl-devel is now required for hashing code. - Added clamsubmit to main package - Re-enabled --with-llvm as this speeds up deployment a lot. - Fixed older changelog dates diff --git a/clamav.spec b/clamav.spec index fc1bfc9..49eedbf 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.1 +Version: 0.98.3 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -13,7 +13,7 @@ URL: http://www.clamav.net/ # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. This # tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +# make clean-sources NAME=clamav VERSION=<version> TARBALL=clamav-<version>.tar.gz TARBALL_CLEAN=clamav-<version>-norar.tar.xz # Upstream: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init @@ -32,7 +32,7 @@ Source12: http://db.local.clamav.net/daily-18353.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -197,7 +197,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) --enable-dns \ --with-dbdir="%{_localstatedir}/lib/clamav" \ --with-group="clam" \ - --with-libcurl \ + --with-libcurl=%{_prefix} \ --with-user="clam" \ --disable-llvm @@ -329,12 +329,14 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/sigtool.1* %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* +%doc %{_mandir}/man1/clamsubmit.1* %doc %{_mandir}/man5/freshclam.conf.5* %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam %{_bindir}/sigtool %{_bindir}/clambc +%{_bindir}/clamsubmit %{_libdir}/libclamav.so.* %files -n clamd @@ -395,6 +397,14 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 +- Upgrade to 0.98.3 +- Fix --with-libcurl parameter to avoid automatic path detection breakage +- openssl-devel is now required for hashing code. +- Added clamsubmit to main package +- Re-enabled --with-llvm as this speeds up deployment a lot. +- Fixed older changelog dates + * Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 - Upgrade to 0.98.1 and updated daily.cvd (#1053400) @@ -486,7 +496,7 @@ rm -rf %{buildroot} - Move db to /var/lib/clamav - Ship empty directory /etc/clamd.d for amavisd-new -* Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 +* Thu Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 - Disable llvm. * Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 @@ -643,7 +653,7 @@ rm -rf %{buildroot} - Changed the init-order of the sysv scripts. (Will McCutcheon) - Changes to the default configuration files. -* Sat Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 +* Wed Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 - Updated to release 0.70. * Tue Mar 16 2004 Dag Wieers <dag(a)wieers.com> - 0.68-1 @@ -656,7 +666,7 @@ rm -rf %{buildroot} * Mon Mar 08 2004 Dag Wieers <dag(a)wieers.com> - 0.67-1 - Personalized SPEC file. -* Mon Aug 22 2003 Matthias Saou/Che +* Fri Aug 22 2003 Matthias Saou/Che - Added "--without milter" build option. (Matthias Saou) - Fixed freshclam cron (Matthias Saou) - Built the new package. (Che) @@ -673,7 +683,7 @@ rm -rf %{buildroot} - various fixes - got rid of rpm-helper prereq -* Fri Mar 24 2003 Che +* Mon Mar 24 2003 Che - some cleanups and fixes - new patch added @@ -686,7 +696,7 @@ rm -rf %{buildroot} * Sat Nov 02 2002 Che - version upgrade -* Wed Oct 24 2002 Che +* Thu Oct 24 2002 Che - some important changes for lsb compliance * Wed Oct 23 2002 Che diff --git a/sources b/sources index c4d296c..b26e5b2 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -8944174b2dca6f38d96a2a2a7146d36e clamav-0.98.1-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -06f660f474d1a6863de4a00eb02521e3 main-55.cvd -52ce049e8df4693766c5c42697890d35 daily-18353.cvd +e9210784829725bf716fda7ca536bbb0 clamav-0.98.3-norar.tar.xz commit 584867bec03059e970dcac11001d6026b6435975 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Jan 15 09:23:52 2014 +0100 Upgrade to 0.98.1 and updated daily.cvd (#1053400) diff --git a/clamav.spec b/clamav.spec index 555b18f..fc1bfc9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,8 +4,8 @@ Summary: Anti-virus software Name: clamav -Version: 0.98 -Release: 2%{?dist} +Version: 0.98.1 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-17940.cvd +Source12: http://db.local.clamav.net/daily-18353.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -395,6 +395,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 +- Upgrade to 0.98.1 and updated daily.cvd (#1053400) + * Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 - Really fix all discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) diff --git a/sources b/sources index 3dd1c22..c4d296c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -500ed097cdd1f27ba2ed5fbc605eba37 clamav-0.98-norar.tar.xz +8944174b2dca6f38d96a2a2a7146d36e clamav-0.98.1-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -012af1d3ee7156db8bad20650c89a94d daily-17940.cvd +52ce049e8df4693766c5c42697890d35 daily-18353.cvd commit c4cf2b1e61514556e725ec8990e063b89a099008 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Oct 19 14:18:35 2013 +0200 Ensure that a clamd and clamav-milter condrestart via initscript works (#1018312, thanks to Filippo Carletti) diff --git a/clamav-milter.init b/clamav-milter.init index 347fe4b..d9fb037 100644 --- a/clamav-milter.init +++ b/clamav-milter.init @@ -47,7 +47,7 @@ case "$1" in RETVAL=$? ;; condrestart) - [ -e /var/lock/subsys/clamd ] && restart + [ -e /var/lock/subsys/clamav-milter ] && $0 restart RETVAL=$? ;; *) diff --git a/clamav.init b/clamav.init index b2eb0c6..dacb403 100755 --- a/clamav.init +++ b/clamav.init @@ -46,7 +46,7 @@ case "$1" in RETVAL=$? ;; condrestart) - [ -e /var/lock/subsys/clamd ] && restart + [ -e /var/lock/subsys/clamd ] && $0 restart RETVAL=$? ;; *) @@ -55,4 +55,3 @@ case "$1" in esac exit $RETVAL - diff --git a/clamav.spec b/clamav.spec index 1ec0861..555b18f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -398,6 +398,8 @@ rm -rf %{buildroot} * Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 - Really fix all discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) +- Ensure that a clamd and clamav-milter condrestart via initscript + works (#1018312, thanks to Filippo Carletti) * Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 - Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) commit 9fa6d109df873b43c0c93dc7fe48c8588d625899 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Oct 19 13:54:54 2013 +0200 Really fix all discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) diff --git a/clamav.init b/clamav.init index c3b28ac..b2eb0c6 100755 --- a/clamav.init +++ b/clamav.init @@ -30,7 +30,7 @@ case "$1" in echo -n "Stopping Clam AntiVirus Daemon: " killproc clamd rm -f /var/run/clamav/clamd.sock - rm -f /var/run/clamav/clamav.pid + rm -f /var/run/clamav/clamd.pid RETVAL=$? echo ### heres the fix... we gotta remove the stale files on restart diff --git a/clamav.spec b/clamav.spec index a33d41f..1ec0861 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.98 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -395,6 +395,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 +- Really fix all discrepancies between clamd initscript and clamd + config file (#960923, thanks to John Horne) + * Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 - Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) - Fixed discrepancies between clamd initscript and clamd config commit a1ce11dec47f24429d7485ee95460b8d13faa0a9 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Oct 6 18:41:28 2013 +0200 - Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) - Fixed discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) - Added build requirement to ncurses-devel for clamdtop (again) - Moved clamd wrapper script and documentation into correct sub-package (#782596, thanks to Philip Prindeville) diff --git a/.gitignore b/.gitignore index 7301ddf..cdb6045 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,4 @@ /clamd-wrapper.tar.bz2 -/clamav-0.97.5-norar.tar.xz -/main-54.cvd -/daily-15103.cvd -/clamav-0.97.6-norar.tar.xz -/daily-15408.cvd -/clamav-0.97.7-norar.tar.xz -/daily.cvd -/main.cvd -/clamav-0.97.8-norar.tar.xz +/clamav-*-norar.tar.xz +/main*.cvd +/daily*.cvd diff --git a/clamav.init b/clamav.init index 848dbce..c3b28ac 100755 --- a/clamav.init +++ b/clamav.init @@ -7,7 +7,7 @@ # server. # processname: clamd # pidfile: /var/run/clamav/clamd.pid -# config: /etc/clamav.conf +# config: /etc/clamd.conf # Source function library. . /etc/rc.d/init.d/functions @@ -29,7 +29,7 @@ case "$1" in stop) echo -n "Stopping Clam AntiVirus Daemon: " killproc clamd - rm -f /var/clamav/clamd.socket + rm -f /var/run/clamav/clamd.sock rm -f /var/run/clamav/clamav.pid RETVAL=$? echo diff --git a/clamav.spec b/clamav.spec index daf0015..a33d41f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,15 +4,17 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.8 +Version: 0.98 Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ -# Upstream source includes libunrar that is not distributable. -# rm -r libclamunrar -#Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. This +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +# Upstream: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init @@ -23,12 +25,14 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig -Source11: http://db.local.clamav.net/main.cvd -Source12: http://db.local.clamav.net/daily.cvd +# To download the *.cvd, go to http://www.clamav.net and use the links +# there (I renamed the files to add the -version suffix for verifying). +Source11: http://db.local.clamav.net/main-55.cvd +Source12: http://db.local.clamav.net/daily-17940.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -123,7 +127,7 @@ you will need to install %{name}-devel. %setup -q -T -c xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) -%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure +%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure %{__perl} -pi.orig -e ' s|\@DBDIR\@|\$(localstatedir)/lib/clamav|g; @@ -162,7 +166,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ArchiveMaxCompressionRatio) .+|$1 300|; s|^#(ArchiveBlockEncrypted)|$1|; s|^#(ArchiveBlockMax)|$1|; - ' etc/clamd.conf + ' etc/clamd.conf.sample %{__perl} -pi.orig -e ' s|^(Example)|#$1|; @@ -171,7 +175,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(LogSyslog)|$1|; s|^#(DatabaseOwner) .+$|$1 clam|; s|^(Checks) .+$|$1 24|; - ' etc/freshclam.conf + ' etc/freshclam.conf.sample %{__perl} -pi.orig -e ' s|^(Example)|#$1|; @@ -179,14 +183,14 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|; s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|; s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf + ' etc/clamav-milter.conf.sample %build %configure \ --program-prefix="%{?_program_prefix}" \ %{!?_without_milter:--enable-milter} \ --disable-clamav \ - --disable-static \ + --disable-static \ --disable-zlib-vcheck \ --disable-unrar \ --enable-id-check \ @@ -195,7 +199,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) --with-group="clam" \ --with-libcurl \ --with-user="clam" \ - --disable-llvm + --disable-llvm make %{?_smp_mflags} @@ -208,6 +212,9 @@ install -Dp -m0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/cron.daily/freshclam install -Dp -m0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav +mv -f %{buildroot}%{_sysconfdir}/clamd.conf{.sample,} +mv -f %{buildroot}%{_sysconfdir}/freshclam.conf{.sample,} + # now rewrite scripts and config files in-place sed -i \ -e 's!%%{_sbindir}!%{_sbindir}!g' \ @@ -219,6 +226,7 @@ sed -i \ %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +mv -f %{buildroot}%{_sysconfdir}/clamav-milter.conf{.sample,} %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif @@ -235,6 +243,9 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +# Clean up for later usage in documentation +for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done + %post /sbin/ldconfig @@ -313,14 +324,12 @@ rm -rf %{buildroot} %files %defattr(-, root, root, 0755) -%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README test/ +%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README %doc docs/*.pdf etc/freshclam.conf %doc %{_mandir}/man1/sigtool.1* %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -337,6 +346,8 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clambc.1* %doc %{_mandir}/man5/clamd.conf.5* %doc %{_mandir}/man8/clamd.8* +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav %{_sysconfdir}/clamd.d @@ -344,6 +355,7 @@ rm -rf %{buildroot} %{_sbindir}/clamd %{_bindir}/clamconf %{_bindir}/clamdscan +%{_bindir}/clamdtop %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ @@ -383,6 +395,14 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 +- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) +- Fixed discrepancies between clamd initscript and clamd config + file (#960923, thanks to John Horne) +- Added build requirement to ncurses-devel for clamdtop (again) +- Moved clamd wrapper script and documentation into correct sub- + package (#782596, thanks to Philip Prindeville) + * Tue Apr 23 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.8-1 - Upgrade to 0.97.8 - Updated daily.cvd diff --git a/sources b/sources index ec1a084..3dd1c22 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -8cfa8b280084a97518d3e80575e98938 clamav-0.97.8-norar.tar.xz +500ed097cdd1f27ba2ed5fbc605eba37 clamav-0.98-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -bbe585f65fb04504544ce3d6e07d38e9 daily.cvd -eb12490fda87d602e476d4b163f8a34b main.cvd +06f660f474d1a6863de4a00eb02521e3 main-55.cvd +012af1d3ee7156db8bad20650c89a94d daily-17940.cvd commit faa3f19f0380abcb265cbc388f3b3fff9cdf4742 Author: Orion Poplawski <orion(a)nwra.com> Date: Tue Apr 23 16:09:44 2013 -0600 - Upgrade to 0.97.8 - Updated daily.cvd diff --git a/.gitignore b/.gitignore index 6d3c72d..7301ddf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /clamav-0.97.7-norar.tar.xz /daily.cvd /main.cvd +/clamav-0.97.8-norar.tar.xz diff --git a/clamav.spec b/clamav.spec index d5f7c57..daf0015 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,13 +4,14 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.7 +Version: 0.97.8 Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. +# rm -r libclamunrar #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init @@ -382,6 +383,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Apr 23 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.8-1 +- Upgrade to 0.97.8 +- Updated daily.cvd + * Mon Mar 18 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.7-1 - Upgrade to 0.97.7 diff --git a/sources b/sources index 410fab6..ec1a084 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -e0dba8d8326cd88293224dc4ac398b21 clamav-0.97.7-norar.tar.xz +8cfa8b280084a97518d3e80575e98938 clamav-0.97.8-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -e3044fecc863b90996f023d20822b6c2 daily.cvd +bbe585f65fb04504544ce3d6e07d38e9 daily.cvd eb12490fda87d602e476d4b163f8a34b main.cvd commit a5b7bfd560a1a7d7b77d3c852601a4ede74b304b Author: Orion Poplawski <orion(a)nwra.com> Date: Mon Mar 18 09:19:41 2013 -0600 Upgrade to 0.97.7 diff --git a/.gitignore b/.gitignore index 25dfb7b..6d3c72d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ /daily-15103.cvd /clamav-0.97.6-norar.tar.xz /daily-15408.cvd +/clamav-0.97.7-norar.tar.xz +/daily.cvd +/main.cvd diff --git a/clamav.spec b/clamav.spec index 00e0c98..d5f7c57 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.6 +Version: 0.97.7 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -12,7 +12,7 @@ URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.6-norar.tar.xz +Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -22,9 +22,8 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig -# Temporary workaround for broken 0.97.6 tarball -Source11: http://db.local.clamav.net/main-54.cvd -Source12: http://db.local.clamav.net/daily-15408.cvd +Source11: http://db.local.clamav.net/main.cvd +Source12: http://db.local.clamav.net/daily.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -383,6 +382,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Mar 18 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.7-1 +- Upgrade to 0.97.7 + * Tue Sep 18 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.6-1 - Upgrade to 0.97.6 diff --git a/sources b/sources index aeaf952..410fab6 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz +e0dba8d8326cd88293224dc4ac398b21 clamav-0.97.7-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -eb12490fda87d602e476d4b163f8a34b main-54.cvd -47b966d960e28a28e505fd178c4cb095 daily-15408.cvd +e3044fecc863b90996f023d20822b6c2 daily.cvd +eb12490fda87d602e476d4b163f8a34b main.cvd commit 15b6ada7a385abb0d64f32bee632a77aeb4c5b4f Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Sep 27 19:41:50 2012 +0200 Ship local copy of virus database; it was removed by accident from 0.97.6 tarball diff --git a/.gitignore b/.gitignore index 128c670..25dfb7b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /main-54.cvd /daily-15103.cvd /clamav-0.97.6-norar.tar.xz +/daily-15408.cvd diff --git a/clamav.spec b/clamav.spec index 927809e..00e0c98 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,9 +22,9 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig -# Temporary workaround for broken 0.97.5 tarball -#Source11: http://db.local.clamav.net/main-54.cvd -#Source12: http://db.local.clamav.net/daily-15103.cvd +# Temporary workaround for broken 0.97.6 tarball +Source11: http://db.local.clamav.net/main-54.cvd +Source12: http://db.local.clamav.net/daily-15408.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -232,8 +232,8 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -#install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd -#install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd +install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd %post /sbin/ldconfig diff --git a/sources b/sources index 65f9425..aeaf952 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +eb12490fda87d602e476d4b163f8a34b main-54.cvd +47b966d960e28a28e505fd178c4cb095 daily-15408.cvd commit ff8b3932d288c49b40a0ec2fb72b58332b614367 Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 22:37:08 2012 -0500 Comment out SOURCE11 SOURCE12 diff --git a/clamav.spec b/clamav.spec index 81ba9f3..927809e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -232,8 +232,8 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd -install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +#install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd +#install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd %post /sbin/ldconfig commit eee4fecd3edceaa0ff7f16c925006f023afd0a03 Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 22:26:37 2012 -0500 Fix sources file diff --git a/sources b/sources index c31c394..65f9425 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit f3c9a633373d1d3c3a48e4929cb17087f01331c4 Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 18:32:24 2012 -0500 Add clamav-wrapper.tar.bz2 back to sources diff --git a/sources b/sources index 0d5102d..c31c394 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 36e6d2dd7cd2b00e25478821cbb4b0836d9f5eea Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 18:18:16 2012 -0500 Update to 0.97.6 diff --git a/.gitignore b/.gitignore index 36d7010..128c670 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /clamav-0.97.5-norar.tar.xz /main-54.cvd /daily-15103.cvd +/clamav-0.97.6-norar.tar.xz diff --git a/clamav.spec b/clamav.spec index 0e4e8f4..81ba9f3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.5 +Version: 0.97.6 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -12,7 +12,7 @@ URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.5-norar.tar.xz +Source0: clamav-0.97.6-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -23,8 +23,8 @@ Source9: clamd.logrotate Source10: clamav-milter.sysconfig # Temporary workaround for broken 0.97.5 tarball -Source11: http://db.local.clamav.net/main-54.cvd -Source12: http://db.local.clamav.net/daily-15103.cvd +#Source11: http://db.local.clamav.net/main-54.cvd +#Source12: http://db.local.clamav.net/daily-15103.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -383,6 +383,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Sep 18 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.6-1 +- Upgrade to 0.97.6 + * Wed Jun 20 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.5-1 - Upgrade to 0.97.5 - Fix CVE-2012-1419 clamav: specially-crafted POSIX tar files evade detection diff --git a/sources b/sources index 14401b5..0d5102d 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -eb12490fda87d602e476d4b163f8a34b main-54.cvd -1606d4b9dd4cf9658b22cb8bd135a0e3 daily-15103.cvd +ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz commit 6bd5ce5307f4581e68d96b4849f47dad5edb384f Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:55:11 2012 +0200 Correct my broken previous commit :( diff --git a/.gitignore b/.gitignore index 23e3e8f..36d7010 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /clamd-wrapper.tar.bz2 /clamav-0.97.5-norar.tar.xz /main-54.cvd -/daily-15050.cvd +/daily-15103.cvd diff --git a/clamav.spec b/clamav.spec index 2bc1881..0e4e8f4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -24,7 +24,7 @@ Source10: clamav-milter.sysconfig # Temporary workaround for broken 0.97.5 tarball Source11: http://db.local.clamav.net/main-54.cvd -Source12: http://db.local.clamav.net/daily-15050.cvd +Source12: http://db.local.clamav.net/daily-15103.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/sources b/sources index 78cc194..14401b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ +f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 eb12490fda87d602e476d4b163f8a34b main-54.cvd -d41d8cd98f00b204e9800998ecf8427e daily-15050.cvd +1606d4b9dd4cf9658b22cb8bd135a0e3 daily-15103.cvd commit df3eb6be0d66e27aa8e51e09d87d08abd8a98c74 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:47:19 2012 +0200 Ship local copy of virus database; it was removed by accident from 0.97.5 tarball diff --git a/.gitignore b/.gitignore index 916d9f6..23e3e8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -/clamav-0.97.2-norar.tar.xz -/clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 -/clamav-0.97.3-norar.tar.xz /clamav-0.97.5-norar.tar.xz +/main-54.cvd +/daily-15050.cvd diff --git a/clamav.spec b/clamav.spec index ee10cb8..2bc1881 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,6 +22,10 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig +# Temporary workaround for broken 0.97.5 tarball +Source11: http://db.local.clamav.net/main-54.cvd +Source12: http://db.local.clamav.net/daily-15050.cvd + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -228,6 +232,9 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ +install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd +install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd + %post /sbin/ldconfig @@ -383,6 +390,7 @@ rm -rf %{buildroot} - Fix CVE-2012-1443 clamav: specially-crafted RAR files evade detection - Fix CVE-2012-1458 clamav: specially-crafted CHM files evade detection - Fix CVE-2012-1459 clamav: specially-crafted length field in tar files evade detection +- Ship local copy of virus database; it was removed by accident from 0.97.5 tarball * Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 - Split files out into SCM instead of in the spec diff --git a/sources b/sources index ec6a603..78cc194 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +eb12490fda87d602e476d4b163f8a34b main-54.cvd +d41d8cd98f00b204e9800998ecf8427e daily-15050.cvd commit c732ee62430052119672ccaba84b9651bdd673ca Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:25:02 2012 +0200 /var/clamav should be /var/lib/clamav (as it was somewhen in the past) diff --git a/clamav.spec b/clamav.spec index 56f5aa7..ee10cb8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -253,14 +253,14 @@ fi %pre getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 %pre -n clamd getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 @@ -291,7 +291,7 @@ fi %pre db getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 commit 70dabdfb2ee545108398b8dc23ede0523531d862 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 20 22:26:09 2012 -0500 Add clamav-wrapper.tar.bz2 to sources diff --git a/sources b/sources index 94f05dd..ec6a603 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 278449beafd0d102b6d043fd1eba36f79c88e041 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 20 21:56:56 2012 -0500 Upgrade to 0.97.5 diff --git a/.gitignore b/.gitignore index b09a0a5..916d9f6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 /clamav-0.97.3-norar.tar.xz +/clamav-0.97.5-norar.tar.xz diff --git a/sources b/sources index 47b00bc..94f05dd 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz commit 1da35f528b76c172da1be61516633bf4774ba2f4 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 20 21:56:33 2012 -0500 Upgrade to 0.97.5 diff --git a/clamav.spec b/clamav.spec index b5d68b2..56f5aa7 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,15 +4,15 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.3 -Release: 4%{?dist} +Version: 0.97.5 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.3-norar.tar.xz +Source0: clamav-0.97.5-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -376,6 +376,14 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jun 20 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.5-1 +- Upgrade to 0.97.5 +- Fix CVE-2012-1419 clamav: specially-crafted POSIX tar files evade detection +- Fix CVE-2012-1457 clamav: overly long length field in tar files evade detection +- Fix CVE-2012-1443 clamav: specially-crafted RAR files evade detection +- Fix CVE-2012-1458 clamav: specially-crafted CHM files evade detection +- Fix CVE-2012-1459 clamav: specially-crafted length field in tar files evade detection + * Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 - Split files out into SCM instead of in the spec commit b6a2788bdb2d6594a798987b9112ebcfb3ea3406 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Thu Jan 19 19:33:03 2012 -0600 Split out files into SCM instead of in spec diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig new file mode 100644 index 0000000..834b0cd --- /dev/null +++ b/clamav-milter.sysconfig @@ -0,0 +1,4 @@ +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" diff --git a/clamav.spec b/clamav.spec index ba4b951..b5d68b2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -16,6 +16,12 @@ Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 + +Source7: freshclam.cron +Source8: freshclam.logrotate +Source9: clamd.logrotate +Source10: clamav-milter.sysconfig + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -171,53 +177,6 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf - -cat <<EOF >clamd.logrotate -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript -} -EOF - -cat <<EOF >freshclam.logrotate -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} -EOF - -cat <<'EOF' >freshclam.cron -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" -EOF - -%{__cat} <<EOF >clamav-milter.sysconfig -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" -EOF - %build %configure \ --program-prefix="%{?_program_prefix}" \ @@ -241,13 +200,21 @@ rm -rf %{buildroot} make install DESTDIR="%{buildroot}" install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd -install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav +install -Dp -m0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav + +# now rewrite scripts and config files in-place +sed -i \ + -e 's!%%{_sbindir}!%{_sbindir}!g' \ + -e 's!%%{_bindir}!%{_bindir}!g' \ + -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ + %{buildroot}%{_sysconfdir}/cron.daily/freshclam \ + %{buildroot}%{_sysconfdir}/logrotate.d/* %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif @@ -409,6 +376,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 +- Split files out into SCM instead of in the spec + * Sun Jan 1 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-3 - Revert patch from 0.97.3-2 diff --git a/clamd.logrotate b/clamd.logrotate new file mode 100644 index 0000000..b233f3a --- /dev/null +++ b/clamd.logrotate @@ -0,0 +1,8 @@ +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} diff --git a/freshclam.cron b/freshclam.cron new file mode 100644 index 0000000..e40d8ef --- /dev/null +++ b/freshclam.cron @@ -0,0 +1,17 @@ +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate new file mode 100644 index 0000000..272d220 --- /dev/null +++ b/freshclam.logrotate @@ -0,0 +1,5 @@ +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} commit 9650322a3c84c2129ddcb0da4f23373ce6960169 Merge: a638626 2cfebfc Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:44:31 2012 -0600 Merge branch 'el6' of ssh://pkgs.fedoraproject.org/clamav into el6 Conflicts: freshclam.logrotate commit a6386267af7aef72c90d01b8364113b49e293dec Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:40:48 2012 -0600 Bump to 0.97.3-3 diff --git a/clamav.spec b/clamav.spec index bd8c933..ba4b951 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -409,6 +409,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Jan 1 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-3 +- Revert patch from 0.97.3-2 + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - Update to 0.97.3 - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 commit 1b188a1f3f19a9a627083b1407aa831810ad6c2f Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:39:31 2012 -0600 Revert "Add files from bug 756854" This reverts commit 14d21bc46d3a59c90e91420a310f14102e8d859b. diff --git a/README.clamd-wrapper b/README.clamd-wrapper deleted file mode 100644 index 5cd1b91..0000000 --- a/README.clamd-wrapper +++ /dev/null @@ -1,116 +0,0 @@ -To create individual clamd-instance take the following files and -modify/copy them in the suggested way: - -clamd.conf: - * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with an unique service-name; - e.g. as /etc/clamd.d/<SERVICE>.conf - - To make logfile rotation work properly, the LogFile should be - writable for the assigned User. Recommended way to reach this, is - to: - * make it owned by the User's *group* - * assign at least 0620 (u+rw,g+w) permissions - - A suitable command might be - | # touch <logfile> - | # chgrp <user> <logfile> - | # chmod 0620 <logfile> - - NEVER use 'clamav' as the user since he can modify the database. - This is the user who is running the application; e.g. for mimedefang - (http://www.roaringpenguin.com/mimedefang) the user might be - 'defang'.Theoretically, distinct users could be used, but it must be - made sure that the application-user can write into the socket-file, - and that the clamd-user can access the files asked by the - application to be checked. - - -clamd.logrotate: - * set the correct value for the logfile - * place it into /etc/logrotate.d - -clamd.sysconfig: - * set the name of the config-file and the local socket - * copy it to /etc/sysconfig/clamd.<SERVICE> - -clamd.init: - * set the service-name - * place it into /etc/init.d/ with an unique name and activate it - (e.g. with /sbin/chkconfig clamd.<SERVICE> on) - -Additionally, a symlink must be set to clamd in a way like - | # ln -s clamd /usr/sbin/clamd.<SERVICE> -and the directory for the socket file must be created (see 'LocalSocket' -in clamd.conf) - | # mkdir -p /var/run/clamd.<SERVICE> - - -This directory must be writable by the 'User' chosen in the config-file. - - - -[Disclaimer: - this file and the script/configfiles are not part of the official - clamav package. - - Please send complaints and comments to - mailto:enrico.scholz@informatik.tu-chemnitz.de!] -To create individual clamd-instance take the following files and -modify/copy them in the suggested way: - -clamd.conf: - * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with an unique service-name; - e.g. as /etc/clamd.d/<SERVICE>.conf - - To make logfile rotation work properly, the LogFile should be - writable for the assigned User. Recommended way to reach this, is - to: - * make it owned by the User's *group* - * assign at least 0620 (u+rw,g+w) permissions - - A suitable command might be - | # touch <logfile> - | # chgrp <user> <logfile> - | # chmod 0620 <logfile> - - NEVER use 'clamav' as the user since he can modify the database. - This is the user who is running the application; e.g. for mimedefang - (http://www.roaringpenguin.com/mimedefang) the user might be - 'defang'.Theoretically, distinct users could be used, but it must be - made sure that the application-user can write into the socket-file, - and that the clamd-user can access the files asked by the - application to be checked. - - -clamd.logrotate: - * set the correct value for the logfile - * place it into /etc/logrotate.d - -clamd.sysconfig: - * set the name of the config-file and the local socket - * copy it to /etc/sysconfig/clamd.<SERVICE> - -clamd.init: - * set the service-name - * place it into /etc/init.d/ with an unique name and activate it - (e.g. with /sbin/chkconfig clamd.<SERVICE> on) - -Additionally, a symlink must be set to clamd in a way like - | # ln -s clamd /usr/sbin/clamd.<SERVICE> -and the directory for the socket file must be created (see 'LocalSocket' -in clamd.conf) - | # mkdir -p /var/run/clamd.<SERVICE> - - -This directory must be writable by the 'User' chosen in the config-file. - - - -[Disclaimer: - this file and the script/configfiles are not part of the official - clamav package. - - Please send complaints and comments to - mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig deleted file mode 100644 index bd82488..0000000 --- a/clamav-milter.sysconfig +++ /dev/null @@ -1,8 +0,0 @@ -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" diff --git a/clamav.spec b/clamav.spec index 53db81e..bd8c933 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -15,14 +15,7 @@ URL: http://www.clamav.net/ Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init -Source3: clamd-wrapper -Source4: clamd.init -Source5: README.clamd-wrapper -Source6: clamd.sysconfig -Source7: freshclam.logrotate -Source8: freshclam.cron -Source9: clamd.logrotate -Source10: clamav-milter.sysconfig +Source3: clamd-wrapper.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -178,6 +171,53 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf + +cat <<EOF >clamd.logrotate +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} +EOF + +cat <<EOF >freshclam.logrotate +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} +EOF + +cat <<'EOF' >freshclam.cron +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" +EOF + +%{__cat} <<EOF >clamav-milter.sysconfig +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" +EOF + %build %configure \ --program-prefix="%{?_program_prefix}" \ @@ -200,30 +240,19 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR="%{buildroot}" -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav -install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav - -# now rewrite scripts and config files in-place -sed -i \ - -e 's!%%{_sbindir}!%{_sbindir}!g' \ - -e 's!%%{_bindir}!%{_bindir}!g' \ - -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ - %{buildroot}%{_sysconfdir}/logrotate.d/* \ - %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif - # Install clamav-wrapper: -install -d -m0755 %{buildroot}/%{_prefix}/share/clamav -install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} -install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} +tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log @@ -316,6 +345,8 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -335,12 +366,10 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav %{_sysconfdir}/clamd.d -%config %{_initrddir}/clamav +%config %{_initrddir}/clamd %{_sbindir}/clamd %{_bindir}/clamconf %{_bindir}/clamdscan -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd* %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ @@ -380,10 +409,6 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 -- Add missing clamd-wrapper supporting files -- Remove from init script the unused CLAMD_SOCKET variable - * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - Update to 0.97.3 - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamav.spec.orig b/clamav.spec.orig deleted file mode 100644 index 45aa5db..0000000 --- a/clamav.spec.orig +++ /dev/null @@ -1,1091 +0,0 @@ -#global prerelease rc1 - -## Fedora Extras specific customization below... -%bcond_without fedora -%bcond_without upstart -%bcond_without systemd -%bcond_with sysv -%bcond_without tmpfiles -%bcond_with unrar -%bcond_without noarch -%bcond_without bytecode -## - -%ifnarch s390 s390x -%global have_ocaml 1 -%else -%global have_ocaml 0 -%endif - -%global username clamupdate -%global homedir %_var/lib/clamav -%global freshclamlog %_var/log/freshclam.log -%global milteruser clamilt -%global milterlog %_var/log/clamav-milter.log -%global milterstatedir %_var/run/clamav-milter -%global pkgdatadir %_datadir/%name - -%global scanuser clamscan -%global scanstatedir %_var/run/clamd.scan - -%{?with_noarch:%global noarch BuildArch: noarch} -%{!?_unitdir:%global _unitdir /lib/systemd/system} -%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} -%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ -%nil} -%{!?systemd_reqs:%global systemd_reqs \ -Requires(post): /bin/systemctl\ -Requires(preun): /bin/systemctl\ -Requires(postun): /bin/systemctl\ -%nil} -%{!?systemd_install:%global systemd_install()\ -%post %1\ -test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -%preun %1\ -test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ -test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ -%postun %1\ -/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ -%nil} - - -Summary: End-user tools for the Clam Antivirus scanner -Name: clamav -Version: 0.97.3 -Release: %release_func 1700 -License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} -Group: Applications/File -URL: http://www.clamav.net -%if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -%else -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: %name-%version%{?prerelease}-norar.tar.xz -%endif -Source1: clamd-wrapper -Source2: clamd.sysconfig -Source3: clamd.logrotate -Source5: clamd-README -Source6: clamav-update.logrotate -Source7: clamd.SERVICE.init -Source8: clamav-notify-servers -Patch24: clamav-0.92-private.patch -Patch25: clamav-0.92-open.patch -Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95.3-umask.patch -# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… -Patch29: clamav-0.96.2-jitoff.patch -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: clamav-lib = %version-%release -Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: ncurses-devel -BuildRequires: %_includedir/tcpd.h -%{?with_bytecode:BuildRequires: bc tcl groff graphviz} -%if %{have_ocaml} -%{?with_bytecode:BuildRequires: ocaml} -%endif - -%package filesystem -Summary: Filesystem structure for clamav -Group: Applications/File -Provides: user(%username) = 4 -Provides: group(%username) = 4 -# Prevent version mix -Conflicts: %name < %version-%release -Conflicts: %name > %version-%release -BuildRequires: fedora-usermgmt-devel -%{?noarch} -%{?FE_USERADD_REQ} - -%package lib -Summary: Dynamic libraries for the Clam Antivirus scanner -Group: System Environment/Libraries -Requires: data(clamav) - -%package devel -Summary: Header files and libraries for the Clam Antivirus scanner -Group: Development/Libraries -Source100: clamd-gen -Requires: clamav-lib = %version-%release -Requires: clamav-filesystem = %version-%release - -%package data -Summary: Virus signature data for the Clam Antivirus scanner -Group: Applications/File -Requires(pre): clamav-filesystem = %version-%release -Requires(postun): clamav-filesystem = %version-%release -Provides: data(clamav) = full -Conflicts: data(clamav) < full -Conflicts: data(clamav) > full -%{?noarch} - -%package data-empty -Summary: Empty data package for the Clam Antivirus scanner -Group: Applications/File -Provides: data(clamav) = empty -Conflicts: data(clamav) < empty -Conflicts: data(clamav) > empty -%{?noarch} - -%package update -Summary: Auto-updater for the Clam Antivirus scanner data-files -Group: Applications/File -Source200: freshclam-sleep -Source201: freshclam.sysconfig -Source202: clamav-update.cron -Requires: clamav-filesystem = %version-%release -Requires(pre): /etc/cron.d -Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod -Requires(post): group(%username) - -%package server -Summary: Clam Antivirus scanner server -Group: System Environment/Daemons -Requires: data(clamav) -Requires: clamav-filesystem = %version-%release -Requires: clamav-lib = %version-%release - -%package server-sysvinit -Summary: SysV initscripts for clamav server -Group: System Environment/Daemons -Provides: init(clamav-server) = sysv -Requires: clamav-server = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir -Provides: clamav-server-sysv = %version-%release -Obsoletes: clamav-server-sysv < %version-%release -%{?noarch} - - -%package scanner -Summary: Clamav scanner daemon -Group: System Environment/Daemons -Requires: init(clamav-scanner) -Provides: user(%scanuser) = 49 -Provides: group(%scanuser) = 49 -Requires: clamav-server = %version-%release -%{?noarch} - -# Remove me after EOL of RHEL5 -%package scanner-sysvinit -Summary: SysV initscripts for clamav scanner daemon -Group: System Environment/Daemons -Provides: init(clamav-scanner) = sysv -Requires: clamav-server-sysvinit = %version-%release -Requires: clamav-scanner = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -%{?noarch} - -%package scanner-upstart -Summary: Upstart initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source410: clamd.scan.upstart -Provides: init(clamav-scanner) = upstart -Requires: clamav-scanner = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package scanner-systemd -Summary: Systemd initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source430: clamd.scan.systemd -Provides: init(clamav-scanner) = systemd -Requires: clamav-scanner = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-scanner-sysvinit = %version-%release -Obsoletes: %name-scanner-sysvinit < %version-%release -%endif - - -%package milter -Summary: Milter module for the Clam Antivirus scanner -Group: System Environment/Daemons -Source300: README.fedora -Requires: init(clamav-milter) -BuildRequires: sendmail-devel -BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) = 5 -Provides: group(%milteruser) = 5 -Requires(post): coreutils -%{?FE_USERADD_REQ} - -Provides: milter(clamav) = sendmail -Provides: milter(clamav) = postfix - -Provides: clamav-milter-core = %version-%release -Obsoletes: clamav-milter-core < %version-%release -Provides: clamav-milter-sendmail = %version-%release -Obsoletes: clamav-milter-sendmail < %version-%release - -# Remove me after EOL of RHEL5 -%package milter-sysvinit -Summary: SysV initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source320: clamav-milter.sysv -Provides: init(clamav-milter) = sysvinit -Requires: clamav-milter = %version-%release -Requires(post): user(%milteruser) clamav-milter -Requires(preun): user(%milteruser) clamav-milter -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -Provides: clamav-milter-sysv = %version-%release -Obsoletes: clamav-milter-sysv < %version-%release -%{?noarch} - -%package milter-upstart -Summary: Upstart initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source310: clamav-milter.upstart -Provides: init(clamav-milter) = upstart -Requires: clamav-milter = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package milter-systemd -Summary: Systemd initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source330: clamav-milter.systemd -Provides: init(clamav-milter) = systemd -Requires: clamav-milter = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-milter-sysvinit = %version-%release -Obsoletes: %name-milter-sysvinit < %version-%release -%endif - - -%description -Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this -software is the integration with mail servers (attachment scanning). The -package provides a flexible and scalable multi-threaded daemon, a command -line scanner, and a tool for automatic updating via Internet. The programs -are based on a shared library distributed with the Clam AntiVirus package, -which you can use with your own software. The virus database is based on -the virus database from OpenAntiVirus, but contains additional signatures -(including signatures for popular polymorphic viruses, too) and is KEPT UP -TO DATE. - -%description filesystem -This package provides the filesystem structure and contains the -user-creation scripts required by clamav. - -%description lib -This package contains dynamic libraries shared between applications -using the Clam Antivirus scanner. - -%description devel -This package contains headerfiles and libraries which are needed to -build applications using clamav. - -%description data -This package contains the virus-database needed by clamav. This -database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. This package and the -'clamav-data-empty' package are mutually exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description data-empty -This is an empty package to fulfill inter-package dependencies of the -clamav suite. This package and the 'clamav-data' package are mutually -exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description update -This package contains programs which can be used to update the clamav -anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. - -%description server -ATTENTION: most users do not need this package; the main package has -everything (or depends on it) which is needed to scan for virii on -workstations. - -This package contains files which are needed to execute the clamd-daemon. -This daemon does not provide a system-wide service. Instead of, an instance -of this daemon should be started for each service requiring it. - -See the README file how this can be done with a minimum of effort. - - -%description server-sysvinit -SysV initscripts template for the clamav server - - -%description scanner -This package contains a generic system wide clamd service which is -e.g. used by the clamav-milter package. - -%description scanner-sysvinit -The SysV initscripts for clamav-scanner. - -%description scanner-upstart -The Upstart initscripts for clamav-scanner. - -%description scanner-systemd -The systemd initscripts for clamav-scanner. - - -%description milter -This package contains files which are needed to run the clamav-milter. - -%description milter-sysvinit -The SysV initscripts for clamav-milter. - -%description milter-upstart -The Upstart initscripts for clamav-milter. - -%description milter-systemd -The systemd initscripts for clamav-scanner. - -## ------------------------------------------------------------ - -%prep -%setup -q -n %{name}-%{version}%{?prerelease} - -%apply -n24 -p1 -b .private -%apply -n25 -p1 -b .open -%apply -n26 -p1 -b .cliopts -%apply -n27 -p1 -b .umask -%apply -n29 -p1 -b .jitoff -%{?apply_end} - -install -p -m0644 %SOURCE300 clamav-milter/ - -mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} - -sed -ri \ - -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ - -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ - -e 's!^#?(User ).*!\1<USER>!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ - -e 's! /usr/local/share/clamav,! %homedir,!g' \ - etc/clamd.conf - -sed -ri \ - -e 's!^#?(UpdateLogFile )!#\1!g;' \ - -e 's!^#?(LogSyslog).*!\1 yes!g' \ - -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf - - -## ------------------------------------------------------------ - -%build -CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" -export LDFLAGS='-Wl,--as-needed' -# HACK: remove me... -export FRESHCLAM_LIBS='-lz' -# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine -export have_cv_ipv6=yes -%configure \ - --disable-static \ - --disable-rpath \ - --disable-silent-rules \ - --disable-clamav \ - --with-user=%username \ - --with-group=%username \ - --with-dbdir=/var/lib/clamav \ - --enable-milter \ - --enable-clamdtop \ - %{!?with_bytecode:--disable-llvm} \ - %{!?with_unrar:--disable-unrar} - -# TODO: check periodically that CLAMAVUSER is used for freshclam only - - -# build with --as-needed and disable rpath -sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ - libtool - - -make %{?_smp_mflags} - - -## ------------------------------------------------------------ - -%install -rm -rf "$RPM_BUILD_ROOT" _doc* -make DESTDIR="$RPM_BUILD_ROOT" install - -function smartsubst() { - local tmp - local regexp=$1 - shift - - tmp=$(mktemp /tmp/%name-subst.XXXXXX) - for i; do - sed -e "$regexp" "$i" >$tmp - cmp -s $tmp "$i" || cat $tmp >"$i" - rm -f $tmp - done -} - - -install -d -m 0755 \ - $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ - $RPM_BUILD_ROOT%_var/{log,run} \ - $RPM_BUILD_ROOT%milterstatedir \ - $RPM_BUILD_ROOT%pkgdatadir/template \ - $RPM_BUILD_ROOT%_initrddir \ - $RPM_BUILD_ROOT%homedir \ - $RPM_BUILD_ROOT%scanstatedir - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ - $RPM_BUILD_ROOT%_libdir/*.la - - -touch $RPM_BUILD_ROOT%homedir/daily.cld -touch $RPM_BUILD_ROOT%homedir/main.cld - - -## prepare the server-files -install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig -install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate -install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init -install -D -m 0644 -p %SOURCE5 _doc_server/README -install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf - -install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ -install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template - -smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper - - -## prepare the update-files -install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update -install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers -touch $RPM_BUILD_ROOT%freshclamlog - -install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update - -smartsubst 's!webmaster,clamav!webmaster,%username!g; - s!/usr/share/clamav!%pkgdatadir!g; - s!/usr/bin!%_bindir!g; - s!/usr/sbin!%_sbindir!g;' \ - $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ - $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep - - -### The scanner stuff -sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf - -sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ - > $RPM_BUILD_ROOT%_initrddir/clamd.scan - -install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf -install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf -d %scanstatedir 0710 %scanuser %scanuser -EOF - -touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} - - -### The milter stuff -sed -r \ - -e 's!^#?(User).*!\1 %milteruser!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ - -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ - -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ - -e 's! /tmp/clamav-milter.log! %milterlog!g' \ - etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf - -install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf -install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter -install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf -d %milterstatedir 0710 %milteruser %milteruser -EOF - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf -touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} - -%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} -%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} -%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} -%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} -%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} - -# keep clamd-wrapper in every case because it might be needed by other -# packages -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper - -## ------------------------------------------------------------ - -%check -make check - -## ------------------------------------------------------------ - -%clean -rm -rf "$RPM_BUILD_ROOT" - -## ------------------------------------------------------------ - -%pre filesystem -%__fe_groupadd 4 -r %username &>/dev/null || : -%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ - -c 'Clamav database update user' -g %username %username &>/dev/null || : - -%postun filesystem -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - - -%pre scanner -%__fe_groupadd 49 -r %scanuser &>/dev/null || : -%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ - -g %scanuser %scanuser &>/dev/null || : - -%postun scanner -%__fe_userdel %scanuser &>/dev/null || : -%__fe_groupdel %scanuser &>/dev/null || : - - -%post scanner-sysvinit -/sbin/chkconfig --add clamd.scan - -%preun scanner-sysvinit -test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.scan - -%postun scanner-sysvinit -test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : - - -%post scanner-upstart -/usr/bin/killall -u %scanuser clamd 2>/dev/null || : - -%preun scanner-upstart -test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : - - -%systemd_install scanner-systemd clamd.scan.service - - -%post update -test -e %freshclamlog || { - touch %freshclamlog - %__chmod 0664 %freshclamlog - %__chown root:%username %freshclamlog -} - - -%triggerin milter -- clamav-scanner -# Add the milteruser to the scanuser group; this is required when -# milter and clamd communicate through local sockets -/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : - -%pre milter -%__fe_groupadd 5 -r %milteruser &>/dev/null || : -%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : - -%post milter -test -e %milterlog || { - touch %milterlog - chmod 0620 %milterlog - chown root:%milteruser %milterlog -} - -%postun milter -%__fe_userdel %milteruser &>/dev/null || : -%__fe_groupdel %milteruser &>/dev/null || : - - -%post milter-sysvinit -/sbin/chkconfig --add clamav-milter - -%preun milter-sysvinit -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter - -%postun milter-sysvinit -test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - - -%post milter-upstart -/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : - -%preun milter-upstart -test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : - - -%systemd_install milter-systemd clamav-milter.service - - -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE -%doc docs/*.pdf -%_bindir/* -%_mandir/man[15]/* -%exclude %_bindir/clamav-config -%exclude %_bindir/freshclam -%exclude %_mandir/*/freshclam* - -## ----------------------- - -%files lib -%defattr(-,root,root,-) -%_libdir/*.so.* - -## ----------------------- - -%files devel -%defattr(-,root,root,-) -%_includedir/* -%_libdir/*.so -%pkgdatadir/template -%pkgdatadir/clamd-gen -%_libdir/pkgconfig/* -%_bindir/clamav-config - -## ----------------------- - -%files filesystem -%attr(-,%username,%username) %dir %homedir -%attr(-,root,root) %dir %pkgdatadir - -## ----------------------- - -%files data -%defattr(-,%username,%username,-) -# use %%config to keep files which were updated by 'freshclam' -# already. Without this tag, they would be overridden with older -# versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %homedir/*.cvd - - -%files data-empty -%defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/*.cvd - - -## ----------------------- - -%files update -%defattr(-,root,root,-) -%_bindir/freshclam -%_mandir/*/freshclam* -%pkgdatadir/freshclam-sleep -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* -%config(noreplace) %_sysconfdir/cron.d/* -%config(noreplace) %_sysconfdir/sysconfig/freshclam - -%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/*.cld - - -## ----------------------- - -%files server -%defattr(-,root,root,-) -%doc _doc_server/* -%_mandir/man[58]/clamd* -%_sbindir/* -%pkgdatadir/clamd-wrapper -%dir %_sysconfdir/clamd.d - -%exclude %_sbindir/*milter* -%exclude %_mandir/man8/clamav-milter* - - -%files server-sysvinit -%defattr(-,root,root,-) -%_initrddir/clamd-wrapper - - -## ----------------------- - -%files scanner -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/clamd.d/scan.conf -%ghost %scanstatedir/clamd.sock - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamd.scan.conf - %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%else - %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%endif - -%if 0%{?with_sysv:1} -%files scanner-sysvinit - %attr(0755,root,root) %config %_initrddir/clamd.scan - %ghost %scanstatedir/clamd.pid -%endif - -%if 0%{?with_upstart:1} -%files scanner-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamd.scan* -%endif - -%if 0%{?with_systemd:1} -%files scanner-systemd - %defattr(-,root,root,-) - %_unitdir/clamd.scan.service -%endif - -## ----------------------- - -%files milter -%defattr(-,root,root,-) -%doc clamav-milter/README.fedora -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %_sysconfdir/mail/clamav-milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%ghost %milterstatedir/clamav-milter.socket - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamav-milter.conf - %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%else - %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%endif - -%if 0%{?with_sysv:1} -%files milter-sysvinit - %defattr(-,root,root,-) - %config %_initrddir/clamav-milter - %ghost %milterstatedir/clamav-milter.pid -%endif - -%if 0%{?with_upstart:1} -%files milter-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamav-milter* -%endif - -%if 0%{?with_systemd:1} -%files milter-systemd - %defattr(-,root,root,-) - %_unitdir/clamav-milter.service -%endif - - -%changelog -* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 -- updated to 0.97.3 -- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 - -* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 -- updated to 0.97.2 -- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) -- fixed systemd scripts and their installation - -* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 -- updated to 0.97.1 -- fixed Requires(preun) vs. Requires(postun) inconsistency - -* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 -- fixed tmpfiles.d syntax (#696812) - -* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 -- updated to 0.97 -- rediffed some patches - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 -- fixed signal specifier in clamd-wrapper (#668131, James Ralston) - -* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 -- added systemd init scripts which obsolete to old sysvinit ones -- added tmpfiles.d/ descriptions - -* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 -- updated to 0.96.5 -- CVE-2010-4260 Multiple errors within the processing of PDF files can - be exploited to e.g. cause a crash. -- CVE-2010-4261 An off-by-one error within the "icon_cb()" function - can be exploited to cause a memory corruption. - -* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 -- updated to 0.96.4 -- execute 'make check' (#640347) but ignore errors for now because - four checks are failing on f13 - -* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 -- lowered stop priority of sysv initscripts (#629435) - -* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 -- updated to 0.96.3 -- fixes CVE-2010-0405 in shipped bzlib.c copy - -* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 -- updated to 0.96.2 -- rediffed patches -- removed the -jit-disable patch which is replaced upstream by a more - detailed configuration option. - -* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed old %%trigger which renamed the 'clamav' user- and groupnames - to 'clamupdate' -- use 'groupmems', not 'usermod' to add a user to a group because - 'usermod' does not work when user does not exist in local /etc/passwd - -* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 -- ocaml not available (at least) on s390(x) - -* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 -- updated to 0.96.1 -- rediffed patches - -* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 -- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) - -* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 -- updated to final 0.96 -- applied upstream patch which allows to disable JIT compiler (#573191) -- build JIT compiler again -- disabled JIT compiler by default -- removed explicit 'pkgconfig' requirements in -devel (#533956) - -* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 -- do not build the bytecode JIT compiler for now until it can be disabled - at runtime (#573191) - -* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 -- updated to 0.96rc1 -- added some BRs - -* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 -- updated -upstart to upstart 0.6.3 - -* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- adjusted chkconfig positions for clamav-milter (#530101) -- use %%apply instead of %%patch - -* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 -- updated to 0.95.3 - -* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- conditionalized build of noarch subpackages to ease packaging under RHEL5 - -* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 -- modified freshclam configuration to log by syslog by default -- disabled LocalSocket option in sample configuration -- fixed clamav-milter sysv initscript to use bash interpreter and to - be disabled by default - -* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 -- renamed 'clamav' user/group to 'clamupdate' -- add the '%milteruser' user to the '%scanuser' group when the -scanner - subpackage is installed - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 -- updated to 0.95.2 - -* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 -- fixed '--without upstart' operation - -* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 -- added '%%bcond_without upstart' conditional to ease skipping of - -upstart subpackage creation e.g. on EL5 systems -- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which - broke update path - -* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 -- Upgrade to 0.95.1 (#495039) - -* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 -- updated to final 0.95 -- added ncurses-devel (-> clamdtop) BR -- enforced IPv6 support - -* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 -- updated to 0.95rc1 -- added -upstart subpackages -- renamed -sysv to -sysvinit to make -upstart win the default dep resolving -- reworked complete milter stuff -- added -scanner subpackage which contains a preconfigured daemon - (e.g. for use by -milter) -- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old - -* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 -- made some subpackages noarch -- fixed typo in SysV initscript which removes 'touch' file (#473513) - -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 -- Upgrade to 0.94.2 (#474002) - -* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 -- Upgrade to 0.94.1 - -* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 -- Upgrade to 0.94 (SECURITY), fixes #461461: -- CVE-2008-1389 Invalid memory access in the CHM unpacker -- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg -- CVE-2008-3913 Memory leak in code path in freshclam's manager.c -- CVE-2008-3914 Multiple file descriptor leaks on the code paths - -* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 -- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read - on petite files) -- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) -- rediffed patches - -* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 -- updated to 0.93.1 -- rediffed -path patch -- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability - -* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 -- updated to final 0.93 -- removed daily.inc + main.inc directories; they are now replaced by - *.cld containers -- trimmed down MAILTO list of cronjob to 'root' again; every well - configured system has an alias for this recipient - -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 -- moved -milter scriptlets into -milter-core subpackage -- added a requirement on the milteruser to the -milter-sendmail - subpackage (reported by Bruce Jerrick) - -* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 -- updated to 0.93rc1 -- fixed rpath issues - -* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 -- updated to 0.92.1 - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 -- redisabled unrar stuff completely by using clean sources -- splitted -milter subpackage into pieces to allow use without sendmail - (#239037) - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 -- use a better way to disable RPATH-generation (needed for '--with - unrar' builds) - -* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 -- added a README.fedora to the milter package (#240610) -- ship original sources again; unrar is now licensed correctly (no more - stolen code put under GPL). Nevertheless, this license is not GPL - compatible, and to allow libclamav to be used by GPL applications, - unrar is disabled by a ./configure switch. -- use pkg-config in clamav-config to emulate --cflags and --libs - operations (fixes partly multilib issues) -- registered some more auto-updated files and marked them as %%ghost - -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 -- updated to 0.92 (SECURITY): -- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability - -* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of - legal problems (resolves 334371) -- correct license tag - -* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 -- Bump release for upgrade path. - -* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 -- updated to 0.91.2 (SECURITY): -- CVE-2007-4510 DOS in RTF parser -- DOS in html normalizer -- arbitrary command execution by special crafted recipients in - clamav-milter's black-hole mode -- fixed an open(2) issue - -* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 -- updated to 0.91.1 - -* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 -- updated to 0.91 - -* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 -- updated to 0.90.3 -- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both - in FC6- and F7+ - -* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 -- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 -- updated to 0.90.1 -- updated %%doc list - -* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 -- updated to final 0.90 -- removed -visibility patch since fixed upstream - -* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 -- build with -Wl,-as-needed and cleaned up pkgconfig file -- removed old hack which forced installation of freshclam.conf; related - check was removed upstream -- removed static library -- removed %%changelog entries from before 2004 - -* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 -- updated to 0.90rc3 -- splitted mandatory parts from the data-file into a separate -filesystem - subpackage -- added a -data-empty subpackage to allow a setup where database is - updated per cron-job and user does not want to download the large - -data package with outdated virus definitations (#214949) -- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej deleted file mode 100644 index 1096912..0000000 --- a/clamav.spec.rej +++ /dev/null @@ -1,152 +0,0 @@ ---- clamav.spec -+++ clamav.spec -@@ -5,7 +5,7 @@ - Summary: Anti-virus software - Name: clamav - Version: 0.97.3 --Release: 1%{?dist} -+Release: 2%{?dist} - License: GPLv2 - Group: Applications/System - URL: http://www.clamav.net/ -@@ -15,7 +15,14 @@ - Source0: clamav-0.97.3-norar.tar.xz - Source1: clamav.init - Source2: clamav-milter.init --Source3: clamd-wrapper.tar.bz2 -+Source3: clamd-wrapper -+Source4: clamd.init -+Source5: README.clamd-wrapper -+Source6: clamd.sysconfig -+Source7: freshclam.logrotate -+Source8: freshclam.cron -+Source9: clamd.logrotate -+Source10: clamav-milter.sysconfig - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - - BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz -@@ -171,53 +178,6 @@ - s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf - -- --cat <<EOF >clamd.logrotate --%{_localstatedir}/log/clamav/clamd.log { -- missingok -- notifempty -- create 644 clam clam -- postrotate -- killall -HUP clamd 2>/dev/null || : -- endscript --} --EOF -- --cat <<EOF >freshclam.logrotate --%{_localstatedir}/log/clamav/freshclam.log { -- missingok -- notifempty -- create 644 clam clam --} --EOF -- --cat <<'EOF' >freshclam.cron --#!/bin/sh -- --### A simple update script for the clamav virus database. --### This could as well be replaced by a SysV script. -- --### fix log file if needed --LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" --if [ ! -f "$LOG_FILE" ]; then -- touch "$LOG_FILE" -- chmod 644 "$LOG_FILE" -- chown clam.clam "$LOG_FILE" --fi -- --%{_bindir}/freshclam \ -- --quiet \ -- --datadir="%{_localstatedir}/lib/clamav" \ -- --log="$LOG_FILE" --EOF -- --%{__cat} <<EOF >clamav-milter.sysconfig --### Simple config file for clamav-milter, you should --### read the documentation and tweak it as you wish. -- --CLAMAV_FLAGS="" --EOF -- - %build - %configure \ - --program-prefix="%{?_program_prefix}" \ -@@ -240,19 +200,30 @@ - rm -rf %{buildroot} - make install DESTDIR="%{buildroot}" - --install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd --install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam --install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam --install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav -+install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -+install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -+install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+ -+# now rewrite scripts and config files in-place -+sed -i \ -+ -e 's!%%{_sbindir}!%{_sbindir}!g' \ -+ -e 's!%%{_bindir}!%{_bindir}!g' \ -+ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ -+ %{buildroot}%{_sysconfdir}/logrotate.d/* \ -+ %{buildroot}%{_sysconfdir}/cron.daily/freshclam - - %if %{!?_without_milter:1}0 - install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter --install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter -+install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter - %else - rm %{buildroot}%{_mandir}/man8/clamav-milter.8* - %endif -+ - # Install clamav-wrapper: --tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share -+install -d -m0755 %{buildroot}/%{_prefix}/share/clamav -+install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} -+install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} - - install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ - touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log -@@ -345,8 +316,6 @@ - %doc %{_mandir}/man1/clamscan.1* - %doc %{_mandir}/man1/freshclam.1* - %doc %{_mandir}/man5/freshclam.conf.5* --%doc %{_prefix}/share/clamav/README.clamd-wrapper --%{_prefix}/share/clamav/clamd-wrapper - %config(noreplace) %{_sysconfdir}/freshclam.conf - %{_bindir}/clamscan - %{_bindir}/freshclam -@@ -366,10 +335,12 @@ - %config(noreplace) %{_sysconfdir}/clamd.conf - %config(noreplace) %{_sysconfdir}/logrotate.d/clamav - %{_sysconfdir}/clamd.d --%config %{_initrddir}/clamd -+%config %{_initrddir}/clamav - %{_sbindir}/clamd - %{_bindir}/clamconf - %{_bindir}/clamdscan -+%doc %{_prefix}/share/clamav/README.clamd-wrapper -+%{_prefix}/share/clamav/clamd* - - %defattr(0644, clam, clam, 0755) - %{_localstatedir}/run/clamav/ -@@ -409,6 +380,10 @@ - %exclude %{_libdir}/libclamav.la - - %changelog -+* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 -+- Add missing clamd-wrapper supporting files -+- Remove from init script the unused CLAMD_SOCKET variable -+ - * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - - Update to 0.97.3 - - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamd-wrapper b/clamd-wrapper deleted file mode 100644 index 000dcb8..0000000 --- a/clamd-wrapper +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 75 25 -# description: The clamd daemon listens for incoming connections on \ -# Unix or TCP socket and scans files or directories on demand. - -[ -n "$CLAMD_SERVICE" ] || { - echo $"*** $0 can not be called in this way" - echo $"*** Please see /usr/share/doc/clamav-server-*/README how" - echo $"*** the clamav-server can be configured" - exit 6 -} - -# Source function library. -. /etc/init.d/functions - -# Get config. -[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network - -# Check that networking is up. -[ "$NETWORKING" != "no" ] || exit 6 - -lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} -sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} -procname=clamd.${CLAMD_SERVICE} - -CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -CLAMD_OPTIONS= -[ -f "$sysconffile" ] && . "$sysconffile" -CLAMD_PIDFILE=`grep ^PidFile ${CLAMD_CONFIGFILE} | awk '{print $2}'` - -# make sure that config file contains a PidFile setting -[ -n "$CLAMD_PIDFILE" ] || exit 6 - -RETVAL=0 -prog="clamd.${CLAMD_SERVICE}" - -start () { - echo -n $"Starting $prog: " - daemon --pidfile=${CLAMD_PIDFILE} \ - exec -a $procname /usr/sbin/clamd \ - ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop () { - echo -n $"Stopping $prog: " - killproc -p ${CLAMD_PIDFILE} $procname - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -reload() { - rc=0 - echo -n $"Reloading $prog: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? - echo - echo -n $"Loading new virus-database: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? - echo - return $rc -} - -restart () { - stop - start -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 ;; - status) - status -p ${CLAMD_PIDFILE} $procname ;; - condrestart) - [ ! -f $lockfile ] || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 2 -esac diff --git a/clamd.init b/clamd.init deleted file mode 100644 index cf25b46..0000000 --- a/clamd.init +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 75 35 -# -# description: The clamd server running for <SERVICE> -# - -CLAMD_SERVICE=<SERVICE> -. /usr/share/clamav/clamd-wrapper -#!/bin/bash -# -# chkconfig: - 75 35 -# -# description: The clamd server running for <SERVICE> -# - -CLAMD_SERVICE=<SERVICE> -. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate deleted file mode 100644 index b233f3a..0000000 --- a/clamd.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript -} diff --git a/clamd.sysconfig b/clamd.sysconfig deleted file mode 100644 index e0e7714..0000000 --- a/clamd.sysconfig +++ /dev/null @@ -1,5 +0,0 @@ -#CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -#CLAMD_OPTIONS= -## the values below should only ever be specified in the above .conf file! -#CLAMD_SOCKET=/var/run/clamd.${CLAMD_SERVICE}/clamd.sock -#CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid diff --git a/freshclam.cron b/freshclam.cron deleted file mode 100644 index 558a2f2..0000000 --- a/freshclam.cron +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate deleted file mode 100644 index 5a5615a..0000000 --- a/freshclam.logrotate +++ /dev/null @@ -1,10 +0,0 @@ -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} diff --git a/sources b/sources index 05755a5..47b00bc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 656658e8d6f02942b3ae77ddfaa4bcfa15c91f8d Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:39:21 2012 -0600 Revert "Oops, i shouldn't have commited these" This reverts commit f5659018a4a4aea8cdf89db6e1c2a05789da7529. diff --git a/clamav.spec.orig b/clamav.spec.orig new file mode 100644 index 0000000..45aa5db --- /dev/null +++ b/clamav.spec.orig @@ -0,0 +1,1091 @@ +#global prerelease rc1 + +## Fedora Extras specific customization below... +%bcond_without fedora +%bcond_without upstart +%bcond_without systemd +%bcond_with sysv +%bcond_without tmpfiles +%bcond_with unrar +%bcond_without noarch +%bcond_without bytecode +## + +%ifnarch s390 s390x +%global have_ocaml 1 +%else +%global have_ocaml 0 +%endif + +%global username clamupdate +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log +%global milterstatedir %_var/run/clamav-milter +%global pkgdatadir %_datadir/%name + +%global scanuser clamscan +%global scanstatedir %_var/run/clamd.scan + +%{?with_noarch:%global noarch BuildArch: noarch} +%{!?_unitdir:%global _unitdir /lib/systemd/system} +%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} +%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ +%nil} +%{!?systemd_reqs:%global systemd_reqs \ +Requires(post): /bin/systemctl\ +Requires(preun): /bin/systemctl\ +Requires(postun): /bin/systemctl\ +%nil} +%{!?systemd_install:%global systemd_install()\ +%post %1\ +test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +%preun %1\ +test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ +test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ +%postun %1\ +/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ +%nil} + + +Summary: End-user tools for the Clam Antivirus scanner +Name: clamav +Version: 0.97.3 +Release: %release_func 1700 +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} +Group: Applications/File +URL: http://www.clamav.net +%if 0%{?with_unrar:1} +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +%else +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +Source0: %name-%version%{?prerelease}-norar.tar.xz +%endif +Source1: clamd-wrapper +Source2: clamd.sysconfig +Source3: clamd.logrotate +Source5: clamd-README +Source6: clamav-update.logrotate +Source7: clamd.SERVICE.init +Source8: clamav-notify-servers +Patch24: clamav-0.92-private.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95.3-umask.patch +# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… +Patch29: clamav-0.96.2-jitoff.patch +BuildRoot: %_tmppath/%name-%version-%release-root +Requires: clamav-lib = %version-%release +Requires: data(clamav) +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel +BuildRequires: %_includedir/tcpd.h +%{?with_bytecode:BuildRequires: bc tcl groff graphviz} +%if %{have_ocaml} +%{?with_bytecode:BuildRequires: ocaml} +%endif + +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(%username) = 4 +Provides: group(%username) = 4 +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?noarch} +%{?FE_USERADD_REQ} + +%package lib +Summary: Dynamic libraries for the Clam Antivirus scanner +Group: System Environment/Libraries +Requires: data(clamav) + +%package devel +Summary: Header files and libraries for the Clam Antivirus scanner +Group: Development/Libraries +Source100: clamd-gen +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release + +%package data +Summary: Virus signature data for the Clam Antivirus scanner +Group: Applications/File +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full +%{?noarch} + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty +%{?noarch} + +%package update +Summary: Auto-updater for the Clam Antivirus scanner data-files +Group: Applications/File +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.cron +Requires: clamav-filesystem = %version-%release +Requires(pre): /etc/cron.d +Requires(postun): /etc/cron.d +Requires(post): %__chown %__chmod +Requires(post): group(%username) + +%package server +Summary: Clam Antivirus scanner server +Group: System Environment/Daemons +Requires: data(clamav) +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release + +%package server-sysvinit +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} + + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 +Requires: clamav-server = %version-%release +%{?noarch} + +# Remove me after EOL of RHEL5 +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +%{?noarch} + +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source410: clamd.scan.upstart +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package scanner-systemd +Summary: Systemd initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source430: clamd.scan.systemd +Provides: init(clamav-scanner) = systemd +Requires: clamav-scanner = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-scanner-sysvinit = %version-%release +Obsoletes: %name-scanner-sysvinit < %version-%release +%endif + + +%package milter +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Source300: README.fedora +Requires: init(clamav-milter) +BuildRequires: sendmail-devel +BuildRequires: fedora-usermgmt-devel +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 +Requires(post): coreutils +%{?FE_USERADD_REQ} + +Provides: milter(clamav) = sendmail +Provides: milter(clamav) = postfix + +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release + +# Remove me after EOL of RHEL5 +%package milter-sysvinit +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source320: clamav-milter.sysv +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} + +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source310: clamav-milter.upstart +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package milter-systemd +Summary: Systemd initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source330: clamav-milter.systemd +Provides: init(clamav-milter) = systemd +Requires: clamav-milter = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-milter-sysvinit = %version-%release +Obsoletes: %name-milter-sysvinit < %version-%release +%endif + + +%description +Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this +software is the integration with mail servers (attachment scanning). The +package provides a flexible and scalable multi-threaded daemon, a command +line scanner, and a tool for automatic updating via Internet. The programs +are based on a shared library distributed with the Clam AntiVirus package, +which you can use with your own software. The virus database is based on +the virus database from OpenAntiVirus, but contains additional signatures +(including signatures for popular polymorphic viruses, too) and is KEPT UP +TO DATE. + +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. + +%description lib +This package contains dynamic libraries shared between applications +using the Clam Antivirus scanner. + +%description devel +This package contains headerfiles and libraries which are needed to +build applications using clamav. + +%description data +This package contains the virus-database needed by clamav. This +database should be updated regularly; the 'clamav-update' package +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description update +This package contains programs which can be used to update the clamav +anti-virus database automatically. It uses the freshclam(1) utility for +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. + +%description server +ATTENTION: most users do not need this package; the main package has +everything (or depends on it) which is needed to scan for virii on +workstations. + +This package contains files which are needed to execute the clamd-daemon. +This daemon does not provide a system-wide service. Instead of, an instance +of this daemon should be started for each service requiring it. + +See the README file how this can be done with a minimum of effort. + + +%description server-sysvinit +SysV initscripts template for the clamav server + + +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + +%description scanner-systemd +The systemd initscripts for clamav-scanner. + + +%description milter +This package contains files which are needed to run the clamav-milter. + +%description milter-sysvinit +The SysV initscripts for clamav-milter. + +%description milter-upstart +The Upstart initscripts for clamav-milter. + +%description milter-systemd +The systemd initscripts for clamav-scanner. + +## ------------------------------------------------------------ + +%prep +%setup -q -n %{name}-%{version}%{?prerelease} + +%apply -n24 -p1 -b .private +%apply -n25 -p1 -b .open +%apply -n26 -p1 -b .cliopts +%apply -n27 -p1 -b .umask +%apply -n29 -p1 -b .jitoff +%{?apply_end} + +install -p -m0644 %SOURCE300 clamav-milter/ + +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} + +sed -ri \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf + +sed -ri \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf + + +## ------------------------------------------------------------ + +%build +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me... +export FRESHCLAM_LIBS='-lz' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes +%configure \ + --disable-static \ + --disable-rpath \ + --disable-silent-rules \ + --disable-clamav \ + --with-user=%username \ + --with-group=%username \ + --with-dbdir=/var/lib/clamav \ + --enable-milter \ + --enable-clamdtop \ + %{!?with_bytecode:--disable-llvm} \ + %{!?with_unrar:--disable-unrar} + +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool + + +make %{?_smp_mflags} + + +## ------------------------------------------------------------ + +%install +rm -rf "$RPM_BUILD_ROOT" _doc* +make DESTDIR="$RPM_BUILD_ROOT" install + +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + +install -d -m 0755 \ + $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ + $RPM_BUILD_ROOT%_var/{log,run} \ + $RPM_BUILD_ROOT%milterstatedir \ + $RPM_BUILD_ROOT%pkgdatadir/template \ + $RPM_BUILD_ROOT%_initrddir \ + $RPM_BUILD_ROOT%homedir \ + $RPM_BUILD_ROOT%scanstatedir + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ + $RPM_BUILD_ROOT%_libdir/*.la + + +touch $RPM_BUILD_ROOT%homedir/daily.cld +touch $RPM_BUILD_ROOT%homedir/main.cld + + +## prepare the server-files +install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate +install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init +install -D -m 0644 -p %SOURCE5 _doc_server/README +install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf + +install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ +install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template + +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper + + +## prepare the update-files +install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update +install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers +touch $RPM_BUILD_ROOT%freshclamlog + +install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update + +smartsubst 's!webmaster,clamav!webmaster,%username!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep + + +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf + +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan + +install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf +install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf +d %scanstatedir 0710 %scanuser %scanuser +EOF + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} + + +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf + +install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf +install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf +d %milterstatedir 0710 %milteruser %milteruser +EOF + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} + +%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} +%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} +%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} +%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} +%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} + +# keep clamd-wrapper in every case because it might be needed by other +# packages +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper + +## ------------------------------------------------------------ + +%check +make check + +## ------------------------------------------------------------ + +%clean +rm -rf "$RPM_BUILD_ROOT" + +## ------------------------------------------------------------ + +%pre filesystem +%__fe_groupadd 4 -r %username &>/dev/null || : +%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ + -c 'Clamav database update user' -g %username %username &>/dev/null || : + +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + +%pre scanner +%__fe_groupadd 49 -r %scanuser &>/dev/null || : +%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ + -g %scanuser %scanuser &>/dev/null || : + +%postun scanner +%__fe_userdel %scanuser &>/dev/null || : +%__fe_groupdel %scanuser &>/dev/null || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + +%systemd_install scanner-systemd clamd.scan.service + + +%post update +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%username %freshclamlog +} + + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : + +%pre milter +%__fe_groupadd 5 -r %milteruser &>/dev/null || : +%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ + -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : + +%post milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} + +%postun milter +%__fe_userdel %milteruser &>/dev/null || : +%__fe_groupdel %milteruser &>/dev/null || : + + +%post milter-sysvinit +/sbin/chkconfig --add clamav-milter + +%preun milter-sysvinit +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter + +%postun milter-sysvinit +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : + + +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : + +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : + + +%systemd_install milter-systemd clamav-milter.service + + +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE +%doc docs/*.pdf +%_bindir/* +%_mandir/man[15]/* +%exclude %_bindir/clamav-config +%exclude %_bindir/freshclam +%exclude %_mandir/*/freshclam* + +## ----------------------- + +%files lib +%defattr(-,root,root,-) +%_libdir/*.so.* + +## ----------------------- + +%files devel +%defattr(-,root,root,-) +%_includedir/* +%_libdir/*.so +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config + +## ----------------------- + +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + +%files data +%defattr(-,%username,%username,-) +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. +%config %verify(not size md5 mtime) %homedir/*.cvd + + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/*.cvd + + +## ----------------------- + +%files update +%defattr(-,root,root,-) +%_bindir/freshclam +%_mandir/*/freshclam* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/* +%config(noreplace) %_sysconfdir/sysconfig/freshclam + +%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/*.cld + + +## ----------------------- + +%files server +%defattr(-,root,root,-) +%doc _doc_server/* +%_mandir/man[58]/clamd* +%_sbindir/* +%pkgdatadir/clamd-wrapper +%dir %_sysconfdir/clamd.d + +%exclude %_sbindir/*milter* +%exclude %_mandir/man8/clamav-milter* + + +%files server-sysvinit +%defattr(-,root,root,-) +%_initrddir/clamd-wrapper + + +## ----------------------- + +%files scanner +%defattr(-,root,root,-) +%config(noreplace) %_sysconfdir/clamd.d/scan.conf +%ghost %scanstatedir/clamd.sock + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamd.scan.conf + %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%else + %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%endif + +%if 0%{?with_sysv:1} +%files scanner-sysvinit + %attr(0755,root,root) %config %_initrddir/clamd.scan + %ghost %scanstatedir/clamd.pid +%endif + +%if 0%{?with_upstart:1} +%files scanner-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamd.scan* +%endif + +%if 0%{?with_systemd:1} +%files scanner-systemd + %defattr(-,root,root,-) + %_unitdir/clamd.scan.service +%endif + +## ----------------------- + +%files milter +%defattr(-,root,root,-) +%doc clamav-milter/README.fedora +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%ghost %milterstatedir/clamav-milter.socket + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamav-milter.conf + %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%else + %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%endif + +%if 0%{?with_sysv:1} +%files milter-sysvinit + %defattr(-,root,root,-) + %config %_initrddir/clamav-milter + %ghost %milterstatedir/clamav-milter.pid +%endif + +%if 0%{?with_upstart:1} +%files milter-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamav-milter* +%endif + +%if 0%{?with_systemd:1} +%files milter-systemd + %defattr(-,root,root,-) + %_unitdir/clamav-milter.service +%endif + + +%changelog +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 +- updated to 0.97.3 +- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 + +* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 +- updated to 0.97.2 +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) +- fixed systemd scripts and their installation + +* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 +- updated to 0.97.1 +- fixed Requires(preun) vs. Requires(postun) inconsistency + +* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 +- fixed tmpfiles.d syntax (#696812) + +* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 +- updated to 0.97 +- rediffed some patches + +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 +- fixed signal specifier in clamd-wrapper (#668131, James Ralston) + +* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 +- added systemd init scripts which obsolete to old sysvinit ones +- added tmpfiles.d/ descriptions + +* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 +- updated to 0.96.5 +- CVE-2010-4260 Multiple errors within the processing of PDF files can + be exploited to e.g. cause a crash. +- CVE-2010-4261 An off-by-one error within the "icon_cb()" function + can be exploited to cause a memory corruption. + +* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 +- updated to 0.96.4 +- execute 'make check' (#640347) but ignore errors for now because + four checks are failing on f13 + +* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 +- lowered stop priority of sysv initscripts (#629435) + +* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 +- updated to 0.96.3 +- fixes CVE-2010-0405 in shipped bzlib.c copy + +* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 +- updated to 0.96.2 +- rediffed patches +- removed the -jit-disable patch which is replaced upstream by a more + detailed configuration option. + +* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed old %%trigger which renamed the 'clamav' user- and groupnames + to 'clamupdate' +- use 'groupmems', not 'usermod' to add a user to a group because + 'usermod' does not work when user does not exist in local /etc/passwd + +* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 +- ocaml not available (at least) on s390(x) + +* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 +- updated to 0.96.1 +- rediffed patches + +* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 +- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) + +* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 +- updated to final 0.96 +- applied upstream patch which allows to disable JIT compiler (#573191) +- build JIT compiler again +- disabled JIT compiler by default +- removed explicit 'pkgconfig' requirements in -devel (#533956) + +* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 +- do not build the bytecode JIT compiler for now until it can be disabled + at runtime (#573191) + +* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 +- updated to 0.96rc1 +- added some BRs + +* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 +- updated -upstart to upstart 0.6.3 + +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) +- use %%apply instead of %%patch + +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 +- updated to 0.95.3 + +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches + +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej new file mode 100644 index 0000000..1096912 --- /dev/null +++ b/clamav.spec.rej @@ -0,0 +1,152 @@ +--- clamav.spec ++++ clamav.spec +@@ -5,7 +5,7 @@ + Summary: Anti-virus software + Name: clamav + Version: 0.97.3 +-Release: 1%{?dist} ++Release: 2%{?dist} + License: GPLv2 + Group: Applications/System + URL: http://www.clamav.net/ +@@ -15,7 +15,14 @@ + Source0: clamav-0.97.3-norar.tar.xz + Source1: clamav.init + Source2: clamav-milter.init +-Source3: clamd-wrapper.tar.bz2 ++Source3: clamd-wrapper ++Source4: clamd.init ++Source5: README.clamd-wrapper ++Source6: clamd.sysconfig ++Source7: freshclam.logrotate ++Source8: freshclam.cron ++Source9: clamd.logrotate ++Source10: clamav-milter.sysconfig + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz +@@ -171,53 +178,6 @@ + s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; + ' etc/clamav-milter.conf + +- +-cat <<EOF >clamd.logrotate +-%{_localstatedir}/log/clamav/clamd.log { +- missingok +- notifempty +- create 644 clam clam +- postrotate +- killall -HUP clamd 2>/dev/null || : +- endscript +-} +-EOF +- +-cat <<EOF >freshclam.logrotate +-%{_localstatedir}/log/clamav/freshclam.log { +- missingok +- notifempty +- create 644 clam clam +-} +-EOF +- +-cat <<'EOF' >freshclam.cron +-#!/bin/sh +- +-### A simple update script for the clamav virus database. +-### This could as well be replaced by a SysV script. +- +-### fix log file if needed +-LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +-if [ ! -f "$LOG_FILE" ]; then +- touch "$LOG_FILE" +- chmod 644 "$LOG_FILE" +- chown clam.clam "$LOG_FILE" +-fi +- +-%{_bindir}/freshclam \ +- --quiet \ +- --datadir="%{_localstatedir}/lib/clamav" \ +- --log="$LOG_FILE" +-EOF +- +-%{__cat} <<EOF >clamav-milter.sysconfig +-### Simple config file for clamav-milter, you should +-### read the documentation and tweak it as you wish. +- +-CLAMAV_FLAGS="" +-EOF +- + %build + %configure \ + --program-prefix="%{?_program_prefix}" \ +@@ -240,19 +200,30 @@ + rm -rf %{buildroot} + make install DESTDIR="%{buildroot}" + +-install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +-install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +-install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +-install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav ++install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam ++install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam ++install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++ ++# now rewrite scripts and config files in-place ++sed -i \ ++ -e 's!%%{_sbindir}!%{_sbindir}!g' \ ++ -e 's!%%{_bindir}!%{_bindir}!g' \ ++ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ ++ %{buildroot}%{_sysconfdir}/logrotate.d/* \ ++ %{buildroot}%{_sysconfdir}/cron.daily/freshclam + + %if %{!?_without_milter:1}0 + install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter +-install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter ++install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter + %else + rm %{buildroot}%{_mandir}/man8/clamav-milter.8* + %endif ++ + # Install clamav-wrapper: +-tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share ++install -d -m0755 %{buildroot}/%{_prefix}/share/clamav ++install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} ++install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} + + install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ + touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log +@@ -345,8 +316,6 @@ + %doc %{_mandir}/man1/clamscan.1* + %doc %{_mandir}/man1/freshclam.1* + %doc %{_mandir}/man5/freshclam.conf.5* +-%doc %{_prefix}/share/clamav/README.clamd-wrapper +-%{_prefix}/share/clamav/clamd-wrapper + %config(noreplace) %{_sysconfdir}/freshclam.conf + %{_bindir}/clamscan + %{_bindir}/freshclam +@@ -366,10 +335,12 @@ + %config(noreplace) %{_sysconfdir}/clamd.conf + %config(noreplace) %{_sysconfdir}/logrotate.d/clamav + %{_sysconfdir}/clamd.d +-%config %{_initrddir}/clamd ++%config %{_initrddir}/clamav + %{_sbindir}/clamd + %{_bindir}/clamconf + %{_bindir}/clamdscan ++%doc %{_prefix}/share/clamav/README.clamd-wrapper ++%{_prefix}/share/clamav/clamd* + + %defattr(0644, clam, clam, 0755) + %{_localstatedir}/run/clamav/ +@@ -409,6 +380,10 @@ + %exclude %{_libdir}/libclamav.la + + %changelog ++* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 ++- Add missing clamd-wrapper supporting files ++- Remove from init script the unused CLAMD_SOCKET variable ++ + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 + - Update to 0.97.3 + - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 commit 2cfebfc9fa6a0f416d9849cb8bbe86ec430c9259 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Dec 20 10:31:23 2011 +0100 Remove duplicate section causing logrotate errors nightly diff --git a/freshclam.logrotate b/freshclam.logrotate index 5a5615a..272d220 100644 --- a/freshclam.logrotate +++ b/freshclam.logrotate @@ -3,8 +3,3 @@ notifempty create 644 clam clam } -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} commit f5659018a4a4aea8cdf89db6e1c2a05789da7529 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Dec 13 17:52:59 2011 -0600 Oops, i shouldn't have commited these diff --git a/clamav.spec.orig b/clamav.spec.orig deleted file mode 100644 index 45aa5db..0000000 --- a/clamav.spec.orig +++ /dev/null @@ -1,1091 +0,0 @@ -#global prerelease rc1 - -## Fedora Extras specific customization below... -%bcond_without fedora -%bcond_without upstart -%bcond_without systemd -%bcond_with sysv -%bcond_without tmpfiles -%bcond_with unrar -%bcond_without noarch -%bcond_without bytecode -## - -%ifnarch s390 s390x -%global have_ocaml 1 -%else -%global have_ocaml 0 -%endif - -%global username clamupdate -%global homedir %_var/lib/clamav -%global freshclamlog %_var/log/freshclam.log -%global milteruser clamilt -%global milterlog %_var/log/clamav-milter.log -%global milterstatedir %_var/run/clamav-milter -%global pkgdatadir %_datadir/%name - -%global scanuser clamscan -%global scanstatedir %_var/run/clamd.scan - -%{?with_noarch:%global noarch BuildArch: noarch} -%{!?_unitdir:%global _unitdir /lib/systemd/system} -%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} -%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ -%nil} -%{!?systemd_reqs:%global systemd_reqs \ -Requires(post): /bin/systemctl\ -Requires(preun): /bin/systemctl\ -Requires(postun): /bin/systemctl\ -%nil} -%{!?systemd_install:%global systemd_install()\ -%post %1\ -test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -%preun %1\ -test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ -test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ -%postun %1\ -/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ -%nil} - - -Summary: End-user tools for the Clam Antivirus scanner -Name: clamav -Version: 0.97.3 -Release: %release_func 1700 -License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} -Group: Applications/File -URL: http://www.clamav.net -%if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -%else -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: %name-%version%{?prerelease}-norar.tar.xz -%endif -Source1: clamd-wrapper -Source2: clamd.sysconfig -Source3: clamd.logrotate -Source5: clamd-README -Source6: clamav-update.logrotate -Source7: clamd.SERVICE.init -Source8: clamav-notify-servers -Patch24: clamav-0.92-private.patch -Patch25: clamav-0.92-open.patch -Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95.3-umask.patch -# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… -Patch29: clamav-0.96.2-jitoff.patch -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: clamav-lib = %version-%release -Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: ncurses-devel -BuildRequires: %_includedir/tcpd.h -%{?with_bytecode:BuildRequires: bc tcl groff graphviz} -%if %{have_ocaml} -%{?with_bytecode:BuildRequires: ocaml} -%endif - -%package filesystem -Summary: Filesystem structure for clamav -Group: Applications/File -Provides: user(%username) = 4 -Provides: group(%username) = 4 -# Prevent version mix -Conflicts: %name < %version-%release -Conflicts: %name > %version-%release -BuildRequires: fedora-usermgmt-devel -%{?noarch} -%{?FE_USERADD_REQ} - -%package lib -Summary: Dynamic libraries for the Clam Antivirus scanner -Group: System Environment/Libraries -Requires: data(clamav) - -%package devel -Summary: Header files and libraries for the Clam Antivirus scanner -Group: Development/Libraries -Source100: clamd-gen -Requires: clamav-lib = %version-%release -Requires: clamav-filesystem = %version-%release - -%package data -Summary: Virus signature data for the Clam Antivirus scanner -Group: Applications/File -Requires(pre): clamav-filesystem = %version-%release -Requires(postun): clamav-filesystem = %version-%release -Provides: data(clamav) = full -Conflicts: data(clamav) < full -Conflicts: data(clamav) > full -%{?noarch} - -%package data-empty -Summary: Empty data package for the Clam Antivirus scanner -Group: Applications/File -Provides: data(clamav) = empty -Conflicts: data(clamav) < empty -Conflicts: data(clamav) > empty -%{?noarch} - -%package update -Summary: Auto-updater for the Clam Antivirus scanner data-files -Group: Applications/File -Source200: freshclam-sleep -Source201: freshclam.sysconfig -Source202: clamav-update.cron -Requires: clamav-filesystem = %version-%release -Requires(pre): /etc/cron.d -Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod -Requires(post): group(%username) - -%package server -Summary: Clam Antivirus scanner server -Group: System Environment/Daemons -Requires: data(clamav) -Requires: clamav-filesystem = %version-%release -Requires: clamav-lib = %version-%release - -%package server-sysvinit -Summary: SysV initscripts for clamav server -Group: System Environment/Daemons -Provides: init(clamav-server) = sysv -Requires: clamav-server = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir -Provides: clamav-server-sysv = %version-%release -Obsoletes: clamav-server-sysv < %version-%release -%{?noarch} - - -%package scanner -Summary: Clamav scanner daemon -Group: System Environment/Daemons -Requires: init(clamav-scanner) -Provides: user(%scanuser) = 49 -Provides: group(%scanuser) = 49 -Requires: clamav-server = %version-%release -%{?noarch} - -# Remove me after EOL of RHEL5 -%package scanner-sysvinit -Summary: SysV initscripts for clamav scanner daemon -Group: System Environment/Daemons -Provides: init(clamav-scanner) = sysv -Requires: clamav-server-sysvinit = %version-%release -Requires: clamav-scanner = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -%{?noarch} - -%package scanner-upstart -Summary: Upstart initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source410: clamd.scan.upstart -Provides: init(clamav-scanner) = upstart -Requires: clamav-scanner = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package scanner-systemd -Summary: Systemd initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source430: clamd.scan.systemd -Provides: init(clamav-scanner) = systemd -Requires: clamav-scanner = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-scanner-sysvinit = %version-%release -Obsoletes: %name-scanner-sysvinit < %version-%release -%endif - - -%package milter -Summary: Milter module for the Clam Antivirus scanner -Group: System Environment/Daemons -Source300: README.fedora -Requires: init(clamav-milter) -BuildRequires: sendmail-devel -BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) = 5 -Provides: group(%milteruser) = 5 -Requires(post): coreutils -%{?FE_USERADD_REQ} - -Provides: milter(clamav) = sendmail -Provides: milter(clamav) = postfix - -Provides: clamav-milter-core = %version-%release -Obsoletes: clamav-milter-core < %version-%release -Provides: clamav-milter-sendmail = %version-%release -Obsoletes: clamav-milter-sendmail < %version-%release - -# Remove me after EOL of RHEL5 -%package milter-sysvinit -Summary: SysV initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source320: clamav-milter.sysv -Provides: init(clamav-milter) = sysvinit -Requires: clamav-milter = %version-%release -Requires(post): user(%milteruser) clamav-milter -Requires(preun): user(%milteruser) clamav-milter -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -Provides: clamav-milter-sysv = %version-%release -Obsoletes: clamav-milter-sysv < %version-%release -%{?noarch} - -%package milter-upstart -Summary: Upstart initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source310: clamav-milter.upstart -Provides: init(clamav-milter) = upstart -Requires: clamav-milter = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package milter-systemd -Summary: Systemd initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source330: clamav-milter.systemd -Provides: init(clamav-milter) = systemd -Requires: clamav-milter = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-milter-sysvinit = %version-%release -Obsoletes: %name-milter-sysvinit < %version-%release -%endif - - -%description -Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this -software is the integration with mail servers (attachment scanning). The -package provides a flexible and scalable multi-threaded daemon, a command -line scanner, and a tool for automatic updating via Internet. The programs -are based on a shared library distributed with the Clam AntiVirus package, -which you can use with your own software. The virus database is based on -the virus database from OpenAntiVirus, but contains additional signatures -(including signatures for popular polymorphic viruses, too) and is KEPT UP -TO DATE. - -%description filesystem -This package provides the filesystem structure and contains the -user-creation scripts required by clamav. - -%description lib -This package contains dynamic libraries shared between applications -using the Clam Antivirus scanner. - -%description devel -This package contains headerfiles and libraries which are needed to -build applications using clamav. - -%description data -This package contains the virus-database needed by clamav. This -database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. This package and the -'clamav-data-empty' package are mutually exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description data-empty -This is an empty package to fulfill inter-package dependencies of the -clamav suite. This package and the 'clamav-data' package are mutually -exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description update -This package contains programs which can be used to update the clamav -anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. - -%description server -ATTENTION: most users do not need this package; the main package has -everything (or depends on it) which is needed to scan for virii on -workstations. - -This package contains files which are needed to execute the clamd-daemon. -This daemon does not provide a system-wide service. Instead of, an instance -of this daemon should be started for each service requiring it. - -See the README file how this can be done with a minimum of effort. - - -%description server-sysvinit -SysV initscripts template for the clamav server - - -%description scanner -This package contains a generic system wide clamd service which is -e.g. used by the clamav-milter package. - -%description scanner-sysvinit -The SysV initscripts for clamav-scanner. - -%description scanner-upstart -The Upstart initscripts for clamav-scanner. - -%description scanner-systemd -The systemd initscripts for clamav-scanner. - - -%description milter -This package contains files which are needed to run the clamav-milter. - -%description milter-sysvinit -The SysV initscripts for clamav-milter. - -%description milter-upstart -The Upstart initscripts for clamav-milter. - -%description milter-systemd -The systemd initscripts for clamav-scanner. - -## ------------------------------------------------------------ - -%prep -%setup -q -n %{name}-%{version}%{?prerelease} - -%apply -n24 -p1 -b .private -%apply -n25 -p1 -b .open -%apply -n26 -p1 -b .cliopts -%apply -n27 -p1 -b .umask -%apply -n29 -p1 -b .jitoff -%{?apply_end} - -install -p -m0644 %SOURCE300 clamav-milter/ - -mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} - -sed -ri \ - -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ - -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ - -e 's!^#?(User ).*!\1<USER>!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ - -e 's! /usr/local/share/clamav,! %homedir,!g' \ - etc/clamd.conf - -sed -ri \ - -e 's!^#?(UpdateLogFile )!#\1!g;' \ - -e 's!^#?(LogSyslog).*!\1 yes!g' \ - -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf - - -## ------------------------------------------------------------ - -%build -CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" -export LDFLAGS='-Wl,--as-needed' -# HACK: remove me... -export FRESHCLAM_LIBS='-lz' -# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine -export have_cv_ipv6=yes -%configure \ - --disable-static \ - --disable-rpath \ - --disable-silent-rules \ - --disable-clamav \ - --with-user=%username \ - --with-group=%username \ - --with-dbdir=/var/lib/clamav \ - --enable-milter \ - --enable-clamdtop \ - %{!?with_bytecode:--disable-llvm} \ - %{!?with_unrar:--disable-unrar} - -# TODO: check periodically that CLAMAVUSER is used for freshclam only - - -# build with --as-needed and disable rpath -sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ - libtool - - -make %{?_smp_mflags} - - -## ------------------------------------------------------------ - -%install -rm -rf "$RPM_BUILD_ROOT" _doc* -make DESTDIR="$RPM_BUILD_ROOT" install - -function smartsubst() { - local tmp - local regexp=$1 - shift - - tmp=$(mktemp /tmp/%name-subst.XXXXXX) - for i; do - sed -e "$regexp" "$i" >$tmp - cmp -s $tmp "$i" || cat $tmp >"$i" - rm -f $tmp - done -} - - -install -d -m 0755 \ - $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ - $RPM_BUILD_ROOT%_var/{log,run} \ - $RPM_BUILD_ROOT%milterstatedir \ - $RPM_BUILD_ROOT%pkgdatadir/template \ - $RPM_BUILD_ROOT%_initrddir \ - $RPM_BUILD_ROOT%homedir \ - $RPM_BUILD_ROOT%scanstatedir - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ - $RPM_BUILD_ROOT%_libdir/*.la - - -touch $RPM_BUILD_ROOT%homedir/daily.cld -touch $RPM_BUILD_ROOT%homedir/main.cld - - -## prepare the server-files -install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig -install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate -install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init -install -D -m 0644 -p %SOURCE5 _doc_server/README -install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf - -install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ -install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template - -smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper - - -## prepare the update-files -install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update -install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers -touch $RPM_BUILD_ROOT%freshclamlog - -install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update - -smartsubst 's!webmaster,clamav!webmaster,%username!g; - s!/usr/share/clamav!%pkgdatadir!g; - s!/usr/bin!%_bindir!g; - s!/usr/sbin!%_sbindir!g;' \ - $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ - $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep - - -### The scanner stuff -sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf - -sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ - > $RPM_BUILD_ROOT%_initrddir/clamd.scan - -install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf -install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf -d %scanstatedir 0710 %scanuser %scanuser -EOF - -touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} - - -### The milter stuff -sed -r \ - -e 's!^#?(User).*!\1 %milteruser!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ - -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ - -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ - -e 's! /tmp/clamav-milter.log! %milterlog!g' \ - etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf - -install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf -install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter -install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf -d %milterstatedir 0710 %milteruser %milteruser -EOF - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf -touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} - -%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} -%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} -%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} -%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} -%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} - -# keep clamd-wrapper in every case because it might be needed by other -# packages -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper - -## ------------------------------------------------------------ - -%check -make check - -## ------------------------------------------------------------ - -%clean -rm -rf "$RPM_BUILD_ROOT" - -## ------------------------------------------------------------ - -%pre filesystem -%__fe_groupadd 4 -r %username &>/dev/null || : -%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ - -c 'Clamav database update user' -g %username %username &>/dev/null || : - -%postun filesystem -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - - -%pre scanner -%__fe_groupadd 49 -r %scanuser &>/dev/null || : -%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ - -g %scanuser %scanuser &>/dev/null || : - -%postun scanner -%__fe_userdel %scanuser &>/dev/null || : -%__fe_groupdel %scanuser &>/dev/null || : - - -%post scanner-sysvinit -/sbin/chkconfig --add clamd.scan - -%preun scanner-sysvinit -test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.scan - -%postun scanner-sysvinit -test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : - - -%post scanner-upstart -/usr/bin/killall -u %scanuser clamd 2>/dev/null || : - -%preun scanner-upstart -test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : - - -%systemd_install scanner-systemd clamd.scan.service - - -%post update -test -e %freshclamlog || { - touch %freshclamlog - %__chmod 0664 %freshclamlog - %__chown root:%username %freshclamlog -} - - -%triggerin milter -- clamav-scanner -# Add the milteruser to the scanuser group; this is required when -# milter and clamd communicate through local sockets -/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : - -%pre milter -%__fe_groupadd 5 -r %milteruser &>/dev/null || : -%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : - -%post milter -test -e %milterlog || { - touch %milterlog - chmod 0620 %milterlog - chown root:%milteruser %milterlog -} - -%postun milter -%__fe_userdel %milteruser &>/dev/null || : -%__fe_groupdel %milteruser &>/dev/null || : - - -%post milter-sysvinit -/sbin/chkconfig --add clamav-milter - -%preun milter-sysvinit -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter - -%postun milter-sysvinit -test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - - -%post milter-upstart -/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : - -%preun milter-upstart -test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : - - -%systemd_install milter-systemd clamav-milter.service - - -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE -%doc docs/*.pdf -%_bindir/* -%_mandir/man[15]/* -%exclude %_bindir/clamav-config -%exclude %_bindir/freshclam -%exclude %_mandir/*/freshclam* - -## ----------------------- - -%files lib -%defattr(-,root,root,-) -%_libdir/*.so.* - -## ----------------------- - -%files devel -%defattr(-,root,root,-) -%_includedir/* -%_libdir/*.so -%pkgdatadir/template -%pkgdatadir/clamd-gen -%_libdir/pkgconfig/* -%_bindir/clamav-config - -## ----------------------- - -%files filesystem -%attr(-,%username,%username) %dir %homedir -%attr(-,root,root) %dir %pkgdatadir - -## ----------------------- - -%files data -%defattr(-,%username,%username,-) -# use %%config to keep files which were updated by 'freshclam' -# already. Without this tag, they would be overridden with older -# versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %homedir/*.cvd - - -%files data-empty -%defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/*.cvd - - -## ----------------------- - -%files update -%defattr(-,root,root,-) -%_bindir/freshclam -%_mandir/*/freshclam* -%pkgdatadir/freshclam-sleep -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* -%config(noreplace) %_sysconfdir/cron.d/* -%config(noreplace) %_sysconfdir/sysconfig/freshclam - -%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/*.cld - - -## ----------------------- - -%files server -%defattr(-,root,root,-) -%doc _doc_server/* -%_mandir/man[58]/clamd* -%_sbindir/* -%pkgdatadir/clamd-wrapper -%dir %_sysconfdir/clamd.d - -%exclude %_sbindir/*milter* -%exclude %_mandir/man8/clamav-milter* - - -%files server-sysvinit -%defattr(-,root,root,-) -%_initrddir/clamd-wrapper - - -## ----------------------- - -%files scanner -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/clamd.d/scan.conf -%ghost %scanstatedir/clamd.sock - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamd.scan.conf - %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%else - %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%endif - -%if 0%{?with_sysv:1} -%files scanner-sysvinit - %attr(0755,root,root) %config %_initrddir/clamd.scan - %ghost %scanstatedir/clamd.pid -%endif - -%if 0%{?with_upstart:1} -%files scanner-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamd.scan* -%endif - -%if 0%{?with_systemd:1} -%files scanner-systemd - %defattr(-,root,root,-) - %_unitdir/clamd.scan.service -%endif - -## ----------------------- - -%files milter -%defattr(-,root,root,-) -%doc clamav-milter/README.fedora -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %_sysconfdir/mail/clamav-milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%ghost %milterstatedir/clamav-milter.socket - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamav-milter.conf - %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%else - %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%endif - -%if 0%{?with_sysv:1} -%files milter-sysvinit - %defattr(-,root,root,-) - %config %_initrddir/clamav-milter - %ghost %milterstatedir/clamav-milter.pid -%endif - -%if 0%{?with_upstart:1} -%files milter-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamav-milter* -%endif - -%if 0%{?with_systemd:1} -%files milter-systemd - %defattr(-,root,root,-) - %_unitdir/clamav-milter.service -%endif - - -%changelog -* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 -- updated to 0.97.3 -- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 - -* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 -- updated to 0.97.2 -- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) -- fixed systemd scripts and their installation - -* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 -- updated to 0.97.1 -- fixed Requires(preun) vs. Requires(postun) inconsistency - -* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 -- fixed tmpfiles.d syntax (#696812) - -* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 -- updated to 0.97 -- rediffed some patches - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 -- fixed signal specifier in clamd-wrapper (#668131, James Ralston) - -* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 -- added systemd init scripts which obsolete to old sysvinit ones -- added tmpfiles.d/ descriptions - -* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 -- updated to 0.96.5 -- CVE-2010-4260 Multiple errors within the processing of PDF files can - be exploited to e.g. cause a crash. -- CVE-2010-4261 An off-by-one error within the "icon_cb()" function - can be exploited to cause a memory corruption. - -* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 -- updated to 0.96.4 -- execute 'make check' (#640347) but ignore errors for now because - four checks are failing on f13 - -* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 -- lowered stop priority of sysv initscripts (#629435) - -* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 -- updated to 0.96.3 -- fixes CVE-2010-0405 in shipped bzlib.c copy - -* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 -- updated to 0.96.2 -- rediffed patches -- removed the -jit-disable patch which is replaced upstream by a more - detailed configuration option. - -* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed old %%trigger which renamed the 'clamav' user- and groupnames - to 'clamupdate' -- use 'groupmems', not 'usermod' to add a user to a group because - 'usermod' does not work when user does not exist in local /etc/passwd - -* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 -- ocaml not available (at least) on s390(x) - -* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 -- updated to 0.96.1 -- rediffed patches - -* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 -- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) - -* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 -- updated to final 0.96 -- applied upstream patch which allows to disable JIT compiler (#573191) -- build JIT compiler again -- disabled JIT compiler by default -- removed explicit 'pkgconfig' requirements in -devel (#533956) - -* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 -- do not build the bytecode JIT compiler for now until it can be disabled - at runtime (#573191) - -* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 -- updated to 0.96rc1 -- added some BRs - -* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 -- updated -upstart to upstart 0.6.3 - -* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- adjusted chkconfig positions for clamav-milter (#530101) -- use %%apply instead of %%patch - -* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 -- updated to 0.95.3 - -* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- conditionalized build of noarch subpackages to ease packaging under RHEL5 - -* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 -- modified freshclam configuration to log by syslog by default -- disabled LocalSocket option in sample configuration -- fixed clamav-milter sysv initscript to use bash interpreter and to - be disabled by default - -* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 -- renamed 'clamav' user/group to 'clamupdate' -- add the '%milteruser' user to the '%scanuser' group when the -scanner - subpackage is installed - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 -- updated to 0.95.2 - -* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 -- fixed '--without upstart' operation - -* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 -- added '%%bcond_without upstart' conditional to ease skipping of - -upstart subpackage creation e.g. on EL5 systems -- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which - broke update path - -* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 -- Upgrade to 0.95.1 (#495039) - -* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 -- updated to final 0.95 -- added ncurses-devel (-> clamdtop) BR -- enforced IPv6 support - -* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 -- updated to 0.95rc1 -- added -upstart subpackages -- renamed -sysv to -sysvinit to make -upstart win the default dep resolving -- reworked complete milter stuff -- added -scanner subpackage which contains a preconfigured daemon - (e.g. for use by -milter) -- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old - -* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 -- made some subpackages noarch -- fixed typo in SysV initscript which removes 'touch' file (#473513) - -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 -- Upgrade to 0.94.2 (#474002) - -* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 -- Upgrade to 0.94.1 - -* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 -- Upgrade to 0.94 (SECURITY), fixes #461461: -- CVE-2008-1389 Invalid memory access in the CHM unpacker -- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg -- CVE-2008-3913 Memory leak in code path in freshclam's manager.c -- CVE-2008-3914 Multiple file descriptor leaks on the code paths - -* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 -- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read - on petite files) -- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) -- rediffed patches - -* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 -- updated to 0.93.1 -- rediffed -path patch -- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability - -* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 -- updated to final 0.93 -- removed daily.inc + main.inc directories; they are now replaced by - *.cld containers -- trimmed down MAILTO list of cronjob to 'root' again; every well - configured system has an alias for this recipient - -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 -- moved -milter scriptlets into -milter-core subpackage -- added a requirement on the milteruser to the -milter-sendmail - subpackage (reported by Bruce Jerrick) - -* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 -- updated to 0.93rc1 -- fixed rpath issues - -* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 -- updated to 0.92.1 - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 -- redisabled unrar stuff completely by using clean sources -- splitted -milter subpackage into pieces to allow use without sendmail - (#239037) - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 -- use a better way to disable RPATH-generation (needed for '--with - unrar' builds) - -* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 -- added a README.fedora to the milter package (#240610) -- ship original sources again; unrar is now licensed correctly (no more - stolen code put under GPL). Nevertheless, this license is not GPL - compatible, and to allow libclamav to be used by GPL applications, - unrar is disabled by a ./configure switch. -- use pkg-config in clamav-config to emulate --cflags and --libs - operations (fixes partly multilib issues) -- registered some more auto-updated files and marked them as %%ghost - -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 -- updated to 0.92 (SECURITY): -- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability - -* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of - legal problems (resolves 334371) -- correct license tag - -* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 -- Bump release for upgrade path. - -* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 -- updated to 0.91.2 (SECURITY): -- CVE-2007-4510 DOS in RTF parser -- DOS in html normalizer -- arbitrary command execution by special crafted recipients in - clamav-milter's black-hole mode -- fixed an open(2) issue - -* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 -- updated to 0.91.1 - -* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 -- updated to 0.91 - -* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 -- updated to 0.90.3 -- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both - in FC6- and F7+ - -* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 -- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 -- updated to 0.90.1 -- updated %%doc list - -* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 -- updated to final 0.90 -- removed -visibility patch since fixed upstream - -* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 -- build with -Wl,-as-needed and cleaned up pkgconfig file -- removed old hack which forced installation of freshclam.conf; related - check was removed upstream -- removed static library -- removed %%changelog entries from before 2004 - -* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 -- updated to 0.90rc3 -- splitted mandatory parts from the data-file into a separate -filesystem - subpackage -- added a -data-empty subpackage to allow a setup where database is - updated per cron-job and user does not want to download the large - -data package with outdated virus definitations (#214949) -- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej deleted file mode 100644 index 1096912..0000000 --- a/clamav.spec.rej +++ /dev/null @@ -1,152 +0,0 @@ ---- clamav.spec -+++ clamav.spec -@@ -5,7 +5,7 @@ - Summary: Anti-virus software - Name: clamav - Version: 0.97.3 --Release: 1%{?dist} -+Release: 2%{?dist} - License: GPLv2 - Group: Applications/System - URL: http://www.clamav.net/ -@@ -15,7 +15,14 @@ - Source0: clamav-0.97.3-norar.tar.xz - Source1: clamav.init - Source2: clamav-milter.init --Source3: clamd-wrapper.tar.bz2 -+Source3: clamd-wrapper -+Source4: clamd.init -+Source5: README.clamd-wrapper -+Source6: clamd.sysconfig -+Source7: freshclam.logrotate -+Source8: freshclam.cron -+Source9: clamd.logrotate -+Source10: clamav-milter.sysconfig - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - - BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz -@@ -171,53 +178,6 @@ - s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf - -- --cat <<EOF >clamd.logrotate --%{_localstatedir}/log/clamav/clamd.log { -- missingok -- notifempty -- create 644 clam clam -- postrotate -- killall -HUP clamd 2>/dev/null || : -- endscript --} --EOF -- --cat <<EOF >freshclam.logrotate --%{_localstatedir}/log/clamav/freshclam.log { -- missingok -- notifempty -- create 644 clam clam --} --EOF -- --cat <<'EOF' >freshclam.cron --#!/bin/sh -- --### A simple update script for the clamav virus database. --### This could as well be replaced by a SysV script. -- --### fix log file if needed --LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" --if [ ! -f "$LOG_FILE" ]; then -- touch "$LOG_FILE" -- chmod 644 "$LOG_FILE" -- chown clam.clam "$LOG_FILE" --fi -- --%{_bindir}/freshclam \ -- --quiet \ -- --datadir="%{_localstatedir}/lib/clamav" \ -- --log="$LOG_FILE" --EOF -- --%{__cat} <<EOF >clamav-milter.sysconfig --### Simple config file for clamav-milter, you should --### read the documentation and tweak it as you wish. -- --CLAMAV_FLAGS="" --EOF -- - %build - %configure \ - --program-prefix="%{?_program_prefix}" \ -@@ -240,19 +200,30 @@ - rm -rf %{buildroot} - make install DESTDIR="%{buildroot}" - --install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd --install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam --install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam --install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav -+install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -+install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -+install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+ -+# now rewrite scripts and config files in-place -+sed -i \ -+ -e 's!%%{_sbindir}!%{_sbindir}!g' \ -+ -e 's!%%{_bindir}!%{_bindir}!g' \ -+ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ -+ %{buildroot}%{_sysconfdir}/logrotate.d/* \ -+ %{buildroot}%{_sysconfdir}/cron.daily/freshclam - - %if %{!?_without_milter:1}0 - install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter --install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter -+install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter - %else - rm %{buildroot}%{_mandir}/man8/clamav-milter.8* - %endif -+ - # Install clamav-wrapper: --tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share -+install -d -m0755 %{buildroot}/%{_prefix}/share/clamav -+install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} -+install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} - - install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ - touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log -@@ -345,8 +316,6 @@ - %doc %{_mandir}/man1/clamscan.1* - %doc %{_mandir}/man1/freshclam.1* - %doc %{_mandir}/man5/freshclam.conf.5* --%doc %{_prefix}/share/clamav/README.clamd-wrapper --%{_prefix}/share/clamav/clamd-wrapper - %config(noreplace) %{_sysconfdir}/freshclam.conf - %{_bindir}/clamscan - %{_bindir}/freshclam -@@ -366,10 +335,12 @@ - %config(noreplace) %{_sysconfdir}/clamd.conf - %config(noreplace) %{_sysconfdir}/logrotate.d/clamav - %{_sysconfdir}/clamd.d --%config %{_initrddir}/clamd -+%config %{_initrddir}/clamav - %{_sbindir}/clamd - %{_bindir}/clamconf - %{_bindir}/clamdscan -+%doc %{_prefix}/share/clamav/README.clamd-wrapper -+%{_prefix}/share/clamav/clamd* - - %defattr(0644, clam, clam, 0755) - %{_localstatedir}/run/clamav/ -@@ -409,6 +380,10 @@ - %exclude %{_libdir}/libclamav.la - - %changelog -+* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 -+- Add missing clamd-wrapper supporting files -+- Remove from init script the unused CLAMD_SOCKET variable -+ - * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - - Update to 0.97.3 - - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 commit 14d21bc46d3a59c90e91420a310f14102e8d859b Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Dec 13 17:51:57 2011 -0600 Add files from bug 756854 diff --git a/README.clamd-wrapper b/README.clamd-wrapper new file mode 100644 index 0000000..5cd1b91 --- /dev/null +++ b/README.clamd-wrapper @@ -0,0 +1,116 @@ +To create individual clamd-instance take the following files and +modify/copy them in the suggested way: + +clamd.conf: + * set LogFile, PidFile, LocalSocket and User to suitable values + * place this file into /etc/clamd.d with an unique service-name; + e.g. as /etc/clamd.d/<SERVICE>.conf + + To make logfile rotation work properly, the LogFile should be + writable for the assigned User. Recommended way to reach this, is + to: + * make it owned by the User's *group* + * assign at least 0620 (u+rw,g+w) permissions + + A suitable command might be + | # touch <logfile> + | # chgrp <user> <logfile> + | # chmod 0620 <logfile> + + NEVER use 'clamav' as the user since he can modify the database. + This is the user who is running the application; e.g. for mimedefang + (http://www.roaringpenguin.com/mimedefang) the user might be + 'defang'.Theoretically, distinct users could be used, but it must be + made sure that the application-user can write into the socket-file, + and that the clamd-user can access the files asked by the + application to be checked. + + +clamd.logrotate: + * set the correct value for the logfile + * place it into /etc/logrotate.d + +clamd.sysconfig: + * set the name of the config-file and the local socket + * copy it to /etc/sysconfig/clamd.<SERVICE> + +clamd.init: + * set the service-name + * place it into /etc/init.d/ with an unique name and activate it + (e.g. with /sbin/chkconfig clamd.<SERVICE> on) + +Additionally, a symlink must be set to clamd in a way like + | # ln -s clamd /usr/sbin/clamd.<SERVICE> +and the directory for the socket file must be created (see 'LocalSocket' +in clamd.conf) + | # mkdir -p /var/run/clamd.<SERVICE> + + +This directory must be writable by the 'User' chosen in the config-file. + + + +[Disclaimer: + this file and the script/configfiles are not part of the official + clamav package. + + Please send complaints and comments to + mailto:enrico.scholz@informatik.tu-chemnitz.de!] +To create individual clamd-instance take the following files and +modify/copy them in the suggested way: + +clamd.conf: + * set LogFile, PidFile, LocalSocket and User to suitable values + * place this file into /etc/clamd.d with an unique service-name; + e.g. as /etc/clamd.d/<SERVICE>.conf + + To make logfile rotation work properly, the LogFile should be + writable for the assigned User. Recommended way to reach this, is + to: + * make it owned by the User's *group* + * assign at least 0620 (u+rw,g+w) permissions + + A suitable command might be + | # touch <logfile> + | # chgrp <user> <logfile> + | # chmod 0620 <logfile> + + NEVER use 'clamav' as the user since he can modify the database. + This is the user who is running the application; e.g. for mimedefang + (http://www.roaringpenguin.com/mimedefang) the user might be + 'defang'.Theoretically, distinct users could be used, but it must be + made sure that the application-user can write into the socket-file, + and that the clamd-user can access the files asked by the + application to be checked. + + +clamd.logrotate: + * set the correct value for the logfile + * place it into /etc/logrotate.d + +clamd.sysconfig: + * set the name of the config-file and the local socket + * copy it to /etc/sysconfig/clamd.<SERVICE> + +clamd.init: + * set the service-name + * place it into /etc/init.d/ with an unique name and activate it + (e.g. with /sbin/chkconfig clamd.<SERVICE> on) + +Additionally, a symlink must be set to clamd in a way like + | # ln -s clamd /usr/sbin/clamd.<SERVICE> +and the directory for the socket file must be created (see 'LocalSocket' +in clamd.conf) + | # mkdir -p /var/run/clamd.<SERVICE> + + +This directory must be writable by the 'User' chosen in the config-file. + + + +[Disclaimer: + this file and the script/configfiles are not part of the official + clamav package. + + Please send complaints and comments to + mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig new file mode 100644 index 0000000..bd82488 --- /dev/null +++ b/clamav-milter.sysconfig @@ -0,0 +1,8 @@ +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" diff --git a/clamav.spec b/clamav.spec index bd8c933..53db81e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -15,7 +15,14 @@ URL: http://www.clamav.net/ Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init -Source3: clamd-wrapper.tar.bz2 +Source3: clamd-wrapper +Source4: clamd.init +Source5: README.clamd-wrapper +Source6: clamd.sysconfig +Source7: freshclam.logrotate +Source8: freshclam.cron +Source9: clamd.logrotate +Source10: clamav-milter.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -171,53 +178,6 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf - -cat <<EOF >clamd.logrotate -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript -} -EOF - -cat <<EOF >freshclam.logrotate -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} -EOF - -cat <<'EOF' >freshclam.cron -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" -EOF - -%{__cat} <<EOF >clamav-milter.sysconfig -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" -EOF - %build %configure \ --program-prefix="%{?_program_prefix}" \ @@ -240,19 +200,30 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR="%{buildroot}" -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd -install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav +install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav + +# now rewrite scripts and config files in-place +sed -i \ + -e 's!%%{_sbindir}!%{_sbindir}!g' \ + -e 's!%%{_bindir}!%{_bindir}!g' \ + -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ + %{buildroot}%{_sysconfdir}/logrotate.d/* \ + %{buildroot}%{_sysconfdir}/cron.daily/freshclam %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif + # Install clamav-wrapper: -tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share +install -d -m0755 %{buildroot}/%{_prefix}/share/clamav +install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} +install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log @@ -345,8 +316,6 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -366,10 +335,12 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav %{_sysconfdir}/clamd.d -%config %{_initrddir}/clamd +%config %{_initrddir}/clamav %{_sbindir}/clamd %{_bindir}/clamconf %{_bindir}/clamdscan +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd* %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ @@ -409,6 +380,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 +- Add missing clamd-wrapper supporting files +- Remove from init script the unused CLAMD_SOCKET variable + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - Update to 0.97.3 - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamav.spec.orig b/clamav.spec.orig new file mode 100644 index 0000000..45aa5db --- /dev/null +++ b/clamav.spec.orig @@ -0,0 +1,1091 @@ +#global prerelease rc1 + +## Fedora Extras specific customization below... +%bcond_without fedora +%bcond_without upstart +%bcond_without systemd +%bcond_with sysv +%bcond_without tmpfiles +%bcond_with unrar +%bcond_without noarch +%bcond_without bytecode +## + +%ifnarch s390 s390x +%global have_ocaml 1 +%else +%global have_ocaml 0 +%endif + +%global username clamupdate +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log +%global milterstatedir %_var/run/clamav-milter +%global pkgdatadir %_datadir/%name + +%global scanuser clamscan +%global scanstatedir %_var/run/clamd.scan + +%{?with_noarch:%global noarch BuildArch: noarch} +%{!?_unitdir:%global _unitdir /lib/systemd/system} +%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} +%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ +%nil} +%{!?systemd_reqs:%global systemd_reqs \ +Requires(post): /bin/systemctl\ +Requires(preun): /bin/systemctl\ +Requires(postun): /bin/systemctl\ +%nil} +%{!?systemd_install:%global systemd_install()\ +%post %1\ +test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +%preun %1\ +test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ +test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ +%postun %1\ +/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ +%nil} + + +Summary: End-user tools for the Clam Antivirus scanner +Name: clamav +Version: 0.97.3 +Release: %release_func 1700 +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} +Group: Applications/File +URL: http://www.clamav.net +%if 0%{?with_unrar:1} +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +%else +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +Source0: %name-%version%{?prerelease}-norar.tar.xz +%endif +Source1: clamd-wrapper +Source2: clamd.sysconfig +Source3: clamd.logrotate +Source5: clamd-README +Source6: clamav-update.logrotate +Source7: clamd.SERVICE.init +Source8: clamav-notify-servers +Patch24: clamav-0.92-private.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95.3-umask.patch +# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… +Patch29: clamav-0.96.2-jitoff.patch +BuildRoot: %_tmppath/%name-%version-%release-root +Requires: clamav-lib = %version-%release +Requires: data(clamav) +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel +BuildRequires: %_includedir/tcpd.h +%{?with_bytecode:BuildRequires: bc tcl groff graphviz} +%if %{have_ocaml} +%{?with_bytecode:BuildRequires: ocaml} +%endif + +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(%username) = 4 +Provides: group(%username) = 4 +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?noarch} +%{?FE_USERADD_REQ} + +%package lib +Summary: Dynamic libraries for the Clam Antivirus scanner +Group: System Environment/Libraries +Requires: data(clamav) + +%package devel +Summary: Header files and libraries for the Clam Antivirus scanner +Group: Development/Libraries +Source100: clamd-gen +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release + +%package data +Summary: Virus signature data for the Clam Antivirus scanner +Group: Applications/File +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full +%{?noarch} + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty +%{?noarch} + +%package update +Summary: Auto-updater for the Clam Antivirus scanner data-files +Group: Applications/File +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.cron +Requires: clamav-filesystem = %version-%release +Requires(pre): /etc/cron.d +Requires(postun): /etc/cron.d +Requires(post): %__chown %__chmod +Requires(post): group(%username) + +%package server +Summary: Clam Antivirus scanner server +Group: System Environment/Daemons +Requires: data(clamav) +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release + +%package server-sysvinit +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} + + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 +Requires: clamav-server = %version-%release +%{?noarch} + +# Remove me after EOL of RHEL5 +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +%{?noarch} + +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source410: clamd.scan.upstart +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package scanner-systemd +Summary: Systemd initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source430: clamd.scan.systemd +Provides: init(clamav-scanner) = systemd +Requires: clamav-scanner = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-scanner-sysvinit = %version-%release +Obsoletes: %name-scanner-sysvinit < %version-%release +%endif + + +%package milter +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Source300: README.fedora +Requires: init(clamav-milter) +BuildRequires: sendmail-devel +BuildRequires: fedora-usermgmt-devel +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 +Requires(post): coreutils +%{?FE_USERADD_REQ} + +Provides: milter(clamav) = sendmail +Provides: milter(clamav) = postfix + +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release + +# Remove me after EOL of RHEL5 +%package milter-sysvinit +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source320: clamav-milter.sysv +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} + +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source310: clamav-milter.upstart +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package milter-systemd +Summary: Systemd initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source330: clamav-milter.systemd +Provides: init(clamav-milter) = systemd +Requires: clamav-milter = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-milter-sysvinit = %version-%release +Obsoletes: %name-milter-sysvinit < %version-%release +%endif + + +%description +Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this +software is the integration with mail servers (attachment scanning). The +package provides a flexible and scalable multi-threaded daemon, a command +line scanner, and a tool for automatic updating via Internet. The programs +are based on a shared library distributed with the Clam AntiVirus package, +which you can use with your own software. The virus database is based on +the virus database from OpenAntiVirus, but contains additional signatures +(including signatures for popular polymorphic viruses, too) and is KEPT UP +TO DATE. + +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. + +%description lib +This package contains dynamic libraries shared between applications +using the Clam Antivirus scanner. + +%description devel +This package contains headerfiles and libraries which are needed to +build applications using clamav. + +%description data +This package contains the virus-database needed by clamav. This +database should be updated regularly; the 'clamav-update' package +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description update +This package contains programs which can be used to update the clamav +anti-virus database automatically. It uses the freshclam(1) utility for +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. + +%description server +ATTENTION: most users do not need this package; the main package has +everything (or depends on it) which is needed to scan for virii on +workstations. + +This package contains files which are needed to execute the clamd-daemon. +This daemon does not provide a system-wide service. Instead of, an instance +of this daemon should be started for each service requiring it. + +See the README file how this can be done with a minimum of effort. + + +%description server-sysvinit +SysV initscripts template for the clamav server + + +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + +%description scanner-systemd +The systemd initscripts for clamav-scanner. + + +%description milter +This package contains files which are needed to run the clamav-milter. + +%description milter-sysvinit +The SysV initscripts for clamav-milter. + +%description milter-upstart +The Upstart initscripts for clamav-milter. + +%description milter-systemd +The systemd initscripts for clamav-scanner. + +## ------------------------------------------------------------ + +%prep +%setup -q -n %{name}-%{version}%{?prerelease} + +%apply -n24 -p1 -b .private +%apply -n25 -p1 -b .open +%apply -n26 -p1 -b .cliopts +%apply -n27 -p1 -b .umask +%apply -n29 -p1 -b .jitoff +%{?apply_end} + +install -p -m0644 %SOURCE300 clamav-milter/ + +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} + +sed -ri \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf + +sed -ri \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf + + +## ------------------------------------------------------------ + +%build +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me... +export FRESHCLAM_LIBS='-lz' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes +%configure \ + --disable-static \ + --disable-rpath \ + --disable-silent-rules \ + --disable-clamav \ + --with-user=%username \ + --with-group=%username \ + --with-dbdir=/var/lib/clamav \ + --enable-milter \ + --enable-clamdtop \ + %{!?with_bytecode:--disable-llvm} \ + %{!?with_unrar:--disable-unrar} + +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool + + +make %{?_smp_mflags} + + +## ------------------------------------------------------------ + +%install +rm -rf "$RPM_BUILD_ROOT" _doc* +make DESTDIR="$RPM_BUILD_ROOT" install + +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + +install -d -m 0755 \ + $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ + $RPM_BUILD_ROOT%_var/{log,run} \ + $RPM_BUILD_ROOT%milterstatedir \ + $RPM_BUILD_ROOT%pkgdatadir/template \ + $RPM_BUILD_ROOT%_initrddir \ + $RPM_BUILD_ROOT%homedir \ + $RPM_BUILD_ROOT%scanstatedir + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ + $RPM_BUILD_ROOT%_libdir/*.la + + +touch $RPM_BUILD_ROOT%homedir/daily.cld +touch $RPM_BUILD_ROOT%homedir/main.cld + + +## prepare the server-files +install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate +install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init +install -D -m 0644 -p %SOURCE5 _doc_server/README +install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf + +install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ +install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template + +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper + + +## prepare the update-files +install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update +install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers +touch $RPM_BUILD_ROOT%freshclamlog + +install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update + +smartsubst 's!webmaster,clamav!webmaster,%username!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep + + +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf + +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan + +install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf +install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf +d %scanstatedir 0710 %scanuser %scanuser +EOF + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} + + +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf + +install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf +install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf +d %milterstatedir 0710 %milteruser %milteruser +EOF + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} + +%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} +%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} +%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} +%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} +%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} + +# keep clamd-wrapper in every case because it might be needed by other +# packages +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper + +## ------------------------------------------------------------ + +%check +make check + +## ------------------------------------------------------------ + +%clean +rm -rf "$RPM_BUILD_ROOT" + +## ------------------------------------------------------------ + +%pre filesystem +%__fe_groupadd 4 -r %username &>/dev/null || : +%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ + -c 'Clamav database update user' -g %username %username &>/dev/null || : + +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + +%pre scanner +%__fe_groupadd 49 -r %scanuser &>/dev/null || : +%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ + -g %scanuser %scanuser &>/dev/null || : + +%postun scanner +%__fe_userdel %scanuser &>/dev/null || : +%__fe_groupdel %scanuser &>/dev/null || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + +%systemd_install scanner-systemd clamd.scan.service + + +%post update +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%username %freshclamlog +} + + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : + +%pre milter +%__fe_groupadd 5 -r %milteruser &>/dev/null || : +%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ + -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : + +%post milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} + +%postun milter +%__fe_userdel %milteruser &>/dev/null || : +%__fe_groupdel %milteruser &>/dev/null || : + + +%post milter-sysvinit +/sbin/chkconfig --add clamav-milter + +%preun milter-sysvinit +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter + +%postun milter-sysvinit +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : + + +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : + +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : + + +%systemd_install milter-systemd clamav-milter.service + + +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE +%doc docs/*.pdf +%_bindir/* +%_mandir/man[15]/* +%exclude %_bindir/clamav-config +%exclude %_bindir/freshclam +%exclude %_mandir/*/freshclam* + +## ----------------------- + +%files lib +%defattr(-,root,root,-) +%_libdir/*.so.* + +## ----------------------- + +%files devel +%defattr(-,root,root,-) +%_includedir/* +%_libdir/*.so +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config + +## ----------------------- + +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + +%files data +%defattr(-,%username,%username,-) +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. +%config %verify(not size md5 mtime) %homedir/*.cvd + + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/*.cvd + + +## ----------------------- + +%files update +%defattr(-,root,root,-) +%_bindir/freshclam +%_mandir/*/freshclam* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/* +%config(noreplace) %_sysconfdir/sysconfig/freshclam + +%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/*.cld + + +## ----------------------- + +%files server +%defattr(-,root,root,-) +%doc _doc_server/* +%_mandir/man[58]/clamd* +%_sbindir/* +%pkgdatadir/clamd-wrapper +%dir %_sysconfdir/clamd.d + +%exclude %_sbindir/*milter* +%exclude %_mandir/man8/clamav-milter* + + +%files server-sysvinit +%defattr(-,root,root,-) +%_initrddir/clamd-wrapper + + +## ----------------------- + +%files scanner +%defattr(-,root,root,-) +%config(noreplace) %_sysconfdir/clamd.d/scan.conf +%ghost %scanstatedir/clamd.sock + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamd.scan.conf + %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%else + %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%endif + +%if 0%{?with_sysv:1} +%files scanner-sysvinit + %attr(0755,root,root) %config %_initrddir/clamd.scan + %ghost %scanstatedir/clamd.pid +%endif + +%if 0%{?with_upstart:1} +%files scanner-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamd.scan* +%endif + +%if 0%{?with_systemd:1} +%files scanner-systemd + %defattr(-,root,root,-) + %_unitdir/clamd.scan.service +%endif + +## ----------------------- + +%files milter +%defattr(-,root,root,-) +%doc clamav-milter/README.fedora +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%ghost %milterstatedir/clamav-milter.socket + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamav-milter.conf + %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%else + %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%endif + +%if 0%{?with_sysv:1} +%files milter-sysvinit + %defattr(-,root,root,-) + %config %_initrddir/clamav-milter + %ghost %milterstatedir/clamav-milter.pid +%endif + +%if 0%{?with_upstart:1} +%files milter-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamav-milter* +%endif + +%if 0%{?with_systemd:1} +%files milter-systemd + %defattr(-,root,root,-) + %_unitdir/clamav-milter.service +%endif + + +%changelog +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 +- updated to 0.97.3 +- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 + +* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 +- updated to 0.97.2 +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) +- fixed systemd scripts and their installation + +* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 +- updated to 0.97.1 +- fixed Requires(preun) vs. Requires(postun) inconsistency + +* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 +- fixed tmpfiles.d syntax (#696812) + +* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 +- updated to 0.97 +- rediffed some patches + +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 +- fixed signal specifier in clamd-wrapper (#668131, James Ralston) + +* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 +- added systemd init scripts which obsolete to old sysvinit ones +- added tmpfiles.d/ descriptions + +* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 +- updated to 0.96.5 +- CVE-2010-4260 Multiple errors within the processing of PDF files can + be exploited to e.g. cause a crash. +- CVE-2010-4261 An off-by-one error within the "icon_cb()" function + can be exploited to cause a memory corruption. + +* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 +- updated to 0.96.4 +- execute 'make check' (#640347) but ignore errors for now because + four checks are failing on f13 + +* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 +- lowered stop priority of sysv initscripts (#629435) + +* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 +- updated to 0.96.3 +- fixes CVE-2010-0405 in shipped bzlib.c copy + +* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 +- updated to 0.96.2 +- rediffed patches +- removed the -jit-disable patch which is replaced upstream by a more + detailed configuration option. + +* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed old %%trigger which renamed the 'clamav' user- and groupnames + to 'clamupdate' +- use 'groupmems', not 'usermod' to add a user to a group because + 'usermod' does not work when user does not exist in local /etc/passwd + +* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 +- ocaml not available (at least) on s390(x) + +* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 +- updated to 0.96.1 +- rediffed patches + +* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 +- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) + +* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 +- updated to final 0.96 +- applied upstream patch which allows to disable JIT compiler (#573191) +- build JIT compiler again +- disabled JIT compiler by default +- removed explicit 'pkgconfig' requirements in -devel (#533956) + +* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 +- do not build the bytecode JIT compiler for now until it can be disabled + at runtime (#573191) + +* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 +- updated to 0.96rc1 +- added some BRs + +* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 +- updated -upstart to upstart 0.6.3 + +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) +- use %%apply instead of %%patch + +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 +- updated to 0.95.3 + +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches + +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej new file mode 100644 index 0000000..1096912 --- /dev/null +++ b/clamav.spec.rej @@ -0,0 +1,152 @@ +--- clamav.spec ++++ clamav.spec +@@ -5,7 +5,7 @@ + Summary: Anti-virus software + Name: clamav + Version: 0.97.3 +-Release: 1%{?dist} ++Release: 2%{?dist} + License: GPLv2 + Group: Applications/System + URL: http://www.clamav.net/ +@@ -15,7 +15,14 @@ + Source0: clamav-0.97.3-norar.tar.xz + Source1: clamav.init + Source2: clamav-milter.init +-Source3: clamd-wrapper.tar.bz2 ++Source3: clamd-wrapper ++Source4: clamd.init ++Source5: README.clamd-wrapper ++Source6: clamd.sysconfig ++Source7: freshclam.logrotate ++Source8: freshclam.cron ++Source9: clamd.logrotate ++Source10: clamav-milter.sysconfig + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz +@@ -171,53 +178,6 @@ + s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; + ' etc/clamav-milter.conf + +- +-cat <<EOF >clamd.logrotate +-%{_localstatedir}/log/clamav/clamd.log { +- missingok +- notifempty +- create 644 clam clam +- postrotate +- killall -HUP clamd 2>/dev/null || : +- endscript +-} +-EOF +- +-cat <<EOF >freshclam.logrotate +-%{_localstatedir}/log/clamav/freshclam.log { +- missingok +- notifempty +- create 644 clam clam +-} +-EOF +- +-cat <<'EOF' >freshclam.cron +-#!/bin/sh +- +-### A simple update script for the clamav virus database. +-### This could as well be replaced by a SysV script. +- +-### fix log file if needed +-LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +-if [ ! -f "$LOG_FILE" ]; then +- touch "$LOG_FILE" +- chmod 644 "$LOG_FILE" +- chown clam.clam "$LOG_FILE" +-fi +- +-%{_bindir}/freshclam \ +- --quiet \ +- --datadir="%{_localstatedir}/lib/clamav" \ +- --log="$LOG_FILE" +-EOF +- +-%{__cat} <<EOF >clamav-milter.sysconfig +-### Simple config file for clamav-milter, you should +-### read the documentation and tweak it as you wish. +- +-CLAMAV_FLAGS="" +-EOF +- + %build + %configure \ + --program-prefix="%{?_program_prefix}" \ +@@ -240,19 +200,30 @@ + rm -rf %{buildroot} + make install DESTDIR="%{buildroot}" + +-install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +-install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +-install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +-install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav ++install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam ++install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam ++install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++ ++# now rewrite scripts and config files in-place ++sed -i \ ++ -e 's!%%{_sbindir}!%{_sbindir}!g' \ ++ -e 's!%%{_bindir}!%{_bindir}!g' \ ++ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ ++ %{buildroot}%{_sysconfdir}/logrotate.d/* \ ++ %{buildroot}%{_sysconfdir}/cron.daily/freshclam + + %if %{!?_without_milter:1}0 + install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter +-install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter ++install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter + %else + rm %{buildroot}%{_mandir}/man8/clamav-milter.8* + %endif ++ + # Install clamav-wrapper: +-tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share ++install -d -m0755 %{buildroot}/%{_prefix}/share/clamav ++install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} ++install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} + + install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ + touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log +@@ -345,8 +316,6 @@ + %doc %{_mandir}/man1/clamscan.1* + %doc %{_mandir}/man1/freshclam.1* + %doc %{_mandir}/man5/freshclam.conf.5* +-%doc %{_prefix}/share/clamav/README.clamd-wrapper +-%{_prefix}/share/clamav/clamd-wrapper + %config(noreplace) %{_sysconfdir}/freshclam.conf + %{_bindir}/clamscan + %{_bindir}/freshclam +@@ -366,10 +335,12 @@ + %config(noreplace) %{_sysconfdir}/clamd.conf + %config(noreplace) %{_sysconfdir}/logrotate.d/clamav + %{_sysconfdir}/clamd.d +-%config %{_initrddir}/clamd ++%config %{_initrddir}/clamav + %{_sbindir}/clamd + %{_bindir}/clamconf + %{_bindir}/clamdscan ++%doc %{_prefix}/share/clamav/README.clamd-wrapper ++%{_prefix}/share/clamav/clamd* + + %defattr(0644, clam, clam, 0755) + %{_localstatedir}/run/clamav/ +@@ -409,6 +380,10 @@ + %exclude %{_libdir}/libclamav.la + + %changelog ++* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 ++- Add missing clamd-wrapper supporting files ++- Remove from init script the unused CLAMD_SOCKET variable ++ + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 + - Update to 0.97.3 + - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamd-wrapper b/clamd-wrapper new file mode 100644 index 0000000..000dcb8 --- /dev/null +++ b/clamd-wrapper @@ -0,0 +1,86 @@ +#!/bin/bash +# +# chkconfig: - 75 25 +# description: The clamd daemon listens for incoming connections on \ +# Unix or TCP socket and scans files or directories on demand. + +[ -n "$CLAMD_SERVICE" ] || { + echo $"*** $0 can not be called in this way" + echo $"*** Please see /usr/share/doc/clamav-server-*/README how" + echo $"*** the clamav-server can be configured" + exit 6 +} + +# Source function library. +. /etc/init.d/functions + +# Get config. +[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network + +# Check that networking is up. +[ "$NETWORKING" != "no" ] || exit 6 + +lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} +sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} +procname=clamd.${CLAMD_SERVICE} + +CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf +CLAMD_OPTIONS= +[ -f "$sysconffile" ] && . "$sysconffile" +CLAMD_PIDFILE=`grep ^PidFile ${CLAMD_CONFIGFILE} | awk '{print $2}'` + +# make sure that config file contains a PidFile setting +[ -n "$CLAMD_PIDFILE" ] || exit 6 + +RETVAL=0 +prog="clamd.${CLAMD_SERVICE}" + +start () { + echo -n $"Starting $prog: " + daemon --pidfile=${CLAMD_PIDFILE} \ + exec -a $procname /usr/sbin/clamd \ + ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch $lockfile + return $RETVAL +} + +stop () { + echo -n $"Stopping $prog: " + killproc -p ${CLAMD_PIDFILE} $procname + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $lockfile + return $RETVAL +} + +reload() { + rc=0 + echo -n $"Reloading $prog: " + killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? + echo + echo -n $"Loading new virus-database: " + killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? + echo + return $rc +} + +restart () { + stop + start +} + +# See how we were called. +case "$1" in + start|stop|restart|reload) + $1 ;; + status) + status -p ${CLAMD_PIDFILE} $procname ;; + condrestart) + [ ! -f $lockfile ] || restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" + exit 2 +esac diff --git a/clamd.init b/clamd.init new file mode 100644 index 0000000..cf25b46 --- /dev/null +++ b/clamd.init @@ -0,0 +1,18 @@ +#!/bin/bash +# +# chkconfig: - 75 35 +# +# description: The clamd server running for <SERVICE> +# + +CLAMD_SERVICE=<SERVICE> +. /usr/share/clamav/clamd-wrapper +#!/bin/bash +# +# chkconfig: - 75 35 +# +# description: The clamd server running for <SERVICE> +# + +CLAMD_SERVICE=<SERVICE> +. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate new file mode 100644 index 0000000..b233f3a --- /dev/null +++ b/clamd.logrotate @@ -0,0 +1,8 @@ +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} diff --git a/clamd.sysconfig b/clamd.sysconfig new file mode 100644 index 0000000..e0e7714 --- /dev/null +++ b/clamd.sysconfig @@ -0,0 +1,5 @@ +#CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf +#CLAMD_OPTIONS= +## the values below should only ever be specified in the above .conf file! +#CLAMD_SOCKET=/var/run/clamd.${CLAMD_SERVICE}/clamd.sock +#CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid diff --git a/freshclam.cron b/freshclam.cron new file mode 100644 index 0000000..558a2f2 --- /dev/null +++ b/freshclam.cron @@ -0,0 +1,34 @@ +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate new file mode 100644 index 0000000..5a5615a --- /dev/null +++ b/freshclam.logrotate @@ -0,0 +1,10 @@ +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} diff --git a/sources b/sources index 47b00bc..05755a5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 813ca6cc8c152e9fc9583c5f0acb9e3b35d347d6 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 20:09:36 2011 -0500 Add Makefile to make clean tarball diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ec42490 --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +MAKEFILE_COMMON = $(HOME)/.fedora/common.mk +-include $(MAKEFILE_COMMON) + +# can not use final tarball name here as it will conflict with rules +# within Makefile.common +TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.xz.tmp +TARBALL = ${NAME}-${VERSION}.tar.gz + +clean-sources: ${TARBALL_CLEAN} + +${TARBALL_CLEAN}: ${TARBALL} + rm -f $@.tmp + zcat $< | tar --delete -f - '*/libclamunrar/*' | xz -c > $@.tmp + mv $@.tmp $@ commit f79a6d54a0d97f0b0acefa78c4819180994fd075 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 20:09:21 2011 -0500 Re-add clamd-wrapper.tar.bz2 diff --git a/sources b/sources index 05755a5..47b00bc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 603c6c9dae1038fe7597a83a33fee2d075710c05 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 19:55:14 2011 -0500 Upgrade to 0.97.3, fixing a CVE diff --git a/.gitignore b/.gitignore index a3ff7cc..b09a0a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /clamav-0.97.2-norar.tar.xz /clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 +/clamav-0.97.3-norar.tar.xz diff --git a/clamav.spec b/clamav.spec index 5ca4752..bd8c933 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,15 +4,15 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.2 -Release: 5%{?dist} +Version: 0.97.3 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.2-norar.tar.xz +Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -409,6 +409,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 +- Update to 0.97.3 +- Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 + * Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-5 - Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. (bz#727894) diff --git a/sources b/sources index 784e26c..05755a5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -c41b2314d1b6b11f091955255dfa23f5 clamav-0.97.2-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz commit a9247006483c53e986707cc19b0f2c224cd14c7b Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 19:34:24 2011 -0500 Remove clamav tarball from git diff --git a/.gitignore b/.gitignore index e230f1a..a3ff7cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /clamav-0.97.2-norar.tar.xz +/clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 diff --git a/clamav-0.97-clean.tar.bz2 b/clamav-0.97-clean.tar.bz2 deleted file mode 100644 index 9d39f27..0000000 Binary files a/clamav-0.97-clean.tar.bz2 and /dev/null differ commit 96fb7210c39ec20d51155510e7e2565c62178638 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Thu Aug 4 10:14:11 2011 +0200 Make substitutions a little more explicit. diff --git a/clamav.spec b/clamav.spec index b4cde09..5ca4752 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -166,8 +166,8 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %{__perl} -pi.orig -e ' s|^(Example)|#$1|; s|^#(User) .+$|$1 clam|; - s|#MilterSocket inet.+$|MilterSocket /var/run/clamav/clamav-milter.sock|; - s|#PidFile .+$|PidFile /var/run/clamav/clamav-milter.pid|; + s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|; + s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|; s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf @@ -409,7 +409,7 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-4 +* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-5 - Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. (bz#727894) commit 3ebb6ff6bf713936d55085d2cfee375e475b0d52 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Thu Aug 4 10:10:19 2011 +0200 Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf (bz#727894). diff --git a/clamav.spec b/clamav.spec index 567babb..b4cde09 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -166,7 +166,9 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %{__perl} -pi.orig -e ' s|^(Example)|#$1|; s|^#(User) .+$|$1 clam|; - s|^#(ClamdSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; + s|#MilterSocket inet.+$|MilterSocket /var/run/clamav/clamav-milter.sock|; + s|#PidFile .+$|PidFile /var/run/clamav/clamav-milter.pid|; + s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf @@ -407,6 +409,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-4 +- Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. + (bz#727894) + * Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-3 - include updated clamd-wrapper which get the PidFile setting from the service configuration file. commit ae959928b685373bbd37a4b9d933f26ef5d2cc46 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 10:03:06 2011 +0200 Handle xz archive SOURCE0 for rpmbuild on RHEL < 6. diff --git a/clamav.spec b/clamav.spec index 234273a..567babb 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -109,7 +109,9 @@ documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep -%setup -q +# Handle that rpmbuild in RHEL < 6 doesn't handle xz archives automatically. +%setup -q -T -c +xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure @@ -405,11 +407,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-2 +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-3 - include updated clamd-wrapper which get the PidFile setting from the service configuration file. - -* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-1 - updated to 0.97.2 - Build-require xz - CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) commit 7d5029a51e1c38d678117c1191668639a5a39d40 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 08:52:51 2011 +0200 Include Jeroen van Meeuwen's updated clamd-wrapper which get the PidFile setting from the service configuration file. diff --git a/clamav.spec b/clamav.spec index d49bb8f..234273a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -405,6 +405,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-2 +- include updated clamd-wrapper which get the PidFile setting from the + service configuration file. + * Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-1 - updated to 0.97.2 - Build-require xz diff --git a/sources b/sources index d15b018..784e26c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ c41b2314d1b6b11f091955255dfa23f5 clamav-0.97.2-norar.tar.xz -ae4e25e5df41b71cf6541e3a876b94a7 clamd-wrapper.tar.bz2 +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 6fcce5b69503ef555029fea998fe39c8623d0c68 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 08:38:13 2011 +0200 Update sources to include clamav-0.97.1-norar.tar.xz diff --git a/sources b/sources index 27407d3..d15b018 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -44e7df79718d104db0666d5db3f08682 clamav-0.97-clean.tar.bz2 +c41b2314d1b6b11f091955255dfa23f5 clamav-0.97.2-norar.tar.xz ae4e25e5df41b71cf6541e3a876b94a7 clamd-wrapper.tar.bz2 commit 6170551529bdcc1510dc70d529b45d7073b7bc42 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 08:36:42 2011 +0200 - updated to 0.97.2 - Build-require xz - CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) diff --git a/.gitignore b/.gitignore index bf9c05a..e230f1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/clamav-0.97-clean.tar.bz2 +/clamav-0.97.2-norar.tar.xz /clamd-wrapper.tar.bz2 diff --git a/clamav.spec b/clamav.spec index 8bb9614..d49bb8f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,21 +4,21 @@ Summary: Anti-virus software Name: clamav -Version: 0.97 -Release: 14%{?dist} +Version: 0.97.2 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97-clean.tar.bz2 +Source0: clamav-0.97.2-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -356,6 +356,7 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamdscan.1* %doc %{_mandir}/man1/clamconf.1* %doc %{_mandir}/man1/clamdtop.1* +%doc %{_mandir}/man1/clambc.1* %doc %{_mandir}/man5/clamd.conf.5* %doc %{_mandir}/man8/clamd.8* %config(noreplace) %{_sysconfdir}/clamd.conf @@ -404,6 +405,11 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-1 +- updated to 0.97.2 +- Build-require xz +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) + * Wed Jun 29 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97-14 - Require /usr/sbin/sendmail instead of sendmail commit 1391380976a7514bf46af8366673b4223013365b Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 29 18:54:08 2011 -0500 Require /usr/sbin/sendmail instead of sendmail diff --git a/clamav.spec b/clamav.spec index 2af6305..8bb9614 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -64,7 +64,7 @@ The Clam AntiVirus Daemon Summary: The Clam AntiVirus sendmail-milter Daemon Group: Applications/System Requires: clamd = %{version}-%{release} -Requires: sendmail +Requires: /usr/sbin/sendmail Provides: clamav-milter-sysv = %{version}-%{release} Obsoletes: clamav-milter-sysv < %{version}-%{release} Provides: clamav-milter-sysvinit = %{version}-%{release} @@ -404,6 +404,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jun 29 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97-14 +- Require /usr/sbin/sendmail instead of sendmail + * Tue Apr 26 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-13 - Obsolete and provide clamav-milter-sysvinit (bz#696856) commit 833c6c9f451b4f48b64d5c53d773b21016d091cc Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Apr 26 08:53:58 2011 +0200 Obsolete and provide clamav-milter-sysvinit (bz#696856). diff --git a/clamav.spec b/clamav.spec index c1fa39f..2af6305 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -67,6 +67,8 @@ Requires: clamd = %{version}-%{release} Requires: sendmail Provides: clamav-milter-sysv = %{version}-%{release} Obsoletes: clamav-milter-sysv < %{version}-%{release} +Provides: clamav-milter-sysvinit = %{version}-%{release} +Obsoletes: clamav-milter-sysvinit < %{version}-%{release} %description milter The Clam AntiVirus sendmail-milter Daemon @@ -402,6 +404,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Apr 26 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-13 +- Obsolete and provide clamav-milter-sysvinit (bz#696856) + * Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 - Move deletion of /var/lib/clamav/mirrors.dat to db package. - Don't enable NotifyClamd in freshclam config and cronjob, as not commit c6b6666973bc259d9160f1894f026e5902328c42 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Mar 30 12:17:31 2011 +0200 * Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 - Move deletion of /var/lib/clamav/mirrors.dat to db package. - Don't enable NotifyClamd in freshclam config and cronjob, as not everybody is running clamd. Running clamd's will anyway notice when db is updated. diff --git a/clamav.spec b/clamav.spec index 4d7776f..c1fa39f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -157,7 +157,6 @@ you will need to install %{name}-devel. s|^#(LogSyslog)|$1|; s|^#(DatabaseOwner) .+$|$1 clam|; s|^(Checks) .+$|$1 24|; - s|^#(NotifyClamd) .+$|$1 %{_sysconfdir}/clamd.conf|; ' etc/freshclam.conf %{__perl} -pi.orig -e ' @@ -203,8 +202,7 @@ fi %{_bindir}/freshclam \ --quiet \ --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" \ - --daemon-notify="%{_sysconfdir}/clamd.conf" + --log="$LOG_FILE" EOF %{__cat} <<EOF >clamav-milter.sysconfig @@ -258,10 +256,6 @@ install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ %post -# Remove old mirrors.dat, mostly because it will have the wrong -# owner after upgrading from clamav < 0.97: -test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat - /sbin/ldconfig ZONES="/usr/share/zoneinfo/zone.tab" @@ -328,6 +322,12 @@ useradd -r -g clam -d /var/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 +%post db +# Remove old mirrors.dat, mostly because it will have the wrong +# owner after upgrading from clamav < 0.97: +test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat +exit 0 + %clean rm -rf %{buildroot} @@ -402,6 +402,12 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 +- Move deletion of /var/lib/clamav/mirrors.dat to db package. +- Don't enable NotifyClamd in freshclam config and cronjob, as not + everybody is running clamd. Running clamd's will anyway notice + when db is updated. + * Fri Mar 18 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-11 - Delete /var/lib/clamav/mirrors.dat, it will be recreated on first run. - clamav-milter config cleanups. commit 0de58a44516ae5ea2eab503715ab5ea2fb9bf4a7 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Fri Mar 18 09:05:10 2011 +0100 Milter cleanups after problems reported in bz#579370. Delete mirrors.dat in %post since I see no other way of getting the permissions correct. diff --git a/clamav-milter.init b/clamav-milter.init index f87efa7..347fe4b 100644 --- a/clamav-milter.init +++ b/clamav-milter.init @@ -25,7 +25,7 @@ test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter case "$1" in start) echo -n "Starting Clamav Milter Daemon: " - daemon clamav-milter $CLAMAV_FLAGS $SOCKET_ADDRESS + daemon clamav-milter $CLAMAV_FLAGS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamav-milter diff --git a/clamav.spec b/clamav.spec index 90e38b4..4d7776f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -160,6 +160,13 @@ you will need to install %{name}-devel. s|^#(NotifyClamd) .+$|$1 %{_sysconfdir}/clamd.conf|; ' etc/freshclam.conf +%{__perl} -pi.orig -e ' + s|^(Example)|#$1|; + s|^#(User) .+$|$1 clam|; + s|^#(ClamdSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; + ' etc/clamav-milter.conf + + cat <<EOF >clamd.logrotate %{_localstatedir}/log/clamav/clamd.log { missingok @@ -204,9 +211,7 @@ EOF ### Simple config file for clamav-milter, you should ### read the documentation and tweak it as you wish. -CLAMAV_FLAGS=" - --config-file=%{_sysconfdir}/clamd.conf -" +CLAMAV_FLAGS="" EOF %build @@ -252,12 +257,11 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -# mirrors.dat might exists with the wrong user on upgrades from pre v0.97, -# touch it here, and later %ghost it so that the permissions are fixed if needed. -touch %{buildroot}%{_localstatedir}/lib/clamav/mirrors.dat - - %post +# Remove old mirrors.dat, mostly because it will have the wrong +# owner after upgrading from clamav < 0.97: +test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat + /sbin/ldconfig ZONES="/usr/share/zoneinfo/zone.tab" @@ -387,7 +391,6 @@ rm -rf %{buildroot} %config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log -%ghost %{_localstatedir}/lib/clamav/mirrors.dat %files devel %defattr(-, root, root, 0755) @@ -399,6 +402,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Fri Mar 18 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-11 +- Delete /var/lib/clamav/mirrors.dat, it will be recreated on first run. +- clamav-milter config cleanups. + * Wed Mar 16 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-10 - Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. - Don't start clamd or milter service by default. commit 86972941e69b28303796b75b36f923ed94c37d88 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Thu Mar 17 10:12:35 2011 +0100 - Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. - Don't start clamd or milter service by default. diff --git a/clamav.spec b/clamav.spec index a756493..90e38b4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -252,6 +252,11 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ +# mirrors.dat might exists with the wrong user on upgrades from pre v0.97, +# touch it here, and later %ghost it so that the permissions are fixed if needed. +touch %{buildroot}%{_localstatedir}/lib/clamav/mirrors.dat + + %post /sbin/ldconfig @@ -382,6 +387,7 @@ rm -rf %{buildroot} %config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log +%ghost %{_localstatedir}/lib/clamav/mirrors.dat %files devel %defattr(-, root, root, 0755) @@ -393,6 +399,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Mar 16 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-10 +- Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. +- Don't start clamd or milter service by default. + * Tue Mar 15 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-7 - rpm-provide all old package names that are now obsoleted commit adb58860131bf63581ba9483ecb8440688b280dc Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 18:23:41 2011 +0100 Don't enable services by default. diff --git a/clamav-milter.init b/clamav-milter.init index 62a2f91..f87efa7 100644 --- a/clamav-milter.init +++ b/clamav-milter.init @@ -2,7 +2,7 @@ # # Startup script for the Clamav Milter Daemon # -# chkconfig: 2345 77 23 +# chkconfig: - 77 23 # description: clamav-milter is a daemon which hooks into sendmail \ # and routes email messages to clamav. # processname: clamav-milter diff --git a/clamav.init b/clamav.init index 0e001fb..848dbce 100755 --- a/clamav.init +++ b/clamav.init @@ -2,7 +2,7 @@ # # Startup script for the Clam AntiVirus Daemon # -# chkconfig: 2345 61 39 +# chkconfig: - 61 39 # description: Clam AntiVirus Daemon is a TCP/IP or socket protocol \ # server. # processname: clamd commit a8bbda52841301f275ac0ad885e98ba0ae31e3e4 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 15:11:59 2011 +0100 Remove broken or deprecated milter and freshclam options. diff --git a/clamav.spec b/clamav.spec index c5573ef..a756493 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -197,7 +197,6 @@ fi --quiet \ --datadir="%{_localstatedir}/lib/clamav" \ --log="$LOG_FILE" \ - --log-verbose \ --daemon-notify="%{_sysconfdir}/clamd.conf" EOF @@ -207,14 +206,7 @@ EOF CLAMAV_FLAGS=" --config-file=%{_sysconfdir}/clamd.conf - --force-scan - --local - --max-children=10 - --noreject - --outgoing - --quiet " -SOCKET_ADDRESS="local:%{_localstatedir}/run/clamav/clmilter.socket" EOF %build commit a89e6fd21e435b5cec12d136672b4ce32a859c46 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 11:20:34 2011 +0100 Obsolete clamav-filesystem in clamav-db package, since this is the first package in the installation chain -- and hopefull this should fix the dependency problem with old clamav-filesystem. diff --git a/clamav.spec b/clamav.spec index 4827933..c5573ef 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -28,8 +28,6 @@ Provides: libclamav Obsoletes: libclamav < %{version}-%{release} Provides: clamav-lib = %{version}-%{release} Obsoletes: clamav-lib < %{version}-%{release} -Provides: clamav-filesystem = %{version}-%{release} -Obsoletes: clamav-filesystem < %{version}-%{release} %description Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of @@ -85,6 +83,10 @@ Obsoletes: clamav-update < %{version}-%{release} Provides: clamav-data = %{version}-%{release} Obsoletes: clamav-data < %{version}-%{release} Obsoletes: clamav-data-empty <= %{version}-%{release} +# Ugly to put these in the db-package, but needed +# here to handle upgrades on EL5. +Provides: clamav-filesystem = %{version}-%{release} +Obsoletes: clamav-filesystem < %{version}-%{release} %description db The actual virus database for %{name} commit aebe2468a4b86955f41ce9ccb61a5236b8d9f481 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 10:39:53 2011 +0100 Provide all old package names that are now obsolete. Following the packaging guideline at: http://fedoraproject.org/wiki/PackageNamingGuidelines#Renaming.2Freplacing_… diff --git a/clamav.spec b/clamav.spec index d587dac..4827933 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -24,10 +24,12 @@ Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils ### Fedora Extras introduced them differently :( +Provides: libclamav Obsoletes: libclamav < %{version}-%{release} +Provides: clamav-lib = %{version}-%{release} Obsoletes: clamav-lib < %{version}-%{release} +Provides: clamav-filesystem = %{version}-%{release} Obsoletes: clamav-filesystem < %{version}-%{release} -Provides: libclamav %description Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of @@ -45,8 +47,17 @@ Group: System Environment/Daemons Requires: clamav = %{version}-%{release} ### Fedora Extras introduced them differently :( -Obsoletes: clamav-server <= %{version}-%{release} -Obsoletes: clamav-server-sysv <= %{version}-%{release} +Provides: clamav-server = %{version}-%{release} +Obsoletes: clamav-server < %{version}-%{release} +Provides: clamav-server-sysv = %{version}-%{release} +Obsoletes: clamav-server-sysv < %{version}-%{release} +Provides: clamav-scanner = %{version}-%{release} +Obsoletes: clamav-scanner < %{version}-%{release} +Provides: clamav-scanner-upstart = %{version}-%{release} +Obsoletes: clamav-scanner-upstart < %{version}-%{release} +Provides: clamav-server-sysvinit = %{version}-%{release} +Obsoletes: clamav-server-sysvinit < %{version}-%{release} + %description -n clamd The Clam AntiVirus Daemon @@ -56,7 +67,8 @@ Summary: The Clam AntiVirus sendmail-milter Daemon Group: Applications/System Requires: clamd = %{version}-%{release} Requires: sendmail -Obsoletes: clamav-milter-sysv <= %{version}-%{release} +Provides: clamav-milter-sysv = %{version}-%{release} +Obsoletes: clamav-milter-sysv < %{version}-%{release} %description milter The Clam AntiVirus sendmail-milter Daemon @@ -68,8 +80,10 @@ Group: Applications/Databases #Requires: clamav = %{version}-%{release} ### Fedora Extras introduced them differently :( -Obsoletes: clamav-update <= %{version}-%{release} -Obsoletes: clamav-data <= %{version}-%{release} +Provides: clamav-update = %{version}-%{release} +Obsoletes: clamav-update < %{version}-%{release} +Provides: clamav-data = %{version}-%{release} +Obsoletes: clamav-data < %{version}-%{release} Obsoletes: clamav-data-empty <= %{version}-%{release} %description db @@ -385,6 +399,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Mar 15 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-7 +- rpm-provide all old package names that are now obsoleted + * Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-6 - clam-db obsoletes old clamav-data-empty. diff --git a/clamd-wrapper b/clamd-wrapper deleted file mode 100644 index 14c04a5..0000000 --- a/clamd-wrapper +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash -# -# Xchkconfig: - 75 25 -# Xdescription: The clamd daemon listens for incoming connections on \ -# Unix or TCP socket and scans files or directories on demand. - -test "$CLAMD_SERVICE" || { - echo $"*** $0 can not be called in this way" - echo $"*** Please see /usr/share/doc/clamav-server-*/README how" - echo $"*** the clamav-server can be configured" - exit 6 -} - -# Source function library. -. /etc/init.d/functions - -# Get config. -test -r /etc/sysconfig/network && . /etc/sysconfig/network - -# Check that networking is up. -test "$NETWORKING" != "no" || exit 6 - -lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} -sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} -procname=clamd.${CLAMD_SERVICE} - -CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -CLAMD_OPTIONS= -## backward-compatibility check... -for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do - CLAMD_SOCKET=$i - test ! -e "$i" || break -done -test -f "$sysconffile" && . "$sysconffile" - - -RETVAL=0 -prog="clamd.${CLAMD_SERVICE}" - -start () { - echo -n $"Starting $prog: " - daemon $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop () { - echo -n $"Stopping $prog: " - killproc $procname - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -reload() { - rc=0 - echo -n $"Reloading $prog: " - killproc $procname -SIGHUP || rc=$? - echo - echo -n $"Loading new virus-database: " - killproc $procname -SIGUSR2 || rc=$? - echo - return $rc -} - -restart () { - stop - start -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 ;; - status) - status $procname ;; - condrestart) - test ! -f $lockfile || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 2 -esac commit cf7db91a88bbba67a6a54ca6c23ec8bd0b7f774d Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Mon Mar 14 12:16:02 2011 +0100 Update release number. diff --git a/clamav.spec b/clamav.spec index 9f0499a..d587dac 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -385,7 +385,7 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-5 +* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-6 - clam-db obsoletes old clamav-data-empty. * Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 commit a41ce1a97cd1767ba81ec794e455e25c7ab4660a Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Mon Mar 14 12:14:30 2011 +0100 clamav-data was already listed as obsolete.. diff --git a/clamav.spec b/clamav.spec index 0fc3799..9f0499a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -64,14 +64,13 @@ The Clam AntiVirus sendmail-milter Daemon %package db Summary: Virus database for %{name} Group: Applications/Databases -Obsoletes: clamav-data <= %{version}-%{release} -Obsoletes: clamav-data-empty <= %{version}-%{release} ### Remove circular dependency #Requires: clamav = %{version}-%{release} ### Fedora Extras introduced them differently :( Obsoletes: clamav-update <= %{version}-%{release} Obsoletes: clamav-data <= %{version}-%{release} +Obsoletes: clamav-data-empty <= %{version}-%{release} %description db The actual virus database for %{name} @@ -387,7 +386,7 @@ rm -rf %{buildroot} %changelog * Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-5 -- clam-db obsoletes old clamav-data and clamav-data-empty. +- clam-db obsoletes old clamav-data-empty. * Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 - Add back clamd-wrapper to stay compatible with users commit e10bf12213c7977e02534f6d5ed364409e7f64dc Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Mon Mar 14 11:19:15 2011 +0100 Fix upgrade problem when clamav-data or clamav-data-empty was installed. clamav-db obsoletes these. diff --git a/clamav.spec b/clamav.spec index f447f08..0fc3799 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -64,6 +64,8 @@ The Clam AntiVirus sendmail-milter Daemon %package db Summary: Virus database for %{name} Group: Applications/Databases +Obsoletes: clamav-data <= %{version}-%{release} +Obsoletes: clamav-data-empty <= %{version}-%{release} ### Remove circular dependency #Requires: clamav = %{version}-%{release} @@ -384,6 +386,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-5 +- clam-db obsoletes old clamav-data and clamav-data-empty. + * Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 - Add back clamd-wrapper to stay compatible with users of old packaging (amavisd-new). commit 44c852187fbb517dd9084ca7100404b6fed6d05c Merge: 728c0a6 825f174 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Sun Mar 13 21:37:43 2011 +0100 Merge branch 'el6' into el5 Conflicts: .gitignore diff --cc .gitignore index f6ee443,720667f..bf9c05a --- a/.gitignore +++ b/.gitignore @@@ -1,6 -1,3 +1,2 @@@ - <<<<<<< HEAD - clamav-0.95.1-norar.tar.bz2 - ======= --clamav-0.95.3-norar.tar.bz2 /clamav-0.97-clean.tar.bz2 - >>>>>>> el6 + /clamd-wrapper.tar.bz2 commit 825f174a59a4b0a16e9b39a0ef524919f00f1f32 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Mar 13 20:25:23 2011 +0000 Update spec, add clamav-wrapper source diff --git a/.gitignore b/.gitignore index cd2bf84..720667f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clamav-0.95.3-norar.tar.bz2 /clamav-0.97-clean.tar.bz2 +/clamd-wrapper.tar.bz2 diff --git a/clamav.spec b/clamav.spec index 824dacd..f447f08 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -15,6 +15,7 @@ URL: http://www.clamav.net/ Source0: clamav-0.97-clean.tar.bz2 Source1: clamav.init Source2: clamav-milter.init +Source3: clamd-wrapper.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel @@ -232,6 +233,8 @@ install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/ %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif +# Install clamav-wrapper: +tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log @@ -318,6 +321,8 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -379,6 +384,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 +- Add back clamd-wrapper to stay compatible with users + of old packaging (amavisd-new). + * Wed Feb 23 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.097-3 - Move db to /var/lib/clamav - Ship empty directory /etc/clamd.d for amavisd-new diff --git a/sources b/sources index 70d67b2..27407d3 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 44e7df79718d104db0666d5db3f08682 clamav-0.97-clean.tar.bz2 +ae4e25e5df41b71cf6541e3a876b94a7 clamd-wrapper.tar.bz2 commit 728c0a6675486de0cac83ed18d426cc498e94670 Merge: b413e80 77e0359 Author: Dennis Gilmore <dennis(a)ausil.us> Date: Wed Feb 23 21:22:32 2011 -0600 Merge branch 'el6' into el5 Conflicts: clamav.spec commit 77e0359251880d555b1a367a4f4cb2e1e1b33fcb Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Feb 23 17:34:22 2011 -0600 Move db to /var/lib/clamav Add /etc/clamd.d for amavisd-new diff --git a/clamav.spec b/clamav.spec index 3bd0251..824dacd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -94,8 +94,8 @@ you will need to install %{name}-devel. %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure %{__perl} -pi.orig -e ' - s|\@DBDIR\@|\$(localstatedir)/clamav|g; - s|\@DBINST\@|\$(localstatedir)/clamav|g; + s|\@DBDIR\@|\$(localstatedir)/lib/clamav|g; + s|\@DBINST\@|\$(localstatedir)/lib/clamav|g; s|\@CFGDIR\@|\$(sysconfdir)|g; s|\@CFGINST\@|\$(sysconfdir)|g; s|^\@INSTALL_CLAMAV_CONF_TRUE\@|\t|g; @@ -110,7 +110,7 @@ you will need to install %{name}-devel. s|^#(LogSyslog)|$1|; s|^#(PidFile) .+$|$1 %{_localstatedir}/run/clamav/clamd.pid|; s|^#(TemporaryDirectory) .+$|$1 %{_localstatedir}/tmp|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; s|^#(LocalSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; s|^#(FixStaleSocket)|$1|; s|^#(TCPSocket) .+$|$1 3310|; @@ -134,7 +134,7 @@ you will need to install %{name}-devel. %{__perl} -pi.orig -e ' s|^(Example)|#$1|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; s|^#(UpdateLogFile) .+$|$1 %{_localstatedir}/log/clamav/freshclam.log|; s|^#(LogSyslog)|$1|; s|^#(DatabaseOwner) .+$|$1 clam|; @@ -177,7 +177,7 @@ fi %{_bindir}/freshclam \ --quiet \ - --datadir="%{_localstatedir}/clamav" \ + --datadir="%{_localstatedir}/lib/clamav" \ --log="$LOG_FILE" \ --log-verbose \ --daemon-notify="%{_sysconfdir}/clamd.conf" @@ -196,7 +196,7 @@ CLAMAV_FLAGS=" --outgoing --quiet " -SOCKET_ADDRESS="local:%{_localstatedir}/clamav/clmilter.socket" +SOCKET_ADDRESS="local:%{_localstatedir}/run/clamav/clmilter.socket" EOF %build @@ -209,7 +209,7 @@ EOF --disable-unrar \ --enable-id-check \ --enable-dns \ - --with-dbdir="%{_localstatedir}/clamav" \ + --with-dbdir="%{_localstatedir}/lib/clamav" \ --with-group="clam" \ --with-libcurl \ --with-user="clam" \ @@ -238,6 +238,7 @@ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ +install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ %post /sbin/ldconfig @@ -334,6 +335,7 @@ rm -rf %{buildroot} %doc %{_mandir}/man8/clamd.8* %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav +%{_sysconfdir}/clamd.d %config %{_initrddir}/clamd %{_sbindir}/clamd %{_bindir}/clamconf @@ -341,10 +343,10 @@ rm -rf %{buildroot} %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ -%dir %{_localstatedir}/clamav/ +%dir %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/clamd.log -%exclude %{_localstatedir}/clamav/* +%exclude %{_localstatedir}/lib/clamav/* %if %{!?_without_milter:1}0 %files milter @@ -363,7 +365,7 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/logrotate.d/freshclam %defattr(0644, clam, clam, 0755) -%config(noreplace) %verify(user group mode) %{_localstatedir}/clamav/ +%config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log @@ -377,6 +379,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Feb 23 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.097-3 +- Move db to /var/lib/clamav +- Ship empty directory /etc/clamd.d for amavisd-new + * Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 - Disable llvm. commit ade013989017f8044801c73b12a9ddb35ea9007d Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 16:46:26 2011 -0600 Minor changes, bump release to 2 diff --git a/clamav.spec b/clamav.spec index 6e138d3..3bd0251 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -212,7 +212,9 @@ EOF --with-dbdir="%{_localstatedir}/clamav" \ --with-group="clam" \ --with-libcurl \ - --with-user="clam" + --with-user="clam" \ + --disable-llvm + make %{?_smp_mflags} %install @@ -375,6 +377,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 +- Disable llvm. + * Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 - Update to 0.97 - Fix up for current guidelines. commit b413e8038f09e0bae6a347cd56f13f47e3900cd7 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 16:42:16 2011 -0600 Minor changes, bump to Release: 2 diff --git a/clamav.spec b/clamav.spec index 6e138d3..3bd0251 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -212,7 +212,9 @@ EOF --with-dbdir="%{_localstatedir}/clamav" \ --with-group="clam" \ --with-libcurl \ - --with-user="clam" + --with-user="clam" \ + --disable-llvm + make %{?_smp_mflags} %install @@ -375,6 +377,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 +- Disable llvm. + * Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 - Update to 0.97 - Fix up for current guidelines. commit 98d8227630e520e187aa14ff1c862018c4b5596c Merge: 0909a88 78c8a5a Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 16:33:19 2011 -0600 Merge branch 'el6' into el5 Conflicts: .gitignore clamav.spec clamd-wrapper sources diff --cc .gitignore index c07be39,cd2bf84..f6ee443 --- a/.gitignore +++ b/.gitignore @@@ -1,1 -1,2 +1,6 @@@ ++<<<<<<< HEAD +clamav-0.95.1-norar.tar.bz2 ++======= + clamav-0.95.3-norar.tar.bz2 + /clamav-0.97-clean.tar.bz2 ++>>>>>>> el6 commit 78c8a5ad5f7f687287d016ac730bf48645b177e0 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 15:42:47 2011 -0600 Update to 0.097 with new spec diff --git a/.gitignore b/.gitignore index 5b7c836..cd2bf84 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ clamav-0.95.3-norar.tar.bz2 +/clamav-0.97-clean.tar.bz2 diff --git a/ChangeLog-rpm.old b/ChangeLog-rpm.old deleted file mode 100644 index 44c8556..0000000 --- a/ChangeLog-rpm.old +++ /dev/null @@ -1,279 +0,0 @@ -* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 -- updated to 0.88.7 - -* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 -- updated to 0.88.6 - -* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 -- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 -- added patch to set '__attribute__ ((visibility("hidden")))' for - exported MD5_*() functions (fixes #202043) - -* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 -- splitted SysV initscripts of -milter and -server into own subpackages - -* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 -- rebuilt - -* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 -- updated to 0.88.4 (SECURITY) - -* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed the clamdscan(1) manpage from the -server subpackage - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed a superfluous '}' -- removed some code which was relevant for FC-3 only - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 -- updated to 0.88.3 -- updated to new fedora-usermgmt macros - -* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 -- cleanups: removed unneeded curlies, use plain command instead of - %%__XXX macro, whitespace cleanup, removed unneeded versioned - dependencies -- added a 'Requires(post): group(clamav)' dependencies for -update and - added the corresponding Provides: to -data -- removed the %%_without_milter conditional; you won't gain anything - when milter would be disabled at buildtime - -* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 -- updated to 0.88.2 (SECURITY) -- rediffed patches; most issues handled by 0.88.1-2 are fixed in - 0.88.2 - -* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 -- added patch which fixes some classes of compiler warnings; at least - the using of implicitly declared functions was reported to cause - segfaults on AMD64 (brought to my attention by Marc Perkel) -- added patch which fixes wrong usage of strncpy(3) in unrarlib.c - -* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 -- updated to 0.88.1 (SECURITY) - -* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 -- rebuilt for FC5 - -* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 -- updated to 0.88 -- added pseudo-versions for the 'init(...)' provides as a first step - for the support of alternative initmethods - -* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 -- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) -- ship 'clamd.conf.5' man page in the -server subpackage *too*. The - same file is contained in multiple packages now, but this man-page - can not be removed from the base package because it also applies to - 'clamdscan' there (#173221). - -* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 -- updated to 0.87.1 - -* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 -- updated to 0.87 (SECURITY) -- removed -timeout patch; it is solved upstream -- reverted the -exim changes; they add yet more complexity, their - functionality can go into an own package and they contained flaws - -* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 -- Add clamav-exim configuration package - -* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 -- [milter] create the milter-logfile in the %%post scriptlet -- [milter] reverted the change of the default child_timeout value; it - was set to 5 minutes in 0.86.2 which conflicts with the internal - mode where a timeout must not be set. So, the clamav-milter would - not run with the default configuration - -* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 -- Fixed calculation of sleep duration; on some systems/IPs, `hostid` - results in a negative number which is retained by the bash - modulo-operation. So the sleep may get a negative number of seconds - being interpreted as an option. This version makes sure that the - module-operations returns a non-negative value. [BZ #164494, James - Wilkinson] -- added support for a /usr/sbin/clamav-notify-servers.local hook; this - file will be executed (source'd) before all other actions and can - abort the entire processing by invoking 'exit' - -* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 -- updated to 0.86.2 (SECURITY) -- changed the freshclam updating mechanism (again); now, it consists - of a crontab which does not need to be changed and a helper script - (freshclam-sleep). This helper script is configured by - /etc/sysconfig/freshclam - -* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 -- updated to 0.86.1 -- fixed randomization in %%post scriptlet: hour should be a range but - not a single number - -* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 -- updated to 0.86 -- randomize freshclam startup times in -update's %%post script (suggested - by Stephen Smoogen); this requires some more Requires(post): also - -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 -- fix dist tagging the way Enrico wants it - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 -- Rebuild - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 -- Update - -* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 -- updated to 0.85 - -* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 -- updated to 0.84 - -* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> -- rebuilt - -* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 -- updated to 0.83 - -* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 -- updated to 0.82 -- minor spec cleanups - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 -- build the package with '--disable-zlib-vcheck' because RH is unable to - apply a fix for a 5 month old and solved security issue. Please fill - your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 -- added 'BuildRequires: bc' (should work without also, but ./configure - gives out ugly warnings else) - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 -- updated to 0.81 -- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports - an internal mode now which is enabled by default -- updated -milter %%description - -* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 -- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update - subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) - -* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 -- updated to 0.80 -- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore -- buildrequire 'curl-devel' -- renamed clamav.conf to clamd.conf (upstream change) -- updated -initoff patch - -* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 -- updated to 0.75.1 -- use %%configure, the problems with the architecture specification - seem to have passed (probably because of an autoconf update) -- set mode 0600 for the cron-script (required by vixie-cron) -- made the cronjob a spambot and send mail about deactivated freshclam - service to nearly everybody... (root, postmaster, webmaster) -- other fixes in the notification cronjob - -* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 -- updated to 0.75 - -* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 -- moved /usr/bin/clamav-config from main into -devel - -* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 -- updated to 0.74 - -* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 -- updated to 0.73 -- added pkgconfig file - -* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 -- notify the user about a deactivated clamav-update service -- added clamd-gen script which generates template spec-files for - services using clamd -- copied template configuration files to %pkgdatadir/template (needed - for clamd-gen) -- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink - will be provided for compatibility reasons -- conditionalized building of the -milter subpackage ('--without - milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) - -* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 -- removed 'BuildRequires: dietlibc'; it was a leftover from the - pre-use-signal era (before 0.70) (bug #1716) - -* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 -- updated to 0.72 - -* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 -- removed the randomization in the cronjob; it seems to be impossible - to use the mod-operator (%%) there. Instead of, the user has to - replace some placeholders... - -* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 -- updated to 0.71 - -* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 -- quote 'EOF' to delay $RANDOM expansion - -* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 -- updated GECOS entry for the 'clamav' user to describe its purpose - more accurately -- use explicit '-m755' when creating directories with install - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 -- updated to 0.70; rediffed some patches -- updated logrotate script to use signals and documented the steps - which are needed to make it work -- adapted initscript to use signals instead of sockwrite -- removed sockwrite; signals can now be used to reload the database -- added logfile to the -milter subpackage - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 -- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets - -* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 -- split the double Requires(...,...): statements; see - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 -- require the recent fedora-usermgmt package (0.7) which fixes similar - ordering issues - -* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 -- updated to 0.68 (using the -1 version) -- ship milter-files in the -milter instead of the -server subpackage - -* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 -- fixed ':' vs. '.' in chown - -* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 -- randomize freshclam startup to prevent server peaks - -* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 -- updated to 0.67 (using the -1 version) - -* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 -- updated to 0.66; important, packaging-relevant changes are - freshclam: - * $http_proxy is not supported anymore; you have to configure it in - /etc/freshclam.conf - * the logfile has been renamed to /var/log/freshclam.log -- removed %%check section; buildroot check is implemented in local - testsuite already -- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew - files -- added some directory-Requires: -- activated milter-package and made it work -- added patch to disable clamav-milter service by default -- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this - makes things more consistently but can break backward compatibility. The - initscript should deal with the old version too, but I would not bet on - it... -- updated some descriptions -- fixed the update-mechanism; now it happens in two stages: at first, - the files will be downloaded as user 'clamav' and then, root initiates - the daemon-reload. - -* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 -- added security fix for - http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/README.fedora b/README.fedora deleted file mode 100644 index 8df192d..0000000 --- a/README.fedora +++ /dev/null @@ -1,116 +0,0 @@ -A clamav-milter setup consists of the following three components: - -* the clamav-milter itself - - --> this is provided by the 'clamav-milter' package plus (alternatively) - 'clamav-milter-upstart' or 'clamav-milter-sysvinit' - - The main configuration is in /etc/mail/clamav-milter.conf and MUST - be changed before first use. - - The -sysvinit package is managed by the traditional tools, but - -upstart requires modification of /etc/event.d/clamav-milter to - enable automatic startup. See comments there for more details. - -* a clamav scanner daemon - - --> this package is called 'clamav-scanner' plus (alternatively) - 'clamav-scanner-upstart' or 'clamav-scanner-sysvinit' - - The daemon is configured by /etc/clamd.d/scan.conf (which MUST be - edited before first use). - - The -sysvinit package is managed by the traditional tools, but - -upstart requires modification of /etc/event.d/clamd.scan to enable - automatic startup. See comments there for more details. - -* the MTA (sendmail/postfix) - - --> you should know how to install this... - - When communicating across unix sockets with the clamav-milter, it is - suggested to use the /var/run/clamav-milter/clamav-milter.socket - path. You have to add something like - - INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav-milter.socket, F=, T=S:4m;R:4m')dnl - - to your sendmail.mc. - - - -It is suggested that components communicate through TCP sockets as -this eases setup. Please add corresponding packet filter rules! - - -EXAMPLE -======= - -For clamav-milter, a possible setup might be created by - -A) On the MTA (assumed hostname 'host-mta') - - 1. Add to sendmail.mc - - | INPUT_MAIL_FILTER(`clamav', `S=inet:6666@host-milter, F=, T=S:4m;R:4m')dnl - - 2. Rebuild sendmail.cf - - -B) On the clamav-milter host (assumed hostname 'host-milter') - - 1. Install clamav-milter + clamav-milter-upstart packages - - 2. Set in /etc/mail/clamav-milter.conf - - | MilterSocket inet:6666 - | ClamdSocket tcp:host-scanner:6665 - - and all the other options which are required on your system - - 3. Edit /etc/event.d/clamav-milter and uncomment the - - | start on starting local - - line. Restart your system or execute - - | initctl emit starting local - - 4. Add something like - - | iptables -N IN-cmilt - | iptables -A IN-cmilt -s host-mta -j ACCEPT - | iptables -A IN-cmilt -j DROP - - | iptables -A INPUT -p tcp --dport 6666 -j IN-cmilt - - to your firewall setup - -C) On the clamav-scanner host (assumed hostname 'host-scanner') - - 1. Install clamav-scanner + clamav-scanner-upstart packages - - 2. Add to /etc/clamd.d/scan.conf - - | TCPSocket 6665 - | TCPAddr host-scanner - - comment out possible 'LocalSocket' lines and set all the other - options which are required on your system - - 3. Edit /etc/event.d/clamav-scanner and uncomment the - - | start on starting local - - line. Restart your system or execute - - | initctl emit starting local - - 4. Add something like - - | iptables -N IN-cscan - | iptables -A IN-cscan -s host-milter -j ACCEPT - | iptables -A IN-cscan -j DROP - - | iptables -A INPUT -p tcp --dport 6665 -j IN-csan - - to your firewall setup diff --git a/clamav-0.92-open.patch b/clamav-0.92-open.patch deleted file mode 100644 index 040fc20..0000000 --- a/clamav-0.92-open.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 -+++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 -@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da - if (dazuko->device < 0) - { - -- dazuko->device = open("/dev/dazuko", 0); -+ dazuko->device = open("/dev/dazuko", O_RDONLY); - if (dazuko->device < 0) - return -1; - diff --git a/clamav-0.92-private.patch b/clamav-0.92-private.patch deleted file mode 100644 index bab2948..0000000 --- a/clamav-0.92-private.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- clamav-0.92/libclamav.pc.in.private -+++ clamav-0.92/libclamav.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libclamav - Description: A GPL virus scanner - Version: @LIBCLAMAV_VERSION@ --Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -- -+Libs: -L${libdir} -lclamav -+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ -+Cflags: -I${includedir} ---- clamav-0.92/clamav-config.in.private -+++ clamav-0.92/clamav-config.in -@@ -54,12 +54,8 @@ while test $# -gt 0; do - usage 0 - ;; - -- --cflags) -- echo -I@includedir@ @CFLAGS@ -- ;; -- -- --libs) -- echo -L@libdir@ @LIBCLAMAV_LIBS@ -+ (--cflags|--libs) -+ ${PKG_CONFIG:-pkg-config} "$1" libclamav - ;; - - *) diff --git a/clamav-0.95-cliopts.patch b/clamav-0.95-cliopts.patch deleted file mode 100644 index 90d173f..0000000 --- a/clamav-0.95-cliopts.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: clamav-0.95rc1/shared/optparser.c -=================================================================== ---- clamav-0.95rc1.orig/shared/optparser.c -+++ clamav-0.95rc1/shared/optparser.c -@@ -211,7 +211,7 @@ const struct clam_option clam_options[] - - { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, - -- { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, -+ { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, - - { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, - diff --git a/clamav-0.95.3-umask.patch b/clamav-0.95.3-umask.patch deleted file mode 100644 index 220f7ab..0000000 --- a/clamav-0.95.3-umask.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: clamav-0.95.3/clamav-milter/clamav-milter.c -=================================================================== ---- clamav-0.95.3.orig/clamav-milter/clamav-milter.c -+++ clamav-0.95.3/clamav-milter/clamav-milter.c -@@ -306,7 +306,7 @@ int main(int argc, char **argv) { - - if((opt = optget(opts, "PidFile"))->enabled) { - FILE *fd; -- mode_t old_umask = umask(0002); -+ mode_t old_umask = umask(0022); - - if((fd = fopen(opt->strarg, "w")) == NULL) { - logg("!Can't save PID in file %s\n", opt->strarg); -Index: clamav-0.95.3/shared/output.c -=================================================================== ---- clamav-0.95.3.orig/shared/output.c -+++ clamav-0.95.3/shared/output.c -@@ -270,7 +270,7 @@ int logg(const char *str, ...) - #endif - if(logg_file) { - if(!logg_fp) { -- old_umask = umask(0037); -+ old_umask = umask(0077); - if((logg_fp = fopen(logg_file, "at")) == NULL) { - umask(old_umask); - #ifdef CL_THREAD_SAFE -Index: clamav-0.95.3/freshclam/freshclam.c -=================================================================== ---- clamav-0.95.3.orig/freshclam/freshclam.c -+++ clamav-0.95.3/freshclam/freshclam.c -@@ -102,7 +102,7 @@ static void writepid(const char *pidfile - { - FILE *fd; - int old_umask; -- old_umask = umask(0006); -+ old_umask = umask(0022); - if((fd = fopen(pidfile, "w")) == NULL) { - logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); - } else { diff --git a/clamav-0.97-clean.tar.bz2 b/clamav-0.97-clean.tar.bz2 new file mode 100644 index 0000000..9d39f27 Binary files /dev/null and b/clamav-0.97-clean.tar.bz2 differ diff --git a/clamav-milter.init b/clamav-milter.init new file mode 100644 index 0000000..62a2f91 --- /dev/null +++ b/clamav-milter.init @@ -0,0 +1,58 @@ +#!/bin/sh +# +# Startup script for the Clamav Milter Daemon +# +# chkconfig: 2345 77 23 +# description: clamav-milter is a daemon which hooks into sendmail \ +# and routes email messages to clamav. +# processname: clamav-milter +# pidfile: /var/run/clamav/clamav-milter.pid +# config: /etc/sysconfig/clamav-milter + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +[ -x /usr/sbin/clamav-milter ] || exit 0 + +# Local clamav-milter config +CLAMAV_FLAGS= +test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter + +# See how we were called. +case "$1" in + start) + echo -n "Starting Clamav Milter Daemon: " + daemon clamav-milter $CLAMAV_FLAGS $SOCKET_ADDRESS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamav-milter + ;; + stop) + echo -n "Stopping Clamav Milter Daemon: " + killproc clamav-milter + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamav-milter + ;; + status) + status clamav-milter + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + [ -e /var/lock/subsys/clamd ] && restart + RETVAL=$? + ;; + *) + echo "Usage: clamav-milter {start|stop|status|restart|reload|condrestart}" + exit 1 +esac + +exit $RETVAL diff --git a/clamav-milter.sysv b/clamav-milter.sysv deleted file mode 100644 index 170cdc1..0000000 --- a/clamav-milter.sysv +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -# -# clamav-milter Starts/stop the "clamav-milter" daemon -# -# chkconfig: - 79 21 -# description: A virus scanning milter - -# Source function library. -. /etc/rc.d/init.d/functions - -exec=/usr/sbin/clamav-milter -prog="clamav-milter" - -OPTS='-c /etc/mail/clamav-milter.conf' -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -pidfile=/var/run/clamav-milter/milter.pid -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon --pidfile=${pidfile} $exec $OPTS --nofork=no --pid=${pidfile} - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc -p "${pidfile}" $exec - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status -p "${pidfile}" $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? diff --git a/clamav-milter.upstart b/clamav-milter.upstart deleted file mode 100644 index e0a63f2..0000000 --- a/clamav-milter.upstart +++ /dev/null @@ -1,15 +0,0 @@ -### Uncomment these lines when you want clamav-milter to be a milter -### for a locally running MTA -#start on starting sendmail -#start on starting postfix - -### Uncomment these lines when you want clamav-milter to be a milter -### for a remotely running MTA -#start on starting local - -stop on runlevel 0 -stop on runlevel 1 -stop on runlevel 6 - -respawn -exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --nofork=yes diff --git a/clamav-notify-servers b/clamav-notify-servers deleted file mode 100644 index f115e89..0000000 --- a/clamav-notify-servers +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/bash - -# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# Usage: clamav-notify-servers - -CFGFILE=/etc/sysconfig/clamav-servers -BASE=/var/lock/subsys/clamd. -INITRDDIR=/etc/init.d - -ok=1 - -f=/usr/sbin/clamav-notify-servers.local -test ! -e "$f" || . "$f" - -for i in ${BASE}*; do - test -e "$i" || continue - - srv=${INITRDDIR}/clamd.${i##${BASE}} - test -e "$srv" || continue - - "$srv" reload || ok= -done >/dev/null - -test "$ok" diff --git a/clamav-update.cron b/clamav-update.cron deleted file mode 100644 index 3a69901..0000000 --- a/clamav-update.cron +++ /dev/null @@ -1,6 +0,0 @@ -## Adjust this line... -MAILTO=root - -## It is ok to execute it as root; freshclam drops privileges and becomes -## user 'clamav' as soon as possible -0 */3 * * * root /usr/share/clamav/freshclam-sleep diff --git a/clamav-update.logrotate b/clamav-update.logrotate deleted file mode 100644 index 0de6062..0000000 --- a/clamav-update.logrotate +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/freshclam.log { - monthly - notifempty -} diff --git a/clamav.init b/clamav.init new file mode 100755 index 0000000..0e001fb --- /dev/null +++ b/clamav.init @@ -0,0 +1,58 @@ +#!/bin/sh +# +# Startup script for the Clam AntiVirus Daemon +# +# chkconfig: 2345 61 39 +# description: Clam AntiVirus Daemon is a TCP/IP or socket protocol \ +# server. +# processname: clamd +# pidfile: /var/run/clamav/clamd.pid +# config: /etc/clamav.conf + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +[ -x /usr/sbin/clamd ] || exit 0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting Clam AntiVirus Daemon: " + daemon clamd + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd + ;; + stop) + echo -n "Stopping Clam AntiVirus Daemon: " + killproc clamd + rm -f /var/clamav/clamd.socket + rm -f /var/run/clamav/clamav.pid + RETVAL=$? + echo +### heres the fix... we gotta remove the stale files on restart + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamd + ;; + status) + status clamd + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + [ -e /var/lock/subsys/clamd ] && restart + RETVAL=$? + ;; + *) + echo "Usage: clamd {start|stop|status|restart|reload|condrestart}" + exit 1 +esac + +exit $RETVAL + diff --git a/clamav.spec b/clamav.spec index 88935d7..6e138d3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,879 +1,579 @@ -#global snapshot rc1 - -## Fedora Extras specific customization below... -%bcond_without fedora -%bcond_without upstart -%bcond_with unrar -%bcond_without noarch -## - -%global username clamupdate -%global homedir %_var/lib/clamav -%global freshclamlog %_var/log/freshclam.log -%global milteruser clamilt -%global milterlog %_var/log/clamav-milter.log -%global milterstatedir %_var/run/clamav-milter -%global pkgdatadir %_datadir/%name - -%global scanuser clamscan -%global scanstatedir %_var/run/clamd.scan - -%{?with_noarch:%global noarch BuildArch: noarch} -%{!?release_func:%global release_func() %1%{?dist}} - -Summary: End-user tools for the Clam Antivirus scanner -Name: clamav -Version: 0.95.3 -Release: %release_func 1200%{?snapshot:.%snapshot} - -License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} -Group: Applications/File -URL: http://www.clamav.net -%if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… -%else -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: %name-%version%{?snapshot}-norar.tar.bz2 -%endif -Source1: clamd-wrapper -Source2: clamd.sysconfig -Source3: clamd.logrotate -Source5: clamd-README -Source6: clamav-update.logrotate -Source7: clamd.SERVICE.init -Source8: clamav-notify-servers -Patch24: clamav-0.92-private.patch -Patch25: clamav-0.92-open.patch -Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95.3-umask.patch -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: clamav-lib = %version-%release -Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: ncurses-devel -BuildRequires: %_includedir/tcpd.h -BuildRequires: bc - -%package filesystem -Summary: Filesystem structure for clamav -Group: Applications/File -Provides: user(%username) = 4 -Provides: group(%username) = 4 -# Prevent version mix -Conflicts: %name < %version-%release -Conflicts: %name > %version-%release -BuildRequires: fedora-usermgmt-devel -%{?noarch} -%{?FE_USERADD_REQ} - -%package lib -Summary: Dynamic libraries for the Clam Antivirus scanner -Group: System Environment/Libraries -Requires: data(clamav) - -%package devel -Summary: Header files and libraries for the Clam Antivirus scanner -Group: Development/Libraries -Source100: clamd-gen -Requires: clamav-lib = %version-%release -Requires: clamav-filesystem = %version-%release -Requires(pre): %_libdir/pkgconfig -Requires: pkgconfig - -%package data -Summary: Virus signature data for the Clam Antivirus scanner -Group: Applications/File -Requires(pre): clamav-filesystem = %version-%release -Requires(postun): clamav-filesystem = %version-%release -Provides: data(clamav) = full -Conflicts: data(clamav) < full -Conflicts: data(clamav) > full -%{?noarch} - -%package data-empty -Summary: Empty data package for the Clam Antivirus scanner -Group: Applications/File -Provides: data(clamav) = empty -Conflicts: data(clamav) < empty -Conflicts: data(clamav) > empty -%{?noarch} - -%package update -Summary: Auto-updater for the Clam Antivirus scanner data-files -Group: Applications/File -Source200: freshclam-sleep -Source201: freshclam.sysconfig -Source202: clamav-update.cron -Requires: clamav-filesystem = %version-%release -Requires(pre): /etc/cron.d -Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod -Requires(post): group(%username) - -%package server -Summary: Clam Antivirus scanner server -Group: System Environment/Daemons -Requires: data(clamav) -Requires: clamav-filesystem = %version-%release -Requires: clamav-lib = %version-%release - -%package server-sysvinit -Summary: SysV initscripts for clamav server -Group: System Environment/Daemons -Provides: init(clamav-server) = sysv -Requires: clamav-server = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir -Provides: clamav-server-sysv = %version-%release -Obsoletes: clamav-server-sysv < %version-%release -%{?noarch} - - -%package scanner -Summary: Clamav scanner daemon -Group: System Environment/Daemons -Requires: init(clamav-scanner) -Provides: user(%scanuser) = 49 -Provides: group(%scanuser) = 49 -Requires: clamav-server = %version-%release -%{?noarch} - -%package scanner-sysvinit -Summary: SysV initscripts for clamav scanner daemon -Group: System Environment/Daemons -Provides: init(clamav-scanner) = sysv -Requires: clamav-server-sysvinit = %version-%release -Requires: clamav-scanner = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -%{?noarch} - -%package scanner-upstart -Summary: Upstart initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source410: clamd.scan.upstart -Provides: init(clamav-scanner) = upstart -Requires: clamav-scanner = %version-%release -# implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d -Requires(post): /usr/bin/killall -Requires(postun): /sbin/initctl -%{?noarch} - - -%package milter -Summary: Milter module for the Clam Antivirus scanner -Group: System Environment/Daemons -Source300: README.fedora -Requires: init(clamav-milter) -BuildRequires: sendmail-devel -BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) = 5 -Provides: group(%milteruser) = 5 -Requires(post): coreutils -%{?FE_USERADD_REQ} - -Provides: milter(clamav) = sendmail -Provides: milter(clamav) = postfix - -Provides: clamav-milter-core = %version-%release -Obsoletes: clamav-milter-core < %version-%release -Provides: clamav-milter-sendmail = %version-%release -Obsoletes: clamav-milter-sendmail < %version-%release - -%package milter-sysvinit -Summary: SysV initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source320: clamav-milter.sysv -Provides: init(clamav-milter) = sysvinit -Requires: clamav-milter = %version-%release -Requires(post): user(%milteruser) clamav-milter -Requires(preun): user(%milteruser) clamav-milter -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -Provides: clamav-milter-sysv = %version-%release -Obsoletes: clamav-milter-sysv < %version-%release -%{?noarch} - -%package milter-upstart -Summary: Upstart initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source310: clamav-milter.upstart -Provides: init(clamav-milter) = upstart -Requires: clamav-milter = %version-%release -# implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d -Requires(post): /usr/bin/killall -Requires(postun): /sbin/initctl -%{?noarch} - +### FIXME: Sysv script does not have condrestart option (redo sysv script) +### FIXME: amavisd-new requires clamd to run as user vscan, solution needed +### REMINDER: Look and sync with Petr Kristof's work + +Summary: Anti-virus software +Name: clamav +Version: 0.97 +Release: 1%{?dist} +License: GPLv2 +Group: Applications/System +URL: http://www.clamav.net/ + +# Upstream source includes libunrar that is not distributable. +#Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz +Source0: clamav-0.97-clean.tar.bz2 +Source1: clamav.init +Source2: clamav-milter.init +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel +%{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} +Requires: clamav-db = %{version}-%{release} +Requires(pre): shadow-utils + +### Fedora Extras introduced them differently :( +Obsoletes: libclamav < %{version}-%{release} +Obsoletes: clamav-lib < %{version}-%{release} +Obsoletes: clamav-filesystem < %{version}-%{release} +Provides: libclamav %description -Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this -software is the integration with mail servers (attachment scanning). The -package provides a flexible and scalable multi-threaded daemon, a command -line scanner, and a tool for automatic updating via Internet. The programs -are based on a shared library distributed with the Clam AntiVirus package, -which you can use with your own software. The virus database is based on -the virus database from OpenAntiVirus, but contains additional signatures -(including signatures for popular polymorphic viruses, too) and is KEPT UP -TO DATE. - -%description filesystem -This package provides the filesystem structure and contains the -user-creation scripts required by clamav. - -%description lib -This package contains dynamic libraries shared between applications -using the Clam Antivirus scanner. - -%description devel -This package contains headerfiles and libraries which are needed to -build applications using clamav. - -%description data -This package contains the virus-database needed by clamav. This -database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. This package and the -'clamav-data-empty' package are mutually exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description data-empty -This is an empty package to fulfill inter-package dependencies of the -clamav suite. This package and the 'clamav-data' package are mutually -exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - +Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of +this software is the integration with mail servers (attachment scanning). +The package provides a flexible and scalable multi-threaded daemon, a +command line scanner, and a tool for automatic updating via Internet. -%description update -This package contains programs which can be used to update the clamav -anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. +The programs are based on a shared library distributed with the Clam +AntiVirus package, which you can use with your own software. Most +importantly, the virus database is kept up to date -%description server -ATTENTION: most users do not need this package; the main package has -everything (or depends on it) which is needed to scan for virii on -workstations. +%package -n clamd +Summary: The Clam AntiVirus Daemon +Group: System Environment/Daemons +Requires: clamav = %{version}-%{release} -This package contains files which are needed to execute the clamd-daemon. -This daemon does not provide a system-wide service. Instead of, an instance -of this daemon should be started for each service requiring it. +### Fedora Extras introduced them differently :( +Obsoletes: clamav-server <= %{version}-%{release} +Obsoletes: clamav-server-sysv <= %{version}-%{release} -See the README file how this can be done with a minimum of effort. - - -%description server-sysvinit -SysV initscripts template for the clamav server - - -%description scanner -This package contains a generic system wide clamd service which is -e.g. used by the clamav-milter package. - -%description scanner-sysvinit -The SysV initscripts for clamav-scanner. - -%description scanner-upstart -The Upstart initscripts for clamav-scanner. +%description -n clamd +The Clam AntiVirus Daemon +%package milter +Summary: The Clam AntiVirus sendmail-milter Daemon +Group: Applications/System +Requires: clamd = %{version}-%{release} +Requires: sendmail +Obsoletes: clamav-milter-sysv <= %{version}-%{release} %description milter -This package contains files which are needed to run the clamav-milter. +The Clam AntiVirus sendmail-milter Daemon -%description milter-sysvinit -The SysV initscripts for clamav-milter. +%package db +Summary: Virus database for %{name} +Group: Applications/Databases +### Remove circular dependency +#Requires: clamav = %{version}-%{release} -%description milter-upstart -The Upstart initscripts for clamav-milter. +### Fedora Extras introduced them differently :( +Obsoletes: clamav-update <= %{version}-%{release} +Obsoletes: clamav-data <= %{version}-%{release} -## ------------------------------------------------------------ - -%prep -%setup -q -n %{name}-%{version}%{?snapshot} +%description db +The actual virus database for %{name} -%patch24 -p1 -b .private -%patch25 -p1 -b .open -%patch26 -p1 -b .cliopts -%patch27 -p1 -b .umask - -install -p -m0644 %SOURCE300 clamav-milter/ - -mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} +%package devel +Summary: Header files, libraries and development documentation for %{name} +Group: Development/Libraries +Requires: clamav = %{version}-%{release} -sed -ri \ - -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ - -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ - -e 's!^#?(User ).*!\1<USER>!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ - -e 's! /usr/local/share/clamav,! %homedir,!g' \ - etc/clamd.conf +### Fedora Extras introduced them differently :( +Obsoletes: libclamav-static-devel <= %{version}-%{release} +Obsoletes: libclamav-devel <= %{version}-%{release} +Provides: libclamav-static-devel, libclamav-devel -sed -ri \ - -e 's!^#?(UpdateLogFile )!#\1!g;' \ - -e 's!^#?(LogSyslog).*!\1 yes!g' \ - -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf +%description devel +This package contains the header files, static libraries and development +documentation for %{name}. If you like to develop programs using %{name}, +you will need to install %{name}-devel. +%prep +%setup -q + +%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure + +%{__perl} -pi.orig -e ' + s|\@DBDIR\@|\$(localstatedir)/clamav|g; + s|\@DBINST\@|\$(localstatedir)/clamav|g; + s|\@CFGDIR\@|\$(sysconfdir)|g; + s|\@CFGINST\@|\$(sysconfdir)|g; + s|^\@INSTALL_CLAMAV_CONF_TRUE\@|\t|g; + s|^\@INSTALL_FRESHCLAM_CONF_TRUE\@|\t|g; + ' database/Makefile.in etc/Makefile.in + +%{__perl} -pi.orig -e ' + s|^(Example)|#$1|; + s|^#(LogFile) .+$|$1 %{_localstatedir}/log/clamav/clamd.log|; + s|^#(LogFileMaxSize) .*|$1 0|; + s|^#(LogTime)|$1|; + s|^#(LogSyslog)|$1|; + s|^#(PidFile) .+$|$1 %{_localstatedir}/run/clamav/clamd.pid|; + s|^#(TemporaryDirectory) .+$|$1 %{_localstatedir}/tmp|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(LocalSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; + s|^#(FixStaleSocket)|$1|; + s|^#(TCPSocket) .+$|$1 3310|; + s|^#(TCPAddr) .+$|$1 127.0.0.1|; + s|^#(MaxConnectionQueueLength) .+$|$1 30|; + s|^#(StreamSaveToDisk)|$1|; + s|^#(MaxThreads) .+$|$1 50|; + s|^#(ReadTimeout) .+$|$1 300|; + s|^#(User) .+$|$1 clam|; + s|^#(AllowSupplementaryGroups).*$|$1 yes|; + s|^#(ScanPE) .+$|$1 yes|; + s|^#(ScanELF) .+$|$1 yes|; + s|^#(DetectBrokenExecutables)|$1|; + s|^#(ScanOLE2) .+$|$1 yes|; + s|^#(ScanMail)|$1|; + s|^#(ScanArchive) .+$|$1 yes|; + s|^#(ArchiveMaxCompressionRatio) .+|$1 300|; + s|^#(ArchiveBlockEncrypted)|$1|; + s|^#(ArchiveBlockMax)|$1|; + ' etc/clamd.conf + +%{__perl} -pi.orig -e ' + s|^(Example)|#$1|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(UpdateLogFile) .+$|$1 %{_localstatedir}/log/clamav/freshclam.log|; + s|^#(LogSyslog)|$1|; + s|^#(DatabaseOwner) .+$|$1 clam|; + s|^(Checks) .+$|$1 24|; + s|^#(NotifyClamd) .+$|$1 %{_sysconfdir}/clamd.conf|; + ' etc/freshclam.conf + +cat <<EOF >clamd.logrotate +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} +EOF -## ------------------------------------------------------------ +cat <<EOF >freshclam.logrotate +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} +EOF + +cat <<'EOF' >freshclam.cron +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/clamav" \ + --log="$LOG_FILE" \ + --log-verbose \ + --daemon-notify="%{_sysconfdir}/clamd.conf" +EOF + +%{__cat} <<EOF >clamav-milter.sysconfig +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS=" + --config-file=%{_sysconfdir}/clamd.conf + --force-scan + --local + --max-children=10 + --noreject + --outgoing + --quiet +" +SOCKET_ADDRESS="local:%{_localstatedir}/clamav/clmilter.socket" +EOF %build -CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" -export LDFLAGS='-Wl,--as-needed' -# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check -export LIBS='-lmilter -lpthread' -# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine -export have_cv_ipv6=yes -%configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static \ - --disable-rpath \ - --with-user=%username \ - --with-group=%username \ - %{!?with_unrar:--disable-unrar} - -# TODO: check periodically that CLAMAVUSER is used for freshclam only - - -# build with --as-needed and disable rpath -sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ - libtool - - +%configure \ + --program-prefix="%{?_program_prefix}" \ +%{!?_without_milter:--enable-milter} \ + --disable-clamav \ + --disable-static \ + --disable-zlib-vcheck \ + --disable-unrar \ + --enable-id-check \ + --enable-dns \ + --with-dbdir="%{_localstatedir}/clamav" \ + --with-group="clam" \ + --with-libcurl \ + --with-user="clam" make %{?_smp_mflags} - -## ------------------------------------------------------------ - %install -rm -rf "$RPM_BUILD_ROOT" _doc* -make DESTDIR="$RPM_BUILD_ROOT" install - -function smartsubst() { - local tmp - local regexp=$1 - shift - - tmp=$(mktemp /tmp/%name-subst.XXXXXX) - for i; do - sed -e "$regexp" "$i" >$tmp - cmp -s $tmp "$i" || cat $tmp >"$i" - rm -f $tmp - done -} - - -install -d -m755 \ - ${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,event.d} \ - ${RPM_BUILD_ROOT}%_var/log \ - ${RPM_BUILD_ROOT}%milterstatedir \ - ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir \ - ${RPM_BUILD_ROOT}%scanstatedir +rm -rf %{buildroot} +make install DESTDIR="%{buildroot}" -rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ - ${RPM_BUILD_ROOT}%_libdir/*.la - - -touch ${RPM_BUILD_ROOT}%homedir/daily.cld -touch ${RPM_BUILD_ROOT}%homedir/main.cld +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav +%if %{!?_without_milter:1}0 +install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter +install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +%else +rm %{buildroot}%{_mandir}/man8/clamav-milter.8* +%endif -## prepare the server-files -mkdir _doc_server -install -m644 -p %SOURCE2 _doc_server/clamd.sysconfig -install -m644 -p %SOURCE3 _doc_server/clamd.logrotate -install -m755 -p %SOURCE7 _doc_server/clamd.init -install -m644 -p %SOURCE5 _doc_server/README -install -m644 -p etc/clamd.conf _doc_server/clamd.conf +install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ +touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log +touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log -install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir -install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper +install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ -smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper +%post +/sbin/ldconfig +ZONES="/usr/share/zoneinfo/zone.tab" +CONFIG="/etc/sysconfig/clock" -## prepare the update-files -install -m644 -p %SOURCE6 ${RPM_BUILD_ROOT}%_sysconfdir/logrotate.d/clamav-update -install -m755 -p %SOURCE8 ${RPM_BUILD_ROOT}%_sbindir/clamav-notify-servers -touch ${RPM_BUILD_ROOT}%freshclamlog +if [ -r "$CONFIG" -a -r "$ZONES" ]; then + source "$CONFIG" + export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | head -1 | cut -f1 | tr [A-Z] [a-z])" +fi -install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update +if [ -z "$CODE" ]; then + export CODE="local" +fi -smartsubst 's!webmaster,clamav!webmaster,%username!g; - s!/usr/share/clamav!%pkgdatadir!g; - s!/usr/bin!%_bindir!g; - s!/usr/sbin!%_sbindir!g;' \ - $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ - $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +%{__perl} -pi -e ' + s|^(DatabaseMirror) database\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; + s|^(DatabaseMirror) db\.\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; + ' %{_sysconfdir}/freshclam.conf{,.rpmnew} &>/dev/null || : +%postun -p /sbin/ldconfig -### The scanner stuff -sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf +%pre +getent group clam >/dev/null || groupadd -r clam +getent passwd clam >/dev/null || \ +useradd -r -g clam -d /var/clamav -s /sbin/nologin \ + -c "Clam Anti Virus Checker" clam +exit 0 -sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ - > $RPM_BUILD_ROOT%_initrddir/clamd.scan +%pre -n clamd +getent group clam >/dev/null || groupadd -r clam +getent passwd clam >/dev/null || \ +useradd -r -g clam -d /var/clamav -s /sbin/nologin \ + -c "Clam Anti Virus Checker" clam +exit 0 -install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamd.scan +%post -n clamd +/sbin/chkconfig --add clamd -touch $RPM_BUILD_ROOT%scanstatedir/clamd.sock +%preun -n clamd +if [ $1 -eq 0 ]; then + /sbin/service clamd stop &>/dev/null || : + /sbin/chkconfig --del clamd +fi +%postun -n clamd +/sbin/service clamd condrestart &>/dev/null || : -### The milter stuff -sed -r \ - -e 's!^#?(User).*!\1 %milteruser!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ - -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ - -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ - -e 's! /tmp/clamav-milter.log! %milterlog!g' \ - etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf +%post milter +/sbin/chkconfig --add clamav-milter -install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamav-milter -install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +%preun milter +if [ $1 -eq 0 ]; then + /sbin/service clamav-milter stop &>/dev/null || : + /sbin/chkconfig --del clamav-milter +fi +%postun milter +/sbin/service clamav-milter condrestart &>/dev/null || : -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf -touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} +%pre db +getent group clam >/dev/null || groupadd -r clam +getent passwd clam >/dev/null || \ +useradd -r -g clam -d /var/clamav -s /sbin/nologin \ + -c "Clam Anti Virus Checker" clam +exit 0 -%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/event.d} +%clean +rm -rf %{buildroot} -## ------------------------------------------------------------ +%files +%defattr(-, root, root, 0755) +%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README test/ +%doc docs/*.pdf etc/freshclam.conf +%doc %{_mandir}/man1/sigtool.1* +%doc %{_mandir}/man1/clamscan.1* +%doc %{_mandir}/man1/freshclam.1* +%doc %{_mandir}/man5/freshclam.conf.5* +%config(noreplace) %{_sysconfdir}/freshclam.conf +%{_bindir}/clamscan +%{_bindir}/freshclam +%{_bindir}/sigtool +%{_bindir}/clambc +%{_libdir}/libclamav.so.* + +%files -n clamd +%defattr(-, root, root, 0755) +%doc etc/clamd.conf +%doc %{_mandir}/man1/clamdscan.1* +%doc %{_mandir}/man1/clamconf.1* +%doc %{_mandir}/man1/clamdtop.1* +%doc %{_mandir}/man5/clamd.conf.5* +%doc %{_mandir}/man8/clamd.8* +%config(noreplace) %{_sysconfdir}/clamd.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/clamav +%config %{_initrddir}/clamd +%{_sbindir}/clamd +%{_bindir}/clamconf +%{_bindir}/clamdscan + +%defattr(0644, clam, clam, 0755) +%{_localstatedir}/run/clamav/ +%dir %{_localstatedir}/clamav/ +%dir %{_localstatedir}/log/clamav/ +%ghost %{_localstatedir}/log/clamav/clamd.log +%exclude %{_localstatedir}/clamav/* + +%if %{!?_without_milter:1}0 +%files milter +%defattr(-, root, root, 0755) +%doc %{_mandir}/man5/clamav-milter.conf.5* +%doc %{_mandir}/man8/clamav-milter.8* +%config(noreplace) %{_sysconfdir}/sysconfig/clamav-milter +%config %{_initrddir}/clamav-milter +%{_sbindir}/clamav-milter +%config(noreplace) %{_sysconfdir}/clamav-milter.conf +%endif -%clean -rm -rf "$RPM_BUILD_ROOT" +%files db +%defattr(-, root, root, 0755) +%config(noreplace) %{_sysconfdir}/cron.daily/freshclam +%config(noreplace) %{_sysconfdir}/logrotate.d/freshclam -## ------------------------------------------------------------ +%defattr(0644, clam, clam, 0755) +%config(noreplace) %verify(user group mode) %{_localstatedir}/clamav/ +%dir %{_localstatedir}/log/clamav/ +%ghost %{_localstatedir}/log/clamav/freshclam.log -%triggerprein filesystem -- clamav-filesystem < 0.96 -## REMOVE me in F14 or F15 (added in pre F12) -! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { - /usr/sbin/usermod -l %username clamav || : - /usr/sbin/groupmod -n %username clamav || : - logger -t rpm/clamav "Renamed clamav user+group to %username" || : -} +%files devel +%defattr(-, root, root, 0755) +%{_bindir}/clamav-config +%{_includedir}/clamav.h +%{_libdir}/libclamav.so +%{_libdir}/pkgconfig/libclamav.pc +#%{_libdir}/libclamav.a +%exclude %{_libdir}/libclamav.la -%pre filesystem -%__fe_groupadd 4 -r %username &>/dev/null || : -%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ - -c 'Clamav database update user' -g %username %username &>/dev/null || : +%changelog +* Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 +- Update to 0.97 +- Fix up for current guidelines. -%postun filesystem -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : +* Fri Nov 23 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-3 +- Change username to get upgrades from fedora versions working. +* Thu Nov 22 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-2 +- Initial changes for EPEL version. -%pre scanner -%__fe_groupadd 49 -r %scanuser &>/dev/null || : -%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ - -g %scanuser %scanuser &>/dev/null || : +* Tue Aug 21 2007 Dag Wieers <dag(a)wieers.com> - 0.91.2-1 +- Updated to release 0.91.2. -%postun scanner -%__fe_userdel %scanuser &>/dev/null || : -%__fe_groupdel %scanuser &>/dev/null || : +* Tue Jul 17 2007 Dag Wieers <dag(a)wieers.com> - 0.91.1-1 +- Updated to release 0.91.1. +* Wed Jul 11 2007 Dag Wieers <dag(a)wieers.com> - 0.91-1 +- Updated to release 0.91. -%post scanner-sysvinit -/sbin/chkconfig --add clamd.scan +* Thu May 31 2007 Dag Wieers <dag(a)wieers.com> - 0.90.3-1 +- Updated to release 0.90.3. -%preun scanner-sysvinit -test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.scan +* Fri Apr 27 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-2 +- Added clamav-milter support for EL2.1 now that it comes with a newer sendmail. (Tom G. Christensen) -%postun scanner-sysvinit -test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : +* Sun Apr 15 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-1 +- Updated to release 0.90.2. +* Fri Mar 09 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-4 +- Removed circular dependency. -%post scanner-upstart -/usr/bin/killall -u %scanuser clamd 2>/dev/null || : +* Thu Mar 08 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-3 +- Cleaned up default options to clamav-milter. (Adam T. Bowen) +- Removed -b/--bounce as it is no longer recognized. (Gerald Teschl) -%preun scanner-upstart -test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : +* Mon Mar 05 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-2 +- Removed the erroneous --dont-clean-log from the clamav-milter sysconfig. (Gerald Teschl) +* Fri Mar 02 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-1 +- Updated to release 0.90.1. +* Tue Feb 20 2007 Dag Wieers <dag(a)wieers.com> - 0.90-3 +- Do the right thing... -%post update -test -e %freshclamlog || { - touch %freshclamlog - %__chmod 0664 %freshclamlog - %__chown root:%username %freshclamlog -} +* Mon Feb 19 2007 Dag Wieers <dag(a)wieers.com> - 0.90-2 +- The tarball was re-rolled before public release. Sigh. +* Tue Feb 13 2007 Dag Wieers <dag(a)wieers.com> - 0.90-1 +- Updated to release 0.90. -%triggerin milter -- clamav-scanner -# Add the milteruser to the scanuser group; this is required when -# milter and clamd communicate through local sockets -/usr/sbin/usermod -a -G %scanuser %milteruser &>/dev/null || : +* Tue Dec 12 2006 Dag Wieers <dag(a)wieers.com> - 0.88.7-1 +- Updated to release 0.88.7. -%pre milter -%__fe_groupadd 5 -r %milteruser &>/dev/null || : -%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : +* Sun Nov 05 2006 Dag Wieers <dag(a)wieers.com> - 0.88.6-1 +- Updated to release 0.88.6. +- Added condrestart to sysv scripts. (Tsai Li Ming) -%post milter -test -e %milterlog || { - touch %milterlog - chmod 0620 %milterlog - chown root:%milteruser %milterlog -} +* Sat Oct 28 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-2 +- Added missing clamav dependency to clamav-db. -%postun milter -%__fe_userdel %milteruser &>/dev/null || : -%__fe_groupdel %milteruser &>/dev/null || : +* Sun Oct 15 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-1 +- Updated to release 0.88.5. +* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.4-1 +- Updated to release 0.88.4. -%post milter-sysvinit -/sbin/chkconfig --add clamav-milter +* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-2 +- Incorporated UPX heap overflow fix. -%preun milter-sysvinit -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter +* Sat Jul 01 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-1 +- Updated to release 0.88.3. -%postun milter-sysvinit -test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : +* Sun Apr 30 2006 Dag Wieers <dag(a)wieers.com> - 0.88.2-1 +- Updated to release 0.88.2. +* Tue Apr 04 2006 Dag Wieers <dag(a)wieers.com> - 0.88.1-1 +- Updated to release 0.88.1. -%post milter-upstart -/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : +* Mon Jan 09 2006 Dag Wieers <dag(a)wieers.com> - 0.88-1 +- Updated to release 0.88. -%preun milter-upstart -test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : +* Sun Nov 13 2005 Dries Verachtert <dries(a)ulyssis.org> - 0.87.1-1 +- Updated to release 0.87.1. +* Sat Sep 17 2005 Dag Wieers <dag(a)wieers.com> - 0.87-1 +- Updated to release 0.87. -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig +* Mon Jul 25 2005 Dag Wieers <dag(a)wieers.com> - 0.86.2-1 +- Updated to release 0.86.2. +* Mon Jul 11 2005 Dag Wieers <dag(a)wieers.com> - 0.86.1-1 +- Updated to release 0.86.1. -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE -%doc docs/*.pdf -%_bindir/* -%_mandir/man[15]/* -%exclude %_bindir/clamav-config -%exclude %_bindir/freshclam -%exclude %_mandir/*/freshclam* +* Mon May 16 2005 Dag Wieers <dag(a)wieers.com> - 0.85.1-1 +- Updated to release 0.85.1. -## ----------------------- +* Fri Apr 29 2005 Dag Wieers <dag(a)wieers.com> - 0.84-1 +- Updated to release 0.84. -%files lib -%defattr(-,root,root,-) -%_libdir/*.so.* +* Mon Feb 14 2005 Dag Wieers <dag(a)wieers.com> - 0.83-1 +- Updated to release 0.83. -## ----------------------- +* Thu Feb 10 2005 Dag Wieers <dag(a)wieers.com> - 0.82-2 +- Fix for false positive on RIFF files. (Roger Jochem) -%files devel -%defattr(-,root,root,-) -%_includedir/* -%_libdir/*.so -%pkgdatadir/template -%pkgdatadir/clamd-gen -%_libdir/pkgconfig/* -%_bindir/clamav-config +* Mon Feb 07 2005 Dag Wieers <dag(a)wieers.com> - 0.82-1 +- Updated to release 0.82. -## ----------------------- +* Thu Jan 27 2005 Dag Wieers <dag(a)wieers.com> - 0.81-1 +- Improved logrotate scripts. (Filippo Grassilli) +- Updated to release 0.81. -%files filesystem -%attr(-,%username,%username) %dir %homedir -%attr(-,root,root) %dir %pkgdatadir +* Wed Dec 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-2 +- Added %%dir /var/clamav/log. (Adam Bowns) +- Changed logrotate script to use clamd.log. (Stuart Schneider) +- Added curl dependency. (Petr Kristof) +- Synchronized some options from Petr. (Petr Kristof) +- Fixed another clamav.conf reference. (Michael Best) -## ----------------------- +* Mon Nov 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-1 +- Updated package description. (Arvin Troels) +- Incorporated fixes from Jima. (Jima) +- Config clamav.conf renamed to clamd.conf. +- Removed obsolete patch. +- Added macros for building without milter. +- Updated to release 0.80. -%files data -%defattr(-,%username,%username,-) -# use %%config to keep files which were updated by 'freshclam' -# already. Without this tag, they would be overridden with older -# versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %homedir/*.cvd +* Fri Jul 30 2004 Dag Wieers <dag(a)wieers.com> - 0.75.1-1 +- Added obsoletes for fedora.us. +- Updated to release 0.75.1. +* Mon Jul 26 2004 Dag Wieers <dag(a)wieers.com> - 0.75-2 +- Fixed a problem where $CODE was empty. -%files data-empty -%defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/*.cvd +* Fri Jul 23 2004 Dag Wieers <dag(a)wieers.com> - 0.75-1 +- Updated to release 0.75. +* Wed Jun 30 2004 Dag Wieers <dag(a)wieers.com> - 0.74-1 +- Updated to release 0.74. -## ----------------------- +* Tue Jun 15 2004 Dag Wieers <dag(a)wieers.com> - 0.73-1 +- Updated to release 0.73. -%files update -%defattr(-,root,root,-) -%_bindir/freshclam -%_mandir/*/freshclam* -%pkgdatadir/freshclam-sleep -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* -%config(noreplace) %_sysconfdir/cron.d/* -%config(noreplace) %_sysconfdir/sysconfig/freshclam +* Thu Jun 03 2004 Dag Wieers <dag(a)wieers.com> - 0.72-1 +- Updated to release 0.72. -%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/*.cld +* Thu May 20 2004 Dag Wieers <dag(a)wieers.com> - 0.71-1 +- Updated to release 0.71. +* Sun May 02 2004 Dag Wieers <dag(a)wieers.com> - 0.70-2 +- Fixed the installation check for conf files. (Richard Soderberg, Udo Ruecker) +- Changed the init-order of the sysv scripts. (Will McCutcheon) +- Changes to the default configuration files. -## ----------------------- +* Sat Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 +- Updated to release 0.70. -%files server -%defattr(-,root,root,-) -%doc _doc_server/* -%_mandir/man[58]/clamd* -%_sbindir/* -%pkgdatadir/clamd-wrapper -%dir %_sysconfdir/clamd.d +* Tue Mar 16 2004 Dag Wieers <dag(a)wieers.com> - 0.68-1 +- Updated to release 0.68. -%exclude %_sbindir/*milter* -%exclude %_mandir/man8/clamav-milter* +* Fri Mar 12 2004 Dag Wieers <dag(a)wieers.com> - 0.67.1-1 +- Updated to release 0.67-1. +- Added clamdwatch and trashcan to clamd. +* Mon Mar 08 2004 Dag Wieers <dag(a)wieers.com> - 0.67-1 +- Personalized SPEC file. -%files server-sysvinit -%defattr(-,root,root,-) -%_initrddir/clamd-wrapper +* Mon Aug 22 2003 Matthias Saou/Che +- Added "--without milter" build option. (Matthias Saou) +- Fixed freshclam cron (Matthias Saou) +- Built the new package. (Che) +* Tue Jun 24 2003 Che +- clamav-milter introduced. +- a few more smaller fixes. -## ----------------------- +* Sun Jun 22 2003 Che +- version upgrade -%files scanner -%defattr(-,root,root,-) -%dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%config(noreplace) %_sysconfdir/clamd.d/scan.conf -%ghost %scanstatedir/clamd.sock +* Mon Jun 16 2003 Che +- rh9 build +- various fixes +- got rid of rpm-helper prereq -%files scanner-sysvinit -%attr(0755,root,root) %config %_initrddir/clamd.scan +* Fri Mar 24 2003 Che +- some cleanups and fixes +- new patch added -%if 0%{?with_upstart:1} -%files scanner-upstart -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/event.d/clamd.scan -%endif +* Fri Nov 22 2002 Che +- fixed a config patch issue -## ----------------------- +* Fri Nov 22 2002 Che +- version upgrade and some fixes -%files milter -%defattr(-,root,root,-) -%doc clamav-milter/README.fedora -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %_sysconfdir/mail/clamav-milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%attr(0710,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterstatedir/* - -%files milter-sysvinit -%defattr(-,root,root,-) -%config %_initrddir/clamav-milter - -%if 0%{?with_upstart:1} -%files milter-upstart -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/event.d/clamav-milter -%endif +* Sat Nov 02 2002 Che +- version upgrade +* Wed Oct 24 2002 Che +- some important changes for lsb compliance -%changelog -* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- adjusted chkconfig positions for clamav-milter (#530101) - -* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1200 -- updated to 0.95.3 - -* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- conditionalized build of noarch subpackages to ease packaging under RHEL5 - -* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 -- modified freshclam configuration to log by syslog by default -- disabled LocalSocket option in sample configuration -- fixed clamav-milter sysv initscript to use bash interpreter and to - be disabled by default - -* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 -- renamed 'clamav' user/group to 'clamupdate' -- add the '%milteruser' user to the '%scanuser' group when the -scanner - subpackage is installed - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 -- updated to 0.95.2 - -* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 -- fixed '--without upstart' operation - -* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 -- added '%%bcond_without upstart' conditional to ease skipping of - -upstart subpackage creation e.g. on EL5 systems -- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which - broke update path - -* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 -- Upgrade to 0.95.1 (#495039) - -* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 -- updated to final 0.95 -- added ncurses-devel (-> clamdtop) BR -- enforced IPv6 support - -* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 -- updated to 0.95rc1 -- added -upstart subpackages -- renamed -sysv to -sysvinit to make -upstart win the default dep resolving -- reworked complete milter stuff -- added -scanner subpackage which contains a preconfigured daemon - (e.g. for use by -milter) -- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old - -* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 -- made some subpackages noarch -- fixed typo in SysV initscript which removes 'touch' file (#473513) - -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 -- Upgrade to 0.94.2 (#474002) - -* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 -- Upgrade to 0.94.1 - -* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 -- Upgrade to 0.94 (SECURITY), fixes #461461: -- CVE-2008-1389 Invalid memory access in the CHM unpacker -- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg -- CVE-2008-3913 Memory leak in code path in freshclam's manager.c -- CVE-2008-3914 Multiple file descriptor leaks on the code paths - -* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 -- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read - on petite files) -- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) -- rediffed patches - -* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 -- updated to 0.93.1 -- rediffed -path patch -- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability - -* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 -- updated to final 0.93 -- removed daily.inc + main.inc directories; they are now replaced by - *.cld containers -- trimmed down MAILTO list of cronjob to 'root' again; every well - configured system has an alias for this recipient - -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 -- moved -milter scriptlets into -milter-core subpackage -- added a requirement on the milteruser to the -milter-sendmail - subpackage (reported by Bruce Jerrick) - -* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 -- updated to 0.93rc1 -- fixed rpath issues - -* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 -- updated to 0.92.1 - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 -- redisabled unrar stuff completely by using clean sources -- splitted -milter subpackage into pieces to allow use without sendmail - (#239037) - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 -- use a better way to disable RPATH-generation (needed for '--with - unrar' builds) - -* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 -- added a README.fedora to the milter package (#240610) -- ship original sources again; unrar is now licensed correctly (no more - stolen code put under GPL). Nevertheless, this license is not GPL - compatible, and to allow libclamav to be used by GPL applications, - unrar is disabled by a ./configure switch. -- use pkg-config in clamav-config to emulate --cflags and --libs - operations (fixes partly multilib issues) -- registered some more auto-updated files and marked them as %%ghost - -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 -- updated to 0.92 (SECURITY): -- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability - -* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of - legal problems (resolves 334371) -- correct license tag - -* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 -- Bump release for upgrade path. - -* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 -- updated to 0.91.2 (SECURITY): -- CVE-2007-4510 DOS in RTF parser -- DOS in html normalizer -- arbitrary command execution by special crafted recipients in - clamav-milter's black-hole mode -- fixed an open(2) issue - -* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 -- updated to 0.91.1 - -* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 -- updated to 0.91 - -* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 -- updated to 0.90.3 -- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both - in FC6- and F7+ - -* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 -- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 -- updated to 0.90.1 -- updated %%doc list - -* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 -- updated to final 0.90 -- removed -visibility patch since fixed upstream - -* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 -- build with -Wl,-as-needed and cleaned up pkgconfig file -- removed old hack which forced installation of freshclam.conf; related - check was removed upstream -- removed static library -- removed %%changelog entries from before 2004 - -* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 -- updated to 0.90rc3 -- splitted mandatory parts from the data-file into a separate -filesystem - subpackage -- added a -data-empty subpackage to allow a setup where database is - updated per cron-job and user does not want to download the large - -data package with outdated virus definitations (#214949) -- %%ghost'ed the files downloaded by freshclam +* Wed Oct 23 2002 Che +- initial rpm release diff --git a/clamd-README b/clamd-README deleted file mode 100644 index e62b487..0000000 --- a/clamd-README +++ /dev/null @@ -1,58 +0,0 @@ -To create individual clamd-instance take the following files and -modify/copy them in the suggested way: - -clamd.conf: - * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with an unique service-name; - e.g. as /etc/clamd.d/<SERVICE>.conf - - To make logfile rotation work properly, the LogFile should be - writable for the assigned User. Recommended way to reach this, is - to: - * make it owned by the User's *group* - * assign at least 0620 (u+rw,g+w) permissions - - A suitable command might be - | # touch <logfile> - | # chgrp <user> <logfile> - | # chmod 0620 <logfile> - - NEVER use 'clamav' as the user since he can modify the database. - This is the user who is running the application; e.g. for mimedefang - (http://www.roaringpenguin.com/mimedefang) the user might be - 'defang'.Theoretically, distinct users could be used, but it must be - made sure that the application-user can write into the socket-file, - and that the clamd-user can access the files asked by the - application to be checked. - - -clamd.logrotate: - * set the correct value for the logfile - * place it into /etc/logrotate.d - -clamd.sysconfig: - * set the name of the config-file and the local socket - * copy it to /etc/sysconfig/clamd.<SERVICE> - -clamd.init: - * set the service-name - * place it into /etc/init.d/ with an unique name and activate it - (e.g. with /sbin/chkconfig clamd.<SERVICE> on) - -Additionally, a symlink must be set to clamd in a way like - | # ln -s clamd /usr/sbin/clamd.<SERVICE> -and the directory for the socket file must be created (see 'LocalSocket' -in clamd.conf) - | # mkdir -p /var/run/clamd.<SERVICE> - - -This directory must be writable by the 'User' chosen in the config-file. - - - -[Disclaimer: - this file and the script/configfiles are not part of the official - clamav package. - - Please send complaints and comments to - mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamd-gen b/clamd-gen deleted file mode 100755 index ac5dae2..0000000 --- a/clamd-gen +++ /dev/null @@ -1,269 +0,0 @@ -#! /bin/bash - -# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -function showHelp() -{ - echo \ -$"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> - --license=<LICENSE> --username=>USERNAME> -" - exit 0 -} - -function rpm.generatePreamble() -{ - cat <<EOF -%{!?release_func:%define release_func() %1%{?dist}} -# The name of the minit service -%define minitsvcdir %minitdir/services/%name -# The configuration file for the SysV initservice -%define conffile %_sysconfdir/clamd.d/%service.conf -# The directory, where the milter socket will be placed into; this -# socket will be named clamd.sock -%define rundir /var/run/clamd.%service -# The name of the logfile -%define logfile /var/log/clamd.%service -# The user under whose id, the clamd shall be running. This user must -# be able to read the files from the base-service and is usually -# created there. -%define username $USERNAME -# The packagename of the service -%define service $SERVICE -# The service name as used by the system's initscripts; usually this -# is %service -%define baseservice %service - -%define __chkconfig /sbin/chkconfig -%define minitdir %_sysconfdir/minit - - -EOF -} - -function rpm.generateHeader() -{ - cat <<EOF -Summary: Clamav server for '%service' -Name: clamd.%service -Version: $VERSION -Release: %release_func $RELEASE -Epoch: 0 -License: $LICENSE -Group: System Environment/Daemons -BuildRoot: %_tmppath/%name-%version-%release-root -BuildArch: noarch -Requires: init(%name) -Requires(pre): %service -Requires: clamav-server -BuildRequires: clamav-devel - -%package sysv -Summary: SysV initscripts for a %service clamav-server -Group: System Environment/Daemons -Provides: init(%name) = sysv -Conflicts: init(%name) < sysv -Conflicts: init(%name) > sysv -Requires: clamav-server-sysv -Requires(post): %name = %epoch:%version-%release -Requires(post): diffutils mktemp %__chkconfig -Requires(preun): %__chkconfig -Requires(pre): %_initrddir -Requires(postun): %_initrddir - -%package minit -Summary: minit initscripts for a %service clamav-server -Group: System Environment/Daemons -Provides: init(%name) = minit -Conflicts: init(%name) < minit -Conflicts: init(%name) > minit -Requires(post): %name = %epoch:%version-%release -Requires(post): diffutils mktemp -Requires(pre): minit-setup -Requires(postun): minit-setup -Requires(triggers): minit-tools - - -%description -Basic setup for a clamav server for '%service'. - - -%description sysv -Basic setup for a clamav server for '%service'. - -This package contains initscripts for SysV based systems. - - -%description minit -Basic setup for a clamav server for '%service'. - -This package contains initscripts for minit based systems. - -EOF -} - - -function rpm.genBody() -{ - cat <<"XEOFX" -%prep -%build - -%install -rm -rf $RPM_BUILD_ROOT -%__install -d -m755 $RPM_BUILD_ROOT{%minitsvcdir,%_sbindir,%rundir,/var/log} - -d=/usr/share/clamav/template - -function subst -{ - src=$d/$1 - dst=$RPM_BUILD_ROOT$2 - - %__install -d -m755 $(dirname "$dst") - sed -e 's!^$#?LogFile $.*!\1%logfile!g; - s!^#?$LocalSocket $.*!\1%rundir/clamd.sock!g; - s!^#?$PidFile $.*!\1%rundir/clamd.pid!g; - s!<SERVICE>!%service!g; - s!<USER>!%username!g;' "$src" >"$dst" - chmod --reference "$src" "$dst" -} - -subst clamd.conf %conffile -subst clamd.logrotate %_sysconfdir/logrotate.d/clamd.%service - -%if 0%{!?_without_sysv:1} -subst clamd.sysconfig %_sysconfdir/sysconfig/clamd.%service -subst clamd.init %_initrddir/clamd.%service -%endif - -ln -s clamd $RPM_BUILD_ROOT%_sbindir/clamd.%service - -touch $RPM_BUILD_ROOT%logfile -touch $RPM_BUILD_ROOT%rundir/clamd.sock - -%if 0%{!?_without_minit:1} -ln -s %_sbindir/clamd.%service $RPM_BUILD_ROOT%minitsvcdir/run -touch $RPM_BUILD_ROOT%minitsvcdir/respawn -cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params --c -%conffile -EOF -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - - -%triggerin minit -- %baseservice -minit-svc add services/clamd.%service services/%baseservice/ - -%triggerun minit -- %baseservice -test "$1" != 0 -a "$2" != 0 || \ - minit-svc del services/clamd.%service services/%baseservice/ - - -%post minit -d=$(mktemp /tmp/clamd.%service.XXXXXX) -sed -e 's!^#Foreground!Foreground!' "%conffile" >"$d" -grep -q '^Foreground' $d || echo 'Foreground' >>$d -cmp -s "$d" %conffile || cat "$d" >"%conffile" -rm -f "$d" - -%post sysv -d=$(mktemp /tmp/clamd.%service.XXXXXX) -sed -e 's!^Foreground!#Foreground!' "%conffile" >"$d" -cmp -s "$d" %conffile || cat "$d" >"%conffile" -rm -f "$d" - -%__chkconfig --add %name - - -%preun sysv -test "$1" != 0 || %__chkconfig --del %name - -XEOFX -} - - -function rpm.genFiles -{ - cat <<"EOF" -%files -%defattr(-,root,root,-) -%doc -%config(noreplace) %verify(not size md5 mtime) %attr(0620,root,%username) %logfile -%config(noreplace) %verify(not mtime) %conffile -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/clamd.%service -%_sbindir/clamd.%service -%dir %attr(0700,%username,root) %rundir -%ghost %rundir/clamd.sock - - -%if 0%{!?_without_sysv:1} -%files sysv -%defattr(-,root,root,-) -%config %verify(not mtime) %_initrddir/clamd.%service -%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamd.%service -%endif - - -%if 0%{!?_without_minit:1} -%files minit -%defattr(-,root,root,-) -%dir %minitsvcdir -%config(noreplace) %verify(not mtime) %minitsvcdir/params -%config %minitsvcdir/run - %minitsvcdir/respawn -%endif -EOF -} - - -SERVICE= -VERSION= -RELEASE= -LICENSE= -USERNAME= -tmp=$(getopt -o '' --long service:,version:,release:,license:,username:,help -n "$0" -- "$@") || exit 1 -eval set -- "$tmp" - -while true; do - case "$1" in - (--help) showHelp $0;; - (--service) SERVICE=$2; shift;; - (--version) VERSION=$2; shift;; - (--release) RELEASE=$2; shift;; - (--license) LICENSE=$2; shift;; - (--username) USERNAME=$2; shift;; - (--) shift; break;; - esac - shift -done - -for i in SERVICE VERSION RELEASE LICENSE USERNAME; do - eval tmp=\$${i} - test "$tmp" || { - echo $"No value for $i specified; assuming @${i}@" >&2; - eval $i=@${i}@; - } -done - - -rpm.generatePreamble -rpm.generateHeader -rpm.genBody -rpm.genFiles diff --git a/clamd-wrapper b/clamd-wrapper deleted file mode 100644 index ec785d0..0000000 --- a/clamd-wrapper +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash -# -# Xchkconfig: - 75 25 -# Xdescription: The clamd daemon listens for incoming connections on \ -# Unix or TCP socket and scans files or directories on demand. - -test "$CLAMD_SERVICE" || { - echo $"*** $0 can not be called in this way" - echo $"*** Please see /usr/share/doc/clamav-server-*/README how" - echo $"*** the clamav-server can be configured" - exit 6 -} - -# Source function library. -. /etc/init.d/functions - -# Get config. -test -r /etc/sysconfig/network && . /etc/sysconfig/network - -# Check that networking is up. -test "$NETWORKING" != "no" || exit 6 - -lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} -sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} -procname=clamd.${CLAMD_SERVICE} - -CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -CLAMD_OPTIONS= -CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid -## backward-compatibility check... -for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do - CLAMD_SOCKET=$i - test ! -e "$i" || break -done -test -f "$sysconffile" && . "$sysconffile" - - -RETVAL=0 -prog="clamd.${CLAMD_SERVICE}" - -start () { - echo -n $"Starting $prog: " - daemon --pidfile=${CLAMD_PIDFILE} \ - exec -a $procname /usr/sbin/clamd \ - ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop () { - echo -n $"Stopping $prog: " - killproc -p ${CLAMD_PIDFILE} $procname - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -reload() { - rc=0 - echo -n $"Reloading $prog: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? - echo - echo -n $"Loading new virus-database: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? - echo - return $rc -} - -restart () { - stop - start -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 ;; - status) - status -p ${CLAMD_PIDFILE} $procname ;; - condrestart) - test ! -f $lockfile || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 2 -esac diff --git a/clamd.SERVICE.init b/clamd.SERVICE.init deleted file mode 100644 index 9681351..0000000 --- a/clamd.SERVICE.init +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 75 25 -# description: The clamd server running for <SERVICE> - -CLAMD_SERVICE=<SERVICE> -. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate deleted file mode 100644 index 0b0b531..0000000 --- a/clamd.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/clamd.<SERVICE> { - monthly - notifempty - missingok - - postrotate - killall -HUP clamd.<SERVICE> 2>/dev/null || : - endscript -} diff --git a/clamd.scan.upstart b/clamd.scan.upstart deleted file mode 100644 index b6280f5..0000000 --- a/clamd.scan.upstart +++ /dev/null @@ -1,14 +0,0 @@ -### Uncomment these lines when you want clamd.scan to be a scanner -### for a locally running clamav-milter -#start on starting clamav-milter - -### Uncomment these lines when you want clamd.scan to be a generic -### scanner service -#start on starting local - -stop on runlevel 0 -stop on runlevel 1 -stop on runlevel 6 - -respawn -exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes diff --git a/clamd.sysconfig b/clamd.sysconfig deleted file mode 100644 index 4933e7e..0000000 --- a/clamd.sysconfig +++ /dev/null @@ -1,3 +0,0 @@ -#CLAMD_CONFIGFILE=/etc/clamd.d/<SERVICE>.conf -#CLAMD_SOCKET=/var/run/clamd.<SERVICE>/clamd.sock -#CLAMD_OPTIONS= diff --git a/freshclam-sleep b/freshclam-sleep deleted file mode 100755 index 7bdcf78..0000000 --- a/freshclam-sleep +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/bash -# Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -FRESHCLAM_MOD=$[ 3*60 ] # 3 hours - -f=/etc/sysconfig/freshclam -test ! -e "$f" || . "$f" - - -case x"$1" in - (xnow) FRESHCLAM_DELAY=0;; - (x|xrandom) : ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};; - (*) FRESHCLAM_DELAY=$1;; -esac - -set -e - -case $FRESHCLAM_DELAY in - (disabled-warn) - echo $"\ -WARNING: update of clamav database is disabled; please see - '$f' - for information how to enable the periodic update resp. how to turn - off this message." >&2 - exit 1 - ;; - - (disabled) - exit 0 - ;; - - (*) - let FRESHCLAM_MOD*=60 - sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] - ;; -esac - - -/usr/bin/freshclam --quiet && { - test -x /usr/sbin/clamav-notify-servers && \ - exec /usr/sbin/clamav-notify-servers || \ - : -} diff --git a/freshclam.sysconfig b/freshclam.sysconfig deleted file mode 100644 index 94035f8..0000000 --- a/freshclam.sysconfig +++ /dev/null @@ -1,24 +0,0 @@ -## When changing the periodicity of freshclam runs in the crontab, -## this value must be adjusted also. Its value is the timespan between -## two subsequent freshclam runs in minutes. E.g. for the default -## -## | 0 */3 * * * ... -## -## crontab line, the value is 180 (minutes). -# FRESHCLAM_MOD= - -## A predefined value for the delay in seconds. By default, the value is -## calculated by the 'hostid' program. This predefined value guarantees -## constant timespans of 3 hours between two subsequent freshclam runs. -## -## This option accepts two special values: -## 'disabled-warn' ... disables the automatic freshclam update and -## gives out a warning -## 'disabled' ... disables the automatic freshclam silently -# FRESHCLAM_DELAY= - - -### !!!!! REMOVE ME !!!!!! -### REMOVE ME: By default, the freshclam update is disabled to avoid -### REMOVE ME: network access without prior activation -FRESHCLAM_DELAY=disabled-warn # REMOVE ME diff --git a/lastver b/lastver deleted file mode 100644 index 4d8fc8c..0000000 --- a/lastver +++ /dev/null @@ -1 +0,0 @@ -0.95.3 diff --git a/sources b/sources index 898c137..70d67b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a76425f5cffb9973d6ee45580dc2094 clamav-0.95.3-norar.tar.bz2 +44e7df79718d104db0666d5db3f08682 clamav-0.97-clean.tar.bz2 diff --git a/verinfo b/verinfo deleted file mode 100644 index 814d953..0000000 --- a/verinfo +++ /dev/null @@ -1,2 +0,0 @@ -http://sourceforge.net/project/showfiles.php?group_id=86638&package_id=90197 -clamav-([0-9.-]*?)\.tar\. commit a58de3534bdbfcf065092de38967589e296c80b0 Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Wed Jul 28 11:45:26 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5b7c836..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -clamav-0.95.3-norar.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5b7c836 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +clamav-0.95.3-norar.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 4a3ae71..0000000 --- a/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Makefile for source rpm: clamav -NAME := clamav -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) - - -# can not use final tarball name here as it will conflict with rules -# within Makefile.common -TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp -TARBALL = ${NAME}-${VERSION}.tar.gz - -clean-sources: ${TARBALL_CLEAN} - -${TARBALL_CLEAN}: ${TARBALL} - rm -f $@.tmp - zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp - mv $@.tmp $@ diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 commit 0909a88ae9e869be8c375d52a412f21d4e70ff8a Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Wed Jul 28 11:45:04 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index c07be39..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -clamav-0.95.1-norar.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c07be39 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +clamav-0.95.1-norar.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index eea4c6f..0000000 --- a/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# Makefile for source rpm: clamav -# $Id$ -NAME := clamav -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) - - -# can not use final tarball name here as it will conflict with rules -# within Makefile.common -TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp -TARBALL = ${NAME}-${VERSION}.tar.gz - -clean-sources: ${TARBALL_CLEAN} - -${TARBALL_CLEAN}: ${TARBALL} - rm -f $@.tmp - zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp - mv $@.tmp $@ diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 commit 7c49c405c76a391d8f3bd861380768224f6d6443 Author: Dennis Gilmore <ausil(a)fedoraproject.org> Date: Sat May 8 01:45:25 2010 +0000 Initialize branch EL-6 for clamav diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 commit 672986e1a1820dfcf501808eb7af818f2430063c Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Thu Nov 26 01:29:38 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index 2cc62a7..eea4c6f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := clamav SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit 45d3d6a99cdfb183c8743a9637160afecef8fd02 Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Thu Nov 26 01:29:38 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index ed9c5e4..4a3ae71 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ NAME := clamav SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit 42e3c91be468fd3efce34f772fc8ac585e860a3b Author: ensc <ensc(a)fedoraproject.org> Date: Sun Nov 22 10:47:16 2009 +0000 removed stanza from upstart script which waited for 'starting\ XXX'; wrongly named upstart events have been fixed in recent initscripts (#501155) diff --git a/README.fedora b/README.fedora index 4f12058..8df192d 100644 --- a/README.fedora +++ b/README.fedora @@ -67,12 +67,11 @@ B) On the clamav-milter host (assumed hostname 'host-milter') and all the other options which are required on your system - 3. Edit /etc/event.d/clamav-milter and uncomment the both + 3. Edit /etc/event.d/clamav-milter and uncomment the - | start on starting\ local | start on starting local - lines. Restart your system or execute + line. Restart your system or execute | initctl emit starting local @@ -98,12 +97,11 @@ C) On the clamav-scanner host (assumed hostname 'host-scanner') comment out possible 'LocalSocket' lines and set all the other options which are required on your system - 3. Edit /etc/event.d/clamav-scanner and uncomment the both + 3. Edit /etc/event.d/clamav-scanner and uncomment the - | start on starting\ local | start on starting local - lines. Restart your system or execute + line. Restart your system or execute | initctl emit starting local diff --git a/clamav-milter.upstart b/clamav-milter.upstart index 165829e..e0a63f2 100644 --- a/clamav-milter.upstart +++ b/clamav-milter.upstart @@ -1,14 +1,10 @@ - ### Uncomment these lines when you want clamav-milter to be a milter ### for a locally running MTA -#start on starting\ sendmail #start on starting sendmail -#start on starting\ postfix #start on starting postfix ### Uncomment these lines when you want clamav-milter to be a milter ### for a remotely running MTA -#start on starting\ local #start on starting local stop on runlevel 0 diff --git a/clamd.scan.upstart b/clamd.scan.upstart index 6c769e0..b6280f5 100644 --- a/clamd.scan.upstart +++ b/clamd.scan.upstart @@ -4,7 +4,6 @@ ### Uncomment these lines when you want clamd.scan to be a generic ### scanner service -#start on starting\ local #start on starting local stop on runlevel 0 commit 46fb0b613780cb65be722bfed8039b10f3c0cb05 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Nov 21 20:20:43 2009 +0000 - adjusted chkconfig positions for clamav-milter (#530101) diff --git a/clamav-milter.sysv b/clamav-milter.sysv index 693d4ee..170cdc1 100644 --- a/clamav-milter.sysv +++ b/clamav-milter.sysv @@ -2,7 +2,7 @@ # # clamav-milter Starts/stop the "clamav-milter" daemon # -# chkconfig: - 99 1 +# chkconfig: - 79 21 # description: A virus scanning milter # Source function library. diff --git a/clamav.spec b/clamav.spec index 4875437..88935d7 100644 --- a/clamav.spec +++ b/clamav.spec @@ -696,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) + * Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1200 - updated to 0.95.3 commit 71bd83f9182d730978dfbbd9b2e8d9fab7db70a2 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Oct 29 09:10:29 2009 +0000 updated to 0.95.3 diff --git a/.cvsignore b/.cvsignore index e2c64e0..5b7c836 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95.2-norar.tar.bz2 +clamav-0.95.3-norar.tar.bz2 diff --git a/clamav-0.95.3-umask.patch b/clamav-0.95.3-umask.patch new file mode 100644 index 0000000..220f7ab --- /dev/null +++ b/clamav-0.95.3-umask.patch @@ -0,0 +1,39 @@ +Index: clamav-0.95.3/clamav-milter/clamav-milter.c +=================================================================== +--- clamav-0.95.3.orig/clamav-milter/clamav-milter.c ++++ clamav-0.95.3/clamav-milter/clamav-milter.c +@@ -306,7 +306,7 @@ int main(int argc, char **argv) { + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0002); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +Index: clamav-0.95.3/shared/output.c +=================================================================== +--- clamav-0.95.3.orig/shared/output.c ++++ clamav-0.95.3/shared/output.c +@@ -270,7 +270,7 @@ int logg(const char *str, ...) + #endif + if(logg_file) { + if(!logg_fp) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +Index: clamav-0.95.3/freshclam/freshclam.c +=================================================================== +--- clamav-0.95.3.orig/freshclam/freshclam.c ++++ clamav-0.95.3/freshclam/freshclam.c +@@ -102,7 +102,7 @@ static void writepid(const char *pidfile + { + FILE *fd; + int old_umask; +- old_umask = umask(0006); ++ old_umask = umask(0022); + if((fd = fopen(pidfile, "w")) == NULL) { + logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); + } else { diff --git a/clamav-0.95rc1-umask.patch b/clamav-0.95rc1-umask.patch deleted file mode 100644 index 8a46216..0000000 --- a/clamav-0.95rc1-umask.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: clamav-0.95rc1/clamav-milter/clamav-milter.c -=================================================================== ---- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c -+++ clamav-0.95rc1/clamav-milter/clamav-milter.c -@@ -287,7 +287,7 @@ int main(int argc, char **argv) { - - if((opt = optget(opts, "PidFile"))->enabled) { - FILE *fd; -- mode_t old_umask = umask(0006); -+ mode_t old_umask = umask(0022); - - if((fd = fopen(opt->strarg, "w")) == NULL) { - logg("!Can't save PID in file %s\n", opt->strarg); -Index: clamav-0.95rc1/shared/output.c -=================================================================== ---- clamav-0.95rc1.orig/shared/output.c -+++ clamav-0.95rc1/shared/output.c -@@ -250,7 +250,7 @@ int logg(const char *str, ...) - #endif - if(logg_file) { - if(!logg_fp) { -- old_umask = umask(0037); -+ old_umask = umask(0077); - if((logg_fp = fopen(logg_file, "at")) == NULL) { - umask(old_umask); - #ifdef CL_THREAD_SAFE -Index: clamav-0.95rc1/freshclam/freshclam.c -=================================================================== ---- clamav-0.95rc1.orig/freshclam/freshclam.c -+++ clamav-0.95rc1/freshclam/freshclam.c -@@ -102,7 +102,7 @@ static void writepid(const char *pidfile - { - FILE *fd; - int old_umask; -- old_umask = umask(0006); -+ old_umask = umask(0022); - if((fd = fopen(pidfile, "w")) == NULL) { - logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); - } else { diff --git a/clamav.spec b/clamav.spec index f8e774c..4875437 100644 --- a/clamav.spec +++ b/clamav.spec @@ -23,8 +23,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.95.2 -Release: %release_func 5%{?snapshot:.%snapshot} +Version: 0.95.3 +Release: %release_func 1200%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -49,7 +49,7 @@ Source8: clamav-notify-servers Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95rc1-umask.patch +Patch27: clamav-0.95.3-umask.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -696,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1200 +- updated to 0.95.3 + * Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - conditionalized build of noarch subpackages to ease packaging under RHEL5 diff --git a/lastver b/lastver index e7f6f8b..4d8fc8c 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.95.2 +0.95.3 diff --git a/sources b/sources index 5744218..898c137 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -377aed737db63d902e641be8d923cda9 clamav-0.95.2-norar.tar.bz2 +7a76425f5cffb9973d6ee45580dc2094 clamav-0.95.3-norar.tar.bz2 commit a5349bae95013a679d45818025d52f560ce2ce4d Author: ensc <ensc(a)fedoraproject.org> Date: Sun Sep 13 13:43:34 2009 +0000 - conditionalized build of noarch subpackages diff --git a/clamav.spec b/clamav.spec index c070641..f8e774c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,9 +1,10 @@ #global snapshot rc1 ## Fedora Extras specific customization below... -%bcond_without fedora +%bcond_without fedora %bcond_without upstart %bcond_with unrar +%bcond_without noarch ## %global username clamupdate @@ -17,6 +18,7 @@ %global scanuser clamscan %global scanstatedir %_var/run/clamd.scan +%{?with_noarch:%global noarch BuildArch: noarch} %{!?release_func:%global release_func() %1%{?dist}} Summary: End-user tools for the Clam Antivirus scanner @@ -31,7 +33,7 @@ URL: http://www.clamav.net Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… %else -# Unfortunately, clamav includes support for RAR v3, derived from GPL +# Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by # make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] @@ -59,13 +61,13 @@ BuildRequires: bc %package filesystem Summary: Filesystem structure for clamav Group: Applications/File -BuildArch: noarch Provides: user(%username) = 4 Provides: group(%username) = 4 # Prevent version mix Conflicts: %name < %version-%release Conflicts: %name > %version-%release BuildRequires: fedora-usermgmt-devel +%{?noarch} %{?FE_USERADD_REQ} %package lib @@ -85,20 +87,20 @@ Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -BuildArch: noarch Requires(pre): clamav-filesystem = %version-%release Requires(postun): clamav-filesystem = %version-%release Provides: data(clamav) = full Conflicts: data(clamav) < full Conflicts: data(clamav) > full +%{?noarch} %package data-empty Summary: Empty data package for the Clam Antivirus scanner Group: Applications/File -BuildArch: noarch Provides: data(clamav) = empty Conflicts: data(clamav) < empty Conflicts: data(clamav) > empty +%{?noarch} %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -122,28 +124,27 @@ Requires: clamav-lib = %version-%release %package server-sysvinit Summary: SysV initscripts for clamav server Group: System Environment/Daemons -BuildArch: noarch Provides: init(clamav-server) = sysv Requires: clamav-server = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir Provides: clamav-server-sysv = %version-%release Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} %package scanner Summary: Clamav scanner daemon Group: System Environment/Daemons -BuildArch: noarch Requires: init(clamav-scanner) Provides: user(%scanuser) = 49 Provides: group(%scanuser) = 49 Requires: clamav-server = %version-%release +%{?noarch} %package scanner-sysvinit Summary: SysV initscripts for clamav scanner daemon Group: System Environment/Daemons -BuildArch: noarch Provides: init(clamav-scanner) = sysv Requires: clamav-server-sysvinit = %version-%release Requires: clamav-scanner = %version-%release @@ -151,18 +152,19 @@ Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts +%{?noarch} %package scanner-upstart Summary: Upstart initscripts for clamav scanner daemon Group: System Environment/Daemons -BuildArch: noarch Source410: clamd.scan.upstart Provides: init(clamav-scanner) = upstart Requires: clamav-scanner = %version-%release # implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d +Requires(pre): /etc/event.d Requires(post): /usr/bin/killall Requires(postun): /sbin/initctl +%{?noarch} %package milter @@ -188,7 +190,6 @@ Obsoletes: clamav-milter-sendmail < %version-%release %package milter-sysvinit Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons -BuildArch: noarch Source320: clamav-milter.sysv Provides: init(clamav-milter) = sysvinit Requires: clamav-milter = %version-%release @@ -200,18 +201,19 @@ Requires(post): chkconfig Requires(preun): chkconfig initscripts Provides: clamav-milter-sysv = %version-%release Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} %package milter-upstart Summary: Upstart initscripts for the clamav sendmail-milter Group: System Environment/Daemons -BuildArch: noarch Source310: clamav-milter.upstart Provides: init(clamav-milter) = upstart Requires: clamav-milter = %version-%release # implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d +Requires(pre): /etc/event.d Requires(post): /usr/bin/killall Requires(postun): /sbin/initctl +%{?noarch} %description @@ -356,7 +358,7 @@ export have_cv_ipv6=yes # build with --as-needed and disable rpath sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ libtool @@ -406,10 +408,10 @@ mkdir _doc_server install -m644 -p %SOURCE2 _doc_server/clamd.sysconfig install -m644 -p %SOURCE3 _doc_server/clamd.logrotate install -m755 -p %SOURCE7 _doc_server/clamd.init -install -m644 -p %SOURCE5 _doc_server/README +install -m644 -p %SOURCE5 _doc_server/README install -m644 -p etc/clamd.conf _doc_server/clamd.conf -install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir +install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper @@ -473,7 +475,7 @@ rm -rf "$RPM_BUILD_ROOT" %triggerprein filesystem -- clamav-filesystem < 0.96 ## REMOVE me in F14 or F15 (added in pre F12) -! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { +! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { /usr/sbin/usermod -l %username clamav || : /usr/sbin/groupmod -n %username clamav || : logger -t rpm/clamav "Renamed clamav user+group to %username" || : @@ -694,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + * Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 - modified freshclam configuration to log by syslog by default - disabled LocalSocket option in sample configuration @@ -811,7 +816,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of +- remove RAR decompression code from source tarball because of legal problems (resolves 334371) - correct license tag @@ -838,7 +843,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : in FC6- and F7+ * Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 * Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 - BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' commit 97fc8d8d655604267f6afec2800848c279e98b0b Author: ensc <ensc(a)fedoraproject.org> Date: Sun Aug 9 11:25:35 2009 +0000 - modified freshclam configuration to log by syslog by default - disabled LocalSocket option in sample configuration - fixed clamav-milter sysv initscript to use bash interpreter and to be disabled by default diff --git a/clamav-milter.sysv b/clamav-milter.sysv index c0fad96..693d4ee 100644 --- a/clamav-milter.sysv +++ b/clamav-milter.sysv @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # # clamav-milter Starts/stop the "clamav-milter" daemon # -# chkconfig: 345 99 1 +# chkconfig: - 99 1 # description: A virus scanning milter # Source function library. diff --git a/clamav.spec b/clamav.spec index 4452722..c070641 100644 --- a/clamav.spec +++ b/clamav.spec @@ -321,15 +321,18 @@ mkdir -p libclamunrar{,_iface} %{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} sed -ri \ - -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ -e 's!^#?(User ).*!\1<USER>!g' \ -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ -e 's! /usr/local/share/clamav,! %homedir,!g' \ etc/clamd.conf -sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf +sed -ri \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf ## ------------------------------------------------------------ @@ -468,7 +471,7 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ -%triggerprein filesystem -- clamav-filesystem < 0.95.2-3 +%triggerprein filesystem -- clamav-filesystem < 0.96 ## REMOVE me in F14 or F15 (added in pre F12) ! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { /usr/sbin/usermod -l %username clamav || : @@ -691,6 +694,12 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + * Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 - renamed 'clamav' user/group to 'clamupdate' - add the '%milteruser' user to the '%scanuser' group when the -scanner commit f7479cda344719b4f462fd6efccdbdae5194e7bd Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 8 13:33:12 2009 +0000 - renamed 'clamav' user/group to 'clamupdate' - add the '%milteruser' user to the '%scanuser' group when the -scanner subpackage is installed diff --git a/clamav.spec b/clamav.spec index 2408882..4452722 100644 --- a/clamav.spec +++ b/clamav.spec @@ -6,7 +6,7 @@ %bcond_with unrar ## -%global username clamav +%global username clamupdate %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log %global milteruser clamilt @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.2 -Release: %release_func 2%{?snapshot:.%snapshot} +Release: %release_func 5%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -110,7 +110,7 @@ Requires: clamav-filesystem = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod -Requires(post): group(clamav) +Requires(post): group(%username) %package server Summary: Clam Antivirus scanner server @@ -344,8 +344,13 @@ export have_cv_ipv6=yes %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --enable-milter --disable-static \ --disable-rpath \ + --with-user=%username \ + --with-group=%username \ %{!?with_unrar:--disable-unrar} +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + # build with --as-needed and disable rpath sed -i \ -e 's! -shared ! -Wl,--as-needed\0!g' \ @@ -463,6 +468,14 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ +%triggerprein filesystem -- clamav-filesystem < 0.95.2-3 +## REMOVE me in F14 or F15 (added in pre F12) +! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { + /usr/sbin/usermod -l %username clamav || : + /usr/sbin/groupmod -n %username clamav || : + logger -t rpm/clamav "Renamed clamav user+group to %username" || : +} + %pre filesystem %__fe_groupadd 4 -r %username &>/dev/null || : %__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ @@ -509,6 +522,12 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/usermod -a -G %scanuser %milteruser &>/dev/null || : + %pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ @@ -672,6 +691,11 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + * Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild commit 9101729e44ad27862d4ee94d199a5fda9f737316 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 1 09:44:42 2009 +0000 fixed inconsistencies added EXAMPLE section for milter setup diff --git a/README.fedora b/README.fedora index 603526c..4f12058 100644 --- a/README.fedora +++ b/README.fedora @@ -29,10 +29,10 @@ A clamav-milter setup consists of the following three components: --> you should know how to install this... When communicating across unix sockets with the clamav-milter, it is - suggested to use the /var/run/clamav-milter/clamav.sock path. You - have to add something like + suggested to use the /var/run/clamav-milter/clamav-milter.socket + path. You have to add something like - INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav-milter.socket, F=, T=S:4m;R:4m')dnl to your sendmail.mc. @@ -40,3 +40,79 @@ A clamav-milter setup consists of the following three components: It is suggested that components communicate through TCP sockets as this eases setup. Please add corresponding packet filter rules! + + +EXAMPLE +======= + +For clamav-milter, a possible setup might be created by + +A) On the MTA (assumed hostname 'host-mta') + + 1. Add to sendmail.mc + + | INPUT_MAIL_FILTER(`clamav', `S=inet:6666@host-milter, F=, T=S:4m;R:4m')dnl + + 2. Rebuild sendmail.cf + + +B) On the clamav-milter host (assumed hostname 'host-milter') + + 1. Install clamav-milter + clamav-milter-upstart packages + + 2. Set in /etc/mail/clamav-milter.conf + + | MilterSocket inet:6666 + | ClamdSocket tcp:host-scanner:6665 + + and all the other options which are required on your system + + 3. Edit /etc/event.d/clamav-milter and uncomment the both + + | start on starting\ local + | start on starting local + + lines. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cmilt + | iptables -A IN-cmilt -s host-mta -j ACCEPT + | iptables -A IN-cmilt -j DROP + + | iptables -A INPUT -p tcp --dport 6666 -j IN-cmilt + + to your firewall setup + +C) On the clamav-scanner host (assumed hostname 'host-scanner') + + 1. Install clamav-scanner + clamav-scanner-upstart packages + + 2. Add to /etc/clamd.d/scan.conf + + | TCPSocket 6665 + | TCPAddr host-scanner + + comment out possible 'LocalSocket' lines and set all the other + options which are required on your system + + 3. Edit /etc/event.d/clamav-scanner and uncomment the both + + | start on starting\ local + | start on starting local + + lines. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cscan + | iptables -A IN-cscan -s host-milter -j ACCEPT + | iptables -A IN-cscan -j DROP + + | iptables -A INPUT -p tcp --dport 6665 -j IN-csan + + to your firewall setup commit f2505c3d26166d5c9d500c56f8fc5fbbc7ad0c85 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Fri Jul 24 19:00:16 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/clamav.spec b/clamav.spec index 9961085..2408882 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.2 -Release: %release_func 1%{?snapshot:.%snapshot} +Release: %release_func 2%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -672,6 +672,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 - updated to 0.95.2 commit 589fdb228f2fc67231de9a3a0203433b1e881f46 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jun 11 07:27:31 2009 +0000 updated diff --git a/.cvsignore b/.cvsignore index c07be39..e2c64e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95.1-norar.tar.bz2 +clamav-0.95.2-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index be9a21f..9961085 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.95.1 -Release: %release_func 3%{?snapshot:.%snapshot} +Version: 0.95.2 +Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -672,6 +672,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + * Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 - fixed '--without upstart' operation diff --git a/lastver b/lastver index fd6d73e..e7f6f8b 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.95 +0.95.2 diff --git a/sources b/sources index acd143c..5744218 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ddd9f341dd0299a6bc5398ee26f4ebf clamav-0.95.1-norar.tar.bz2 +377aed737db63d902e641be8d923cda9 clamav-0.95.2-norar.tar.bz2 commit a4b44dcd073a0a23591471fcd66b03a3263b580a Author: ensc <ensc(a)fedoraproject.org> Date: Sun Apr 19 10:31:25 2009 +0000 fixed '--without upstart' operation diff --git a/clamav.spec b/clamav.spec index e56399f..be9a21f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.1 -Release: %release_func 2%{?snapshot:.%snapshot} +Release: %release_func 3%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -454,7 +454,7 @@ install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} -%{!?with_upstart:rm -rf %_sysconfdir/event.d} +%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/event.d} ## ------------------------------------------------------------ @@ -672,6 +672,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + * Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 - added '%%bcond_without upstart' conditional to ease skipping of -upstart subpackage creation e.g. on EL5 systems commit f3bc46b75404e44c1b18aa0710782d298871e8a5 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Apr 15 14:14:27 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index 2daad57..e56399f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -2,6 +2,7 @@ ## Fedora Extras specific customization below... %bcond_without fedora +%bcond_without upstart %bcond_with unrar ## @@ -21,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.1 -Release: %release_func 1%{?snapshot:.%snapshot} +Release: %release_func 2%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -197,8 +198,8 @@ Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts -Provides: milter-sysv = %version-%release -Obsoletes: milter-sysv < %version-%release +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release %package milter-upstart Summary: Upstart initscripts for the clamav sendmail-milter @@ -453,6 +454,7 @@ install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} +%{!?with_upstart:rm -rf %_sysconfdir/event.d} ## ------------------------------------------------------------ @@ -640,9 +642,11 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %files scanner-sysvinit %attr(0755,root,root) %config %_initrddir/clamd.scan +%if 0%{?with_upstart:1} %files scanner-upstart %defattr(-,root,root,-) %config(noreplace) %_sysconfdir/event.d/clamd.scan +%endif ## ----------------------- @@ -660,12 +664,20 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %defattr(-,root,root,-) %config %_initrddir/clamav-milter +%if 0%{?with_upstart:1} %files milter-upstart %defattr(-,root,root,-) %config(noreplace) %_sysconfdir/event.d/clamav-milter +%endif %changelog +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + * Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 - Upgrade to 0.95.1 (#495039) commit fa9656200e23fc036ec7e31084e5b111e070e32e Author: Robert Scheck <robert(a)fedoraproject.org> Date: Fri Apr 10 21:10:04 2009 +0000 - Upgrade to 0.95.1 (#495036, #495039) and enabled IPv6 support - Fixed typo in SysV initscript which removes 'touch' file (#473513) - Added build requirement to ncurses-devel for clamdtop diff --git a/.cvsignore b/.cvsignore index 336c23f..c07be39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.2-norar.tar.bz2 +clamav-0.95.1-norar.tar.bz2 diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch deleted file mode 100644 index 66b662e..0000000 --- a/clamav-0.90rc3-private.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 -+++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 -@@ -6,6 +6,6 @@ - Name: libclamav - Description: A GPL virus scanner - Version: @LIBCLAMAV_VERSION@ --Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -- -+Libs: -L${libdir} -lclamav -+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ -+Cflags: -I${includedir} ---- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 -+++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 -@@ -55,11 +55,11 @@ - ;; - - --cflags) -- echo -I@includedir@ @CFLAGS@ -+ echo -I@includedir@ - ;; - - --libs) -- echo -L@libdir@ @LIBCLAMAV_LIBS@ -+ echo -L@libdir@ -lclamav - ;; - - *) diff --git a/clamav-0.92-private.patch b/clamav-0.92-private.patch new file mode 100644 index 0000000..bab2948 --- /dev/null +++ b/clamav-0.92-private.patch @@ -0,0 +1,29 @@ +--- clamav-0.92/libclamav.pc.in.private ++++ clamav-0.92/libclamav.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.92/clamav-config.in.private ++++ clamav-0.92/clamav-config.in +@@ -54,12 +54,8 @@ while test $# -gt 0; do + usage 0 + ;; + +- --cflags) +- echo -I@includedir@ @CFLAGS@ +- ;; +- +- --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ (--cflags|--libs) ++ ${PKG_CONFIG:-pkg-config} "$1" libclamav + ;; + + *) diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch deleted file mode 100644 index 4f1872c..0000000 --- a/clamav-0.93.1-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path -+++ clamav-0.93.1/contrib/init/RedHat/clamav-milter -@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -87,7 +86,7 @@ case "$1" in - restart - ;; - condrestart) -- test -f ${lockfile} && $0 restart || : -+ test -f ${lockfile} && restart || : - ;; - status) - if [ ! -z $pidfile ]; then diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch deleted file mode 100644 index 899d32b..0000000 --- a/clamav-0.93.3-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff -+++ clamav-0.93.3/contrib/init/RedHat/clamav-milter -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes \ - # email messages for virus scanning with ClamAV diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch deleted file mode 100644 index de29887..0000000 --- a/clamav-0.93.3-pid.patch +++ /dev/null @@ -1,17 +0,0 @@ -Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora -initscripts do not support killing of whole processgroups. Hence, disable -feature which posts negative pgrp into pidfile and use plain pid instead -of. - -diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c ---- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 -+++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 -@@ -1985,7 +1985,7 @@ main(int argc, char **argv) - logg(_("!Can't save PID in file %s\n"), pidfile); - return EX_CONFIG; - } --#ifdef C_LINUX -+#if defined(C_LINUX) && 0 - /* Ensure that all threads are kill()ed */ - fprintf(fd, "-%d\n", (int)getpgrp()); - #else diff --git a/clamav-0.95-cliopts.patch b/clamav-0.95-cliopts.patch new file mode 100644 index 0000000..90d173f --- /dev/null +++ b/clamav-0.95-cliopts.patch @@ -0,0 +1,13 @@ +Index: clamav-0.95rc1/shared/optparser.c +=================================================================== +--- clamav-0.95rc1.orig/shared/optparser.c ++++ clamav-0.95rc1/shared/optparser.c +@@ -211,7 +211,7 @@ const struct clam_option clam_options[] + + { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, + +- { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, ++ { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, + + { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, + diff --git a/clamav-0.95rc1-umask.patch b/clamav-0.95rc1-umask.patch new file mode 100644 index 0000000..8a46216 --- /dev/null +++ b/clamav-0.95rc1-umask.patch @@ -0,0 +1,39 @@ +Index: clamav-0.95rc1/clamav-milter/clamav-milter.c +=================================================================== +--- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c ++++ clamav-0.95rc1/clamav-milter/clamav-milter.c +@@ -287,7 +287,7 @@ int main(int argc, char **argv) { + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0006); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +Index: clamav-0.95rc1/shared/output.c +=================================================================== +--- clamav-0.95rc1.orig/shared/output.c ++++ clamav-0.95rc1/shared/output.c +@@ -250,7 +250,7 @@ int logg(const char *str, ...) + #endif + if(logg_file) { + if(!logg_fp) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +Index: clamav-0.95rc1/freshclam/freshclam.c +=================================================================== +--- clamav-0.95rc1.orig/freshclam/freshclam.c ++++ clamav-0.95rc1/freshclam/freshclam.c +@@ -102,7 +102,7 @@ static void writepid(const char *pidfile + { + FILE *fd; + int old_umask; +- old_umask = umask(0006); ++ old_umask = umask(0022); + if((fd = fopen(pidfile, "w")) == NULL) { + logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); + } else { diff --git a/clamav-milter.sysv b/clamav-milter.sysv new file mode 100644 index 0000000..7c06c60 --- /dev/null +++ b/clamav-milter.sysv @@ -0,0 +1,103 @@ +#!/bin/sh +# +# clamav-milter This script starts and stops the clamav-milter daemon +# +# chkconfig: - 79 40 +# +# description: clamav-milter is a daemon which hooks into sendmail and routes \ +# email messages for virus scanning with ClamAV +# processname: clamav-milter +# pidfile: /var/lock/subsys/clamav-milter + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +# Local clamav-milter config +CLAMAV_FLAGS= +test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter + +# Check that networking is up. +[ ${NETWORKING} = "no" ] && exit 0 + +PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin + +RETVAL=0 + +# Clamav-milter must have write access to the pid file, /var/run is not suitable +default_pidfile= +[ -d /var/run/clamav-milter ] && default_pidfile=/var/run/clamav-milter/clamav-milter.pid +[ -d /var/clamav ] && default_pidfile=/var/clamav/clamav-milter.pid +pidfile=${PIDFILE:-$default_pidfile} + +lockfile=/var/lock/subsys/clamav-milter + +start() { + echo -n "Starting clamav-milter: " + # Don't allow files larger than 25M to be created, to limit DoS + # Needs to be large enough to extract the signature files + ulimit -f 25600 + if [ ! -z $pidfile ]; then + CLAMAV_PID=--pidfile=${pidfile} + PID=`pidofproc -p ${pidfile} clamav-milter` + else + CLAMAV_PID= + PID=`pidofproc clamav-milter` + fi + [ -n "$PID" ] && echo " already running!" && return 1 + LANG= daemon clamav-milter $CLAMAV_PID ${CLAMAV_FLAGS} + RETVAL=$? + [ ! -z $pidfile -a -f $pidfile ] && sed -i -e 's/-//' $pidfile + echo + test $RETVAL -eq 0 && touch ${lockfile} + return $RETVAL +} + +stop() { + echo -n "Shutting down clamav-milter: " + if [ ! -z $pidfile ]; then + killproc -p ${pidfile} clamav-milter + else + killproc clamav-milter + fi + RETVAL=$? + echo + test $RETVAL -eq 0 && rm -f ${lockfile} ${pidfile} +} + +restart() { + stop + start +} + +# See how we were called. +case "$1" in + start) + # Start daemon. + start + ;; + stop) + # Stop daemon. + stop + ;; + restart|reload) + restart + ;; + condrestart) + test -f ${lockfile} && restart || : + ;; + status) + if [ ! -z $pidfile ]; then + status -p ${pidfile} clamav-milter + else + status clamav-milter + fi + ;; + *) + echo "Usage: $0 {start|stop|reload|restart|condrestart|status}" + exit 1 +esac + +exit $? diff --git a/clamav.spec b/clamav.spec index 4fe1dee..3f5dea1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.2 +Version: 0.95.1 Release: %release_func 1 License: GPLv2 @@ -25,7 +25,7 @@ URL: http://www.clamav.net # incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by # make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: clamav-%{version}-norar.tar.bz2 +Source0: %name-%version-norar.tar.bz2 # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. # Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig @@ -36,15 +36,15 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.93.3-initoff.patch -Patch24: clamav-0.90rc3-private.patch +Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.93.3-pid.patch +Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95rc1-umask.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel BuildRequires: %_includedir/tcpd.h BuildRequires: bc @@ -71,6 +71,7 @@ Source100: clamd-gen Requires: clamav-lib = %version-%release Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig +Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner @@ -131,6 +132,7 @@ Requires(post): coreutils %package milter-sysv Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons +Source320: clamav-milter.sysv Provides: init(clamav-milter) = sysv Requires: clamav-milter = %version-%release Requires(post): user(%milteruser) clamav-milter @@ -229,23 +231,24 @@ The SysV initscripts for clamav-milter. %prep %setup -q -%patch21 -p1 -b .path -%patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .pid +%patch26 -p1 -b .cliopts +%patch27 -p1 -b .umask mkdir -p libclamunrar{,_iface} touch libclamunrar/{Makefile.in,all,install} -perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; - s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; - s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g; - s!^#?(User ).*!\1<USER>!g; - s! /usr/local/share/clamav,! %homedir,!g; - ' etc/clamd.conf +sed -ri \ + -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf -perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf +sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ @@ -255,12 +258,17 @@ CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' -%configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static --disable-unrar -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -# No rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes +%configure --disable-clamav --with-dbdir=/var/lib/clamav \ + --enable-milter --disable-static \ + --disable-rpath --disable-unrar + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool make %{?_smp_mflags} @@ -297,6 +305,7 @@ install -d -m755 \ rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la + touch ${RPM_BUILD_ROOT}%homedir/daily.cld touch ${RPM_BUILD_ROOT}%homedir/main.cld @@ -348,7 +357,8 @@ cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' EOF -install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog @@ -455,6 +465,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %defattr(-,%username,%username,-) %ghost %attr(0664,%username,%username) %homedir/*.cvd + ## ----------------------- %files update @@ -468,7 +479,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %config(noreplace) %_sysconfdir/sysconfig/freshclam %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog - %ghost %attr(0664,%username,%username) %homedir/*.cld @@ -495,13 +505,12 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files milter %defattr(-,root,root,-) -%doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%attr(0700,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%attr(0710,%milteruser,%milteruser) %dir %milterstatedir +%ghost %milterstatedir/* %files milter-sysv @@ -511,6 +520,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495036, #495039) and enabled IPv6 support +- Fixed typo in SysV initscript which removes 'touch' file (#473513) +- Added build requirement to ncurses-devel for clamdtop + * Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 - Upgrade to 0.94.2 (#474002) diff --git a/clamd-wrapper b/clamd-wrapper index 372005f..14c04a5 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -28,7 +28,7 @@ CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf CLAMD_OPTIONS= ## backward-compatibility check... for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do + /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do CLAMD_SOCKET=$i test ! -e "$i" || break done @@ -52,7 +52,7 @@ stop () { killproc $procname RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f touch $lockfile + [ $RETVAL -eq 0 ] && rm -f $lockfile return $RETVAL } diff --git a/sources b/sources index e115b9a..acd143c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 +0ddd9f341dd0299a6bc5398ee26f4ebf clamav-0.95.1-norar.tar.bz2 commit aef9a638f4c2b07f96790dc7e3cdd427fd67552d Author: Robert Scheck <robert(a)fedoraproject.org> Date: Fri Apr 10 20:17:31 2009 +0000 Upgrade to 0.95.1 (#495039) diff --git a/.cvsignore b/.cvsignore index 10b1622..c07be39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95-norar.tar.bz2 +clamav-0.95.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index a7b09ae..2daad57 100644 --- a/clamav.spec +++ b/clamav.spec @@ -20,7 +20,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.95 +Version: 0.95.1 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -666,6 +666,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + * Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 - updated to final 0.95 - added ncurses-devel (-> clamdtop) BR diff --git a/sources b/sources index 186409f..acd143c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6ede74787379f1683a368ee6da62cea clamav-0.95-norar.tar.bz2 +0ddd9f341dd0299a6bc5398ee26f4ebf clamav-0.95.1-norar.tar.bz2 commit 3054d5609e5b4a832d67e35d946906fbead966cf Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 25 22:03:44 2009 +0000 updated diff --git a/.cvsignore b/.cvsignore index 334ef5c..10b1622 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95rc1-norar.tar.bz2 +clamav-0.95-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index f6c79f5..a7b09ae 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -%global snapshot rc1 +#global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95 -Release: %release_func 0.1%{?snapshot:.%snapshot} +Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -51,6 +51,7 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel BuildRequires: %_includedir/tcpd.h BuildRequires: bc @@ -337,6 +338,8 @@ CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --enable-milter --disable-static \ --disable-rpath \ @@ -663,6 +666,11 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + * Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 - updated to 0.95rc1 - added -upstart subpackages diff --git a/lastver b/lastver index d89b314..fd6d73e 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.94.2 +0.95 diff --git a/sources b/sources index 5f92b5e..186409f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40d13c0d39568b17aec35fe793233861 clamav-0.95rc1-norar.tar.bz2 +f6ede74787379f1683a368ee6da62cea clamav-0.95-norar.tar.bz2 commit 5e13498992d054b9cb059fd390b3d6251426b891 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 14:49:39 2009 +0000 updated diff --git a/README.fedora b/README.fedora index d46b193..603526c 100644 --- a/README.fedora +++ b/README.fedora @@ -24,7 +24,7 @@ A clamav-milter setup consists of the following three components: -upstart requires modification of /etc/event.d/clamd.scan to enable automatic startup. See comments there for more details. -* the MDA (sendmail/postfix) +* the MTA (sendmail/postfix) --> you should know how to install this... diff --git a/clamav-milter.upstart b/clamav-milter.upstart index 12a5d0c..165829e 100644 --- a/clamav-milter.upstart +++ b/clamav-milter.upstart @@ -1,13 +1,13 @@ ### Uncomment these lines when you want clamav-milter to be a milter -### for a locally running MDA +### for a locally running MTA #start on starting\ sendmail #start on starting sendmail #start on starting\ postfix #start on starting postfix ### Uncomment these lines when you want clamav-milter to be a milter -### for a remotely running MDA +### for a remotely running MTA #start on starting\ local #start on starting local commit 8e678e525b999e5eaca946ece8e9fb67a7b0c065 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 13:24:07 2009 +0000 updated diff --git a/README.fedora b/README.fedora index b9f572e..d46b193 100644 --- a/README.fedora +++ b/README.fedora @@ -1,5 +1,42 @@ -Add +A clamav-milter setup consists of the following three components: - INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl +* the clamav-milter itself -to your sendmail.mc. + --> this is provided by the 'clamav-milter' package plus (alternatively) + 'clamav-milter-upstart' or 'clamav-milter-sysvinit' + + The main configuration is in /etc/mail/clamav-milter.conf and MUST + be changed before first use. + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamav-milter to + enable automatic startup. See comments there for more details. + +* a clamav scanner daemon + + --> this package is called 'clamav-scanner' plus (alternatively) + 'clamav-scanner-upstart' or 'clamav-scanner-sysvinit' + + The daemon is configured by /etc/clamd.d/scan.conf (which MUST be + edited before first use). + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamd.scan to enable + automatic startup. See comments there for more details. + +* the MDA (sendmail/postfix) + + --> you should know how to install this... + + When communicating across unix sockets with the clamav-milter, it is + suggested to use the /var/run/clamav-milter/clamav.sock path. You + have to add something like + + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl + + to your sendmail.mc. + + + +It is suggested that components communicate through TCP sockets as +this eases setup. Please add corresponding packet filter rules! diff --git a/clamav-0.95rc1-umask.patch b/clamav-0.95rc1-umask.patch new file mode 100644 index 0000000..8a46216 --- /dev/null +++ b/clamav-0.95rc1-umask.patch @@ -0,0 +1,39 @@ +Index: clamav-0.95rc1/clamav-milter/clamav-milter.c +=================================================================== +--- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c ++++ clamav-0.95rc1/clamav-milter/clamav-milter.c +@@ -287,7 +287,7 @@ int main(int argc, char **argv) { + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0006); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +Index: clamav-0.95rc1/shared/output.c +=================================================================== +--- clamav-0.95rc1.orig/shared/output.c ++++ clamav-0.95rc1/shared/output.c +@@ -250,7 +250,7 @@ int logg(const char *str, ...) + #endif + if(logg_file) { + if(!logg_fp) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +Index: clamav-0.95rc1/freshclam/freshclam.c +=================================================================== +--- clamav-0.95rc1.orig/freshclam/freshclam.c ++++ clamav-0.95rc1/freshclam/freshclam.c +@@ -102,7 +102,7 @@ static void writepid(const char *pidfile + { + FILE *fd; + int old_umask; +- old_umask = umask(0006); ++ old_umask = umask(0022); + if((fd = fopen(pidfile, "w")) == NULL) { + logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); + } else { diff --git a/clamav-milter.sysv b/clamav-milter.sysv index 8ff51b3..c0fad96 100644 --- a/clamav-milter.sysv +++ b/clamav-milter.sysv @@ -11,7 +11,7 @@ exec=/usr/sbin/clamav-milter prog="clamav-milter" -OPTS= +OPTS='-c /etc/mail/clamav-milter.conf' [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog pidfile=/var/run/clamav-milter/milter.pid @@ -21,8 +21,7 @@ start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " - daemon --pidfile=${pidfile} \ - $exec $OPTS --nofork=no --pid=${pidfile} && success || failure + daemon --pidfile=${pidfile} $exec $OPTS --nofork=no --pid=${pidfile} retval=$? echo [ $retval -eq 0 ] && touch $lockfile @@ -31,7 +30,7 @@ start() { stop() { echo -n $"Stopping $prog: " - killproc -o "${pidfile} $exec && success || failure + killproc -p "${pidfile}" $exec retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile @@ -53,7 +52,7 @@ force_reload() { rh_status() { # run checks to determine if the service is running or use generic status - status $prog + status -p "${pidfile}" $prog } rh_status_q() { diff --git a/clamav-milter.upstart b/clamav-milter.upstart index f211818..12a5d0c 100644 --- a/clamav-milter.upstart +++ b/clamav-milter.upstart @@ -16,4 +16,4 @@ stop on runlevel 1 stop on runlevel 6 respawn -exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter --nofork=yes +exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --nofork=yes diff --git a/clamav.spec b/clamav.spec index 8b5758c..f6c79f5 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95 -Release: %release_func 0.0.3%{?snapshot:.%snapshot} +Release: %release_func 0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File diff --git a/clamd-wrapper b/clamd-wrapper index 5baca59..ec785d0 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -42,7 +42,8 @@ prog="clamd.${CLAMD_SERVICE}" start () { echo -n $"Starting $prog: " daemon --pidfile=${CLAMD_PIDFILE} \ - $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} + exec -a $procname /usr/sbin/clamd \ + ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/clamd.scan.upstart b/clamd.scan.upstart index e96b37e..6c769e0 100644 --- a/clamd.scan.upstart +++ b/clamd.scan.upstart @@ -12,4 +12,4 @@ stop on runlevel 1 stop on runlevel 6 respawn -exec /usr/sbin/clamd -c /etc/clamd.d/clamd.scan --nofork=yes +exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes commit 9cba4633a4309d7d2b7456c54fbcf0a85fa4efb7 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 12:53:03 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index f08684d..8b5758c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -134,8 +134,8 @@ Summary: Clamav scanner daemon Group: System Environment/Daemons BuildArch: noarch Requires: init(clamav-scanner) -Provides: user(%scanuser) = 99 -Provides: group(%scanuser) = 99 +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 Requires: clamav-server = %version-%release %package scanner-sysvinit diff --git a/clamd-wrapper b/clamd-wrapper index b601cf2..5baca59 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -51,7 +51,7 @@ start () { stop () { echo -n $"Stopping $prog: " - killproc $procname + killproc -p ${CLAMD_PIDFILE} $procname RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $lockfile @@ -79,7 +79,7 @@ case "$1" in start|stop|restart|reload) $1 ;; status) - status $procname ;; + status -p ${CLAMD_PIDFILE} $procname ;; condrestart) test ! -f $lockfile || restart ;; commit 71c33552b35a0ee478fc90c5696dfd548c7c81b4 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 12:47:20 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index 941cbc9..f08684d 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95 -Release: %release_func 0.0.1%{?snapshot:.%snapshot} +Release: %release_func 0.0.3%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -46,6 +46,7 @@ Source8: clamav-notify-servers Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95rc1-umask.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -310,6 +311,7 @@ The Upstart initscripts for clamav-milter. %patch24 -p1 -b .private %patch25 -p1 -b .open %patch26 -p1 -b .cliopts +%patch27 -p1 -b .umask install -p -m0644 %SOURCE300 clamav-milter/ @@ -422,7 +424,7 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; ### The scanner stuff sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/clamd.scan + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ > $RPM_BUILD_ROOT%_initrddir/clamd.scan @@ -629,7 +631,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %files scanner %defattr(-,root,root,-) %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%config(noreplace) %_sysconfdir/clamd.d/clamd.scan +%config(noreplace) %_sysconfdir/clamd.d/scan.conf %ghost %scanstatedir/clamd.sock %files scanner-sysvinit commit 0981a17d0b3b976ba2b2a6196e1a76db59a3b54c Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 11:38:36 2009 +0000 updated diff --git a/.cvsignore b/.cvsignore index 336c23f..334ef5c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.2-norar.tar.bz2 +clamav-0.95rc1-norar.tar.bz2 diff --git a/ChangeLog-rpm.old b/ChangeLog-rpm.old new file mode 100644 index 0000000..44c8556 --- /dev/null +++ b/ChangeLog-rpm.old @@ -0,0 +1,279 @@ +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + +* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 +- updated to 0.88.6 + +* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 +- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 +- added patch to set '__attribute__ ((visibility("hidden")))' for + exported MD5_*() functions (fixes #202043) + +* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 +- splitted SysV initscripts of -milter and -server into own subpackages + +* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 +- rebuilt + +* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 +- updated to 0.88.4 (SECURITY) + +* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed the clamdscan(1) manpage from the -server subpackage + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed a superfluous '}' +- removed some code which was relevant for FC-3 only + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 +- updated to 0.88.3 +- updated to new fedora-usermgmt macros + +* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 +- cleanups: removed unneeded curlies, use plain command instead of + %%__XXX macro, whitespace cleanup, removed unneeded versioned + dependencies +- added a 'Requires(post): group(clamav)' dependencies for -update and + added the corresponding Provides: to -data +- removed the %%_without_milter conditional; you won't gain anything + when milter would be disabled at buildtime + +* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 +- updated to 0.88.2 (SECURITY) +- rediffed patches; most issues handled by 0.88.1-2 are fixed in + 0.88.2 + +* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 +- added patch which fixes some classes of compiler warnings; at least + the using of implicitly declared functions was reported to cause + segfaults on AMD64 (brought to my attention by Marc Perkel) +- added patch which fixes wrong usage of strncpy(3) in unrarlib.c + +* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 +- updated to 0.88.1 (SECURITY) + +* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 +- rebuilt for FC5 + +* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 +- updated to 0.88 +- added pseudo-versions for the 'init(...)' provides as a first step + for the support of alternative initmethods + +* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 +- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) +- ship 'clamd.conf.5' man page in the -server subpackage *too*. The + same file is contained in multiple packages now, but this man-page + can not be removed from the base package because it also applies to + 'clamdscan' there (#173221). + +* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 +- updated to 0.87.1 + +* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 +- updated to 0.87 (SECURITY) +- removed -timeout patch; it is solved upstream +- reverted the -exim changes; they add yet more complexity, their + functionality can go into an own package and they contained flaws + +* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 +- Add clamav-exim configuration package + +* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + +* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 +- updated to 0.86.2 (SECURITY) +- changed the freshclam updating mechanism (again); now, it consists + of a crontab which does not need to be changed and a helper script + (freshclam-sleep). This helper script is configured by + /etc/sysconfig/freshclam + +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 +- updated to 0.86.1 +- fixed randomization in %%post scriptlet: hour should be a range but + not a single number + +* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 +- updated to 0.86 +- randomize freshclam startup times in -update's %%post script (suggested + by Stephen Smoogen); this requires some more Requires(post): also + +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 +- fix dist tagging the way Enrico wants it + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 +- Rebuild + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 +- Update + +* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 +- updated to 0.85 + +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 +- updated to 0.84 + +* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> +- rebuilt + +* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 +- updated to 0.83 + +* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 +- updated to 0.82 +- minor spec cleanups + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 +- build the package with '--disable-zlib-vcheck' because RH is unable to + apply a fix for a 5 month old and solved security issue. Please fill + your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +- added 'BuildRequires: bc' (should work without also, but ./configure + gives out ugly warnings else) + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 +- updated to 0.81 +- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports + an internal mode now which is enabled by default +- updated -milter %%description + +* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 +- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update + subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) + +* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 +- updated to 0.80 +- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore +- buildrequire 'curl-devel' +- renamed clamav.conf to clamd.conf (upstream change) +- updated -initoff patch + +* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 +- updated to 0.75.1 +- use %%configure, the problems with the architecture specification + seem to have passed (probably because of an autoconf update) +- set mode 0600 for the cron-script (required by vixie-cron) +- made the cronjob a spambot and send mail about deactivated freshclam + service to nearly everybody... (root, postmaster, webmaster) +- other fixes in the notification cronjob + +* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 +- updated to 0.75 + +* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 +- moved /usr/bin/clamav-config from main into -devel + +* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 +- updated to 0.74 + +* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 +- updated to 0.73 +- added pkgconfig file + +* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 +- notify the user about a deactivated clamav-update service +- added clamd-gen script which generates template spec-files for + services using clamd +- copied template configuration files to %pkgdatadir/template (needed + for clamd-gen) +- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink + will be provided for compatibility reasons +- conditionalized building of the -milter subpackage ('--without + milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) + +* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 +- removed 'BuildRequires: dietlibc'; it was a leftover from the + pre-use-signal era (before 0.70) (bug #1716) + +* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 +- updated to 0.72 + +* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 +- removed the randomization in the cronjob; it seems to be impossible + to use the mod-operator (%%) there. Instead of, the user has to + replace some placeholders... + +* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 +- updated to 0.71 + +* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 +- quote 'EOF' to delay $RANDOM expansion + +* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 +- updated GECOS entry for the 'clamav' user to describe its purpose + more accurately +- use explicit '-m755' when creating directories with install + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 +- updated to 0.70; rediffed some patches +- updated logrotate script to use signals and documented the steps + which are needed to make it work +- adapted initscript to use signals instead of sockwrite +- removed sockwrite; signals can now be used to reload the database +- added logfile to the -milter subpackage + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 +- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets + +* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 +- split the double Requires(...,...): statements; see + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 +- require the recent fedora-usermgmt package (0.7) which fixes similar + ordering issues + +* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 +- updated to 0.68 (using the -1 version) +- ship milter-files in the -milter instead of the -server subpackage + +* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 +- fixed ':' vs. '.' in chown + +* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 +- randomize freshclam startup to prevent server peaks + +* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 +- updated to 0.67 (using the -1 version) + +* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 +- updated to 0.66; important, packaging-relevant changes are + freshclam: + * $http_proxy is not supported anymore; you have to configure it in + /etc/freshclam.conf + * the logfile has been renamed to /var/log/freshclam.log +- removed %%check section; buildroot check is implemented in local + testsuite already +- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew + files +- added some directory-Requires: +- activated milter-package and made it work +- added patch to disable clamav-milter service by default +- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this + makes things more consistently but can break backward compatibility. The + initscript should deal with the old version too, but I would not bet on + it... +- updated some descriptions +- fixed the update-mechanism; now it happens in two stages: at first, + the files will be downloaded as user 'clamav' and then, root initiates + the daemon-reload. + +* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 +- added security fix for + http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch deleted file mode 100644 index 4f1872c..0000000 --- a/clamav-0.93.1-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path -+++ clamav-0.93.1/contrib/init/RedHat/clamav-milter -@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -87,7 +86,7 @@ case "$1" in - restart - ;; - condrestart) -- test -f ${lockfile} && $0 restart || : -+ test -f ${lockfile} && restart || : - ;; - status) - if [ ! -z $pidfile ]; then diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch deleted file mode 100644 index 899d32b..0000000 --- a/clamav-0.93.3-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff -+++ clamav-0.93.3/contrib/init/RedHat/clamav-milter -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes \ - # email messages for virus scanning with ClamAV diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch deleted file mode 100644 index de29887..0000000 --- a/clamav-0.93.3-pid.patch +++ /dev/null @@ -1,17 +0,0 @@ -Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora -initscripts do not support killing of whole processgroups. Hence, disable -feature which posts negative pgrp into pidfile and use plain pid instead -of. - -diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c ---- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 -+++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 -@@ -1985,7 +1985,7 @@ main(int argc, char **argv) - logg(_("!Can't save PID in file %s\n"), pidfile); - return EX_CONFIG; - } --#ifdef C_LINUX -+#if defined(C_LINUX) && 0 - /* Ensure that all threads are kill()ed */ - fprintf(fd, "-%d\n", (int)getpgrp()); - #else diff --git a/clamav-0.95-cliopts.patch b/clamav-0.95-cliopts.patch new file mode 100644 index 0000000..90d173f --- /dev/null +++ b/clamav-0.95-cliopts.patch @@ -0,0 +1,13 @@ +Index: clamav-0.95rc1/shared/optparser.c +=================================================================== +--- clamav-0.95rc1.orig/shared/optparser.c ++++ clamav-0.95rc1/shared/optparser.c +@@ -211,7 +211,7 @@ const struct clam_option clam_options[] + + { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, + +- { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, ++ { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, + + { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, + diff --git a/clamav-milter.sysv b/clamav-milter.sysv new file mode 100644 index 0000000..8ff51b3 --- /dev/null +++ b/clamav-milter.sysv @@ -0,0 +1,94 @@ +#!/bin/sh +# +# clamav-milter Starts/stop the "clamav-milter" daemon +# +# chkconfig: 345 99 1 +# description: A virus scanning milter + +# Source function library. +. /etc/rc.d/init.d/functions + +exec=/usr/sbin/clamav-milter +prog="clamav-milter" + +OPTS= +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +pidfile=/var/run/clamav-milter/milter.pid +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + [ -f $config ] || exit 6 + echo -n $"Starting $prog: " + daemon --pidfile=${pidfile} \ + $exec $OPTS --nofork=no --pid=${pidfile} && success || failure + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -o "${pidfile} $exec && success || failure + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + # run checks to determine if the service is running or use generic status + status $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? diff --git a/clamav-milter.upstart b/clamav-milter.upstart new file mode 100644 index 0000000..f211818 --- /dev/null +++ b/clamav-milter.upstart @@ -0,0 +1,19 @@ + +### Uncomment these lines when you want clamav-milter to be a milter +### for a locally running MDA +#start on starting\ sendmail +#start on starting sendmail +#start on starting\ postfix +#start on starting postfix + +### Uncomment these lines when you want clamav-milter to be a milter +### for a remotely running MDA +#start on starting\ local +#start on starting local + +stop on runlevel 0 +stop on runlevel 1 +stop on runlevel 6 + +respawn +exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter --nofork=yes diff --git a/clamav.spec b/clamav.spec index e03bcaa..941cbc9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -#global snapshot rc1 +%global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -8,18 +8,20 @@ %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log -%global milterlog %_var/log/clamd.milter %global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log %global milterstatedir %_var/run/clamav-milter %global pkgdatadir %_datadir/%name +%global scanuser clamscan +%global scanstatedir %_var/run/clamd.scan %{!?release_func:%global release_func() %1%{?dist}} Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.2 -Release: %release_func 3%{?snapshot:.%snapshot} +Version: 0.95 +Release: %release_func 0.0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -41,11 +43,9 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.93.3-pid.patch +Patch26: clamav-0.95-cliopts.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -56,8 +56,9 @@ BuildRequires: bc %package filesystem Summary: Filesystem structure for clamav Group: Applications/File -Provides: user(clamav) -Provides: group(clamav) +BuildArch: noarch +Provides: user(%username) = 4 +Provides: group(%username) = 4 # Prevent version mix Conflicts: %name < %version-%release Conflicts: %name > %version-%release @@ -81,7 +82,7 @@ Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -BuildArch: noarch +BuildArch: noarch Requires(pre): clamav-filesystem = %version-%release Requires(postun): clamav-filesystem = %version-%release Provides: data(clamav) = full @@ -111,12 +112,11 @@ Requires(post): group(clamav) %package server Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Requires: init(clamav-server) Requires: data(clamav) Requires: clamav-filesystem = %version-%release Requires: clamav-lib = %version-%release -%package server-sysv +%package server-sysvinit Summary: SysV initscripts for clamav server Group: System Environment/Daemons BuildArch: noarch @@ -124,48 +124,91 @@ Provides: init(clamav-server) = sysv Requires: clamav-server = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release -%package milter -Summary: Milter module for the Clam Antivirus scanner + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +BuildArch: noarch +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 99 +Provides: group(%scanuser) = 99 +Requires: clamav-server = %version-%release + +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon Group: System Environment/Daemons -Requires: clamav-milter-core = %version-%release -Requires: milter(clamav) +BuildArch: noarch +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts -%package milter-core -Summary: Core milter module for the Clam Antivirus scanner +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon Group: System Environment/Daemons +BuildArch: noarch +Source410: clamd.scan.upstart +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl + + +%package milter +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Source300: README.fedora Requires: init(clamav-milter) BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) -Provides: group(%milteruser) +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 Requires(post): coreutils %{?FE_USERADD_REQ} -%package milter-sendmail -Summary: Sendmail customizations for clamav-milter -Group: System Environment/Daemons -Source300: README.fedora -Requires: sendmail -Requires: clamav-milter-core = %version-%release -Requires(pre): user(%milteruser) -Requires(pre): group(%milteruser) Provides: milter(clamav) = sendmail -Conflicts: milter(clamav) < sendmail -Conflicts: milter(clamav) > sendmail +Provides: milter(clamav) = postfix -%package milter-sysv +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release + +%package milter-sysvinit Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons -Provides: init(clamav-milter) = sysv -Requires: clamav-milter = %version-%release BuildArch: noarch +Source320: clamav-milter.sysv +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release Requires(post): user(%milteruser) clamav-milter Requires(preun): user(%milteruser) clamav-milter Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts +Provides: milter-sysv = %version-%release +Obsoletes: milter-sysv < %version-%release + +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +BuildArch: noarch +Source310: clamav-milter.upstart +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl %description @@ -235,47 +278,54 @@ of this daemon should be started for each service requiring it. See the README file how this can be done with a minimum of effort. -%description server-sysv +%description server-sysvinit SysV initscripts template for the clamav server +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + + %description milter This package contains files which are needed to run the clamav-milter. -%description milter-sysv +%description milter-sysvinit The SysV initscripts for clamav-milter. -%description milter-core -Core files for the clamav-milter. - -%description milter-sendmail -Sendmail customizations of the clamav-milter. - +%description milter-upstart +The Upstart initscripts for clamav-milter. ## ------------------------------------------------------------ %prep %setup -q -n %{name}-%{version}%{?snapshot} -%patch21 -p1 -b .path -%patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .pid +%patch26 -p1 -b .cliopts install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} %{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} -perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; - s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; - s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g; - s!^#?(User ).*!\1<USER>!g; - s! /usr/local/share/clamav,! %homedir,!g; - ' etc/clamd.conf +sed -ri \ + -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf -perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf +sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ @@ -321,12 +371,13 @@ function smartsubst() { install -d -m755 \ - ${RPM_BUILD_ROOT}%_sysconfdir/{clamd.d,cron.d,logrotate.d,sysconfig} \ + ${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,event.d} \ ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir + ${RPM_BUILD_ROOT}%homedir \ + ${RPM_BUILD_ROOT}%scanstatedir rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la @@ -369,22 +420,33 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -#### The milter stuff -function subst() { - sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" -} +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/clamd.scan + +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan + +install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamd.scan + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.sock -subst etc/clamd.conf /etc/clamd.d/milter.conf \ - 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf +install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamav-milter +install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter -cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter -CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' -EOF -install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter -touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} ## ------------------------------------------------------------ @@ -404,6 +466,35 @@ rm -rf "$RPM_BUILD_ROOT" %__fe_groupdel %username &>/dev/null || : +%pre scanner +%__fe_groupadd 49 -r %scanuser &>/dev/null || : +%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ + -g %scanuser %scanuser &>/dev/null || : + +%postun scanner +%__fe_userdel %scanuser &>/dev/null || : +%__fe_groupdel %scanuser &>/dev/null || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + + %post update test -e %freshclamlog || { touch %freshclamlog @@ -411,34 +502,41 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%pre milter-core +%pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : -%post milter-core +%post milter test -e %milterlog || { touch %milterlog chmod 0620 %milterlog chown root:%milteruser %milterlog } -%postun milter-core +%postun milter %__fe_userdel %milteruser &>/dev/null || : %__fe_groupdel %milteruser &>/dev/null || : -%post milter-sysv +%post milter-sysvinit /sbin/chkconfig --add clamav-milter -%preun milter-sysv +%preun milter-sysvinit test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : test "$1" != 0 || /sbin/chkconfig --del clamav-milter -%postun milter-sysv +%postun milter-sysvinit test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : + +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : + + %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -521,37 +619,57 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %exclude %_mandir/man8/clamav-milter* -%files server-sysv +%files server-sysvinit %defattr(-,root,root,-) %_initrddir/clamd-wrapper ## ----------------------- -%files milter +%files scanner %defattr(-,root,root,-) +%dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%config(noreplace) %_sysconfdir/clamd.d/clamd.scan +%ghost %scanstatedir/clamd.sock -%files milter-core +%files scanner-sysvinit +%attr(0755,root,root) %config %_initrddir/clamd.scan + +%files scanner-upstart %defattr(-,root,root,-) -%doc clamav-milter/INSTALL -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%config(noreplace) %_sysconfdir/event.d/clamd.scan + +## ----------------------- -%files milter-sendmail +%files milter %defattr(-,root,root,-) %doc clamav-milter/README.fedora -%attr(0700,%milteruser,%milteruser) %dir %milterstatedir +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%attr(0710,%milteruser,%milteruser) %dir %milterstatedir %ghost %milterstatedir/* -%files milter-sysv +%files milter-sysvinit %defattr(-,root,root,-) %config %_initrddir/clamav-milter -%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter + +%files milter-upstart +%defattr(-,root,root,-) +%config(noreplace) %_sysconfdir/event.d/clamav-milter %changelog +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + * Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 - made some subpackages noarch - fixed typo in SysV initscript which removes 'touch' file (#473513) @@ -681,283 +799,3 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : updated per cron-job and user does not want to download the large -data package with outdated virus definitations (#214949) - %%ghost'ed the files downloaded by freshclam - -* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 -- updated to 0.88.7 - -* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 -- updated to 0.88.6 - -* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 -- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 -- added patch to set '__attribute__ ((visibility("hidden")))' for - exported MD5_*() functions (fixes #202043) - -* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 -- splitted SysV initscripts of -milter and -server into own subpackages - -* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 -- rebuilt - -* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 -- updated to 0.88.4 (SECURITY) - -* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed the clamdscan(1) manpage from the -server subpackage - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed a superfluous '}' -- removed some code which was relevant for FC-3 only - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 -- updated to 0.88.3 -- updated to new fedora-usermgmt macros - -* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 -- cleanups: removed unneeded curlies, use plain command instead of - %%__XXX macro, whitespace cleanup, removed unneeded versioned - dependencies -- added a 'Requires(post): group(clamav)' dependencies for -update and - added the corresponding Provides: to -data -- removed the %%_without_milter conditional; you won't gain anything - when milter would be disabled at buildtime - -* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 -- updated to 0.88.2 (SECURITY) -- rediffed patches; most issues handled by 0.88.1-2 are fixed in - 0.88.2 - -* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 -- added patch which fixes some classes of compiler warnings; at least - the using of implicitly declared functions was reported to cause - segfaults on AMD64 (brought to my attention by Marc Perkel) -- added patch which fixes wrong usage of strncpy(3) in unrarlib.c - -* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 -- updated to 0.88.1 (SECURITY) - -* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 -- rebuilt for FC5 - -* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 -- updated to 0.88 -- added pseudo-versions for the 'init(...)' provides as a first step - for the support of alternative initmethods - -* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 -- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) -- ship 'clamd.conf.5' man page in the -server subpackage *too*. The - same file is contained in multiple packages now, but this man-page - can not be removed from the base package because it also applies to - 'clamdscan' there (#173221). - -* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 -- updated to 0.87.1 - -* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 -- updated to 0.87 (SECURITY) -- removed -timeout patch; it is solved upstream -- reverted the -exim changes; they add yet more complexity, their - functionality can go into an own package and they contained flaws - -* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 -- Add clamav-exim configuration package - -* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 -- [milter] create the milter-logfile in the %%post scriptlet -- [milter] reverted the change of the default child_timeout value; it - was set to 5 minutes in 0.86.2 which conflicts with the internal - mode where a timeout must not be set. So, the clamav-milter would - not run with the default configuration - -* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 -- Fixed calculation of sleep duration; on some systems/IPs, `hostid` - results in a negative number which is retained by the bash - modulo-operation. So the sleep may get a negative number of seconds - being interpreted as an option. This version makes sure that the - module-operations returns a non-negative value. [BZ #164494, James - Wilkinson] -- added support for a /usr/sbin/clamav-notify-servers.local hook; this - file will be executed (source'd) before all other actions and can - abort the entire processing by invoking 'exit' - -* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 -- updated to 0.86.2 (SECURITY) -- changed the freshclam updating mechanism (again); now, it consists - of a crontab which does not need to be changed and a helper script - (freshclam-sleep). This helper script is configured by - /etc/sysconfig/freshclam - -* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 -- updated to 0.86.1 -- fixed randomization in %%post scriptlet: hour should be a range but - not a single number - -* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 -- updated to 0.86 -- randomize freshclam startup times in -update's %%post script (suggested - by Stephen Smoogen); this requires some more Requires(post): also - -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 -- fix dist tagging the way Enrico wants it - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 -- Rebuild - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 -- Update - -* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 -- updated to 0.85 - -* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 -- updated to 0.84 - -* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> -- rebuilt - -* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 -- updated to 0.83 - -* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 -- updated to 0.82 -- minor spec cleanups - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 -- build the package with '--disable-zlib-vcheck' because RH is unable to - apply a fix for a 5 month old and solved security issue. Please fill - your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 -- added 'BuildRequires: bc' (should work without also, but ./configure - gives out ugly warnings else) - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 -- updated to 0.81 -- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports - an internal mode now which is enabled by default -- updated -milter %%description - -* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 -- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update - subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) - -* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 -- updated to 0.80 -- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore -- buildrequire 'curl-devel' -- renamed clamav.conf to clamd.conf (upstream change) -- updated -initoff patch - -* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 -- updated to 0.75.1 -- use %%configure, the problems with the architecture specification - seem to have passed (probably because of an autoconf update) -- set mode 0600 for the cron-script (required by vixie-cron) -- made the cronjob a spambot and send mail about deactivated freshclam - service to nearly everybody... (root, postmaster, webmaster) -- other fixes in the notification cronjob - -* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 -- updated to 0.75 - -* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 -- moved /usr/bin/clamav-config from main into -devel - -* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 -- updated to 0.74 - -* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 -- updated to 0.73 -- added pkgconfig file - -* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 -- notify the user about a deactivated clamav-update service -- added clamd-gen script which generates template spec-files for - services using clamd -- copied template configuration files to %pkgdatadir/template (needed - for clamd-gen) -- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink - will be provided for compatibility reasons -- conditionalized building of the -milter subpackage ('--without - milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) - -* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 -- removed 'BuildRequires: dietlibc'; it was a leftover from the - pre-use-signal era (before 0.70) (bug #1716) - -* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 -- updated to 0.72 - -* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 -- removed the randomization in the cronjob; it seems to be impossible - to use the mod-operator (%%) there. Instead of, the user has to - replace some placeholders... - -* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 -- updated to 0.71 - -* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 -- quote 'EOF' to delay $RANDOM expansion - -* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 -- updated GECOS entry for the 'clamav' user to describe its purpose - more accurately -- use explicit '-m755' when creating directories with install - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 -- updated to 0.70; rediffed some patches -- updated logrotate script to use signals and documented the steps - which are needed to make it work -- adapted initscript to use signals instead of sockwrite -- removed sockwrite; signals can now be used to reload the database -- added logfile to the -milter subpackage - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 -- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets - -* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 -- split the double Requires(...,...): statements; see - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 -- require the recent fedora-usermgmt package (0.7) which fixes similar - ordering issues - -* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 -- updated to 0.68 (using the -1 version) -- ship milter-files in the -milter instead of the -server subpackage - -* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 -- fixed ':' vs. '.' in chown - -* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 -- randomize freshclam startup to prevent server peaks - -* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 -- updated to 0.67 (using the -1 version) - -* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 -- updated to 0.66; important, packaging-relevant changes are - freshclam: - * $http_proxy is not supported anymore; you have to configure it in - /etc/freshclam.conf - * the logfile has been renamed to /var/log/freshclam.log -- removed %%check section; buildroot check is implemented in local - testsuite already -- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew - files -- added some directory-Requires: -- activated milter-package and made it work -- added patch to disable clamav-milter service by default -- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this - makes things more consistently but can break backward compatibility. The - initscript should deal with the old version too, but I would not bet on - it... -- updated some descriptions -- fixed the update-mechanism; now it happens in two stages: at first, - the files will be downloaded as user 'clamav' and then, root initiates - the daemon-reload. - -* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 -- added security fix for - http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/clamd-wrapper b/clamd-wrapper index 14c04a5..b601cf2 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -26,6 +26,7 @@ procname=clamd.${CLAMD_SERVICE} CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf CLAMD_OPTIONS= +CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid ## backward-compatibility check... for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do @@ -40,7 +41,8 @@ prog="clamd.${CLAMD_SERVICE}" start () { echo -n $"Starting $prog: " - daemon $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} + daemon --pidfile=${CLAMD_PIDFILE} \ + $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile @@ -59,10 +61,10 @@ stop () { reload() { rc=0 echo -n $"Reloading $prog: " - killproc $procname -SIGHUP || rc=$? + killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? echo echo -n $"Loading new virus-database: " - killproc $procname -SIGUSR2 || rc=$? + killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? echo return $rc } diff --git a/clamd.scan.upstart b/clamd.scan.upstart new file mode 100644 index 0000000..e96b37e --- /dev/null +++ b/clamd.scan.upstart @@ -0,0 +1,15 @@ +### Uncomment these lines when you want clamd.scan to be a scanner +### for a locally running clamav-milter +#start on starting clamav-milter + +### Uncomment these lines when you want clamd.scan to be a generic +### scanner service +#start on starting\ local +#start on starting local + +stop on runlevel 0 +stop on runlevel 1 +stop on runlevel 6 + +respawn +exec /usr/sbin/clamd -c /etc/clamd.d/clamd.scan --nofork=yes diff --git a/lastver b/lastver index 5e4a9c1..d89b314 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.93.3 +0.94.2 diff --git a/sources b/sources index e115b9a..5f92b5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 +40d13c0d39568b17aec35fe793233861 clamav-0.95rc1-norar.tar.bz2 commit 3717d73615ddb16892f77ab78066a28db6f96ec0 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Feb 25 08:58:23 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index 2bc0418..e03bcaa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.94.2 -Release: %release_func 2%{?snapshot:.%snapshot} +Release: %release_func 3%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -81,6 +81,7 @@ Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File +BuildArch: noarch Requires(pre): clamav-filesystem = %version-%release Requires(postun): clamav-filesystem = %version-%release Provides: data(clamav) = full @@ -90,6 +91,7 @@ Conflicts: data(clamav) > full %package data-empty Summary: Empty data package for the Clam Antivirus scanner Group: Applications/File +BuildArch: noarch Provides: data(clamav) = empty Conflicts: data(clamav) < empty Conflicts: data(clamav) > empty @@ -117,6 +119,7 @@ Requires: clamav-lib = %version-%release %package server-sysv Summary: SysV initscripts for clamav server Group: System Environment/Daemons +BuildArch: noarch Provides: init(clamav-server) = sysv Requires: clamav-server = %version-%release Requires(pre): %_initrddir @@ -156,6 +159,7 @@ Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons Provides: init(clamav-milter) = sysv Requires: clamav-milter = %version-%release +BuildArch: noarch Requires(post): user(%milteruser) clamav-milter Requires(preun): user(%milteruser) clamav-milter Requires(pre): %_initrddir @@ -548,6 +552,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + * Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/clamd-wrapper b/clamd-wrapper index c32e34e..14c04a5 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -52,7 +52,7 @@ stop () { killproc $procname RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f touch $lockfile + [ $RETVAL -eq 0 ] && rm -f $lockfile return $RETVAL } diff --git a/verinfo b/verinfo index a4a0b38..814d953 100644 --- a/verinfo +++ b/verinfo @@ -1,2 +1,2 @@ -http://prdownloads.sourceforge.net/sourceforge/clamav/ +http://sourceforge.net/project/showfiles.php?group_id=86638&package_id=90197 clamav-([0-9.-]*?)\.tar\. commit a843b1831a1f03926eeebf884ffecfb73e6fb551 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Tue Feb 24 07:37:58 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/clamav.spec b/clamav.spec index ab6ef56..2bc0418 100644 --- a/clamav.spec +++ b/clamav.spec @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.94.2 -Release: %release_func 1%{?snapshot:.%snapshot} +Release: %release_func 2%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -548,6 +548,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 - Upgrade to 0.94.2 (#474002) commit 3ef6d7cff563db71bc8c64dca022138fb4bca716 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Dec 2 22:26:31 2008 +0000 Upgrade to 0.94.2 (#474002) diff --git a/.cvsignore b/.cvsignore index 0a417f9..336c23f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.1-norar.tar.bz2 +clamav-0.94.2-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index 8ab44ec..4fe1dee 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.1 +Version: 0.94.2 Release: %release_func 1 License: GPLv2 @@ -511,6 +511,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + * Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 - Upgrade to 0.94.1 diff --git a/sources b/sources index a29b987..e115b9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 +9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 commit b4e507d2995e34811d8a03e7e5a4b5eaacd48ec2 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Dec 2 22:26:31 2008 +0000 Upgrade to 0.94.2 (#474002) diff --git a/.cvsignore b/.cvsignore index 0a417f9..336c23f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.1-norar.tar.bz2 +clamav-0.94.2-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index e39ffaa..ab6ef56 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.1 +Version: 0.94.2 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -548,6 +548,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + * Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 - Upgrade to 0.94.1 diff --git a/sources b/sources index a29b987..e115b9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 +9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 commit fc9b9c469299fb1d0289b3d170e87680f4757f96 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Nov 5 19:50:09 2008 +0000 Upgrade to 0.94.1 diff --git a/.cvsignore b/.cvsignore index e015b0c..0a417f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94-norar.tar.bz2 +clamav-0.94.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index c20f532..8ab44ec 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94 +Version: 0.94.1 Release: %release_func 1 License: GPLv2 @@ -511,6 +511,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + * Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker diff --git a/sources b/sources index ec908dc..a29b987 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 +7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 commit c063e179aa855be52af01f273a3a93171e096835 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Nov 5 19:50:09 2008 +0000 Upgrade to 0.94.1 diff --git a/.cvsignore b/.cvsignore index e015b0c..0a417f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94-norar.tar.bz2 +clamav-0.94.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index f8d8778..e39ffaa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94 +Version: 0.94.1 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -548,6 +548,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + * Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker diff --git a/sources b/sources index ec908dc..a29b987 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 +7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 commit 3a1d2b5e3ca38ce6c5e6619c49a07d91a8043aae Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Oct 26 17:48:00 2008 +0000 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker - CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg - CVE-2008-3913 Memory leak in code path in freshclam's manager.c - CVE-2008-3914 Multiple file descriptor leaks on the code paths diff --git a/.cvsignore b/.cvsignore index a51ec3e..e015b0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.3-norar.tar.bz2 +clamav-0.94-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index aa1497f..f8d8778 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.3 +Version: 0.94 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -548,6 +548,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + * Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 - updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read on petite files) diff --git a/sources b/sources index 7ccec62..ec908dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 +a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 commit da4aada21147f2e98cda179eabc647f2078dc9d8 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Oct 26 17:38:04 2008 +0000 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker - CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg - CVE-2008-3913 Memory leak in code path in freshclam's manager.c - CVE-2008-3914 Multiple file descriptor leaks on the code paths diff --git a/.cvsignore b/.cvsignore index a51ec3e..e015b0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.3-norar.tar.bz2 +clamav-0.94-norar.tar.bz2 diff --git a/Makefile b/Makefile index 21be25f..2cc62a7 100644 --- a/Makefile +++ b/Makefile @@ -19,3 +19,16 @@ MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) + + +# can not use final tarball name here as it will conflict with rules +# within Makefile.common +TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp +TARBALL = ${NAME}-${VERSION}.tar.gz + +clean-sources: ${TARBALL_CLEAN} + +${TARBALL_CLEAN}: ${TARBALL} + rm -f $@.tmp + zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp + mv $@.tmp $@ diff --git a/clamav.spec b/clamav.spec index 1a799d2..c20f532 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,16 +15,16 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.3 +Version: 0.94 Release: %release_func 1 License: GPLv2 Group: Applications/File URL: http://www.clamav.net -# Unfortunately, clamav includes support for RAR v3, derived from GPL +# Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. -# All that is needed to make the clean tarball is: rm -rf libclamunrar* -# Note that you also need patch26. +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] Source0: clamav-%{version}-norar.tar.bz2 # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. @@ -511,6 +511,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + * Mon Jul 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.3-1 - Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: - CVE-2008-2713 Out-of-bounds read on petite files diff --git a/sources b/sources index 7ccec62..ec908dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 +a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 commit 20b50894331b06649484c380c0c35f84cf8795eb Author: Robert Scheck <robert(a)fedoraproject.org> Date: Mon Jul 14 10:34:44 2008 +0000 - Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: - CVE-2008-2713 Out-of-bounds read on petite files - Put pid instead of pgrp into pid file of clamav-milter (#452359) diff --git a/.cvsignore b/.cvsignore index 48c3a65..a51ec3e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.1-norar.tar.bz2 +clamav-0.93.3-norar.tar.bz2 diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch deleted file mode 100644 index db4e000..0000000 --- a/clamav-0.80-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes - # email messages to clamav diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch new file mode 100644 index 0000000..899d32b --- /dev/null +++ b/clamav-0.93.3-initoff.patch @@ -0,0 +1,11 @@ +--- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff ++++ clamav-0.93.3/contrib/init/RedHat/clamav-milter +@@ -2,7 +2,7 @@ + # + # clamav-milter This script starts and stops the clamav-milter daemon + # +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 + # + # description: clamav-milter is a daemon which hooks into sendmail and routes \ + # email messages for virus scanning with ClamAV diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch new file mode 100644 index 0000000..de29887 --- /dev/null +++ b/clamav-0.93.3-pid.patch @@ -0,0 +1,17 @@ +Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora +initscripts do not support killing of whole processgroups. Hence, disable +feature which posts negative pgrp into pidfile and use plain pid instead +of. + +diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c +--- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 ++++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 +@@ -1985,7 +1985,7 @@ main(int argc, char **argv) + logg(_("!Can't save PID in file %s\n"), pidfile); + return EX_CONFIG; + } +-#ifdef C_LINUX ++#if defined(C_LINUX) && 0 + /* Ensure that all threads are kill()ed */ + fprintf(fd, "-%d\n", (int)getpgrp()); + #else diff --git a/clamav.spec b/clamav.spec index 682f593..1a799d2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,5 +1,3 @@ -## $Id: clamav.spec,v 1.50 2008/04/14 20:31:45 robert Exp $ - ## Fedora Extras specific customization below... # %bcond_without fedora ## @@ -17,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.1 +Version: 0.93.3 Release: %release_func 1 License: GPLv2 @@ -39,9 +37,10 @@ Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.80-initoff.patch +Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.90rc3-private.patch Patch25: clamav-0.92-open.patch +Patch26: clamav-0.93.3-pid.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -234,6 +233,7 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .pid mkdir -p libclamunrar{,_iface} touch libclamunrar/{Makefile.in,all,install} @@ -511,8 +511,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Jul 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.3-1 +- Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: +- CVE-2008-2713 Out-of-bounds read on petite files +- Put pid instead of pgrp into pid file of clamav-milter (#452359) + * Wed Jun 18 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.1-1 -- Upgrade to 0.93.1, rediffed -path patch +- Upgrade to 0.93.1 (SECURITY), rediffed -path patch: - CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability * Mon Apr 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93-1 diff --git a/sources b/sources index 3875ac9..7ccec62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 +53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 commit 6a9c737ebd351c9b269dcedec4338158e767b7c1 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:36:07 2008 +0000 rediffed patches diff --git a/clamav.spec b/clamav.spec index 65c92e8..aa1497f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -42,7 +42,7 @@ Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.80-initoff.patch +Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch Patch26: clamav-0.93.3-pid.patch @@ -552,6 +552,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read on petite files) - put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches * Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 - updated to 0.93.1 commit 422a07557176c65c5f04a4759298ddf64efdff44 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:33:38 2008 +0000 rediffed diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch deleted file mode 100644 index db4e000..0000000 --- a/clamav-0.80-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes - # email messages to clamav diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch new file mode 100644 index 0000000..899d32b --- /dev/null +++ b/clamav-0.93.3-initoff.patch @@ -0,0 +1,11 @@ +--- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff ++++ clamav-0.93.3/contrib/init/RedHat/clamav-milter +@@ -2,7 +2,7 @@ + # + # clamav-milter This script starts and stops the clamav-milter daemon + # +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 + # + # description: clamav-milter is a daemon which hooks into sendmail and routes \ + # email messages for virus scanning with ClamAV commit cc612e64b642ec9f0284f1c799b5d4254bb59a0c Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:20:40 2008 +0000 - updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read on petite files) - put pid instead of pgrp into pidfile of clamav-milter (bz #452359) diff --git a/clamav.spec b/clamav.spec index 55e2a2f..65c92e8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.1 +Version: 0.93.3 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -45,6 +45,7 @@ Patch21: clamav-0.93.1-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch +Patch26: clamav-0.93.3-pid.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -256,6 +257,7 @@ Sendmail customizations of the clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .pid install -p -m0644 %SOURCE300 clamav-milter/ @@ -546,6 +548,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) + * Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 - updated to 0.93.1 - rediffed -path patch commit 8775e9b2f26ed4dec631ecd4f3700077d589957f Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:12:31 2008 +0000 updated to 0.93.3 diff --git a/.cvsignore b/.cvsignore index 48c3a65..a51ec3e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.1-norar.tar.bz2 +clamav-0.93.3-norar.tar.bz2 diff --git a/lastver b/lastver index a16a6df..5e4a9c1 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.93.1 +0.93.3 diff --git a/sources b/sources index 3875ac9..7ccec62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 +53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 commit a7fdf91c087bd185fc7bb18332bf0e10e633cef9 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:09:15 2008 +0000 initial checkin diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch new file mode 100644 index 0000000..de29887 --- /dev/null +++ b/clamav-0.93.3-pid.patch @@ -0,0 +1,17 @@ +Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora +initscripts do not support killing of whole processgroups. Hence, disable +feature which posts negative pgrp into pidfile and use plain pid instead +of. + +diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c +--- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 ++++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 +@@ -1985,7 +1985,7 @@ main(int argc, char **argv) + logg(_("!Can't save PID in file %s\n"), pidfile); + return EX_CONFIG; + } +-#ifdef C_LINUX ++#if defined(C_LINUX) && 0 + /* Ensure that all threads are kill()ed */ + fprintf(fd, "-%d\n", (int)getpgrp()); + #else commit 61e30bf5ea1d3cd2f608f9f1b20e993c5a3d91e1 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 21 14:55:11 2008 +0000 removed CVS tags diff --git a/Makefile b/Makefile index 2cc62a7..ed9c5e4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ # Makefile for source rpm: clamav -# $Id$ NAME := clamav SPECFILE = $(firstword $(wildcard *.spec)) diff --git a/clamav.spec b/clamav.spec index 1486ed8..55e2a2f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,5 +1,3 @@ -## $Id: clamav.spec,v 1.72 2008/06/17 19:57:54 ensc Exp $ - #global snapshot rc1 ## Fedora Extras specific customization below... commit 55d261d5465594de69aee6a408ef2b39bb9445dd Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Jun 18 10:13:26 2008 +0000 - Upgrade to 0.93.1, rediffed -path patch - CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability diff --git a/.cvsignore b/.cvsignore index 069bca4..48c3a65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93-norar.tar.bz2 +clamav-0.93.1-norar.tar.bz2 diff --git a/clamav-0.70-path.patch b/clamav-0.70-path.patch deleted file mode 100644 index 3312e38..0000000 --- a/clamav-0.70-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.path 2003-06-26 15:38:06.000000000 +0200 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 15:39:01.000000000 +0200 -@@ -22,7 +22,6 @@ - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -63,7 +62,7 @@ - restart - ;; - condrestart) -- test -f /var/lock/subsys/clamav-milter && $0 restart || : -+ test -f /var/lock/subsys/clamav-milter && restart || : - ;; - status) - status clamav-milter diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch new file mode 100644 index 0000000..4f1872c --- /dev/null +++ b/clamav-0.93.1-path.patch @@ -0,0 +1,19 @@ +--- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path ++++ clamav-0.93.1/contrib/init/RedHat/clamav-milter +@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && + # Check that networking is up. + [ ${NETWORKING} = "no" ] && exit 0 + +-[ -x /usr/local/sbin/clamav-milter ] || exit 0 + PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin + + RETVAL=0 +@@ -87,7 +86,7 @@ case "$1" in + restart + ;; + condrestart) +- test -f ${lockfile} && $0 restart || : ++ test -f ${lockfile} && restart || : + ;; + status) + if [ ! -z $pidfile ]; then diff --git a/clamav.spec b/clamav.spec index a6c30f4..682f593 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.49 2008/02/14 16:00:40 robert Exp $ +## $Id: clamav.spec,v 1.50 2008/04/14 20:31:45 robert Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93 +Version: 0.93.1 Release: %release_func 1 License: GPLv2 @@ -38,7 +38,7 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.70-path.patch +Patch21: clamav-0.93.1-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch Patch25: clamav-0.92-open.patch @@ -511,6 +511,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Jun 18 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.1-1 +- Upgrade to 0.93.1, rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + * Mon Apr 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93-1 - Upgrade to 0.93 (SECURITY): - CVE-2008-1100 Upack processing buffer overflow (#442360) diff --git a/sources b/sources index 444be31..3875ac9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 +c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 commit 56aef066d81499de3563d7775cf1d8d52fe75f7d Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 17 20:03:53 2008 +0000 updated diff --git a/.cvsignore b/.cvsignore index 069bca4..48c3a65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93-norar.tar.bz2 +clamav-0.93.1-norar.tar.bz2 diff --git a/clamav-0.70-path.patch b/clamav-0.70-path.patch deleted file mode 100644 index 3312e38..0000000 --- a/clamav-0.70-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.path 2003-06-26 15:38:06.000000000 +0200 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 15:39:01.000000000 +0200 -@@ -22,7 +22,6 @@ - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -63,7 +62,7 @@ - restart - ;; - condrestart) -- test -f /var/lock/subsys/clamav-milter && $0 restart || : -+ test -f /var/lock/subsys/clamav-milter && restart || : - ;; - status) - status clamav-milter diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch new file mode 100644 index 0000000..4f1872c --- /dev/null +++ b/clamav-0.93.1-path.patch @@ -0,0 +1,19 @@ +--- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path ++++ clamav-0.93.1/contrib/init/RedHat/clamav-milter +@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && + # Check that networking is up. + [ ${NETWORKING} = "no" ] && exit 0 + +-[ -x /usr/local/sbin/clamav-milter ] || exit 0 + PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin + + RETVAL=0 +@@ -87,7 +86,7 @@ case "$1" in + restart + ;; + condrestart) +- test -f ${lockfile} && $0 restart || : ++ test -f ${lockfile} && restart || : + ;; + status) + if [ ! -z $pidfile ]; then diff --git a/clamav.spec b/clamav.spec index ebadcd9..1486ed8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.70 2008/03/12 08:40:04 ensc Exp $ +## $Id: clamav.spec,v 1.72 2008/06/17 19:57:54 ensc Exp $ #global snapshot rc1 @@ -20,7 +20,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93 +Version: 0.93.1 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -43,7 +43,7 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.70-path.patch +Patch21: clamav-0.93.1-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch @@ -548,6 +548,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + * Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 - updated to final 0.93 - removed daily.inc + main.inc directories; they are now replaced by diff --git a/lastver b/lastver index 341ad3c..a16a6df 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.93 +0.93.1 diff --git a/sources b/sources index 444be31..3875ac9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 +c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 commit dbbdf5e26efedef21283e6ccd639f1724e49adcc Author: Robert Scheck <robert(a)fedoraproject.org> Date: Mon Apr 14 20:31:45 2008 +0000 - Upgrade to 0.93 (SECURITY): - CVE-2008-1100 Upack processing buffer overflow (#442360) - Removed *.inc directories; got replaced by *.cld containers diff --git a/.cvsignore b/.cvsignore index 9a29028..069bca4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.92.1-norar.tar.bz2 +clamav-0.93-norar.tar.bz2 diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch deleted file mode 100644 index b63921e..0000000 --- a/clamav-0.92-nounrar.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in ---- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 -+++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 -@@ -242,7 +242,7 @@ target_os = @target_os@ - target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - bin_SCRIPTS = clamav-config - pkgconfigdir = $(libdir)/pkgconfig -diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in ---- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 -+++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 -@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex - AC_C_FPU_BIGENDIAN - - AC_OUTPUT([ --libclamunrar/Makefile --libclamunrar_iface/Makefile - libclamav/Makefile - clamscan/Makefile - database/Makefile -diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am ---- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 -+++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 -@@ -16,7 +16,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - # MA 02110-1301, USA. - --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - - bin_SCRIPTS=clamav-config -diff -up clamav-0.92/configure.BAD clamav-0.92/configure ---- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 -+++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 -@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi - esac - - --ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" -+ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -27013,8 +27013,6 @@ do - case $ac_config_target in - "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; -- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; - "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; - "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; - "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav.spec b/clamav.spec index a0dff5c..a6c30f4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.48 2007/12/21 19:23:28 spot Exp $ +## $Id: clamav.spec,v 1.49 2008/02/14 16:00:40 robert Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92.1 +Version: 0.93 Release: %release_func 1 License: GPLv2 @@ -42,7 +42,6 @@ Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -235,7 +234,9 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .nounrar + +mkdir -p libclamunrar{,_iface} +touch libclamunrar/{Makefile.in,all,install} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -291,14 +292,13 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir/daily.inc + ${RPM_BUILD_ROOT}%homedir rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la -for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do - touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i -done +touch ${RPM_BUILD_ROOT}%homedir/daily.cld +touch ${RPM_BUILD_ROOT}%homedir/main.cld ## prepare the server-files @@ -439,7 +439,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files filesystem %attr(-,%username,%username) %dir %homedir -%attr(-,%username,%username) %dir %homedir/daily.inc %attr(-,root,root) %dir %pkgdatadir ## ----------------------- @@ -454,7 +453,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files data-empty %defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/main.cvd +%ghost %attr(0664,%username,%username) %homedir/*.cvd ## ----------------------- @@ -470,14 +469,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd +%ghost %attr(0664,%username,%username) %homedir/*.cld ## ----------------------- @@ -519,6 +511,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Apr 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93-1 +- Upgrade to 0.93 (SECURITY): +- CVE-2008-1100 Upack processing buffer overflow (#442360) +- Removed *.inc directories; got replaced by *.cld containers + * Thu Feb 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.92.1-1 - Upgrade to 0.92.1 (SECURITY): - CVE-2008-0318 Integer overflow in libclamav (#432623) diff --git a/sources b/sources index 6e9b8a3..444be31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 +141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 commit 72cb5cff7c03a0348e09aa055d1d79ef616321f2 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 14 18:36:29 2008 +0000 - updated to final 0.93 - removed daily.inc + main.inc directories; they are now replaced by *.cld containers diff --git a/clamav.spec b/clamav.spec index 6aa5e2b..ebadcd9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,6 +1,6 @@ -## $Id: clamav.spec,v 1.69 2008/03/12 08:38:02 ensc Exp $ +## $Id: clamav.spec,v 1.70 2008/03/12 08:40:04 ensc Exp $ -%global snapshot rc1 +#global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.93 -Release: %release_func 0.1%{?snapshot:.%snapshot} +Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -322,19 +322,14 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir/{main,daily}.inc + ${RPM_BUILD_ROOT}%homedir rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la -for i in cfg db fp hdb info mdb mdu ndb ndu pdb wdb zmd; do - touch ${RPM_BUILD_ROOT}%homedir/daily.inc/daily.$i - touch ${RPM_BUILD_ROOT}%homedir/main.inc/main.$i -done - -touch ${RPM_BUILD_ROOT}%homedir/daily.inc/COPYING -touch ${RPM_BUILD_ROOT}%homedir/main.inc/COPYING +touch ${RPM_BUILD_ROOT}%homedir/daily.cld +touch ${RPM_BUILD_ROOT}%homedir/main.cld ## prepare the server-files @@ -475,7 +470,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files filesystem %attr(-,%username,%username) %dir %homedir -%attr(-,%username,%username) %dir %homedir/daily.inc %attr(-,root,root) %dir %pkgdatadir ## ----------------------- @@ -490,7 +484,8 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files data-empty %defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/main.cvd +%ghost %attr(0664,%username,%username) %homedir/*.cvd + ## ----------------------- @@ -505,9 +500,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %config(noreplace) %_sysconfdir/sysconfig/freshclam %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog - -%ghost %attr(0664,%username,%username) %homedir/daily.inc/* -%ghost %attr(0664,%username,%username) %homedir/main.inc/* +%ghost %attr(0664,%username,%username) %homedir/*.cld ## ----------------------- @@ -555,6 +548,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + * Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 - moved -milter scriptlets into -milter-core subpackage - added a requirement on the milteruser to the -milter-sendmail commit 3e418407a561822f535ccbb038fe0971dce644d0 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 14 18:35:02 2008 +0000 trimmed down MAILTO list of cronjob to 'root' again; every well configured system has an alias for this recipient diff --git a/clamav-update.cron b/clamav-update.cron index 3f1b005..3a69901 100644 --- a/clamav-update.cron +++ b/clamav-update.cron @@ -1,5 +1,5 @@ ## Adjust this line... -MAILTO=root,postmaster,webmaster,clamav +MAILTO=root ## It is ok to execute it as root; freshclam drops privileges and becomes ## user 'clamav' as soon as possible commit 9a66eef1308862e95496555c836f296dcd0bff8a Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 14 18:28:07 2008 +0000 updated to final 0.93 diff --git a/.cvsignore b/.cvsignore index d34f911..069bca4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -clamav-*.tar.gz* -clamav-*.tar.bz2* -clamav-*.*.rpm +clamav-0.93-norar.tar.bz2 diff --git a/lastver b/lastver index da011ce..341ad3c 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.92.1 +0.93 diff --git a/sources b/sources index 47ab841..444be31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d7b2be9783f20956b7e090437105699 clamav-0.93rc1-norar.tar.bz2 +141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 commit 5fb728d2ef5c915ed0f1cc17b50643c0b39862d5 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 12 08:40:04 2008 +0000 added missing version to %changelog diff --git a/clamav.spec b/clamav.spec index 000b2d3..6aa5e2b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.68 2008/03/05 07:30:58 ensc Exp $ +## $Id: clamav.spec,v 1.69 2008/03/12 08:38:02 ensc Exp $ %global snapshot rc1 @@ -555,7 +555,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 - moved -milter scriptlets into -milter-core subpackage - added a requirement on the milteruser to the -milter-sendmail subpackage (reported by Bruce Jerrick) commit f5d1e31d7c361732661a7318830c91da7daffd97 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 12 08:38:02 2008 +0000 - moved -milter scriptlets into -milter-core subpackage - added a requirement on the milteruser to the -milter-sendmail subpackage (reported by Bruce Jerrick) diff --git a/clamav.spec b/clamav.spec index 2fe72e1..000b2d3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.67 2008/02/11 22:30:35 ensc Exp $ +## $Id: clamav.spec,v 1.68 2008/03/05 07:30:58 ensc Exp $ %global snapshot rc1 @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.93 -Release: %release_func 0.0%{?snapshot:.%snapshot} +Release: %release_func 0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -146,6 +146,8 @@ Group: System Environment/Daemons Source300: README.fedora Requires: sendmail Requires: clamav-milter-core = %version-%release +Requires(pre): user(%milteruser) +Requires(pre): group(%milteruser) Provides: milter(clamav) = sendmail Conflicts: milter(clamav) < sendmail Conflicts: milter(clamav) > sendmail @@ -410,19 +412,19 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%pre milter +%pre milter-core %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : -%post milter +%post milter-core test -e %milterlog || { touch %milterlog chmod 0620 %milterlog chown root:%milteruser %milterlog } -%postun milter +%postun milter-core %__fe_userdel %milteruser &>/dev/null || : %__fe_groupdel %milteruser &>/dev/null || : @@ -553,6 +555,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + * Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 - updated to 0.93rc1 - fixed rpath issues commit 1f82fa929ae02cbeee422a5d4e04cf7bb686aeb2 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 5 07:30:58 2008 +0000 - updated to 0.93rc1 - fixed rpath issues diff --git a/clamav.spec b/clamav.spec index 70932c8..2fe72e1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,6 @@ -## $Id: clamav.spec,v 1.66 2008/01/01 17:33:05 ensc Exp $ +## $Id: clamav.spec,v 1.67 2008/02/11 22:30:35 ensc Exp $ + +%global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,26 +20,21 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92.1 -Release: %release_func 1 +Version: 0.93 +Release: %release_func 0.0%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net %if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… %else # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by -# -# zcat clamav-$V.tar.gz | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > clamav-$V-norar.tar.bz2 -# -# or -# -# make clean-sources [TARBALL=<original-tarball>] -Source0: %name-%version-norar.tar.bz2 +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +Source0: %name-%version%{?snapshot}-norar.tar.bz2 %endif Source1: clamd-wrapper Source2: clamd.sysconfig @@ -253,7 +250,7 @@ Sendmail customizations of the clamav-milter. ## ------------------------------------------------------------ %prep -%setup -q +%setup -q -n %{name}-%{version}%{?snapshot} %patch21 -p1 -b .path %patch22 -p1 -b .initoff @@ -284,12 +281,13 @@ export LDFLAGS='-Wl,--as-needed' export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --enable-milter --disable-static \ + --disable-rpath \ %{!?with_unrar:--disable-unrar} # build with --as-needed and disable rpath sed -i \ -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ libtool @@ -555,6 +553,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + * Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 - updated to 0.92.1 commit d7a04eea73382ccc812607bc031a6aa4c43bfda2 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 5 07:29:47 2008 +0000 updated to 0.93rc1 diff --git a/sources b/sources index 6e9b8a3..47ab841 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 +7d7b2be9783f20956b7e090437105699 clamav-0.93rc1-norar.tar.bz2 commit d86d8a8a765d07f7d26dd84d7019d7639464e7d0 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Feb 14 16:00:40 2008 +0000 - Upgrade to 0.92.1 (SECURITY): - CVE-2008-0318 Integer overflow in libclamav (#432623) diff --git a/.cvsignore b/.cvsignore index f6ee3be..9a29028 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -clamav-*.tar.gz* -clamav-*.*.rpm +clamav-0.92.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index e006b41..a0dff5c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.47 2007/12/21 19:12:19 spot Exp $ +## $Id: clamav.spec,v 1.48 2007/12/21 19:23:28 spot Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92 -Release: %release_func 4.1 +Version: 0.92.1 +Release: %release_func 1 License: GPLv2 Group: Applications/File @@ -27,7 +27,7 @@ URL: http://www.clamav.net # incompatible unrar from RARlabs. We have to pull this code out. # All that is needed to make the clean tarball is: rm -rf libclamunrar* # Note that you also need patch26. -Source0: clamav-%{version}.clean.tar.gz +Source0: clamav-%{version}-norar.tar.bz2 # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. # Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig @@ -519,6 +519,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu Feb 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.92.1-1 +- Upgrade to 0.92.1 (SECURITY): +- CVE-2008-0318 Integer overflow in libclamav (#432623) + * Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-4 - EPEL fixes diff --git a/sources b/sources index 10dd892..6e9b8a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz +aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 commit 869e18548a9fa2dcab5307559ee885a1b0704ef6 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Feb 14 15:42:36 2008 +0000 Removed old, unneeded patches diff --git a/clamav-0.70-user.patch b/clamav-0.70-user.patch deleted file mode 100644 index f7f42b1..0000000 --- a/clamav-0.70-user.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.user 2000-02-19 07:04:00.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 14:35:01.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # - # clamav-milter This script starts and stops the clamav-milter daemon - # -@@ -16,6 +16,7 @@ - - # Local clamav-milter config - CLAMAV_FLAGS= -+CLAMAV_USER= - test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter - - # Check that networking is up. -@@ -28,7 +29,7 @@ - - start() { - echo -n "Starting clamav-milter: " -- daemon clamav-milter ${CLAMAV_FLAGS} -+ daemon ${CLAMAV_USER:+--user $CLAMAV_USER} setsid /usr/sbin/clamav-milter ${CLAMAV_FLAGS} </dev/null - RETVAL=$? - echo - test $RETVAL -eq 0 && touch /var/lock/subsys/clamav-milter diff --git a/clamav-0.88.1-strncpy.patch b/clamav-0.88.1-strncpy.patch deleted file mode 100644 index ceceb7d..0000000 --- a/clamav-0.88.1-strncpy.patch +++ /dev/null @@ -1,26 +0,0 @@ -2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { diff --git a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch deleted file mode 100644 index 38f9d9d..0000000 --- a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- clamav-0.88.2/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-29 19:46:09.000000000 +0200 -+++ clamav-0.88.2/libclamav/pe.c 2006-04-30 11:25:53.000000000 +0200 -@@ -1555,7 +1555,7 @@ int cli_peheader(int desc, struct cli_pe - { - uint16_t e_magic; /* DOS signature ("MZ") */ - uint32_t e_lfanew; /* address of new exe header */ -- uint32_t min, max; -+ uint32_t min=0, max=0; - struct pe_image_file_hdr file_hdr; - struct pe_image_optional_hdr optional_hdr; - struct pe_image_section_hdr *section_hdr; ---- clamav-0.88.2/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 -+++ clamav-0.88.2/libclamav/htmlnorm.c 2006-04-30 11:25:53.000000000 +0200 -@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ - { - int fd_tmp, tag_length, tag_arg_length, binary; - int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; -- FILE *stream_in; -+ FILE *stream_in = 0; - html_state state=HTML_NORM, next_state=HTML_BAD_STATE; - char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; - char tag_val[HTML_STR_LENGTH+1], *tmp_file; diff --git a/clamav-0.88.4-visibility.patch b/clamav-0.88.4-visibility.patch deleted file mode 100644 index 34ef51e..0000000 --- a/clamav-0.88.4-visibility.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- clamav-0.88.4/libclamav/md5.c.visibility 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.4/libclamav/md5.c 2006-08-11 08:19:02.000000000 +0200 -@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da - return ptr; - } - --void MD5_Init(MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx) - { - ctx->a = 0x67452301; - ctx->b = 0xefcdab89; -@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx) - ctx->hi = 0; - } - --void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) -+void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) - { - MD5_u32plus saved_lo; - unsigned long used, free; -@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data - memcpy(ctx->buffer, data, size); - } - --void MD5_Final(unsigned char *result, MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx) - { - unsigned long used, free; - commit 693b061eac2a68f66601c2f80fa51621872b7a95 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Feb 11 22:30:35 2008 +0000 updated to 0.92.1 diff --git a/.cvsignore b/.cvsignore index f6ee3be..d34f911 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ clamav-*.tar.gz* +clamav-*.tar.bz2* clamav-*.*.rpm diff --git a/Makefile b/Makefile index 21be25f..2cc62a7 100644 --- a/Makefile +++ b/Makefile @@ -19,3 +19,16 @@ MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) + + +# can not use final tarball name here as it will conflict with rules +# within Makefile.common +TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp +TARBALL = ${NAME}-${VERSION}.tar.gz + +clean-sources: ${TARBALL_CLEAN} + +${TARBALL_CLEAN}: ${TARBALL} + rm -f $@.tmp + zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp + mv $@.tmp $@ diff --git a/clamav.spec b/clamav.spec index 919bf65..70932c8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.65 2008/01/01 17:10:12 ensc Exp $ +## $Id: clamav.spec,v 1.66 2008/01/01 17:33:05 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92 -Release: %release_func 6 +Version: 0.92.1 +Release: %release_func 1 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -30,8 +30,14 @@ Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar %else # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. -# All that is needed to make the clean tarball is: rm -rf libclamunrar* -Source0: %name-%version.clean.tar.gz +# tarball was created by +# +# zcat clamav-$V.tar.gz | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > clamav-$V-norar.tar.bz2 +# +# or +# +# make clean-sources [TARBALL=<original-tarball>] +Source0: %name-%version-norar.tar.bz2 %endif Source1: clamd-wrapper Source2: clamd.sysconfig @@ -257,7 +263,7 @@ Sendmail customizations of the clamav-milter. install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar{,_iface}/{Makefile.in,all,install}} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -549,6 +555,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + * Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 - redisabled unrar stuff completely by using clean sources - splitted -milter subpackage into pieces to allow use without sendmail diff --git a/lastver b/lastver index ca6156a..da011ce 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.92 +0.92.1 diff --git a/sources b/sources index 10dd892..6e9b8a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz +aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 commit 089cc9d166636f758fe483327989d9ad695b0457 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 17:33:05 2008 +0000 minor optimizations diff --git a/clamav.spec b/clamav.spec index 64e1074..919bf65 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.64 2008/01/01 14:59:15 ensc Exp $ +## $Id: clamav.spec,v 1.65 2008/01/01 17:10:12 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -257,7 +257,7 @@ Sendmail customizations of the clamav-milter. install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} -%{!?with_unrar:> libclamunrar/Makefile.in; >libclamunrar_iface/Makefile.in; touch libclamunrar{,_iface}/{all,install}} +%{!?with_unrar:touch libclamunrar{,_iface}/{Makefile.in,all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; commit 46c82f4bf86733c97dfab69594ef9f91336a21e2 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 17:10:12 2008 +0000 - redisabled unrar stuff completely by using clean sources - splitted -milter subpackage into pieces to allow use without sendmail (#239037) diff --git a/clamav.spec b/clamav.spec index fe53a7b..64e1074 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.63 2008/01/01 13:19:16 ensc Exp $ +## $Id: clamav.spec,v 1.64 2008/01/01 14:59:15 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,13 +19,20 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 5 +Release: %release_func 6 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net +%if 0%{?with_unrar:1} Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +%else +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# All that is needed to make the clean tarball is: rm -rf libclamunrar* +Source0: %name-%version.clean.tar.gz +%endif Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -114,18 +121,32 @@ Requires(pre): %_initrddir Requires(postun): %_initrddir %package milter -Summary: Sendmail-milter for the Clam Antivirus scanner +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Requires: clamav-milter-core = %version-%release +Requires: milter(clamav) + +%package milter-core +Summary: Core milter module for the Clam Antivirus scanner Group: System Environment/Daemons Requires: init(clamav-milter) -Source300: README.fedora BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel Provides: user(%milteruser) Provides: group(%milteruser) -Requires: sendmail Requires(post): coreutils %{?FE_USERADD_REQ} +%package milter-sendmail +Summary: Sendmail customizations for clamav-milter +Group: System Environment/Daemons +Source300: README.fedora +Requires: sendmail +Requires: clamav-milter-core = %version-%release +Provides: milter(clamav) = sendmail +Conflicts: milter(clamav) < sendmail +Conflicts: milter(clamav) > sendmail + %package milter-sysv Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons @@ -216,6 +237,12 @@ This package contains files which are needed to run the clamav-milter. %description milter-sysv The SysV initscripts for clamav-milter. +%description milter-core +Core files for the clamav-milter. + +%description milter-sendmail +Sendmail customizations of the clamav-milter. + ## ------------------------------------------------------------ @@ -229,6 +256,8 @@ The SysV initscripts for clamav-milter. install -p -m0644 %SOURCE300 clamav-milter/ +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:> libclamunrar/Makefile.in; >libclamunrar_iface/Makefile.in; touch libclamunrar{,_iface}/{all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -498,14 +527,20 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files milter %defattr(-,root,root,-) -%doc clamav-milter/INSTALL clamav-milter/README.fedora + +%files milter-core +%defattr(-,root,root,-) +%doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%attr(0700,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%files milter-sendmail +%defattr(-,root,root,-) +%doc clamav-milter/README.fedora +%attr(0700,%milteruser,%milteruser) %dir %milterstatedir +%ghost %milterstatedir/* %files milter-sysv %defattr(-,root,root,-) @@ -514,6 +549,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + * Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 - use a better way to disable RPATH-generation (needed for '--with unrar' builds) diff --git a/sources b/sources index 6999f43..10dd892 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -e500651858a9187a87025c8a5c23969c clamav-0.92.tar.gz -5ac3264d9b01b7dce93f646e247b2621 clamav-0.92.tar.gz.sig +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz commit 00b1bfee950f366b37e29456d9ef3535b1ee820e Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 14:59:15 2008 +0000 use a better way to disable RPATH-generation (needed for '--with unrar' builds) diff --git a/clamav.spec b/clamav.spec index 71c14f3..fe53a7b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.62 2007/12/21 18:11:32 spot Exp $ +## $Id: clamav.spec,v 1.63 2008/01/01 13:19:16 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 4 +Release: %release_func 5 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -248,14 +248,13 @@ export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static --disable-rpath \ + --enable-milter --disable-static \ %{!?with_unrar:--disable-unrar} # build with --as-needed and disable rpath sed -i \ -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g' \ libtool @@ -515,6 +514,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + * Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 - added a README.fedora to the milter package (#240610) - ship original sources again; unrar is now licensed correctly (no more commit 019ada64a99a5d99349f06e27c29cfbaec008c10 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 13:19:16 2008 +0000 merged with F-8 diff --git a/.cvsignore b/.cvsignore index cdd308b..f6ee3be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -clamav-0.92.clean.tar.gz +clamav-*.tar.gz* +clamav-*.*.rpm diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..b9f572e --- /dev/null +++ b/README.fedora @@ -0,0 +1,5 @@ +Add + + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl + +to your sendmail.mc. diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch deleted file mode 100644 index 66b662e..0000000 --- a/clamav-0.90rc3-private.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 -+++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 -@@ -6,6 +6,6 @@ - Name: libclamav - Description: A GPL virus scanner - Version: @LIBCLAMAV_VERSION@ --Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -- -+Libs: -L${libdir} -lclamav -+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ -+Cflags: -I${includedir} ---- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 -+++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 -@@ -55,11 +55,11 @@ - ;; - - --cflags) -- echo -I@includedir@ @CFLAGS@ -+ echo -I@includedir@ - ;; - - --libs) -- echo -L@libdir@ @LIBCLAMAV_LIBS@ -+ echo -L@libdir@ -lclamav - ;; - - *) diff --git a/clamav-0.91.2-open.patch b/clamav-0.91.2-open.patch deleted file mode 100644 index b933e46..0000000 --- a/clamav-0.91.2-open.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 -+++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 -@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da - if (dazuko->device < 0) - { - -- dazuko->device = open("/dev/dazuko", 0); -+ dazuko->device = open("/dev/dazuko", O_RDONLY); - if (dazuko->device < 0) - return -1; - ---- clamav-0.91.2/shared/misc.c.open 2007-03-31 21:27:31.000000000 +0200 -+++ clamav-0.91.2/shared/misc.c 2007-08-25 12:36:30.000000000 +0200 -@@ -165,7 +165,7 @@ int filecopy(const char *src, const char - if((s = open(src, O_RDONLY|O_BINARY)) == -1) - return -1; - -- if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY)) == -1) { -+ if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, 0600)) == -1) { - close(s); - return -1; - } diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch deleted file mode 100644 index b63921e..0000000 --- a/clamav-0.92-nounrar.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in ---- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 -+++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 -@@ -242,7 +242,7 @@ target_os = @target_os@ - target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - bin_SCRIPTS = clamav-config - pkgconfigdir = $(libdir)/pkgconfig -diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in ---- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 -+++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 -@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex - AC_C_FPU_BIGENDIAN - - AC_OUTPUT([ --libclamunrar/Makefile --libclamunrar_iface/Makefile - libclamav/Makefile - clamscan/Makefile - database/Makefile -diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am ---- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 -+++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 -@@ -16,7 +16,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - # MA 02110-1301, USA. - --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - - bin_SCRIPTS=clamav-config -diff -up clamav-0.92/configure.BAD clamav-0.92/configure ---- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 -+++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 -@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi - esac - - --ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" -+ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -27013,8 +27013,6 @@ do - case $ac_config_target in - "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; -- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; - "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; - "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; - "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav-0.92-private.patch b/clamav-0.92-private.patch new file mode 100644 index 0000000..bab2948 --- /dev/null +++ b/clamav-0.92-private.patch @@ -0,0 +1,29 @@ +--- clamav-0.92/libclamav.pc.in.private ++++ clamav-0.92/libclamav.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.92/clamav-config.in.private ++++ clamav-0.92/clamav-config.in +@@ -54,12 +54,8 @@ while test $# -gt 0; do + usage 0 + ;; + +- --cflags) +- echo -I@includedir@ @CFLAGS@ +- ;; +- +- --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ (--cflags|--libs) ++ ${PKG_CONFIG:-pkg-config} "$1" libclamav + ;; + + *) diff --git a/clamav-notify-servers b/clamav-notify-servers index 22d57a6..f115e89 100644 --- a/clamav-notify-servers +++ b/clamav-notify-servers @@ -1,16 +1,16 @@ #! /bin/bash # Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # 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. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/clamav.spec b/clamav.spec index 0e049d1..71c14f3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,7 +1,8 @@ -## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ +## $Id: clamav.spec,v 1.62 2007/12/21 18:11:32 spot Exp $ ## Fedora Extras specific customization below... -%bcond_without fedora +%bcond_without fedora +%bcond_with unrar ## %global username clamav @@ -18,19 +19,13 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 3 +Release: %release_func 4 -License: GPLv2 +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# All that is needed to make the clean tarball is: rm -rf libclamunrar* -# Note that you also need patch26. -Source0: clamav-%{version}.clean.tar.gz -# Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -# No sense in using this file for the time being. -# Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -40,9 +35,8 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch24: clamav-0.90rc3-private.patch +Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -73,6 +67,7 @@ Source100: clamd-gen Requires: clamav-lib = %version-%release Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig +Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner @@ -122,6 +117,7 @@ Requires(postun): %_initrddir Summary: Sendmail-milter for the Clam Antivirus scanner Group: System Environment/Daemons Requires: init(clamav-milter) +Source300: README.fedora BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel Provides: user(%milteruser) @@ -215,12 +211,7 @@ SysV initscripts template for the clamav server %description milter -This package contains files which are needed to run the clamav-milter. It -can be activated by adding - -| INPUT_MAIL_FILTER(`clamav', `S=local:%milterstatedir/clamav.sock, F=, T=S:4m;R:4m')dnl - -to your sendmail.mc. +This package contains files which are needed to run the clamav-milter. %description milter-sysv The SysV initscripts for clamav-milter. @@ -235,7 +226,9 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .nounrar + +install -p -m0644 %SOURCE300 clamav-milter/ + perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -254,12 +247,16 @@ CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' -%configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static --disable-unrar -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -# No rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%configure --disable-clamav --with-dbdir=/var/lib/clamav \ + --enable-milter --disable-static --disable-rpath \ + %{!?with_unrar:--disable-unrar} + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + libtool make %{?_smp_mflags} @@ -291,15 +288,20 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir/daily.inc + ${RPM_BUILD_ROOT}%homedir/{main,daily}.inc rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la -for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do - touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i + +for i in cfg db fp hdb info mdb mdu ndb ndu pdb wdb zmd; do + touch ${RPM_BUILD_ROOT}%homedir/daily.inc/daily.$i + touch ${RPM_BUILD_ROOT}%homedir/main.inc/main.$i done +touch ${RPM_BUILD_ROOT}%homedir/daily.inc/COPYING +touch ${RPM_BUILD_ROOT}%homedir/main.inc/COPYING + ## prepare the server-files mkdir _doc_server @@ -470,14 +472,8 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd +%ghost %attr(0664,%username,%username) %homedir/daily.inc/* +%ghost %attr(0664,%username,%username) %homedir/main.inc/* ## ----------------------- @@ -503,7 +499,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files milter %defattr(-,root,root,-) -%doc clamav-milter/INSTALL +%doc clamav-milter/INSTALL clamav-milter/README.fedora %_sbindir/*milter* %_mandir/man8/clamav-milter* %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf @@ -519,6 +515,16 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + * Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability diff --git a/clamd-gen b/clamd-gen index 46739ba..ac5dae2 100755 --- a/clamd-gen +++ b/clamd-gen @@ -1,16 +1,16 @@ #! /bin/bash # Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # 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. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -19,7 +19,7 @@ function showHelp() { echo \ $"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> - --license=<LICENSE> --username=>USERNAME> + --license=<LICENSE> --username=>USERNAME> " exit 0 } @@ -227,7 +227,7 @@ function rpm.genFiles %dir %minitsvcdir %config(noreplace) %verify(not mtime) %minitsvcdir/params %config %minitsvcdir/run - %minitsvcdir/respawn + %minitsvcdir/respawn %endif EOF } diff --git a/clamd-wrapper b/clamd-wrapper index 372005f..c32e34e 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -28,7 +28,7 @@ CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf CLAMD_OPTIONS= ## backward-compatibility check... for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do + /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do CLAMD_SOCKET=$i test ! -e "$i" || break done diff --git a/freshclam-sleep b/freshclam-sleep index 2cb6bb2..7bdcf78 100755 --- a/freshclam-sleep +++ b/freshclam-sleep @@ -1,15 +1,15 @@ #! /bin/bash # Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # 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. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -33,7 +33,7 @@ case $FRESHCLAM_DELAY in (disabled-warn) echo $"\ WARNING: update of clamav database is disabled; please see - '$f' + '$f' for information how to enable the periodic update resp. how to turn off this message." >&2 exit 1 diff --git a/lastver b/lastver index 021c263..ca6156a 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.91.2 +0.92 diff --git a/sources b/sources index 10dd892..6999f43 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz +e500651858a9187a87025c8a5c23969c clamav-0.92.tar.gz +5ac3264d9b01b7dce93f646e247b2621 clamav-0.92.tar.gz.sig diff --git a/verinfo b/verinfo index 2d35ad0..a4a0b38 100644 --- a/verinfo +++ b/verinfo @@ -1,2 +1,2 @@ http://prdownloads.sourceforge.net/sourceforge/clamav/ -clamav-(.*?)\.tar\. +clamav-([0-9.-]*?)\.tar\. commit 128b1e458fc8dcab82f7d6a9bc6a98a5a873355a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 19:23:28 2007 +0000 clamav-0.90rc3-private.patch needed to be resynced diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch index 7ef309e..db4e000 100644 --- a/clamav-0.80-initoff.patch +++ b/clamav-0.80-initoff.patch @@ -4,8 +4,8 @@ # # clamav-milter This script starts and stops the clamav-milter daemon # --# chkconfig: 2345 71 40 -+# chkconfig: - 71 40 +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 # # description: clamav-milter is a daemon which hooks into sendmail and routes # email messages to clamav diff --git a/clamav.spec b/clamav.spec index 28ef9f3..e006b41 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.28 2007/12/21 18:10:56 spot Exp $ +## $Id: clamav.spec,v 1.47 2007/12/21 19:12:19 spot Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 4 +Release: %release_func 4.1 License: GPLv2 Group: Applications/File commit 0cb76702f80a28fead3971b25d00d1fcf5b1cd3e Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 19:12:19 2007 +0000 Fix EPEL diff --git a/clamav.spec b/clamav.spec index 0e049d1..28ef9f3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,7 +1,7 @@ -## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ +## $Id: clamav.spec,v 1.28 2007/12/21 18:10:56 spot Exp $ ## Fedora Extras specific customization below... -%bcond_without fedora +# %bcond_without fedora ## %global username clamav @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 3 +Release: %release_func 4 License: GPLv2 Group: Applications/File @@ -519,6 +519,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-4 +- EPEL fixes + * Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability commit cf29647a15f7741d92b6cbf16daf19917c5cce16 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:11:32 2007 +0000 Fix changelog to match version diff --git a/clamav.spec b/clamav.spec index 69321c3..0e049d1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ +## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -519,7 +519,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability commit 9d37ba25fb56f5cecc8d04aa734139f63a468879 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:11:02 2007 +0000 Fix changelog to match version diff --git a/clamav.spec b/clamav.spec index 69321c3..0e049d1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ +## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -519,7 +519,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability commit 34e19ca3c910b337f8c0e086ded8db511d089a4b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:06:29 2007 +0000 0.92 on all active branches diff --git a/.cvsignore b/.cvsignore index 3fc2429..cdd308b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.91.2-clean.tar.bz2 +clamav-0.92.clean.tar.gz diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch new file mode 100644 index 0000000..b63921e --- /dev/null +++ b/clamav-0.92-nounrar.patch @@ -0,0 +1,57 @@ +diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in +--- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 ++++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 +@@ -242,7 +242,7 @@ target_os = @target_os@ + target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + bin_SCRIPTS = clamav-config + pkgconfigdir = $(libdir)/pkgconfig +diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in +--- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 ++++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 +@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex + AC_C_FPU_BIGENDIAN + + AC_OUTPUT([ +-libclamunrar/Makefile +-libclamunrar_iface/Makefile + libclamav/Makefile + clamscan/Makefile + database/Makefile +diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am +--- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 ++++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 +@@ -16,7 +16,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + # MA 02110-1301, USA. + +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + + bin_SCRIPTS=clamav-config +diff -up clamav-0.92/configure.BAD clamav-0.92/configure +--- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 ++++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 +@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi + esac + + +-ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" ++ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -27013,8 +27013,6 @@ do + case $ac_config_target in + "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; +- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; + "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; + "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; + "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav-0.92-open.patch b/clamav-0.92-open.patch new file mode 100644 index 0000000..040fc20 --- /dev/null +++ b/clamav-0.92-open.patch @@ -0,0 +1,11 @@ +--- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 ++++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 +@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da + if (dazuko->device < 0) + { + +- dazuko->device = open("/dev/dazuko", 0); ++ dazuko->device = open("/dev/dazuko", O_RDONLY); + if (dazuko->device < 0) + return -1; + diff --git a/clamav.spec b/clamav.spec index 6278230..69321c3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.60 2007/10/29 10:22:00 spot Exp $ +## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.91.2 +Version: 0.92 Release: %release_func 3 License: GPLv2 @@ -25,7 +25,9 @@ Group: Applications/File URL: http://www.clamav.net # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. -Source0: clamav-0.91.2-clean.tar.bz2 +# All that is needed to make the clean tarball is: rm -rf libclamunrar* +# Note that you also need patch26. +Source0: clamav-%{version}.clean.tar.gz # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. # Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig @@ -39,7 +41,8 @@ Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch -Patch25: clamav-0.91.2-open.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -232,6 +235,7 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .nounrar perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -251,8 +255,12 @@ export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static + --enable-milter --disable-static --disable-unrar sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +# No rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + make %{?_smp_mflags} @@ -511,6 +519,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 - remove RAR decompression code from source tarball because of legal problems (resolves 334371) diff --git a/sources b/sources index 8a090b8..10dd892 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c072b629b19d97ebe246b87269bd2ac2 clamav-0.91.2-clean.tar.bz2 +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz commit 85ce1bf814ac36ef561c1d03008282782885b305 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:06:01 2007 +0000 0.92 on all active branches diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch new file mode 100644 index 0000000..66b662e --- /dev/null +++ b/clamav-0.90rc3-private.patch @@ -0,0 +1,28 @@ +--- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 ++++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 +@@ -6,6 +6,6 @@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 ++++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 +@@ -55,11 +55,11 @@ + ;; + + --cflags) +- echo -I@includedir@ @CFLAGS@ ++ echo -I@includedir@ + ;; + + --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ echo -L@libdir@ -lclamav + ;; + + *) diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch new file mode 100644 index 0000000..b63921e --- /dev/null +++ b/clamav-0.92-nounrar.patch @@ -0,0 +1,57 @@ +diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in +--- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 ++++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 +@@ -242,7 +242,7 @@ target_os = @target_os@ + target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + bin_SCRIPTS = clamav-config + pkgconfigdir = $(libdir)/pkgconfig +diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in +--- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 ++++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 +@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex + AC_C_FPU_BIGENDIAN + + AC_OUTPUT([ +-libclamunrar/Makefile +-libclamunrar_iface/Makefile + libclamav/Makefile + clamscan/Makefile + database/Makefile +diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am +--- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 ++++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 +@@ -16,7 +16,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + # MA 02110-1301, USA. + +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + + bin_SCRIPTS=clamav-config +diff -up clamav-0.92/configure.BAD clamav-0.92/configure +--- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 ++++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 +@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi + esac + + +-ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" ++ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -27013,8 +27013,6 @@ do + case $ac_config_target in + "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; +- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; + "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; + "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; + "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav-0.92-open.patch b/clamav-0.92-open.patch new file mode 100644 index 0000000..040fc20 --- /dev/null +++ b/clamav-0.92-open.patch @@ -0,0 +1,11 @@ +--- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 ++++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 +@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da + if (dazuko->device < 0) + { + +- dazuko->device = open("/dev/dazuko", 0); ++ dazuko->device = open("/dev/dazuko", O_RDONLY); + if (dazuko->device < 0) + return -1; + diff --git a/clamav.spec b/clamav.spec index f893c9a..69321c3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,10 +1,9 @@ -## $Id: clamav.spec,v 1.43 2006/10/18 07:22:18 ensc Exp $ +## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora ## - %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log @@ -18,14 +17,20 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.6 -Release: %release_func 1 +Version: 0.92 +Release: %release_func 3 -License: GPL +License: GPLv2 Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# All that is needed to make the clean tarball is: rm -rf libclamunrar* +# Note that you also need patch26. +Source0: clamav-%{version}.clean.tar.gz +# Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +# No sense in using this file for the time being. +# Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -33,18 +38,29 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch0: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch -Patch1: clamav-0.88.1-strncpy.patch -Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch23: clamav-0.88.4-visibility.patch +Patch24: clamav-0.90rc3-private.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: %_includedir/tcpd.h BuildRequires: bc +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(clamav) +Provides: group(clamav) +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?FE_USERADD_REQ} + %package lib Summary: Dynamic libraries for the Clam Antivirus scanner Group: System Environment/Libraries @@ -54,17 +70,25 @@ Requires: data(clamav) Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %version-%release +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -Provides: data(clamav) -Provides: user(clamav) -Provides: group(clamav) -BuildRequires: fedora-usermgmt-devel -%{?FE_USERADD_REQ} +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -72,7 +96,7 @@ Group: Applications/File Source200: freshclam-sleep Source201: freshclam.sysconfig Source202: clamav-update.cron -Requires: clamav-data = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod @@ -83,7 +107,8 @@ Summary: Clam Antivirus scanner server Group: System Environment/Daemons Requires: init(clamav-server) Requires: data(clamav) -Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release %package server-sysv Summary: SysV initscripts for clamav server @@ -129,6 +154,9 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. %description lib This package contains dynamic libraries shared between applications @@ -141,7 +169,29 @@ build applications using clamav. %description data This package contains the virus-database needed by clamav. This database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + %description update This package contains programs which can be used to update the clamav @@ -180,13 +230,12 @@ The SysV initscripts for clamav-milter. %prep %setup -q -%patch0 -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch' -%patch1 -p1 -b .strncpy -%patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff -%patch23 -p1 -b .visibility +%patch24 -p1 -b .private +%patch25 -p1 -b .open +%patch26 -p1 -b .nounrar perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -202,15 +251,16 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf %build CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check +export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter + --enable-milter --disable-static --disable-unrar +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +# No rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -## HACK: ./configure checks if freshclam.conf/clamd.conf are existing -## in current filesystem and skips its installation then. Was introduced -## by 0.66. -perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; - s!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_FALSE\@),[^,]*,!\1,\#,!g' config.status -./config.status make %{?_smp_mflags} @@ -240,11 +290,16 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%_initrddir + ${RPM_BUILD_ROOT}%_initrddir \ + ${RPM_BUILD_ROOT}%homedir/daily.inc rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la +for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do + touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i +done + ## prepare the server-files mkdir _doc_server @@ -290,10 +345,7 @@ subst etc/clamd.conf /etc/clamd.d/milter.conf \ cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter -## The '-blo' options might be usefully here -- especially for testing; see -## "man 8 clamav-milter" for further options -CLAMAV_FLAGS='--max-children=2 -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' -CLAMAV_USER='%milteruser' +CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' EOF install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter @@ -307,11 +359,16 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ -%pre data +%pre filesystem %__fe_groupadd 4 -r %username &>/dev/null || : %__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ -c 'Clamav database update user' -g %username %username &>/dev/null || : +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + %post update test -e %freshclamlog || { touch %freshclamlog @@ -319,10 +376,6 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%postun data -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - %pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ @@ -357,7 +410,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files %defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE %doc docs/*.pdf %_bindir/* %_mandir/man[15]/* @@ -376,9 +429,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files devel %defattr(-,root,root,-) %_includedir/* -%_libdir/*.*a %_libdir/*.so -%dir %pkgdatadir %pkgdatadir/template %pkgdatadir/clamd-gen %_libdir/pkgconfig/* @@ -386,14 +437,25 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : ## ----------------------- +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,%username,%username) %dir %homedir/daily.inc +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + %files data %defattr(-,%username,%username,-) -%dir %homedir # use %%config to keep files which were updated by 'freshclam' # already. Without this tag, they would be overridden with older # versions whenever a new -data package is installed. %config %verify(not size md5 mtime) %homedir/*.cvd + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/main.cvd + ## ----------------------- %files update @@ -408,6 +470,16 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd + + ## ----------------------- %files server @@ -415,7 +487,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc _doc_server/* %_mandir/man[58]/clamd* %_sbindir/* -%dir %pkgdatadir %pkgdatadir/clamd-wrapper %dir %_sysconfdir/clamd.d @@ -448,6 +519,70 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam + +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + * Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 - updated to 0.88.6 @@ -724,83 +859,3 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : * Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 - added security fix for http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 - -* Fri Nov 28 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.4 -- fixed typo in README (sysconf.d vs. sysconf) -- make build on rhl8 succeed by adding '|| :' to %%check - -* Tue Nov 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.3 -- substitute 'User' in sample cfg-file also -- uncommented some cfg-options which are needed for a proper operation -- fixed typos in README (thanks to Michael Schwendt) - -* Mon Nov 17 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.2 -- fixed path of 'LocalSocket' and documented steps how to create it -- added a missing backslash at the configure-call -- do not package clamav-milter.8 manpage -- documented 'User' in the README - -* Sat Nov 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.1 -- updated to 0.65 -- added gmp-devel buildrequires: -- changed installed databases from 'viruses.db*' to '*.cvb' -- made milter-build conditional; 0.65 is missing some files which would break the build else -- fixed typo (clamav-notify-server -> clamav-notify-servers) - -* Fri Oct 31 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.60-0.fdr.5 -- created -update subpackage and filled it with files from main and -data package -- set more reasonable default-values in the sample config-file -- made the README in -server more clear -- moved clamav-milter man-page into -milter subpackage -- use fedora-usermgmt -- renamed -daemon subpackage and related files to -server -- use abstract 'data(clamav)' notation for clamav-data dependencies -- use 'init(...)' requirements as placeholder for future -sysv/-minit subpackages - -* Sat Aug 16 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.4 -- backported clamav-sockwrite.c to C89 - -* Fri Aug 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- updated Source0 URL -- fixed portuguese i18n-abbreviation - -* Fri Jul 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- use LSB compliant exit-codes in the init-script -- other init-script cleanups - -* Tue Jul 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.2 -- updated %%description -- removed README from %%doc-list - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.1 -- disabled -milter subpackage; I do not get it to run :( - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.0.1 -- updated to 0.60 -- modernized usercreation -- added -milter subpackage - -* Thu May 8 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.2 -- added BUGS file -- moved clamd.8 man-page into daemon-subpackage -- some cosmetical cleanups -- removed config-patch; it was unused -- made some paths more fedora-compliant -- honor $RPM_OPT_FLAGS -- added clamav-notify-daemons script -- removed obsoleted %%socketdir - -* Wed May 7 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.0.1 -- splitted into additional -data/-daemon packages -- added clamav-sockwrite program -- updated to recent fedora policies - -* Thu Nov 21 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.54-1 -- updated to 0.54 -- updated config-patch - -* Tue Oct 29 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.52-1 -- updated to 0.52 - -* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- Initial build. diff --git a/sources b/sources index e74691d..10dd892 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz -38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz commit 73644b64f36c4e5953029b0d53a6a0d1f363d780 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 29 14:25:28 2007 +0000 Pull out rar code from clamav, resolve legal issue (334371). diff --git a/.cvsignore b/.cvsignore index f6ee3be..3fc2429 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -clamav-*.tar.gz* -clamav-*.*.rpm +clamav-0.91.2-clean.tar.bz2 diff --git a/clamav.spec b/clamav.spec index a0b599e..6278230 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.58 2007/08/25 10:40:56 ensc Exp $ +## $Id: clamav.spec,v 1.60 2007/10/29 10:22:00 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,13 +18,17 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.91.2 -Release: %release_func 2 +Release: %release_func 3 -License: GPL +License: GPLv2 Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +Source0: clamav-0.91.2-clean.tar.bz2 +# Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +# No sense in using this file for the time being. +# Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -507,6 +511,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + * Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 - Bump release for upgrade path. diff --git a/sources b/sources index 7a01a39..8a090b8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -2a7265d17cfa80c32858978f16a3f47b clamav-0.91.2.tar.gz -9e1b4659b506315dbc9f1c06dbe6273b clamav-0.91.2.tar.gz.sig +c072b629b19d97ebe246b87269bd2ac2 clamav-0.91.2-clean.tar.bz2 commit 0b7f0c1221f44311cd97327030b5f71d44b6ef35 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Mon Sep 24 18:17:46 2007 +0000 - Bump release for upgrade path. diff --git a/clamav.spec b/clamav.spec index 5b0e5cd..a0b599e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.57 2007/08/25 10:12:31 ensc Exp $ +## $Id: clamav.spec,v 1.58 2007/08/25 10:40:56 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.91.2 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -507,6 +507,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + * Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 - updated to 0.91.2 (SECURITY): - CVE-2007-4510 DOS in RTF parser commit d9370ed2889a28fee0176e2e0798a91aec5eb629 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Sep 2 11:30:08 2007 +0000 initial checkin diff --git a/lastver b/lastver new file mode 100644 index 0000000..021c263 --- /dev/null +++ b/lastver @@ -0,0 +1 @@ +0.91.2 diff --git a/verinfo b/verinfo new file mode 100644 index 0000000..2d35ad0 --- /dev/null +++ b/verinfo @@ -0,0 +1,2 @@ +http://prdownloads.sourceforge.net/sourceforge/clamav/ +clamav-(.*?)\.tar\. commit 7aecf13b517885415cebd7da07efce9b70b82573 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 25 10:40:56 2007 +0000 fixed an open(2) issue diff --git a/clamav-0.91.2-open.patch b/clamav-0.91.2-open.patch new file mode 100644 index 0000000..b933e46 --- /dev/null +++ b/clamav-0.91.2-open.patch @@ -0,0 +1,22 @@ +--- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 ++++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 +@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da + if (dazuko->device < 0) + { + +- dazuko->device = open("/dev/dazuko", 0); ++ dazuko->device = open("/dev/dazuko", O_RDONLY); + if (dazuko->device < 0) + return -1; + +--- clamav-0.91.2/shared/misc.c.open 2007-03-31 21:27:31.000000000 +0200 ++++ clamav-0.91.2/shared/misc.c 2007-08-25 12:36:30.000000000 +0200 +@@ -165,7 +165,7 @@ int filecopy(const char *src, const char + if((s = open(src, O_RDONLY|O_BINARY)) == -1) + return -1; + +- if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY)) == -1) { ++ if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, 0600)) == -1) { + close(s); + return -1; + } diff --git a/clamav.spec b/clamav.spec index 4b6b705..5b0e5cd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.56 2007/07/17 07:27:38 ensc Exp $ +## $Id: clamav.spec,v 1.57 2007/08/25 10:12:31 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -35,6 +35,7 @@ Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch +Patch25: clamav-0.91.2-open.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -226,6 +227,7 @@ The SysV initscripts for clamav-milter. %patch21 -p1 -b .path %patch22 -p1 -b .initoff %patch24 -p1 -b .private +%patch25 -p1 -b .open perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -511,6 +513,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - DOS in html normalizer - arbitrary command execution by special crafted recipients in clamav-milter's black-hole mode +- fixed an open(2) issue * Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 - updated to 0.91.1 commit 1d4259aaa9d4d2b5e387166d7660164c0f298575 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 25 10:12:31 2007 +0000 - updated to 0.91.2 (SECURITY): - CVE-2007-4510 DOS in RTF parser - DOS in html normalizer - arbitrary command execution by special crafted recipients in clamav-milter's black-hole mode diff --git a/clamav.spec b/clamav.spec index 361371c..4b6b705 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.55 2007/07/12 07:31:31 ensc Exp $ +## $Id: clamav.spec,v 1.56 2007/07/17 07:27:38 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.91.1 -Release: %release_func 0 +Version: 0.91.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -505,6 +505,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode + * Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 - updated to 0.91.1 diff --git a/sources b/sources index 4366c05..7a01a39 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -60152bf1e24b3fbdf0473794199e5215 clamav-0.91.1.tar.gz -79dd6dd870dbeb5d5a88e1327f82a015 clamav-0.91.1.tar.gz.sig +2a7265d17cfa80c32858978f16a3f47b clamav-0.91.2.tar.gz +9e1b4659b506315dbc9f1c06dbe6273b clamav-0.91.2.tar.gz.sig commit 07ca3e8f63ce599893ef168485711bc61b3d3e31 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jul 17 07:27:38 2007 +0000 updated to 0.91.1 diff --git a/clamav.spec b/clamav.spec index 732c243..361371c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.54 2007/05/31 19:37:44 ensc Exp $ +## $Id: clamav.spec,v 1.55 2007/07/12 07:31:31 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.91 +Version: 0.91.1 Release: %release_func 0 License: GPL @@ -505,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + * Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 - updated to 0.91 diff --git a/sources b/sources index 06a6d28..4366c05 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -35192423e44642c86ea69dc93f59cfb1 clamav-0.91.tar.gz -85b2e343dd60024bbb8b57671fd525ef clamav-0.91.tar.gz.sig +60152bf1e24b3fbdf0473794199e5215 clamav-0.91.1.tar.gz +79dd6dd870dbeb5d5a88e1327f82a015 clamav-0.91.1.tar.gz.sig commit c1a7b3706b72cefd1d58bee3f5945687f4223a70 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 12 07:31:31 2007 +0000 updated to 0.91 diff --git a/clamav.spec b/clamav.spec index 7009f84..732c243 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.53 2007/05/31 07:40:24 ensc Exp $ +## $Id: clamav.spec,v 1.54 2007/05/31 19:37:44 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90.3 -Release: %release_func 1 +Version: 0.91 +Release: %release_func 0 License: GPL Group: Applications/File @@ -505,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + * Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 - updated to 0.90.3 - BR tcpd.h instead of tcp_wrappers(-devel) to make it build both diff --git a/sources b/sources index 6f2abc1..06a6d28 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d42ccf7a32daeb7c7cc3c8c23a7793ea clamav-0.90.3.tar.gz -f6c5b6e941bcd2bed7105f7ce29a02f9 clamav-0.90.3.tar.gz.sig +35192423e44642c86ea69dc93f59cfb1 clamav-0.91.tar.gz +85b2e343dd60024bbb8b57671fd525ef clamav-0.91.tar.gz.sig commit a640334a8eab063415707665657ac2b2ee73294c Author: ensc <ensc(a)fedoraproject.org> Date: Thu May 31 19:37:44 2007 +0000 fixed tcp-wrappers BR diff --git a/clamav.spec b/clamav.spec index ec59663..7009f84 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.52 2007/04/13 07:37:40 ensc Exp $ +## $Id: clamav.spec,v 1.53 2007/05/31 07:40:24 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -39,7 +39,7 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: %_libdir/libwrap.so +BuildRequires: %_includedir/tcpd.h BuildRequires: bc %package filesystem @@ -507,7 +507,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog * Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 - updated to 0.90.3 -- BR libwrap.so instead of tcp_wrappers(-devel) to make it build both +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both in FC6- and F7+ * Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 commit f9850d977e524b00f51192143d8563322a45a878 Author: ensc <ensc(a)fedoraproject.org> Date: Thu May 31 07:40:24 2007 +0000 - updated to 0.90.3 - BR libwrap.so instead of tcp_wrappers(-devel) to make it build both in FC6- and F7+ diff --git a/clamav.spec b/clamav.spec index 0ab56f8..ec59663 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.51 2007/03/02 17:59:09 ensc Exp $ +## $Id: clamav.spec,v 1.52 2007/04/13 07:37:40 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90.2 +Version: 0.90.3 Release: %release_func 1 License: GPL @@ -39,7 +39,7 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: tcp_wrappers-devel +BuildRequires: %_libdir/libwrap.so BuildRequires: bc %package filesystem @@ -505,6 +505,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR libwrap.so instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + * Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 - [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 diff --git a/sources b/sources index af58feb..6f2abc1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -39d1f07a399b551b55096b6ec7325c33 clamav-0.90.2.tar.gz -eb31a4a230930568d55bc2dd45f373c0 clamav-0.90.2.tar.gz.sig +d42ccf7a32daeb7c7cc3c8c23a7793ea clamav-0.90.3.tar.gz +f6c5b6e941bcd2bed7105f7ce29a02f9 clamav-0.90.3.tar.gz.sig commit 20d8116dd064b707793cefa323761dcdded5e105 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Apr 13 07:37:40 2007 +0000 [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch index 7ef309e..db4e000 100644 --- a/clamav-0.80-initoff.patch +++ b/clamav-0.80-initoff.patch @@ -4,8 +4,8 @@ # # clamav-milter This script starts and stops the clamav-milter daemon # --# chkconfig: 2345 71 40 -+# chkconfig: - 71 40 +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 # # description: clamav-milter is a daemon which hooks into sendmail and routes # email messages to clamav diff --git a/clamav.spec b/clamav.spec index bd25be1..0ab56f8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.50 2007/03/02 17:17:37 ensc Exp $ +## $Id: clamav.spec,v 1.51 2007/03/02 17:59:09 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90.1 -Release: %release_func 2 +Version: 0.90.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -505,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + * Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 - BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' diff --git a/sources b/sources index 598ffdb..af58feb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -cd11c05b5476262eaea4fa3bd7dc25bf clamav-0.90.1.tar.gz -97061af5fe626136e70db3861640f381 clamav-0.90.1.tar.gz.sig +39d1f07a399b551b55096b6ec7325c33 clamav-0.90.2.tar.gz +eb31a4a230930568d55bc2dd45f373c0 clamav-0.90.2.tar.gz.sig commit 164549699e502c87d099635a9910c0d0daac094f Author: ensc <ensc(a)fedoraproject.org> Date: Fri Mar 2 17:59:09 2007 +0000 BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' diff --git a/clamav.spec b/clamav.spec index 59406af..bd25be1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.49 2007/02/18 21:25:26 ensc Exp $ +## $Id: clamav.spec,v 1.50 2007/03/02 17:17:37 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90.1 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -38,7 +38,8 @@ Patch24: clamav-0.90rc3-private.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: tcp_wrappers-devel BuildRequires: bc %package filesystem @@ -504,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + * Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 - updated to 0.90.1 - updated %%doc list commit 3077ab218570c4c6398ce451a01ae1c1f2e9ab9c Author: ensc <ensc(a)fedoraproject.org> Date: Fri Mar 2 17:17:37 2007 +0000 - updated to 0.90.1 - updated %%doc list diff --git a/clamav.spec b/clamav.spec index ac86cc3..59406af 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.48 2007/02/18 21:19:28 ensc Exp $ +## $Id: clamav.spec,v 1.49 2007/02/18 21:25:26 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90 +Version: 0.90.1 Release: %release_func 1 License: GPL @@ -395,7 +395,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files %defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE %doc docs/*.pdf %_bindir/* %_mandir/man[15]/* @@ -504,6 +504,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + * Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 - updated to final 0.90 - removed -visibility patch since fixed upstream diff --git a/sources b/sources index 32bb4ec..598ffdb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9d5d53eed766976c2cfc9b14d56b2bba clamav-0.90.tar.gz.sig -f04372e49c3c5ff3bd94bbe1fef2eaca clamav-0.90.tar.gz +cd11c05b5476262eaea4fa3bd7dc25bf clamav-0.90.1.tar.gz +97061af5fe626136e70db3861640f381 clamav-0.90.1.tar.gz.sig commit 5df338709c6f2fe74ee74c820afe830660390c91 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Feb 18 21:25:26 2007 +0000 updated release diff --git a/clamav.spec b/clamav.spec index 69f08ae..ac86cc3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.47 2007/02/04 11:57:35 ensc Exp $ +## $Id: clamav.spec,v 1.48 2007/02/18 21:19:28 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.4 +Release: %release_func 1 License: GPL Group: Applications/File commit b842833b0bed60711642f5b40286dfb7fe7c40ba Author: ensc <ensc(a)fedoraproject.org> Date: Sun Feb 18 21:19:28 2007 +0000 - updated to final 0.90 - removed -visibility patch since fixed upstream diff --git a/clamav-0.88.4-visibility.patch b/clamav-0.88.4-visibility.patch deleted file mode 100644 index 34ef51e..0000000 --- a/clamav-0.88.4-visibility.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- clamav-0.88.4/libclamav/md5.c.visibility 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.4/libclamav/md5.c 2006-08-11 08:19:02.000000000 +0200 -@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da - return ptr; - } - --void MD5_Init(MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx) - { - ctx->a = 0x67452301; - ctx->b = 0xefcdab89; -@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx) - ctx->hi = 0; - } - --void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) -+void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) - { - MD5_u32plus saved_lo; - unsigned long used, free; -@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data - memcpy(ctx->buffer, data, size); - } - --void MD5_Final(unsigned char *result, MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx) - { - unsigned long used, free; - diff --git a/clamav.spec b/clamav.spec index 6ae90e2..69f08ae 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,12 +1,9 @@ -## $Id: clamav.spec,v 1.46 2007/02/03 15:16:08 ensc Exp $ +## $Id: clamav.spec,v 1.47 2007/02/04 11:57:35 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora ## - -%global rcver rc3 - %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log @@ -21,13 +18,13 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.3.rc3 +Release: %release_func 0.4 License: GPL Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -37,7 +34,6 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch23: clamav-0.88.4-visibility.patch Patch24: clamav-0.90rc3-private.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release @@ -224,11 +220,10 @@ The SysV initscripts for clamav-milter. ## ------------------------------------------------------------ %prep -%setup -q -n %name-%version%{?rcver} +%setup -q %patch21 -p1 -b .path %patch22 -p1 -b .initoff -%patch23 -p1 -b .visibility %patch24 -p1 -b .private perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; @@ -509,6 +504,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + * Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 - build with -Wl,-as-needed and cleaned up pkgconfig file - removed old hack which forced installation of freshclam.conf; related diff --git a/sources b/sources index 6527451..32bb4ec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5af2bdbbb255829dd590609d900c1854 clamav-0.90rc3.tar.gz -978715ae312d5dda63a0591b0a4eae14 clamav-0.90rc3.tar.gz.sig +9d5d53eed766976c2cfc9b14d56b2bba clamav-0.90.tar.gz.sig +f04372e49c3c5ff3bd94bbe1fef2eaca clamav-0.90.tar.gz commit 0e58ab345a08dba81aea0155270a8e1a43cd07f4 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Feb 4 11:57:35 2007 +0000 - build with -Wl,-as-needed and cleaned up pkgconfig file - removed old hack which forced installation of freshclam.conf; related check was removed upstream - removed static library - removed %%changelog entries from before 2004 diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch new file mode 100644 index 0000000..66b662e --- /dev/null +++ b/clamav-0.90rc3-private.patch @@ -0,0 +1,28 @@ +--- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 ++++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 +@@ -6,6 +6,6 @@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 ++++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 +@@ -55,11 +55,11 @@ + ;; + + --cflags) +- echo -I@includedir@ @CFLAGS@ ++ echo -I@includedir@ + ;; + + --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ echo -L@libdir@ -lclamav + ;; + + *) diff --git a/clamav.spec b/clamav.spec index 4bd460e..6ae90e2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.45 2006/12/12 08:17:53 ensc Exp $ +## $Id: clamav.spec,v 1.46 2007/02/03 15:16:08 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.2.rc3 +Release: %release_func 0.3.rc3 License: GPL Group: Applications/File @@ -38,6 +38,7 @@ Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch23: clamav-0.88.4-visibility.patch +Patch24: clamav-0.90rc3-private.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -228,6 +229,7 @@ The SysV initscripts for clamav-milter. %patch21 -p1 -b .path %patch22 -p1 -b .initoff %patch23 -p1 -b .visibility +%patch24 -p1 -b .private perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -243,15 +245,12 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf %build CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check +export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter - -## HACK: ./configure checks if freshclam.conf/clamd.conf are existing -## in current filesystem and skips its installation then. Was introduced -## by 0.66. -perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; - s!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_FALSE\@),[^,]*,!\1,\#,!g' config.status -./config.status + --enable-milter --disable-static +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} @@ -420,7 +419,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files devel %defattr(-,root,root,-) %_includedir/* -%_libdir/*.*a %_libdir/*.so %pkgdatadir/template %pkgdatadir/clamd-gen @@ -511,6 +509,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + * Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 - updated to 0.90rc3 - splitted mandatory parts from the data-file into a separate -filesystem @@ -799,83 +804,3 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : * Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 - added security fix for http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 - -* Fri Nov 28 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.4 -- fixed typo in README (sysconf.d vs. sysconf) -- make build on rhl8 succeed by adding '|| :' to %%check - -* Tue Nov 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.3 -- substitute 'User' in sample cfg-file also -- uncommented some cfg-options which are needed for a proper operation -- fixed typos in README (thanks to Michael Schwendt) - -* Mon Nov 17 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.2 -- fixed path of 'LocalSocket' and documented steps how to create it -- added a missing backslash at the configure-call -- do not package clamav-milter.8 manpage -- documented 'User' in the README - -* Sat Nov 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.1 -- updated to 0.65 -- added gmp-devel buildrequires: -- changed installed databases from 'viruses.db*' to '*.cvb' -- made milter-build conditional; 0.65 is missing some files which would break the build else -- fixed typo (clamav-notify-server -> clamav-notify-servers) - -* Fri Oct 31 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.60-0.fdr.5 -- created -update subpackage and filled it with files from main and -data package -- set more reasonable default-values in the sample config-file -- made the README in -server more clear -- moved clamav-milter man-page into -milter subpackage -- use fedora-usermgmt -- renamed -daemon subpackage and related files to -server -- use abstract 'data(clamav)' notation for clamav-data dependencies -- use 'init(...)' requirements as placeholder for future -sysv/-minit subpackages - -* Sat Aug 16 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.4 -- backported clamav-sockwrite.c to C89 - -* Fri Aug 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- updated Source0 URL -- fixed portuguese i18n-abbreviation - -* Fri Jul 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- use LSB compliant exit-codes in the init-script -- other init-script cleanups - -* Tue Jul 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.2 -- updated %%description -- removed README from %%doc-list - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.1 -- disabled -milter subpackage; I do not get it to run :( - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.0.1 -- updated to 0.60 -- modernized usercreation -- added -milter subpackage - -* Thu May 8 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.2 -- added BUGS file -- moved clamd.8 man-page into daemon-subpackage -- some cosmetical cleanups -- removed config-patch; it was unused -- made some paths more fedora-compliant -- honor $RPM_OPT_FLAGS -- added clamav-notify-daemons script -- removed obsoleted %%socketdir - -* Wed May 7 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.0.1 -- splitted into additional -data/-daemon packages -- added clamav-sockwrite program -- updated to recent fedora policies - -* Thu Nov 21 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.54-1 -- updated to 0.54 -- updated config-patch - -* Tue Oct 29 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.52-1 -- updated to 0.52 - -* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- Initial build. commit 4ae894ed3f5bee1d9751813ca3d85d07e8678c4b Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 3 15:33:47 2007 +0000 - updated to 0.90rc3 diff --git a/sources b/sources index 5117994..6527451 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -34a9d58cf5bcb04dbe3eb32b5367a3f8 clamav-0.88.7.tar.gz -b19286b26aafe255c7e1e1d0fc4d3797 clamav-0.88.7.tar.gz.sig +5af2bdbbb255829dd590609d900c1854 clamav-0.90rc3.tar.gz +978715ae312d5dda63a0591b0a4eae14 clamav-0.90rc3.tar.gz.sig commit fead405bc3234e38069316b5c11507248c584727 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 3 15:16:08 2007 +0000 - updated to 0.90rc3 - splitted mandatory parts from the data-file into a separate -filesystem subpackage - added a -data-empty subpackage to allow a setup where database is updated per cron-job and user does not want to download the large -data package with outdated virus definitations (#214949) - %ghost'ed the files downloaded by freshclam diff --git a/clamav.spec b/clamav.spec index e564b35..4bd460e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,10 +1,12 @@ -## $Id: clamav.spec,v 1.44 2006/11/05 20:11:19 ensc Exp $ +## $Id: clamav.spec,v 1.45 2006/12/12 08:17:53 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora ## +%global rcver rc3 + %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log @@ -18,14 +20,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.7 -Release: %release_func 1 +Version: 0.90 +Release: %release_func 0.2.rc3 License: GPL Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -33,9 +35,6 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch0: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch -Patch1: clamav-0.88.1-strncpy.patch -Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch23: clamav-0.88.4-visibility.patch @@ -45,6 +44,17 @@ Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel BuildRequires: bc +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(clamav) +Provides: group(clamav) +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?FE_USERADD_REQ} + %package lib Summary: Dynamic libraries for the Clam Antivirus scanner Group: System Environment/Libraries @@ -54,17 +64,25 @@ Requires: data(clamav) Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %version-%release +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -Provides: data(clamav) -Provides: user(clamav) -Provides: group(clamav) -BuildRequires: fedora-usermgmt-devel -%{?FE_USERADD_REQ} +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -72,7 +90,7 @@ Group: Applications/File Source200: freshclam-sleep Source201: freshclam.sysconfig Source202: clamav-update.cron -Requires: clamav-data = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod @@ -83,7 +101,8 @@ Summary: Clam Antivirus scanner server Group: System Environment/Daemons Requires: init(clamav-server) Requires: data(clamav) -Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release %package server-sysv Summary: SysV initscripts for clamav server @@ -129,6 +148,9 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. %description lib This package contains dynamic libraries shared between applications @@ -141,7 +163,29 @@ build applications using clamav. %description data This package contains the virus-database needed by clamav. This database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + %description update This package contains programs which can be used to update the clamav @@ -179,11 +223,8 @@ The SysV initscripts for clamav-milter. ## ------------------------------------------------------------ %prep -%setup -q -%patch0 -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch' -%patch1 -p1 -b .strncpy +%setup -q -n %name-%version%{?rcver} -%patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff %patch23 -p1 -b .visibility @@ -240,11 +281,16 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%_initrddir + ${RPM_BUILD_ROOT}%_initrddir \ + ${RPM_BUILD_ROOT}%homedir/daily.inc rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la +for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do + touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i +done + ## prepare the server-files mkdir _doc_server @@ -290,10 +336,7 @@ subst etc/clamd.conf /etc/clamd.d/milter.conf \ cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter -## The '-blo' options might be usefully here -- especially for testing; see -## "man 8 clamav-milter" for further options -CLAMAV_FLAGS='--max-children=2 -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' -CLAMAV_USER='%milteruser' +CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' EOF install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter @@ -307,11 +350,16 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ -%pre data +%pre filesystem %__fe_groupadd 4 -r %username &>/dev/null || : %__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ -c 'Clamav database update user' -g %username %username &>/dev/null || : +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + %post update test -e %freshclamlog || { touch %freshclamlog @@ -319,10 +367,6 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%postun data -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - %pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ @@ -378,7 +422,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %_includedir/* %_libdir/*.*a %_libdir/*.so -%dir %pkgdatadir %pkgdatadir/template %pkgdatadir/clamd-gen %_libdir/pkgconfig/* @@ -386,14 +429,25 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : ## ----------------------- +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,%username,%username) %dir %homedir/daily.inc +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + %files data %defattr(-,%username,%username,-) -%dir %homedir # use %%config to keep files which were updated by 'freshclam' # already. Without this tag, they would be overridden with older # versions whenever a new -data package is installed. %config %verify(not size md5 mtime) %homedir/*.cvd + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/main.cvd + ## ----------------------- %files update @@ -408,6 +462,16 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd + + ## ----------------------- %files server @@ -415,7 +479,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc _doc_server/* %_mandir/man[58]/clamd* %_sbindir/* -%dir %pkgdatadir %pkgdatadir/clamd-wrapper %dir %_sysconfdir/clamd.d @@ -448,6 +511,15 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam + * Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 - updated to 0.88.7 commit 552980be36d784c5ff10bc150171b46564399ac9 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 3 15:15:39 2007 +0000 updated to 0.90rc3; these patches don't apply anymore diff --git a/clamav-0.70-user.patch b/clamav-0.70-user.patch deleted file mode 100644 index f7f42b1..0000000 --- a/clamav-0.70-user.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.user 2000-02-19 07:04:00.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 14:35:01.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # - # clamav-milter This script starts and stops the clamav-milter daemon - # -@@ -16,6 +16,7 @@ - - # Local clamav-milter config - CLAMAV_FLAGS= -+CLAMAV_USER= - test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter - - # Check that networking is up. -@@ -28,7 +29,7 @@ - - start() { - echo -n "Starting clamav-milter: " -- daemon clamav-milter ${CLAMAV_FLAGS} -+ daemon ${CLAMAV_USER:+--user $CLAMAV_USER} setsid /usr/sbin/clamav-milter ${CLAMAV_FLAGS} </dev/null - RETVAL=$? - echo - test $RETVAL -eq 0 && touch /var/lock/subsys/clamav-milter diff --git a/clamav-0.88.1-strncpy.patch b/clamav-0.88.1-strncpy.patch deleted file mode 100644 index ceceb7d..0000000 --- a/clamav-0.88.1-strncpy.patch +++ /dev/null @@ -1,26 +0,0 @@ -2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { diff --git a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch deleted file mode 100644 index 38f9d9d..0000000 --- a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- clamav-0.88.2/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-29 19:46:09.000000000 +0200 -+++ clamav-0.88.2/libclamav/pe.c 2006-04-30 11:25:53.000000000 +0200 -@@ -1555,7 +1555,7 @@ int cli_peheader(int desc, struct cli_pe - { - uint16_t e_magic; /* DOS signature ("MZ") */ - uint32_t e_lfanew; /* address of new exe header */ -- uint32_t min, max; -+ uint32_t min=0, max=0; - struct pe_image_file_hdr file_hdr; - struct pe_image_optional_hdr optional_hdr; - struct pe_image_section_hdr *section_hdr; ---- clamav-0.88.2/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 -+++ clamav-0.88.2/libclamav/htmlnorm.c 2006-04-30 11:25:53.000000000 +0200 -@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ - { - int fd_tmp, tag_length, tag_arg_length, binary; - int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; -- FILE *stream_in; -+ FILE *stream_in = 0; - html_state state=HTML_NORM, next_state=HTML_BAD_STATE; - char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; - char tag_val[HTML_STR_LENGTH+1], *tmp_file; commit 714bcbb9b4238e9c0480c92646505184d493d281 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Dec 12 08:17:53 2006 +0000 updated to 0.88.7 diff --git a/clamav.spec b/clamav.spec index f893c9a..e564b35 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.43 2006/10/18 07:22:18 ensc Exp $ +## $Id: clamav.spec,v 1.44 2006/11/05 20:11:19 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.6 +Version: 0.88.7 Release: %release_func 1 License: GPL @@ -448,6 +448,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + * Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 - updated to 0.88.6 diff --git a/sources b/sources index e74691d..5117994 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz -38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig +34a9d58cf5bcb04dbe3eb32b5367a3f8 clamav-0.88.7.tar.gz +b19286b26aafe255c7e1e1d0fc4d3797 clamav-0.88.7.tar.gz.sig commit 095844cfcac1d7bd6a1f31f96cd5d3bfa5b1b923 Author: Dennis Gilmore <ausil(a)fedoraproject.org> Date: Thu Nov 30 17:23:00 2006 +0000 Initialize branch EL-5 for clamav diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 commit a8e23fb58bf80a8697ad5e2bc49bcff217004cc0 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Nov 5 20:11:19 2006 +0000 updated to 0.88.6 diff --git a/clamav.spec b/clamav.spec index a3fba4e..f893c9a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.42 2006/10/04 22:32:25 c4chris Exp $ +## $Id: clamav.spec,v 1.43 2006/10/18 07:22:18 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.5 -Release: %release_func 1 +Version: 0.88.6 +Release: %release_func 1 License: GPL Group: Applications/File @@ -448,6 +448,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 +- updated to 0.88.6 + * Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 - added patch to set '__attribute__ ((visibility("hidden")))' for diff --git a/sources b/sources index fc5c4da..e74691d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d62376205647b208eba4191dde821830 clamav-0.88.5.tar.gz -5daea1b5d8ab49257dea3ccc5dacaf35 clamav-0.88.5.tar.gz.sig +db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz +38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig commit 953d4e4dc1de1f092691cace8019737596ad8113 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Oct 18 07:22:18 2006 +0000 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 - added patch to set '__attribute__ ((visibility("hidden")))' for exported MD5_*() functions (fixes #202043) diff --git a/clamav-0.88.4-visibility.patch b/clamav-0.88.4-visibility.patch new file mode 100644 index 0000000..34ef51e --- /dev/null +++ b/clamav-0.88.4-visibility.patch @@ -0,0 +1,29 @@ +--- clamav-0.88.4/libclamav/md5.c.visibility 2005-06-23 22:03:12.000000000 +0200 ++++ clamav-0.88.4/libclamav/md5.c 2006-08-11 08:19:02.000000000 +0200 +@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da + return ptr; + } + +-void MD5_Init(MD5_CTX *ctx) ++void __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx) + { + ctx->a = 0x67452301; + ctx->b = 0xefcdab89; +@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx) + ctx->hi = 0; + } + +-void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) ++void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) + { + MD5_u32plus saved_lo; + unsigned long used, free; +@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data + memcpy(ctx->buffer, data, size); + } + +-void MD5_Final(unsigned char *result, MD5_CTX *ctx) ++void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx) + { + unsigned long used, free; + diff --git a/clamav.spec b/clamav.spec index b6bb6f4..a3fba4e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.41 2006/09/21 18:27:43 ensc Exp $ +## $Id: clamav.spec,v 1.42 2006/10/04 22:32:25 c4chris Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.4 -Release: %release_func 4 +Version: 0.88.5 +Release: %release_func 1 License: GPL Group: Applications/File @@ -38,6 +38,7 @@ Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch +Patch23: clamav-0.88.4-visibility.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -185,6 +186,7 @@ The SysV initscripts for clamav-milter. %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff +%patch23 -p1 -b .visibility perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -446,6 +448,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 +- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 +- added patch to set '__attribute__ ((visibility("hidden")))' for + exported MD5_*() functions (fixes #202043) + * Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 diff --git a/sources b/sources index bca4b2c..fc5c4da 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7759784aa4506b314e6543e0f2a8587b clamav-0.88.4.tar.gz -450d59c0a663b5986cda1105b85ae673 clamav-0.88.4.tar.gz.sig +d62376205647b208eba4191dde821830 clamav-0.88.5.tar.gz +5daea1b5d8ab49257dea3ccc5dacaf35 clamav-0.88.5.tar.gz.sig commit d5918e831444dc5f65de614c9d6f2eb4b5f265c3 Author: Christian Iseli <c4chris(a)fedoraproject.org> Date: Wed Oct 4 22:32:25 2006 +0000 automated bump and rebuild diff --git a/clamav.spec b/clamav.spec index ea23148..b6bb6f4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.40 2006/09/15 06:21:38 ensc Exp $ +## $Id: clamav.spec,v 1.41 2006/09/21 18:27:43 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.4 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -446,6 +446,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + * Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 - splitted SysV initscripts of -milter and -server into own subpackages commit f1f8b458cd18df3134a3d6707ca818735440e83f Author: ensc <ensc(a)fedoraproject.org> Date: Thu Sep 21 18:27:43 2006 +0000 splitted SysV initscripts of -milter and -server into own subpackages diff --git a/clamav.spec b/clamav.spec index 90f84fb..ea23148 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.39 2006/08/09 06:48:12 ensc Exp $ +## $Id: clamav.spec,v 1.40 2006/09/15 06:21:38 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.4 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -80,33 +80,41 @@ Requires(post): group(clamav) %package server Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Provides: clamav-daemon = %version-%release -Obsoletes: clamav-daemon < %version-%release -Conflicts: clamav-daemon > %version-%release -## For now, use this as a placeholder. Later, generate separate -sysv -## and -minit subpackages Requires: init(clamav-server) -Provides: init(clamav-server) = sysv Requires: data(clamav) Requires: clamav-lib = %version-%release + +%package server-sysv +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir %package milter Summary: Sendmail-milter for the Clam Antivirus scanner Group: System Environment/Daemons -## For now, use this as a placeholder. Later, generate separate -sysv -## and -minit subpackages Requires: init(clamav-milter) -Provides: init(clamav-milter) = sysv BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel -Requires: sendmail +Provides: user(%milteruser) +Provides: group(%milteruser) +Requires: sendmail +Requires(post): coreutils +%{?FE_USERADD_REQ} + +%package milter-sysv +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = sysv +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts -Requires(post): chkconfig coreutils +Requires(post): chkconfig Requires(preun): chkconfig initscripts -%{?FE_USERADD_REQ} %description @@ -150,6 +158,11 @@ of this daemon should be started for each service requiring it. See the README file how this can be done with a minimum of effort. + +%description server-sysv +SysV initscripts template for the clamav server + + %description milter This package contains files which are needed to run the clamav-milter. It can be activated by adding @@ -158,7 +171,9 @@ can be activated by adding to your sendmail.mc. -THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! +%description milter-sysv +The SysV initscripts for clamav-milter. + ## ------------------------------------------------------------ @@ -312,20 +327,25 @@ test -e %freshclamlog || { -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : %post milter -/sbin/chkconfig --add clamav-milter test -e %milterlog || { touch %milterlog chmod 0620 %milterlog chown root:%milteruser %milterlog } -%preun milter -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter - %postun milter %__fe_userdel %milteruser &>/dev/null || : %__fe_groupdel %milteruser &>/dev/null || : + + +%post milter-sysv +/sbin/chkconfig --add clamav-milter + +%preun milter-sysv +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter + +%postun milter-sysv test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : @@ -393,15 +413,19 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc _doc_server/* %_mandir/man[58]/clamd* %_sbindir/* -%_initrddir/clamd-wrapper %dir %pkgdatadir -%dir %_sysconfdir/clamd.d %pkgdatadir/clamd-wrapper - +%dir %_sysconfdir/clamd.d %exclude %_sbindir/*milter* %exclude %_mandir/man8/clamav-milter* + +%files server-sysv +%defattr(-,root,root,-) +%_initrddir/clamd-wrapper + + ## ----------------------- %files milter @@ -409,14 +433,22 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* -%config %_initrddir/clamav-milter %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter %attr(0700,%milteruser,%milteruser) %dir %milterstatedir %ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog + +%files milter-sysv +%defattr(-,root,root,-) +%config %_initrddir/clamav-milter +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter + + %changelog +* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 +- splitted SysV initscripts of -milter and -server into own subpackages + * Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 - rebuilt diff --git a/clamd-gen b/clamd-gen index 134e149..46739ba 100755 --- a/clamd-gen +++ b/clamd-gen @@ -77,6 +77,7 @@ Group: System Environment/Daemons Provides: init(%name) = sysv Conflicts: init(%name) < sysv Conflicts: init(%name) > sysv +Requires: clamav-server-sysv Requires(post): %name = %epoch:%version-%release Requires(post): diffutils mktemp %__chkconfig Requires(preun): %__chkconfig commit 3ae7322b01e875dcba5e77103c6a08f75f656f0f Author: ensc <ensc(a)fedoraproject.org> Date: Fri Sep 15 06:21:38 2006 +0000 rebuilt diff --git a/clamav.spec b/clamav.spec index 8f1221e..90f84fb 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.38 2006/08/09 06:30:01 ensc Exp $ +## $Id: clamav.spec,v 1.39 2006/08/09 06:48:12 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.4 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -417,6 +417,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog %changelog +* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 +- rebuilt + * Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 - updated to 0.88.4 (SECURITY) diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild commit f18c7ca19f194bce8d74b533c4bebcc7f7e724e5 Author: Ville Skyttä <scop(a)fedoraproject.org> Date: Sun Aug 27 20:18:44 2006 +0000 http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild commit 3446373d245d02b9a486e901a86cc89da43aa8f3 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Aug 9 06:49:22 2006 +0000 cleanup; removed old sources diff --git a/sources b/sources index 1fe5f15..bca4b2c 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ -330206089713e73a44afc7a4d6450225 clamav-0.88.3.tar.gz -dc0e3b56253c7974ef9f3e9011017e0c clamav-0.88.3.tar.gz.sig 7759784aa4506b314e6543e0f2a8587b clamav-0.88.4.tar.gz 450d59c0a663b5986cda1105b85ae673 clamav-0.88.4.tar.gz.sig commit 72cd79d86160b8cc3d648f0cb11f35afdef67caa Author: ensc <ensc(a)fedoraproject.org> Date: Wed Aug 9 06:48:12 2006 +0000 removed a superfluous %doc diff --git a/clamav.spec b/clamav.spec index b6adf26..8f1221e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.37 2006/07/08 15:57:54 ensc Exp $ +## $Id: clamav.spec,v 1.38 2006/08/09 06:30:01 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -391,7 +391,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc %_mandir/man[58]/clamd* +%_mandir/man[58]/clamd* %_sbindir/* %_initrddir/clamd-wrapper %dir %pkgdatadir commit 87b2de41e228d562296b18dcc46539d5b010adf1 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Aug 9 06:30:01 2006 +0000 - updated to 0.88.4 (SECURITY) - removed the clamdscan(1) manpage from the -server subpackage diff --git a/clamav.spec b/clamav.spec index ccf532b..b6adf26 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.36 2006/07/08 13:17:12 ensc Exp $ +## $Id: clamav.spec,v 1.37 2006/07/08 15:57:54 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.3 +Version: 0.88.4 Release: %release_func 1 License: GPL @@ -337,8 +337,8 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO %doc docs/*.pdf -%doc %_mandir/man[15]/* %_bindir/* +%_mandir/man[15]/* %exclude %_bindir/clamav-config %exclude %_bindir/freshclam %exclude %_mandir/*/freshclam* @@ -391,7 +391,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc %_mandir/*/clamd* +%doc %_mandir/man[58]/clamd* %_sbindir/* %_initrddir/clamd-wrapper %dir %pkgdatadir @@ -417,6 +417,12 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog %changelog +* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 +- updated to 0.88.4 (SECURITY) + +* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed the clamdscan(1) manpage from the -server subpackage + * Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - removed a superfluous '}' - removed some code which was relevant for FC-3 only diff --git a/sources b/sources index 4710962..1fe5f15 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ 330206089713e73a44afc7a4d6450225 clamav-0.88.3.tar.gz dc0e3b56253c7974ef9f3e9011017e0c clamav-0.88.3.tar.gz.sig +7759784aa4506b314e6543e0f2a8587b clamav-0.88.4.tar.gz +450d59c0a663b5986cda1105b85ae673 clamav-0.88.4.tar.gz.sig commit bf7d59e040c87f39767e4ed2e87467659399ebeb Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jul 8 15:57:54 2006 +0000 - removed a superfluous '}' - removed some code which was relevant for FC-3 only diff --git a/clamav.spec b/clamav.spec index 9047da9..ccf532b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.35 2006/04/30 10:07:15 ensc Exp $ +## $Id: clamav.spec,v 1.36 2006/07/08 13:17:12 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -82,7 +82,7 @@ Summary: Clam Antivirus scanner server Group: System Environment/Daemons Provides: clamav-daemon = %version-%release Obsoletes: clamav-daemon < %version-%release -Conflicts: clamav-daemon > %version-%release} +Conflicts: clamav-daemon > %version-%release ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) @@ -184,16 +184,8 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ %build -## '--disable-zlib-vcheck' is used because every FC<=3 ships zlib-1.2.1* -## but clamav checks for zlib >= 1.2.2. This option can be removed for -## FC4 builds. -## -## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and -## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 -## also -CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --disable-zlib-vcheck \ --enable-milter ## HACK: ./configure checks if freshclam.conf/clamd.conf are existing @@ -425,6 +417,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog %changelog +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed a superfluous '}' +- removed some code which was relevant for FC-3 only + * Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 - updated to 0.88.3 - updated to new fedora-usermgmt macros commit 6ff0a52518d97ffc37166b594e41c187a9477246 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jul 8 13:17:12 2006 +0000 - updated to 0.88.3 - updated to new fedora-usermgmt macros - cleanups: removed unneeded curlies, use plain command instead of %%__XXX macro, whitespace cleanup, removed unneeded versioned dependencies - added a 'Requires(post): group(clamav)' dependencies for -update and added the corresponding Provides: to -data - removed the %%_without_milter conditional; you won't gain anything when milter would be disabled at buildtime diff --git a/clamav.spec b/clamav.spec index 8cfc0cd..9047da9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,10 +1,7 @@ -## $Id: clamav.spec,v 1.34 2006/04/24 22:05:44 ensc Exp $ - -## This package understands the following switches: -## --without milter ... deactivate the -milter subpackage - +## $Id: clamav.spec,v 1.35 2006/04/30 10:07:15 ensc Exp $ ## Fedora Extras specific customization below... +%bcond_without fedora ## @@ -21,14 +18,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.2 +Version: 0.88.3 Release: %release_func 1 License: GPL Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -41,8 +38,8 @@ Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: clamav-lib = %{version}-%{release} +BuildRoot: %_tmppath/%name-%version-%release-root +Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel BuildRequires: bc @@ -56,15 +53,17 @@ Requires: data(clamav) Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %{version}-%{release} +Requires: clamav-lib = %version-%release Requires(pre): %_libdir/pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File Provides: data(clamav) -Requires(pre): fedora-usermgmt >= 0.7 -Requires(postun): fedora-usermgmt >= 0.7 +Provides: user(clamav) +Provides: group(clamav) +BuildRequires: fedora-usermgmt-devel +%{?FE_USERADD_REQ} %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -72,23 +71,24 @@ Group: Applications/File Source200: freshclam-sleep Source201: freshclam.sysconfig Source202: clamav-update.cron -Requires: clamav-data = %{version}-%{release} +Requires: clamav-data = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod +Requires(post): group(clamav) %package server Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Provides: clamav-daemon = %{version}-%{release} -Obsoletes: clamav-daemon < %{version}-%{release} -Conflicts: clamav-daemon > %{version}-%{release} +Provides: clamav-daemon = %version-%release +Obsoletes: clamav-daemon < %version-%release +Conflicts: clamav-daemon > %version-%release} ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) Provides: init(clamav-server) = sysv Requires: data(clamav) -Requires: clamav-lib = %{version}-%{release} +Requires: clamav-lib = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir @@ -99,14 +99,14 @@ Group: System Environment/Daemons ## and -minit subpackages Requires: init(clamav-milter) Provides: init(clamav-milter) = sysv -%{!?_without_milter:BuildRequires: sendmail-devel} +BuildRequires: sendmail-devel +BuildRequires: fedora-usermgmt-devel Requires: sendmail Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig coreutils Requires(preun): chkconfig initscripts -Requires(pre): fedora-usermgmt >= 0.7 -Requires(postun): fedora-usermgmt >= 0.7 +%{?FE_USERADD_REQ} %description @@ -194,7 +194,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --disable-zlib-vcheck \ - %{!?_without_milter:--enable-milter} + --enable-milter ## HACK: ./configure checks if freshclam.conf/clamd.conf are existing ## in current filesystem and skips its installation then. Was introduced @@ -203,14 +203,14 @@ perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; s!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_FALSE\@),[^,]*,!\1,\#,!g' config.status ./config.status -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} ## ------------------------------------------------------------ %install rm -rf "$RPM_BUILD_ROOT" _doc* -%{__make} DESTDIR="$RPM_BUILD_ROOT" install +make DESTDIR="$RPM_BUILD_ROOT" install function smartsubst() { local tmp @@ -226,43 +226,41 @@ function smartsubst() { } -%{__install} -d -m755 \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ - ${RPM_BUILD_ROOT}%{_var}/log \ +install -d -m755 \ + ${RPM_BUILD_ROOT}%_sysconfdir/{clamd.d,cron.d,logrotate.d,sysconfig} \ + ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%{_initrddir} - -rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/clamd.conf \ - ${RPM_BUILD_ROOT}%{_libdir}/*.la + ${RPM_BUILD_ROOT}%_initrddir -%{?_without_milter:rm -f $RPM_BUILD_ROOT%_mandir/*/*milter*} +rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ + ${RPM_BUILD_ROOT}%_libdir/*.la ## prepare the server-files mkdir _doc_server -%{__install} -m644 -p %{SOURCE2} _doc_server/clamd.sysconfig -%{__install} -m644 -p %{SOURCE3} _doc_server/clamd.logrotate -%{__install} -m755 -p %{SOURCE7} _doc_server/clamd.init -%{__install} -m644 -p %{SOURCE5} _doc_server/README -%__install -m644 -p etc/clamd.conf _doc_server/clamd.conf +install -m644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -m644 -p %SOURCE3 _doc_server/clamd.logrotate +install -m755 -p %SOURCE7 _doc_server/clamd.init +install -m644 -p %SOURCE5 _doc_server/README +install -m644 -p etc/clamd.conf _doc_server/clamd.conf -%__install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir -%__install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper +install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir +install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper ## prepare the update-files -%{__install} -m644 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/clamav-update -%{__install} -m755 -p %{SOURCE8} ${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers -touch ${RPM_BUILD_ROOT}%{freshclamlog} +install -m644 -p %SOURCE6 ${RPM_BUILD_ROOT}%_sysconfdir/logrotate.d/clamav-update +install -m755 -p %SOURCE8 ${RPM_BUILD_ROOT}%_sbindir/clamav-notify-servers +touch ${RPM_BUILD_ROOT}%freshclamlog -%__install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -%__install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -%__install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update +install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update smartsubst 's!webmaster,clamav!webmaster,%username!g; s!/usr/share/clamav!%pkgdatadir!g; @@ -272,9 +270,7 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -%if 0%{!?_without_milter:1} #### The milter stuff - function subst() { sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } @@ -291,9 +287,8 @@ CLAMAV_FLAGS='--max-children=2 -c /etc/clamd.d/milter.conf local:%milterstatedir CLAMAV_USER='%milteruser' EOF -%__install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog -%endif # _without_milter ## ------------------------------------------------------------ @@ -304,25 +299,25 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ %pre data -/usr/sbin/fedora-groupadd 4 -r %{username} &>/dev/null || : -/usr/sbin/fedora-useradd 4 -r -s /sbin/nologin -d %{homedir} -M \ - -c 'Clamav database update user' -g %{username} %{username} &>/dev/null || : +%__fe_groupadd 4 -r %username &>/dev/null || : +%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ + -c 'Clamav database update user' -g %username %username &>/dev/null || : %post update -test -e %{freshclamlog} || { - touch %{freshclamlog} - %{__chmod} 0664 %{freshclamlog} - %{__chown} root:%{username} %{freshclamlog} +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%username %freshclamlog } %postun data -test "$1" != 0 || /usr/sbin/fedora-userdel %{username} &>/dev/null || : -test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : %pre milter -/usr/sbin/fedora-groupadd 5 -r %milteruser &>/dev/null || : -/usr/sbin/fedora-useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : +%__fe_groupadd 5 -r %milteruser &>/dev/null || : +%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ + -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : %post milter /sbin/chkconfig --add clamav-milter @@ -333,13 +328,13 @@ test -e %milterlog || { } %preun milter -test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : test "$1" != 0 || /sbin/chkconfig --del clamav-milter %postun milter -test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : -test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : -test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : +%__fe_userdel %milteruser &>/dev/null || : +%__fe_groupdel %milteruser &>/dev/null || : +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %post lib -p /sbin/ldconfig @@ -350,8 +345,8 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO %doc docs/*.pdf -%doc %{_mandir}/man[15]/* -%{_bindir}/* +%doc %_mandir/man[15]/* +%_bindir/* %exclude %_bindir/clamav-config %exclude %_bindir/freshclam %exclude %_mandir/*/freshclam* @@ -360,15 +355,15 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files lib %defattr(-,root,root,-) -%{_libdir}/*.so.* +%_libdir/*.so.* ## ----------------------- %files devel %defattr(-,root,root,-) -%{_includedir}/* -%{_libdir}/*.*a -%{_libdir}/*.so +%_includedir/* +%_libdir/*.*a +%_libdir/*.so %dir %pkgdatadir %pkgdatadir/template %pkgdatadir/clamd-gen @@ -378,12 +373,12 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : ## ----------------------- %files data -%defattr(-,%{username},%{username},-) -%dir %{homedir} +%defattr(-,%username,%username,-) +%dir %homedir # use %%config to keep files which were updated by 'freshclam' # already. Without this tag, they would be overridden with older # versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %{homedir}/*.cvd +%config %verify(not size md5 mtime) %homedir/*.cvd ## ----------------------- @@ -397,7 +392,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %config(noreplace) %_sysconfdir/cron.d/* %config(noreplace) %_sysconfdir/sysconfig/freshclam -%ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog} +%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog ## ----------------------- @@ -405,14 +400,13 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc _doc_server/* %doc %_mandir/*/clamd* -%{_sbindir}/* +%_sbindir/* %_initrddir/clamd-wrapper %dir %pkgdatadir -%dir %{_sysconfdir}/clamd.d +%dir %_sysconfdir/clamd.d %pkgdatadir/clamd-wrapper -%if 0%{!?_without_milter:1} %exclude %_sbindir/*milter* %exclude %_mandir/man8/clamav-milter* @@ -423,15 +417,27 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* -%config %{_initrddir}/clamav-milter -%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/milter.conf -%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamav-milter +%config %_initrddir/clamav-milter +%config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter %attr(0700,%milteruser,%milteruser) %dir %milterstatedir %ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%endif # _without_milter %changelog +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 +- updated to 0.88.3 +- updated to new fedora-usermgmt macros + +* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 +- cleanups: removed unneeded curlies, use plain command instead of + %%__XXX macro, whitespace cleanup, removed unneeded versioned + dependencies +- added a 'Requires(post): group(clamav)' dependencies for -update and + added the corresponding Provides: to -data +- removed the %%_without_milter conditional; you won't gain anything + when milter would be disabled at buildtime + * Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 - updated to 0.88.2 (SECURITY) - rediffed patches; most issues handled by 0.88.1-2 are fixed in diff --git a/sources b/sources index 1cdc576..4710962 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f0a1c610a1fb70bd748a08bea69c736c clamav-0.88.2.tar.gz -6846cb50e005c18ab4b39ff9aa7126fc clamav-0.88.2.tar.gz.sig +330206089713e73a44afc7a4d6450225 clamav-0.88.3.tar.gz +dc0e3b56253c7974ef9f3e9011017e0c clamav-0.88.3.tar.gz.sig commit de4634e5814c6fcb4136e155c81e9fcf60c6d687 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Apr 30 10:07:15 2006 +0000 - updated to 0.88.2 (SECURITY) - rediffed patches; most issues handled by 0.88.1-2 are fixed in 0.88.2 diff --git a/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch deleted file mode 100644 index 9bc9723..0000000 --- a/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +++ /dev/null @@ -1,157 +0,0 @@ -2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - - * Guys, please read the compiler warnings before releasing a - new version. The compiler is clever enough to warn you about - issues like - - | encrypted = (zdirent.d_flags & 0x2041 != 0); - - with - - | scanners.c:381: warning: suggest parentheses around comparison in operand of & - - - Ditto about the usage of implicitly declared functions. - - Warnings about uninitialized variables shall be taken - seriously too; this patch fixes one existing issue. The - htmlnorm.c parser should be reviewed. - - - * this patch does not fix: - - - things like - | ole2_extract.c:86: warning: 'packed' attribute ignored for field of type 'unsigned char[7u]' - - which are caused by - - struct foo { - char a[2] __attribute__((__packed__)); - char b __attribute__((__packed__)); - }; - - which can/should be written as - - struct foo { - char a[2]; - char b; - } __attribute__((__packed__)); - - - signed/unsigned comparisions. This was really too much to - get fixed now. It will require rewrite/review of the - complete code to use 'size_t' instead of 'int' for sizes. - - Lot of bufferover- and underflows can be prevented by - correct signess. - - - missing prototypes like - - | warning: no previous prototype for - - - 'clamav' is used to operate on hostile data so its source - code should have a good quality. Building with a high warning - level and removing reasons for such warnings is a cheap way - to eliminate a huge part of potential problems. - - - ---- clamav-0.88.1/clamd/others.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-10-30 21:22:01.000000000 +0100 -+++ clamav-0.88.1/clamd/others.c 2006-04-24 22:53:27.000000000 +0200 -@@ -30,6 +30,7 @@ - #include <sys/stat.h> - #include <errno.h> - #include <sys/time.h> -+#include <sys/wait.h> - - #if HAVE_SYS_PARAM_H - #include <sys/param.h> -@@ -68,6 +69,7 @@ - #include "memory.h" - #include "cfgparser.h" - #include "session.h" -+#include "../shared/output.h" - - #define ENV_FILE "CLAM_VIRUSEVENT_FILENAME" - #define ENV_VIRUS "CLAM_VIRUSEVENT_VIRUSNAME" ---- clamav-0.88.1/shared/misc.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-12-23 22:25:10.000000000 +0100 -+++ clamav-0.88.1/shared/misc.c 2006-04-24 22:53:27.000000000 +0200 -@@ -28,6 +28,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <ctype.h> - - #include "clamav.h" - #include "cfgparser.h" ---- clamav-0.88.1/freshclam/manager.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-25 18:39:25.000000000 +0100 -+++ clamav-0.88.1/freshclam/manager.c 2006-04-24 22:53:27.000000000 +0200 -@@ -50,6 +50,7 @@ - #include "../libclamav/others.h" - #include "../libclamav/str.h" /* cli_strtok */ - #include "dns.h" -+#include "execute.h" - - - int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, const char *hostname) ---- clamav-0.88.1/libclamav/zziplib/zzip-zip.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 01:43:53.000000000 +0200 -+++ clamav-0.88.1/libclamav/zziplib/zzip-zip.c 2006-04-24 22:57:44.000000000 +0200 -@@ -16,6 +16,7 @@ - #endif - - #include "target.h" -+#include "others.h" - - #include <zzip.h> /* archive handling */ - #include <zzip-file.h> ---- clamav-0.88.1/libclamav/scanners.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-04 11:32:55.000000000 +0200 -+++ clamav-0.88.1/libclamav/scanners.c 2006-04-24 22:53:27.000000000 +0200 -@@ -69,6 +69,7 @@ extern int cli_mbox(const char *dir, int - #include "untar.h" - #include "special.h" - #include "binhex.h" -+#include "../tnef.h" - - #ifdef HAVE_ZLIB_H - #include <zlib.h> -@@ -378,7 +379,7 @@ static int cli_scanzip(int desc, const c - * Bit 6: Strong encryption was used - * Bit 13: Encrypted central directory - */ -- encrypted = (zdirent.d_flags & 0x2041 != 0); -+ encrypted = (zdirent.d_flags & 0x2041) != 0; - - cli_dbgmsg("Zip: %s, crc32: 0x%x, offset: %d, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", zdirent.d_name, zdirent.d_crc32, zdirent.d_off, encrypted, zdirent.d_csize, zdirent.st_size, zdirent.d_compr, zdirent.d_csize ? (zdirent.st_size / zdirent.d_csize) : 0, limits ? limits->maxratio : 0); - ---- clamav-0.88.1/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 21:22:02.000000000 +0200 -+++ clamav-0.88.1/libclamav/pe.c 2006-04-24 22:53:27.000000000 +0200 -@@ -1451,7 +1451,7 @@ int cli_peheader(int desc, struct cli_pe - { - uint16_t e_magic; /* DOS signature ("MZ") */ - uint32_t e_lfanew; /* address of new exe header */ -- uint32_t min, max; -+ uint32_t min=0, max=0; - struct pe_image_file_hdr file_hdr; - struct pe_image_optional_hdr optional_hdr; - struct pe_image_section_hdr *section_hdr; ---- clamav-0.88.1/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 -+++ clamav-0.88.1/libclamav/htmlnorm.c 2006-04-24 22:53:27.000000000 +0200 -@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ - { - int fd_tmp, tag_length, tag_arg_length, binary; - int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; -- FILE *stream_in; -+ FILE *stream_in = 0; - html_state state=HTML_NORM, next_state=HTML_BAD_STATE; - char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; - char tag_val[HTML_STR_LENGTH+1], *tmp_file; ---- clamav-0.88.1/libclamav/special.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-06-23 22:03:13.000000000 +0200 -+++ clamav-0.88.1/libclamav/special.c 2006-04-24 22:53:27.000000000 +0200 -@@ -25,6 +25,7 @@ - #include <netinet/in.h> - #include <string.h> - -+#include "special.h" - #include "clamav.h" - #include "others.h" - #include "cltypes.h" diff --git a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch new file mode 100644 index 0000000..38f9d9d --- /dev/null +++ b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch @@ -0,0 +1,22 @@ +--- clamav-0.88.2/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-29 19:46:09.000000000 +0200 ++++ clamav-0.88.2/libclamav/pe.c 2006-04-30 11:25:53.000000000 +0200 +@@ -1555,7 +1555,7 @@ int cli_peheader(int desc, struct cli_pe + { + uint16_t e_magic; /* DOS signature ("MZ") */ + uint32_t e_lfanew; /* address of new exe header */ +- uint32_t min, max; ++ uint32_t min=0, max=0; + struct pe_image_file_hdr file_hdr; + struct pe_image_optional_hdr optional_hdr; + struct pe_image_section_hdr *section_hdr; +--- clamav-0.88.2/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 ++++ clamav-0.88.2/libclamav/htmlnorm.c 2006-04-30 11:25:53.000000000 +0200 +@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ + { + int fd_tmp, tag_length, tag_arg_length, binary; + int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; +- FILE *stream_in; ++ FILE *stream_in = 0; + html_state state=HTML_NORM, next_state=HTML_BAD_STATE; + char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; + char tag_val[HTML_STR_LENGTH+1], *tmp_file; diff --git a/clamav.spec b/clamav.spec index d1894a2..8cfc0cd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.33 2006/04/06 16:50:58 ensc Exp $ +## $Id: clamav.spec,v 1.34 2006/04/24 22:05:44 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.1 -Release: %release_func 2 +Version: 0.88.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -36,7 +36,7 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch0: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +Patch0: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch @@ -432,6 +432,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 +- updated to 0.88.2 (SECURITY) +- rediffed patches; most issues handled by 0.88.1-2 are fixed in + 0.88.2 + * Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 - added patch which fixes some classes of compiler warnings; at least the using of implicitly declared functions was reported to cause diff --git a/sources b/sources index 2b31a40..1cdc576 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9fe8c47037051e350077513dd94fb76a clamav-0.88.1.tar.gz -bc06324bf070679854689235df5042d8 clamav-0.88.1.tar.gz.sig +f0a1c610a1fb70bd748a08bea69c736c clamav-0.88.2.tar.gz +6846cb50e005c18ab4b39ff9aa7126fc clamav-0.88.2.tar.gz.sig commit e1f2fc085e8bfcdc36448341173f31e6a4ec4ef5 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 24 22:05:45 2006 +0000 - added patch which fixes some classes of compiler warnings; at least the using of implicitly declared functions was reported to cause segfaults on AMD64 (brought to my attention by Marc Perkel) - added patch which fixes wrong usage of strncpy(3) in unrarlib.c diff --git a/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch new file mode 100644 index 0000000..9bc9723 --- /dev/null +++ b/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch @@ -0,0 +1,157 @@ +2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> + + * Guys, please read the compiler warnings before releasing a + new version. The compiler is clever enough to warn you about + issues like + + | encrypted = (zdirent.d_flags & 0x2041 != 0); + + with + + | scanners.c:381: warning: suggest parentheses around comparison in operand of & + + + Ditto about the usage of implicitly declared functions. + + Warnings about uninitialized variables shall be taken + seriously too; this patch fixes one existing issue. The + htmlnorm.c parser should be reviewed. + + + * this patch does not fix: + + - things like + | ole2_extract.c:86: warning: 'packed' attribute ignored for field of type 'unsigned char[7u]' + + which are caused by + + struct foo { + char a[2] __attribute__((__packed__)); + char b __attribute__((__packed__)); + }; + + which can/should be written as + + struct foo { + char a[2]; + char b; + } __attribute__((__packed__)); + + - signed/unsigned comparisions. This was really too much to + get fixed now. It will require rewrite/review of the + complete code to use 'size_t' instead of 'int' for sizes. + + Lot of bufferover- and underflows can be prevented by + correct signess. + + - missing prototypes like + + | warning: no previous prototype for + + + 'clamav' is used to operate on hostile data so its source + code should have a good quality. Building with a high warning + level and removing reasons for such warnings is a cheap way + to eliminate a huge part of potential problems. + + + +--- clamav-0.88.1/clamd/others.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-10-30 21:22:01.000000000 +0100 ++++ clamav-0.88.1/clamd/others.c 2006-04-24 22:53:27.000000000 +0200 +@@ -30,6 +30,7 @@ + #include <sys/stat.h> + #include <errno.h> + #include <sys/time.h> ++#include <sys/wait.h> + + #if HAVE_SYS_PARAM_H + #include <sys/param.h> +@@ -68,6 +69,7 @@ + #include "memory.h" + #include "cfgparser.h" + #include "session.h" ++#include "../shared/output.h" + + #define ENV_FILE "CLAM_VIRUSEVENT_FILENAME" + #define ENV_VIRUS "CLAM_VIRUSEVENT_VIRUSNAME" +--- clamav-0.88.1/shared/misc.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-12-23 22:25:10.000000000 +0100 ++++ clamav-0.88.1/shared/misc.c 2006-04-24 22:53:27.000000000 +0200 +@@ -28,6 +28,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <ctype.h> + + #include "clamav.h" + #include "cfgparser.h" +--- clamav-0.88.1/freshclam/manager.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-25 18:39:25.000000000 +0100 ++++ clamav-0.88.1/freshclam/manager.c 2006-04-24 22:53:27.000000000 +0200 +@@ -50,6 +50,7 @@ + #include "../libclamav/others.h" + #include "../libclamav/str.h" /* cli_strtok */ + #include "dns.h" ++#include "execute.h" + + + int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, const char *hostname) +--- clamav-0.88.1/libclamav/zziplib/zzip-zip.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 01:43:53.000000000 +0200 ++++ clamav-0.88.1/libclamav/zziplib/zzip-zip.c 2006-04-24 22:57:44.000000000 +0200 +@@ -16,6 +16,7 @@ + #endif + + #include "target.h" ++#include "others.h" + + #include <zzip.h> /* archive handling */ + #include <zzip-file.h> +--- clamav-0.88.1/libclamav/scanners.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-04 11:32:55.000000000 +0200 ++++ clamav-0.88.1/libclamav/scanners.c 2006-04-24 22:53:27.000000000 +0200 +@@ -69,6 +69,7 @@ extern int cli_mbox(const char *dir, int + #include "untar.h" + #include "special.h" + #include "binhex.h" ++#include "../tnef.h" + + #ifdef HAVE_ZLIB_H + #include <zlib.h> +@@ -378,7 +379,7 @@ static int cli_scanzip(int desc, const c + * Bit 6: Strong encryption was used + * Bit 13: Encrypted central directory + */ +- encrypted = (zdirent.d_flags & 0x2041 != 0); ++ encrypted = (zdirent.d_flags & 0x2041) != 0; + + cli_dbgmsg("Zip: %s, crc32: 0x%x, offset: %d, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", zdirent.d_name, zdirent.d_crc32, zdirent.d_off, encrypted, zdirent.d_csize, zdirent.st_size, zdirent.d_compr, zdirent.d_csize ? (zdirent.st_size / zdirent.d_csize) : 0, limits ? limits->maxratio : 0); + +--- clamav-0.88.1/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 21:22:02.000000000 +0200 ++++ clamav-0.88.1/libclamav/pe.c 2006-04-24 22:53:27.000000000 +0200 +@@ -1451,7 +1451,7 @@ int cli_peheader(int desc, struct cli_pe + { + uint16_t e_magic; /* DOS signature ("MZ") */ + uint32_t e_lfanew; /* address of new exe header */ +- uint32_t min, max; ++ uint32_t min=0, max=0; + struct pe_image_file_hdr file_hdr; + struct pe_image_optional_hdr optional_hdr; + struct pe_image_section_hdr *section_hdr; +--- clamav-0.88.1/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 ++++ clamav-0.88.1/libclamav/htmlnorm.c 2006-04-24 22:53:27.000000000 +0200 +@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ + { + int fd_tmp, tag_length, tag_arg_length, binary; + int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; +- FILE *stream_in; ++ FILE *stream_in = 0; + html_state state=HTML_NORM, next_state=HTML_BAD_STATE; + char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; + char tag_val[HTML_STR_LENGTH+1], *tmp_file; +--- clamav-0.88.1/libclamav/special.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-06-23 22:03:13.000000000 +0200 ++++ clamav-0.88.1/libclamav/special.c 2006-04-24 22:53:27.000000000 +0200 +@@ -25,6 +25,7 @@ + #include <netinet/in.h> + #include <string.h> + ++#include "special.h" + #include "clamav.h" + #include "others.h" + #include "cltypes.h" diff --git a/clamav-0.88.1-strncpy.patch b/clamav-0.88.1-strncpy.patch new file mode 100644 index 0000000..ceceb7d --- /dev/null +++ b/clamav-0.88.1-strncpy.patch @@ -0,0 +1,26 @@ +2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> + + * libclamav/unrarlib.c/stricomp(): terminate the string copied + with strncpy() explicitly with '\0'. Does not seem to be + exploitable at the moment due to deeply buried constraints + (function will be called for buffers with a static size of + 260 only). + + But it is better to fix it now than to run into problems + when function is used for other purposes. + +--- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 ++++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 +@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) + char S1[512],S2[512]; + char *chptr; + +- strncpy(S1,Str1,sizeof(S1)); +- strncpy(S2,Str2,sizeof(S2)); ++ strncpy(S1,Str1,sizeof(S1)); ++ strncpy(S2,Str2,sizeof(S2)); ++ S1[sizeof(S1)-1] = '\0'; ++ S2[sizeof(S2)-1] = '\0'; + + while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ + { diff --git a/clamav.spec b/clamav.spec index 50dba49..d1894a2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.32 2006/02/18 09:33:59 ensc Exp $ +## $Id: clamav.spec,v 1.33 2006/04/06 16:50:58 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.1 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -36,6 +36,8 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers +Patch0: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch @@ -162,6 +164,9 @@ THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! %prep %setup -q +%patch0 -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch' +%patch1 -p1 -b .strncpy + %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff @@ -186,6 +191,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and ## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 ## also +CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --disable-zlib-vcheck \ %{!?_without_milter:--enable-milter} @@ -426,6 +432,12 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 +- added patch which fixes some classes of compiler warnings; at least + the using of implicitly declared functions was reported to cause + segfaults on AMD64 (brought to my attention by Marc Perkel) +- added patch which fixes wrong usage of strncpy(3) in unrarlib.c + * Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 - updated to 0.88.1 (SECURITY) commit cf9eaf4edbd86067499e209368d9c64ac576609d Author: ensc <ensc(a)fedoraproject.org> Date: Thu Apr 6 16:50:58 2006 +0000 updated to 0.88.1 (SECURITY) diff --git a/clamav.spec b/clamav.spec index f79ed76..50dba49 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.31 2006/01/09 23:27:46 ensc Exp $ +## $Id: clamav.spec,v 1.32 2006/02/18 09:33:59 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88 -Release: %release_func 2 +Version: 0.88.1 +Release: %release_func 1 License: GPL Group: Applications/File @@ -426,6 +426,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 +- updated to 0.88.1 (SECURITY) + * Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 - rebuilt for FC5 diff --git a/sources b/sources index 79339ac..2b31a40 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5d23205673c32e2b1b6db95000e6da74 clamav-0.88.tar.gz -12816c52cf4434f861c1c7faa196361a clamav-0.88.tar.gz.sig +9fe8c47037051e350077513dd94fb76a clamav-0.88.1.tar.gz +bc06324bf070679854689235df5042d8 clamav-0.88.1.tar.gz.sig commit f03dc9cffc7b47746b6a9280dc5169ebdef14b24 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 18 09:33:59 2006 +0000 rebuilt for FC5 diff --git a/clamav.spec b/clamav.spec index b4b1e90..f79ed76 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.30 2005/11/04 12:55:25 ensc Exp $ +## $Id: clamav.spec,v 1.31 2006/01/09 23:27:46 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -426,6 +426,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 +- rebuilt for FC5 + * Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 - updated to 0.88 - added pseudo-versions for the 'init(...)' provides as a first step commit 0a90d8190cc98d4ff5a94b19033e2de3146ab2dd Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jan 9 23:27:46 2006 +0000 - updated to 0.88 - added pseudo-versions for the 'init(...)' provides as a first step for the support of alternative initmethods - moved 'freshclam.conf.5' man page into the -update subpackage (#173221) - ship 'clamd.conf.5' man page in the -server subpackage *too*. The same file is contained in multiple packages now, but this man-page can not be removed from the base package because it also applies to 'clamdscan' there (#173221). diff --git a/clamav.spec b/clamav.spec index 6f1f1c9..b4b1e90 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.29 2005/09/17 09:01:24 ensc Exp $ +## $Id: clamav.spec,v 1.30 2005/11/04 12:55:25 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.87.1 +Version: 0.88 Release: %release_func 1 License: GPL @@ -84,7 +84,7 @@ Conflicts: clamav-daemon > %{version}-%{release} ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) -Provides: init(clamav-server) +Provides: init(clamav-server) = sysv Requires: data(clamav) Requires: clamav-lib = %{version}-%{release} Requires(pre): %_initrddir @@ -96,7 +96,7 @@ Group: System Environment/Daemons ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-milter) -Provides: init(clamav-milter) +Provides: init(clamav-milter) = sysv %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir @@ -348,7 +348,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %{_bindir}/* %exclude %_bindir/clamav-config %exclude %_bindir/freshclam -%exclude %_mandir/man1/freshclam* +%exclude %_mandir/*/freshclam* ## ----------------------- @@ -384,7 +384,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files update %defattr(-,root,root,-) %_bindir/freshclam -%_mandir/man1/freshclam* +%_mandir/*/freshclam* %pkgdatadir/freshclam-sleep %config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf %config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* @@ -398,7 +398,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc %{_mandir}/man8/* +%doc %_mandir/*/clamd* %{_sbindir}/* %_initrddir/clamd-wrapper %dir %pkgdatadir @@ -426,6 +426,18 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 +- updated to 0.88 +- added pseudo-versions for the 'init(...)' provides as a first step + for the support of alternative initmethods + +* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 +- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) +- ship 'clamd.conf.5' man page in the -server subpackage *too*. The + same file is contained in multiple packages now, but this man-page + can not be removed from the base package because it also applies to + 'clamdscan' there (#173221). + * Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 - updated to 0.87.1 diff --git a/sources b/sources index e805da2..79339ac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bf9f038edf0b6d5f76552e1b8d014b81 clamav-0.87.1.tar.gz -4685754c9888f14dfa0bd879002566b3 clamav-0.87.1.tar.gz.sig +5d23205673c32e2b1b6db95000e6da74 clamav-0.88.tar.gz +12816c52cf4434f861c1c7faa196361a clamav-0.88.tar.gz.sig commit 443889f1fbf4fe4134291809fcffe23a7ee7d5e3 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Nov 4 12:56:50 2005 +0000 do not add the '.fdr.' repotag to the generated spec-files diff --git a/clamd-gen b/clamd-gen index cd4c61c..134e149 100755 --- a/clamd-gen +++ b/clamd-gen @@ -27,7 +27,7 @@ $"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> function rpm.generatePreamble() { cat <<EOF -%{!?release_func:%define release_func() 0.fdr.%1} +%{!?release_func:%define release_func() %1%{?dist}} # The name of the minit service %define minitsvcdir %minitdir/services/%name # The configuration file for the SysV initservice commit 3176f3c12c66ec4c869ad579c6bfce7e0829efa7 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Nov 4 12:55:25 2005 +0000 synced with the FC-4 branch diff --git a/clamav.spec b/clamav.spec index ea1f750..6f1f1c9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.28 2005/09/10 11:20:26 dwmw2 Exp $ +## $Id: clamav.spec,v 1.29 2005/09/17 09:01:24 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.87 +Version: 0.87.1 Release: %release_func 1 License: GPL @@ -426,6 +426,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 +- updated to 0.87.1 + * Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 - updated to 0.87 (SECURITY) - removed -timeout patch; it is solved upstream diff --git a/sources b/sources index 617685e..e805da2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -dd0a12deb4f48f760fa1fcd378ae7c24 clamav-0.87.tar.gz -db9c17eec9e05085795b48ba199af895 clamav-0.87.tar.gz.sig +bf9f038edf0b6d5f76552e1b8d014b81 clamav-0.87.1.tar.gz +4685754c9888f14dfa0bd879002566b3 clamav-0.87.1.tar.gz.sig commit ecc95d934504ae863c4f6f37530a35edbb2f82c9 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 09:01:24 2005 +0000 - updated to 0.87 (SECURITY) - removed -timeout patch; it is solved upstream - reverted the -exim changes; they add yet more complexity, their functionality can go into an own package and they contained flaws diff --git a/clamav.spec b/clamav.spec index bd1e8d5..ea1f750 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.26 2005/07/29 16:37:45 ensc Exp $ +## $Id: clamav.spec,v 1.28 2005/09/10 11:20:26 dwmw2 Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -14,9 +14,6 @@ %global milterlog %_var/log/clamd.milter %global milteruser clamilt %global milterstatedir %_var/run/clamav-milter -%global clameximlog %_var/log/clamd.exim -%global clameximuser clamexim -%global clameximstatedir %_var/run/clamd.exim %global pkgdatadir %_datadir/%name @@ -24,14 +21,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.2 -Release: %release_func 5 +Version: 0.87 +Release: %release_func 1 License: GPL Group: Applications/File URL: http://www.clamav.net Source0: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz -#Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… +Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -42,7 +39,6 @@ Source8: clamav-notify-servers Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch23: clamav-0.86.2-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: clamav-lib = %{version}-%{release} Requires: data(clamav) @@ -110,21 +106,6 @@ Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 -%package exim -Summary: Exim dæmon configuration for the Clam Antivirus scanner -Group: System Environment/Daemons -## For now, use this as a placeholder. Later, generate separate -sysv -## and -minit subpackages -Requires: init(clamav-exim) -Provides: init(clamav-exim) -Requires(pre): exim -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig coreutils -Requires(preun): chkconfig initscripts -Requires(pre): fedora-usermgmt >= 0.7 -Requires(postun): fedora-usermgmt >= 0.7 - %description Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this @@ -177,22 +158,6 @@ to your sendmail.mc. THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! -%description exim -This package contains files which are needed to run the clamav dæmon for use -by the Exim MTA. It can be activated by adding - - av_scanner = clamd:%clameximstatedir/clamd.sock - -to your exim.conf, and using the 'malware' condition in the data ACL, -as follows: - - deny message = This message contains malware ($malware_name) - demime = * - malware = * - -For further details of Exim content scanning, see chapter 40 of the Exim -specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html - ## ------------------------------------------------------------ %prep @@ -200,7 +165,6 @@ specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff -%patch23 -p1 -b .timeout perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -260,7 +224,6 @@ function smartsubst() { ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ ${RPM_BUILD_ROOT}%milterstatedir \ - ${RPM_BUILD_ROOT}%clameximstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%{_initrddir} @@ -303,34 +266,15 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -#### The Exim stuff +%if 0%{!?_without_milter:1} +#### The milter stuff function subst() { - sed -e "s!<SERVICE>!$3!g;s!<USER>!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2" + sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } -subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \ - 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive$$\)!\1!;s!^Example!#Example!;' - -subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser '' -chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim -subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser '' - -cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim -CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf' -CLAMD_SOCKET=%clameximstatedir/clamd.sock -EOF - -mkdir -p $RPM_BUILD_ROOT/%clameximstatedir -ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim - -touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog - -%if 0%{!?_without_milter:1} -#### The milter stuff - -subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \ +subst etc/clamd.conf /etc/clamd.d/milter.conf \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' @@ -391,26 +335,6 @@ test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : -%pre exim -/usr/sbin/fedora-useradd 5 -r -s /sbin/nologin -d %clameximstatedir -M \ - -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || : - -%post exim -/sbin/chkconfig --add clamd.exim -test -e %clameximlog || { - touch %clameximlog - chmod 0620 %clameximlog - chown root:exim %clameximlog -} - -%preun exim -test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.exim - -%postun exim -test "$1" != 0 || /usr/sbin/fedora-userdel %{clameximuser} &>/dev/null || : -test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : - %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -488,19 +412,6 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : ## ----------------------- -%files exim -%defattr(-,root,root,-) -%_sbindir/clamd.exim -%config %{_initrddir}/clamd.exim -%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf -%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim -%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim -%attr(0750,%clameximuser,exim) %dir %clameximstatedir -%ghost %clameximstatedir/* -%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog - -## ----------------------- - %files milter %defattr(-,root,root,-) %doc clamav-milter/INSTALL @@ -515,6 +426,12 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : %endif # _without_milter %changelog +* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 +- updated to 0.87 (SECURITY) +- removed -timeout patch; it is solved upstream +- reverted the -exim changes; they add yet more complexity, their + functionality can go into an own package and they contained flaws + * Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 - Add clamav-exim configuration package commit c0efe2d256191354a85f763cad1ec0f4566b7408 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 09:00:16 2005 +0000 version 0.87 diff --git a/sources b/sources index bc5ea4f..617685e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -870de14ba123d6e9cba9850498c49f5d clamav-0.86.2.tar.gz -7d9ffe964a67ee6db157e112203a2678 clamav-0.86.2.tar.gz.sig +dd0a12deb4f48f760fa1fcd378ae7c24 clamav-0.87.tar.gz +db9c17eec9e05085795b48ba199af895 clamav-0.87.tar.gz.sig commit 5ef1a038cf71c098ec58d09769076517442a8b97 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 08:59:16 2005 +0000 fixed typo diff --git a/freshclam.sysconfig b/freshclam.sysconfig index b11e207..94035f8 100644 --- a/freshclam.sysconfig +++ b/freshclam.sysconfig @@ -11,7 +11,7 @@ ## calculated by the 'hostid' program. This predefined value guarantees ## constant timespans of 3 hours between two subsequent freshclam runs. ## -## This options accepts two special values: +## This option accepts two special values: ## 'disabled-warn' ... disables the automatic freshclam update and ## gives out a warning ## 'disabled' ... disables the automatic freshclam silently commit c6699d2e8fb799f2b9253e08627f0f6daaba5cbd Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 08:58:53 2005 +0000 not needed for 0.87 anymore diff --git a/clamav-0.86.2-timeout.patch b/clamav-0.86.2-timeout.patch deleted file mode 100644 index af252b2..0000000 --- a/clamav-0.86.2-timeout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout -+++ clamav-0.86.2/clamav-milter/clamav-milter.c -@@ -373,7 +373,7 @@ - static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; - static volatile unsigned int n_children = 0; - static unsigned int max_children = 0; --static int child_timeout = 300; /* number of seconds to wait for -+static int child_timeout = 0; /* number of seconds to wait for - * a child to die. Set to 0 to - * wait forever - */ commit d22637741f46aba02b802c3c9ad31db456cf87e1 Author: David Woodhouse <dwmw2(a)fedoraproject.org> Date: Sat Sep 10 11:20:26 2005 +0000 add clamav-exim subpackage diff --git a/clamav.spec b/clamav.spec index 062897b..bd1e8d5 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.26 2005/07/28 15:35:10 ensc Exp $ +## $Id: clamav.spec,v 1.26 2005/07/29 16:37:45 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -14,6 +14,9 @@ %global milterlog %_var/log/clamd.milter %global milteruser clamilt %global milterstatedir %_var/run/clamav-milter +%global clameximlog %_var/log/clamd.exim +%global clameximuser clamexim +%global clameximstatedir %_var/run/clamd.exim %global pkgdatadir %_datadir/%name @@ -22,7 +25,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 4 +Release: %release_func 5 License: GPL Group: Applications/File @@ -107,6 +110,21 @@ Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 +%package exim +Summary: Exim dæmon configuration for the Clam Antivirus scanner +Group: System Environment/Daemons +## For now, use this as a placeholder. Later, generate separate -sysv +## and -minit subpackages +Requires: init(clamav-exim) +Provides: init(clamav-exim) +Requires(pre): exim +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts +Requires(pre): fedora-usermgmt >= 0.7 +Requires(postun): fedora-usermgmt >= 0.7 + %description Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this @@ -159,6 +177,22 @@ to your sendmail.mc. THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! +%description exim +This package contains files which are needed to run the clamav dæmon for use +by the Exim MTA. It can be activated by adding + + av_scanner = clamd:%clameximstatedir/clamd.sock + +to your exim.conf, and using the 'malware' condition in the data ACL, +as follows: + + deny message = This message contains malware ($malware_name) + demime = * + malware = * + +For further details of Exim content scanning, see chapter 40 of the Exim +specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html + ## ------------------------------------------------------------ %prep @@ -226,6 +260,7 @@ function smartsubst() { ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ ${RPM_BUILD_ROOT}%milterstatedir \ + ${RPM_BUILD_ROOT}%clameximstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%{_initrddir} @@ -268,15 +303,34 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -%if 0%{!?_without_milter:1} -#### The milter stuff +#### The Exim stuff function subst() { - sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" + sed -e "s!<SERVICE>!$3!g;s!<USER>!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2" } +subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \ + 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive$$\)!\1!;s!^Example!#Example!;' + -subst etc/clamd.conf /etc/clamd.d/milter.conf \ +subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser '' +chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim +subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser '' + +cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim +CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf' +CLAMD_SOCKET=%clameximstatedir/clamd.sock +EOF + +mkdir -p $RPM_BUILD_ROOT/%clameximstatedir +ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim + +touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog + +%if 0%{!?_without_milter:1} +#### The milter stuff + +subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' @@ -337,6 +391,26 @@ test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : +%pre exim +/usr/sbin/fedora-useradd 5 -r -s /sbin/nologin -d %clameximstatedir -M \ + -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || : + +%post exim +/sbin/chkconfig --add clamd.exim +test -e %clameximlog || { + touch %clameximlog + chmod 0620 %clameximlog + chown root:exim %clameximlog +} + +%preun exim +test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.exim + +%postun exim +test "$1" != 0 || /usr/sbin/fedora-userdel %{clameximuser} &>/dev/null || : +test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : + %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -414,6 +488,19 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : ## ----------------------- +%files exim +%defattr(-,root,root,-) +%_sbindir/clamd.exim +%config %{_initrddir}/clamd.exim +%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf +%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim +%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim +%attr(0750,%clameximuser,exim) %dir %clameximstatedir +%ghost %clameximstatedir/* +%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog + +## ----------------------- + %files milter %defattr(-,root,root,-) %doc clamav-milter/INSTALL @@ -428,6 +515,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 +- Add clamav-exim configuration package + * Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 - [milter] create the milter-logfile in the %%post scriptlet - [milter] reverted the change of the default child_timeout value; it commit 5f98a1413790fce863ee762488f2070c1997b221 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Jul 29 16:29:09 2005 +0000 - [milter] create the milter-logfile in the %%post scriptlet - [milter] reverted the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration diff --git a/clamav.spec b/clamav.spec index 4f5ffb9..062897b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.25 2005/07/25 17:56:56 ensc Exp $ +## $Id: clamav.spec,v 1.26 2005/07/28 15:35:10 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -39,6 +39,7 @@ Source8: clamav-notify-servers Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch +Patch23: clamav-0.86.2-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: clamav-lib = %{version}-%{release} Requires: data(clamav) @@ -100,11 +101,9 @@ Provides: init(clamav-milter) %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir -Requires(postun): %_initrddir -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 @@ -167,6 +166,7 @@ THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff +%patch23 -p1 -b .timeout perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -177,6 +177,7 @@ perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf + ## ------------------------------------------------------------ %build @@ -321,6 +322,11 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : %post milter /sbin/chkconfig --add clamav-milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : @@ -422,6 +428,13 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + * Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash commit fcb173893df176fd8469eb974cd6d75a3e4221bb Author: ensc <ensc(a)fedoraproject.org> Date: Fri Jul 29 16:28:05 2005 +0000 this patch reverts the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration diff --git a/clamav-0.86.2-timeout.patch b/clamav-0.86.2-timeout.patch new file mode 100644 index 0000000..af252b2 --- /dev/null +++ b/clamav-0.86.2-timeout.patch @@ -0,0 +1,11 @@ +--- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout ++++ clamav-0.86.2/clamav-milter/clamav-milter.c +@@ -373,7 +373,7 @@ + static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; + static volatile unsigned int n_children = 0; + static unsigned int max_children = 0; +-static int child_timeout = 300; /* number of seconds to wait for ++static int child_timeout = 0; /* number of seconds to wait for + * a child to die. Set to 0 to + * wait forever + */ commit 4c5e9e7ce3164112e9887d2671af41eca4323dff Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 28 15:35:10 2005 +0000 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash modulo-operation. So the sleep may get a negative number of seconds being interpreted as an option. This version makes sure that the module-operations returns a non-negative value. [BZ #164494, James Wilkinson] - added support for a /usr/sbin/clamav-notify-servers.local hook; this file will be executed (source'd) before all other actions and can abort the entire processing by invoking 'exit' diff --git a/clamav.spec b/clamav.spec index 554754c..4f5ffb9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.24 2005/07/25 17:19:21 ensc Exp $ +## $Id: clamav.spec,v 1.25 2005/07/25 17:56:56 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -422,6 +422,17 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + * Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists commit fe1f906f7a698666d2c19ef36d4966805a2b9c28 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 28 12:10:28 2005 +0000 added support for a /usr/sbin/clamav-notify-servers.local hook; this file will be executed (source'd) before all other actions and can abort the entire processing by invoking 'exit' diff --git a/clamav-notify-servers b/clamav-notify-servers index 11b443d..22d57a6 100644 --- a/clamav-notify-servers +++ b/clamav-notify-servers @@ -23,6 +23,9 @@ INITRDDIR=/etc/init.d ok=1 +f=/usr/sbin/clamav-notify-servers.local +test ! -e "$f" || . "$f" + for i in ${BASE}*; do test -e "$i" || continue commit 21bb824bafe08936866df1e56aa02c535f4bfaa4 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 28 12:06:36 2005 +0000 Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash modulo-operation. So the sleep may get a negative number of seconds being interpreted as an option. This version makes sure that the module-operations returns a non-negative value. [BZ #164494, James Wilkinson] diff --git a/freshclam-sleep b/freshclam-sleep index 25c3067..2cb6bb2 100755 --- a/freshclam-sleep +++ b/freshclam-sleep @@ -44,7 +44,8 @@ WARNING: update of clamav database is disabled; please see ;; (*) - sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] ;; esac commit 07f7b7b9b355cbfd2f4c1bf8cf1b82bb8d15977d Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:56:56 2005 +0000 bump release: to fix broken cvs tags diff --git a/clamav.spec b/clamav.spec index 41a4731..554754c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.23 2005/06/25 18:01:32 ensc Exp $ +## $Id: clamav.spec,v 1.24 2005/07/25 17:19:21 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -422,7 +422,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-1 +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists of a crontab which does not need to be changed and a helper script commit 34ee90c2defad8af819b7da7d889179c6e4b5d4c Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:19:38 2005 +0000 version 0.86.2 diff --git a/sources b/sources index a1edad3..bc5ea4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -df7116898cdd80ce56721a91e9cff206 clamav-0.86.1.tar.gz -dd5b89f732f84112207843748df5218c clamav-0.86.1.tar.gz.sig +870de14ba123d6e9cba9850498c49f5d clamav-0.86.2.tar.gz +7d9ffe964a67ee6db157e112203a2678 clamav-0.86.2.tar.gz.sig commit e5f388088b24008eefc97b54c51511b210391408 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:19:21 2005 +0000 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists of a crontab which does not need to be changed and a helper script (freshclam-sleep). This helper script is configured by /etc/sysconfig/freshclam diff --git a/clamav.spec b/clamav.spec index 1912e3b..41a4731 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.22 2005/06/25 17:38:35 ensc Exp $ +## $Id: clamav.spec,v 1.23 2005/06/25 18:01:32 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.1 -Release: %release_func 2 +Version: 0.86.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -67,10 +67,13 @@ Requires(postun): fedora-usermgmt >= 0.7 %package update Summary: Auto-updater for the Clam Antivirus scanner data-files Group: Applications/File +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.cron Requires: clamav-data = %{version}-%{release} Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod %__sed diffutils +Requires(post): %__chown %__chmod %package server Summary: Clam Antivirus scanner server @@ -204,6 +207,20 @@ perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; rm -rf "$RPM_BUILD_ROOT" _doc* %{__make} DESTDIR="$RPM_BUILD_ROOT" install +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + %{__install} -d -m755 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ @@ -230,10 +247,7 @@ mkdir _doc_server cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper -f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper -sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp -cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f" -rm -f "$f".tmp +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper ## prepare the update-files @@ -241,17 +255,17 @@ rm -f "$f".tmp %{__install} -m755 -p %{SOURCE8} ${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers touch ${RPM_BUILD_ROOT}%{freshclamlog} -cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF" -## Adjust this line... -MAILTO=root,postmaster,webmaster,%username +%__install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +%__install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +%__install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update -## It is ok to execute it as root; freshclam drops privileges and becomes -## user 'clamav' as soon as possible -# @MIN@ @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } +smartsubst 's!webmaster,clamav!webmaster,%username!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -## Comment out or remove this line... -1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2' -EOF %if 0%{!?_without_milter:1} #### The milter stuff @@ -260,6 +274,7 @@ function subst() { sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } + subst etc/clamd.conf /etc/clamd.d/milter.conf \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' @@ -295,15 +310,6 @@ test -e %{freshclamlog} || { %{__chown} root:%{username} %{freshclamlog} } -min=$[ RANDOM % 60 ] -hour=$[ RANDOM % 3 ] -tmp=$(mktemp /tmp/freshclam-cron.XXXXXX) -src=%_sysconfdir/cron.d/clamav-update -%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp -cmp -s $tmp "$src" || cat "$tmp" >"$src" -rm -f $tmp - - %postun data test "$1" != 0 || /usr/sbin/fedora-userdel %{username} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : @@ -375,9 +381,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %_bindir/freshclam %_mandir/man1/freshclam* -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/* -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/* +%config(noreplace) %_sysconfdir/sysconfig/freshclam %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog} @@ -414,6 +422,13 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-1 +- updated to 0.86.2 (SECURITY) +- changed the freshclam updating mechanism (again); now, it consists + of a crontab which does not need to be changed and a helper script + (freshclam-sleep). This helper script is configured by + /etc/sysconfig/freshclam + * Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 - updated to 0.86.1 - fixed randomization in %%post scriptlet: hour should be a range but commit 0ce16b40647c3f3f4f93b06e371b9c2aa6d0160b Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:17:06 2005 +0000 initial checkin diff --git a/clamav-update.cron b/clamav-update.cron new file mode 100644 index 0000000..3f1b005 --- /dev/null +++ b/clamav-update.cron @@ -0,0 +1,6 @@ +## Adjust this line... +MAILTO=root,postmaster,webmaster,clamav + +## It is ok to execute it as root; freshclam drops privileges and becomes +## user 'clamav' as soon as possible +0 */3 * * * root /usr/share/clamav/freshclam-sleep diff --git a/freshclam-sleep b/freshclam-sleep new file mode 100755 index 0000000..25c3067 --- /dev/null +++ b/freshclam-sleep @@ -0,0 +1,56 @@ +#! /bin/bash +# Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +FRESHCLAM_MOD=$[ 3*60 ] # 3 hours + +f=/etc/sysconfig/freshclam +test ! -e "$f" || . "$f" + + +case x"$1" in + (xnow) FRESHCLAM_DELAY=0;; + (x|xrandom) : ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};; + (*) FRESHCLAM_DELAY=$1;; +esac + +set -e + +case $FRESHCLAM_DELAY in + (disabled-warn) + echo $"\ +WARNING: update of clamav database is disabled; please see + '$f' + for information how to enable the periodic update resp. how to turn + off this message." >&2 + exit 1 + ;; + + (disabled) + exit 0 + ;; + + (*) + sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + ;; +esac + + +/usr/bin/freshclam --quiet && { + test -x /usr/sbin/clamav-notify-servers && \ + exec /usr/sbin/clamav-notify-servers || \ + : +} diff --git a/freshclam.sysconfig b/freshclam.sysconfig new file mode 100644 index 0000000..b11e207 --- /dev/null +++ b/freshclam.sysconfig @@ -0,0 +1,24 @@ +## When changing the periodicity of freshclam runs in the crontab, +## this value must be adjusted also. Its value is the timespan between +## two subsequent freshclam runs in minutes. E.g. for the default +## +## | 0 */3 * * * ... +## +## crontab line, the value is 180 (minutes). +# FRESHCLAM_MOD= + +## A predefined value for the delay in seconds. By default, the value is +## calculated by the 'hostid' program. This predefined value guarantees +## constant timespans of 3 hours between two subsequent freshclam runs. +## +## This options accepts two special values: +## 'disabled-warn' ... disables the automatic freshclam update and +## gives out a warning +## 'disabled' ... disables the automatic freshclam silently +# FRESHCLAM_DELAY= + + +### !!!!! REMOVE ME !!!!!! +### REMOVE ME: By default, the freshclam update is disabled to avoid +### REMOVE ME: network access without prior activation +FRESHCLAM_DELAY=disabled-warn # REMOVE ME commit a5bcab3926635c345dcd6c6522c1d8b5320fcc24 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 18:01:32 2005 +0000 sometime I should learn the difference between Release: and Version:... diff --git a/clamav.spec b/clamav.spec index 470ecee..1912e3b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.21 2005/06/25 17:25:50 ensc Exp $ +## $Id: clamav.spec,v 1.22 2005/06/25 17:38:35 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.2 -Release: %release_func 1 +Version: 0.86.1 +Release: %release_func 2 License: GPL Group: Applications/File commit fd1ada700391ea4328061dc708216465cdcec922 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 17:38:35 2005 +0000 increased release due a failed previous 'make tag'... diff --git a/clamav.spec b/clamav.spec index e0c1f8b..470ecee 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.20 2005/06/21 07:25:56 ensc Exp $ +## $Id: clamav.spec,v 1.21 2005/06/25 17:25:50 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.1 +Version: 0.86.2 Release: %release_func 1 License: GPL @@ -414,7 +414,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-1 +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 - updated to 0.86.1 - fixed randomization in %%post scriptlet: hour should be a range but not a single number commit 6162ba3c1464a8297fbad160a722c8f8da129fa5 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 17:35:47 2005 +0000 version 0.86.1 diff --git a/sources b/sources index 7072f09..a1edad3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1c886e4f4f4c3e4e76250b7b52c000b4 clamav-0.86.tar.gz -57948dbd3a9093265fe0ac4abd40c4c2 clamav-0.86.tar.gz.sig +df7116898cdd80ce56721a91e9cff206 clamav-0.86.1.tar.gz +dd5b89f732f84112207843748df5218c clamav-0.86.1.tar.gz.sig commit 48f46c14d083d743d84498f1423071a20a20c1c6 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 17:25:50 2005 +0000 - updated to 0.86.1 - fixed randomization in %%post scriptlet: hour should be a range but not a single number diff --git a/clamav.spec b/clamav.spec index 85a12fa..e0c1f8b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.19 2005/05/19 07:45:09 wtogami Exp $ +## $Id: clamav.spec,v 1.20 2005/06/21 07:25:56 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86 +Version: 0.86.1 Release: %release_func 1 License: GPL @@ -296,10 +296,10 @@ test -e %{freshclamlog} || { } min=$[ RANDOM % 60 ] -hour=$[ RANDOM % 24 ] +hour=$[ RANDOM % 3 ] tmp=$(mktemp /tmp/freshclam-cron.XXXXXX) src=%_sysconfdir/cron.d/clamav-update -%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour!g" "$src" >$tmp +%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp cmp -s $tmp "$src" || cat "$tmp" >"$src" rm -f $tmp @@ -414,6 +414,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-1 +- updated to 0.86.1 +- fixed randomization in %%post scriptlet: hour should be a range but + not a single number + * Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 - updated to 0.86 - randomize freshclam startup times in -update's %%post script (suggested commit 013c2bcebdca8d5314618be86e1d25bfb7b5f7c5 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 21 07:27:20 2005 +0000 version 0.86 diff --git a/sources b/sources index 07ebabb..7072f09 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b0675c3273785d61eefc1afa304745c0 clamav-0.85.1.tar.gz -a7472bf7044adf4b21be39d7b93360f0 clamav-0.85.1.tar.gz.sig +1c886e4f4f4c3e4e76250b7b52c000b4 clamav-0.86.tar.gz +57948dbd3a9093265fe0ac4abd40c4c2 clamav-0.86.tar.gz.sig commit ea2eaf4e94d18b4d33adfb704dae91416e79d25d Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 21 07:26:54 2005 +0000 typo diff --git a/clamd-README b/clamd-README index d717d39..e62b487 100644 --- a/clamd-README +++ b/clamd-README @@ -3,7 +3,7 @@ modify/copy them in the suggested way: clamd.conf: * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with a unique service-name; + * place this file into /etc/clamd.d with an unique service-name; e.g. as /etc/clamd.d/<SERVICE>.conf To make logfile rotation work properly, the LogFile should be commit 2d2f85be2fe304db356a1b949fef42644e9e2d71 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 21 07:25:56 2005 +0000 - updated to 0.86 - randomize freshclam startup times in -update's %%post script (suggested by Stephen Smoogen); this requires some more Requires(post): also diff --git a/clamav.spec b/clamav.spec index 6a711cf..85a12fa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.18 2005/05/19 07:41:38 wtogami Exp $ +## $Id: clamav.spec,v 1.19 2005/05/19 07:45:09 wtogami Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.85.1 -Release: %release_func 4 +Version: 0.86 +Release: %release_func 1 License: GPL Group: Applications/File @@ -70,7 +70,7 @@ Group: Applications/File Requires: clamav-data = %{version}-%{release} Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d -Requires(post): %{__chown} %{__chmod} +Requires(post): %__chown %__chmod %__sed diffutils %package server Summary: Clam Antivirus scanner server @@ -247,8 +247,7 @@ MAILTO=root,postmaster,webmaster,%username ## It is ok to execute it as root; freshclam drops privileges and becomes ## user 'clamav' as soon as possible -## Note: replace 'MIN' and 'HOUR' with random values -# MIN HOUR/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } +# @MIN@ @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } ## Comment out or remove this line... 1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2' @@ -296,6 +295,15 @@ test -e %{freshclamlog} || { %{__chown} root:%{username} %{freshclamlog} } +min=$[ RANDOM % 60 ] +hour=$[ RANDOM % 24 ] +tmp=$(mktemp /tmp/freshclam-cron.XXXXXX) +src=%_sysconfdir/cron.d/clamav-update +%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour!g" "$src" >$tmp +cmp -s $tmp "$src" || cat "$tmp" >"$src" +rm -f $tmp + + %postun data test "$1" != 0 || /usr/sbin/fedora-userdel %{username} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : @@ -406,6 +414,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 +- updated to 0.86 +- randomize freshclam startup times in -update's %%post script (suggested + by Stephen Smoogen); this requires some more Requires(post): also + * Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 - fix dist tagging the way Enrico wants it commit aaf71503391ab41e52637beec651d1aef92ec69c Author: ensc <ensc(a)fedoraproject.org> Date: Thu May 19 17:16:39 2005 +0000 reverted last changes diff --git a/.cvsignore b/.cvsignore index 1c1caee..f6ee3be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -clamav-0.85.1.tar.gz -clamav-0.85.1.tar.gz.sig +clamav-*.tar.gz* +clamav-*.*.rpm commit a7b6ed15124250eb324aee28c1402070655c1fda Author: Warren Togami <wtogami(a)fedoraproject.org> Date: Thu May 19 07:45:09 2005 +0000 bump because I screwed up the last tag diff --git a/clamav.spec b/clamav.spec index 524a1ec..6a711cf 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.17 2005/05/19 07:35:49 wtogami Exp $ +## $Id: clamav.spec,v 1.18 2005/05/19 07:41:38 wtogami Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.85.1 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -406,7 +406,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-3 +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 - fix dist tagging the way Enrico wants it * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 commit 6179079faec83bfe1430ed6a9cb2e3c446a6fd65 Author: Warren Togami <wtogami(a)fedoraproject.org> Date: Thu May 19 07:41:38 2005 +0000 fix typo diff --git a/clamav.spec b/clamav.spec index 7aea152..524a1ec 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.16 2005/05/19 06:27:21 oliver Exp $ +## $Id: clamav.spec,v 1.17 2005/05/19 07:35:49 wtogami Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -406,7 +406,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85-3 +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-3 - fix dist tagging the way Enrico wants it * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 commit d52962c3c636ac4dd1f4ec8737bc335b042c91c1 Author: Warren Togami <wtogami(a)fedoraproject.org> Date: Thu May 19 07:35:49 2005 +0000 fix dist tagging the way Enrico wants it diff --git a/clamav.spec b/clamav.spec index a1bb51d..7aea152 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.15 2005/05/17 06:41:27 oliver Exp $ +## $Id: clamav.spec,v 1.16 2005/05/19 06:27:21 oliver Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -17,12 +17,12 @@ %global pkgdatadir %_datadir/%name -%{!?release_func:%global release_func() %1} +%{!?release_func:%global release_func() %1%{?dist}} Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.85.1 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85-3 +- fix dist tagging the way Enrico wants it + * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 - Rebuild commit ec3e79546b429dd62f3b30ebe80a65e903e382fc Author: Oliver Falk <oliver(a)fedoraproject.org> Date: Thu May 19 06:27:21 2005 +0000 As the release version (2) was wrong (typo), I force a rebuild. Sorry. diff --git a/clamav.spec b/clamav.spec index 3836e02..a1bb51d 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.14 2005/05/14 08:56:12 ensc Exp $ +## $Id: clamav.spec,v 1.15 2005/05/17 06:41:27 oliver Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 +- Rebuild + * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 - Update commit bd5c6a1fc262f757a40fc1ed921092d6963ccc37 Author: Oliver Falk <oliver(a)fedoraproject.org> Date: Tue May 17 06:41:27 2005 +0000 Update from 0.85 to 0.85.1 diff --git a/.cvsignore b/.cvsignore index f6ee3be..1c1caee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -clamav-*.tar.gz* -clamav-*.*.rpm +clamav-0.85.1.tar.gz +clamav-0.85.1.tar.gz.sig diff --git a/clamav.spec b/clamav.spec index a78ed2d..3836e02 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.11 2005/03/29 23:52:48 ensc Exp $ +## $Id: clamav.spec,v 1.14 2005/05/14 08:56:12 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.85 -Release: %release_func 1 +Version: 0.85.1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 +- Update + * Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 - updated to 0.85 diff --git a/sources b/sources index dac75a1..07ebabb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -938952faec9f4deffe2c0f6772d64b97 clamav-0.85.tar.gz.sig -b6bf9b04d69b4e9cf917beca99d8169a clamav-0.85.tar.gz +b0675c3273785d61eefc1afa304745c0 clamav-0.85.1.tar.gz +a7472bf7044adf4b21be39d7b93360f0 clamav-0.85.1.tar.gz.sig commit 031b1c0a071352a41e2926767140d9ea4f7e1e22 Author: ensc <ensc(a)fedoraproject.org> Date: Sat May 14 08:56:12 2005 +0000 version 0.85 diff --git a/clamav.spec b/clamav.spec index 9e01022..a78ed2d 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.84 -Release: %release_func 0 +Version: 0.85 +Release: %release_func 1 License: GPL Group: Applications/File @@ -406,7 +406,10 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84 +* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 +- updated to 0.85 + +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 - updated to 0.84 * Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> diff --git a/sources b/sources index 13ee400..dac75a1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4c89908cc3e8ea7684bbea4cfeae025a clamav-0.84.tar.gz.sig -c43213da01d510faf117daa9a4d5326c clamav-0.84.tar.gz +938952faec9f4deffe2c0f6772d64b97 clamav-0.85.tar.gz.sig +b6bf9b04d69b4e9cf917beca99d8169a clamav-0.85.tar.gz commit 71de95e1ff2a117bd20ac64220229bc5fd2b6646 Author: ensc <ensc(a)fedoraproject.org> Date: Sun May 1 11:03:39 2005 +0000 version 0.84 diff --git a/clamav.spec b/clamav.spec index f361b89..9e01022 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,14 +21,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.83 -Release: %release_func 2 +Version: 0.84 +Release: %release_func 0 License: GPL Group: Applications/File URL: http://www.clamav.net Source0: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… +#Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84 +- updated to 0.84 + * Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - rebuilt diff --git a/sources b/sources index e519735..13ee400 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e3a1b6bbda8095c5aae4eb7bc753804c clamav-0.83.tar.gz -8bd9bb753a1f0cceb588f96dd0f002ab clamav-0.83.tar.gz.sig +4c89908cc3e8ea7684bbea4cfeae025a clamav-0.84.tar.gz.sig +c43213da01d510faf117daa9a4d5326c clamav-0.84.tar.gz commit 4d6873538bda3dae621909346d49ae09b3a2746e Author: Michael Schwendt <mschwendt(a)fedoraproject.org> Date: Wed Apr 6 22:11:35 2005 +0000 mass release bump for packages not rebuilt after FC-3-split diff --git a/clamav.spec b/clamav.spec index 9f404d8..f361b89 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id$ +## $Id: clamav.spec,v 1.11 2005/03/29 23:52:48 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.83 -Release: %release_func 1 +Release: %release_func 2 + License: GPL Group: Applications/File URL: http://www.clamav.net @@ -405,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> +- rebuilt + * Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 - updated to 0.83 commit a71f8e3289baf0878ecfe9eb04fdb06d8364613a Author: ensc <ensc(a)fedoraproject.org> Date: Tue Mar 29 23:52:48 2005 +0000 use %global instead of %define diff --git a/clamav.spec b/clamav.spec index 7c3a1e9..9f404d8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -8,16 +8,16 @@ ## -%define username clamav -%define homedir %_var/lib/clamav -%define freshclamlog %_var/log/freshclam.log -%define milterlog %_var/log/clamd.milter -%define milteruser clamilt -%define milterstatedir %_var/run/clamav-milter -%define pkgdatadir %_datadir/%name +%global username clamav +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milterlog %_var/log/clamd.milter +%global milteruser clamilt +%global milterstatedir %_var/run/clamav-milter +%global pkgdatadir %_datadir/%name -%{!?release_func:%define release_func() %1} +%{!?release_func:%global release_func() %1} Summary: End-user tools for the Clam Antivirus scanner Name: clamav commit f8eda023689b189f1760424a2c68acdbec99c166 Author: Michael Schwendt <mschwendt(a)fedoraproject.org> Date: Thu Mar 3 21:23:41 2005 +0000 *** empty log message *** diff --git a/clamav.spec b/clamav.spec index 62358d0..7c3a1e9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -60,8 +60,8 @@ Requires(pre): %_libdir/pkgconfig Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File Provides: data(clamav) -Requires(pre): fedora-usermgmt >= 0:0.7 -Requires(postun): fedora-usermgmt >= 0:0.7 +Requires(pre): fedora-usermgmt >= 0.7 +Requires(postun): fedora-usermgmt >= 0.7 %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -101,8 +101,8 @@ Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts -Requires(pre): fedora-usermgmt >= 0:0.7 -Requires(postun): fedora-usermgmt >= 0:0.7 +Requires(pre): fedora-usermgmt >= 0.7 +Requires(postun): fedora-usermgmt >= 0.7 %description commit 4563bd9bb7150614176e76b4e3d344c773ce9550 Author: Matthias Saou <thias(a)fedoraproject.org> Date: Thu Mar 3 20:08:36 2005 +0000 Mass letter "c" update, one or more apply : - Drop epoch: 0 - Remove %{epoch} requirements in sub-packages - Remove trailing white spaces - Keep consistent between spaces and tabs diff --git a/clamav.spec b/clamav.spec index 8a0ed30..62358d0 100644 --- a/clamav.spec +++ b/clamav.spec @@ -23,7 +23,6 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.83 Release: %release_func 1 -Epoch: 0 License: GPL Group: Applications/File URL: http://www.clamav.net @@ -40,7 +39,7 @@ Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires: clamav-lib = %{version}-%{release} Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel BuildRequires: bc @@ -51,44 +50,44 @@ Group: System Environment/Libraries Requires: data(clamav) %package devel -Summary: Headerfiles and libraries for the Clam Antivirus scanner +Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires: clamav-lib = %{version}-%{release} Requires(pre): %_libdir/pkgconfig %package data -Summary: The virus-signatures for clamav +Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File Provides: data(clamav) Requires(pre): fedora-usermgmt >= 0:0.7 Requires(postun): fedora-usermgmt >= 0:0.7 %package update -Summary: Auto-updater for clamav data-files +Summary: Auto-updater for the Clam Antivirus scanner data-files Group: Applications/File -Requires: clamav-data = %epoch:%version-%release +Requires: clamav-data = %{version}-%{release} Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %{__chown} %{__chmod} %package server -Summary: The clamav server +Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Provides: clamav-daemon = %epoch:%version-%release -Obsoletes: clamav-daemon < %epoch:%version-%release -Conflicts: clamav-daemon > %epoch:%version-%release +Provides: clamav-daemon = %{version}-%{release} +Obsoletes: clamav-daemon < %{version}-%{release} +Conflicts: clamav-daemon > %{version}-%{release} ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) Provides: init(clamav-server) Requires: data(clamav) -Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires: clamav-lib = %{version}-%{release} Requires(pre): %_initrddir Requires(postun): %_initrddir %package milter -Summary: A sendmail-milter for clamav +Summary: Sendmail-milter for the Clam Antivirus scanner Group: System Environment/Daemons ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages @@ -626,5 +625,5 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : * Tue Oct 29 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.52-1 - updated to 0.52 -* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - Initial build. commit c19278e4f79fa0cebe6a2d7921beab2ba7d38daa Author: ensc <ensc(a)fedoraproject.org> Date: Tue Feb 15 08:40:51 2005 +0000 updated to 0.83 diff --git a/clamav.spec b/clamav.spec index c02e110..8a0ed30 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.82 +Version: 0.83 Release: %release_func 1 Epoch: 0 License: GPL @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 +- updated to 0.83 + * Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 - updated to 0.82 - minor spec cleanups diff --git a/sources b/sources index 155b8af..e519735 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1b58972d8918f5174d7f05a35a48856b clamav-0.82.tar.gz -f4010a5d15408fb83077fc5eb468eeb0 clamav-0.82.tar.gz.sig +e3a1b6bbda8095c5aae4eb7bc753804c clamav-0.83.tar.gz +8bd9bb753a1f0cceb588f96dd0f002ab clamav-0.83.tar.gz.sig commit e75ca52c9f36c2ea3423449659015ba2cdc61e7e Author: ensc <ensc(a)fedoraproject.org> Date: Tue Feb 8 23:01:08 2005 +0000 updated diff --git a/.cvsignore b/.cvsignore index ff8c3c5..f6ee3be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ clamav-*.tar.gz* -clamav-0.81.tar.gz -clamav-0.81.tar.gz.sig +clamav-*.*.rpm diff --git a/sources b/sources index c9f586e..155b8af 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -60081ddd9f29cbb8f0a2fe575e5a8afa clamav-0.81.tar.gz -b3c33479713c18794dfe83aa7397c604 clamav-0.81.tar.gz.sig +1b58972d8918f5174d7f05a35a48856b clamav-0.82.tar.gz +f4010a5d15408fb83077fc5eb468eeb0 clamav-0.82.tar.gz.sig commit 5ec291e507237bec6628b38dbd5fc9cd006b0f41 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Feb 8 23:00:37 2005 +0000 - updated to 0.82 - minor spec cleanups diff --git a/clamav.spec b/clamav.spec index babe1b2..c02e110 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,9 +1,10 @@ +## $Id$ + ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage ## Fedora Extras specific customization below... -%{!?release_func:%define release_func() %1} ## @@ -15,10 +16,13 @@ %define milterstatedir %_var/run/clamav-milter %define pkgdatadir %_datadir/%name + +%{!?release_func:%define release_func() %1} + Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.81 -Release: %release_func 2 +Version: 0.82 +Release: %release_func 1 Epoch: 0 License: GPL Group: Applications/File @@ -113,15 +117,6 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. -WARNING: this package was built with '--disable-zlib-vcheck' because Red Hat - is unable to apply a simple security fix within 5 months. On - failures or successful DOS attacks on your mailserver, please - blame RH but not fedora.us. - - See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and - http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 - for references - %description lib This package contains dynamic libraries shared between applications @@ -182,23 +177,13 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ %build -cat <<EOF -********************* -** -** WARNING: building with '--disable-zlib-vcheck' because Red Hat is unable -** to apply a simple security fix within 5 months. On failures or -** successful DOS attacks on your mailserver, please blame RH -** but not fedora.us. -** -** See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 -** and http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 -** for references -** -********************* -EOF - -sleep 10 - +## '--disable-zlib-vcheck' is used because every FC<=3 ships zlib-1.2.1* +## but clamav checks for zlib >= 1.2.2. This option can be removed for +## FC4 builds. +## +## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and +## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 +## also %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --disable-zlib-vcheck \ %{!?_without_milter:--enable-milter} @@ -421,6 +406,10 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 +- updated to 0.82 +- minor spec cleanups + * Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 - build the package with '--disable-zlib-vcheck' because RH is unable to apply a fix for a 5 month old and solved security issue. Please fill commit b77bb64a6a20ba072422bcfd7e45c5c310d67c82 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Feb 3 08:40:44 2005 +0000 - build the package with '--disable-zlib-vcheck' because RH is unable to apply a fix for a 5 month old and solved security issue. Please fill your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 - added 'BuildRequires: bc' (should work without also, but ./configure gives out ugly warnings else) 0.81-0.fdr.1 - updated to 0.81 - do not ship the 'clamd.milter' daemon anymore; clamav-milter supports an internal mode now which is enabled by default - updated -milter %%description 0.80-0.fdr.2 - s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) 0.80-0.fdr.1 - updated to 0.80 - removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore - buildrequire 'curl-devel' - renamed clamav.conf to clamd.conf (upstream change) - updated -initoff patch 0.75.1-0.fdr.1 - updated to 0.75.1 - use %%configure, the problems with the architecture specification seem to have passed (probably because of an autoconf update) - set mode 0600 for the cron-script (required by vixie-cron) - made the cronjob a spambot and send mail about deactivated freshclam service to nearly everybody... (root, postmaster, webmaster) - other fixes in the notification cronjob 0.75-0.fdr.1 - updated to 0.75 0.74-0.fdr.2 - moved /usr/bin/clamav-config from main into -devel 0.74-0.fdr.1 - updated to 0.74 0.73-0.fdr.1 - updated to 0.73 - added pkgconfig file 0.72-0.fdr.3 - notify the user about a deactivated clamav-update service - added clamd-gen script which generates template spec-files for services using clamd - copied template configuration files to %pkgdatadir/template (needed for clamd-gen) - moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink will be provided for compatibility reasons - conditionalized building of the -milter subpackage ('--without milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) 0.72-0.fdr.2 - removed 'BuildRequires: dietlibc'; it was a leftover from the pre-use-signal era (before 0.70) (bug #1716) 0.72-0.fdr.1 - updated to 0.72 diff --git a/.cvsignore b/.cvsignore index 0196009..ff8c3c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,3 @@ -clamav-0.71.tar.gz +clamav-*.tar.gz* +clamav-0.81.tar.gz +clamav-0.81.tar.gz.sig diff --git a/clamav-0.70-initoff.patch b/clamav-0.70-initoff.patch deleted file mode 100644 index c1e1860..0000000 --- a/clamav-0.70-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 91 30 -+# chkconfig: - 79 31 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes - # email messages to clamav diff --git a/clamav-0.71.tar.gz.sig b/clamav-0.71.tar.gz.sig deleted file mode 100644 index 2d70446..0000000 Binary files a/clamav-0.71.tar.gz.sig and /dev/null differ diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch new file mode 100644 index 0000000..7ef309e --- /dev/null +++ b/clamav-0.80-initoff.patch @@ -0,0 +1,11 @@ +--- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 ++++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 +@@ -2,7 +2,7 @@ + # + # clamav-milter This script starts and stops the clamav-milter daemon + # +-# chkconfig: 2345 71 40 ++# chkconfig: - 71 40 + # + # description: clamav-milter is a daemon which hooks into sendmail and routes + # email messages to clamav diff --git a/clamav.spec b/clamav.spec index e264659..babe1b2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,15 +1,24 @@ +## This package understands the following switches: +## --without milter ... deactivate the -milter subpackage + + +## Fedora Extras specific customization below... +%{!?release_func:%define release_func() %1} +## + + %define username clamav %define homedir %_var/lib/clamav %define freshclamlog %_var/log/freshclam.log %define milterlog %_var/log/clamd.milter %define milteruser clamilt %define milterstatedir %_var/run/clamav-milter -%define milterclamddir %_var/run/clamd.milter +%define pkgdatadir %_datadir/%name Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.71 -Release: 2 +Version: 0.81 +Release: %release_func 2 Epoch: 0 License: GPL Group: Applications/File @@ -25,11 +34,12 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch -Patch22: clamav-0.70-initoff.patch +Patch22: clamav-0.80-initoff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: clamav-lib = %{epoch}:%{version}-%{release} Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers +BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel +BuildRequires: bc %package lib Summary: Dynamic libraries for the Clam Antivirus scanner @@ -39,7 +49,9 @@ Requires: data(clamav) %package devel Summary: Headerfiles and libraries for the Clam Antivirus scanner Group: Development/Libraries +Source100: clamd-gen Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires(pre): %_libdir/pkgconfig %package data Summary: The virus-signatures for clamav @@ -68,7 +80,6 @@ Requires: init(clamav-server) Provides: init(clamav-server) Requires: data(clamav) Requires: clamav-lib = %{epoch}:%{version}-%{release} -BuildRequires: dietlibc Requires(pre): %_initrddir Requires(postun): %_initrddir @@ -79,9 +90,7 @@ Group: System Environment/Daemons ## and -minit subpackages Requires: init(clamav-milter) Provides: init(clamav-milter) -BuildRequires: sendmail-devel -Requires(preun): clamav-server = %{epoch}:%{version}-%{release} -Requires(postun): clamav-server = %{epoch}:%{version}-%{release} +%{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir Requires(postun): %_initrddir @@ -104,6 +113,16 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. +WARNING: this package was built with '--disable-zlib-vcheck' because Red Hat + is unable to apply a simple security fix within 5 months. On + failures or successful DOS attacks on your mailserver, please + blame RH but not fedora.us. + + See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and + http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 + for references + + %description lib This package contains dynamic libraries shared between applications using the Clam Antivirus scanner. @@ -120,7 +139,7 @@ ships a corresponding cron-job. %description update This package contains programs which can be used to update the clamav anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav. +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. %description server ATTENTION: most users do not need this package; the main package has @@ -138,7 +157,6 @@ This package contains files which are needed to run the clamav-milter. It can be activated by adding | INPUT_MAIL_FILTER(`clamav', `S=local:%milterstatedir/clamav.sock, F=, T=S:4m;R:4m')dnl -| define(`confINPUT_MAIL_FILTERS', `clamav')dnl to your sendmail.mc. @@ -157,23 +175,35 @@ perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g; s!^#?(User ).*!\1<USER>!g; s! /usr/local/share/clamav,! %homedir,!g; - ' etc/clamav.conf + ' etc/clamd.conf perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ %build -#%%configure --disable-clamav --with-dbdir=/var/lib/clamav -## The %%configure macro can not be used since the script breaks on -## the old architecture specification +cat <<EOF +********************* +** +** WARNING: building with '--disable-zlib-vcheck' because Red Hat is unable +** to apply a simple security fix within 5 months. On failures or +** successful DOS attacks on your mailserver, please blame RH +** but not fedora.us. +** +** See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +** and http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 +** for references +** +********************* +EOF -CFLAGS=$RPM_OPT_FLAGS; export CFLAGS -./configure --prefix=%{_prefix} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \ - --disable-clamav --with-dbdir=%{homedir} \ - --enable-milter +sleep 10 -## HACK: ./configure checks if freshclam.conf/clamav.conf are existing +%configure --disable-clamav --with-dbdir=/var/lib/clamav \ + --disable-zlib-vcheck \ + %{!?_without_milter:--enable-milter} + +## HACK: ./configure checks if freshclam.conf/clamd.conf are existing ## in current filesystem and skips its installation then. Was introduced ## by 0.66. perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; @@ -192,20 +222,34 @@ rm -rf "$RPM_BUILD_ROOT" _doc* %{__install} -d -m755 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ - ${RPM_BUILD_ROOT}{%milterstatedir,%milterclamddir} \ + ${RPM_BUILD_ROOT}%milterstatedir \ + ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%{_initrddir} -rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/clamav.conf \ +rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/clamd.conf \ ${RPM_BUILD_ROOT}%{_libdir}/*.la +%{?_without_milter:rm -f $RPM_BUILD_ROOT%_mandir/*/*milter*} + ## prepare the server-files mkdir _doc_server -%{__install} -m644 -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_initrddir}/clamd-wrapper %{__install} -m644 -p %{SOURCE2} _doc_server/clamd.sysconfig %{__install} -m644 -p %{SOURCE3} _doc_server/clamd.logrotate %{__install} -m755 -p %{SOURCE7} _doc_server/clamd.init %{__install} -m644 -p %{SOURCE5} _doc_server/README +%__install -m644 -p etc/clamd.conf _doc_server/clamd.conf + +%__install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir +%__install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper + +f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper +sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp +cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f" +rm -f "$f".tmp + ## prepare the update-files %{__install} -m644 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/clamav-update @@ -213,26 +257,28 @@ mkdir _doc_server touch ${RPM_BUILD_ROOT}%{freshclamlog} cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF" +## Adjust this line... +MAILTO=root,postmaster,webmaster,%username + ## It is ok to execute it as root; freshclam drops privileges and becomes ## user 'clamav' as soon as possible ## Note: replace 'MIN' and 'HOUR' with random values # MIN HOUR/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } -EOF +## Comment out or remove this line... +1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2' +EOF +%if 0%{!?_without_milter:1} #### The milter stuff function subst() { sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } -subst %SOURCE3 /etc/logrotate.d/clamd.milter -subst %SOURCE7 %_initrddir/clamd.milter -subst etc/clamav.conf /etc/clamd.d/milter.conf \ +subst etc/clamd.conf /etc/clamd.d/milter.conf \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' -chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.milter -ln -s ./clamd $RPM_BUILD_ROOT%_sbindir/clamd.milter cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter ## The '-blo' options might be usefully here -- especially for testing; see @@ -242,8 +288,9 @@ CLAMAV_USER='%milteruser' EOF %__install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter -touch $RPM_BUILD_ROOT%milterclamddir/{clamd.sock,clamd.pid,milter.sock} touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog +%endif # _without_milter + ## ------------------------------------------------------------ @@ -275,18 +322,14 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : %post milter /sbin/chkconfig --add clamav-milter -/sbin/chkconfig --add clamd.milter %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : -test "$1" != 0 || %{_initrddir}/clamd.milter stop &>/dev/null || : test "$1" != 0 || /sbin/chkconfig --del clamav-milter -test "$1" != 0 || /sbin/chkconfig --del clamd.milter %postun milter test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : -test "$1" = 0 || %{_initrddir}/clamd.milter condrestart >/dev/null || : test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : @@ -298,15 +341,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO %doc docs/*.pdf -%doc docs/html docs/DMS docs/FreeBSD-HowTo -%lang(fr) %doc docs/French -%lang(ja) %doc docs/Japanese -%lang(pl) %doc docs/Polish -%lang(pt) %doc docs/Portugese -%lang(es) %doc docs/Spanish -%lang(tr) %doc docs/Turkish %doc %{_mandir}/man[15]/* %{_bindir}/* +%exclude %_bindir/clamav-config %exclude %_bindir/freshclam %exclude %_mandir/man1/freshclam* @@ -323,12 +360,20 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %{_includedir}/* %{_libdir}/*.*a %{_libdir}/*.so +%dir %pkgdatadir +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config ## ----------------------- %files data %defattr(-,%{username},%{username},-) %dir %{homedir} +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. %config %verify(not size md5 mtime) %{homedir}/*.cvd ## ----------------------- @@ -338,7 +383,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %_bindir/freshclam %_mandir/man1/freshclam* %config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/cron.d/* +%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/* %config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog} @@ -348,12 +393,15 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc etc/clamav.conf %doc %{_mandir}/man8/* %{_sbindir}/* -%config %{_initrddir}/clamd-wrapper +%_initrddir/clamd-wrapper +%dir %pkgdatadir %dir %{_sysconfdir}/clamd.d +%pkgdatadir/clamd-wrapper + +%if 0%{!?_without_milter:1} %exclude %_sbindir/*milter* %exclude %_mandir/man8/clamav-milter* @@ -364,18 +412,79 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* -%config %{_initrddir}/clamd.milter %config %{_initrddir}/clamav-milter %config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/milter.conf %config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamav-milter -%attr(0700,%milteruser,%milteruser) %dir %milterclamddir %attr(0700,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterclamddir/* %ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog - +%endif # _without_milter %changelog +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 +- build the package with '--disable-zlib-vcheck' because RH is unable to + apply a fix for a 5 month old and solved security issue. Please fill + your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +- added 'BuildRequires: bc' (should work without also, but ./configure + gives out ugly warnings else) + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 +- updated to 0.81 +- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports + an internal mode now which is enabled by default +- updated -milter %%description + +* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 +- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update + subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) + +* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 +- updated to 0.80 +- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore +- buildrequire 'curl-devel' +- renamed clamav.conf to clamd.conf (upstream change) +- updated -initoff patch + +* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 +- updated to 0.75.1 +- use %%configure, the problems with the architecture specification + seem to have passed (probably because of an autoconf update) +- set mode 0600 for the cron-script (required by vixie-cron) +- made the cronjob a spambot and send mail about deactivated freshclam + service to nearly everybody... (root, postmaster, webmaster) +- other fixes in the notification cronjob + +* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 +- updated to 0.75 + +* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 +- moved /usr/bin/clamav-config from main into -devel + +* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 +- updated to 0.74 + +* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 +- updated to 0.73 +- added pkgconfig file + +* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 +- notify the user about a deactivated clamav-update service +- added clamd-gen script which generates template spec-files for + services using clamd +- copied template configuration files to %pkgdatadir/template (needed + for clamd-gen) +- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink + will be provided for compatibility reasons +- conditionalized building of the -milter subpackage ('--without + milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) + +* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 +- removed 'BuildRequires: dietlibc'; it was a leftover from the + pre-use-signal era (before 0.70) (bug #1716) + +* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 +- updated to 0.72 + * Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 - removed the randomization in the cronjob; it seems to be impossible to use the mod-operator (%%) there. Instead of, the user has to diff --git a/clamd-README b/clamd-README index 7d8e676..d717d39 100644 --- a/clamd-README +++ b/clamd-README @@ -1,7 +1,7 @@ To create individual clamd-instance take the following files and modify/copy them in the suggested way: -clamav.conf: +clamd.conf: * set LogFile, PidFile, LocalSocket and User to suitable values * place this file into /etc/clamd.d with a unique service-name; e.g. as /etc/clamd.d/<SERVICE>.conf @@ -42,7 +42,7 @@ clamd.init: Additionally, a symlink must be set to clamd in a way like | # ln -s clamd /usr/sbin/clamd.<SERVICE> and the directory for the socket file must be created (see 'LocalSocket' -in clamav.conf) +in clamd.conf) | # mkdir -p /var/run/clamd.<SERVICE> diff --git a/clamd-gen b/clamd-gen new file mode 100755 index 0000000..cd4c61c --- /dev/null +++ b/clamd-gen @@ -0,0 +1,268 @@ +#! /bin/bash + +# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +function showHelp() +{ + echo \ +$"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> + --license=<LICENSE> --username=>USERNAME> +" + exit 0 +} + +function rpm.generatePreamble() +{ + cat <<EOF +%{!?release_func:%define release_func() 0.fdr.%1} +# The name of the minit service +%define minitsvcdir %minitdir/services/%name +# The configuration file for the SysV initservice +%define conffile %_sysconfdir/clamd.d/%service.conf +# The directory, where the milter socket will be placed into; this +# socket will be named clamd.sock +%define rundir /var/run/clamd.%service +# The name of the logfile +%define logfile /var/log/clamd.%service +# The user under whose id, the clamd shall be running. This user must +# be able to read the files from the base-service and is usually +# created there. +%define username $USERNAME +# The packagename of the service +%define service $SERVICE +# The service name as used by the system's initscripts; usually this +# is %service +%define baseservice %service + +%define __chkconfig /sbin/chkconfig +%define minitdir %_sysconfdir/minit + + +EOF +} + +function rpm.generateHeader() +{ + cat <<EOF +Summary: Clamav server for '%service' +Name: clamd.%service +Version: $VERSION +Release: %release_func $RELEASE +Epoch: 0 +License: $LICENSE +Group: System Environment/Daemons +BuildRoot: %_tmppath/%name-%version-%release-root +BuildArch: noarch +Requires: init(%name) +Requires(pre): %service +Requires: clamav-server +BuildRequires: clamav-devel + +%package sysv +Summary: SysV initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = sysv +Conflicts: init(%name) < sysv +Conflicts: init(%name) > sysv +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp %__chkconfig +Requires(preun): %__chkconfig +Requires(pre): %_initrddir +Requires(postun): %_initrddir + +%package minit +Summary: minit initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = minit +Conflicts: init(%name) < minit +Conflicts: init(%name) > minit +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp +Requires(pre): minit-setup +Requires(postun): minit-setup +Requires(triggers): minit-tools + + +%description +Basic setup for a clamav server for '%service'. + + +%description sysv +Basic setup for a clamav server for '%service'. + +This package contains initscripts for SysV based systems. + + +%description minit +Basic setup for a clamav server for '%service'. + +This package contains initscripts for minit based systems. + +EOF +} + + +function rpm.genBody() +{ + cat <<"XEOFX" +%prep +%build + +%install +rm -rf $RPM_BUILD_ROOT +%__install -d -m755 $RPM_BUILD_ROOT{%minitsvcdir,%_sbindir,%rundir,/var/log} + +d=/usr/share/clamav/template + +function subst +{ + src=$d/$1 + dst=$RPM_BUILD_ROOT$2 + + %__install -d -m755 $(dirname "$dst") + sed -e 's!^$#?LogFile $.*!\1%logfile!g; + s!^#?$LocalSocket $.*!\1%rundir/clamd.sock!g; + s!^#?$PidFile $.*!\1%rundir/clamd.pid!g; + s!<SERVICE>!%service!g; + s!<USER>!%username!g;' "$src" >"$dst" + chmod --reference "$src" "$dst" +} + +subst clamd.conf %conffile +subst clamd.logrotate %_sysconfdir/logrotate.d/clamd.%service + +%if 0%{!?_without_sysv:1} +subst clamd.sysconfig %_sysconfdir/sysconfig/clamd.%service +subst clamd.init %_initrddir/clamd.%service +%endif + +ln -s clamd $RPM_BUILD_ROOT%_sbindir/clamd.%service + +touch $RPM_BUILD_ROOT%logfile +touch $RPM_BUILD_ROOT%rundir/clamd.sock + +%if 0%{!?_without_minit:1} +ln -s %_sbindir/clamd.%service $RPM_BUILD_ROOT%minitsvcdir/run +touch $RPM_BUILD_ROOT%minitsvcdir/respawn +cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params +-c +%conffile +EOF +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + + +%triggerin minit -- %baseservice +minit-svc add services/clamd.%service services/%baseservice/ + +%triggerun minit -- %baseservice +test "$1" != 0 -a "$2" != 0 || \ + minit-svc del services/clamd.%service services/%baseservice/ + + +%post minit +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^#Foreground!Foreground!' "%conffile" >"$d" +grep -q '^Foreground' $d || echo 'Foreground' >>$d +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%post sysv +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^Foreground!#Foreground!' "%conffile" >"$d" +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%__chkconfig --add %name + + +%preun sysv +test "$1" != 0 || %__chkconfig --del %name + +XEOFX +} + + +function rpm.genFiles +{ + cat <<"EOF" +%files +%defattr(-,root,root,-) +%doc +%config(noreplace) %verify(not size md5 mtime) %attr(0620,root,%username) %logfile +%config(noreplace) %verify(not mtime) %conffile +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/clamd.%service +%_sbindir/clamd.%service +%dir %attr(0700,%username,root) %rundir +%ghost %rundir/clamd.sock + + +%if 0%{!?_without_sysv:1} +%files sysv +%defattr(-,root,root,-) +%config %verify(not mtime) %_initrddir/clamd.%service +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamd.%service +%endif + + +%if 0%{!?_without_minit:1} +%files minit +%defattr(-,root,root,-) +%dir %minitsvcdir +%config(noreplace) %verify(not mtime) %minitsvcdir/params +%config %minitsvcdir/run + %minitsvcdir/respawn +%endif +EOF +} + + +SERVICE= +VERSION= +RELEASE= +LICENSE= +USERNAME= +tmp=$(getopt -o '' --long service:,version:,release:,license:,username:,help -n "$0" -- "$@") || exit 1 +eval set -- "$tmp" + +while true; do + case "$1" in + (--help) showHelp $0;; + (--service) SERVICE=$2; shift;; + (--version) VERSION=$2; shift;; + (--release) RELEASE=$2; shift;; + (--license) LICENSE=$2; shift;; + (--username) USERNAME=$2; shift;; + (--) shift; break;; + esac + shift +done + +for i in SERVICE VERSION RELEASE LICENSE USERNAME; do + eval tmp=\$${i} + test "$tmp" || { + echo $"No value for $i specified; assuming @${i}@" >&2; + eval $i=@${i}@; + } +done + + +rpm.generatePreamble +rpm.generateHeader +rpm.genBody +rpm.genFiles diff --git a/clamd.SERVICE.init b/clamd.SERVICE.init index 5906b10..9681351 100644 --- a/clamd.SERVICE.init +++ b/clamd.SERVICE.init @@ -4,4 +4,4 @@ # description: The clamd server running for <SERVICE> CLAMD_SERVICE=<SERVICE> -. /etc/init.d/clamd-wrapper +. /usr/share/clamav/clamd-wrapper diff --git a/sources b/sources index 32295b7..c9f586e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -096cffd2633cbac5a14b7080b6f67a67 clamav-0.71.tar.gz +60081ddd9f29cbb8f0a2fe575e5a8afa clamav-0.81.tar.gz +b3c33479713c18794dfe83aa7397c604 clamav-0.81.tar.gz.sig commit 9b62e0af2851c28f6381b6b4626c4739d8573ac7 Author: Michael Schwendt <mschwendt(a)fedoraproject.org> Date: Fri Dec 10 22:03:01 2004 +0000 Bump release, strip off fedora.us prefix and dist tag. diff --git a/clamav.spec b/clamav.spec index d338b5d..e264659 100644 --- a/clamav.spec +++ b/clamav.spec @@ -9,7 +9,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.71 -Release: 0.fdr.2.2 +Release: 2 Epoch: 0 License: GPL Group: Applications/File commit a0e1e1da964db851c8383047d93ac78320b42c3e Author: gafton <gafton(a)fedoraproject.org> Date: Wed Nov 24 03:10:01 2004 +0000 Fix braindead import typo artifact in the default generated Makefile. Oh well, the fedora extras commits list needs a workout anyway... diff --git a/Makefile b/Makefile index aefa629..21be25f 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common))

1 0

Architecture specific change in rpms/clamav.git
by githook-noreply＠fedoraproject.org 27 Jan '18

27 Jan '18

The package rpms/clamav.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=f5659018a4a4a… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=162c660fd5b57… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=656658e8d6f02… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=1b188a1f3f19a… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=14d21bc46d3a5…. Change: -%ifnarch s390 s390x +%ifnarch s390 s390x +%ifnarch s390 s390x -%ifnarch s390 s390x +%ifnarch s390 s390x Thanks. Full change: ============ commit c93e477aa420f38a4421934d407eb576adb57473 Merge: c67bf0c 162c660 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Sat Jan 27 02:21:29 2018 +0000 Merge branch 'el6' commit 162c660fd5b57e919c56c0bd981e25adbb01d65d Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Fri Jan 26 22:54:22 2018 +0000 Clamav 0.99.3 with git "merge" master i.e.: git diff HEAD..master | patch -p1 and git add ChangeLog-rpm.old README.fedora clamav-0.98-umask.patch clamav-0.99-private.patch clamav-milter.systemd clamav-milter.sysv clamav-milter.upstart clamav-update.crond clamav-update.logrotate clamd-README clamd-gen clamd-wrapper clamd.SERVICE.init clamd.scan.upstart clamd.sysconfig clamd@.service clamd(a)scan.service freshclam-sleep freshclam.sysconfig llvm-glibc.patch and again git diff HEAD..master | patch -p1 patching file clamd-gen patching file freshclam-sleep diff --git a/.gitignore b/.gitignore index d87d52b..0c8b00b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/clamd-wrapper.tar.bz2 /clamav-*-norar.tar.xz /main*.cvd /daily*.cvd /bytecode-278.cvd +/bytecode-319.cvd diff --git a/ChangeLog-rpm.old b/ChangeLog-rpm.old new file mode 100644 index 0000000..44c8556 --- /dev/null +++ b/ChangeLog-rpm.old @@ -0,0 +1,279 @@ +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + +* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 +- updated to 0.88.6 + +* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 +- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 +- added patch to set '__attribute__ ((visibility("hidden")))' for + exported MD5_*() functions (fixes #202043) + +* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 +- splitted SysV initscripts of -milter and -server into own subpackages + +* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 +- rebuilt + +* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 +- updated to 0.88.4 (SECURITY) + +* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed the clamdscan(1) manpage from the -server subpackage + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed a superfluous '}' +- removed some code which was relevant for FC-3 only + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 +- updated to 0.88.3 +- updated to new fedora-usermgmt macros + +* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 +- cleanups: removed unneeded curlies, use plain command instead of + %%__XXX macro, whitespace cleanup, removed unneeded versioned + dependencies +- added a 'Requires(post): group(clamav)' dependencies for -update and + added the corresponding Provides: to -data +- removed the %%_without_milter conditional; you won't gain anything + when milter would be disabled at buildtime + +* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 +- updated to 0.88.2 (SECURITY) +- rediffed patches; most issues handled by 0.88.1-2 are fixed in + 0.88.2 + +* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 +- added patch which fixes some classes of compiler warnings; at least + the using of implicitly declared functions was reported to cause + segfaults on AMD64 (brought to my attention by Marc Perkel) +- added patch which fixes wrong usage of strncpy(3) in unrarlib.c + +* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 +- updated to 0.88.1 (SECURITY) + +* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 +- rebuilt for FC5 + +* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 +- updated to 0.88 +- added pseudo-versions for the 'init(...)' provides as a first step + for the support of alternative initmethods + +* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 +- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) +- ship 'clamd.conf.5' man page in the -server subpackage *too*. The + same file is contained in multiple packages now, but this man-page + can not be removed from the base package because it also applies to + 'clamdscan' there (#173221). + +* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 +- updated to 0.87.1 + +* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 +- updated to 0.87 (SECURITY) +- removed -timeout patch; it is solved upstream +- reverted the -exim changes; they add yet more complexity, their + functionality can go into an own package and they contained flaws + +* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 +- Add clamav-exim configuration package + +* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + +* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 +- updated to 0.86.2 (SECURITY) +- changed the freshclam updating mechanism (again); now, it consists + of a crontab which does not need to be changed and a helper script + (freshclam-sleep). This helper script is configured by + /etc/sysconfig/freshclam + +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 +- updated to 0.86.1 +- fixed randomization in %%post scriptlet: hour should be a range but + not a single number + +* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 +- updated to 0.86 +- randomize freshclam startup times in -update's %%post script (suggested + by Stephen Smoogen); this requires some more Requires(post): also + +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 +- fix dist tagging the way Enrico wants it + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 +- Rebuild + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 +- Update + +* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 +- updated to 0.85 + +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 +- updated to 0.84 + +* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> +- rebuilt + +* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 +- updated to 0.83 + +* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 +- updated to 0.82 +- minor spec cleanups + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 +- build the package with '--disable-zlib-vcheck' because RH is unable to + apply a fix for a 5 month old and solved security issue. Please fill + your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +- added 'BuildRequires: bc' (should work without also, but ./configure + gives out ugly warnings else) + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 +- updated to 0.81 +- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports + an internal mode now which is enabled by default +- updated -milter %%description + +* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 +- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update + subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) + +* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 +- updated to 0.80 +- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore +- buildrequire 'curl-devel' +- renamed clamav.conf to clamd.conf (upstream change) +- updated -initoff patch + +* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 +- updated to 0.75.1 +- use %%configure, the problems with the architecture specification + seem to have passed (probably because of an autoconf update) +- set mode 0600 for the cron-script (required by vixie-cron) +- made the cronjob a spambot and send mail about deactivated freshclam + service to nearly everybody... (root, postmaster, webmaster) +- other fixes in the notification cronjob + +* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 +- updated to 0.75 + +* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 +- moved /usr/bin/clamav-config from main into -devel + +* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 +- updated to 0.74 + +* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 +- updated to 0.73 +- added pkgconfig file + +* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 +- notify the user about a deactivated clamav-update service +- added clamd-gen script which generates template spec-files for + services using clamd +- copied template configuration files to %pkgdatadir/template (needed + for clamd-gen) +- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink + will be provided for compatibility reasons +- conditionalized building of the -milter subpackage ('--without + milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) + +* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 +- removed 'BuildRequires: dietlibc'; it was a leftover from the + pre-use-signal era (before 0.70) (bug #1716) + +* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 +- updated to 0.72 + +* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 +- removed the randomization in the cronjob; it seems to be impossible + to use the mod-operator (%%) there. Instead of, the user has to + replace some placeholders... + +* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 +- updated to 0.71 + +* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 +- quote 'EOF' to delay $RANDOM expansion + +* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 +- updated GECOS entry for the 'clamav' user to describe its purpose + more accurately +- use explicit '-m755' when creating directories with install + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 +- updated to 0.70; rediffed some patches +- updated logrotate script to use signals and documented the steps + which are needed to make it work +- adapted initscript to use signals instead of sockwrite +- removed sockwrite; signals can now be used to reload the database +- added logfile to the -milter subpackage + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 +- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets + +* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 +- split the double Requires(...,...): statements; see + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 +- require the recent fedora-usermgmt package (0.7) which fixes similar + ordering issues + +* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 +- updated to 0.68 (using the -1 version) +- ship milter-files in the -milter instead of the -server subpackage + +* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 +- fixed ':' vs. '.' in chown + +* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 +- randomize freshclam startup to prevent server peaks + +* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 +- updated to 0.67 (using the -1 version) + +* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 +- updated to 0.66; important, packaging-relevant changes are + freshclam: + * $http_proxy is not supported anymore; you have to configure it in + /etc/freshclam.conf + * the logfile has been renamed to /var/log/freshclam.log +- removed %%check section; buildroot check is implemented in local + testsuite already +- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew + files +- added some directory-Requires: +- activated milter-package and made it work +- added patch to disable clamav-milter service by default +- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this + makes things more consistently but can break backward compatibility. The + initscript should deal with the old version too, but I would not bet on + it... +- updated some descriptions +- fixed the update-mechanism; now it happens in two stages: at first, + the files will be downloaded as user 'clamav' and then, root initiates + the daemon-reload. + +* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 +- added security fix for + http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..8df192d --- /dev/null +++ b/README.fedora @@ -0,0 +1,116 @@ +A clamav-milter setup consists of the following three components: + +* the clamav-milter itself + + --> this is provided by the 'clamav-milter' package plus (alternatively) + 'clamav-milter-upstart' or 'clamav-milter-sysvinit' + + The main configuration is in /etc/mail/clamav-milter.conf and MUST + be changed before first use. + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamav-milter to + enable automatic startup. See comments there for more details. + +* a clamav scanner daemon + + --> this package is called 'clamav-scanner' plus (alternatively) + 'clamav-scanner-upstart' or 'clamav-scanner-sysvinit' + + The daemon is configured by /etc/clamd.d/scan.conf (which MUST be + edited before first use). + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamd.scan to enable + automatic startup. See comments there for more details. + +* the MTA (sendmail/postfix) + + --> you should know how to install this... + + When communicating across unix sockets with the clamav-milter, it is + suggested to use the /var/run/clamav-milter/clamav-milter.socket + path. You have to add something like + + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav-milter.socket, F=, T=S:4m;R:4m')dnl + + to your sendmail.mc. + + + +It is suggested that components communicate through TCP sockets as +this eases setup. Please add corresponding packet filter rules! + + +EXAMPLE +======= + +For clamav-milter, a possible setup might be created by + +A) On the MTA (assumed hostname 'host-mta') + + 1. Add to sendmail.mc + + | INPUT_MAIL_FILTER(`clamav', `S=inet:6666@host-milter, F=, T=S:4m;R:4m')dnl + + 2. Rebuild sendmail.cf + + +B) On the clamav-milter host (assumed hostname 'host-milter') + + 1. Install clamav-milter + clamav-milter-upstart packages + + 2. Set in /etc/mail/clamav-milter.conf + + | MilterSocket inet:6666 + | ClamdSocket tcp:host-scanner:6665 + + and all the other options which are required on your system + + 3. Edit /etc/event.d/clamav-milter and uncomment the + + | start on starting local + + line. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cmilt + | iptables -A IN-cmilt -s host-mta -j ACCEPT + | iptables -A IN-cmilt -j DROP + + | iptables -A INPUT -p tcp --dport 6666 -j IN-cmilt + + to your firewall setup + +C) On the clamav-scanner host (assumed hostname 'host-scanner') + + 1. Install clamav-scanner + clamav-scanner-upstart packages + + 2. Add to /etc/clamd.d/scan.conf + + | TCPSocket 6665 + | TCPAddr host-scanner + + comment out possible 'LocalSocket' lines and set all the other + options which are required on your system + + 3. Edit /etc/event.d/clamav-scanner and uncomment the + + | start on starting local + + line. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cscan + | iptables -A IN-cscan -s host-milter -j ACCEPT + | iptables -A IN-cscan -j DROP + + | iptables -A INPUT -p tcp --dport 6665 -j IN-csan + + to your firewall setup diff --git a/clamav-0.98-umask.patch b/clamav-0.98-umask.patch new file mode 100644 index 0000000..b9aa421 --- /dev/null +++ b/clamav-0.98-umask.patch @@ -0,0 +1,33 @@ +--- clamav-0.98/clamav-milter/clamav-milter.c 2013-09-16 21:28:14.000000000 +0200 ++++ clamav-0.98/clamav-milter/clamav-milter.c.umask 2013-10-06 20:39:08.000000000 +0200 +@@ -374,7 +374,7 @@ + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0002); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +--- clamav-0.98/shared/output.c 2013-09-16 21:28:14.000000000 +0200 ++++ clamav-0.98/shared/output.c.umask 2013-10-06 20:39:28.000000000 +0200 +@@ -348,7 +348,7 @@ + logg_open(); + + if(!logg_fp && logg_file) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +--- clamav-0.98/freshclam/freshclam.c 2013-09-16 21:28:14.000000000 +0200 ++++ clamav-0.98/freshclam/freshclam.c.umask 2013-10-06 20:39:47.000000000 +0200 +@@ -123,7 +123,7 @@ + { + FILE *fd; + int old_umask; +- old_umask = umask (0006); ++ old_umask = umask (0022); + if ((fd = fopen (pidfile, "w")) == NULL) + { + logg ("!Can't save PID to file %s: %s\n", pidfile, strerror (errno)); diff --git a/clamav-0.99-private.patch b/clamav-0.99-private.patch new file mode 100644 index 0000000..7f9f563 --- /dev/null +++ b/clamav-0.99-private.patch @@ -0,0 +1,27 @@ +--- clamav-0.99/libclamav.pc.in 2015-09-18 22:48:25.000000000 +0200 ++++ clamav-0.99/libclamav.pc.in.private 2015-12-02 01:30:30.055231319 +0100 +@@ -7,6 +7,6 @@ + Description: A GPL virus scanner + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lclamav +-Libs.private: @LIBCLAMAV_LIBS@ ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ + Cflags: -I${includedir} + +--- clamav-0.99/clamav-config.in 2015-05-28 23:56:25.000000000 +0200 ++++ clamav-0.99/clamav-config.in.private 2015-12-02 01:31:34.933705763 +0100 +@@ -54,12 +54,8 @@ + usage 0 + ;; + +- --cflags) +- echo -I@includedir@ @CFLAGS@ +- ;; +- +- --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ (--cflags|--libs) ++ ${PKG_CONFIG:-pkg-config} "$1" libclamav + ;; + + *) diff --git a/clamav-milter.init b/clamav-milter.init deleted file mode 100644 index d9fb037..0000000 --- a/clamav-milter.init +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# Startup script for the Clamav Milter Daemon -# -# chkconfig: - 77 23 -# description: clamav-milter is a daemon which hooks into sendmail \ -# and routes email messages to clamav. -# processname: clamav-milter -# pidfile: /var/run/clamav/clamav-milter.pid -# config: /etc/sysconfig/clamav-milter - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -[ -x /usr/sbin/clamav-milter ] || exit 0 - -# Local clamav-milter config -CLAMAV_FLAGS= -test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter - -# See how we were called. -case "$1" in - start) - echo -n "Starting Clamav Milter Daemon: " - daemon clamav-milter $CLAMAV_FLAGS - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamav-milter - ;; - stop) - echo -n "Stopping Clamav Milter Daemon: " - killproc clamav-milter - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamav-milter - ;; - status) - status clamav-milter - RETVAL=$? - ;; - restart|reload) - $0 stop - $0 start - RETVAL=$? - ;; - condrestart) - [ -e /var/lock/subsys/clamav-milter ] && $0 restart - RETVAL=$? - ;; - *) - echo "Usage: clamav-milter {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -exit $RETVAL diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig deleted file mode 100644 index 834b0cd..0000000 --- a/clamav-milter.sysconfig +++ /dev/null @@ -1,4 +0,0 @@ -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" diff --git a/clamav-milter.systemd b/clamav-milter.systemd new file mode 100644 index 0000000..7571038 --- /dev/null +++ b/clamav-milter.systemd @@ -0,0 +1,25 @@ +[Unit] +Description = Milter module for the Clam Antivirus scanner +After = syslog.target nss-lookup.target network.target +Before = sendmail.service +Before = postfix.service +After = clamd(a)scan.service + +[Service] +Type = forking +ExecStart = /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf +Restart = on-failure + +User=clamilt +Group=clamilt + +PrivateTmp=yes +PrivateDevices=yes +CapabilityBoundingSet=CAP_KILL + +ReadOnlyDirectories=/etc +ReadOnlyDirectories=/usr +ReadOnlyDirectories=/var/lib + +[Install] +WantedBy = multi-user.target diff --git a/clamav-milter.sysv b/clamav-milter.sysv new file mode 100644 index 0000000..3e37ae0 --- /dev/null +++ b/clamav-milter.sysv @@ -0,0 +1,93 @@ +#!/bin/bash +# +# clamav-milter Starts/stop the "clamav-milter" daemon +# +# chkconfig: - 79 31 +# description: A virus scanning milter + +# Source function library. +. /etc/rc.d/init.d/functions + +exec=/usr/sbin/clamav-milter +prog="clamav-milter" + +OPTS='-c /etc/mail/clamav-milter.conf' +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +pidfile=/var/run/clamav-milter/milter.pid +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + [ -f $config ] || exit 6 + echo -n $"Starting $prog: " + daemon --pidfile=${pidfile} $exec $OPTS --foreground=no --pid=${pidfile} + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -p "${pidfile}" $exec + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + # run checks to determine if the service is running or use generic status + status -p "${pidfile}" $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? diff --git a/clamav-milter.upstart b/clamav-milter.upstart new file mode 100644 index 0000000..1a10b8e --- /dev/null +++ b/clamav-milter.upstart @@ -0,0 +1,14 @@ +### !!! Uncomment only *one* of the 'start on' statements !!! + +### Uncomment these lines when you want clamav-milter to be a milter +### for a locally running MTA +#start on (starting sendmail or starting postfix) + +### Uncomment these lines when you want clamav-milter to be a milter +### for a remotely running MTA +#start on runlevel [345] and starting local + +stop on runlevel [!345] + +respawn +exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --foreground=yes diff --git a/clamav-update.crond b/clamav-update.crond new file mode 100644 index 0000000..dc85745 --- /dev/null +++ b/clamav-update.crond @@ -0,0 +1,6 @@ +## Adjust this line... +MAILTO=root + +## It is ok to execute it as root; freshclam drops privileges and becomes +## user 'clamupdate' as soon as possible +0 */3 * * * root /usr/share/clamav/freshclam-sleep diff --git a/clamav-update.logrotate b/clamav-update.logrotate new file mode 100644 index 0000000..0de6062 --- /dev/null +++ b/clamav-update.logrotate @@ -0,0 +1,4 @@ +/var/log/freshclam.log { + monthly + notifempty +} diff --git a/clamav.init b/clamav.init deleted file mode 100755 index 633c301..0000000 --- a/clamav.init +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# Startup script for the Clam AntiVirus Daemon -# -# chkconfig: - 61 39 -# description: Clam AntiVirus Daemon is a TCP/IP or socket protocol \ -# server. -# processname: clamd -# pidfile: /var/run/clamav/clamd.pid -# config: /etc/clamd.conf - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -[ -x /usr/sbin/clamd ] || exit 0 - -# Local clamd config -test -f /etc/sysconfig/clamd && . /etc/sysconfig/clamd - -# See how we were called. -case "$1" in - start) - echo -n "Starting Clam AntiVirus Daemon: " - daemon clamd - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd - ;; - stop) - echo -n "Stopping Clam AntiVirus Daemon: " - killproc clamd - rm -f /var/run/clamav/clamd.sock - rm -f /var/run/clamav/clamd.pid - RETVAL=$? - echo -### heres the fix... we gotta remove the stale files on restart - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamd - ;; - status) - status clamd - RETVAL=$? - ;; - restart|reload) - $0 stop - $0 start - RETVAL=$? - ;; - condrestart) - [ -e /var/lock/subsys/clamd ] && $0 restart - RETVAL=$? - ;; - *) - echo "Usage: clamd {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -exit $RETVAL diff --git a/clamav.spec b/clamav.spec index 2fd02bd..a44be34 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,762 +1,1418 @@ -### FIXME: Sysv script does not have condrestart option (redo sysv script) -### FIXME: amavisd-new requires clamd to run as user vscan, solution needed -### REMINDER: Look and sync with Petr Kristof's work - -Summary: Anti-virus software -Name: clamav -Version: 0.99.2 -Release: 3%{?dist} -License: GPLv2 -Group: Applications/System -URL: http://www.clamav.net/ +#global prerelease rc1 + +## Fedora Extras specific customization below... +%bcond_without fedora +%if 0%{?fedora} || 0%{?rhel} > 6 +%bcond_without systemd +%bcond_without tmpfiles +%bcond_with sysv +%bcond_with upstart +%else +%if 0%{?rhel} == 6 +%bcond_with systemd +%bcond_with tmpfiles +%bcond_without sysv +%bcond_without upstart +%else +%bcond_with systemd +%bcond_with tmpfiles +%bcond_without sysv +%bcond_with upstart +%endif +%endif +%bcond_with unrar +%bcond_without noarch +%bcond_without bytecode +## + +%global _hardened_build 1 +%ifnarch s390 s390x +%global have_ocaml 1 +%else +%global have_ocaml 0 +%endif + +%{!?_rundir:%global _rundir /var/run} + +%global updateuser clamupdate +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log +%global milterstatedir %_rundir/clamav-milter +%global pkgdatadir %_datadir/%name + +%global scanuser clamscan +%global scanstatedir %_rundir/clamd.scan + +%{?with_noarch:%global noarch BuildArch: noarch} +%{!?_unitdir:%global _unitdir /lib/systemd/system} +%{!?_initrddir:%global _initrddir /etc/rc.d/init.d} +%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} +%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ +%nil} +%{!?systemd_reqs:%global systemd_reqs \ +Requires(post): /bin/systemctl\ +Requires(preun): /bin/systemctl\ +Requires(postun): /bin/systemctl\ +%nil} +%{!?systemd_install:%global systemd_install()\ +%post %1\ +%systemd_post %2 \ +%preun %1\ +%systemd_preun %2 \ +%postun %1\ +%systemd_postun_with_restart %2 \ +%nil} + + +Summary: End-user tools for the Clam Antivirus scanner +Name: clamav +Version: 0.99.3 +Release: 1%{?dist} +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} +Group: Applications/File +URL: http://www.clamav.net +%if %{with unrar} +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +%else # Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. This +# incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by # make clean-sources NAME=clamav VERSION=<version> TARBALL=clamav-<version>.tar.gz TARBALL_CLEAN=clamav-<version>-norar.tar.xz -# Upstream: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-%{version}-norar.tar.xz -Source1: clamav.init -Source2: clamav-milter.init -Source3: clamd-wrapper.tar.bz2 - -Source7: freshclam.cron -Source8: freshclam.logrotate -Source9: clamd.logrotate -Source10: clamav-milter.sysconfig - +Source0: %name-%version%{?prerelease}-norar.tar.xz +%endif +#for server +Source2: clamd.sysconfig +Source3: clamd.logrotate +Source5: clamd-README +Source7: clamd.SERVICE.init # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). -Source11: http://db.local.clamav.net/main-57.cvd -Source12: http://db.local.clamav.net/daily-21723.cvd -Source13: http://db.local.clamav.net/bytecode-278.cvd +# Check the first line of the file for version, file is not working +# see https://bugzilla.redhat.com/show_bug.cgi?id=1539107 +Source10: http://db.local.clamav.net/main-58.cvd +Source11: http://db.local.clamav.net/daily-24253.cvd +Source12: http://db.local.clamav.net/bytecode-319.cvd +#for devel +Source100: clamd-gen +#for update +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.crond +Source203: clamav-update.logrotate +#for milter +Source300: README.fedora +#for clamav-milter.upstart +Source310: clamav-milter.upstart +#for milter-sysvinit +Source320: clamav-milter.sysv +#for clamav-milter.systemd +Source330: clamav-milter.systemd +#for scanner-upstart +Source410: clamd.scan.upstart +#for scanner-systemd +Source430: clamd(a)scan.service +#for server-sysvinit +Source520: clamd-wrapper +#for server-systemd +Source530: clamd@.service + +Patch24: clamav-0.99-private.patch +Patch27: clamav-0.98-umask.patch +# https://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Int… +Patch30: llvm-glibc.patch +Patch31: clamav-0.99.1-setsebool.patch +Patch33: clamav-0.99.2-temp-cleanup.patch + + + +BuildRequires: autoconf automake gettext-devel libtool libtool-ltdl-devel +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel openssl-devel libxml2-devel +BuildRequires: %_includedir/tcpd.h +%{?with_bytecode:BuildRequires: bc tcl groff graphviz} +%if %{have_ocaml} +%{?with_bytecode:BuildRequires: ocaml} +%endif +# nc reuqired for tests +BuildRequires: nc +%if %{with systemd} +BuildRequires: systemd +%endif +#for milter +BuildRequires: sendmail-devel -Patch31: clamav-0.99.1-setsebool.patch -Patch32: clamav-0.99.2-temp-cleanup.patch +Requires: clamav-lib = %version-%release +Requires: data(clamav) -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%description +Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this +software is the integration with mail servers (attachment scanning). The +package provides a flexible and scalable multi-threaded daemon, a command +line scanner, and a tool for automatic updating via Internet. The programs +are based on a shared library distributed with the Clam AntiVirus package, +which you can use with your own software. The virus database is based on +the virus database from OpenAntiVirus, but contains additional signatures +(including signatures for popular polymorphic viruses, too) and is KEPT UP +TO DATE. + +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(%updateuser) = 4 +Provides: group(%updateuser) = 4 +Provides: group(virusgroup) +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +Requires(pre): shadow-utils +%{?noarch} + +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. + + +%package lib +Summary: Dynamic libraries for the Clam Antivirus scanner +Group: System Environment/Libraries +Requires: data(clamav) + +%description lib +This package contains dynamic libraries shared between applications +using the Clam Antivirus scanner. -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel, pcre-devel -%{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} -Requires: clamav-db = %{version}-%{release} -Requires(pre): shadow-utils +%package devel +Summary: Header files and libraries for the Clam Antivirus scanner +Group: Development/Libraries +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release +Requires: openssl-devel -### Fedora Extras introduced them differently :( -Provides: libclamav -Obsoletes: libclamav < %{version}-%{release} -Provides: clamav-lib = %{version}-%{release} -Obsoletes: clamav-lib < %{version}-%{release} +%description devel +This package contains headerfiles and libraries which are needed to +build applications using clamav. + + +%package data +Summary: Virus signature data for the Clam Antivirus scanner +Group: Applications/File +Requires: clamav-filesystem = %version-%release +Requires: clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full +%{?noarch} + +%description data +This package contains the virus-database needed by clamav. This +database should be updated regularly; the 'clamav-update' package +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty +%{?noarch} + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%package update +Summary: Auto-updater for the Clam Antivirus scanner data-files +Group: Applications/File +Requires: clamav-filesystem = %version-%release +Requires: crontabs +Requires: /etc/cron.d +Requires(post): %__chown %__chmod +Requires(post): group(%updateuser) + +%description update +This package contains programs which can be used to update the clamav +anti-virus database automatically. It uses the freshclam(1) utility for +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. + + +%package server +Summary: Clam Antivirus scanner server +Group: System Environment/Daemons +Requires: data(clamav) +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release +Requires: coreutils +%if ! %{with sysv} +Obsoletes: clamav-server-sysvinit < %version-%release +%endif + +%description server +ATTENTION: most users do not need this package; the main package has +everything (or depends on it) which is needed to scan for virii on +workstations. + +This package contains files which are needed to execute the clamd-daemon. +This daemon does not provide a system-wide service. Instead of, an instance +of this daemon should be started for each service requiring it. + +See the README file how this can be done with a minimum of effort. + + +%package server-sysvinit +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release +Requires: %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} + +%description server-sysvinit +SysV initscripts template for the clamav server + + +%package server-systemd +Summary: Systemd initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = systemd +Requires: clamav-server = %version-%release +%{?systemd_reqs} +%{?noarch} + +%description server-systemd +Systemd template for the clamav server + + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 +Requires: clamav-server = %version-%release +Requires(pre): shadow-utils +Requires(pre): group(virusgroup) +%if ! %{with sysv} +Obsoletes: clamav-scanner-sysvinit < %version-%release +%endif +%if ! %{with upstart} +Obsoletes: clamav-scanner-upstart < %version-%release +%endif +%{?noarch} + +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + + +# Remove me after EOL of RHEL5 +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires: %_initrddir +Requires(postun): initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +%{?noarch} + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + + +# Remove me after EOL of RHEL6 +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +Requires: /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + + +%package scanner-systemd +Summary: Systemd initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = systemd +Requires: clamav-scanner = %version-%release +Requires: clamav-server-systemd = %version-%release +%{?systemd_reqs} +%{?noarch} + +%description scanner-systemd +The systemd initscripts for clamav-scanner. -%description -Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of -this software is the integration with mail servers (attachment scanning). -The package provides a flexible and scalable multi-threaded daemon, a -command line scanner, and a tool for automatic updating via Internet. - -The programs are based on a shared library distributed with the Clam -AntiVirus package, which you can use with your own software. Most -importantly, the virus database is kept up to date - -%package -n clamd -Summary: The Clam AntiVirus Daemon -Group: System Environment/Daemons -Requires: clamav = %{version}-%{release} - -### Fedora Extras introduced them differently :( -Provides: clamav-server = %{version}-%{release} -Obsoletes: clamav-server < %{version}-%{release} -Provides: clamav-server-sysv = %{version}-%{release} -Obsoletes: clamav-server-sysv < %{version}-%{release} -Provides: clamav-scanner = %{version}-%{release} -Obsoletes: clamav-scanner < %{version}-%{release} -Provides: clamav-scanner-upstart = %{version}-%{release} -Obsoletes: clamav-scanner-upstart < %{version}-%{release} -Provides: clamav-server-sysvinit = %{version}-%{release} -Obsoletes: clamav-server-sysvinit < %{version}-%{release} - - -%description -n clamd -The Clam AntiVirus Daemon %package milter -Summary: The Clam AntiVirus sendmail-milter Daemon -Group: Applications/System -Requires: clamd = %{version}-%{release} -Requires: /usr/sbin/sendmail -Provides: clamav-milter-sysv = %{version}-%{release} -Obsoletes: clamav-milter-sysv < %{version}-%{release} -Provides: clamav-milter-sysvinit = %{version}-%{release} -Obsoletes: clamav-milter-sysvinit < %{version}-%{release} +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Requires: init(clamav-milter) +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 +Requires(post): coreutils +Requires(pre): shadow-utils +Requires(pre): group(virusgroup) + +Provides: milter(clamav) = sendmail +Provides: milter(clamav) = postfix + +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release +%if ! %{with sysv} +Obsoletes: clamav-milter-sysvinit < %version-%release +%endif +%if ! %{with upstart} +Obsoletes: clamav-milter-upstart < %version-%release +%endif %description milter -The Clam AntiVirus sendmail-milter Daemon - -%package db -Summary: Virus database for %{name} -Group: Applications/Databases -### Remove circular dependency -#Requires: clamav = %{version}-%{release} - -### Fedora Extras introduced them differently :( -Provides: clamav-update = %{version}-%{release} -Obsoletes: clamav-update < %{version}-%{release} -Provides: clamav-data = %{version}-%{release} -Obsoletes: clamav-data < %{version}-%{release} -Obsoletes: clamav-data-empty <= %{version}-%{release} -# Ugly to put these in the db-package, but needed -# here to handle upgrades on EL5. -Provides: clamav-filesystem = %{version}-%{release} -Obsoletes: clamav-filesystem < %{version}-%{release} - -%description db -The actual virus database for %{name} +This package contains files which are needed to run the clamav-milter. + + +# Remove me after EOL of RHEL5 +%package milter-sysvinit +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter +Requires: %_initrddir +Requires(postun): initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} + +%description milter-sysvinit +The SysV initscripts for clamav-milter. + + +# Remove me after EOL of RHEL6 +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +Requires: /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%description milter-upstart +The Upstart initscripts for clamav-milter. + + +%package milter-systemd +Summary: Systemd initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = systemd +Requires: clamav-milter = %version-%release +%{?systemd_reqs} +%{?noarch} + +%description milter-systemd +The systemd initscripts for clamav-scanner. +## ------------------------------------------------------------ -%package devel -Summary: Header files, libraries and development documentation for %{name} -Group: Development/Libraries -Requires: clamav = %{version}-%{release}, openssl-devel +%prep +%setup -q -n %{name}-%{version}%{?prerelease} -### Fedora Extras introduced them differently :( -Obsoletes: libclamav-static-devel <= %{version}-%{release} -Obsoletes: libclamav-devel <= %{version}-%{release} -Provides: libclamav-static-devel, libclamav-devel +%apply -n24 -p1 -b .private +%apply -n27 -p1 -b .umask +%apply -n30 -p1 +%apply -n31 -p1 -b .setsebool +%apply -n33 -p1 -b .temp-cleanup +%{?apply_end} -%description devel -This package contains the header files, static libraries and development -documentation for %{name}. If you like to develop programs using %{name}, -you will need to install %{name}-devel. +install -p -m0644 %SOURCE300 clamav-milter/ + +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} + +sed -ri \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf.sample + +sed -ri \ + -e 's!^Example!#Example!' \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%updateuser!g' etc/freshclam.conf.sample -%prep -# Handle that rpmbuild in RHEL < 6 doesn't handle xz archives automatically. -%setup -q -T -c -xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) -%patch31 -p1 -b .setsebool -%patch32 -p1 -b .temp-cleanup - -%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure - -%{__perl} -pi.orig -e ' - s|\@DBDIR\@|\$(localstatedir)/lib/clamav|g; - s|\@DBINST\@|\$(localstatedir)/lib/clamav|g; - s|\@CFGDIR\@|\$(sysconfdir)|g; - s|\@CFGINST\@|\$(sysconfdir)|g; - s|^\@INSTALL_CLAMAV_CONF_TRUE\@|\t|g; - s|^\@INSTALL_FRESHCLAM_CONF_TRUE\@|\t|g; - ' database/Makefile.in etc/Makefile.in - -%{__perl} -pi.orig -e ' - s|^(Example)|#$1|; - s|^#(LogFile) .+$|$1 %{_localstatedir}/log/clamav/clamd.log|; - s|^#(LogFileMaxSize) .*|$1 0|; - s|^#(LogTime)|$1|; - s|^#(LogSyslog)|$1|; - s|^#(PidFile) .+$|$1 %{_localstatedir}/run/clamav/clamd.pid|; - s|^#(TemporaryDirectory) .+$|$1 %{_localstatedir}/tmp|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; - s|^#(LocalSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; - s|^#(FixStaleSocket)|$1|; - s|^#(TCPSocket) .+$|$1 3310|; - s|^#(TCPAddr) .+$|$1 127.0.0.1|; - s|^#(MaxConnectionQueueLength) .+$|$1 30|; - s|^#(StreamSaveToDisk)|$1|; - s|^#(MaxThreads) .+$|$1 50|; - s|^#(ReadTimeout) .+$|$1 300|; - s|^#(User) .+$|$1 clam|; - s|^#(AllowSupplementaryGroups).*$|$1 yes|; - s|^#(ScanPE) .+$|$1 yes|; - s|^#(ScanELF) .+$|$1 yes|; - s|^#(DetectBrokenExecutables)|$1|; - s|^#(ScanOLE2) .+$|$1 yes|; - s|^#(ScanMail)|$1|; - s|^#(ScanArchive) .+$|$1 yes|; - s|^#(ArchiveMaxCompressionRatio) .+|$1 300|; - s|^#(ArchiveBlockEncrypted)|$1|; - s|^#(ArchiveBlockMax)|$1|; - ' etc/clamd.conf.sample - -%{__perl} -pi.orig -e ' - s|^(Example)|#$1|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; - s|^#(UpdateLogFile) .+$|$1 %{_localstatedir}/log/clamav/freshclam.log|; - s|^#(LogSyslog)|$1|; - s|^#(DatabaseOwner) .+$|$1 clam|; - s|^(Checks) .+$|$1 24|; - ' etc/freshclam.conf.sample - -%{__perl} -pi.orig -e ' - s|^(Example)|#$1|; - s|^#(User) .+$|$1 clam|; - s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|; - s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|; - s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf.sample + +## ------------------------------------------------------------ %build -%configure \ - --program-prefix="%{?_program_prefix}" \ -%{!?_without_milter:--enable-milter} \ - --disable-clamav \ - --disable-static \ - --disable-zlib-vcheck \ - --disable-unrar \ - --enable-id-check \ - --enable-dns \ - --with-dbdir="%{_localstatedir}/lib/clamav" \ - --with-group="clam" \ - --with-libcurl=%{_prefix} \ - --with-user="clam" \ -# --disable-llvm - -make %{?_smp_mflags} +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98" +export LDFLAGS='%{?__global_ldflags} -Wl,--as-needed' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes + +rm -rf libltdl autom4te.cache Makefile.in +autoreconf -i +%configure \ + --disable-static \ + --disable-rpath \ + --disable-silent-rules \ + --disable-clamav \ + --with-user=%updateuser \ + --with-group=%updateuser \ + --with-libcurl=%{_prefix} \ + --with-dbdir=%homedir \ + --enable-milter \ + --enable-clamdtop \ + --disable-zlib-vcheck \ + %{!?with_bytecode:--disable-llvm} \ + %{!?with_unrar:--disable-unrar} + +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool + +%make_build + + +## ------------------------------------------------------------ %install -rm -rf %{buildroot} -make install DESTDIR="%{buildroot}" +rm -rf "$RPM_BUILD_ROOT" _doc* +%make_install + +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + +install -d -m 0755 \ + $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,logrotate.d} \ + $RPM_BUILD_ROOT%_tmpfilesdir \ + $RPM_BUILD_ROOT%_rundir \ + $RPM_BUILD_ROOT%_var/log \ + $RPM_BUILD_ROOT%milterstatedir \ + $RPM_BUILD_ROOT%pkgdatadir/template \ + $RPM_BUILD_ROOT%_initrddir \ + $RPM_BUILD_ROOT%homedir \ + $RPM_BUILD_ROOT%scanstatedir + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf.sample \ + $RPM_BUILD_ROOT%_libdir/*.la + + +%{?with_bytecode:touch $RPM_BUILD_ROOT%homedir/bytecode.cld} +touch $RPM_BUILD_ROOT%homedir/{daily,main}.cld +touch $RPM_BUILD_ROOT%homedir/mirrors.dat + +install -D -m 0644 -p %SOURCE10 $RPM_BUILD_ROOT%homedir/main.cvd +install -D -m 0644 -p %SOURCE11 $RPM_BUILD_ROOT%homedir/daily.cvd +%{?with_bytecode:install -D -m 0644 -p %SOURCE12 $RPM_BUILD_ROOT%homedir/bytecode.cvd} + +## prepare the server-files +install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate +%if %{with sysv} +install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init +%endif +install -D -m 0644 -p %SOURCE5 _doc_server/README +install -D -m 0644 -p etc/clamd.conf.sample _doc_server/clamd.conf -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd -install -Dp -m0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav +%if %{with sysv} +install -m 0644 -p %SOURCE520 $RPM_BUILD_ROOT%pkgdatadir/ +%endif +install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template -mv -f %{buildroot}%{_sysconfdir}/clamd.conf{.sample,} -mv -f %{buildroot}%{_sysconfdir}/freshclam.conf{.sample,} +%if %{with sysv} +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper +%endif +install -D -p -m 0644 %SOURCE530 $RPM_BUILD_ROOT%_unitdir/clamd@.service -# now rewrite scripts and config files in-place -sed -i \ - -e 's!%%{_sbindir}!%{_sbindir}!g' \ - -e 's!%%{_bindir}!%{_bindir}!g' \ - -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ - %{buildroot}%{_sysconfdir}/cron.daily/freshclam \ - %{buildroot}%{_sysconfdir}/logrotate.d/* - -%if %{!?_without_milter:1}0 -install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter -mv -f %{buildroot}%{_sysconfdir}/clamav-milter.conf{.sample,} -%else -rm %{buildroot}%{_mandir}/man8/clamav-milter.8* + +## prepare the update-files +install -D -m 0644 -p %SOURCE203 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update +touch $RPM_BUILD_ROOT%freshclamlog + +install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update +mv -f $RPM_BUILD_ROOT%_sysconfdir/freshclam.conf{.sample,} + +smartsubst 's!webmaster,clamav!webmaster,%updateuser!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep + + +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf.sample > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf + +%if %{with sysv} +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan %endif -# Install clamav-wrapper: -tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share -install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ -touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log -touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log +install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf +install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd(a)scan.service + +cat << EOF > $RPM_BUILD_ROOT%_tmpfilesdir/clamd.scan.conf +d %scanstatedir 0710 %scanuser %scanuser +EOF + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} -install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ -install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd -install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd -install -Dp -m0644 %{SOURCE13} %{buildroot}%{_localstatedir}/lib/clamav/bytecode.cvd -touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/bytecode.cld -touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/{daily,main}.cld -touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/mirrors.dat +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /var/run/clamd/clamd.socket! %scanstatedir/clamd.sock!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf.sample > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf + +install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf +%if %{with sysv} +install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +%endif +install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service +cat << EOF > $RPM_BUILD_ROOT%_tmpfilesdir/clamav-milter.conf +d %milterstatedir 0710 %milteruser %milteruser +EOF -# Clean up for later usage in documentation -for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf.sample +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} -%post -/sbin/ldconfig +%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} +%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} +%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} +%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_rundir/*/*.pid} +%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_tmpfilesdir} -ZONES="/usr/share/zoneinfo/zone.tab" -CONFIG="/etc/sysconfig/clock" +%if %{with systemd} +# TODO: Evaluate using upstream's unit files +rm $RPM_BUILD_ROOT%_unitdir/clamav-{daemon,freshclam}.* +%endif -if [ -r "$CONFIG" -a -r "$ZONES" -a -n "$ZONE" ]; then - source "$CONFIG" - export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | grep -v ^# | head -1 | cut -f1 | tr [A-Z] [a-z])" -fi +%if %{with sysv} +# keep clamd-wrapper in every case because it might be needed by other +# packages +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper +%endif -if [ -z "$CODE" ]; then - export CODE="local" -fi +## ------------------------------------------------------------ -%{__perl} -pi -e ' - s|^(DatabaseMirror) database\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; - s|^(DatabaseMirror) db\.\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; - ' %{_sysconfdir}/freshclam.conf{,.rpmnew} &>/dev/null || : +%check +make check -%postun -p /sbin/ldconfig +## ------------------------------------------------------------ -%pre -getent group clam >/dev/null || groupadd -r clam -getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ - -c "Clam Anti Virus Checker" clam +%pre filesystem +getent group %{updateuser} >/dev/null || groupadd -r %{updateuser} +getent passwd %{updateuser} >/dev/null || \ + useradd -r -g %{updateuser} -d %{homedir} -s /sbin/nologin \ + -c "Clamav database update user" %{updateuser} +getent group virusgroup >/dev/null || groupadd -r virusgroup +usermod %{updateuser} -a -G virusgroup exit 0 -%pre -n clamd -getent group clam >/dev/null || groupadd -r clam -getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ - -c "Clam Anti Virus Checker" clam + +%pre scanner +getent group %{scanuser} >/dev/null || groupadd -r %{scanuser} +getent passwd %{scanuser} >/dev/null || \ + useradd -r -g %{scanuser} -d / -s /sbin/nologin \ + -c "Clamav scanner user" %{scanuser} +usermod %{scanuser} -a -G virusgroup exit 0 -%post -n clamd -/sbin/chkconfig --add clamd -%preun -n clamd -if [ $1 -eq 0 ]; then - /sbin/service clamd stop &>/dev/null || : - /sbin/chkconfig --del clamd -fi +%{?with_tmpfiles: +%post scanner +%{?with_systemd:/bin/systemd-tmpfiles --create %_tmpfilesdir/clamd.scan.conf || :}} + + +%post server-systemd +test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || : + +%postun server-systemd +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + +%systemd_install scanner-systemd clamd(a)scan.service + + +%post update +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%updateuser %freshclamlog + ! test -x /sbin/restorecon || /sbin/restorecon %freshclamlog +} + +%triggerin update -- %name-update < 0.97.3-1704 +# remove me after F19 +! test -x /sbin/restorecon || /sbin/restorecon %freshclamlog &>/dev/null || : + + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : + +%pre milter +getent group %{milteruser} >/dev/null || groupadd -r %{milteruser} +getent passwd %{milteruser} >/dev/null || \ + useradd -r -g %{milteruser} -d %{milterstatedir} -s /sbin/nologin \ + -c "Clamav Milter user" %{milteruser} +usermod %{milteruser} -a -G virusgroup +exit 0 -%postun -n clamd -/sbin/service clamd condrestart &>/dev/null || : %post milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog + ! test -x /sbin/restorecon || /sbin/restorecon %milterlog +} +%{?with_systemd:/bin/systemd-tmpfiles --create %_tmpfilesdir/clamav-milter.conf || :} + + +%triggerin milter -- %name-milter < 0.97.3-1704 +# remove me after F19 +! test -x /sbin/restorecon || /sbin/restorecon %milterlog &>/dev/null || : + + +%post milter-sysvinit /sbin/chkconfig --add clamav-milter -%preun milter -if [ $1 -eq 0 ]; then - /sbin/service clamav-milter stop &>/dev/null || : - /sbin/chkconfig --del clamav-milter -fi +%preun milter-sysvinit +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter -%postun milter -/sbin/service clamav-milter condrestart &>/dev/null || : +%postun milter-sysvinit +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : -%pre db -getent group clam >/dev/null || groupadd -r clam -getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ - -c "Clam Anti Virus Checker" clam -exit 0 -%post db -# Remove old mirrors.dat, mostly because it will have the wrong -# owner after upgrading from clamav < 0.97: -test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat -exit 0 +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : -%clean -rm -rf %{buildroot} +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : -%files -%defattr(-, root, root, 0755) -%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README -%doc docs/*.pdf etc/freshclam.conf -%doc %{_mandir}/man1/sigtool.1* -%doc %{_mandir}/man1/clamscan.1* -%doc %{_mandir}/man1/freshclam.1* -%doc %{_mandir}/man1/clamsubmit.1* -%doc %{_mandir}/man5/freshclam.conf.5* -%config(noreplace) %{_sysconfdir}/freshclam.conf -%{_bindir}/clamscan -%{_bindir}/freshclam -%{_bindir}/sigtool -%{_bindir}/clambc -%{_bindir}/clamsubmit -%{_libdir}/libclamav.so.* - -%files -n clamd -%defattr(-, root, root, 0755) -%doc etc/clamd.conf -%doc %{_mandir}/man1/clamdscan.1* -%doc %{_mandir}/man1/clamconf.1* -%doc %{_mandir}/man1/clamdtop.1* -%doc %{_mandir}/man1/clambc.1* -%doc %{_mandir}/man5/clamd.conf.5* -%doc %{_mandir}/man8/clamd.8* -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd-wrapper -%config(noreplace) %{_sysconfdir}/clamd.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/clamav -%{_sysconfdir}/clamd.d -%config %{_initrddir}/clamd -%{_sbindir}/clamd -%{_bindir}/clamconf -%{_bindir}/clamdscan -%{_bindir}/clamdtop - -%defattr(0644, clam, clam, 0755) -%{_localstatedir}/run/clamav/ -%dir %{_localstatedir}/lib/clamav/ -%dir %{_localstatedir}/log/clamav/ -%ghost %{_localstatedir}/log/clamav/clamd.log -%exclude %{_localstatedir}/lib/clamav/* - -%if %{!?_without_milter:1}0 -%files milter -%defattr(-, root, root, 0755) -%doc %{_mandir}/man5/clamav-milter.conf.5* -%doc %{_mandir}/man8/clamav-milter.8* -%config(noreplace) %{_sysconfdir}/sysconfig/clamav-milter -%config %{_initrddir}/clamav-milter -%{_sbindir}/clamav-milter -%config(noreplace) %{_sysconfdir}/clamav-milter.conf -%endif -%files db -%defattr(-, root, root, 0755) -%config(noreplace) %{_sysconfdir}/cron.daily/freshclam -%config(noreplace) %{_sysconfdir}/logrotate.d/freshclam +%systemd_install milter-systemd clamav-milter.service -%defattr(0644, clam, clam, 0755) -%config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ -%dir %{_localstatedir}/log/clamav/ -%ghost %{_localstatedir}/log/clamav/freshclam.log -%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/*.cld -%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/mirrors.dat +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig -%files devel -%defattr(-, root, root, 0755) -%{_bindir}/clamav-config -%{_includedir}/clamav.h -%{_libdir}/libclamav.so -%{_libdir}/pkgconfig/libclamav.pc -#%{_libdir}/libclamav.a -%exclude %{_libdir}/libclamav.la -%changelog -* Sun Nov 26 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-3 -- Backported upstream patch to unbreak e2guardian vs. temp files +%files +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE +%doc docs/*.pdf +%_bindir/* +%_mandir/man[15]/* +%exclude %_bindir/clamav-config +%exclude %_bindir/freshclam +%exclude %_mandir/*/freshclam* -* Tue Mar 28 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-2 -- Ensure that missing or invalid timezone configuration does not - mangle /etc/freshclam.conf in %%post (#1154756) +## ----------------------- -* Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 -- Update to 0.99.2 -- Enable llvm -- Drop cliopts patch fixed upstream, use upstream's "--forground" option name -- Fix main.cvd (fedora #1325482, epel #1325717) -- Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd -- Update daily.cvd -- Fixup Requires(pre) usage (#1319151) +%files lib +%_libdir/*.so.* -* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 -- Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) +## ----------------------- -* Mon Dec 07 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-3 -- Added missing build-time requirement to pcre-devel +%files devel +%_includedir/* +%_libdir/*.so +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config -* Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 -- Require openssl-devel for clamav-devel +## ----------------------- -* Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 -- Upgrade to 0.99 and updated daily.cvd (#1287327) +%files filesystem +%attr(-,%updateuser,%updateuser) %dir %homedir +%attr(-,root,root) %dir %pkgdatadir +%dir %_sysconfdir/clamd.d -* Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 -- Upgrade to 0.98.7 and updated daily.cvd (#1217014) +## ----------------------- -* Tue Feb 24 2015 Joel Smith <joelsmith(a)fedoraproject.org> - 0.98.6-2 -- Make init script source /etc/sysconfig/clamd if present (#1195864) +%files data +%defattr(-,%updateuser,%updateuser,-) +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. +%config %verify(not size md5 mtime) %homedir/*.cvd -* Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 -- Upgrade to 0.98.6 and updated daily.cvd (#1187050) -* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 -- Upgrade to 0.98.5 and updated daily.cvd (#1138101) +%files data-empty +%defattr(-,%updateuser,%updateuser,-) +%ghost %attr(0664,%updateuser,%updateuser) %homedir/*.cvd -* Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 -- Upgrade to 0.98.4 and updated daily.cvd (#1111811) -- Add build requirement to libxml2 for DMG, OpenIOC and XAR -* Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 -- Upgrade to 0.98.3 -- Fix --with-libcurl parameter to avoid automatic path detection breakage -- openssl-devel is now required for hashing code. -- Added clamsubmit to main package -- Re-enabled --with-llvm as this speeds up deployment a lot. -- Fixed older changelog dates +## ----------------------- -* Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 -- Upgrade to 0.98.1 and updated daily.cvd (#1053400) +%files update +%_bindir/freshclam +%_mandir/*/freshclam* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/clamav-update +%config(noreplace) %_sysconfdir/sysconfig/freshclam -* Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 -- Really fix all discrepancies between clamd initscript and clamd - config file (#960923, thanks to John Horne) -- Ensure that a clamd and clamav-milter condrestart via initscript - works (#1018312, thanks to Filippo Carletti) +%ghost %attr(0664,root,%updateuser) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%updateuser,%updateuser) %homedir/*.cld +%ghost %attr(0664,%updateuser,%updateuser) %homedir/mirrors.dat -* Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 -- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) -- Fixed discrepancies between clamd initscript and clamd config - file (#960923, thanks to John Horne) -- Added build requirement to ncurses-devel for clamdtop (again) -- Moved clamd wrapper script and documentation into correct sub- - package (#782596, thanks to Philip Prindeville) - -* Tue Apr 23 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.8-1 -- Upgrade to 0.97.8 -- Updated daily.cvd - -* Mon Mar 18 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.7-1 -- Upgrade to 0.97.7 - -* Tue Sep 18 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.6-1 -- Upgrade to 0.97.6 - -* Wed Jun 20 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.5-1 -- Upgrade to 0.97.5 -- Fix CVE-2012-1419 clamav: specially-crafted POSIX tar files evade detection -- Fix CVE-2012-1457 clamav: overly long length field in tar files evade detection -- Fix CVE-2012-1443 clamav: specially-crafted RAR files evade detection -- Fix CVE-2012-1458 clamav: specially-crafted CHM files evade detection -- Fix CVE-2012-1459 clamav: specially-crafted length field in tar files evade detection -- Ship local copy of virus database; it was removed by accident from 0.97.5 tarball - -* Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 -- Split files out into SCM instead of in the spec - -* Sun Jan 1 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-3 -- Revert patch from 0.97.3-2 - -* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 -- Update to 0.97.3 -- Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 - -* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-5 -- Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. - (bz#727894) - -* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-3 -- include updated clamd-wrapper which get the PidFile setting from the - service configuration file. -- updated to 0.97.2 -- Build-require xz -- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) -* Wed Jun 29 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97-14 -- Require /usr/sbin/sendmail instead of sendmail +## ----------------------- -* Tue Apr 26 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-13 -- Obsolete and provide clamav-milter-sysvinit (bz#696856) +%files server +%doc _doc_server/* +%_mandir/man5/clamd.conf.5* +%_mandir/man8/clamd.8* +%_sbindir/clamd -* Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 -- Move deletion of /var/lib/clamav/mirrors.dat to db package. -- Don't enable NotifyClamd in freshclam config and cronjob, as not - everybody is running clamd. Running clamd's will anyway notice - when db is updated. +%if %{with sysv} +%files server-sysvinit +%_initrddir/clamd-wrapper +%pkgdatadir/clamd-wrapper +%endif + +%if %{with systemd} +%files server-systemd + %_unitdir/clamd@.service +%endif -* Fri Mar 18 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-11 -- Delete /var/lib/clamav/mirrors.dat, it will be recreated on first run. -- clamav-milter config cleanups. +## ----------------------- -* Wed Mar 16 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-10 -- Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. -- Don't start clamd or milter service by default. +%files scanner +%config(noreplace) %_sysconfdir/clamd.d/scan.conf +%ghost %scanstatedir/clamd.sock -* Tue Mar 15 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-7 -- rpm-provide all old package names that are now obsoleted +%if %{with tmpfiles} + %_tmpfilesdir/clamd.scan.conf + %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%else + %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%endif -* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-6 -- clam-db obsoletes old clamav-data-empty. +%if %{with sysv} +%files scanner-sysvinit + %attr(0755,root,root) %config %_initrddir/clamd.scan + %ghost %scanstatedir/clamd.pid +%endif -* Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 -- Add back clamd-wrapper to stay compatible with users - of old packaging (amavisd-new). +%if %{with upstart} +%files scanner-upstart + %config(noreplace) %_sysconfdir/init/clamd.scan* +%endif -* Wed Feb 23 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.097-3 -- Move db to /var/lib/clamav -- Ship empty directory /etc/clamd.d for amavisd-new +%if %{with systemd} +%files scanner-systemd + %_unitdir/clamd(a)scan.service +%endif -* Thu Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 -- Disable llvm. +## ----------------------- -* Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 -- Update to 0.97 -- Fix up for current guidelines. +%files milter +%doc clamav-milter/README.fedora +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%dir %_sysconfdir/mail +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%ghost %milterstatedir/clamav-milter.socket + +%if %{with tmpfiles} + %_tmpfilesdir/clamav-milter.conf + %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%else + %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%endif -* Fri Nov 23 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-3 -- Change username to get upgrades from fedora versions working. +%if %{with sysv} +%files milter-sysvinit + %config %_initrddir/clamav-milter + %ghost %milterstatedir/clamav-milter.pid +%endif -* Thu Nov 22 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-2 -- Initial changes for EPEL version. +%if %{with upstart} +%files milter-upstart + %config(noreplace) %_sysconfdir/init/clamav-milter* +%endif -* Tue Aug 21 2007 Dag Wieers <dag(a)wieers.com> - 0.91.2-1 -- Updated to release 0.91.2. +%if %{with systemd} +%files milter-systemd + %_unitdir/clamav-milter.service +%endif -* Tue Jul 17 2007 Dag Wieers <dag(a)wieers.com> - 0.91.1-1 -- Updated to release 0.91.1. -* Wed Jul 11 2007 Dag Wieers <dag(a)wieers.com> - 0.91-1 -- Updated to release 0.91. +%changelog +* Fri Jan 26 2018 Orion Poplawski <orion(a)nwra.com> - 0.99.3-1 +- Update to 0.99.3 +- Security fixes CVE-2017-12374 CVE-2017-12375 CVE-2017-12376 CVE-2017-12377 + CVE-2017-12378 CVE-2017-12379 CVE-2017-12380 (bug #1539030) +- Drop clamav-notify-servers and it's dependency on ncat (bug #1530678) + +* Wed Jan 17 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-18 +- Fix type of clamd@ service +- Fix packages name of Obsoletes directives +- Also fix type of clamav-milter.service + +* Thu Jan 11 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-17 +- Security fixes CVE-2017-6420 (#1483910), CVE-2017-6418 (#1483908) + +* Tue Jan 09 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-16 +- Make sure that Obsoletes sysv and upstart for Epel upgrade and update + +* Mon Jan 08 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-15 +- Fix rundir path (#1126595) +- Update main.cvd, daily.cvd and bytecode.cvd +- Fixes for rhbz 1464269 and rhbz 1126625 +- Move Sources and BuildRequires to the beginning +- Build systemd for F22+ and el7+ +- Build sysv and upstart for el6 else build only sysv +- Only enable tmpfiles with systemd enabled +- Move descritions to near the package macro and remove his build + conditionals, this also fix the generation of src.rpm +- Remove hack from 2010 (git show e1a9be60) +- Use autoreconf without --force + +* Thu Jan 04 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-14 +- Use 4 spaces instead tabs +- Fix rhbz #1530678 +- Fix rhbz #1518016 +- Simplify conditional builds reference: /usr/lib/rpm/macros +- use make_build and make install macros + +* Sun Nov 26 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-13 +- Backported upstream patch to unbreak e2guardian vs. temp files -* Thu May 31 2007 Dag Wieers <dag(a)wieers.com> - 0.90.3-1 -- Updated to release 0.90.3. +* Fri Sep 15 2017 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-12 +- Try fix rhbz #1473642 -* Fri Apr 27 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-2 -- Added clamav-milter support for EL2.1 now that it comes with a newer sendmail. (Tom G. Christensen) +* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild -* Sun Apr 15 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-1 -- Updated to release 0.90.2. +* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild -* Fri Mar 09 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-4 -- Removed circular dependency. +* Mon Jul 17 2017 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-9 +- Add patch for openssl-1.1 -* Thu Mar 08 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-3 -- Cleaned up default options to clamav-milter. (Adam T. Bowen) -- Removed -b/--bounce as it is no longer recognized. (Gerald Teschl) +* Mon Mar 27 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-8 +- Create virusgroup group and add the various clam* users to it -* Mon Mar 05 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-2 -- Removed the erroneous --dont-clean-log from the clamav-milter sysconfig. (Gerald Teschl) +* Sun Mar 26 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-7 +- Fix clamav-milter startup under selinux (bug #1434176) +- Move /etc/clam.d to clamav-filesystem (bug #1275630) +- Make clamav-milter own /etc/mail (bug #1175473) -* Fri Mar 02 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-1 -- Updated to release 0.90.1. +* Sun Mar 26 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-6 +- Start clamav-milter after clamd@scan (bug #1356507)) -* Tue Feb 20 2007 Dag Wieers <dag(a)wieers.com> - 0.90-3 -- Do the right thing... +* Sun Mar 26 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-5 +- Allow freshclam to run automatically on install (bug #1408649) -* Mon Feb 19 2007 Dag Wieers <dag(a)wieers.com> - 0.90-2 -- The tarball was re-rolled before public release. Sigh. +* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -* Tue Feb 13 2007 Dag Wieers <dag(a)wieers.com> - 0.90-1 -- Updated to release 0.90. +* Mon Nov 07 2016 Richard W.M. Jones <rjones(a)redhat.com> - 0.99.2-3 +- Rebuild for OCaml 4.04.0. -* Tue Dec 12 2006 Dag Wieers <dag(a)wieers.com> - 0.88.7-1 -- Updated to release 0.88.7. +* Tue Oct 18 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-2 +- Also send logrotate script stdout to /dev/null (bug #1376815) -* Sun Nov 05 2006 Dag Wieers <dag(a)wieers.com> - 0.88.6-1 -- Updated to release 0.88.6. -- Added condrestart to sysv scripts. (Tsai Li Ming) +* Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 +- Update to 0.99.2 +- Drop cliopts patch fixed upstream, use upstream's "--forground" option name +- Fix main.cvd (fedora #1325482, epel #1325717) +- Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd +- Update daily.cvd +- Fixup Requires(pre) usage (#1319151) -* Sat Oct 28 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-2 -- Added missing clamav dependency to clamav-db. +* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 +- Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) +- Complain about antivirus_use_jit rather clamd_use_jit (#1295473) -* Sun Oct 15 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-1 -- Updated to release 0.88.5. +* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99-4 +- Link using %%{?__global_ldflags} for hardened builds (#1321173) +- Build using -std=gnu++98 (#1307378, thanks to Yaakov Selkowitz) -* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.4-1 -- Updated to release 0.88.4. +* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-2 -- Incorporated UPX heap overflow fix. +* Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 +- Require openssl-devel for clamav-devel +- Change clamav-milter unit for upstream changes (#1287795) -* Sat Jul 01 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-1 -- Updated to release 0.88.3. +* Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 +- Upgrade to 0.99 and updated daily.cvd (#1287327) -* Sun Apr 30 2006 Dag Wieers <dag(a)wieers.com> - 0.88.2-1 -- Updated to release 0.88.2. +* Tue Jun 30 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-3 +- Move /etc/tmpfiles.d/ to /usr/lib/tmpfiles.d/ (#1126595) -* Tue Apr 04 2006 Dag Wieers <dag(a)wieers.com> - 0.88.1-1 -- Updated to release 0.88.1. +* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -* Mon Jan 09 2006 Dag Wieers <dag(a)wieers.com> - 0.88-1 -- Updated to release 0.88. +* Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 +- Upgrade to 0.98.7 and updated daily.cvd (#1217014) -* Sun Nov 13 2005 Dries Verachtert <dries(a)ulyssis.org> - 0.87.1-1 -- Updated to release 0.87.1. +* Tue Mar 10 2015 Adam Jackson <ajax(a)redhat.com> 0.98.6-2 +- Drop sysvinit subpackages in F23+ -* Sat Sep 17 2005 Dag Wieers <dag(a)wieers.com> - 0.87-1 -- Updated to release 0.87. +* Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 +- Upgrade to 0.98.6 and updated daily.cvd (#1187050) -* Mon Jul 25 2005 Dag Wieers <dag(a)wieers.com> - 0.86.2-1 -- Updated to release 0.86.2. +* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-2 +- Corrected summary of clamav-server-systemd package (#1165672) -* Mon Jul 11 2005 Dag Wieers <dag(a)wieers.com> - 0.86.1-1 -- Updated to release 0.86.1. +* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 +- Upgrade to 0.98.5 and updated daily.cvd (#1138101) -* Mon May 16 2005 Dag Wieers <dag(a)wieers.com> - 0.85.1-1 -- Updated to release 0.85.1. +* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild -* Fri Apr 29 2005 Dag Wieers <dag(a)wieers.com> - 0.84-1 -- Updated to release 0.84. +* Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 +- Upgrade to 0.98.4 and updated daily.cvd (#1111811) +- Add build requirement to libxml2 for DMG, OpenIOC and XAR -* Mon Feb 14 2005 Dag Wieers <dag(a)wieers.com> - 0.83-1 -- Updated to release 0.83. +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Thu Feb 10 2005 Dag Wieers <dag(a)wieers.com> - 0.82-2 -- Fix for false positive on RIFF files. (Roger Jochem) +* Sat May 10 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.3-1 +- Upgrade to 0.98.3 and updated daily.cvd (#1095614) +- Avoid automatic path detection breakage regarding curl +- Added build requirement to openssl-devel for hasing code +- Added clamsubmit to main package -* Mon Feb 07 2005 Dag Wieers <dag(a)wieers.com> - 0.82-1 -- Updated to release 0.82. +* Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 +- Upgrade to 0.98.1 and updated daily.cvd (#1053400) -* Thu Jan 27 2005 Dag Wieers <dag(a)wieers.com> - 0.81-1 -- Improved logrotate scripts. (Filippo Grassilli) -- Updated to release 0.81. +* Wed Oct 09 2013 Dan Horák <dan[at]danny.cz> - 0.98-2 +- Use fanotify from glibc instead of the limited hand-crafted version -* Wed Dec 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-2 -- Added %%dir /var/clamav/log. (Adam Bowns) -- Changed logrotate script to use clamd.log. (Stuart Schneider) -- Added curl dependency. (Petr Kristof) -- Synchronized some options from Petr. (Petr Kristof) -- Fixed another clamav.conf reference. (Michael Best) +* Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 +- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) -* Mon Nov 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-1 -- Updated package description. (Arvin Troels) -- Incorporated fixes from Jima. (Jima) -- Config clamav.conf renamed to clamd.conf. -- Removed obsolete patch. -- Added macros for building without milter. -- Updated to release 0.80. +* Wed Aug 07 2013 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 0.97.8-4 +- Add a missing requirement on crontabs to spec file +- Fix RHBZ#988605 -* Fri Jul 30 2004 Dag Wieers <dag(a)wieers.com> - 0.75.1-1 -- Added obsoletes for fedora.us. -- Updated to release 0.75.1. +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.97.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Mon Jul 26 2004 Dag Wieers <dag(a)wieers.com> - 0.75-2 -- Fixed a problem where $CODE was empty. +* Thu May 2 2013 Nick Bebout <nb(a)fedoraproject.org> - 0.97.8-1 +- Update to 0.97.8 -* Fri Jul 23 2004 Dag Wieers <dag(a)wieers.com> - 0.75-1 -- Updated to release 0.75. +* Wed Apr 10 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.97.7-2 +- Migrate from fedora-usermgmt to guideline scriptlets. -* Wed Jun 30 2004 Dag Wieers <dag(a)wieers.com> - 0.74-1 -- Updated to release 0.74. +* Sat Mar 23 2013 Nick Bebout <nb(a)fedoraproject.org> - 0.97.7-1 +- Update to 0.97.7 -* Tue Jun 15 2004 Dag Wieers <dag(a)wieers.com> - 0.73-1 -- Updated to release 0.73. +* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.97.6-1901 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Thu Jun 03 2004 Dag Wieers <dag(a)wieers.com> - 0.72-1 -- Updated to release 0.72. +* Sat Sep 22 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.6-1900 +- updated to 0.97.6 +- use %%systemd macros -* Thu May 20 2004 Dag Wieers <dag(a)wieers.com> - 0.71-1 -- Updated to release 0.71. +* Tue Aug 14 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.5-1900 +- disabled upstart support -* Sun May 02 2004 Dag Wieers <dag(a)wieers.com> - 0.70-2 -- Fixed the installation check for conf files. (Richard Soderberg, Udo Ruecker) -- Changed the init-order of the sysv scripts. (Will McCutcheon) -- Changes to the default configuration files. +* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.97.5-1801 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Wed Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 -- Updated to release 0.70. +* Sat Jun 16 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.5-1800 +- updated to 0.97.5 +- 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 +- ship local copy of virus database; it was removed by accident from + 0.97.5 tarball +- removed sysv compat stuff -* Tue Mar 16 2004 Dag Wieers <dag(a)wieers.com> - 0.68-1 -- Updated to release 0.68. +* Fri Apr 13 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.4-1801 +- build with -fPIE -* Fri Mar 12 2004 Dag Wieers <dag(a)wieers.com> - 0.67.1-1 -- Updated to release 0.67-1. -- Added clamdwatch and trashcan to clamd. +* Fri Mar 16 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.4-1800 +- updated to 0.97.4 -* Mon Mar 08 2004 Dag Wieers <dag(a)wieers.com> - 0.67-1 -- Personalized SPEC file. +* Sun Feb 5 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.3-1703 +- fixed SELinux restorecon invocation +- added trigger to fix SELinux contexts of logfiles created by old + packages +- fixed build with recent gcc/glibc toolchain -* Fri Aug 22 2003 Matthias Saou/Che -- Added "--without milter" build option. (Matthias Saou) -- Fixed freshclam cron (Matthias Saou) -- Built the new package. (Che) +* Sat Jan 21 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.3-1703 +- rewrote clamav-notify-servers to be init system neutral +- set PrivateTmp systemd option (#782488) -* Tue Jun 24 2003 Che -- clamav-milter introduced. -- a few more smaller fixes. +* Sun Jan 8 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.3-1702 +- set correct SELinux context for logfiles generated in %%post (#754555) +- create systemd tmpfiles in %%post +- created -server-systemd subpackage providing a clamd@.service template +- made script in -scanner-systemd an instance of clamd@.service -* Sun Jun 22 2003 Che -- version upgrade +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 +- updated to 0.97.3 +- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 -* Mon Jun 16 2003 Che -- rh9 build -- various fixes -- got rid of rpm-helper prereq +* Thu Aug 4 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1700 +- moved sysv wrapper script into -sysv subpackage +- start systemd services after network.target and nss-lookup.target -* Mon Mar 24 2003 Che -- some cleanups and fixes -- new patch added +* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 +- updated to 0.97.2 +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) +- fixed systemd scripts and their installation + +* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 +- updated to 0.97.1 +- fixed Requires(preun) vs. Requires(postun) inconsistency -* Fri Nov 22 2002 Che -- fixed a config patch issue +* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 +- fixed tmpfiles.d syntax (#696812) -* Fri Nov 22 2002 Che -- version upgrade and some fixes +* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 +- updated to 0.97 +- rediffed some patches -* Sat Nov 02 2002 Che -- version upgrade +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 +- fixed signal specifier in clamd-wrapper (#668131, James Ralston) -* Thu Oct 24 2002 Che -- some important changes for lsb compliance +* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 +- added systemd init scripts which obsolete to old sysvinit ones +- added tmpfiles.d/ descriptions -* Wed Oct 23 2002 Che -- initial rpm release +* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 +- updated to 0.96.5 +- CVE-2010-4260 Multiple errors within the processing of PDF files can + be exploited to e.g. cause a crash. +- CVE-2010-4261 An off-by-one error within the "icon_cb()" function + can be exploited to cause a memory corruption. + +* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 +- updated to 0.96.4 +- execute 'make check' (#640347) but ignore errors for now because + four checks are failing on f13 + +* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 +- lowered stop priority of sysv initscripts (#629435) + +* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 +- updated to 0.96.3 +- fixes CVE-2010-0405 in shipped bzlib.c copy + +* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 +- updated to 0.96.2 +- rediffed patches +- removed the -jit-disable patch which is replaced upstream by a more + detailed configuration option. + +* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed old %%trigger which renamed the 'clamav' user- and groupnames + to 'clamupdate' +- use 'groupmems', not 'usermod' to add a user to a group because + 'usermod' does not work when user does not exist in local /etc/passwd + +* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 +- ocaml not available (at least) on s390(x) + +* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 +- updated to 0.96.1 +- rediffed patches + +* Sat May 29 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 +- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) + +* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 +- updated to final 0.96 +- applied upstream patch which allows to disable JIT compiler (#573191) +- build JIT compiler again +- disabled JIT compiler by default +- removed explicit 'pkgconfig' requirements in -devel (#533956) + +* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 +- do not build the bytecode JIT compiler for now until it can be disabled + at runtime (#573191) + +* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 +- updated to 0.96rc1 +- added some BRs + +* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 +- updated -upstart to upstart 0.6.3 + +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) +- use %%apply instead of %%patch + +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 +- updated to 0.95.3 + +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches + +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam diff --git a/clamd-README b/clamd-README new file mode 100644 index 0000000..fa6eea5 --- /dev/null +++ b/clamd-README @@ -0,0 +1,59 @@ +To create individual clamd-instance take the following files and +modify/copy them in the suggested way: + +clamd.conf: + * set LocalSocket (or better: TCPSocket) and User to suitable values; + avoid PidFile unless it is required by system monitoring or something + else. Logging through syslog is usually better than an individual + Logfile. + * place this file into /etc/clamd.d with an unique service-name; + e.g. as /etc/clamd.d/<SERVICE>.conf + + When using TCPSocket, create iptables rules which are limiting the + access by source and/or by using '-m owner'. + + When LogFile feature is wanted, it must be writable for the assigned + User. Recommended way to reach this, is to: + * make it owned by the User's *group* + * assign at least 0620 (u+rw,g+w) permissions + + A suitable command might be + | # touch <logfile> + | # chgrp <user> <logfile> + | # chmod 0620 <logfile> + | # restorecon <logfile> + + NEVER use 'clamav' as the user since he can modify the database. + This is the user who is running the application; e.g. for mimedefang + (http://www.roaringpenguin.com/mimedefang) the user might be + 'defang'.Theoretically, distinct users could be used, but it must be + made sure that the application-user can write into the socket-file, + and that the clamd-user can access the files asked by the + application to be checked. + +clamd.logrotate: (only when LogFile feature is used) + * set the correct value for the logfile + * place it into /etc/logrotate.d + +clamd@<SERVICE>.service: (systemd instance) + * instance of clamd@.service + +Additionally, when using LocalSocket instead of TCPSocket, the directory +for the socket file must be created. For tmpfiles based systems, you +might want to create a file /usr/lib/tmpfiles.d/clamd.<SERVICE>.conf +with a content of + + | d /var/run/clamd.<SERVICE> <MODE> <USER> <GROUP> + +Adjust <MODE> (0710 should suffice for most cases) and <USER> + <GROUP> +so that the socket can be accessed by clamd and by the applications +using clamd. Make sure that the socket is not world accessible; else, +DOS attacks or worse are trivial. + + +[Disclaimer: + this file and the script/configfiles are not part of the official + clamav package. + + Please send complaints and comments to + mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamd-gen b/clamd-gen new file mode 100755 index 0000000..ac5dae2 --- /dev/null +++ b/clamd-gen @@ -0,0 +1,269 @@ +#! /bin/bash + +# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +function showHelp() +{ + echo \ +$"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> + --license=<LICENSE> --username=>USERNAME> +" + exit 0 +} + +function rpm.generatePreamble() +{ + cat <<EOF +%{!?release_func:%define release_func() %1%{?dist}} +# The name of the minit service +%define minitsvcdir %minitdir/services/%name +# The configuration file for the SysV initservice +%define conffile %_sysconfdir/clamd.d/%service.conf +# The directory, where the milter socket will be placed into; this +# socket will be named clamd.sock +%define rundir /var/run/clamd.%service +# The name of the logfile +%define logfile /var/log/clamd.%service +# The user under whose id, the clamd shall be running. This user must +# be able to read the files from the base-service and is usually +# created there. +%define username $USERNAME +# The packagename of the service +%define service $SERVICE +# The service name as used by the system's initscripts; usually this +# is %service +%define baseservice %service + +%define __chkconfig /sbin/chkconfig +%define minitdir %_sysconfdir/minit + + +EOF +} + +function rpm.generateHeader() +{ + cat <<EOF +Summary: Clamav server for '%service' +Name: clamd.%service +Version: $VERSION +Release: %release_func $RELEASE +Epoch: 0 +License: $LICENSE +Group: System Environment/Daemons +BuildRoot: %_tmppath/%name-%version-%release-root +BuildArch: noarch +Requires: init(%name) +Requires(pre): %service +Requires: clamav-server +BuildRequires: clamav-devel + +%package sysv +Summary: SysV initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = sysv +Conflicts: init(%name) < sysv +Conflicts: init(%name) > sysv +Requires: clamav-server-sysv +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp %__chkconfig +Requires(preun): %__chkconfig +Requires(pre): %_initrddir +Requires(postun): %_initrddir + +%package minit +Summary: minit initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = minit +Conflicts: init(%name) < minit +Conflicts: init(%name) > minit +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp +Requires(pre): minit-setup +Requires(postun): minit-setup +Requires(triggers): minit-tools + + +%description +Basic setup for a clamav server for '%service'. + + +%description sysv +Basic setup for a clamav server for '%service'. + +This package contains initscripts for SysV based systems. + + +%description minit +Basic setup for a clamav server for '%service'. + +This package contains initscripts for minit based systems. + +EOF +} + + +function rpm.genBody() +{ + cat <<"XEOFX" +%prep +%build + +%install +rm -rf $RPM_BUILD_ROOT +%__install -d -m755 $RPM_BUILD_ROOT{%minitsvcdir,%_sbindir,%rundir,/var/log} + +d=/usr/share/clamav/template + +function subst +{ + src=$d/$1 + dst=$RPM_BUILD_ROOT$2 + + %__install -d -m755 $(dirname "$dst") + sed -e 's!^$#?LogFile $.*!\1%logfile!g; + s!^#?$LocalSocket $.*!\1%rundir/clamd.sock!g; + s!^#?$PidFile $.*!\1%rundir/clamd.pid!g; + s!<SERVICE>!%service!g; + s!<USER>!%username!g;' "$src" >"$dst" + chmod --reference "$src" "$dst" +} + +subst clamd.conf %conffile +subst clamd.logrotate %_sysconfdir/logrotate.d/clamd.%service + +%if 0%{!?_without_sysv:1} +subst clamd.sysconfig %_sysconfdir/sysconfig/clamd.%service +subst clamd.init %_initrddir/clamd.%service +%endif + +ln -s clamd $RPM_BUILD_ROOT%_sbindir/clamd.%service + +touch $RPM_BUILD_ROOT%logfile +touch $RPM_BUILD_ROOT%rundir/clamd.sock + +%if 0%{!?_without_minit:1} +ln -s %_sbindir/clamd.%service $RPM_BUILD_ROOT%minitsvcdir/run +touch $RPM_BUILD_ROOT%minitsvcdir/respawn +cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params +-c +%conffile +EOF +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + + +%triggerin minit -- %baseservice +minit-svc add services/clamd.%service services/%baseservice/ + +%triggerun minit -- %baseservice +test "$1" != 0 -a "$2" != 0 || \ + minit-svc del services/clamd.%service services/%baseservice/ + + +%post minit +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^#Foreground!Foreground!' "%conffile" >"$d" +grep -q '^Foreground' $d || echo 'Foreground' >>$d +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%post sysv +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^Foreground!#Foreground!' "%conffile" >"$d" +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%__chkconfig --add %name + + +%preun sysv +test "$1" != 0 || %__chkconfig --del %name + +XEOFX +} + + +function rpm.genFiles +{ + cat <<"EOF" +%files +%defattr(-,root,root,-) +%doc +%config(noreplace) %verify(not size md5 mtime) %attr(0620,root,%username) %logfile +%config(noreplace) %verify(not mtime) %conffile +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/clamd.%service +%_sbindir/clamd.%service +%dir %attr(0700,%username,root) %rundir +%ghost %rundir/clamd.sock + + +%if 0%{!?_without_sysv:1} +%files sysv +%defattr(-,root,root,-) +%config %verify(not mtime) %_initrddir/clamd.%service +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamd.%service +%endif + + +%if 0%{!?_without_minit:1} +%files minit +%defattr(-,root,root,-) +%dir %minitsvcdir +%config(noreplace) %verify(not mtime) %minitsvcdir/params +%config %minitsvcdir/run + %minitsvcdir/respawn +%endif +EOF +} + + +SERVICE= +VERSION= +RELEASE= +LICENSE= +USERNAME= +tmp=$(getopt -o '' --long service:,version:,release:,license:,username:,help -n "$0" -- "$@") || exit 1 +eval set -- "$tmp" + +while true; do + case "$1" in + (--help) showHelp $0;; + (--service) SERVICE=$2; shift;; + (--version) VERSION=$2; shift;; + (--release) RELEASE=$2; shift;; + (--license) LICENSE=$2; shift;; + (--username) USERNAME=$2; shift;; + (--) shift; break;; + esac + shift +done + +for i in SERVICE VERSION RELEASE LICENSE USERNAME; do + eval tmp=\$${i} + test "$tmp" || { + echo $"No value for $i specified; assuming @${i}@" >&2; + eval $i=@${i}@; + } +done + + +rpm.generatePreamble +rpm.generateHeader +rpm.genBody +rpm.genFiles diff --git a/clamd-wrapper b/clamd-wrapper new file mode 100644 index 0000000..0a30628 --- /dev/null +++ b/clamd-wrapper @@ -0,0 +1,90 @@ +#!/bin/bash +# +# Xchkconfig: - 75 35 +# Xdescription: The clamd daemon listens for incoming connections on \ +# Unix or TCP socket and scans files or directories on demand. + +test "$CLAMD_SERVICE" || { + echo $"*** $0 can not be called in this way" + echo $"*** Please see /usr/share/doc/clamav-server-*/README how" + echo $"*** the clamav-server can be configured" + exit 6 +} + +# Source function library. +. /etc/init.d/functions + +# Get config. +test -r /etc/sysconfig/network && . /etc/sysconfig/network + +# Check that networking is up. +test "$NETWORKING" != "no" || exit 6 + +lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} +sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} +procname=clamd.${CLAMD_SERVICE} + +CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf +CLAMD_OPTIONS= +CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid +## backward-compatibility check... +for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ + /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do + CLAMD_SOCKET=$i + test ! -e "$i" || break +done +test -f "$sysconffile" && . "$sysconffile" + + +RETVAL=0 +prog="clamd.${CLAMD_SERVICE}" + +start () { + echo -n $"Starting $prog: " + daemon --pidfile=${CLAMD_PIDFILE} \ + exec -a $procname /usr/sbin/clamd \ + ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch $lockfile + return $RETVAL +} + +stop () { + echo -n $"Stopping $prog: " + killproc -p ${CLAMD_PIDFILE} $procname + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $lockfile + return $RETVAL +} + +reload() { + rc=0 + echo -n $"Reloading $prog: " + killproc -p ${CLAMD_PIDFILE} $procname -HUP || rc=$? + echo + echo -n $"Loading new virus-database: " + killproc -p ${CLAMD_PIDFILE} $procname -USR2 || rc=$? + echo + return $rc +} + +restart () { + stop + start +} + +# See how we were called. +case "$1" in + start|stop|restart|reload) + $1 ;; + status) + status -p ${CLAMD_PIDFILE} $procname ;; + condrestart) + test ! -f $lockfile || restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" + exit 2 +esac diff --git a/clamd.SERVICE.init b/clamd.SERVICE.init new file mode 100644 index 0000000..f2f9191 --- /dev/null +++ b/clamd.SERVICE.init @@ -0,0 +1,7 @@ +#!/bin/bash +# +# chkconfig: - 75 35 +# description: The clamd server running for <SERVICE> + +CLAMD_SERVICE=<SERVICE> +. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate index b233f3a..315f352 100644 --- a/clamd.logrotate +++ b/clamd.logrotate @@ -1,8 +1,9 @@ -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript +/var/log/clamd.<SERVICE> { + monthly + notifempty + missingok + + postrotate + killall -HUP clamd.<SERVICE> >/dev/null 2>&1 || : + endscript } diff --git a/clamd.scan.upstart b/clamd.scan.upstart new file mode 100644 index 0000000..54482e6 --- /dev/null +++ b/clamd.scan.upstart @@ -0,0 +1,14 @@ +### !!! Uncomment only *one* of the 'start on' statements !!! + +### Uncomment this line when you want clamd.scan to be a scanner for a +### locally running clamav-milter +#start on starting clamav-milter + +### Uncomment this line when you want clamd.scan to be a generic +### scanner service +#start on runlevel [345] and starting local + +stop on runlevel [!345] + +respawn +exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --foreground=yes diff --git a/clamd.sysconfig b/clamd.sysconfig new file mode 100644 index 0000000..4933e7e --- /dev/null +++ b/clamd.sysconfig @@ -0,0 +1,3 @@ +#CLAMD_CONFIGFILE=/etc/clamd.d/<SERVICE>.conf +#CLAMD_SOCKET=/var/run/clamd.<SERVICE>/clamd.sock +#CLAMD_OPTIONS= diff --git a/clamd@.service b/clamd@.service new file mode 100644 index 0000000..4e3556f --- /dev/null +++ b/clamd@.service @@ -0,0 +1,8 @@ +[Unit] +Description = clamd scanner (%i) daemon +After = syslog.target nss-lookup.target network.target + +[Service] +Type = forking +ExecStart = /usr/sbin/clamd -c /etc/clamd.d/%i.conf +Restart = on-failure diff --git a/clamd(a)scan.service b/clamd(a)scan.service new file mode 100644 index 0000000..c329612 --- /dev/null +++ b/clamd(a)scan.service @@ -0,0 +1,7 @@ +.include /lib/systemd/system/clamd@.service + +[Unit] +Description = Generic clamav scanner daemon + +[Install] +WantedBy = multi-user.target diff --git a/freshclam-sleep b/freshclam-sleep new file mode 100755 index 0000000..fddb922 --- /dev/null +++ b/freshclam-sleep @@ -0,0 +1,52 @@ +#! /bin/bash +# Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +FRESHCLAM_MOD=$[ 3*60 ] # 3 hours + +f=/etc/sysconfig/freshclam +test ! -e "$f" || . "$f" + + +case x"$1" in + (xnow) FRESHCLAM_DELAY=0;; + (x|xrandom) : ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};; + (*) FRESHCLAM_DELAY=$1;; +esac + +set -e + +case $FRESHCLAM_DELAY in + (disabled-warn) + echo $"\ +WARNING: update of clamav database is disabled; please see + '$f' + for information how to enable the periodic update resp. how to turn + off this message." >&2 + exit 1 + ;; + + (disabled) + exit 0 + ;; + + (*) + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] + ;; +esac + +/usr/bin/freshclam --quiet diff --git a/freshclam.cron b/freshclam.cron deleted file mode 100644 index e40d8ef..0000000 --- a/freshclam.cron +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate deleted file mode 100644 index 272d220..0000000 --- a/freshclam.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} diff --git a/freshclam.sysconfig b/freshclam.sysconfig new file mode 100644 index 0000000..417dafc --- /dev/null +++ b/freshclam.sysconfig @@ -0,0 +1,18 @@ +## When changing the periodicity of freshclam runs in the crontab, +## this value must be adjusted also. Its value is the timespan between +## two subsequent freshclam runs in minutes. E.g. for the default +## +## | 0 */3 * * * ... +## +## crontab line, the value is 180 (minutes). +# FRESHCLAM_MOD= + +## A predefined value for the delay in seconds. By default, the value is +## calculated by the 'hostid' program. This predefined value guarantees +## constant timespans of 3 hours between two subsequent freshclam runs. +## +## This option accepts two special values: +## 'disabled-warn' ... disables the automatic freshclam update and +## gives out a warning +## 'disabled' ... disables the automatic freshclam silently +# FRESHCLAM_DELAY= diff --git a/llvm-glibc.patch b/llvm-glibc.patch new file mode 100644 index 0000000..67dbdd7 --- /dev/null +++ b/llvm-glibc.patch @@ -0,0 +1,12 @@ +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 +@@ -52,6 +52,7 @@ static void runAtExitHandlers() { + #include <sys/stat.h> + #endif + #include <fcntl.h> ++#include <unistd.h> + /* stat functions are redirecting to __xstat with a version number. On x86-64 + * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat' + * available as an exported symbol, so we have to add it explicitly. diff --git a/sources b/sources index 0573f02..113ca26 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ -a4517adbd9c72a3fec3fbb1384dd3234 clamav-0.99.2-norar.tar.xz -d71fbb44799945970f2c2b75e40ec105 daily-21723.cvd -f13ead862171f50019c15c946d25e91f main-57.cvd -c545b6a9775ccb72a293d259335589be bytecode-278.cvd -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +SHA512 (clamav-0.99.3-norar.tar.xz) = d80b20c982d35eecd2719af325bc774a5a5fe63a97f3d855c74919f6cfac6fe3f12c51479e49d96031ae0e9a3dedcf446dd22426cceba22ec4b641e9ea1f250a +SHA512 (bytecode-319.cvd) = 1b2785fde078e0dae5a4b8a5161a0da55b26b010deda9fd9dc5edb7113d46d6eb45f644c16b4cb3882e7192d0b389d7b1826fbb718377aa40e1bac3485829acc +SHA512 (daily-24253.cvd) = cef70a86f7989ec330c0479f6070e735181168c0331e981cfcd8d9a5aebdd6be42d772167c701f6f33219a4b41aced806e70c156e9a2a060c30ba55e73743fcd +SHA512 (main-58.cvd) = 71309a7ea26f0fbfe329252c728173c895b107b7ea2e0bd613b12475db1d0270a496d707c4d80c842bf8b6f21680e86edfa7fa3b8aea075e93d67c91d696603a commit 4f3fd81e6aff2829d95ecf971feb5ba34b761c76 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Nov 26 03:55:21 2017 +0100 Backported upstream patch to unbreak e2guardian vs. temp files diff --git a/clamav-0.99.2-temp-cleanup.patch b/clamav-0.99.2-temp-cleanup.patch new file mode 100644 index 0000000..1b01341 --- /dev/null +++ b/clamav-0.99.2-temp-cleanup.patch @@ -0,0 +1,137 @@ +https://github.com/vrtadmin/clamav-devel/commit/f5bc94cf01e6a19d5255c0e5f9a5bc2336f5a2b1 +backported (re-merge). See also: + + - https://bugzilla.clamav.net/show_bug.cgi?id=11549 + - https://github.com/e2guardian/e2guardian/issues/159 + +--- clamav-0.99.2/libclamav/scanners.c 2016-04-22 17:02:19.000000000 +0200 ++++ clamav-0.99.2/libclamav/scanners.c.temp-cleanup 2017-11-17 00:59:14.295670694 +0100 +@@ -1342,37 +1342,33 @@ + return CL_CLEAN; + } + +- /* dump to disk only if explicitly asked to +- * or if necessary to check relative offsets, +- * otherwise we can process just in-memory */ +- if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) { +- if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) { +- cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n"); +- return ret; +- } +- if (ctx->engine->keeptmp) +- cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname); +- } +- + if(!(normalized = cli_malloc(SCANBUFF + maxpatlen))) { + cli_dbgmsg("cli_scanscript: Unable to malloc %u bytes\n", SCANBUFF); +- free(tmpname); + return CL_EMEM; + } +- + text_normalize_init(&state, normalized, SCANBUFF + maxpatlen); +- ret = CL_CLEAN; +- + + if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) { +- free(tmpname); +- return ret; ++ free(normalized); ++ return ret; + } + + if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) { +- cli_ac_freedata(&tmdata); +- free(tmpname); +- return ret; ++ cli_ac_freedata(&tmdata); ++ free(normalized); ++ return ret; ++ } ++ ++ /* dump to disk only if explicitly asked to ++ * or if necessary to check relative offsets, ++ * otherwise we can process just in-memory */ ++ if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) { ++ if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) { ++ cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n"); ++ goto done; ++ } ++ if (ctx->engine->keeptmp) ++ cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname); + } + + mdata[0] = &tmdata; +@@ -1387,10 +1383,9 @@ + map_off += written; + + if (write(ofd, state.out, state.out_pos) == -1) { +- cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname); +- close(ofd); +- free(tmpname); +- return CL_EWRITE; ++ cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname); ++ ret = CL_EWRITE; ++ goto done; + } + text_normalize_reset(&state); + } +@@ -1409,11 +1404,6 @@ + funmap(*ctx->fmap); + } + *ctx->fmap = map; +- +- /* If we aren't keeping temps, delete the normalized file after scan. */ +- if(!(ctx->engine->keeptmp)) +- if (cli_unlink(tmpname)) ret = CL_EUNLINK; +- + } else { + /* Since the above is moderately costly all in all, + * do the old stuff if there's no relative offsets. */ +@@ -1421,11 +1411,8 @@ + if (troot) { + cli_targetinfo(&info, 7, map); + ret = cli_ac_caloff(troot, &tmdata, &info); +- if (ret) { +- cli_ac_freedata(&tmdata); +- free(tmpname); +- return ret; +- } ++ if (ret) ++ goto done; + } + + while(1) { +@@ -1466,13 +1453,6 @@ + + } + +- if(ctx->engine->keeptmp) { +- free(tmpname); +- if (ofd >= 0) +- close(ofd); +- } +- free(normalized); +- + if(ret != CL_VIRUS || SCAN_ALL) { + if ((ret = cli_exp_eval(ctx, troot, &tmdata, NULL, NULL)) == CL_VIRUS) + viruses_found++; +@@ -1481,9 +1461,19 @@ + viruses_found++; + } + ++done: ++ free(normalized); + cli_ac_freedata(&tmdata); + cli_ac_freedata(&gmdata); + ++ if (ofd != -1) ++ close(ofd); ++ if (tmpname != NULL) { ++ if (!ctx->engine->keeptmp) ++ cli_unlink(tmpname); ++ free(tmpname); ++ } ++ + if (SCAN_ALL && viruses_found) + return CL_VIRUS; + diff --git a/clamav.spec b/clamav.spec index edf30f2..2fd02bd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -32,6 +32,7 @@ Source12: http://db.local.clamav.net/daily-21723.cvd Source13: http://db.local.clamav.net/bytecode-278.cvd Patch31: clamav-0.99.1-setsebool.patch +Patch32: clamav-0.99.2-temp-cleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -131,6 +132,7 @@ you will need to install %{name}-devel. %setup -q -T -c xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %patch31 -p1 -b .setsebool +%patch32 -p1 -b .temp-cleanup %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure @@ -410,6 +412,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Nov 26 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-3 +- Backported upstream patch to unbreak e2guardian vs. temp files + * Tue Mar 28 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-2 - Ensure that missing or invalid timezone configuration does not mangle /etc/freshclam.conf in %%post (#1154756) commit f7d8e9087c523eb46dce29552fcb37c2a69e0ffc Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Mar 28 21:54:37 2017 +0200 Ensure that missing or invalid timezone configuration does not mangle /etc/freshclam.conf in %post (#1154756) diff --git a/clamav.spec b/clamav.spec index 315b839..edf30f2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -262,9 +262,9 @@ for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done ZONES="/usr/share/zoneinfo/zone.tab" CONFIG="/etc/sysconfig/clock" -if [ -r "$CONFIG" -a -r "$ZONES" ]; then +if [ -r "$CONFIG" -a -r "$ZONES" -a -n "$ZONE" ]; then source "$CONFIG" - export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | head -1 | cut -f1 | tr [A-Z] [a-z])" + export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | grep -v ^# | head -1 | cut -f1 | tr [A-Z] [a-z])" fi if [ -z "$CODE" ]; then @@ -410,6 +410,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Mar 28 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-2 +- Ensure that missing or invalid timezone configuration does not + mangle /etc/freshclam.conf in %%post (#1154756) + * Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 - Update to 0.99.2 - Enable llvm commit 0577117bb2cb0095605995c4ad488e03951e809a Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Mon Jun 13 11:36:38 2016 -0600 Update to 0.99.2 - Enable llvm - Drop cliopts patch fixed upstream, use upstream's "--forground" option name - Fix main.cvd (fedora #1325482, epel #1325717) - Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd - Update daily.cvd - Fixup Requires(pre) usage (#1319151) Conflicts: clamav-milter.systemd clamav-milter.sysv clamav-milter.upstart clamav.spec clamd.scan.upstart clamd@.service sources diff --git a/.gitignore b/.gitignore index cdb6045..d87d52b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /clamav-*-norar.tar.xz /main*.cvd /daily*.cvd +/bytecode-278.cvd diff --git a/clamav-0.99.1-setsebool.patch b/clamav-0.99.1-setsebool.patch new file mode 100644 index 0000000..f168b55 --- /dev/null +++ b/clamav-0.99.1-setsebool.patch @@ -0,0 +1,15 @@ +Patch by Robert Scheck <robert(a)fedoraproject.org> for clamav >= 0.99.1 which changes the SELinux +boolean name from the obsolete (and former alias) clamd_use_jit to the current antivirus_use_jit. +See also: https://bugzilla.redhat.com/show_bug.cgi?id=1295473 + +--- clamav-0.99.1/libclamav/builtin_bytecodes.h 2015-12-11 17:26:02.000000000 +0100 ++++ clamav-0.99.1/libclamav/builtin_bytecodes.h.setsebool 2016-03-29 23:32:03.000000000 +0200 +@@ -139,7 +139,7 @@ + if (env.os_features & (1 << feature_selinux)) + /* all SELinux versions deny RWX mapping when policy says so */ + disable_jit_if("^SELinux is preventing 'execmem' access.\n" +- "Run 'setsebool -P clamd_use_jit on'.", 0, 1); ++ "Run 'setsebool -P antivirus_use_jit on'.", 0, 1); + else if (env.os_features & (1 << feature_pax)) + /* recent versions of PaX deny RWX mapping */ + disable_jit_if("^PaX is preventing 'mprotect' access.\n" diff --git a/clamav.spec b/clamav.spec index 0f0f118..315b839 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.99.1 +Version: 0.99.2 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,12 +28,16 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-57.cvd -Source12: http://db.local.clamav.net/daily-21478.cvd +Source12: http://db.local.clamav.net/daily-21723.cvd +Source13: http://db.local.clamav.net/bytecode-278.cvd + +Patch31: clamav-0.99.1-setsebool.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel, pcre-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} + Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -126,6 +130,7 @@ you will need to install %{name}-devel. # Handle that rpmbuild in RHEL < 6 doesn't handle xz archives automatically. %setup -q -T -c xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) +%patch31 -p1 -b .setsebool %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure @@ -199,7 +204,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) --with-group="clam" \ --with-libcurl=%{_prefix} \ --with-user="clam" \ - --disable-llvm +# --disable-llvm make %{?_smp_mflags} @@ -242,6 +247,11 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +install -Dp -m0644 %{SOURCE13} %{buildroot}%{_localstatedir}/lib/clamav/bytecode.cvd +touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/bytecode.cld +touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/{daily,main}.cld +touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/mirrors.dat + # Clean up for later usage in documentation for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done @@ -387,6 +397,9 @@ rm -rf %{buildroot} %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log +%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/*.cld +%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/mirrors.dat + %files devel %defattr(-, root, root, 0755) %{_bindir}/clamav-config @@ -397,6 +410,15 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 +- Update to 0.99.2 +- Enable llvm +- Drop cliopts patch fixed upstream, use upstream's "--forground" option name +- Fix main.cvd (fedora #1325482, epel #1325717) +- Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd +- Update daily.cvd +- Fixup Requires(pre) usage (#1319151) + * Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 - Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) diff --git a/sources b/sources index c0744a1..0573f02 100644 --- a/sources +++ b/sources @@ -1,4 +1,5 @@ -6bf23527691890664c66e62e7bee44ff clamav-0.99.1-norar.tar.xz -85b8dd2229ba4a0ddd8bf048fe2b2078 main-57.cvd -b82f2fc713069d378d79b8e4e3db0b74 daily-21478.cvd +a4517adbd9c72a3fec3fbb1384dd3234 clamav-0.99.2-norar.tar.xz +d71fbb44799945970f2c2b75e40ec105 daily-21723.cvd +f13ead862171f50019c15c946d25e91f main-57.cvd +c545b6a9775ccb72a293d259335589be bytecode-278.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit ea28252658542e37209d2a5ef1b1c1ef58ac7b0b Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Mar 30 00:14:00 2016 +0200 Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) diff --git a/clamav.spec b/clamav.spec index b381569..0f0f118 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,8 +4,8 @@ Summary: Anti-virus software Name: clamav -Version: 0.99 -Release: 3%{?dist} +Version: 0.99.1 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -27,8 +27,8 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). -Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-21123.cvd +Source11: http://db.local.clamav.net/main-57.cvd +Source12: http://db.local.clamav.net/daily-21478.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 +- Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) + * Mon Dec 07 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-3 - Added missing build-time requirement to pcre-devel diff --git a/sources b/sources index 2d52233..c0744a1 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -a972a59e09ef86fdfaaf028f714996e5 clamav-0.99-norar.tar.xz -06f660f474d1a6863de4a00eb02521e3 main-55.cvd -547dca19d7c3f1bfb51a3e0dad4ad52e daily-21123.cvd +6bf23527691890664c66e62e7bee44ff clamav-0.99.1-norar.tar.xz +85b8dd2229ba4a0ddd8bf048fe2b2078 main-57.cvd +b82f2fc713069d378d79b8e4e3db0b74 daily-21478.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 22de990d883ff79a5b7465d9cdb256036839e87c Author: Robert Scheck <robert(a)fedoraproject.org> Date: Mon Dec 7 21:26:22 2015 +0100 Added missing build-time requirement to pcre-devel diff --git a/clamav.spec b/clamav.spec index 2943bcc..b381569 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -32,7 +32,7 @@ Source12: http://db.local.clamav.net/daily-21123.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel, pcre-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Dec 07 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-3 +- Added missing build-time requirement to pcre-devel + * Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 - Require openssl-devel for clamav-devel commit f889ba1f96dfdcf315ae3c6dfb575be290b79571 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Dec 6 18:09:17 2015 +0100 Require openssl-devel for clamav-devel diff --git a/clamav.spec b/clamav.spec index 8021b31..2943bcc 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -110,7 +110,7 @@ The actual virus database for %{name} %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries -Requires: clamav = %{version}-%{release} +Requires: clamav = %{version}-%{release}, openssl-devel ### Fedora Extras introduced them differently :( Obsoletes: libclamav-static-devel <= %{version}-%{release} @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 +- Require openssl-devel for clamav-devel + * Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 - Upgrade to 0.99 and updated daily.cvd (#1287327) commit 685f0bd46bb139c57518ca0c418d262bc8acd9d1 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Dec 2 01:53:02 2015 +0100 Upgrade to 0.99 and updated daily.cvd (#1287327) diff --git a/clamav.spec b/clamav.spec index fe3e9a2..8021b31 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.7 +Version: 0.99 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-20394.cvd +Source12: http://db.local.clamav.net/daily-21123.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 +- Upgrade to 0.99 and updated daily.cvd (#1287327) + * Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 - Upgrade to 0.98.7 and updated daily.cvd (#1217014) diff --git a/sources b/sources index 78b4995..2d52233 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -2dd003807614ef53c5ab6c811273ff4e clamav-0.98.7-norar.tar.xz +a972a59e09ef86fdfaaf028f714996e5 clamav-0.99-norar.tar.xz 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -223a4a02a3b8486ce01b44ea4bb56291 daily-20394.cvd +547dca19d7c3f1bfb51a3e0dad4ad52e daily-21123.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 21917faf8969ba61e367a567fa46900728e0d382 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Apr 29 20:34:24 2015 +0200 Upgrade to 0.98.7 and updated daily.cvd (#1217014) diff --git a/clamav.spec b/clamav.spec index 8b41064..fe3e9a2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,8 +4,8 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.6 -Release: 2%{?dist} +Version: 0.98.7 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-19995.cvd +Source12: http://db.local.clamav.net/daily-20394.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 +- Upgrade to 0.98.7 and updated daily.cvd (#1217014) + * Tue Feb 24 2015 Joel Smith <joelsmith(a)fedoraproject.org> - 0.98.6-2 - Make init script source /etc/sysconfig/clamd if present (#1195864) diff --git a/sources b/sources index c1532aa..78b4995 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -a158e74b3741a4b928bcbc17ab171690 clamav-0.98.6-norar.tar.xz +2dd003807614ef53c5ab6c811273ff4e clamav-0.98.7-norar.tar.xz 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -d58cb68afd94e61caab919d6bfd34fcb daily-19995.cvd +223a4a02a3b8486ce01b44ea4bb56291 daily-20394.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 865529f4ffc69c765e572d951f1407c414c458c1 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Fri Apr 10 18:44:47 2015 +0200 Make init script source /etc/sysconfig/clamd if present (#1195864) diff --git a/clamav.init b/clamav.init index dacb403..633c301 100755 --- a/clamav.init +++ b/clamav.init @@ -17,6 +17,9 @@ [ -x /usr/sbin/clamd ] || exit 0 +# Local clamd config +test -f /etc/sysconfig/clamd && . /etc/sysconfig/clamd + # See how we were called. case "$1" in start) diff --git a/clamav.spec b/clamav.spec index b70ab17..8b41064 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.98.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Feb 24 2015 Joel Smith <joelsmith(a)fedoraproject.org> - 0.98.6-2 +- Make init script source /etc/sysconfig/clamd if present (#1195864) + * Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 - Upgrade to 0.98.6 and updated daily.cvd (#1187050) commit 1e9ece70df82b7e69409fe05d090570af80ee073 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Jan 29 22:44:11 2015 +0100 Really update daily.cvd diff --git a/clamav.spec b/clamav.spec index b1e1e60..b70ab17 100644 --- a/clamav.spec +++ b/clamav.spec @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-19651.cvd +Source12: http://db.local.clamav.net/daily-19995.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) commit ba56519d00748db57cbf148b363f8ed95ebe817b Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Jan 29 22:31:21 2015 +0100 Upgrade to 0.98.6 and updated daily.cvd (#1187050) diff --git a/clamav.spec b/clamav.spec index d87084a..b1e1e60 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.5 +Version: 0.98.6 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 +- Upgrade to 0.98.6 and updated daily.cvd (#1187050) + * Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 - Upgrade to 0.98.5 and updated daily.cvd (#1138101) diff --git a/sources b/sources index 90d8e3a..c1532aa 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ +a158e74b3741a4b928bcbc17ab171690 clamav-0.98.6-norar.tar.xz 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -f83334a2cb2510cc8f9ec9750beaeada daily-19651.cvd -6455c6ce50b56ba1f545c759129f2ad1 clamav-0.98.5-norar.tar.xz +d58cb68afd94e61caab919d6bfd34fcb daily-19995.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 4548304dd3c0924b4c358097eee31b27933fb241 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Nov 19 13:13:01 2014 +0100 Upgrade to 0.98.5 and updated daily.cvd (#1138101) diff --git a/clamav.spec b/clamav.spec index 902fe8a..d87084a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.4 +Version: 0.98.5 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-19120.cvd +Source12: http://db.local.clamav.net/daily-19651.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 +- Upgrade to 0.98.5 and updated daily.cvd (#1138101) + * Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 - Upgrade to 0.98.4 and updated daily.cvd (#1111811) - Add build requirement to libxml2 for DMG, OpenIOC and XAR diff --git a/sources b/sources index bb4d1f0..90d8e3a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -14939dd869178d9c934bd2b7026104f5 daily-19120.cvd -22bca4a49928a883c90c549a93b9bcde clamav-0.98.4-norar.tar.xz +f83334a2cb2510cc8f9ec9750beaeada daily-19651.cvd +6455c6ce50b56ba1f545c759129f2ad1 clamav-0.98.5-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 242037ee812fed4dbd5eefd4e6cb9ab82ce82beb Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Jun 21 19:20:28 2014 +0200 Add build requirement to libxml2 for DMG, OpenIOC and XAR diff --git a/clamav.spec b/clamav.spec index 3b452fa..902fe8a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -32,7 +32,7 @@ Source12: http://db.local.clamav.net/daily-19120.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -399,6 +399,7 @@ rm -rf %{buildroot} %changelog * Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 - Upgrade to 0.98.4 and updated daily.cvd (#1111811) +- Add build requirement to libxml2 for DMG, OpenIOC and XAR * Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 - Upgrade to 0.98.3 commit 22850e6fbd532abf7dce4bf0ddf160b81aff3fac Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Jun 21 19:10:05 2014 +0200 Upgrade to 0.98.4 and updated daily.cvd (#1111811) diff --git a/clamav.spec b/clamav.spec index c8bc466..3b452fa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.3 +Version: 0.98.4 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-18354.cvd +Source12: http://db.local.clamav.net/daily-19120.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 +- Upgrade to 0.98.4 and updated daily.cvd (#1111811) + * Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 - Upgrade to 0.98.3 - Fix --with-libcurl parameter to avoid automatic path detection breakage diff --git a/sources b/sources index 05ea68b..bb4d1f0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -5a7d62d7d8ee4b237d6e08f5bc02037c daily-18354.cvd -e9210784829725bf716fda7ca536bbb0 clamav-0.98.3-norar.tar.xz +14939dd869178d9c934bd2b7026104f5 daily-19120.cvd +22bca4a49928a883c90c549a93b9bcde clamav-0.98.4-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 5db0137e5a5bd88d1ca992d9376a0e6cbfb6d1ed Author: Paul Wouters <pwouters(a)redhat.com> Date: Fri May 9 16:01:41 2014 -0400 update sources, use latest daily cvd diff --git a/clamav.spec b/clamav.spec index 49eedbf..c8bc466 100644 --- a/clamav.spec +++ b/clamav.spec @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-18353.cvd +Source12: http://db.local.clamav.net/daily-18354.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/sources b/sources index b26e5b2..05ea68b 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ +06f660f474d1a6863de4a00eb02521e3 main-55.cvd +5a7d62d7d8ee4b237d6e08f5bc02037c daily-18354.cvd e9210784829725bf716fda7ca536bbb0 clamav-0.98.3-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit e7e53f9ced1d1f2babecad82953cfb613109cf35 Author: Paul Wouters <pwouters(a)redhat.com> Date: Fri May 9 13:10:48 2014 -0400 * Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 - Upgrade to 0.98.3 - Fix --with-libcurl parameter to avoid automatic path detection breakage - openssl-devel is now required for hashing code. - Added clamsubmit to main package - Re-enabled --with-llvm as this speeds up deployment a lot. - Fixed older changelog dates diff --git a/clamav.spec b/clamav.spec index fc1bfc9..49eedbf 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.1 +Version: 0.98.3 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -13,7 +13,7 @@ URL: http://www.clamav.net/ # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. This # tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +# make clean-sources NAME=clamav VERSION=<version> TARBALL=clamav-<version>.tar.gz TARBALL_CLEAN=clamav-<version>-norar.tar.xz # Upstream: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init @@ -32,7 +32,7 @@ Source12: http://db.local.clamav.net/daily-18353.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -197,7 +197,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) --enable-dns \ --with-dbdir="%{_localstatedir}/lib/clamav" \ --with-group="clam" \ - --with-libcurl \ + --with-libcurl=%{_prefix} \ --with-user="clam" \ --disable-llvm @@ -329,12 +329,14 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/sigtool.1* %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* +%doc %{_mandir}/man1/clamsubmit.1* %doc %{_mandir}/man5/freshclam.conf.5* %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam %{_bindir}/sigtool %{_bindir}/clambc +%{_bindir}/clamsubmit %{_libdir}/libclamav.so.* %files -n clamd @@ -395,6 +397,14 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 +- Upgrade to 0.98.3 +- Fix --with-libcurl parameter to avoid automatic path detection breakage +- openssl-devel is now required for hashing code. +- Added clamsubmit to main package +- Re-enabled --with-llvm as this speeds up deployment a lot. +- Fixed older changelog dates + * Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 - Upgrade to 0.98.1 and updated daily.cvd (#1053400) @@ -486,7 +496,7 @@ rm -rf %{buildroot} - Move db to /var/lib/clamav - Ship empty directory /etc/clamd.d for amavisd-new -* Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 +* Thu Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 - Disable llvm. * Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 @@ -643,7 +653,7 @@ rm -rf %{buildroot} - Changed the init-order of the sysv scripts. (Will McCutcheon) - Changes to the default configuration files. -* Sat Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 +* Wed Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 - Updated to release 0.70. * Tue Mar 16 2004 Dag Wieers <dag(a)wieers.com> - 0.68-1 @@ -656,7 +666,7 @@ rm -rf %{buildroot} * Mon Mar 08 2004 Dag Wieers <dag(a)wieers.com> - 0.67-1 - Personalized SPEC file. -* Mon Aug 22 2003 Matthias Saou/Che +* Fri Aug 22 2003 Matthias Saou/Che - Added "--without milter" build option. (Matthias Saou) - Fixed freshclam cron (Matthias Saou) - Built the new package. (Che) @@ -673,7 +683,7 @@ rm -rf %{buildroot} - various fixes - got rid of rpm-helper prereq -* Fri Mar 24 2003 Che +* Mon Mar 24 2003 Che - some cleanups and fixes - new patch added @@ -686,7 +696,7 @@ rm -rf %{buildroot} * Sat Nov 02 2002 Che - version upgrade -* Wed Oct 24 2002 Che +* Thu Oct 24 2002 Che - some important changes for lsb compliance * Wed Oct 23 2002 Che diff --git a/sources b/sources index c4d296c..b26e5b2 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -8944174b2dca6f38d96a2a2a7146d36e clamav-0.98.1-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -06f660f474d1a6863de4a00eb02521e3 main-55.cvd -52ce049e8df4693766c5c42697890d35 daily-18353.cvd +e9210784829725bf716fda7ca536bbb0 clamav-0.98.3-norar.tar.xz commit 584867bec03059e970dcac11001d6026b6435975 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Jan 15 09:23:52 2014 +0100 Upgrade to 0.98.1 and updated daily.cvd (#1053400) diff --git a/clamav.spec b/clamav.spec index 555b18f..fc1bfc9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,8 +4,8 @@ Summary: Anti-virus software Name: clamav -Version: 0.98 -Release: 2%{?dist} +Version: 0.98.1 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-17940.cvd +Source12: http://db.local.clamav.net/daily-18353.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -395,6 +395,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 +- Upgrade to 0.98.1 and updated daily.cvd (#1053400) + * Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 - Really fix all discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) diff --git a/sources b/sources index 3dd1c22..c4d296c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -500ed097cdd1f27ba2ed5fbc605eba37 clamav-0.98-norar.tar.xz +8944174b2dca6f38d96a2a2a7146d36e clamav-0.98.1-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -012af1d3ee7156db8bad20650c89a94d daily-17940.cvd +52ce049e8df4693766c5c42697890d35 daily-18353.cvd commit c4cf2b1e61514556e725ec8990e063b89a099008 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Oct 19 14:18:35 2013 +0200 Ensure that a clamd and clamav-milter condrestart via initscript works (#1018312, thanks to Filippo Carletti) diff --git a/clamav-milter.init b/clamav-milter.init index 347fe4b..d9fb037 100644 --- a/clamav-milter.init +++ b/clamav-milter.init @@ -47,7 +47,7 @@ case "$1" in RETVAL=$? ;; condrestart) - [ -e /var/lock/subsys/clamd ] && restart + [ -e /var/lock/subsys/clamav-milter ] && $0 restart RETVAL=$? ;; *) diff --git a/clamav.init b/clamav.init index b2eb0c6..dacb403 100755 --- a/clamav.init +++ b/clamav.init @@ -46,7 +46,7 @@ case "$1" in RETVAL=$? ;; condrestart) - [ -e /var/lock/subsys/clamd ] && restart + [ -e /var/lock/subsys/clamd ] && $0 restart RETVAL=$? ;; *) @@ -55,4 +55,3 @@ case "$1" in esac exit $RETVAL - diff --git a/clamav.spec b/clamav.spec index 1ec0861..555b18f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -398,6 +398,8 @@ rm -rf %{buildroot} * Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 - Really fix all discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) +- Ensure that a clamd and clamav-milter condrestart via initscript + works (#1018312, thanks to Filippo Carletti) * Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 - Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) commit 9fa6d109df873b43c0c93dc7fe48c8588d625899 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Oct 19 13:54:54 2013 +0200 Really fix all discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) diff --git a/clamav.init b/clamav.init index c3b28ac..b2eb0c6 100755 --- a/clamav.init +++ b/clamav.init @@ -30,7 +30,7 @@ case "$1" in echo -n "Stopping Clam AntiVirus Daemon: " killproc clamd rm -f /var/run/clamav/clamd.sock - rm -f /var/run/clamav/clamav.pid + rm -f /var/run/clamav/clamd.pid RETVAL=$? echo ### heres the fix... we gotta remove the stale files on restart diff --git a/clamav.spec b/clamav.spec index a33d41f..1ec0861 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.98 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -395,6 +395,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 +- Really fix all discrepancies between clamd initscript and clamd + config file (#960923, thanks to John Horne) + * Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 - Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) - Fixed discrepancies between clamd initscript and clamd config commit a1ce11dec47f24429d7485ee95460b8d13faa0a9 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Oct 6 18:41:28 2013 +0200 - Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) - Fixed discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) - Added build requirement to ncurses-devel for clamdtop (again) - Moved clamd wrapper script and documentation into correct sub-package (#782596, thanks to Philip Prindeville) diff --git a/.gitignore b/.gitignore index 7301ddf..cdb6045 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,4 @@ /clamd-wrapper.tar.bz2 -/clamav-0.97.5-norar.tar.xz -/main-54.cvd -/daily-15103.cvd -/clamav-0.97.6-norar.tar.xz -/daily-15408.cvd -/clamav-0.97.7-norar.tar.xz -/daily.cvd -/main.cvd -/clamav-0.97.8-norar.tar.xz +/clamav-*-norar.tar.xz +/main*.cvd +/daily*.cvd diff --git a/clamav.init b/clamav.init index 848dbce..c3b28ac 100755 --- a/clamav.init +++ b/clamav.init @@ -7,7 +7,7 @@ # server. # processname: clamd # pidfile: /var/run/clamav/clamd.pid -# config: /etc/clamav.conf +# config: /etc/clamd.conf # Source function library. . /etc/rc.d/init.d/functions @@ -29,7 +29,7 @@ case "$1" in stop) echo -n "Stopping Clam AntiVirus Daemon: " killproc clamd - rm -f /var/clamav/clamd.socket + rm -f /var/run/clamav/clamd.sock rm -f /var/run/clamav/clamav.pid RETVAL=$? echo diff --git a/clamav.spec b/clamav.spec index daf0015..a33d41f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,15 +4,17 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.8 +Version: 0.98 Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ -# Upstream source includes libunrar that is not distributable. -# rm -r libclamunrar -#Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. This +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +# Upstream: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init @@ -23,12 +25,14 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig -Source11: http://db.local.clamav.net/main.cvd -Source12: http://db.local.clamav.net/daily.cvd +# To download the *.cvd, go to http://www.clamav.net and use the links +# there (I renamed the files to add the -version suffix for verifying). +Source11: http://db.local.clamav.net/main-55.cvd +Source12: http://db.local.clamav.net/daily-17940.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -123,7 +127,7 @@ you will need to install %{name}-devel. %setup -q -T -c xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) -%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure +%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure %{__perl} -pi.orig -e ' s|\@DBDIR\@|\$(localstatedir)/lib/clamav|g; @@ -162,7 +166,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ArchiveMaxCompressionRatio) .+|$1 300|; s|^#(ArchiveBlockEncrypted)|$1|; s|^#(ArchiveBlockMax)|$1|; - ' etc/clamd.conf + ' etc/clamd.conf.sample %{__perl} -pi.orig -e ' s|^(Example)|#$1|; @@ -171,7 +175,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(LogSyslog)|$1|; s|^#(DatabaseOwner) .+$|$1 clam|; s|^(Checks) .+$|$1 24|; - ' etc/freshclam.conf + ' etc/freshclam.conf.sample %{__perl} -pi.orig -e ' s|^(Example)|#$1|; @@ -179,14 +183,14 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|; s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|; s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf + ' etc/clamav-milter.conf.sample %build %configure \ --program-prefix="%{?_program_prefix}" \ %{!?_without_milter:--enable-milter} \ --disable-clamav \ - --disable-static \ + --disable-static \ --disable-zlib-vcheck \ --disable-unrar \ --enable-id-check \ @@ -195,7 +199,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) --with-group="clam" \ --with-libcurl \ --with-user="clam" \ - --disable-llvm + --disable-llvm make %{?_smp_mflags} @@ -208,6 +212,9 @@ install -Dp -m0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/cron.daily/freshclam install -Dp -m0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav +mv -f %{buildroot}%{_sysconfdir}/clamd.conf{.sample,} +mv -f %{buildroot}%{_sysconfdir}/freshclam.conf{.sample,} + # now rewrite scripts and config files in-place sed -i \ -e 's!%%{_sbindir}!%{_sbindir}!g' \ @@ -219,6 +226,7 @@ sed -i \ %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +mv -f %{buildroot}%{_sysconfdir}/clamav-milter.conf{.sample,} %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif @@ -235,6 +243,9 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +# Clean up for later usage in documentation +for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done + %post /sbin/ldconfig @@ -313,14 +324,12 @@ rm -rf %{buildroot} %files %defattr(-, root, root, 0755) -%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README test/ +%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README %doc docs/*.pdf etc/freshclam.conf %doc %{_mandir}/man1/sigtool.1* %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -337,6 +346,8 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clambc.1* %doc %{_mandir}/man5/clamd.conf.5* %doc %{_mandir}/man8/clamd.8* +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav %{_sysconfdir}/clamd.d @@ -344,6 +355,7 @@ rm -rf %{buildroot} %{_sbindir}/clamd %{_bindir}/clamconf %{_bindir}/clamdscan +%{_bindir}/clamdtop %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ @@ -383,6 +395,14 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 +- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) +- Fixed discrepancies between clamd initscript and clamd config + file (#960923, thanks to John Horne) +- Added build requirement to ncurses-devel for clamdtop (again) +- Moved clamd wrapper script and documentation into correct sub- + package (#782596, thanks to Philip Prindeville) + * Tue Apr 23 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.8-1 - Upgrade to 0.97.8 - Updated daily.cvd diff --git a/sources b/sources index ec1a084..3dd1c22 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -8cfa8b280084a97518d3e80575e98938 clamav-0.97.8-norar.tar.xz +500ed097cdd1f27ba2ed5fbc605eba37 clamav-0.98-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -bbe585f65fb04504544ce3d6e07d38e9 daily.cvd -eb12490fda87d602e476d4b163f8a34b main.cvd +06f660f474d1a6863de4a00eb02521e3 main-55.cvd +012af1d3ee7156db8bad20650c89a94d daily-17940.cvd commit faa3f19f0380abcb265cbc388f3b3fff9cdf4742 Author: Orion Poplawski <orion(a)nwra.com> Date: Tue Apr 23 16:09:44 2013 -0600 - Upgrade to 0.97.8 - Updated daily.cvd diff --git a/.gitignore b/.gitignore index 6d3c72d..7301ddf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /clamav-0.97.7-norar.tar.xz /daily.cvd /main.cvd +/clamav-0.97.8-norar.tar.xz diff --git a/clamav.spec b/clamav.spec index d5f7c57..daf0015 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,13 +4,14 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.7 +Version: 0.97.8 Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. +# rm -r libclamunrar #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init @@ -382,6 +383,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Apr 23 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.8-1 +- Upgrade to 0.97.8 +- Updated daily.cvd + * Mon Mar 18 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.7-1 - Upgrade to 0.97.7 diff --git a/sources b/sources index 410fab6..ec1a084 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -e0dba8d8326cd88293224dc4ac398b21 clamav-0.97.7-norar.tar.xz +8cfa8b280084a97518d3e80575e98938 clamav-0.97.8-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -e3044fecc863b90996f023d20822b6c2 daily.cvd +bbe585f65fb04504544ce3d6e07d38e9 daily.cvd eb12490fda87d602e476d4b163f8a34b main.cvd commit a5b7bfd560a1a7d7b77d3c852601a4ede74b304b Author: Orion Poplawski <orion(a)nwra.com> Date: Mon Mar 18 09:19:41 2013 -0600 Upgrade to 0.97.7 diff --git a/.gitignore b/.gitignore index 25dfb7b..6d3c72d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ /daily-15103.cvd /clamav-0.97.6-norar.tar.xz /daily-15408.cvd +/clamav-0.97.7-norar.tar.xz +/daily.cvd +/main.cvd diff --git a/clamav.spec b/clamav.spec index 00e0c98..d5f7c57 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.6 +Version: 0.97.7 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -12,7 +12,7 @@ URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.6-norar.tar.xz +Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -22,9 +22,8 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig -# Temporary workaround for broken 0.97.6 tarball -Source11: http://db.local.clamav.net/main-54.cvd -Source12: http://db.local.clamav.net/daily-15408.cvd +Source11: http://db.local.clamav.net/main.cvd +Source12: http://db.local.clamav.net/daily.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -383,6 +382,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Mar 18 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.7-1 +- Upgrade to 0.97.7 + * Tue Sep 18 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.6-1 - Upgrade to 0.97.6 diff --git a/sources b/sources index aeaf952..410fab6 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz +e0dba8d8326cd88293224dc4ac398b21 clamav-0.97.7-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -eb12490fda87d602e476d4b163f8a34b main-54.cvd -47b966d960e28a28e505fd178c4cb095 daily-15408.cvd +e3044fecc863b90996f023d20822b6c2 daily.cvd +eb12490fda87d602e476d4b163f8a34b main.cvd commit 15b6ada7a385abb0d64f32bee632a77aeb4c5b4f Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Sep 27 19:41:50 2012 +0200 Ship local copy of virus database; it was removed by accident from 0.97.6 tarball diff --git a/.gitignore b/.gitignore index 128c670..25dfb7b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /main-54.cvd /daily-15103.cvd /clamav-0.97.6-norar.tar.xz +/daily-15408.cvd diff --git a/clamav.spec b/clamav.spec index 927809e..00e0c98 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,9 +22,9 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig -# Temporary workaround for broken 0.97.5 tarball -#Source11: http://db.local.clamav.net/main-54.cvd -#Source12: http://db.local.clamav.net/daily-15103.cvd +# Temporary workaround for broken 0.97.6 tarball +Source11: http://db.local.clamav.net/main-54.cvd +Source12: http://db.local.clamav.net/daily-15408.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -232,8 +232,8 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -#install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd -#install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd +install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd %post /sbin/ldconfig diff --git a/sources b/sources index 65f9425..aeaf952 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +eb12490fda87d602e476d4b163f8a34b main-54.cvd +47b966d960e28a28e505fd178c4cb095 daily-15408.cvd commit ff8b3932d288c49b40a0ec2fb72b58332b614367 Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 22:37:08 2012 -0500 Comment out SOURCE11 SOURCE12 diff --git a/clamav.spec b/clamav.spec index 81ba9f3..927809e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -232,8 +232,8 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd -install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +#install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd +#install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd %post /sbin/ldconfig commit eee4fecd3edceaa0ff7f16c925006f023afd0a03 Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 22:26:37 2012 -0500 Fix sources file diff --git a/sources b/sources index c31c394..65f9425 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit f3c9a633373d1d3c3a48e4929cb17087f01331c4 Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 18:32:24 2012 -0500 Add clamav-wrapper.tar.bz2 back to sources diff --git a/sources b/sources index 0d5102d..c31c394 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 36e6d2dd7cd2b00e25478821cbb4b0836d9f5eea Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 18:18:16 2012 -0500 Update to 0.97.6 diff --git a/.gitignore b/.gitignore index 36d7010..128c670 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /clamav-0.97.5-norar.tar.xz /main-54.cvd /daily-15103.cvd +/clamav-0.97.6-norar.tar.xz diff --git a/clamav.spec b/clamav.spec index 0e4e8f4..81ba9f3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.5 +Version: 0.97.6 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -12,7 +12,7 @@ URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.5-norar.tar.xz +Source0: clamav-0.97.6-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -23,8 +23,8 @@ Source9: clamd.logrotate Source10: clamav-milter.sysconfig # Temporary workaround for broken 0.97.5 tarball -Source11: http://db.local.clamav.net/main-54.cvd -Source12: http://db.local.clamav.net/daily-15103.cvd +#Source11: http://db.local.clamav.net/main-54.cvd +#Source12: http://db.local.clamav.net/daily-15103.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -383,6 +383,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Sep 18 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.6-1 +- Upgrade to 0.97.6 + * Wed Jun 20 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.5-1 - Upgrade to 0.97.5 - Fix CVE-2012-1419 clamav: specially-crafted POSIX tar files evade detection diff --git a/sources b/sources index 14401b5..0d5102d 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -eb12490fda87d602e476d4b163f8a34b main-54.cvd -1606d4b9dd4cf9658b22cb8bd135a0e3 daily-15103.cvd +ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz commit 6bd5ce5307f4581e68d96b4849f47dad5edb384f Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:55:11 2012 +0200 Correct my broken previous commit :( diff --git a/.gitignore b/.gitignore index 23e3e8f..36d7010 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /clamd-wrapper.tar.bz2 /clamav-0.97.5-norar.tar.xz /main-54.cvd -/daily-15050.cvd +/daily-15103.cvd diff --git a/clamav.spec b/clamav.spec index 2bc1881..0e4e8f4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -24,7 +24,7 @@ Source10: clamav-milter.sysconfig # Temporary workaround for broken 0.97.5 tarball Source11: http://db.local.clamav.net/main-54.cvd -Source12: http://db.local.clamav.net/daily-15050.cvd +Source12: http://db.local.clamav.net/daily-15103.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/sources b/sources index 78cc194..14401b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ +f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 eb12490fda87d602e476d4b163f8a34b main-54.cvd -d41d8cd98f00b204e9800998ecf8427e daily-15050.cvd +1606d4b9dd4cf9658b22cb8bd135a0e3 daily-15103.cvd commit df3eb6be0d66e27aa8e51e09d87d08abd8a98c74 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:47:19 2012 +0200 Ship local copy of virus database; it was removed by accident from 0.97.5 tarball diff --git a/.gitignore b/.gitignore index 916d9f6..23e3e8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -/clamav-0.97.2-norar.tar.xz -/clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 -/clamav-0.97.3-norar.tar.xz /clamav-0.97.5-norar.tar.xz +/main-54.cvd +/daily-15050.cvd diff --git a/clamav.spec b/clamav.spec index ee10cb8..2bc1881 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,6 +22,10 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig +# Temporary workaround for broken 0.97.5 tarball +Source11: http://db.local.clamav.net/main-54.cvd +Source12: http://db.local.clamav.net/daily-15050.cvd + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -228,6 +232,9 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ +install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd +install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd + %post /sbin/ldconfig @@ -383,6 +390,7 @@ rm -rf %{buildroot} - Fix CVE-2012-1443 clamav: specially-crafted RAR files evade detection - Fix CVE-2012-1458 clamav: specially-crafted CHM files evade detection - Fix CVE-2012-1459 clamav: specially-crafted length field in tar files evade detection +- Ship local copy of virus database; it was removed by accident from 0.97.5 tarball * Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 - Split files out into SCM instead of in the spec diff --git a/sources b/sources index ec6a603..78cc194 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +eb12490fda87d602e476d4b163f8a34b main-54.cvd +d41d8cd98f00b204e9800998ecf8427e daily-15050.cvd commit c732ee62430052119672ccaba84b9651bdd673ca Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:25:02 2012 +0200 /var/clamav should be /var/lib/clamav (as it was somewhen in the past) diff --git a/clamav.spec b/clamav.spec index 56f5aa7..ee10cb8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -253,14 +253,14 @@ fi %pre getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 %pre -n clamd getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 @@ -291,7 +291,7 @@ fi %pre db getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 commit 70dabdfb2ee545108398b8dc23ede0523531d862 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 20 22:26:09 2012 -0500 Add clamav-wrapper.tar.bz2 to sources diff --git a/sources b/sources index 94f05dd..ec6a603 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 278449beafd0d102b6d043fd1eba36f79c88e041 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 20 21:56:56 2012 -0500 Upgrade to 0.97.5 diff --git a/.gitignore b/.gitignore index b09a0a5..916d9f6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 /clamav-0.97.3-norar.tar.xz +/clamav-0.97.5-norar.tar.xz diff --git a/sources b/sources index 47b00bc..94f05dd 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz commit 1da35f528b76c172da1be61516633bf4774ba2f4 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 20 21:56:33 2012 -0500 Upgrade to 0.97.5 diff --git a/clamav.spec b/clamav.spec index b5d68b2..56f5aa7 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,15 +4,15 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.3 -Release: 4%{?dist} +Version: 0.97.5 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.3-norar.tar.xz +Source0: clamav-0.97.5-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -376,6 +376,14 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jun 20 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.5-1 +- Upgrade to 0.97.5 +- Fix CVE-2012-1419 clamav: specially-crafted POSIX tar files evade detection +- Fix CVE-2012-1457 clamav: overly long length field in tar files evade detection +- Fix CVE-2012-1443 clamav: specially-crafted RAR files evade detection +- Fix CVE-2012-1458 clamav: specially-crafted CHM files evade detection +- Fix CVE-2012-1459 clamav: specially-crafted length field in tar files evade detection + * Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 - Split files out into SCM instead of in the spec commit b6a2788bdb2d6594a798987b9112ebcfb3ea3406 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Thu Jan 19 19:33:03 2012 -0600 Split out files into SCM instead of in spec diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig new file mode 100644 index 0000000..834b0cd --- /dev/null +++ b/clamav-milter.sysconfig @@ -0,0 +1,4 @@ +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" diff --git a/clamav.spec b/clamav.spec index ba4b951..b5d68b2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -16,6 +16,12 @@ Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 + +Source7: freshclam.cron +Source8: freshclam.logrotate +Source9: clamd.logrotate +Source10: clamav-milter.sysconfig + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -171,53 +177,6 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf - -cat <<EOF >clamd.logrotate -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript -} -EOF - -cat <<EOF >freshclam.logrotate -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} -EOF - -cat <<'EOF' >freshclam.cron -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" -EOF - -%{__cat} <<EOF >clamav-milter.sysconfig -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" -EOF - %build %configure \ --program-prefix="%{?_program_prefix}" \ @@ -241,13 +200,21 @@ rm -rf %{buildroot} make install DESTDIR="%{buildroot}" install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd -install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav +install -Dp -m0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav + +# now rewrite scripts and config files in-place +sed -i \ + -e 's!%%{_sbindir}!%{_sbindir}!g' \ + -e 's!%%{_bindir}!%{_bindir}!g' \ + -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ + %{buildroot}%{_sysconfdir}/cron.daily/freshclam \ + %{buildroot}%{_sysconfdir}/logrotate.d/* %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif @@ -409,6 +376,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 +- Split files out into SCM instead of in the spec + * Sun Jan 1 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-3 - Revert patch from 0.97.3-2 diff --git a/clamd.logrotate b/clamd.logrotate new file mode 100644 index 0000000..b233f3a --- /dev/null +++ b/clamd.logrotate @@ -0,0 +1,8 @@ +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} diff --git a/freshclam.cron b/freshclam.cron new file mode 100644 index 0000000..e40d8ef --- /dev/null +++ b/freshclam.cron @@ -0,0 +1,17 @@ +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate new file mode 100644 index 0000000..272d220 --- /dev/null +++ b/freshclam.logrotate @@ -0,0 +1,5 @@ +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} commit 9650322a3c84c2129ddcb0da4f23373ce6960169 Merge: a638626 2cfebfc Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:44:31 2012 -0600 Merge branch 'el6' of ssh://pkgs.fedoraproject.org/clamav into el6 Conflicts: freshclam.logrotate commit a6386267af7aef72c90d01b8364113b49e293dec Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:40:48 2012 -0600 Bump to 0.97.3-3 diff --git a/clamav.spec b/clamav.spec index bd8c933..ba4b951 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -409,6 +409,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Jan 1 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-3 +- Revert patch from 0.97.3-2 + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - Update to 0.97.3 - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 commit 1b188a1f3f19a9a627083b1407aa831810ad6c2f Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:39:31 2012 -0600 Revert "Add files from bug 756854" This reverts commit 14d21bc46d3a59c90e91420a310f14102e8d859b. diff --git a/README.clamd-wrapper b/README.clamd-wrapper deleted file mode 100644 index 5cd1b91..0000000 --- a/README.clamd-wrapper +++ /dev/null @@ -1,116 +0,0 @@ -To create individual clamd-instance take the following files and -modify/copy them in the suggested way: - -clamd.conf: - * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with an unique service-name; - e.g. as /etc/clamd.d/<SERVICE>.conf - - To make logfile rotation work properly, the LogFile should be - writable for the assigned User. Recommended way to reach this, is - to: - * make it owned by the User's *group* - * assign at least 0620 (u+rw,g+w) permissions - - A suitable command might be - | # touch <logfile> - | # chgrp <user> <logfile> - | # chmod 0620 <logfile> - - NEVER use 'clamav' as the user since he can modify the database. - This is the user who is running the application; e.g. for mimedefang - (http://www.roaringpenguin.com/mimedefang) the user might be - 'defang'.Theoretically, distinct users could be used, but it must be - made sure that the application-user can write into the socket-file, - and that the clamd-user can access the files asked by the - application to be checked. - - -clamd.logrotate: - * set the correct value for the logfile - * place it into /etc/logrotate.d - -clamd.sysconfig: - * set the name of the config-file and the local socket - * copy it to /etc/sysconfig/clamd.<SERVICE> - -clamd.init: - * set the service-name - * place it into /etc/init.d/ with an unique name and activate it - (e.g. with /sbin/chkconfig clamd.<SERVICE> on) - -Additionally, a symlink must be set to clamd in a way like - | # ln -s clamd /usr/sbin/clamd.<SERVICE> -and the directory for the socket file must be created (see 'LocalSocket' -in clamd.conf) - | # mkdir -p /var/run/clamd.<SERVICE> - - -This directory must be writable by the 'User' chosen in the config-file. - - - -[Disclaimer: - this file and the script/configfiles are not part of the official - clamav package. - - Please send complaints and comments to - mailto:enrico.scholz@informatik.tu-chemnitz.de!] -To create individual clamd-instance take the following files and -modify/copy them in the suggested way: - -clamd.conf: - * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with an unique service-name; - e.g. as /etc/clamd.d/<SERVICE>.conf - - To make logfile rotation work properly, the LogFile should be - writable for the assigned User. Recommended way to reach this, is - to: - * make it owned by the User's *group* - * assign at least 0620 (u+rw,g+w) permissions - - A suitable command might be - | # touch <logfile> - | # chgrp <user> <logfile> - | # chmod 0620 <logfile> - - NEVER use 'clamav' as the user since he can modify the database. - This is the user who is running the application; e.g. for mimedefang - (http://www.roaringpenguin.com/mimedefang) the user might be - 'defang'.Theoretically, distinct users could be used, but it must be - made sure that the application-user can write into the socket-file, - and that the clamd-user can access the files asked by the - application to be checked. - - -clamd.logrotate: - * set the correct value for the logfile - * place it into /etc/logrotate.d - -clamd.sysconfig: - * set the name of the config-file and the local socket - * copy it to /etc/sysconfig/clamd.<SERVICE> - -clamd.init: - * set the service-name - * place it into /etc/init.d/ with an unique name and activate it - (e.g. with /sbin/chkconfig clamd.<SERVICE> on) - -Additionally, a symlink must be set to clamd in a way like - | # ln -s clamd /usr/sbin/clamd.<SERVICE> -and the directory for the socket file must be created (see 'LocalSocket' -in clamd.conf) - | # mkdir -p /var/run/clamd.<SERVICE> - - -This directory must be writable by the 'User' chosen in the config-file. - - - -[Disclaimer: - this file and the script/configfiles are not part of the official - clamav package. - - Please send complaints and comments to - mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig deleted file mode 100644 index bd82488..0000000 --- a/clamav-milter.sysconfig +++ /dev/null @@ -1,8 +0,0 @@ -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" diff --git a/clamav.spec b/clamav.spec index 53db81e..bd8c933 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -15,14 +15,7 @@ URL: http://www.clamav.net/ Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init -Source3: clamd-wrapper -Source4: clamd.init -Source5: README.clamd-wrapper -Source6: clamd.sysconfig -Source7: freshclam.logrotate -Source8: freshclam.cron -Source9: clamd.logrotate -Source10: clamav-milter.sysconfig +Source3: clamd-wrapper.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -178,6 +171,53 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf + +cat <<EOF >clamd.logrotate +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} +EOF + +cat <<EOF >freshclam.logrotate +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} +EOF + +cat <<'EOF' >freshclam.cron +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" +EOF + +%{__cat} <<EOF >clamav-milter.sysconfig +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" +EOF + %build %configure \ --program-prefix="%{?_program_prefix}" \ @@ -200,30 +240,19 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR="%{buildroot}" -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav -install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav - -# now rewrite scripts and config files in-place -sed -i \ - -e 's!%%{_sbindir}!%{_sbindir}!g' \ - -e 's!%%{_bindir}!%{_bindir}!g' \ - -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ - %{buildroot}%{_sysconfdir}/logrotate.d/* \ - %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif - # Install clamav-wrapper: -install -d -m0755 %{buildroot}/%{_prefix}/share/clamav -install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} -install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} +tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log @@ -316,6 +345,8 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -335,12 +366,10 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav %{_sysconfdir}/clamd.d -%config %{_initrddir}/clamav +%config %{_initrddir}/clamd %{_sbindir}/clamd %{_bindir}/clamconf %{_bindir}/clamdscan -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd* %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ @@ -380,10 +409,6 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 -- Add missing clamd-wrapper supporting files -- Remove from init script the unused CLAMD_SOCKET variable - * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - Update to 0.97.3 - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamav.spec.orig b/clamav.spec.orig deleted file mode 100644 index 45aa5db..0000000 --- a/clamav.spec.orig +++ /dev/null @@ -1,1091 +0,0 @@ -#global prerelease rc1 - -## Fedora Extras specific customization below... -%bcond_without fedora -%bcond_without upstart -%bcond_without systemd -%bcond_with sysv -%bcond_without tmpfiles -%bcond_with unrar -%bcond_without noarch -%bcond_without bytecode -## - -%ifnarch s390 s390x -%global have_ocaml 1 -%else -%global have_ocaml 0 -%endif - -%global username clamupdate -%global homedir %_var/lib/clamav -%global freshclamlog %_var/log/freshclam.log -%global milteruser clamilt -%global milterlog %_var/log/clamav-milter.log -%global milterstatedir %_var/run/clamav-milter -%global pkgdatadir %_datadir/%name - -%global scanuser clamscan -%global scanstatedir %_var/run/clamd.scan - -%{?with_noarch:%global noarch BuildArch: noarch} -%{!?_unitdir:%global _unitdir /lib/systemd/system} -%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} -%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ -%nil} -%{!?systemd_reqs:%global systemd_reqs \ -Requires(post): /bin/systemctl\ -Requires(preun): /bin/systemctl\ -Requires(postun): /bin/systemctl\ -%nil} -%{!?systemd_install:%global systemd_install()\ -%post %1\ -test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -%preun %1\ -test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ -test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ -%postun %1\ -/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ -%nil} - - -Summary: End-user tools for the Clam Antivirus scanner -Name: clamav -Version: 0.97.3 -Release: %release_func 1700 -License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} -Group: Applications/File -URL: http://www.clamav.net -%if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -%else -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: %name-%version%{?prerelease}-norar.tar.xz -%endif -Source1: clamd-wrapper -Source2: clamd.sysconfig -Source3: clamd.logrotate -Source5: clamd-README -Source6: clamav-update.logrotate -Source7: clamd.SERVICE.init -Source8: clamav-notify-servers -Patch24: clamav-0.92-private.patch -Patch25: clamav-0.92-open.patch -Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95.3-umask.patch -# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… -Patch29: clamav-0.96.2-jitoff.patch -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: clamav-lib = %version-%release -Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: ncurses-devel -BuildRequires: %_includedir/tcpd.h -%{?with_bytecode:BuildRequires: bc tcl groff graphviz} -%if %{have_ocaml} -%{?with_bytecode:BuildRequires: ocaml} -%endif - -%package filesystem -Summary: Filesystem structure for clamav -Group: Applications/File -Provides: user(%username) = 4 -Provides: group(%username) = 4 -# Prevent version mix -Conflicts: %name < %version-%release -Conflicts: %name > %version-%release -BuildRequires: fedora-usermgmt-devel -%{?noarch} -%{?FE_USERADD_REQ} - -%package lib -Summary: Dynamic libraries for the Clam Antivirus scanner -Group: System Environment/Libraries -Requires: data(clamav) - -%package devel -Summary: Header files and libraries for the Clam Antivirus scanner -Group: Development/Libraries -Source100: clamd-gen -Requires: clamav-lib = %version-%release -Requires: clamav-filesystem = %version-%release - -%package data -Summary: Virus signature data for the Clam Antivirus scanner -Group: Applications/File -Requires(pre): clamav-filesystem = %version-%release -Requires(postun): clamav-filesystem = %version-%release -Provides: data(clamav) = full -Conflicts: data(clamav) < full -Conflicts: data(clamav) > full -%{?noarch} - -%package data-empty -Summary: Empty data package for the Clam Antivirus scanner -Group: Applications/File -Provides: data(clamav) = empty -Conflicts: data(clamav) < empty -Conflicts: data(clamav) > empty -%{?noarch} - -%package update -Summary: Auto-updater for the Clam Antivirus scanner data-files -Group: Applications/File -Source200: freshclam-sleep -Source201: freshclam.sysconfig -Source202: clamav-update.cron -Requires: clamav-filesystem = %version-%release -Requires(pre): /etc/cron.d -Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod -Requires(post): group(%username) - -%package server -Summary: Clam Antivirus scanner server -Group: System Environment/Daemons -Requires: data(clamav) -Requires: clamav-filesystem = %version-%release -Requires: clamav-lib = %version-%release - -%package server-sysvinit -Summary: SysV initscripts for clamav server -Group: System Environment/Daemons -Provides: init(clamav-server) = sysv -Requires: clamav-server = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir -Provides: clamav-server-sysv = %version-%release -Obsoletes: clamav-server-sysv < %version-%release -%{?noarch} - - -%package scanner -Summary: Clamav scanner daemon -Group: System Environment/Daemons -Requires: init(clamav-scanner) -Provides: user(%scanuser) = 49 -Provides: group(%scanuser) = 49 -Requires: clamav-server = %version-%release -%{?noarch} - -# Remove me after EOL of RHEL5 -%package scanner-sysvinit -Summary: SysV initscripts for clamav scanner daemon -Group: System Environment/Daemons -Provides: init(clamav-scanner) = sysv -Requires: clamav-server-sysvinit = %version-%release -Requires: clamav-scanner = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -%{?noarch} - -%package scanner-upstart -Summary: Upstart initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source410: clamd.scan.upstart -Provides: init(clamav-scanner) = upstart -Requires: clamav-scanner = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package scanner-systemd -Summary: Systemd initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source430: clamd.scan.systemd -Provides: init(clamav-scanner) = systemd -Requires: clamav-scanner = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-scanner-sysvinit = %version-%release -Obsoletes: %name-scanner-sysvinit < %version-%release -%endif - - -%package milter -Summary: Milter module for the Clam Antivirus scanner -Group: System Environment/Daemons -Source300: README.fedora -Requires: init(clamav-milter) -BuildRequires: sendmail-devel -BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) = 5 -Provides: group(%milteruser) = 5 -Requires(post): coreutils -%{?FE_USERADD_REQ} - -Provides: milter(clamav) = sendmail -Provides: milter(clamav) = postfix - -Provides: clamav-milter-core = %version-%release -Obsoletes: clamav-milter-core < %version-%release -Provides: clamav-milter-sendmail = %version-%release -Obsoletes: clamav-milter-sendmail < %version-%release - -# Remove me after EOL of RHEL5 -%package milter-sysvinit -Summary: SysV initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source320: clamav-milter.sysv -Provides: init(clamav-milter) = sysvinit -Requires: clamav-milter = %version-%release -Requires(post): user(%milteruser) clamav-milter -Requires(preun): user(%milteruser) clamav-milter -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -Provides: clamav-milter-sysv = %version-%release -Obsoletes: clamav-milter-sysv < %version-%release -%{?noarch} - -%package milter-upstart -Summary: Upstart initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source310: clamav-milter.upstart -Provides: init(clamav-milter) = upstart -Requires: clamav-milter = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package milter-systemd -Summary: Systemd initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source330: clamav-milter.systemd -Provides: init(clamav-milter) = systemd -Requires: clamav-milter = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-milter-sysvinit = %version-%release -Obsoletes: %name-milter-sysvinit < %version-%release -%endif - - -%description -Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this -software is the integration with mail servers (attachment scanning). The -package provides a flexible and scalable multi-threaded daemon, a command -line scanner, and a tool for automatic updating via Internet. The programs -are based on a shared library distributed with the Clam AntiVirus package, -which you can use with your own software. The virus database is based on -the virus database from OpenAntiVirus, but contains additional signatures -(including signatures for popular polymorphic viruses, too) and is KEPT UP -TO DATE. - -%description filesystem -This package provides the filesystem structure and contains the -user-creation scripts required by clamav. - -%description lib -This package contains dynamic libraries shared between applications -using the Clam Antivirus scanner. - -%description devel -This package contains headerfiles and libraries which are needed to -build applications using clamav. - -%description data -This package contains the virus-database needed by clamav. This -database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. This package and the -'clamav-data-empty' package are mutually exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description data-empty -This is an empty package to fulfill inter-package dependencies of the -clamav suite. This package and the 'clamav-data' package are mutually -exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description update -This package contains programs which can be used to update the clamav -anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. - -%description server -ATTENTION: most users do not need this package; the main package has -everything (or depends on it) which is needed to scan for virii on -workstations. - -This package contains files which are needed to execute the clamd-daemon. -This daemon does not provide a system-wide service. Instead of, an instance -of this daemon should be started for each service requiring it. - -See the README file how this can be done with a minimum of effort. - - -%description server-sysvinit -SysV initscripts template for the clamav server - - -%description scanner -This package contains a generic system wide clamd service which is -e.g. used by the clamav-milter package. - -%description scanner-sysvinit -The SysV initscripts for clamav-scanner. - -%description scanner-upstart -The Upstart initscripts for clamav-scanner. - -%description scanner-systemd -The systemd initscripts for clamav-scanner. - - -%description milter -This package contains files which are needed to run the clamav-milter. - -%description milter-sysvinit -The SysV initscripts for clamav-milter. - -%description milter-upstart -The Upstart initscripts for clamav-milter. - -%description milter-systemd -The systemd initscripts for clamav-scanner. - -## ------------------------------------------------------------ - -%prep -%setup -q -n %{name}-%{version}%{?prerelease} - -%apply -n24 -p1 -b .private -%apply -n25 -p1 -b .open -%apply -n26 -p1 -b .cliopts -%apply -n27 -p1 -b .umask -%apply -n29 -p1 -b .jitoff -%{?apply_end} - -install -p -m0644 %SOURCE300 clamav-milter/ - -mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} - -sed -ri \ - -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ - -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ - -e 's!^#?(User ).*!\1<USER>!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ - -e 's! /usr/local/share/clamav,! %homedir,!g' \ - etc/clamd.conf - -sed -ri \ - -e 's!^#?(UpdateLogFile )!#\1!g;' \ - -e 's!^#?(LogSyslog).*!\1 yes!g' \ - -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf - - -## ------------------------------------------------------------ - -%build -CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" -export LDFLAGS='-Wl,--as-needed' -# HACK: remove me... -export FRESHCLAM_LIBS='-lz' -# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine -export have_cv_ipv6=yes -%configure \ - --disable-static \ - --disable-rpath \ - --disable-silent-rules \ - --disable-clamav \ - --with-user=%username \ - --with-group=%username \ - --with-dbdir=/var/lib/clamav \ - --enable-milter \ - --enable-clamdtop \ - %{!?with_bytecode:--disable-llvm} \ - %{!?with_unrar:--disable-unrar} - -# TODO: check periodically that CLAMAVUSER is used for freshclam only - - -# build with --as-needed and disable rpath -sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ - libtool - - -make %{?_smp_mflags} - - -## ------------------------------------------------------------ - -%install -rm -rf "$RPM_BUILD_ROOT" _doc* -make DESTDIR="$RPM_BUILD_ROOT" install - -function smartsubst() { - local tmp - local regexp=$1 - shift - - tmp=$(mktemp /tmp/%name-subst.XXXXXX) - for i; do - sed -e "$regexp" "$i" >$tmp - cmp -s $tmp "$i" || cat $tmp >"$i" - rm -f $tmp - done -} - - -install -d -m 0755 \ - $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ - $RPM_BUILD_ROOT%_var/{log,run} \ - $RPM_BUILD_ROOT%milterstatedir \ - $RPM_BUILD_ROOT%pkgdatadir/template \ - $RPM_BUILD_ROOT%_initrddir \ - $RPM_BUILD_ROOT%homedir \ - $RPM_BUILD_ROOT%scanstatedir - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ - $RPM_BUILD_ROOT%_libdir/*.la - - -touch $RPM_BUILD_ROOT%homedir/daily.cld -touch $RPM_BUILD_ROOT%homedir/main.cld - - -## prepare the server-files -install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig -install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate -install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init -install -D -m 0644 -p %SOURCE5 _doc_server/README -install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf - -install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ -install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template - -smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper - - -## prepare the update-files -install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update -install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers -touch $RPM_BUILD_ROOT%freshclamlog - -install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update - -smartsubst 's!webmaster,clamav!webmaster,%username!g; - s!/usr/share/clamav!%pkgdatadir!g; - s!/usr/bin!%_bindir!g; - s!/usr/sbin!%_sbindir!g;' \ - $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ - $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep - - -### The scanner stuff -sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf - -sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ - > $RPM_BUILD_ROOT%_initrddir/clamd.scan - -install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf -install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf -d %scanstatedir 0710 %scanuser %scanuser -EOF - -touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} - - -### The milter stuff -sed -r \ - -e 's!^#?(User).*!\1 %milteruser!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ - -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ - -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ - -e 's! /tmp/clamav-milter.log! %milterlog!g' \ - etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf - -install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf -install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter -install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf -d %milterstatedir 0710 %milteruser %milteruser -EOF - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf -touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} - -%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} -%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} -%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} -%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} -%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} - -# keep clamd-wrapper in every case because it might be needed by other -# packages -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper - -## ------------------------------------------------------------ - -%check -make check - -## ------------------------------------------------------------ - -%clean -rm -rf "$RPM_BUILD_ROOT" - -## ------------------------------------------------------------ - -%pre filesystem -%__fe_groupadd 4 -r %username &>/dev/null || : -%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ - -c 'Clamav database update user' -g %username %username &>/dev/null || : - -%postun filesystem -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - - -%pre scanner -%__fe_groupadd 49 -r %scanuser &>/dev/null || : -%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ - -g %scanuser %scanuser &>/dev/null || : - -%postun scanner -%__fe_userdel %scanuser &>/dev/null || : -%__fe_groupdel %scanuser &>/dev/null || : - - -%post scanner-sysvinit -/sbin/chkconfig --add clamd.scan - -%preun scanner-sysvinit -test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.scan - -%postun scanner-sysvinit -test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : - - -%post scanner-upstart -/usr/bin/killall -u %scanuser clamd 2>/dev/null || : - -%preun scanner-upstart -test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : - - -%systemd_install scanner-systemd clamd.scan.service - - -%post update -test -e %freshclamlog || { - touch %freshclamlog - %__chmod 0664 %freshclamlog - %__chown root:%username %freshclamlog -} - - -%triggerin milter -- clamav-scanner -# Add the milteruser to the scanuser group; this is required when -# milter and clamd communicate through local sockets -/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : - -%pre milter -%__fe_groupadd 5 -r %milteruser &>/dev/null || : -%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : - -%post milter -test -e %milterlog || { - touch %milterlog - chmod 0620 %milterlog - chown root:%milteruser %milterlog -} - -%postun milter -%__fe_userdel %milteruser &>/dev/null || : -%__fe_groupdel %milteruser &>/dev/null || : - - -%post milter-sysvinit -/sbin/chkconfig --add clamav-milter - -%preun milter-sysvinit -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter - -%postun milter-sysvinit -test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - - -%post milter-upstart -/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : - -%preun milter-upstart -test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : - - -%systemd_install milter-systemd clamav-milter.service - - -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE -%doc docs/*.pdf -%_bindir/* -%_mandir/man[15]/* -%exclude %_bindir/clamav-config -%exclude %_bindir/freshclam -%exclude %_mandir/*/freshclam* - -## ----------------------- - -%files lib -%defattr(-,root,root,-) -%_libdir/*.so.* - -## ----------------------- - -%files devel -%defattr(-,root,root,-) -%_includedir/* -%_libdir/*.so -%pkgdatadir/template -%pkgdatadir/clamd-gen -%_libdir/pkgconfig/* -%_bindir/clamav-config - -## ----------------------- - -%files filesystem -%attr(-,%username,%username) %dir %homedir -%attr(-,root,root) %dir %pkgdatadir - -## ----------------------- - -%files data -%defattr(-,%username,%username,-) -# use %%config to keep files which were updated by 'freshclam' -# already. Without this tag, they would be overridden with older -# versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %homedir/*.cvd - - -%files data-empty -%defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/*.cvd - - -## ----------------------- - -%files update -%defattr(-,root,root,-) -%_bindir/freshclam -%_mandir/*/freshclam* -%pkgdatadir/freshclam-sleep -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* -%config(noreplace) %_sysconfdir/cron.d/* -%config(noreplace) %_sysconfdir/sysconfig/freshclam - -%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/*.cld - - -## ----------------------- - -%files server -%defattr(-,root,root,-) -%doc _doc_server/* -%_mandir/man[58]/clamd* -%_sbindir/* -%pkgdatadir/clamd-wrapper -%dir %_sysconfdir/clamd.d - -%exclude %_sbindir/*milter* -%exclude %_mandir/man8/clamav-milter* - - -%files server-sysvinit -%defattr(-,root,root,-) -%_initrddir/clamd-wrapper - - -## ----------------------- - -%files scanner -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/clamd.d/scan.conf -%ghost %scanstatedir/clamd.sock - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamd.scan.conf - %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%else - %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%endif - -%if 0%{?with_sysv:1} -%files scanner-sysvinit - %attr(0755,root,root) %config %_initrddir/clamd.scan - %ghost %scanstatedir/clamd.pid -%endif - -%if 0%{?with_upstart:1} -%files scanner-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamd.scan* -%endif - -%if 0%{?with_systemd:1} -%files scanner-systemd - %defattr(-,root,root,-) - %_unitdir/clamd.scan.service -%endif - -## ----------------------- - -%files milter -%defattr(-,root,root,-) -%doc clamav-milter/README.fedora -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %_sysconfdir/mail/clamav-milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%ghost %milterstatedir/clamav-milter.socket - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamav-milter.conf - %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%else - %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%endif - -%if 0%{?with_sysv:1} -%files milter-sysvinit - %defattr(-,root,root,-) - %config %_initrddir/clamav-milter - %ghost %milterstatedir/clamav-milter.pid -%endif - -%if 0%{?with_upstart:1} -%files milter-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamav-milter* -%endif - -%if 0%{?with_systemd:1} -%files milter-systemd - %defattr(-,root,root,-) - %_unitdir/clamav-milter.service -%endif - - -%changelog -* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 -- updated to 0.97.3 -- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 - -* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 -- updated to 0.97.2 -- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) -- fixed systemd scripts and their installation - -* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 -- updated to 0.97.1 -- fixed Requires(preun) vs. Requires(postun) inconsistency - -* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 -- fixed tmpfiles.d syntax (#696812) - -* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 -- updated to 0.97 -- rediffed some patches - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 -- fixed signal specifier in clamd-wrapper (#668131, James Ralston) - -* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 -- added systemd init scripts which obsolete to old sysvinit ones -- added tmpfiles.d/ descriptions - -* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 -- updated to 0.96.5 -- CVE-2010-4260 Multiple errors within the processing of PDF files can - be exploited to e.g. cause a crash. -- CVE-2010-4261 An off-by-one error within the "icon_cb()" function - can be exploited to cause a memory corruption. - -* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 -- updated to 0.96.4 -- execute 'make check' (#640347) but ignore errors for now because - four checks are failing on f13 - -* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 -- lowered stop priority of sysv initscripts (#629435) - -* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 -- updated to 0.96.3 -- fixes CVE-2010-0405 in shipped bzlib.c copy - -* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 -- updated to 0.96.2 -- rediffed patches -- removed the -jit-disable patch which is replaced upstream by a more - detailed configuration option. - -* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed old %%trigger which renamed the 'clamav' user- and groupnames - to 'clamupdate' -- use 'groupmems', not 'usermod' to add a user to a group because - 'usermod' does not work when user does not exist in local /etc/passwd - -* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 -- ocaml not available (at least) on s390(x) - -* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 -- updated to 0.96.1 -- rediffed patches - -* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 -- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) - -* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 -- updated to final 0.96 -- applied upstream patch which allows to disable JIT compiler (#573191) -- build JIT compiler again -- disabled JIT compiler by default -- removed explicit 'pkgconfig' requirements in -devel (#533956) - -* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 -- do not build the bytecode JIT compiler for now until it can be disabled - at runtime (#573191) - -* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 -- updated to 0.96rc1 -- added some BRs - -* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 -- updated -upstart to upstart 0.6.3 - -* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- adjusted chkconfig positions for clamav-milter (#530101) -- use %%apply instead of %%patch - -* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 -- updated to 0.95.3 - -* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- conditionalized build of noarch subpackages to ease packaging under RHEL5 - -* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 -- modified freshclam configuration to log by syslog by default -- disabled LocalSocket option in sample configuration -- fixed clamav-milter sysv initscript to use bash interpreter and to - be disabled by default - -* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 -- renamed 'clamav' user/group to 'clamupdate' -- add the '%milteruser' user to the '%scanuser' group when the -scanner - subpackage is installed - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 -- updated to 0.95.2 - -* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 -- fixed '--without upstart' operation - -* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 -- added '%%bcond_without upstart' conditional to ease skipping of - -upstart subpackage creation e.g. on EL5 systems -- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which - broke update path - -* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 -- Upgrade to 0.95.1 (#495039) - -* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 -- updated to final 0.95 -- added ncurses-devel (-> clamdtop) BR -- enforced IPv6 support - -* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 -- updated to 0.95rc1 -- added -upstart subpackages -- renamed -sysv to -sysvinit to make -upstart win the default dep resolving -- reworked complete milter stuff -- added -scanner subpackage which contains a preconfigured daemon - (e.g. for use by -milter) -- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old - -* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 -- made some subpackages noarch -- fixed typo in SysV initscript which removes 'touch' file (#473513) - -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 -- Upgrade to 0.94.2 (#474002) - -* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 -- Upgrade to 0.94.1 - -* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 -- Upgrade to 0.94 (SECURITY), fixes #461461: -- CVE-2008-1389 Invalid memory access in the CHM unpacker -- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg -- CVE-2008-3913 Memory leak in code path in freshclam's manager.c -- CVE-2008-3914 Multiple file descriptor leaks on the code paths - -* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 -- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read - on petite files) -- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) -- rediffed patches - -* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 -- updated to 0.93.1 -- rediffed -path patch -- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability - -* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 -- updated to final 0.93 -- removed daily.inc + main.inc directories; they are now replaced by - *.cld containers -- trimmed down MAILTO list of cronjob to 'root' again; every well - configured system has an alias for this recipient - -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 -- moved -milter scriptlets into -milter-core subpackage -- added a requirement on the milteruser to the -milter-sendmail - subpackage (reported by Bruce Jerrick) - -* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 -- updated to 0.93rc1 -- fixed rpath issues - -* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 -- updated to 0.92.1 - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 -- redisabled unrar stuff completely by using clean sources -- splitted -milter subpackage into pieces to allow use without sendmail - (#239037) - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 -- use a better way to disable RPATH-generation (needed for '--with - unrar' builds) - -* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 -- added a README.fedora to the milter package (#240610) -- ship original sources again; unrar is now licensed correctly (no more - stolen code put under GPL). Nevertheless, this license is not GPL - compatible, and to allow libclamav to be used by GPL applications, - unrar is disabled by a ./configure switch. -- use pkg-config in clamav-config to emulate --cflags and --libs - operations (fixes partly multilib issues) -- registered some more auto-updated files and marked them as %%ghost - -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 -- updated to 0.92 (SECURITY): -- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability - -* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of - legal problems (resolves 334371) -- correct license tag - -* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 -- Bump release for upgrade path. - -* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 -- updated to 0.91.2 (SECURITY): -- CVE-2007-4510 DOS in RTF parser -- DOS in html normalizer -- arbitrary command execution by special crafted recipients in - clamav-milter's black-hole mode -- fixed an open(2) issue - -* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 -- updated to 0.91.1 - -* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 -- updated to 0.91 - -* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 -- updated to 0.90.3 -- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both - in FC6- and F7+ - -* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 -- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 -- updated to 0.90.1 -- updated %%doc list - -* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 -- updated to final 0.90 -- removed -visibility patch since fixed upstream - -* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 -- build with -Wl,-as-needed and cleaned up pkgconfig file -- removed old hack which forced installation of freshclam.conf; related - check was removed upstream -- removed static library -- removed %%changelog entries from before 2004 - -* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 -- updated to 0.90rc3 -- splitted mandatory parts from the data-file into a separate -filesystem - subpackage -- added a -data-empty subpackage to allow a setup where database is - updated per cron-job and user does not want to download the large - -data package with outdated virus definitations (#214949) -- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej deleted file mode 100644 index 1096912..0000000 --- a/clamav.spec.rej +++ /dev/null @@ -1,152 +0,0 @@ ---- clamav.spec -+++ clamav.spec -@@ -5,7 +5,7 @@ - Summary: Anti-virus software - Name: clamav - Version: 0.97.3 --Release: 1%{?dist} -+Release: 2%{?dist} - License: GPLv2 - Group: Applications/System - URL: http://www.clamav.net/ -@@ -15,7 +15,14 @@ - Source0: clamav-0.97.3-norar.tar.xz - Source1: clamav.init - Source2: clamav-milter.init --Source3: clamd-wrapper.tar.bz2 -+Source3: clamd-wrapper -+Source4: clamd.init -+Source5: README.clamd-wrapper -+Source6: clamd.sysconfig -+Source7: freshclam.logrotate -+Source8: freshclam.cron -+Source9: clamd.logrotate -+Source10: clamav-milter.sysconfig - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - - BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz -@@ -171,53 +178,6 @@ - s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf - -- --cat <<EOF >clamd.logrotate --%{_localstatedir}/log/clamav/clamd.log { -- missingok -- notifempty -- create 644 clam clam -- postrotate -- killall -HUP clamd 2>/dev/null || : -- endscript --} --EOF -- --cat <<EOF >freshclam.logrotate --%{_localstatedir}/log/clamav/freshclam.log { -- missingok -- notifempty -- create 644 clam clam --} --EOF -- --cat <<'EOF' >freshclam.cron --#!/bin/sh -- --### A simple update script for the clamav virus database. --### This could as well be replaced by a SysV script. -- --### fix log file if needed --LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" --if [ ! -f "$LOG_FILE" ]; then -- touch "$LOG_FILE" -- chmod 644 "$LOG_FILE" -- chown clam.clam "$LOG_FILE" --fi -- --%{_bindir}/freshclam \ -- --quiet \ -- --datadir="%{_localstatedir}/lib/clamav" \ -- --log="$LOG_FILE" --EOF -- --%{__cat} <<EOF >clamav-milter.sysconfig --### Simple config file for clamav-milter, you should --### read the documentation and tweak it as you wish. -- --CLAMAV_FLAGS="" --EOF -- - %build - %configure \ - --program-prefix="%{?_program_prefix}" \ -@@ -240,19 +200,30 @@ - rm -rf %{buildroot} - make install DESTDIR="%{buildroot}" - --install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd --install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam --install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam --install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav -+install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -+install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -+install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+ -+# now rewrite scripts and config files in-place -+sed -i \ -+ -e 's!%%{_sbindir}!%{_sbindir}!g' \ -+ -e 's!%%{_bindir}!%{_bindir}!g' \ -+ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ -+ %{buildroot}%{_sysconfdir}/logrotate.d/* \ -+ %{buildroot}%{_sysconfdir}/cron.daily/freshclam - - %if %{!?_without_milter:1}0 - install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter --install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter -+install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter - %else - rm %{buildroot}%{_mandir}/man8/clamav-milter.8* - %endif -+ - # Install clamav-wrapper: --tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share -+install -d -m0755 %{buildroot}/%{_prefix}/share/clamav -+install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} -+install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} - - install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ - touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log -@@ -345,8 +316,6 @@ - %doc %{_mandir}/man1/clamscan.1* - %doc %{_mandir}/man1/freshclam.1* - %doc %{_mandir}/man5/freshclam.conf.5* --%doc %{_prefix}/share/clamav/README.clamd-wrapper --%{_prefix}/share/clamav/clamd-wrapper - %config(noreplace) %{_sysconfdir}/freshclam.conf - %{_bindir}/clamscan - %{_bindir}/freshclam -@@ -366,10 +335,12 @@ - %config(noreplace) %{_sysconfdir}/clamd.conf - %config(noreplace) %{_sysconfdir}/logrotate.d/clamav - %{_sysconfdir}/clamd.d --%config %{_initrddir}/clamd -+%config %{_initrddir}/clamav - %{_sbindir}/clamd - %{_bindir}/clamconf - %{_bindir}/clamdscan -+%doc %{_prefix}/share/clamav/README.clamd-wrapper -+%{_prefix}/share/clamav/clamd* - - %defattr(0644, clam, clam, 0755) - %{_localstatedir}/run/clamav/ -@@ -409,6 +380,10 @@ - %exclude %{_libdir}/libclamav.la - - %changelog -+* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 -+- Add missing clamd-wrapper supporting files -+- Remove from init script the unused CLAMD_SOCKET variable -+ - * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - - Update to 0.97.3 - - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamd-wrapper b/clamd-wrapper deleted file mode 100644 index 000dcb8..0000000 --- a/clamd-wrapper +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 75 25 -# description: The clamd daemon listens for incoming connections on \ -# Unix or TCP socket and scans files or directories on demand. - -[ -n "$CLAMD_SERVICE" ] || { - echo $"*** $0 can not be called in this way" - echo $"*** Please see /usr/share/doc/clamav-server-*/README how" - echo $"*** the clamav-server can be configured" - exit 6 -} - -# Source function library. -. /etc/init.d/functions - -# Get config. -[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network - -# Check that networking is up. -[ "$NETWORKING" != "no" ] || exit 6 - -lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} -sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} -procname=clamd.${CLAMD_SERVICE} - -CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -CLAMD_OPTIONS= -[ -f "$sysconffile" ] && . "$sysconffile" -CLAMD_PIDFILE=`grep ^PidFile ${CLAMD_CONFIGFILE} | awk '{print $2}'` - -# make sure that config file contains a PidFile setting -[ -n "$CLAMD_PIDFILE" ] || exit 6 - -RETVAL=0 -prog="clamd.${CLAMD_SERVICE}" - -start () { - echo -n $"Starting $prog: " - daemon --pidfile=${CLAMD_PIDFILE} \ - exec -a $procname /usr/sbin/clamd \ - ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop () { - echo -n $"Stopping $prog: " - killproc -p ${CLAMD_PIDFILE} $procname - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -reload() { - rc=0 - echo -n $"Reloading $prog: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? - echo - echo -n $"Loading new virus-database: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? - echo - return $rc -} - -restart () { - stop - start -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 ;; - status) - status -p ${CLAMD_PIDFILE} $procname ;; - condrestart) - [ ! -f $lockfile ] || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 2 -esac diff --git a/clamd.init b/clamd.init deleted file mode 100644 index cf25b46..0000000 --- a/clamd.init +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 75 35 -# -# description: The clamd server running for <SERVICE> -# - -CLAMD_SERVICE=<SERVICE> -. /usr/share/clamav/clamd-wrapper -#!/bin/bash -# -# chkconfig: - 75 35 -# -# description: The clamd server running for <SERVICE> -# - -CLAMD_SERVICE=<SERVICE> -. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate deleted file mode 100644 index b233f3a..0000000 --- a/clamd.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript -} diff --git a/clamd.sysconfig b/clamd.sysconfig deleted file mode 100644 index e0e7714..0000000 --- a/clamd.sysconfig +++ /dev/null @@ -1,5 +0,0 @@ -#CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -#CLAMD_OPTIONS= -## the values below should only ever be specified in the above .conf file! -#CLAMD_SOCKET=/var/run/clamd.${CLAMD_SERVICE}/clamd.sock -#CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid diff --git a/freshclam.cron b/freshclam.cron deleted file mode 100644 index 558a2f2..0000000 --- a/freshclam.cron +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate deleted file mode 100644 index 5a5615a..0000000 --- a/freshclam.logrotate +++ /dev/null @@ -1,10 +0,0 @@ -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} diff --git a/sources b/sources index 05755a5..47b00bc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 656658e8d6f02942b3ae77ddfaa4bcfa15c91f8d Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:39:21 2012 -0600 Revert "Oops, i shouldn't have commited these" This reverts commit f5659018a4a4aea8cdf89db6e1c2a05789da7529. diff --git a/clamav.spec.orig b/clamav.spec.orig new file mode 100644 index 0000000..45aa5db --- /dev/null +++ b/clamav.spec.orig @@ -0,0 +1,1091 @@ +#global prerelease rc1 + +## Fedora Extras specific customization below... +%bcond_without fedora +%bcond_without upstart +%bcond_without systemd +%bcond_with sysv +%bcond_without tmpfiles +%bcond_with unrar +%bcond_without noarch +%bcond_without bytecode +## + +%ifnarch s390 s390x +%global have_ocaml 1 +%else +%global have_ocaml 0 +%endif + +%global username clamupdate +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log +%global milterstatedir %_var/run/clamav-milter +%global pkgdatadir %_datadir/%name + +%global scanuser clamscan +%global scanstatedir %_var/run/clamd.scan + +%{?with_noarch:%global noarch BuildArch: noarch} +%{!?_unitdir:%global _unitdir /lib/systemd/system} +%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} +%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ +%nil} +%{!?systemd_reqs:%global systemd_reqs \ +Requires(post): /bin/systemctl\ +Requires(preun): /bin/systemctl\ +Requires(postun): /bin/systemctl\ +%nil} +%{!?systemd_install:%global systemd_install()\ +%post %1\ +test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +%preun %1\ +test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ +test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ +%postun %1\ +/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ +%nil} + + +Summary: End-user tools for the Clam Antivirus scanner +Name: clamav +Version: 0.97.3 +Release: %release_func 1700 +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} +Group: Applications/File +URL: http://www.clamav.net +%if 0%{?with_unrar:1} +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +%else +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +Source0: %name-%version%{?prerelease}-norar.tar.xz +%endif +Source1: clamd-wrapper +Source2: clamd.sysconfig +Source3: clamd.logrotate +Source5: clamd-README +Source6: clamav-update.logrotate +Source7: clamd.SERVICE.init +Source8: clamav-notify-servers +Patch24: clamav-0.92-private.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95.3-umask.patch +# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… +Patch29: clamav-0.96.2-jitoff.patch +BuildRoot: %_tmppath/%name-%version-%release-root +Requires: clamav-lib = %version-%release +Requires: data(clamav) +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel +BuildRequires: %_includedir/tcpd.h +%{?with_bytecode:BuildRequires: bc tcl groff graphviz} +%if %{have_ocaml} +%{?with_bytecode:BuildRequires: ocaml} +%endif + +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(%username) = 4 +Provides: group(%username) = 4 +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?noarch} +%{?FE_USERADD_REQ} + +%package lib +Summary: Dynamic libraries for the Clam Antivirus scanner +Group: System Environment/Libraries +Requires: data(clamav) + +%package devel +Summary: Header files and libraries for the Clam Antivirus scanner +Group: Development/Libraries +Source100: clamd-gen +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release + +%package data +Summary: Virus signature data for the Clam Antivirus scanner +Group: Applications/File +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full +%{?noarch} + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty +%{?noarch} + +%package update +Summary: Auto-updater for the Clam Antivirus scanner data-files +Group: Applications/File +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.cron +Requires: clamav-filesystem = %version-%release +Requires(pre): /etc/cron.d +Requires(postun): /etc/cron.d +Requires(post): %__chown %__chmod +Requires(post): group(%username) + +%package server +Summary: Clam Antivirus scanner server +Group: System Environment/Daemons +Requires: data(clamav) +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release + +%package server-sysvinit +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} + + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 +Requires: clamav-server = %version-%release +%{?noarch} + +# Remove me after EOL of RHEL5 +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +%{?noarch} + +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source410: clamd.scan.upstart +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package scanner-systemd +Summary: Systemd initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source430: clamd.scan.systemd +Provides: init(clamav-scanner) = systemd +Requires: clamav-scanner = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-scanner-sysvinit = %version-%release +Obsoletes: %name-scanner-sysvinit < %version-%release +%endif + + +%package milter +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Source300: README.fedora +Requires: init(clamav-milter) +BuildRequires: sendmail-devel +BuildRequires: fedora-usermgmt-devel +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 +Requires(post): coreutils +%{?FE_USERADD_REQ} + +Provides: milter(clamav) = sendmail +Provides: milter(clamav) = postfix + +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release + +# Remove me after EOL of RHEL5 +%package milter-sysvinit +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source320: clamav-milter.sysv +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} + +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source310: clamav-milter.upstart +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package milter-systemd +Summary: Systemd initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source330: clamav-milter.systemd +Provides: init(clamav-milter) = systemd +Requires: clamav-milter = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-milter-sysvinit = %version-%release +Obsoletes: %name-milter-sysvinit < %version-%release +%endif + + +%description +Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this +software is the integration with mail servers (attachment scanning). The +package provides a flexible and scalable multi-threaded daemon, a command +line scanner, and a tool for automatic updating via Internet. The programs +are based on a shared library distributed with the Clam AntiVirus package, +which you can use with your own software. The virus database is based on +the virus database from OpenAntiVirus, but contains additional signatures +(including signatures for popular polymorphic viruses, too) and is KEPT UP +TO DATE. + +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. + +%description lib +This package contains dynamic libraries shared between applications +using the Clam Antivirus scanner. + +%description devel +This package contains headerfiles and libraries which are needed to +build applications using clamav. + +%description data +This package contains the virus-database needed by clamav. This +database should be updated regularly; the 'clamav-update' package +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description update +This package contains programs which can be used to update the clamav +anti-virus database automatically. It uses the freshclam(1) utility for +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. + +%description server +ATTENTION: most users do not need this package; the main package has +everything (or depends on it) which is needed to scan for virii on +workstations. + +This package contains files which are needed to execute the clamd-daemon. +This daemon does not provide a system-wide service. Instead of, an instance +of this daemon should be started for each service requiring it. + +See the README file how this can be done with a minimum of effort. + + +%description server-sysvinit +SysV initscripts template for the clamav server + + +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + +%description scanner-systemd +The systemd initscripts for clamav-scanner. + + +%description milter +This package contains files which are needed to run the clamav-milter. + +%description milter-sysvinit +The SysV initscripts for clamav-milter. + +%description milter-upstart +The Upstart initscripts for clamav-milter. + +%description milter-systemd +The systemd initscripts for clamav-scanner. + +## ------------------------------------------------------------ + +%prep +%setup -q -n %{name}-%{version}%{?prerelease} + +%apply -n24 -p1 -b .private +%apply -n25 -p1 -b .open +%apply -n26 -p1 -b .cliopts +%apply -n27 -p1 -b .umask +%apply -n29 -p1 -b .jitoff +%{?apply_end} + +install -p -m0644 %SOURCE300 clamav-milter/ + +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} + +sed -ri \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf + +sed -ri \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf + + +## ------------------------------------------------------------ + +%build +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me... +export FRESHCLAM_LIBS='-lz' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes +%configure \ + --disable-static \ + --disable-rpath \ + --disable-silent-rules \ + --disable-clamav \ + --with-user=%username \ + --with-group=%username \ + --with-dbdir=/var/lib/clamav \ + --enable-milter \ + --enable-clamdtop \ + %{!?with_bytecode:--disable-llvm} \ + %{!?with_unrar:--disable-unrar} + +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool + + +make %{?_smp_mflags} + + +## ------------------------------------------------------------ + +%install +rm -rf "$RPM_BUILD_ROOT" _doc* +make DESTDIR="$RPM_BUILD_ROOT" install + +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + +install -d -m 0755 \ + $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ + $RPM_BUILD_ROOT%_var/{log,run} \ + $RPM_BUILD_ROOT%milterstatedir \ + $RPM_BUILD_ROOT%pkgdatadir/template \ + $RPM_BUILD_ROOT%_initrddir \ + $RPM_BUILD_ROOT%homedir \ + $RPM_BUILD_ROOT%scanstatedir + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ + $RPM_BUILD_ROOT%_libdir/*.la + + +touch $RPM_BUILD_ROOT%homedir/daily.cld +touch $RPM_BUILD_ROOT%homedir/main.cld + + +## prepare the server-files +install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate +install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init +install -D -m 0644 -p %SOURCE5 _doc_server/README +install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf + +install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ +install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template + +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper + + +## prepare the update-files +install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update +install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers +touch $RPM_BUILD_ROOT%freshclamlog + +install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update + +smartsubst 's!webmaster,clamav!webmaster,%username!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep + + +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf + +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan + +install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf +install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf +d %scanstatedir 0710 %scanuser %scanuser +EOF + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} + + +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf + +install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf +install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf +d %milterstatedir 0710 %milteruser %milteruser +EOF + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} + +%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} +%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} +%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} +%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} +%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} + +# keep clamd-wrapper in every case because it might be needed by other +# packages +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper + +## ------------------------------------------------------------ + +%check +make check + +## ------------------------------------------------------------ + +%clean +rm -rf "$RPM_BUILD_ROOT" + +## ------------------------------------------------------------ + +%pre filesystem +%__fe_groupadd 4 -r %username &>/dev/null || : +%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ + -c 'Clamav database update user' -g %username %username &>/dev/null || : + +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + +%pre scanner +%__fe_groupadd 49 -r %scanuser &>/dev/null || : +%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ + -g %scanuser %scanuser &>/dev/null || : + +%postun scanner +%__fe_userdel %scanuser &>/dev/null || : +%__fe_groupdel %scanuser &>/dev/null || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + +%systemd_install scanner-systemd clamd.scan.service + + +%post update +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%username %freshclamlog +} + + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : + +%pre milter +%__fe_groupadd 5 -r %milteruser &>/dev/null || : +%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ + -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : + +%post milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} + +%postun milter +%__fe_userdel %milteruser &>/dev/null || : +%__fe_groupdel %milteruser &>/dev/null || : + + +%post milter-sysvinit +/sbin/chkconfig --add clamav-milter + +%preun milter-sysvinit +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter + +%postun milter-sysvinit +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : + + +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : + +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : + + +%systemd_install milter-systemd clamav-milter.service + + +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE +%doc docs/*.pdf +%_bindir/* +%_mandir/man[15]/* +%exclude %_bindir/clamav-config +%exclude %_bindir/freshclam +%exclude %_mandir/*/freshclam* + +## ----------------------- + +%files lib +%defattr(-,root,root,-) +%_libdir/*.so.* + +## ----------------------- + +%files devel +%defattr(-,root,root,-) +%_includedir/* +%_libdir/*.so +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config + +## ----------------------- + +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + +%files data +%defattr(-,%username,%username,-) +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. +%config %verify(not size md5 mtime) %homedir/*.cvd + + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/*.cvd + + +## ----------------------- + +%files update +%defattr(-,root,root,-) +%_bindir/freshclam +%_mandir/*/freshclam* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/* +%config(noreplace) %_sysconfdir/sysconfig/freshclam + +%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/*.cld + + +## ----------------------- + +%files server +%defattr(-,root,root,-) +%doc _doc_server/* +%_mandir/man[58]/clamd* +%_sbindir/* +%pkgdatadir/clamd-wrapper +%dir %_sysconfdir/clamd.d + +%exclude %_sbindir/*milter* +%exclude %_mandir/man8/clamav-milter* + + +%files server-sysvinit +%defattr(-,root,root,-) +%_initrddir/clamd-wrapper + + +## ----------------------- + +%files scanner +%defattr(-,root,root,-) +%config(noreplace) %_sysconfdir/clamd.d/scan.conf +%ghost %scanstatedir/clamd.sock + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamd.scan.conf + %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%else + %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%endif + +%if 0%{?with_sysv:1} +%files scanner-sysvinit + %attr(0755,root,root) %config %_initrddir/clamd.scan + %ghost %scanstatedir/clamd.pid +%endif + +%if 0%{?with_upstart:1} +%files scanner-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamd.scan* +%endif + +%if 0%{?with_systemd:1} +%files scanner-systemd + %defattr(-,root,root,-) + %_unitdir/clamd.scan.service +%endif + +## ----------------------- + +%files milter +%defattr(-,root,root,-) +%doc clamav-milter/README.fedora +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%ghost %milterstatedir/clamav-milter.socket + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamav-milter.conf + %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%else + %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%endif + +%if 0%{?with_sysv:1} +%files milter-sysvinit + %defattr(-,root,root,-) + %config %_initrddir/clamav-milter + %ghost %milterstatedir/clamav-milter.pid +%endif + +%if 0%{?with_upstart:1} +%files milter-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamav-milter* +%endif + +%if 0%{?with_systemd:1} +%files milter-systemd + %defattr(-,root,root,-) + %_unitdir/clamav-milter.service +%endif + + +%changelog +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 +- updated to 0.97.3 +- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 + +* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 +- updated to 0.97.2 +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) +- fixed systemd scripts and their installation + +* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 +- updated to 0.97.1 +- fixed Requires(preun) vs. Requires(postun) inconsistency + +* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 +- fixed tmpfiles.d syntax (#696812) + +* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 +- updated to 0.97 +- rediffed some patches + +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 +- fixed signal specifier in clamd-wrapper (#668131, James Ralston) + +* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 +- added systemd init scripts which obsolete to old sysvinit ones +- added tmpfiles.d/ descriptions + +* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 +- updated to 0.96.5 +- CVE-2010-4260 Multiple errors within the processing of PDF files can + be exploited to e.g. cause a crash. +- CVE-2010-4261 An off-by-one error within the "icon_cb()" function + can be exploited to cause a memory corruption. + +* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 +- updated to 0.96.4 +- execute 'make check' (#640347) but ignore errors for now because + four checks are failing on f13 + +* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 +- lowered stop priority of sysv initscripts (#629435) + +* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 +- updated to 0.96.3 +- fixes CVE-2010-0405 in shipped bzlib.c copy + +* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 +- updated to 0.96.2 +- rediffed patches +- removed the -jit-disable patch which is replaced upstream by a more + detailed configuration option. + +* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed old %%trigger which renamed the 'clamav' user- and groupnames + to 'clamupdate' +- use 'groupmems', not 'usermod' to add a user to a group because + 'usermod' does not work when user does not exist in local /etc/passwd + +* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 +- ocaml not available (at least) on s390(x) + +* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 +- updated to 0.96.1 +- rediffed patches + +* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 +- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) + +* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 +- updated to final 0.96 +- applied upstream patch which allows to disable JIT compiler (#573191) +- build JIT compiler again +- disabled JIT compiler by default +- removed explicit 'pkgconfig' requirements in -devel (#533956) + +* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 +- do not build the bytecode JIT compiler for now until it can be disabled + at runtime (#573191) + +* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 +- updated to 0.96rc1 +- added some BRs + +* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 +- updated -upstart to upstart 0.6.3 + +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) +- use %%apply instead of %%patch + +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 +- updated to 0.95.3 + +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches + +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej new file mode 100644 index 0000000..1096912 --- /dev/null +++ b/clamav.spec.rej @@ -0,0 +1,152 @@ +--- clamav.spec ++++ clamav.spec +@@ -5,7 +5,7 @@ + Summary: Anti-virus software + Name: clamav + Version: 0.97.3 +-Release: 1%{?dist} ++Release: 2%{?dist} + License: GPLv2 + Group: Applications/System + URL: http://www.clamav.net/ +@@ -15,7 +15,14 @@ + Source0: clamav-0.97.3-norar.tar.xz + Source1: clamav.init + Source2: clamav-milter.init +-Source3: clamd-wrapper.tar.bz2 ++Source3: clamd-wrapper ++Source4: clamd.init ++Source5: README.clamd-wrapper ++Source6: clamd.sysconfig ++Source7: freshclam.logrotate ++Source8: freshclam.cron ++Source9: clamd.logrotate ++Source10: clamav-milter.sysconfig + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz +@@ -171,53 +178,6 @@ + s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; + ' etc/clamav-milter.conf + +- +-cat <<EOF >clamd.logrotate +-%{_localstatedir}/log/clamav/clamd.log { +- missingok +- notifempty +- create 644 clam clam +- postrotate +- killall -HUP clamd 2>/dev/null || : +- endscript +-} +-EOF +- +-cat <<EOF >freshclam.logrotate +-%{_localstatedir}/log/clamav/freshclam.log { +- missingok +- notifempty +- create 644 clam clam +-} +-EOF +- +-cat <<'EOF' >freshclam.cron +-#!/bin/sh +- +-### A simple update script for the clamav virus database. +-### This could as well be replaced by a SysV script. +- +-### fix log file if needed +-LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +-if [ ! -f "$LOG_FILE" ]; then +- touch "$LOG_FILE" +- chmod 644 "$LOG_FILE" +- chown clam.clam "$LOG_FILE" +-fi +- +-%{_bindir}/freshclam \ +- --quiet \ +- --datadir="%{_localstatedir}/lib/clamav" \ +- --log="$LOG_FILE" +-EOF +- +-%{__cat} <<EOF >clamav-milter.sysconfig +-### Simple config file for clamav-milter, you should +-### read the documentation and tweak it as you wish. +- +-CLAMAV_FLAGS="" +-EOF +- + %build + %configure \ + --program-prefix="%{?_program_prefix}" \ +@@ -240,19 +200,30 @@ + rm -rf %{buildroot} + make install DESTDIR="%{buildroot}" + +-install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +-install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +-install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +-install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav ++install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam ++install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam ++install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++ ++# now rewrite scripts and config files in-place ++sed -i \ ++ -e 's!%%{_sbindir}!%{_sbindir}!g' \ ++ -e 's!%%{_bindir}!%{_bindir}!g' \ ++ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ ++ %{buildroot}%{_sysconfdir}/logrotate.d/* \ ++ %{buildroot}%{_sysconfdir}/cron.daily/freshclam + + %if %{!?_without_milter:1}0 + install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter +-install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter ++install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter + %else + rm %{buildroot}%{_mandir}/man8/clamav-milter.8* + %endif ++ + # Install clamav-wrapper: +-tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share ++install -d -m0755 %{buildroot}/%{_prefix}/share/clamav ++install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} ++install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} + + install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ + touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log +@@ -345,8 +316,6 @@ + %doc %{_mandir}/man1/clamscan.1* + %doc %{_mandir}/man1/freshclam.1* + %doc %{_mandir}/man5/freshclam.conf.5* +-%doc %{_prefix}/share/clamav/README.clamd-wrapper +-%{_prefix}/share/clamav/clamd-wrapper + %config(noreplace) %{_sysconfdir}/freshclam.conf + %{_bindir}/clamscan + %{_bindir}/freshclam +@@ -366,10 +335,12 @@ + %config(noreplace) %{_sysconfdir}/clamd.conf + %config(noreplace) %{_sysconfdir}/logrotate.d/clamav + %{_sysconfdir}/clamd.d +-%config %{_initrddir}/clamd ++%config %{_initrddir}/clamav + %{_sbindir}/clamd + %{_bindir}/clamconf + %{_bindir}/clamdscan ++%doc %{_prefix}/share/clamav/README.clamd-wrapper ++%{_prefix}/share/clamav/clamd* + + %defattr(0644, clam, clam, 0755) + %{_localstatedir}/run/clamav/ +@@ -409,6 +380,10 @@ + %exclude %{_libdir}/libclamav.la + + %changelog ++* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 ++- Add missing clamd-wrapper supporting files ++- Remove from init script the unused CLAMD_SOCKET variable ++ + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 + - Update to 0.97.3 + - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 commit 2cfebfc9fa6a0f416d9849cb8bbe86ec430c9259 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Dec 20 10:31:23 2011 +0100 Remove duplicate section causing logrotate errors nightly diff --git a/freshclam.logrotate b/freshclam.logrotate index 5a5615a..272d220 100644 --- a/freshclam.logrotate +++ b/freshclam.logrotate @@ -3,8 +3,3 @@ notifempty create 644 clam clam } -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} commit f5659018a4a4aea8cdf89db6e1c2a05789da7529 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Dec 13 17:52:59 2011 -0600 Oops, i shouldn't have commited these diff --git a/clamav.spec.orig b/clamav.spec.orig deleted file mode 100644 index 45aa5db..0000000 --- a/clamav.spec.orig +++ /dev/null @@ -1,1091 +0,0 @@ -#global prerelease rc1 - -## Fedora Extras specific customization below... -%bcond_without fedora -%bcond_without upstart -%bcond_without systemd -%bcond_with sysv -%bcond_without tmpfiles -%bcond_with unrar -%bcond_without noarch -%bcond_without bytecode -## - -%ifnarch s390 s390x -%global have_ocaml 1 -%else -%global have_ocaml 0 -%endif - -%global username clamupdate -%global homedir %_var/lib/clamav -%global freshclamlog %_var/log/freshclam.log -%global milteruser clamilt -%global milterlog %_var/log/clamav-milter.log -%global milterstatedir %_var/run/clamav-milter -%global pkgdatadir %_datadir/%name - -%global scanuser clamscan -%global scanstatedir %_var/run/clamd.scan - -%{?with_noarch:%global noarch BuildArch: noarch} -%{!?_unitdir:%global _unitdir /lib/systemd/system} -%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} -%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ -%nil} -%{!?systemd_reqs:%global systemd_reqs \ -Requires(post): /bin/systemctl\ -Requires(preun): /bin/systemctl\ -Requires(postun): /bin/systemctl\ -%nil} -%{!?systemd_install:%global systemd_install()\ -%post %1\ -test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -%preun %1\ -test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ -test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ -%postun %1\ -/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ -%nil} - - -Summary: End-user tools for the Clam Antivirus scanner -Name: clamav -Version: 0.97.3 -Release: %release_func 1700 -License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} -Group: Applications/File -URL: http://www.clamav.net -%if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -%else -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: %name-%version%{?prerelease}-norar.tar.xz -%endif -Source1: clamd-wrapper -Source2: clamd.sysconfig -Source3: clamd.logrotate -Source5: clamd-README -Source6: clamav-update.logrotate -Source7: clamd.SERVICE.init -Source8: clamav-notify-servers -Patch24: clamav-0.92-private.patch -Patch25: clamav-0.92-open.patch -Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95.3-umask.patch -# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… -Patch29: clamav-0.96.2-jitoff.patch -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: clamav-lib = %version-%release -Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: ncurses-devel -BuildRequires: %_includedir/tcpd.h -%{?with_bytecode:BuildRequires: bc tcl groff graphviz} -%if %{have_ocaml} -%{?with_bytecode:BuildRequires: ocaml} -%endif - -%package filesystem -Summary: Filesystem structure for clamav -Group: Applications/File -Provides: user(%username) = 4 -Provides: group(%username) = 4 -# Prevent version mix -Conflicts: %name < %version-%release -Conflicts: %name > %version-%release -BuildRequires: fedora-usermgmt-devel -%{?noarch} -%{?FE_USERADD_REQ} - -%package lib -Summary: Dynamic libraries for the Clam Antivirus scanner -Group: System Environment/Libraries -Requires: data(clamav) - -%package devel -Summary: Header files and libraries for the Clam Antivirus scanner -Group: Development/Libraries -Source100: clamd-gen -Requires: clamav-lib = %version-%release -Requires: clamav-filesystem = %version-%release - -%package data -Summary: Virus signature data for the Clam Antivirus scanner -Group: Applications/File -Requires(pre): clamav-filesystem = %version-%release -Requires(postun): clamav-filesystem = %version-%release -Provides: data(clamav) = full -Conflicts: data(clamav) < full -Conflicts: data(clamav) > full -%{?noarch} - -%package data-empty -Summary: Empty data package for the Clam Antivirus scanner -Group: Applications/File -Provides: data(clamav) = empty -Conflicts: data(clamav) < empty -Conflicts: data(clamav) > empty -%{?noarch} - -%package update -Summary: Auto-updater for the Clam Antivirus scanner data-files -Group: Applications/File -Source200: freshclam-sleep -Source201: freshclam.sysconfig -Source202: clamav-update.cron -Requires: clamav-filesystem = %version-%release -Requires(pre): /etc/cron.d -Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod -Requires(post): group(%username) - -%package server -Summary: Clam Antivirus scanner server -Group: System Environment/Daemons -Requires: data(clamav) -Requires: clamav-filesystem = %version-%release -Requires: clamav-lib = %version-%release - -%package server-sysvinit -Summary: SysV initscripts for clamav server -Group: System Environment/Daemons -Provides: init(clamav-server) = sysv -Requires: clamav-server = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir -Provides: clamav-server-sysv = %version-%release -Obsoletes: clamav-server-sysv < %version-%release -%{?noarch} - - -%package scanner -Summary: Clamav scanner daemon -Group: System Environment/Daemons -Requires: init(clamav-scanner) -Provides: user(%scanuser) = 49 -Provides: group(%scanuser) = 49 -Requires: clamav-server = %version-%release -%{?noarch} - -# Remove me after EOL of RHEL5 -%package scanner-sysvinit -Summary: SysV initscripts for clamav scanner daemon -Group: System Environment/Daemons -Provides: init(clamav-scanner) = sysv -Requires: clamav-server-sysvinit = %version-%release -Requires: clamav-scanner = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -%{?noarch} - -%package scanner-upstart -Summary: Upstart initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source410: clamd.scan.upstart -Provides: init(clamav-scanner) = upstart -Requires: clamav-scanner = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package scanner-systemd -Summary: Systemd initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source430: clamd.scan.systemd -Provides: init(clamav-scanner) = systemd -Requires: clamav-scanner = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-scanner-sysvinit = %version-%release -Obsoletes: %name-scanner-sysvinit < %version-%release -%endif - - -%package milter -Summary: Milter module for the Clam Antivirus scanner -Group: System Environment/Daemons -Source300: README.fedora -Requires: init(clamav-milter) -BuildRequires: sendmail-devel -BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) = 5 -Provides: group(%milteruser) = 5 -Requires(post): coreutils -%{?FE_USERADD_REQ} - -Provides: milter(clamav) = sendmail -Provides: milter(clamav) = postfix - -Provides: clamav-milter-core = %version-%release -Obsoletes: clamav-milter-core < %version-%release -Provides: clamav-milter-sendmail = %version-%release -Obsoletes: clamav-milter-sendmail < %version-%release - -# Remove me after EOL of RHEL5 -%package milter-sysvinit -Summary: SysV initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source320: clamav-milter.sysv -Provides: init(clamav-milter) = sysvinit -Requires: clamav-milter = %version-%release -Requires(post): user(%milteruser) clamav-milter -Requires(preun): user(%milteruser) clamav-milter -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -Provides: clamav-milter-sysv = %version-%release -Obsoletes: clamav-milter-sysv < %version-%release -%{?noarch} - -%package milter-upstart -Summary: Upstart initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source310: clamav-milter.upstart -Provides: init(clamav-milter) = upstart -Requires: clamav-milter = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package milter-systemd -Summary: Systemd initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source330: clamav-milter.systemd -Provides: init(clamav-milter) = systemd -Requires: clamav-milter = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-milter-sysvinit = %version-%release -Obsoletes: %name-milter-sysvinit < %version-%release -%endif - - -%description -Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this -software is the integration with mail servers (attachment scanning). The -package provides a flexible and scalable multi-threaded daemon, a command -line scanner, and a tool for automatic updating via Internet. The programs -are based on a shared library distributed with the Clam AntiVirus package, -which you can use with your own software. The virus database is based on -the virus database from OpenAntiVirus, but contains additional signatures -(including signatures for popular polymorphic viruses, too) and is KEPT UP -TO DATE. - -%description filesystem -This package provides the filesystem structure and contains the -user-creation scripts required by clamav. - -%description lib -This package contains dynamic libraries shared between applications -using the Clam Antivirus scanner. - -%description devel -This package contains headerfiles and libraries which are needed to -build applications using clamav. - -%description data -This package contains the virus-database needed by clamav. This -database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. This package and the -'clamav-data-empty' package are mutually exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description data-empty -This is an empty package to fulfill inter-package dependencies of the -clamav suite. This package and the 'clamav-data' package are mutually -exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description update -This package contains programs which can be used to update the clamav -anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. - -%description server -ATTENTION: most users do not need this package; the main package has -everything (or depends on it) which is needed to scan for virii on -workstations. - -This package contains files which are needed to execute the clamd-daemon. -This daemon does not provide a system-wide service. Instead of, an instance -of this daemon should be started for each service requiring it. - -See the README file how this can be done with a minimum of effort. - - -%description server-sysvinit -SysV initscripts template for the clamav server - - -%description scanner -This package contains a generic system wide clamd service which is -e.g. used by the clamav-milter package. - -%description scanner-sysvinit -The SysV initscripts for clamav-scanner. - -%description scanner-upstart -The Upstart initscripts for clamav-scanner. - -%description scanner-systemd -The systemd initscripts for clamav-scanner. - - -%description milter -This package contains files which are needed to run the clamav-milter. - -%description milter-sysvinit -The SysV initscripts for clamav-milter. - -%description milter-upstart -The Upstart initscripts for clamav-milter. - -%description milter-systemd -The systemd initscripts for clamav-scanner. - -## ------------------------------------------------------------ - -%prep -%setup -q -n %{name}-%{version}%{?prerelease} - -%apply -n24 -p1 -b .private -%apply -n25 -p1 -b .open -%apply -n26 -p1 -b .cliopts -%apply -n27 -p1 -b .umask -%apply -n29 -p1 -b .jitoff -%{?apply_end} - -install -p -m0644 %SOURCE300 clamav-milter/ - -mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} - -sed -ri \ - -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ - -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ - -e 's!^#?(User ).*!\1<USER>!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ - -e 's! /usr/local/share/clamav,! %homedir,!g' \ - etc/clamd.conf - -sed -ri \ - -e 's!^#?(UpdateLogFile )!#\1!g;' \ - -e 's!^#?(LogSyslog).*!\1 yes!g' \ - -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf - - -## ------------------------------------------------------------ - -%build -CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" -export LDFLAGS='-Wl,--as-needed' -# HACK: remove me... -export FRESHCLAM_LIBS='-lz' -# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine -export have_cv_ipv6=yes -%configure \ - --disable-static \ - --disable-rpath \ - --disable-silent-rules \ - --disable-clamav \ - --with-user=%username \ - --with-group=%username \ - --with-dbdir=/var/lib/clamav \ - --enable-milter \ - --enable-clamdtop \ - %{!?with_bytecode:--disable-llvm} \ - %{!?with_unrar:--disable-unrar} - -# TODO: check periodically that CLAMAVUSER is used for freshclam only - - -# build with --as-needed and disable rpath -sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ - libtool - - -make %{?_smp_mflags} - - -## ------------------------------------------------------------ - -%install -rm -rf "$RPM_BUILD_ROOT" _doc* -make DESTDIR="$RPM_BUILD_ROOT" install - -function smartsubst() { - local tmp - local regexp=$1 - shift - - tmp=$(mktemp /tmp/%name-subst.XXXXXX) - for i; do - sed -e "$regexp" "$i" >$tmp - cmp -s $tmp "$i" || cat $tmp >"$i" - rm -f $tmp - done -} - - -install -d -m 0755 \ - $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ - $RPM_BUILD_ROOT%_var/{log,run} \ - $RPM_BUILD_ROOT%milterstatedir \ - $RPM_BUILD_ROOT%pkgdatadir/template \ - $RPM_BUILD_ROOT%_initrddir \ - $RPM_BUILD_ROOT%homedir \ - $RPM_BUILD_ROOT%scanstatedir - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ - $RPM_BUILD_ROOT%_libdir/*.la - - -touch $RPM_BUILD_ROOT%homedir/daily.cld -touch $RPM_BUILD_ROOT%homedir/main.cld - - -## prepare the server-files -install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig -install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate -install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init -install -D -m 0644 -p %SOURCE5 _doc_server/README -install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf - -install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ -install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template - -smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper - - -## prepare the update-files -install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update -install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers -touch $RPM_BUILD_ROOT%freshclamlog - -install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update - -smartsubst 's!webmaster,clamav!webmaster,%username!g; - s!/usr/share/clamav!%pkgdatadir!g; - s!/usr/bin!%_bindir!g; - s!/usr/sbin!%_sbindir!g;' \ - $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ - $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep - - -### The scanner stuff -sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf - -sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ - > $RPM_BUILD_ROOT%_initrddir/clamd.scan - -install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf -install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf -d %scanstatedir 0710 %scanuser %scanuser -EOF - -touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} - - -### The milter stuff -sed -r \ - -e 's!^#?(User).*!\1 %milteruser!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ - -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ - -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ - -e 's! /tmp/clamav-milter.log! %milterlog!g' \ - etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf - -install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf -install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter -install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf -d %milterstatedir 0710 %milteruser %milteruser -EOF - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf -touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} - -%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} -%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} -%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} -%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} -%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} - -# keep clamd-wrapper in every case because it might be needed by other -# packages -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper - -## ------------------------------------------------------------ - -%check -make check - -## ------------------------------------------------------------ - -%clean -rm -rf "$RPM_BUILD_ROOT" - -## ------------------------------------------------------------ - -%pre filesystem -%__fe_groupadd 4 -r %username &>/dev/null || : -%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ - -c 'Clamav database update user' -g %username %username &>/dev/null || : - -%postun filesystem -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - - -%pre scanner -%__fe_groupadd 49 -r %scanuser &>/dev/null || : -%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ - -g %scanuser %scanuser &>/dev/null || : - -%postun scanner -%__fe_userdel %scanuser &>/dev/null || : -%__fe_groupdel %scanuser &>/dev/null || : - - -%post scanner-sysvinit -/sbin/chkconfig --add clamd.scan - -%preun scanner-sysvinit -test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.scan - -%postun scanner-sysvinit -test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : - - -%post scanner-upstart -/usr/bin/killall -u %scanuser clamd 2>/dev/null || : - -%preun scanner-upstart -test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : - - -%systemd_install scanner-systemd clamd.scan.service - - -%post update -test -e %freshclamlog || { - touch %freshclamlog - %__chmod 0664 %freshclamlog - %__chown root:%username %freshclamlog -} - - -%triggerin milter -- clamav-scanner -# Add the milteruser to the scanuser group; this is required when -# milter and clamd communicate through local sockets -/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : - -%pre milter -%__fe_groupadd 5 -r %milteruser &>/dev/null || : -%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : - -%post milter -test -e %milterlog || { - touch %milterlog - chmod 0620 %milterlog - chown root:%milteruser %milterlog -} - -%postun milter -%__fe_userdel %milteruser &>/dev/null || : -%__fe_groupdel %milteruser &>/dev/null || : - - -%post milter-sysvinit -/sbin/chkconfig --add clamav-milter - -%preun milter-sysvinit -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter - -%postun milter-sysvinit -test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - - -%post milter-upstart -/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : - -%preun milter-upstart -test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : - - -%systemd_install milter-systemd clamav-milter.service - - -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE -%doc docs/*.pdf -%_bindir/* -%_mandir/man[15]/* -%exclude %_bindir/clamav-config -%exclude %_bindir/freshclam -%exclude %_mandir/*/freshclam* - -## ----------------------- - -%files lib -%defattr(-,root,root,-) -%_libdir/*.so.* - -## ----------------------- - -%files devel -%defattr(-,root,root,-) -%_includedir/* -%_libdir/*.so -%pkgdatadir/template -%pkgdatadir/clamd-gen -%_libdir/pkgconfig/* -%_bindir/clamav-config - -## ----------------------- - -%files filesystem -%attr(-,%username,%username) %dir %homedir -%attr(-,root,root) %dir %pkgdatadir - -## ----------------------- - -%files data -%defattr(-,%username,%username,-) -# use %%config to keep files which were updated by 'freshclam' -# already. Without this tag, they would be overridden with older -# versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %homedir/*.cvd - - -%files data-empty -%defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/*.cvd - - -## ----------------------- - -%files update -%defattr(-,root,root,-) -%_bindir/freshclam -%_mandir/*/freshclam* -%pkgdatadir/freshclam-sleep -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* -%config(noreplace) %_sysconfdir/cron.d/* -%config(noreplace) %_sysconfdir/sysconfig/freshclam - -%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/*.cld - - -## ----------------------- - -%files server -%defattr(-,root,root,-) -%doc _doc_server/* -%_mandir/man[58]/clamd* -%_sbindir/* -%pkgdatadir/clamd-wrapper -%dir %_sysconfdir/clamd.d - -%exclude %_sbindir/*milter* -%exclude %_mandir/man8/clamav-milter* - - -%files server-sysvinit -%defattr(-,root,root,-) -%_initrddir/clamd-wrapper - - -## ----------------------- - -%files scanner -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/clamd.d/scan.conf -%ghost %scanstatedir/clamd.sock - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamd.scan.conf - %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%else - %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%endif - -%if 0%{?with_sysv:1} -%files scanner-sysvinit - %attr(0755,root,root) %config %_initrddir/clamd.scan - %ghost %scanstatedir/clamd.pid -%endif - -%if 0%{?with_upstart:1} -%files scanner-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamd.scan* -%endif - -%if 0%{?with_systemd:1} -%files scanner-systemd - %defattr(-,root,root,-) - %_unitdir/clamd.scan.service -%endif - -## ----------------------- - -%files milter -%defattr(-,root,root,-) -%doc clamav-milter/README.fedora -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %_sysconfdir/mail/clamav-milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%ghost %milterstatedir/clamav-milter.socket - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamav-milter.conf - %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%else - %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%endif - -%if 0%{?with_sysv:1} -%files milter-sysvinit - %defattr(-,root,root,-) - %config %_initrddir/clamav-milter - %ghost %milterstatedir/clamav-milter.pid -%endif - -%if 0%{?with_upstart:1} -%files milter-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamav-milter* -%endif - -%if 0%{?with_systemd:1} -%files milter-systemd - %defattr(-,root,root,-) - %_unitdir/clamav-milter.service -%endif - - -%changelog -* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 -- updated to 0.97.3 -- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 - -* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 -- updated to 0.97.2 -- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) -- fixed systemd scripts and their installation - -* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 -- updated to 0.97.1 -- fixed Requires(preun) vs. Requires(postun) inconsistency - -* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 -- fixed tmpfiles.d syntax (#696812) - -* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 -- updated to 0.97 -- rediffed some patches - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 -- fixed signal specifier in clamd-wrapper (#668131, James Ralston) - -* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 -- added systemd init scripts which obsolete to old sysvinit ones -- added tmpfiles.d/ descriptions - -* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 -- updated to 0.96.5 -- CVE-2010-4260 Multiple errors within the processing of PDF files can - be exploited to e.g. cause a crash. -- CVE-2010-4261 An off-by-one error within the "icon_cb()" function - can be exploited to cause a memory corruption. - -* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 -- updated to 0.96.4 -- execute 'make check' (#640347) but ignore errors for now because - four checks are failing on f13 - -* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 -- lowered stop priority of sysv initscripts (#629435) - -* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 -- updated to 0.96.3 -- fixes CVE-2010-0405 in shipped bzlib.c copy - -* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 -- updated to 0.96.2 -- rediffed patches -- removed the -jit-disable patch which is replaced upstream by a more - detailed configuration option. - -* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed old %%trigger which renamed the 'clamav' user- and groupnames - to 'clamupdate' -- use 'groupmems', not 'usermod' to add a user to a group because - 'usermod' does not work when user does not exist in local /etc/passwd - -* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 -- ocaml not available (at least) on s390(x) - -* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 -- updated to 0.96.1 -- rediffed patches - -* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 -- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) - -* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 -- updated to final 0.96 -- applied upstream patch which allows to disable JIT compiler (#573191) -- build JIT compiler again -- disabled JIT compiler by default -- removed explicit 'pkgconfig' requirements in -devel (#533956) - -* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 -- do not build the bytecode JIT compiler for now until it can be disabled - at runtime (#573191) - -* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 -- updated to 0.96rc1 -- added some BRs - -* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 -- updated -upstart to upstart 0.6.3 - -* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- adjusted chkconfig positions for clamav-milter (#530101) -- use %%apply instead of %%patch - -* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 -- updated to 0.95.3 - -* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- conditionalized build of noarch subpackages to ease packaging under RHEL5 - -* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 -- modified freshclam configuration to log by syslog by default -- disabled LocalSocket option in sample configuration -- fixed clamav-milter sysv initscript to use bash interpreter and to - be disabled by default - -* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 -- renamed 'clamav' user/group to 'clamupdate' -- add the '%milteruser' user to the '%scanuser' group when the -scanner - subpackage is installed - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 -- updated to 0.95.2 - -* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 -- fixed '--without upstart' operation - -* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 -- added '%%bcond_without upstart' conditional to ease skipping of - -upstart subpackage creation e.g. on EL5 systems -- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which - broke update path - -* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 -- Upgrade to 0.95.1 (#495039) - -* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 -- updated to final 0.95 -- added ncurses-devel (-> clamdtop) BR -- enforced IPv6 support - -* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 -- updated to 0.95rc1 -- added -upstart subpackages -- renamed -sysv to -sysvinit to make -upstart win the default dep resolving -- reworked complete milter stuff -- added -scanner subpackage which contains a preconfigured daemon - (e.g. for use by -milter) -- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old - -* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 -- made some subpackages noarch -- fixed typo in SysV initscript which removes 'touch' file (#473513) - -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 -- Upgrade to 0.94.2 (#474002) - -* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 -- Upgrade to 0.94.1 - -* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 -- Upgrade to 0.94 (SECURITY), fixes #461461: -- CVE-2008-1389 Invalid memory access in the CHM unpacker -- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg -- CVE-2008-3913 Memory leak in code path in freshclam's manager.c -- CVE-2008-3914 Multiple file descriptor leaks on the code paths - -* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 -- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read - on petite files) -- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) -- rediffed patches - -* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 -- updated to 0.93.1 -- rediffed -path patch -- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability - -* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 -- updated to final 0.93 -- removed daily.inc + main.inc directories; they are now replaced by - *.cld containers -- trimmed down MAILTO list of cronjob to 'root' again; every well - configured system has an alias for this recipient - -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 -- moved -milter scriptlets into -milter-core subpackage -- added a requirement on the milteruser to the -milter-sendmail - subpackage (reported by Bruce Jerrick) - -* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 -- updated to 0.93rc1 -- fixed rpath issues - -* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 -- updated to 0.92.1 - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 -- redisabled unrar stuff completely by using clean sources -- splitted -milter subpackage into pieces to allow use without sendmail - (#239037) - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 -- use a better way to disable RPATH-generation (needed for '--with - unrar' builds) - -* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 -- added a README.fedora to the milter package (#240610) -- ship original sources again; unrar is now licensed correctly (no more - stolen code put under GPL). Nevertheless, this license is not GPL - compatible, and to allow libclamav to be used by GPL applications, - unrar is disabled by a ./configure switch. -- use pkg-config in clamav-config to emulate --cflags and --libs - operations (fixes partly multilib issues) -- registered some more auto-updated files and marked them as %%ghost - -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 -- updated to 0.92 (SECURITY): -- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability - -* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of - legal problems (resolves 334371) -- correct license tag - -* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 -- Bump release for upgrade path. - -* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 -- updated to 0.91.2 (SECURITY): -- CVE-2007-4510 DOS in RTF parser -- DOS in html normalizer -- arbitrary command execution by special crafted recipients in - clamav-milter's black-hole mode -- fixed an open(2) issue - -* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 -- updated to 0.91.1 - -* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 -- updated to 0.91 - -* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 -- updated to 0.90.3 -- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both - in FC6- and F7+ - -* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 -- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 -- updated to 0.90.1 -- updated %%doc list - -* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 -- updated to final 0.90 -- removed -visibility patch since fixed upstream - -* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 -- build with -Wl,-as-needed and cleaned up pkgconfig file -- removed old hack which forced installation of freshclam.conf; related - check was removed upstream -- removed static library -- removed %%changelog entries from before 2004 - -* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 -- updated to 0.90rc3 -- splitted mandatory parts from the data-file into a separate -filesystem - subpackage -- added a -data-empty subpackage to allow a setup where database is - updated per cron-job and user does not want to download the large - -data package with outdated virus definitations (#214949) -- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej deleted file mode 100644 index 1096912..0000000 --- a/clamav.spec.rej +++ /dev/null @@ -1,152 +0,0 @@ ---- clamav.spec -+++ clamav.spec -@@ -5,7 +5,7 @@ - Summary: Anti-virus software - Name: clamav - Version: 0.97.3 --Release: 1%{?dist} -+Release: 2%{?dist} - License: GPLv2 - Group: Applications/System - URL: http://www.clamav.net/ -@@ -15,7 +15,14 @@ - Source0: clamav-0.97.3-norar.tar.xz - Source1: clamav.init - Source2: clamav-milter.init --Source3: clamd-wrapper.tar.bz2 -+Source3: clamd-wrapper -+Source4: clamd.init -+Source5: README.clamd-wrapper -+Source6: clamd.sysconfig -+Source7: freshclam.logrotate -+Source8: freshclam.cron -+Source9: clamd.logrotate -+Source10: clamav-milter.sysconfig - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - - BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz -@@ -171,53 +178,6 @@ - s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf - -- --cat <<EOF >clamd.logrotate --%{_localstatedir}/log/clamav/clamd.log { -- missingok -- notifempty -- create 644 clam clam -- postrotate -- killall -HUP clamd 2>/dev/null || : -- endscript --} --EOF -- --cat <<EOF >freshclam.logrotate --%{_localstatedir}/log/clamav/freshclam.log { -- missingok -- notifempty -- create 644 clam clam --} --EOF -- --cat <<'EOF' >freshclam.cron --#!/bin/sh -- --### A simple update script for the clamav virus database. --### This could as well be replaced by a SysV script. -- --### fix log file if needed --LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" --if [ ! -f "$LOG_FILE" ]; then -- touch "$LOG_FILE" -- chmod 644 "$LOG_FILE" -- chown clam.clam "$LOG_FILE" --fi -- --%{_bindir}/freshclam \ -- --quiet \ -- --datadir="%{_localstatedir}/lib/clamav" \ -- --log="$LOG_FILE" --EOF -- --%{__cat} <<EOF >clamav-milter.sysconfig --### Simple config file for clamav-milter, you should --### read the documentation and tweak it as you wish. -- --CLAMAV_FLAGS="" --EOF -- - %build - %configure \ - --program-prefix="%{?_program_prefix}" \ -@@ -240,19 +200,30 @@ - rm -rf %{buildroot} - make install DESTDIR="%{buildroot}" - --install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd --install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam --install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam --install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav -+install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -+install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -+install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+ -+# now rewrite scripts and config files in-place -+sed -i \ -+ -e 's!%%{_sbindir}!%{_sbindir}!g' \ -+ -e 's!%%{_bindir}!%{_bindir}!g' \ -+ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ -+ %{buildroot}%{_sysconfdir}/logrotate.d/* \ -+ %{buildroot}%{_sysconfdir}/cron.daily/freshclam - - %if %{!?_without_milter:1}0 - install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter --install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter -+install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter - %else - rm %{buildroot}%{_mandir}/man8/clamav-milter.8* - %endif -+ - # Install clamav-wrapper: --tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share -+install -d -m0755 %{buildroot}/%{_prefix}/share/clamav -+install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} -+install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} - - install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ - touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log -@@ -345,8 +316,6 @@ - %doc %{_mandir}/man1/clamscan.1* - %doc %{_mandir}/man1/freshclam.1* - %doc %{_mandir}/man5/freshclam.conf.5* --%doc %{_prefix}/share/clamav/README.clamd-wrapper --%{_prefix}/share/clamav/clamd-wrapper - %config(noreplace) %{_sysconfdir}/freshclam.conf - %{_bindir}/clamscan - %{_bindir}/freshclam -@@ -366,10 +335,12 @@ - %config(noreplace) %{_sysconfdir}/clamd.conf - %config(noreplace) %{_sysconfdir}/logrotate.d/clamav - %{_sysconfdir}/clamd.d --%config %{_initrddir}/clamd -+%config %{_initrddir}/clamav - %{_sbindir}/clamd - %{_bindir}/clamconf - %{_bindir}/clamdscan -+%doc %{_prefix}/share/clamav/README.clamd-wrapper -+%{_prefix}/share/clamav/clamd* - - %defattr(0644, clam, clam, 0755) - %{_localstatedir}/run/clamav/ -@@ -409,6 +380,10 @@ - %exclude %{_libdir}/libclamav.la - - %changelog -+* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 -+- Add missing clamd-wrapper supporting files -+- Remove from init script the unused CLAMD_SOCKET variable -+ - * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - - Update to 0.97.3 - - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 commit 14d21bc46d3a59c90e91420a310f14102e8d859b Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Dec 13 17:51:57 2011 -0600 Add files from bug 756854 diff --git a/README.clamd-wrapper b/README.clamd-wrapper new file mode 100644 index 0000000..5cd1b91 --- /dev/null +++ b/README.clamd-wrapper @@ -0,0 +1,116 @@ +To create individual clamd-instance take the following files and +modify/copy them in the suggested way: + +clamd.conf: + * set LogFile, PidFile, LocalSocket and User to suitable values + * place this file into /etc/clamd.d with an unique service-name; + e.g. as /etc/clamd.d/<SERVICE>.conf + + To make logfile rotation work properly, the LogFile should be + writable for the assigned User. Recommended way to reach this, is + to: + * make it owned by the User's *group* + * assign at least 0620 (u+rw,g+w) permissions + + A suitable command might be + | # touch <logfile> + | # chgrp <user> <logfile> + | # chmod 0620 <logfile> + + NEVER use 'clamav' as the user since he can modify the database. + This is the user who is running the application; e.g. for mimedefang + (http://www.roaringpenguin.com/mimedefang) the user might be + 'defang'.Theoretically, distinct users could be used, but it must be + made sure that the application-user can write into the socket-file, + and that the clamd-user can access the files asked by the + application to be checked. + + +clamd.logrotate: + * set the correct value for the logfile + * place it into /etc/logrotate.d + +clamd.sysconfig: + * set the name of the config-file and the local socket + * copy it to /etc/sysconfig/clamd.<SERVICE> + +clamd.init: + * set the service-name + * place it into /etc/init.d/ with an unique name and activate it + (e.g. with /sbin/chkconfig clamd.<SERVICE> on) + +Additionally, a symlink must be set to clamd in a way like + | # ln -s clamd /usr/sbin/clamd.<SERVICE> +and the directory for the socket file must be created (see 'LocalSocket' +in clamd.conf) + | # mkdir -p /var/run/clamd.<SERVICE> + + +This directory must be writable by the 'User' chosen in the config-file. + + + +[Disclaimer: + this file and the script/configfiles are not part of the official + clamav package. + + Please send complaints and comments to + mailto:enrico.scholz@informatik.tu-chemnitz.de!] +To create individual clamd-instance take the following files and +modify/copy them in the suggested way: + +clamd.conf: + * set LogFile, PidFile, LocalSocket and User to suitable values + * place this file into /etc/clamd.d with an unique service-name; + e.g. as /etc/clamd.d/<SERVICE>.conf + + To make logfile rotation work properly, the LogFile should be + writable for the assigned User. Recommended way to reach this, is + to: + * make it owned by the User's *group* + * assign at least 0620 (u+rw,g+w) permissions + + A suitable command might be + | # touch <logfile> + | # chgrp <user> <logfile> + | # chmod 0620 <logfile> + + NEVER use 'clamav' as the user since he can modify the database. + This is the user who is running the application; e.g. for mimedefang + (http://www.roaringpenguin.com/mimedefang) the user might be + 'defang'.Theoretically, distinct users could be used, but it must be + made sure that the application-user can write into the socket-file, + and that the clamd-user can access the files asked by the + application to be checked. + + +clamd.logrotate: + * set the correct value for the logfile + * place it into /etc/logrotate.d + +clamd.sysconfig: + * set the name of the config-file and the local socket + * copy it to /etc/sysconfig/clamd.<SERVICE> + +clamd.init: + * set the service-name + * place it into /etc/init.d/ with an unique name and activate it + (e.g. with /sbin/chkconfig clamd.<SERVICE> on) + +Additionally, a symlink must be set to clamd in a way like + | # ln -s clamd /usr/sbin/clamd.<SERVICE> +and the directory for the socket file must be created (see 'LocalSocket' +in clamd.conf) + | # mkdir -p /var/run/clamd.<SERVICE> + + +This directory must be writable by the 'User' chosen in the config-file. + + + +[Disclaimer: + this file and the script/configfiles are not part of the official + clamav package. + + Please send complaints and comments to + mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig new file mode 100644 index 0000000..bd82488 --- /dev/null +++ b/clamav-milter.sysconfig @@ -0,0 +1,8 @@ +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" diff --git a/clamav.spec b/clamav.spec index bd8c933..53db81e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -15,7 +15,14 @@ URL: http://www.clamav.net/ Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init -Source3: clamd-wrapper.tar.bz2 +Source3: clamd-wrapper +Source4: clamd.init +Source5: README.clamd-wrapper +Source6: clamd.sysconfig +Source7: freshclam.logrotate +Source8: freshclam.cron +Source9: clamd.logrotate +Source10: clamav-milter.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -171,53 +178,6 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf - -cat <<EOF >clamd.logrotate -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript -} -EOF - -cat <<EOF >freshclam.logrotate -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} -EOF - -cat <<'EOF' >freshclam.cron -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" -EOF - -%{__cat} <<EOF >clamav-milter.sysconfig -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" -EOF - %build %configure \ --program-prefix="%{?_program_prefix}" \ @@ -240,19 +200,30 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR="%{buildroot}" -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd -install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav +install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav + +# now rewrite scripts and config files in-place +sed -i \ + -e 's!%%{_sbindir}!%{_sbindir}!g' \ + -e 's!%%{_bindir}!%{_bindir}!g' \ + -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ + %{buildroot}%{_sysconfdir}/logrotate.d/* \ + %{buildroot}%{_sysconfdir}/cron.daily/freshclam %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif + # Install clamav-wrapper: -tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share +install -d -m0755 %{buildroot}/%{_prefix}/share/clamav +install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} +install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log @@ -345,8 +316,6 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -366,10 +335,12 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav %{_sysconfdir}/clamd.d -%config %{_initrddir}/clamd +%config %{_initrddir}/clamav %{_sbindir}/clamd %{_bindir}/clamconf %{_bindir}/clamdscan +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd* %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ @@ -409,6 +380,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 +- Add missing clamd-wrapper supporting files +- Remove from init script the unused CLAMD_SOCKET variable + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - Update to 0.97.3 - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamav.spec.orig b/clamav.spec.orig new file mode 100644 index 0000000..45aa5db --- /dev/null +++ b/clamav.spec.orig @@ -0,0 +1,1091 @@ +#global prerelease rc1 + +## Fedora Extras specific customization below... +%bcond_without fedora +%bcond_without upstart +%bcond_without systemd +%bcond_with sysv +%bcond_without tmpfiles +%bcond_with unrar +%bcond_without noarch +%bcond_without bytecode +## + +%ifnarch s390 s390x +%global have_ocaml 1 +%else +%global have_ocaml 0 +%endif + +%global username clamupdate +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log +%global milterstatedir %_var/run/clamav-milter +%global pkgdatadir %_datadir/%name + +%global scanuser clamscan +%global scanstatedir %_var/run/clamd.scan + +%{?with_noarch:%global noarch BuildArch: noarch} +%{!?_unitdir:%global _unitdir /lib/systemd/system} +%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} +%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ +%nil} +%{!?systemd_reqs:%global systemd_reqs \ +Requires(post): /bin/systemctl\ +Requires(preun): /bin/systemctl\ +Requires(postun): /bin/systemctl\ +%nil} +%{!?systemd_install:%global systemd_install()\ +%post %1\ +test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +%preun %1\ +test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ +test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ +%postun %1\ +/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ +%nil} + + +Summary: End-user tools for the Clam Antivirus scanner +Name: clamav +Version: 0.97.3 +Release: %release_func 1700 +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} +Group: Applications/File +URL: http://www.clamav.net +%if 0%{?with_unrar:1} +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +%else +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +Source0: %name-%version%{?prerelease}-norar.tar.xz +%endif +Source1: clamd-wrapper +Source2: clamd.sysconfig +Source3: clamd.logrotate +Source5: clamd-README +Source6: clamav-update.logrotate +Source7: clamd.SERVICE.init +Source8: clamav-notify-servers +Patch24: clamav-0.92-private.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95.3-umask.patch +# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… +Patch29: clamav-0.96.2-jitoff.patch +BuildRoot: %_tmppath/%name-%version-%release-root +Requires: clamav-lib = %version-%release +Requires: data(clamav) +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel +BuildRequires: %_includedir/tcpd.h +%{?with_bytecode:BuildRequires: bc tcl groff graphviz} +%if %{have_ocaml} +%{?with_bytecode:BuildRequires: ocaml} +%endif + +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(%username) = 4 +Provides: group(%username) = 4 +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?noarch} +%{?FE_USERADD_REQ} + +%package lib +Summary: Dynamic libraries for the Clam Antivirus scanner +Group: System Environment/Libraries +Requires: data(clamav) + +%package devel +Summary: Header files and libraries for the Clam Antivirus scanner +Group: Development/Libraries +Source100: clamd-gen +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release + +%package data +Summary: Virus signature data for the Clam Antivirus scanner +Group: Applications/File +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full +%{?noarch} + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty +%{?noarch} + +%package update +Summary: Auto-updater for the Clam Antivirus scanner data-files +Group: Applications/File +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.cron +Requires: clamav-filesystem = %version-%release +Requires(pre): /etc/cron.d +Requires(postun): /etc/cron.d +Requires(post): %__chown %__chmod +Requires(post): group(%username) + +%package server +Summary: Clam Antivirus scanner server +Group: System Environment/Daemons +Requires: data(clamav) +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release + +%package server-sysvinit +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} + + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 +Requires: clamav-server = %version-%release +%{?noarch} + +# Remove me after EOL of RHEL5 +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +%{?noarch} + +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source410: clamd.scan.upstart +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package scanner-systemd +Summary: Systemd initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source430: clamd.scan.systemd +Provides: init(clamav-scanner) = systemd +Requires: clamav-scanner = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-scanner-sysvinit = %version-%release +Obsoletes: %name-scanner-sysvinit < %version-%release +%endif + + +%package milter +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Source300: README.fedora +Requires: init(clamav-milter) +BuildRequires: sendmail-devel +BuildRequires: fedora-usermgmt-devel +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 +Requires(post): coreutils +%{?FE_USERADD_REQ} + +Provides: milter(clamav) = sendmail +Provides: milter(clamav) = postfix + +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release + +# Remove me after EOL of RHEL5 +%package milter-sysvinit +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source320: clamav-milter.sysv +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} + +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source310: clamav-milter.upstart +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package milter-systemd +Summary: Systemd initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source330: clamav-milter.systemd +Provides: init(clamav-milter) = systemd +Requires: clamav-milter = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-milter-sysvinit = %version-%release +Obsoletes: %name-milter-sysvinit < %version-%release +%endif + + +%description +Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this +software is the integration with mail servers (attachment scanning). The +package provides a flexible and scalable multi-threaded daemon, a command +line scanner, and a tool for automatic updating via Internet. The programs +are based on a shared library distributed with the Clam AntiVirus package, +which you can use with your own software. The virus database is based on +the virus database from OpenAntiVirus, but contains additional signatures +(including signatures for popular polymorphic viruses, too) and is KEPT UP +TO DATE. + +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. + +%description lib +This package contains dynamic libraries shared between applications +using the Clam Antivirus scanner. + +%description devel +This package contains headerfiles and libraries which are needed to +build applications using clamav. + +%description data +This package contains the virus-database needed by clamav. This +database should be updated regularly; the 'clamav-update' package +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description update +This package contains programs which can be used to update the clamav +anti-virus database automatically. It uses the freshclam(1) utility for +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. + +%description server +ATTENTION: most users do not need this package; the main package has +everything (or depends on it) which is needed to scan for virii on +workstations. + +This package contains files which are needed to execute the clamd-daemon. +This daemon does not provide a system-wide service. Instead of, an instance +of this daemon should be started for each service requiring it. + +See the README file how this can be done with a minimum of effort. + + +%description server-sysvinit +SysV initscripts template for the clamav server + + +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + +%description scanner-systemd +The systemd initscripts for clamav-scanner. + + +%description milter +This package contains files which are needed to run the clamav-milter. + +%description milter-sysvinit +The SysV initscripts for clamav-milter. + +%description milter-upstart +The Upstart initscripts for clamav-milter. + +%description milter-systemd +The systemd initscripts for clamav-scanner. + +## ------------------------------------------------------------ + +%prep +%setup -q -n %{name}-%{version}%{?prerelease} + +%apply -n24 -p1 -b .private +%apply -n25 -p1 -b .open +%apply -n26 -p1 -b .cliopts +%apply -n27 -p1 -b .umask +%apply -n29 -p1 -b .jitoff +%{?apply_end} + +install -p -m0644 %SOURCE300 clamav-milter/ + +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} + +sed -ri \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf + +sed -ri \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf + + +## ------------------------------------------------------------ + +%build +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me... +export FRESHCLAM_LIBS='-lz' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes +%configure \ + --disable-static \ + --disable-rpath \ + --disable-silent-rules \ + --disable-clamav \ + --with-user=%username \ + --with-group=%username \ + --with-dbdir=/var/lib/clamav \ + --enable-milter \ + --enable-clamdtop \ + %{!?with_bytecode:--disable-llvm} \ + %{!?with_unrar:--disable-unrar} + +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool + + +make %{?_smp_mflags} + + +## ------------------------------------------------------------ + +%install +rm -rf "$RPM_BUILD_ROOT" _doc* +make DESTDIR="$RPM_BUILD_ROOT" install + +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + +install -d -m 0755 \ + $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ + $RPM_BUILD_ROOT%_var/{log,run} \ + $RPM_BUILD_ROOT%milterstatedir \ + $RPM_BUILD_ROOT%pkgdatadir/template \ + $RPM_BUILD_ROOT%_initrddir \ + $RPM_BUILD_ROOT%homedir \ + $RPM_BUILD_ROOT%scanstatedir + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ + $RPM_BUILD_ROOT%_libdir/*.la + + +touch $RPM_BUILD_ROOT%homedir/daily.cld +touch $RPM_BUILD_ROOT%homedir/main.cld + + +## prepare the server-files +install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate +install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init +install -D -m 0644 -p %SOURCE5 _doc_server/README +install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf + +install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ +install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template + +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper + + +## prepare the update-files +install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update +install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers +touch $RPM_BUILD_ROOT%freshclamlog + +install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update + +smartsubst 's!webmaster,clamav!webmaster,%username!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep + + +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf + +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan + +install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf +install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf +d %scanstatedir 0710 %scanuser %scanuser +EOF + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} + + +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf + +install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf +install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf +d %milterstatedir 0710 %milteruser %milteruser +EOF + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} + +%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} +%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} +%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} +%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} +%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} + +# keep clamd-wrapper in every case because it might be needed by other +# packages +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper + +## ------------------------------------------------------------ + +%check +make check + +## ------------------------------------------------------------ + +%clean +rm -rf "$RPM_BUILD_ROOT" + +## ------------------------------------------------------------ + +%pre filesystem +%__fe_groupadd 4 -r %username &>/dev/null || : +%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ + -c 'Clamav database update user' -g %username %username &>/dev/null || : + +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + +%pre scanner +%__fe_groupadd 49 -r %scanuser &>/dev/null || : +%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ + -g %scanuser %scanuser &>/dev/null || : + +%postun scanner +%__fe_userdel %scanuser &>/dev/null || : +%__fe_groupdel %scanuser &>/dev/null || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + +%systemd_install scanner-systemd clamd.scan.service + + +%post update +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%username %freshclamlog +} + + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : + +%pre milter +%__fe_groupadd 5 -r %milteruser &>/dev/null || : +%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ + -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : + +%post milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} + +%postun milter +%__fe_userdel %milteruser &>/dev/null || : +%__fe_groupdel %milteruser &>/dev/null || : + + +%post milter-sysvinit +/sbin/chkconfig --add clamav-milter + +%preun milter-sysvinit +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter + +%postun milter-sysvinit +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : + + +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : + +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : + + +%systemd_install milter-systemd clamav-milter.service + + +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE +%doc docs/*.pdf +%_bindir/* +%_mandir/man[15]/* +%exclude %_bindir/clamav-config +%exclude %_bindir/freshclam +%exclude %_mandir/*/freshclam* + +## ----------------------- + +%files lib +%defattr(-,root,root,-) +%_libdir/*.so.* + +## ----------------------- + +%files devel +%defattr(-,root,root,-) +%_includedir/* +%_libdir/*.so +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config + +## ----------------------- + +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + +%files data +%defattr(-,%username,%username,-) +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. +%config %verify(not size md5 mtime) %homedir/*.cvd + + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/*.cvd + + +## ----------------------- + +%files update +%defattr(-,root,root,-) +%_bindir/freshclam +%_mandir/*/freshclam* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/* +%config(noreplace) %_sysconfdir/sysconfig/freshclam + +%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/*.cld + + +## ----------------------- + +%files server +%defattr(-,root,root,-) +%doc _doc_server/* +%_mandir/man[58]/clamd* +%_sbindir/* +%pkgdatadir/clamd-wrapper +%dir %_sysconfdir/clamd.d + +%exclude %_sbindir/*milter* +%exclude %_mandir/man8/clamav-milter* + + +%files server-sysvinit +%defattr(-,root,root,-) +%_initrddir/clamd-wrapper + + +## ----------------------- + +%files scanner +%defattr(-,root,root,-) +%config(noreplace) %_sysconfdir/clamd.d/scan.conf +%ghost %scanstatedir/clamd.sock + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamd.scan.conf + %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%else + %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%endif + +%if 0%{?with_sysv:1} +%files scanner-sysvinit + %attr(0755,root,root) %config %_initrddir/clamd.scan + %ghost %scanstatedir/clamd.pid +%endif + +%if 0%{?with_upstart:1} +%files scanner-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamd.scan* +%endif + +%if 0%{?with_systemd:1} +%files scanner-systemd + %defattr(-,root,root,-) + %_unitdir/clamd.scan.service +%endif + +## ----------------------- + +%files milter +%defattr(-,root,root,-) +%doc clamav-milter/README.fedora +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%ghost %milterstatedir/clamav-milter.socket + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamav-milter.conf + %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%else + %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%endif + +%if 0%{?with_sysv:1} +%files milter-sysvinit + %defattr(-,root,root,-) + %config %_initrddir/clamav-milter + %ghost %milterstatedir/clamav-milter.pid +%endif + +%if 0%{?with_upstart:1} +%files milter-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamav-milter* +%endif + +%if 0%{?with_systemd:1} +%files milter-systemd + %defattr(-,root,root,-) + %_unitdir/clamav-milter.service +%endif + + +%changelog +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 +- updated to 0.97.3 +- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 + +* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 +- updated to 0.97.2 +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) +- fixed systemd scripts and their installation + +* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 +- updated to 0.97.1 +- fixed Requires(preun) vs. Requires(postun) inconsistency + +* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 +- fixed tmpfiles.d syntax (#696812) + +* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 +- updated to 0.97 +- rediffed some patches + +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 +- fixed signal specifier in clamd-wrapper (#668131, James Ralston) + +* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 +- added systemd init scripts which obsolete to old sysvinit ones +- added tmpfiles.d/ descriptions + +* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 +- updated to 0.96.5 +- CVE-2010-4260 Multiple errors within the processing of PDF files can + be exploited to e.g. cause a crash. +- CVE-2010-4261 An off-by-one error within the "icon_cb()" function + can be exploited to cause a memory corruption. + +* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 +- updated to 0.96.4 +- execute 'make check' (#640347) but ignore errors for now because + four checks are failing on f13 + +* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 +- lowered stop priority of sysv initscripts (#629435) + +* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 +- updated to 0.96.3 +- fixes CVE-2010-0405 in shipped bzlib.c copy + +* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 +- updated to 0.96.2 +- rediffed patches +- removed the -jit-disable patch which is replaced upstream by a more + detailed configuration option. + +* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed old %%trigger which renamed the 'clamav' user- and groupnames + to 'clamupdate' +- use 'groupmems', not 'usermod' to add a user to a group because + 'usermod' does not work when user does not exist in local /etc/passwd + +* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 +- ocaml not available (at least) on s390(x) + +* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 +- updated to 0.96.1 +- rediffed patches + +* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 +- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) + +* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 +- updated to final 0.96 +- applied upstream patch which allows to disable JIT compiler (#573191) +- build JIT compiler again +- disabled JIT compiler by default +- removed explicit 'pkgconfig' requirements in -devel (#533956) + +* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 +- do not build the bytecode JIT compiler for now until it can be disabled + at runtime (#573191) + +* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 +- updated to 0.96rc1 +- added some BRs + +* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 +- updated -upstart to upstart 0.6.3 + +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) +- use %%apply instead of %%patch + +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 +- updated to 0.95.3 + +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches + +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej new file mode 100644 index 0000000..1096912 --- /dev/null +++ b/clamav.spec.rej @@ -0,0 +1,152 @@ +--- clamav.spec ++++ clamav.spec +@@ -5,7 +5,7 @@ + Summary: Anti-virus software + Name: clamav + Version: 0.97.3 +-Release: 1%{?dist} ++Release: 2%{?dist} + License: GPLv2 + Group: Applications/System + URL: http://www.clamav.net/ +@@ -15,7 +15,14 @@ + Source0: clamav-0.97.3-norar.tar.xz + Source1: clamav.init + Source2: clamav-milter.init +-Source3: clamd-wrapper.tar.bz2 ++Source3: clamd-wrapper ++Source4: clamd.init ++Source5: README.clamd-wrapper ++Source6: clamd.sysconfig ++Source7: freshclam.logrotate ++Source8: freshclam.cron ++Source9: clamd.logrotate ++Source10: clamav-milter.sysconfig + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz +@@ -171,53 +178,6 @@ + s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; + ' etc/clamav-milter.conf + +- +-cat <<EOF >clamd.logrotate +-%{_localstatedir}/log/clamav/clamd.log { +- missingok +- notifempty +- create 644 clam clam +- postrotate +- killall -HUP clamd 2>/dev/null || : +- endscript +-} +-EOF +- +-cat <<EOF >freshclam.logrotate +-%{_localstatedir}/log/clamav/freshclam.log { +- missingok +- notifempty +- create 644 clam clam +-} +-EOF +- +-cat <<'EOF' >freshclam.cron +-#!/bin/sh +- +-### A simple update script for the clamav virus database. +-### This could as well be replaced by a SysV script. +- +-### fix log file if needed +-LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +-if [ ! -f "$LOG_FILE" ]; then +- touch "$LOG_FILE" +- chmod 644 "$LOG_FILE" +- chown clam.clam "$LOG_FILE" +-fi +- +-%{_bindir}/freshclam \ +- --quiet \ +- --datadir="%{_localstatedir}/lib/clamav" \ +- --log="$LOG_FILE" +-EOF +- +-%{__cat} <<EOF >clamav-milter.sysconfig +-### Simple config file for clamav-milter, you should +-### read the documentation and tweak it as you wish. +- +-CLAMAV_FLAGS="" +-EOF +- + %build + %configure \ + --program-prefix="%{?_program_prefix}" \ +@@ -240,19 +200,30 @@ + rm -rf %{buildroot} + make install DESTDIR="%{buildroot}" + +-install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +-install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +-install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +-install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav ++install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam ++install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam ++install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++ ++# now rewrite scripts and config files in-place ++sed -i \ ++ -e 's!%%{_sbindir}!%{_sbindir}!g' \ ++ -e 's!%%{_bindir}!%{_bindir}!g' \ ++ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ ++ %{buildroot}%{_sysconfdir}/logrotate.d/* \ ++ %{buildroot}%{_sysconfdir}/cron.daily/freshclam + + %if %{!?_without_milter:1}0 + install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter +-install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter ++install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter + %else + rm %{buildroot}%{_mandir}/man8/clamav-milter.8* + %endif ++ + # Install clamav-wrapper: +-tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share ++install -d -m0755 %{buildroot}/%{_prefix}/share/clamav ++install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} ++install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} + + install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ + touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log +@@ -345,8 +316,6 @@ + %doc %{_mandir}/man1/clamscan.1* + %doc %{_mandir}/man1/freshclam.1* + %doc %{_mandir}/man5/freshclam.conf.5* +-%doc %{_prefix}/share/clamav/README.clamd-wrapper +-%{_prefix}/share/clamav/clamd-wrapper + %config(noreplace) %{_sysconfdir}/freshclam.conf + %{_bindir}/clamscan + %{_bindir}/freshclam +@@ -366,10 +335,12 @@ + %config(noreplace) %{_sysconfdir}/clamd.conf + %config(noreplace) %{_sysconfdir}/logrotate.d/clamav + %{_sysconfdir}/clamd.d +-%config %{_initrddir}/clamd ++%config %{_initrddir}/clamav + %{_sbindir}/clamd + %{_bindir}/clamconf + %{_bindir}/clamdscan ++%doc %{_prefix}/share/clamav/README.clamd-wrapper ++%{_prefix}/share/clamav/clamd* + + %defattr(0644, clam, clam, 0755) + %{_localstatedir}/run/clamav/ +@@ -409,6 +380,10 @@ + %exclude %{_libdir}/libclamav.la + + %changelog ++* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 ++- Add missing clamd-wrapper supporting files ++- Remove from init script the unused CLAMD_SOCKET variable ++ + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 + - Update to 0.97.3 + - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamd-wrapper b/clamd-wrapper new file mode 100644 index 0000000..000dcb8 --- /dev/null +++ b/clamd-wrapper @@ -0,0 +1,86 @@ +#!/bin/bash +# +# chkconfig: - 75 25 +# description: The clamd daemon listens for incoming connections on \ +# Unix or TCP socket and scans files or directories on demand. + +[ -n "$CLAMD_SERVICE" ] || { + echo $"*** $0 can not be called in this way" + echo $"*** Please see /usr/share/doc/clamav-server-*/README how" + echo $"*** the clamav-server can be configured" + exit 6 +} + +# Source function library. +. /etc/init.d/functions + +# Get config. +[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network + +# Check that networking is up. +[ "$NETWORKING" != "no" ] || exit 6 + +lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} +sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} +procname=clamd.${CLAMD_SERVICE} + +CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf +CLAMD_OPTIONS= +[ -f "$sysconffile" ] && . "$sysconffile" +CLAMD_PIDFILE=`grep ^PidFile ${CLAMD_CONFIGFILE} | awk '{print $2}'` + +# make sure that config file contains a PidFile setting +[ -n "$CLAMD_PIDFILE" ] || exit 6 + +RETVAL=0 +prog="clamd.${CLAMD_SERVICE}" + +start () { + echo -n $"Starting $prog: " + daemon --pidfile=${CLAMD_PIDFILE} \ + exec -a $procname /usr/sbin/clamd \ + ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch $lockfile + return $RETVAL +} + +stop () { + echo -n $"Stopping $prog: " + killproc -p ${CLAMD_PIDFILE} $procname + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $lockfile + return $RETVAL +} + +reload() { + rc=0 + echo -n $"Reloading $prog: " + killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? + echo + echo -n $"Loading new virus-database: " + killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? + echo + return $rc +} + +restart () { + stop + start +} + +# See how we were called. +case "$1" in + start|stop|restart|reload) + $1 ;; + status) + status -p ${CLAMD_PIDFILE} $procname ;; + condrestart) + [ ! -f $lockfile ] || restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" + exit 2 +esac diff --git a/clamd.init b/clamd.init new file mode 100644 index 0000000..cf25b46 --- /dev/null +++ b/clamd.init @@ -0,0 +1,18 @@ +#!/bin/bash +# +# chkconfig: - 75 35 +# +# description: The clamd server running for <SERVICE> +# + +CLAMD_SERVICE=<SERVICE> +. /usr/share/clamav/clamd-wrapper +#!/bin/bash +# +# chkconfig: - 75 35 +# +# description: The clamd server running for <SERVICE> +# + +CLAMD_SERVICE=<SERVICE> +. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate new file mode 100644 index 0000000..b233f3a --- /dev/null +++ b/clamd.logrotate @@ -0,0 +1,8 @@ +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} diff --git a/clamd.sysconfig b/clamd.sysconfig new file mode 100644 index 0000000..e0e7714 --- /dev/null +++ b/clamd.sysconfig @@ -0,0 +1,5 @@ +#CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf +#CLAMD_OPTIONS= +## the values below should only ever be specified in the above .conf file! +#CLAMD_SOCKET=/var/run/clamd.${CLAMD_SERVICE}/clamd.sock +#CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid diff --git a/freshclam.cron b/freshclam.cron new file mode 100644 index 0000000..558a2f2 --- /dev/null +++ b/freshclam.cron @@ -0,0 +1,34 @@ +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate new file mode 100644 index 0000000..5a5615a --- /dev/null +++ b/freshclam.logrotate @@ -0,0 +1,10 @@ +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} diff --git a/sources b/sources index 47b00bc..05755a5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 813ca6cc8c152e9fc9583c5f0acb9e3b35d347d6 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 20:09:36 2011 -0500 Add Makefile to make clean tarball diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ec42490 --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +MAKEFILE_COMMON = $(HOME)/.fedora/common.mk +-include $(MAKEFILE_COMMON) + +# can not use final tarball name here as it will conflict with rules +# within Makefile.common +TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.xz.tmp +TARBALL = ${NAME}-${VERSION}.tar.gz + +clean-sources: ${TARBALL_CLEAN} + +${TARBALL_CLEAN}: ${TARBALL} + rm -f $@.tmp + zcat $< | tar --delete -f - '*/libclamunrar/*' | xz -c > $@.tmp + mv $@.tmp $@ commit f79a6d54a0d97f0b0acefa78c4819180994fd075 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 20:09:21 2011 -0500 Re-add clamd-wrapper.tar.bz2 diff --git a/sources b/sources index 05755a5..47b00bc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 603c6c9dae1038fe7597a83a33fee2d075710c05 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 19:55:14 2011 -0500 Upgrade to 0.97.3, fixing a CVE diff --git a/.gitignore b/.gitignore index a3ff7cc..b09a0a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /clamav-0.97.2-norar.tar.xz /clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 +/clamav-0.97.3-norar.tar.xz diff --git a/clamav.spec b/clamav.spec index 5ca4752..bd8c933 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,15 +4,15 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.2 -Release: 5%{?dist} +Version: 0.97.3 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.2-norar.tar.xz +Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -409,6 +409,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 +- Update to 0.97.3 +- Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 + * Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-5 - Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. (bz#727894) diff --git a/sources b/sources index 784e26c..05755a5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -c41b2314d1b6b11f091955255dfa23f5 clamav-0.97.2-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz commit a9247006483c53e986707cc19b0f2c224cd14c7b Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 19:34:24 2011 -0500 Remove clamav tarball from git diff --git a/.gitignore b/.gitignore index e230f1a..a3ff7cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /clamav-0.97.2-norar.tar.xz +/clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 diff --git a/clamav-0.97-clean.tar.bz2 b/clamav-0.97-clean.tar.bz2 deleted file mode 100644 index 9d39f27..0000000 Binary files a/clamav-0.97-clean.tar.bz2 and /dev/null differ commit 96fb7210c39ec20d51155510e7e2565c62178638 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Thu Aug 4 10:14:11 2011 +0200 Make substitutions a little more explicit. diff --git a/clamav.spec b/clamav.spec index b4cde09..5ca4752 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -166,8 +166,8 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %{__perl} -pi.orig -e ' s|^(Example)|#$1|; s|^#(User) .+$|$1 clam|; - s|#MilterSocket inet.+$|MilterSocket /var/run/clamav/clamav-milter.sock|; - s|#PidFile .+$|PidFile /var/run/clamav/clamav-milter.pid|; + s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|; + s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|; s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf @@ -409,7 +409,7 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-4 +* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-5 - Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. (bz#727894) commit 3ebb6ff6bf713936d55085d2cfee375e475b0d52 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Thu Aug 4 10:10:19 2011 +0200 Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf (bz#727894). diff --git a/clamav.spec b/clamav.spec index 567babb..b4cde09 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -166,7 +166,9 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %{__perl} -pi.orig -e ' s|^(Example)|#$1|; s|^#(User) .+$|$1 clam|; - s|^#(ClamdSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; + s|#MilterSocket inet.+$|MilterSocket /var/run/clamav/clamav-milter.sock|; + s|#PidFile .+$|PidFile /var/run/clamav/clamav-milter.pid|; + s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf @@ -407,6 +409,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-4 +- Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. + (bz#727894) + * Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-3 - include updated clamd-wrapper which get the PidFile setting from the service configuration file. commit ae959928b685373bbd37a4b9d933f26ef5d2cc46 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 10:03:06 2011 +0200 Handle xz archive SOURCE0 for rpmbuild on RHEL < 6. diff --git a/clamav.spec b/clamav.spec index 234273a..567babb 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -109,7 +109,9 @@ documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep -%setup -q +# Handle that rpmbuild in RHEL < 6 doesn't handle xz archives automatically. +%setup -q -T -c +xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure @@ -405,11 +407,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-2 +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-3 - include updated clamd-wrapper which get the PidFile setting from the service configuration file. - -* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-1 - updated to 0.97.2 - Build-require xz - CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) commit 7d5029a51e1c38d678117c1191668639a5a39d40 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 08:52:51 2011 +0200 Include Jeroen van Meeuwen's updated clamd-wrapper which get the PidFile setting from the service configuration file. diff --git a/clamav.spec b/clamav.spec index d49bb8f..234273a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -405,6 +405,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-2 +- include updated clamd-wrapper which get the PidFile setting from the + service configuration file. + * Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-1 - updated to 0.97.2 - Build-require xz diff --git a/sources b/sources index d15b018..784e26c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ c41b2314d1b6b11f091955255dfa23f5 clamav-0.97.2-norar.tar.xz -ae4e25e5df41b71cf6541e3a876b94a7 clamd-wrapper.tar.bz2 +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 6fcce5b69503ef555029fea998fe39c8623d0c68 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 08:38:13 2011 +0200 Update sources to include clamav-0.97.1-norar.tar.xz diff --git a/sources b/sources index 27407d3..d15b018 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -44e7df79718d104db0666d5db3f08682 clamav-0.97-clean.tar.bz2 +c41b2314d1b6b11f091955255dfa23f5 clamav-0.97.2-norar.tar.xz ae4e25e5df41b71cf6541e3a876b94a7 clamd-wrapper.tar.bz2 commit 6170551529bdcc1510dc70d529b45d7073b7bc42 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 08:36:42 2011 +0200 - updated to 0.97.2 - Build-require xz - CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) diff --git a/.gitignore b/.gitignore index bf9c05a..e230f1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/clamav-0.97-clean.tar.bz2 +/clamav-0.97.2-norar.tar.xz /clamd-wrapper.tar.bz2 diff --git a/clamav.spec b/clamav.spec index 8bb9614..d49bb8f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,21 +4,21 @@ Summary: Anti-virus software Name: clamav -Version: 0.97 -Release: 14%{?dist} +Version: 0.97.2 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97-clean.tar.bz2 +Source0: clamav-0.97.2-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -356,6 +356,7 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamdscan.1* %doc %{_mandir}/man1/clamconf.1* %doc %{_mandir}/man1/clamdtop.1* +%doc %{_mandir}/man1/clambc.1* %doc %{_mandir}/man5/clamd.conf.5* %doc %{_mandir}/man8/clamd.8* %config(noreplace) %{_sysconfdir}/clamd.conf @@ -404,6 +405,11 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-1 +- updated to 0.97.2 +- Build-require xz +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) + * Wed Jun 29 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97-14 - Require /usr/sbin/sendmail instead of sendmail commit 1391380976a7514bf46af8366673b4223013365b Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 29 18:54:08 2011 -0500 Require /usr/sbin/sendmail instead of sendmail diff --git a/clamav.spec b/clamav.spec index 2af6305..8bb9614 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -64,7 +64,7 @@ The Clam AntiVirus Daemon Summary: The Clam AntiVirus sendmail-milter Daemon Group: Applications/System Requires: clamd = %{version}-%{release} -Requires: sendmail +Requires: /usr/sbin/sendmail Provides: clamav-milter-sysv = %{version}-%{release} Obsoletes: clamav-milter-sysv < %{version}-%{release} Provides: clamav-milter-sysvinit = %{version}-%{release} @@ -404,6 +404,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jun 29 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97-14 +- Require /usr/sbin/sendmail instead of sendmail + * Tue Apr 26 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-13 - Obsolete and provide clamav-milter-sysvinit (bz#696856) commit 833c6c9f451b4f48b64d5c53d773b21016d091cc Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Apr 26 08:53:58 2011 +0200 Obsolete and provide clamav-milter-sysvinit (bz#696856). diff --git a/clamav.spec b/clamav.spec index c1fa39f..2af6305 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -67,6 +67,8 @@ Requires: clamd = %{version}-%{release} Requires: sendmail Provides: clamav-milter-sysv = %{version}-%{release} Obsoletes: clamav-milter-sysv < %{version}-%{release} +Provides: clamav-milter-sysvinit = %{version}-%{release} +Obsoletes: clamav-milter-sysvinit < %{version}-%{release} %description milter The Clam AntiVirus sendmail-milter Daemon @@ -402,6 +404,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Apr 26 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-13 +- Obsolete and provide clamav-milter-sysvinit (bz#696856) + * Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 - Move deletion of /var/lib/clamav/mirrors.dat to db package. - Don't enable NotifyClamd in freshclam config and cronjob, as not commit c6b6666973bc259d9160f1894f026e5902328c42 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Mar 30 12:17:31 2011 +0200 * Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 - Move deletion of /var/lib/clamav/mirrors.dat to db package. - Don't enable NotifyClamd in freshclam config and cronjob, as not everybody is running clamd. Running clamd's will anyway notice when db is updated. diff --git a/clamav.spec b/clamav.spec index 4d7776f..c1fa39f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -157,7 +157,6 @@ you will need to install %{name}-devel. s|^#(LogSyslog)|$1|; s|^#(DatabaseOwner) .+$|$1 clam|; s|^(Checks) .+$|$1 24|; - s|^#(NotifyClamd) .+$|$1 %{_sysconfdir}/clamd.conf|; ' etc/freshclam.conf %{__perl} -pi.orig -e ' @@ -203,8 +202,7 @@ fi %{_bindir}/freshclam \ --quiet \ --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" \ - --daemon-notify="%{_sysconfdir}/clamd.conf" + --log="$LOG_FILE" EOF %{__cat} <<EOF >clamav-milter.sysconfig @@ -258,10 +256,6 @@ install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ %post -# Remove old mirrors.dat, mostly because it will have the wrong -# owner after upgrading from clamav < 0.97: -test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat - /sbin/ldconfig ZONES="/usr/share/zoneinfo/zone.tab" @@ -328,6 +322,12 @@ useradd -r -g clam -d /var/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 +%post db +# Remove old mirrors.dat, mostly because it will have the wrong +# owner after upgrading from clamav < 0.97: +test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat +exit 0 + %clean rm -rf %{buildroot} @@ -402,6 +402,12 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 +- Move deletion of /var/lib/clamav/mirrors.dat to db package. +- Don't enable NotifyClamd in freshclam config and cronjob, as not + everybody is running clamd. Running clamd's will anyway notice + when db is updated. + * Fri Mar 18 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-11 - Delete /var/lib/clamav/mirrors.dat, it will be recreated on first run. - clamav-milter config cleanups. commit 0de58a44516ae5ea2eab503715ab5ea2fb9bf4a7 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Fri Mar 18 09:05:10 2011 +0100 Milter cleanups after problems reported in bz#579370. Delete mirrors.dat in %post since I see no other way of getting the permissions correct. diff --git a/clamav-milter.init b/clamav-milter.init index f87efa7..347fe4b 100644 --- a/clamav-milter.init +++ b/clamav-milter.init @@ -25,7 +25,7 @@ test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter case "$1" in start) echo -n "Starting Clamav Milter Daemon: " - daemon clamav-milter $CLAMAV_FLAGS $SOCKET_ADDRESS + daemon clamav-milter $CLAMAV_FLAGS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamav-milter diff --git a/clamav.spec b/clamav.spec index 90e38b4..4d7776f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -160,6 +160,13 @@ you will need to install %{name}-devel. s|^#(NotifyClamd) .+$|$1 %{_sysconfdir}/clamd.conf|; ' etc/freshclam.conf +%{__perl} -pi.orig -e ' + s|^(Example)|#$1|; + s|^#(User) .+$|$1 clam|; + s|^#(ClamdSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; + ' etc/clamav-milter.conf + + cat <<EOF >clamd.logrotate %{_localstatedir}/log/clamav/clamd.log { missingok @@ -204,9 +211,7 @@ EOF ### Simple config file for clamav-milter, you should ### read the documentation and tweak it as you wish. -CLAMAV_FLAGS=" - --config-file=%{_sysconfdir}/clamd.conf -" +CLAMAV_FLAGS="" EOF %build @@ -252,12 +257,11 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -# mirrors.dat might exists with the wrong user on upgrades from pre v0.97, -# touch it here, and later %ghost it so that the permissions are fixed if needed. -touch %{buildroot}%{_localstatedir}/lib/clamav/mirrors.dat - - %post +# Remove old mirrors.dat, mostly because it will have the wrong +# owner after upgrading from clamav < 0.97: +test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat + /sbin/ldconfig ZONES="/usr/share/zoneinfo/zone.tab" @@ -387,7 +391,6 @@ rm -rf %{buildroot} %config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log -%ghost %{_localstatedir}/lib/clamav/mirrors.dat %files devel %defattr(-, root, root, 0755) @@ -399,6 +402,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Fri Mar 18 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-11 +- Delete /var/lib/clamav/mirrors.dat, it will be recreated on first run. +- clamav-milter config cleanups. + * Wed Mar 16 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-10 - Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. - Don't start clamd or milter service by default. commit 86972941e69b28303796b75b36f923ed94c37d88 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Thu Mar 17 10:12:35 2011 +0100 - Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. - Don't start clamd or milter service by default. diff --git a/clamav.spec b/clamav.spec index a756493..90e38b4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -252,6 +252,11 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ +# mirrors.dat might exists with the wrong user on upgrades from pre v0.97, +# touch it here, and later %ghost it so that the permissions are fixed if needed. +touch %{buildroot}%{_localstatedir}/lib/clamav/mirrors.dat + + %post /sbin/ldconfig @@ -382,6 +387,7 @@ rm -rf %{buildroot} %config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log +%ghost %{_localstatedir}/lib/clamav/mirrors.dat %files devel %defattr(-, root, root, 0755) @@ -393,6 +399,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Mar 16 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-10 +- Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. +- Don't start clamd or milter service by default. + * Tue Mar 15 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-7 - rpm-provide all old package names that are now obsoleted commit adb58860131bf63581ba9483ecb8440688b280dc Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 18:23:41 2011 +0100 Don't enable services by default. diff --git a/clamav-milter.init b/clamav-milter.init index 62a2f91..f87efa7 100644 --- a/clamav-milter.init +++ b/clamav-milter.init @@ -2,7 +2,7 @@ # # Startup script for the Clamav Milter Daemon # -# chkconfig: 2345 77 23 +# chkconfig: - 77 23 # description: clamav-milter is a daemon which hooks into sendmail \ # and routes email messages to clamav. # processname: clamav-milter diff --git a/clamav.init b/clamav.init index 0e001fb..848dbce 100755 --- a/clamav.init +++ b/clamav.init @@ -2,7 +2,7 @@ # # Startup script for the Clam AntiVirus Daemon # -# chkconfig: 2345 61 39 +# chkconfig: - 61 39 # description: Clam AntiVirus Daemon is a TCP/IP or socket protocol \ # server. # processname: clamd commit a8bbda52841301f275ac0ad885e98ba0ae31e3e4 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 15:11:59 2011 +0100 Remove broken or deprecated milter and freshclam options. diff --git a/clamav.spec b/clamav.spec index c5573ef..a756493 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -197,7 +197,6 @@ fi --quiet \ --datadir="%{_localstatedir}/lib/clamav" \ --log="$LOG_FILE" \ - --log-verbose \ --daemon-notify="%{_sysconfdir}/clamd.conf" EOF @@ -207,14 +206,7 @@ EOF CLAMAV_FLAGS=" --config-file=%{_sysconfdir}/clamd.conf - --force-scan - --local - --max-children=10 - --noreject - --outgoing - --quiet " -SOCKET_ADDRESS="local:%{_localstatedir}/run/clamav/clmilter.socket" EOF %build commit a89e6fd21e435b5cec12d136672b4ce32a859c46 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 11:20:34 2011 +0100 Obsolete clamav-filesystem in clamav-db package, since this is the first package in the installation chain -- and hopefull this should fix the dependency problem with old clamav-filesystem. diff --git a/clamav.spec b/clamav.spec index 4827933..c5573ef 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -28,8 +28,6 @@ Provides: libclamav Obsoletes: libclamav < %{version}-%{release} Provides: clamav-lib = %{version}-%{release} Obsoletes: clamav-lib < %{version}-%{release} -Provides: clamav-filesystem = %{version}-%{release} -Obsoletes: clamav-filesystem < %{version}-%{release} %description Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of @@ -85,6 +83,10 @@ Obsoletes: clamav-update < %{version}-%{release} Provides: clamav-data = %{version}-%{release} Obsoletes: clamav-data < %{version}-%{release} Obsoletes: clamav-data-empty <= %{version}-%{release} +# Ugly to put these in the db-package, but needed +# here to handle upgrades on EL5. +Provides: clamav-filesystem = %{version}-%{release} +Obsoletes: clamav-filesystem < %{version}-%{release} %description db The actual virus database for %{name} commit aebe2468a4b86955f41ce9ccb61a5236b8d9f481 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 10:39:53 2011 +0100 Provide all old package names that are now obsolete. Following the packaging guideline at: http://fedoraproject.org/wiki/PackageNamingGuidelines#Renaming.2Freplacing_… diff --git a/clamav.spec b/clamav.spec index d587dac..4827933 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -24,10 +24,12 @@ Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils ### Fedora Extras introduced them differently :( +Provides: libclamav Obsoletes: libclamav < %{version}-%{release} +Provides: clamav-lib = %{version}-%{release} Obsoletes: clamav-lib < %{version}-%{release} +Provides: clamav-filesystem = %{version}-%{release} Obsoletes: clamav-filesystem < %{version}-%{release} -Provides: libclamav %description Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of @@ -45,8 +47,17 @@ Group: System Environment/Daemons Requires: clamav = %{version}-%{release} ### Fedora Extras introduced them differently :( -Obsoletes: clamav-server <= %{version}-%{release} -Obsoletes: clamav-server-sysv <= %{version}-%{release} +Provides: clamav-server = %{version}-%{release} +Obsoletes: clamav-server < %{version}-%{release} +Provides: clamav-server-sysv = %{version}-%{release} +Obsoletes: clamav-server-sysv < %{version}-%{release} +Provides: clamav-scanner = %{version}-%{release} +Obsoletes: clamav-scanner < %{version}-%{release} +Provides: clamav-scanner-upstart = %{version}-%{release} +Obsoletes: clamav-scanner-upstart < %{version}-%{release} +Provides: clamav-server-sysvinit = %{version}-%{release} +Obsoletes: clamav-server-sysvinit < %{version}-%{release} + %description -n clamd The Clam AntiVirus Daemon @@ -56,7 +67,8 @@ Summary: The Clam AntiVirus sendmail-milter Daemon Group: Applications/System Requires: clamd = %{version}-%{release} Requires: sendmail -Obsoletes: clamav-milter-sysv <= %{version}-%{release} +Provides: clamav-milter-sysv = %{version}-%{release} +Obsoletes: clamav-milter-sysv < %{version}-%{release} %description milter The Clam AntiVirus sendmail-milter Daemon @@ -68,8 +80,10 @@ Group: Applications/Databases #Requires: clamav = %{version}-%{release} ### Fedora Extras introduced them differently :( -Obsoletes: clamav-update <= %{version}-%{release} -Obsoletes: clamav-data <= %{version}-%{release} +Provides: clamav-update = %{version}-%{release} +Obsoletes: clamav-update < %{version}-%{release} +Provides: clamav-data = %{version}-%{release} +Obsoletes: clamav-data < %{version}-%{release} Obsoletes: clamav-data-empty <= %{version}-%{release} %description db @@ -385,6 +399,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Mar 15 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-7 +- rpm-provide all old package names that are now obsoleted + * Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-6 - clam-db obsoletes old clamav-data-empty. diff --git a/clamd-wrapper b/clamd-wrapper deleted file mode 100644 index 14c04a5..0000000 --- a/clamd-wrapper +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash -# -# Xchkconfig: - 75 25 -# Xdescription: The clamd daemon listens for incoming connections on \ -# Unix or TCP socket and scans files or directories on demand. - -test "$CLAMD_SERVICE" || { - echo $"*** $0 can not be called in this way" - echo $"*** Please see /usr/share/doc/clamav-server-*/README how" - echo $"*** the clamav-server can be configured" - exit 6 -} - -# Source function library. -. /etc/init.d/functions - -# Get config. -test -r /etc/sysconfig/network && . /etc/sysconfig/network - -# Check that networking is up. -test "$NETWORKING" != "no" || exit 6 - -lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} -sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} -procname=clamd.${CLAMD_SERVICE} - -CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -CLAMD_OPTIONS= -## backward-compatibility check... -for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do - CLAMD_SOCKET=$i - test ! -e "$i" || break -done -test -f "$sysconffile" && . "$sysconffile" - - -RETVAL=0 -prog="clamd.${CLAMD_SERVICE}" - -start () { - echo -n $"Starting $prog: " - daemon $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop () { - echo -n $"Stopping $prog: " - killproc $procname - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -reload() { - rc=0 - echo -n $"Reloading $prog: " - killproc $procname -SIGHUP || rc=$? - echo - echo -n $"Loading new virus-database: " - killproc $procname -SIGUSR2 || rc=$? - echo - return $rc -} - -restart () { - stop - start -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 ;; - status) - status $procname ;; - condrestart) - test ! -f $lockfile || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 2 -esac commit cf7db91a88bbba67a6a54ca6c23ec8bd0b7f774d Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Mon Mar 14 12:16:02 2011 +0100 Update release number. diff --git a/clamav.spec b/clamav.spec index 9f0499a..d587dac 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -385,7 +385,7 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-5 +* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-6 - clam-db obsoletes old clamav-data-empty. * Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 commit a41ce1a97cd1767ba81ec794e455e25c7ab4660a Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Mon Mar 14 12:14:30 2011 +0100 clamav-data was already listed as obsolete.. diff --git a/clamav.spec b/clamav.spec index 0fc3799..9f0499a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -64,14 +64,13 @@ The Clam AntiVirus sendmail-milter Daemon %package db Summary: Virus database for %{name} Group: Applications/Databases -Obsoletes: clamav-data <= %{version}-%{release} -Obsoletes: clamav-data-empty <= %{version}-%{release} ### Remove circular dependency #Requires: clamav = %{version}-%{release} ### Fedora Extras introduced them differently :( Obsoletes: clamav-update <= %{version}-%{release} Obsoletes: clamav-data <= %{version}-%{release} +Obsoletes: clamav-data-empty <= %{version}-%{release} %description db The actual virus database for %{name} @@ -387,7 +386,7 @@ rm -rf %{buildroot} %changelog * Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-5 -- clam-db obsoletes old clamav-data and clamav-data-empty. +- clam-db obsoletes old clamav-data-empty. * Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 - Add back clamd-wrapper to stay compatible with users commit e10bf12213c7977e02534f6d5ed364409e7f64dc Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Mon Mar 14 11:19:15 2011 +0100 Fix upgrade problem when clamav-data or clamav-data-empty was installed. clamav-db obsoletes these. diff --git a/clamav.spec b/clamav.spec index f447f08..0fc3799 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -64,6 +64,8 @@ The Clam AntiVirus sendmail-milter Daemon %package db Summary: Virus database for %{name} Group: Applications/Databases +Obsoletes: clamav-data <= %{version}-%{release} +Obsoletes: clamav-data-empty <= %{version}-%{release} ### Remove circular dependency #Requires: clamav = %{version}-%{release} @@ -384,6 +386,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-5 +- clam-db obsoletes old clamav-data and clamav-data-empty. + * Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 - Add back clamd-wrapper to stay compatible with users of old packaging (amavisd-new). commit 44c852187fbb517dd9084ca7100404b6fed6d05c Merge: 728c0a6 825f174 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Sun Mar 13 21:37:43 2011 +0100 Merge branch 'el6' into el5 Conflicts: .gitignore diff --cc .gitignore index f6ee443,720667f..bf9c05a --- a/.gitignore +++ b/.gitignore @@@ -1,6 -1,3 +1,2 @@@ - <<<<<<< HEAD - clamav-0.95.1-norar.tar.bz2 - ======= --clamav-0.95.3-norar.tar.bz2 /clamav-0.97-clean.tar.bz2 - >>>>>>> el6 + /clamd-wrapper.tar.bz2 commit 825f174a59a4b0a16e9b39a0ef524919f00f1f32 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Mar 13 20:25:23 2011 +0000 Update spec, add clamav-wrapper source diff --git a/.gitignore b/.gitignore index cd2bf84..720667f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clamav-0.95.3-norar.tar.bz2 /clamav-0.97-clean.tar.bz2 +/clamd-wrapper.tar.bz2 diff --git a/clamav.spec b/clamav.spec index 824dacd..f447f08 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -15,6 +15,7 @@ URL: http://www.clamav.net/ Source0: clamav-0.97-clean.tar.bz2 Source1: clamav.init Source2: clamav-milter.init +Source3: clamd-wrapper.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel @@ -232,6 +233,8 @@ install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/ %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif +# Install clamav-wrapper: +tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log @@ -318,6 +321,8 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -379,6 +384,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 +- Add back clamd-wrapper to stay compatible with users + of old packaging (amavisd-new). + * Wed Feb 23 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.097-3 - Move db to /var/lib/clamav - Ship empty directory /etc/clamd.d for amavisd-new diff --git a/sources b/sources index 70d67b2..27407d3 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 44e7df79718d104db0666d5db3f08682 clamav-0.97-clean.tar.bz2 +ae4e25e5df41b71cf6541e3a876b94a7 clamd-wrapper.tar.bz2 commit 728c0a6675486de0cac83ed18d426cc498e94670 Merge: b413e80 77e0359 Author: Dennis Gilmore <dennis(a)ausil.us> Date: Wed Feb 23 21:22:32 2011 -0600 Merge branch 'el6' into el5 Conflicts: clamav.spec commit 77e0359251880d555b1a367a4f4cb2e1e1b33fcb Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Feb 23 17:34:22 2011 -0600 Move db to /var/lib/clamav Add /etc/clamd.d for amavisd-new diff --git a/clamav.spec b/clamav.spec index 3bd0251..824dacd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -94,8 +94,8 @@ you will need to install %{name}-devel. %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure %{__perl} -pi.orig -e ' - s|\@DBDIR\@|\$(localstatedir)/clamav|g; - s|\@DBINST\@|\$(localstatedir)/clamav|g; + s|\@DBDIR\@|\$(localstatedir)/lib/clamav|g; + s|\@DBINST\@|\$(localstatedir)/lib/clamav|g; s|\@CFGDIR\@|\$(sysconfdir)|g; s|\@CFGINST\@|\$(sysconfdir)|g; s|^\@INSTALL_CLAMAV_CONF_TRUE\@|\t|g; @@ -110,7 +110,7 @@ you will need to install %{name}-devel. s|^#(LogSyslog)|$1|; s|^#(PidFile) .+$|$1 %{_localstatedir}/run/clamav/clamd.pid|; s|^#(TemporaryDirectory) .+$|$1 %{_localstatedir}/tmp|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; s|^#(LocalSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; s|^#(FixStaleSocket)|$1|; s|^#(TCPSocket) .+$|$1 3310|; @@ -134,7 +134,7 @@ you will need to install %{name}-devel. %{__perl} -pi.orig -e ' s|^(Example)|#$1|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; s|^#(UpdateLogFile) .+$|$1 %{_localstatedir}/log/clamav/freshclam.log|; s|^#(LogSyslog)|$1|; s|^#(DatabaseOwner) .+$|$1 clam|; @@ -177,7 +177,7 @@ fi %{_bindir}/freshclam \ --quiet \ - --datadir="%{_localstatedir}/clamav" \ + --datadir="%{_localstatedir}/lib/clamav" \ --log="$LOG_FILE" \ --log-verbose \ --daemon-notify="%{_sysconfdir}/clamd.conf" @@ -196,7 +196,7 @@ CLAMAV_FLAGS=" --outgoing --quiet " -SOCKET_ADDRESS="local:%{_localstatedir}/clamav/clmilter.socket" +SOCKET_ADDRESS="local:%{_localstatedir}/run/clamav/clmilter.socket" EOF %build @@ -209,7 +209,7 @@ EOF --disable-unrar \ --enable-id-check \ --enable-dns \ - --with-dbdir="%{_localstatedir}/clamav" \ + --with-dbdir="%{_localstatedir}/lib/clamav" \ --with-group="clam" \ --with-libcurl \ --with-user="clam" \ @@ -238,6 +238,7 @@ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ +install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ %post /sbin/ldconfig @@ -334,6 +335,7 @@ rm -rf %{buildroot} %doc %{_mandir}/man8/clamd.8* %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav +%{_sysconfdir}/clamd.d %config %{_initrddir}/clamd %{_sbindir}/clamd %{_bindir}/clamconf @@ -341,10 +343,10 @@ rm -rf %{buildroot} %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ -%dir %{_localstatedir}/clamav/ +%dir %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/clamd.log -%exclude %{_localstatedir}/clamav/* +%exclude %{_localstatedir}/lib/clamav/* %if %{!?_without_milter:1}0 %files milter @@ -363,7 +365,7 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/logrotate.d/freshclam %defattr(0644, clam, clam, 0755) -%config(noreplace) %verify(user group mode) %{_localstatedir}/clamav/ +%config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log @@ -377,6 +379,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Feb 23 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.097-3 +- Move db to /var/lib/clamav +- Ship empty directory /etc/clamd.d for amavisd-new + * Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 - Disable llvm. commit ade013989017f8044801c73b12a9ddb35ea9007d Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 16:46:26 2011 -0600 Minor changes, bump release to 2 diff --git a/clamav.spec b/clamav.spec index 6e138d3..3bd0251 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -212,7 +212,9 @@ EOF --with-dbdir="%{_localstatedir}/clamav" \ --with-group="clam" \ --with-libcurl \ - --with-user="clam" + --with-user="clam" \ + --disable-llvm + make %{?_smp_mflags} %install @@ -375,6 +377,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 +- Disable llvm. + * Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 - Update to 0.97 - Fix up for current guidelines. commit b413e8038f09e0bae6a347cd56f13f47e3900cd7 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 16:42:16 2011 -0600 Minor changes, bump to Release: 2 diff --git a/clamav.spec b/clamav.spec index 6e138d3..3bd0251 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -212,7 +212,9 @@ EOF --with-dbdir="%{_localstatedir}/clamav" \ --with-group="clam" \ --with-libcurl \ - --with-user="clam" + --with-user="clam" \ + --disable-llvm + make %{?_smp_mflags} %install @@ -375,6 +377,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 +- Disable llvm. + * Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 - Update to 0.97 - Fix up for current guidelines. commit 98d8227630e520e187aa14ff1c862018c4b5596c Merge: 0909a88 78c8a5a Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 16:33:19 2011 -0600 Merge branch 'el6' into el5 Conflicts: .gitignore clamav.spec clamd-wrapper sources diff --cc .gitignore index c07be39,cd2bf84..f6ee443 --- a/.gitignore +++ b/.gitignore @@@ -1,1 -1,2 +1,6 @@@ ++<<<<<<< HEAD +clamav-0.95.1-norar.tar.bz2 ++======= + clamav-0.95.3-norar.tar.bz2 + /clamav-0.97-clean.tar.bz2 ++>>>>>>> el6 commit 78c8a5ad5f7f687287d016ac730bf48645b177e0 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 15:42:47 2011 -0600 Update to 0.097 with new spec diff --git a/.gitignore b/.gitignore index 5b7c836..cd2bf84 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ clamav-0.95.3-norar.tar.bz2 +/clamav-0.97-clean.tar.bz2 diff --git a/ChangeLog-rpm.old b/ChangeLog-rpm.old deleted file mode 100644 index 44c8556..0000000 --- a/ChangeLog-rpm.old +++ /dev/null @@ -1,279 +0,0 @@ -* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 -- updated to 0.88.7 - -* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 -- updated to 0.88.6 - -* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 -- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 -- added patch to set '__attribute__ ((visibility("hidden")))' for - exported MD5_*() functions (fixes #202043) - -* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 -- splitted SysV initscripts of -milter and -server into own subpackages - -* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 -- rebuilt - -* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 -- updated to 0.88.4 (SECURITY) - -* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed the clamdscan(1) manpage from the -server subpackage - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed a superfluous '}' -- removed some code which was relevant for FC-3 only - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 -- updated to 0.88.3 -- updated to new fedora-usermgmt macros - -* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 -- cleanups: removed unneeded curlies, use plain command instead of - %%__XXX macro, whitespace cleanup, removed unneeded versioned - dependencies -- added a 'Requires(post): group(clamav)' dependencies for -update and - added the corresponding Provides: to -data -- removed the %%_without_milter conditional; you won't gain anything - when milter would be disabled at buildtime - -* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 -- updated to 0.88.2 (SECURITY) -- rediffed patches; most issues handled by 0.88.1-2 are fixed in - 0.88.2 - -* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 -- added patch which fixes some classes of compiler warnings; at least - the using of implicitly declared functions was reported to cause - segfaults on AMD64 (brought to my attention by Marc Perkel) -- added patch which fixes wrong usage of strncpy(3) in unrarlib.c - -* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 -- updated to 0.88.1 (SECURITY) - -* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 -- rebuilt for FC5 - -* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 -- updated to 0.88 -- added pseudo-versions for the 'init(...)' provides as a first step - for the support of alternative initmethods - -* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 -- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) -- ship 'clamd.conf.5' man page in the -server subpackage *too*. The - same file is contained in multiple packages now, but this man-page - can not be removed from the base package because it also applies to - 'clamdscan' there (#173221). - -* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 -- updated to 0.87.1 - -* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 -- updated to 0.87 (SECURITY) -- removed -timeout patch; it is solved upstream -- reverted the -exim changes; they add yet more complexity, their - functionality can go into an own package and they contained flaws - -* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 -- Add clamav-exim configuration package - -* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 -- [milter] create the milter-logfile in the %%post scriptlet -- [milter] reverted the change of the default child_timeout value; it - was set to 5 minutes in 0.86.2 which conflicts with the internal - mode where a timeout must not be set. So, the clamav-milter would - not run with the default configuration - -* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 -- Fixed calculation of sleep duration; on some systems/IPs, `hostid` - results in a negative number which is retained by the bash - modulo-operation. So the sleep may get a negative number of seconds - being interpreted as an option. This version makes sure that the - module-operations returns a non-negative value. [BZ #164494, James - Wilkinson] -- added support for a /usr/sbin/clamav-notify-servers.local hook; this - file will be executed (source'd) before all other actions and can - abort the entire processing by invoking 'exit' - -* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 -- updated to 0.86.2 (SECURITY) -- changed the freshclam updating mechanism (again); now, it consists - of a crontab which does not need to be changed and a helper script - (freshclam-sleep). This helper script is configured by - /etc/sysconfig/freshclam - -* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 -- updated to 0.86.1 -- fixed randomization in %%post scriptlet: hour should be a range but - not a single number - -* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 -- updated to 0.86 -- randomize freshclam startup times in -update's %%post script (suggested - by Stephen Smoogen); this requires some more Requires(post): also - -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 -- fix dist tagging the way Enrico wants it - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 -- Rebuild - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 -- Update - -* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 -- updated to 0.85 - -* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 -- updated to 0.84 - -* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> -- rebuilt - -* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 -- updated to 0.83 - -* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 -- updated to 0.82 -- minor spec cleanups - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 -- build the package with '--disable-zlib-vcheck' because RH is unable to - apply a fix for a 5 month old and solved security issue. Please fill - your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 -- added 'BuildRequires: bc' (should work without also, but ./configure - gives out ugly warnings else) - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 -- updated to 0.81 -- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports - an internal mode now which is enabled by default -- updated -milter %%description - -* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 -- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update - subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) - -* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 -- updated to 0.80 -- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore -- buildrequire 'curl-devel' -- renamed clamav.conf to clamd.conf (upstream change) -- updated -initoff patch - -* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 -- updated to 0.75.1 -- use %%configure, the problems with the architecture specification - seem to have passed (probably because of an autoconf update) -- set mode 0600 for the cron-script (required by vixie-cron) -- made the cronjob a spambot and send mail about deactivated freshclam - service to nearly everybody... (root, postmaster, webmaster) -- other fixes in the notification cronjob - -* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 -- updated to 0.75 - -* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 -- moved /usr/bin/clamav-config from main into -devel - -* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 -- updated to 0.74 - -* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 -- updated to 0.73 -- added pkgconfig file - -* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 -- notify the user about a deactivated clamav-update service -- added clamd-gen script which generates template spec-files for - services using clamd -- copied template configuration files to %pkgdatadir/template (needed - for clamd-gen) -- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink - will be provided for compatibility reasons -- conditionalized building of the -milter subpackage ('--without - milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) - -* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 -- removed 'BuildRequires: dietlibc'; it was a leftover from the - pre-use-signal era (before 0.70) (bug #1716) - -* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 -- updated to 0.72 - -* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 -- removed the randomization in the cronjob; it seems to be impossible - to use the mod-operator (%%) there. Instead of, the user has to - replace some placeholders... - -* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 -- updated to 0.71 - -* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 -- quote 'EOF' to delay $RANDOM expansion - -* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 -- updated GECOS entry for the 'clamav' user to describe its purpose - more accurately -- use explicit '-m755' when creating directories with install - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 -- updated to 0.70; rediffed some patches -- updated logrotate script to use signals and documented the steps - which are needed to make it work -- adapted initscript to use signals instead of sockwrite -- removed sockwrite; signals can now be used to reload the database -- added logfile to the -milter subpackage - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 -- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets - -* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 -- split the double Requires(...,...): statements; see - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 -- require the recent fedora-usermgmt package (0.7) which fixes similar - ordering issues - -* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 -- updated to 0.68 (using the -1 version) -- ship milter-files in the -milter instead of the -server subpackage - -* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 -- fixed ':' vs. '.' in chown - -* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 -- randomize freshclam startup to prevent server peaks - -* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 -- updated to 0.67 (using the -1 version) - -* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 -- updated to 0.66; important, packaging-relevant changes are - freshclam: - * $http_proxy is not supported anymore; you have to configure it in - /etc/freshclam.conf - * the logfile has been renamed to /var/log/freshclam.log -- removed %%check section; buildroot check is implemented in local - testsuite already -- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew - files -- added some directory-Requires: -- activated milter-package and made it work -- added patch to disable clamav-milter service by default -- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this - makes things more consistently but can break backward compatibility. The - initscript should deal with the old version too, but I would not bet on - it... -- updated some descriptions -- fixed the update-mechanism; now it happens in two stages: at first, - the files will be downloaded as user 'clamav' and then, root initiates - the daemon-reload. - -* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 -- added security fix for - http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/README.fedora b/README.fedora deleted file mode 100644 index 8df192d..0000000 --- a/README.fedora +++ /dev/null @@ -1,116 +0,0 @@ -A clamav-milter setup consists of the following three components: - -* the clamav-milter itself - - --> this is provided by the 'clamav-milter' package plus (alternatively) - 'clamav-milter-upstart' or 'clamav-milter-sysvinit' - - The main configuration is in /etc/mail/clamav-milter.conf and MUST - be changed before first use. - - The -sysvinit package is managed by the traditional tools, but - -upstart requires modification of /etc/event.d/clamav-milter to - enable automatic startup. See comments there for more details. - -* a clamav scanner daemon - - --> this package is called 'clamav-scanner' plus (alternatively) - 'clamav-scanner-upstart' or 'clamav-scanner-sysvinit' - - The daemon is configured by /etc/clamd.d/scan.conf (which MUST be - edited before first use). - - The -sysvinit package is managed by the traditional tools, but - -upstart requires modification of /etc/event.d/clamd.scan to enable - automatic startup. See comments there for more details. - -* the MTA (sendmail/postfix) - - --> you should know how to install this... - - When communicating across unix sockets with the clamav-milter, it is - suggested to use the /var/run/clamav-milter/clamav-milter.socket - path. You have to add something like - - INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav-milter.socket, F=, T=S:4m;R:4m')dnl - - to your sendmail.mc. - - - -It is suggested that components communicate through TCP sockets as -this eases setup. Please add corresponding packet filter rules! - - -EXAMPLE -======= - -For clamav-milter, a possible setup might be created by - -A) On the MTA (assumed hostname 'host-mta') - - 1. Add to sendmail.mc - - | INPUT_MAIL_FILTER(`clamav', `S=inet:6666@host-milter, F=, T=S:4m;R:4m')dnl - - 2. Rebuild sendmail.cf - - -B) On the clamav-milter host (assumed hostname 'host-milter') - - 1. Install clamav-milter + clamav-milter-upstart packages - - 2. Set in /etc/mail/clamav-milter.conf - - | MilterSocket inet:6666 - | ClamdSocket tcp:host-scanner:6665 - - and all the other options which are required on your system - - 3. Edit /etc/event.d/clamav-milter and uncomment the - - | start on starting local - - line. Restart your system or execute - - | initctl emit starting local - - 4. Add something like - - | iptables -N IN-cmilt - | iptables -A IN-cmilt -s host-mta -j ACCEPT - | iptables -A IN-cmilt -j DROP - - | iptables -A INPUT -p tcp --dport 6666 -j IN-cmilt - - to your firewall setup - -C) On the clamav-scanner host (assumed hostname 'host-scanner') - - 1. Install clamav-scanner + clamav-scanner-upstart packages - - 2. Add to /etc/clamd.d/scan.conf - - | TCPSocket 6665 - | TCPAddr host-scanner - - comment out possible 'LocalSocket' lines and set all the other - options which are required on your system - - 3. Edit /etc/event.d/clamav-scanner and uncomment the - - | start on starting local - - line. Restart your system or execute - - | initctl emit starting local - - 4. Add something like - - | iptables -N IN-cscan - | iptables -A IN-cscan -s host-milter -j ACCEPT - | iptables -A IN-cscan -j DROP - - | iptables -A INPUT -p tcp --dport 6665 -j IN-csan - - to your firewall setup diff --git a/clamav-0.92-open.patch b/clamav-0.92-open.patch deleted file mode 100644 index 040fc20..0000000 --- a/clamav-0.92-open.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 -+++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 -@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da - if (dazuko->device < 0) - { - -- dazuko->device = open("/dev/dazuko", 0); -+ dazuko->device = open("/dev/dazuko", O_RDONLY); - if (dazuko->device < 0) - return -1; - diff --git a/clamav-0.92-private.patch b/clamav-0.92-private.patch deleted file mode 100644 index bab2948..0000000 --- a/clamav-0.92-private.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- clamav-0.92/libclamav.pc.in.private -+++ clamav-0.92/libclamav.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libclamav - Description: A GPL virus scanner - Version: @LIBCLAMAV_VERSION@ --Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -- -+Libs: -L${libdir} -lclamav -+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ -+Cflags: -I${includedir} ---- clamav-0.92/clamav-config.in.private -+++ clamav-0.92/clamav-config.in -@@ -54,12 +54,8 @@ while test $# -gt 0; do - usage 0 - ;; - -- --cflags) -- echo -I@includedir@ @CFLAGS@ -- ;; -- -- --libs) -- echo -L@libdir@ @LIBCLAMAV_LIBS@ -+ (--cflags|--libs) -+ ${PKG_CONFIG:-pkg-config} "$1" libclamav - ;; - - *) diff --git a/clamav-0.95-cliopts.patch b/clamav-0.95-cliopts.patch deleted file mode 100644 index 90d173f..0000000 --- a/clamav-0.95-cliopts.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: clamav-0.95rc1/shared/optparser.c -=================================================================== ---- clamav-0.95rc1.orig/shared/optparser.c -+++ clamav-0.95rc1/shared/optparser.c -@@ -211,7 +211,7 @@ const struct clam_option clam_options[] - - { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, - -- { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, -+ { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, - - { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, - diff --git a/clamav-0.95.3-umask.patch b/clamav-0.95.3-umask.patch deleted file mode 100644 index 220f7ab..0000000 --- a/clamav-0.95.3-umask.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: clamav-0.95.3/clamav-milter/clamav-milter.c -=================================================================== ---- clamav-0.95.3.orig/clamav-milter/clamav-milter.c -+++ clamav-0.95.3/clamav-milter/clamav-milter.c -@@ -306,7 +306,7 @@ int main(int argc, char **argv) { - - if((opt = optget(opts, "PidFile"))->enabled) { - FILE *fd; -- mode_t old_umask = umask(0002); -+ mode_t old_umask = umask(0022); - - if((fd = fopen(opt->strarg, "w")) == NULL) { - logg("!Can't save PID in file %s\n", opt->strarg); -Index: clamav-0.95.3/shared/output.c -=================================================================== ---- clamav-0.95.3.orig/shared/output.c -+++ clamav-0.95.3/shared/output.c -@@ -270,7 +270,7 @@ int logg(const char *str, ...) - #endif - if(logg_file) { - if(!logg_fp) { -- old_umask = umask(0037); -+ old_umask = umask(0077); - if((logg_fp = fopen(logg_file, "at")) == NULL) { - umask(old_umask); - #ifdef CL_THREAD_SAFE -Index: clamav-0.95.3/freshclam/freshclam.c -=================================================================== ---- clamav-0.95.3.orig/freshclam/freshclam.c -+++ clamav-0.95.3/freshclam/freshclam.c -@@ -102,7 +102,7 @@ static void writepid(const char *pidfile - { - FILE *fd; - int old_umask; -- old_umask = umask(0006); -+ old_umask = umask(0022); - if((fd = fopen(pidfile, "w")) == NULL) { - logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); - } else { diff --git a/clamav-0.97-clean.tar.bz2 b/clamav-0.97-clean.tar.bz2 new file mode 100644 index 0000000..9d39f27 Binary files /dev/null and b/clamav-0.97-clean.tar.bz2 differ diff --git a/clamav-milter.init b/clamav-milter.init new file mode 100644 index 0000000..62a2f91 --- /dev/null +++ b/clamav-milter.init @@ -0,0 +1,58 @@ +#!/bin/sh +# +# Startup script for the Clamav Milter Daemon +# +# chkconfig: 2345 77 23 +# description: clamav-milter is a daemon which hooks into sendmail \ +# and routes email messages to clamav. +# processname: clamav-milter +# pidfile: /var/run/clamav/clamav-milter.pid +# config: /etc/sysconfig/clamav-milter + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +[ -x /usr/sbin/clamav-milter ] || exit 0 + +# Local clamav-milter config +CLAMAV_FLAGS= +test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter + +# See how we were called. +case "$1" in + start) + echo -n "Starting Clamav Milter Daemon: " + daemon clamav-milter $CLAMAV_FLAGS $SOCKET_ADDRESS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamav-milter + ;; + stop) + echo -n "Stopping Clamav Milter Daemon: " + killproc clamav-milter + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamav-milter + ;; + status) + status clamav-milter + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + [ -e /var/lock/subsys/clamd ] && restart + RETVAL=$? + ;; + *) + echo "Usage: clamav-milter {start|stop|status|restart|reload|condrestart}" + exit 1 +esac + +exit $RETVAL diff --git a/clamav-milter.sysv b/clamav-milter.sysv deleted file mode 100644 index 170cdc1..0000000 --- a/clamav-milter.sysv +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -# -# clamav-milter Starts/stop the "clamav-milter" daemon -# -# chkconfig: - 79 21 -# description: A virus scanning milter - -# Source function library. -. /etc/rc.d/init.d/functions - -exec=/usr/sbin/clamav-milter -prog="clamav-milter" - -OPTS='-c /etc/mail/clamav-milter.conf' -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -pidfile=/var/run/clamav-milter/milter.pid -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon --pidfile=${pidfile} $exec $OPTS --nofork=no --pid=${pidfile} - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc -p "${pidfile}" $exec - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status -p "${pidfile}" $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? diff --git a/clamav-milter.upstart b/clamav-milter.upstart deleted file mode 100644 index e0a63f2..0000000 --- a/clamav-milter.upstart +++ /dev/null @@ -1,15 +0,0 @@ -### Uncomment these lines when you want clamav-milter to be a milter -### for a locally running MTA -#start on starting sendmail -#start on starting postfix - -### Uncomment these lines when you want clamav-milter to be a milter -### for a remotely running MTA -#start on starting local - -stop on runlevel 0 -stop on runlevel 1 -stop on runlevel 6 - -respawn -exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --nofork=yes diff --git a/clamav-notify-servers b/clamav-notify-servers deleted file mode 100644 index f115e89..0000000 --- a/clamav-notify-servers +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/bash - -# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# Usage: clamav-notify-servers - -CFGFILE=/etc/sysconfig/clamav-servers -BASE=/var/lock/subsys/clamd. -INITRDDIR=/etc/init.d - -ok=1 - -f=/usr/sbin/clamav-notify-servers.local -test ! -e "$f" || . "$f" - -for i in ${BASE}*; do - test -e "$i" || continue - - srv=${INITRDDIR}/clamd.${i##${BASE}} - test -e "$srv" || continue - - "$srv" reload || ok= -done >/dev/null - -test "$ok" diff --git a/clamav-update.cron b/clamav-update.cron deleted file mode 100644 index 3a69901..0000000 --- a/clamav-update.cron +++ /dev/null @@ -1,6 +0,0 @@ -## Adjust this line... -MAILTO=root - -## It is ok to execute it as root; freshclam drops privileges and becomes -## user 'clamav' as soon as possible -0 */3 * * * root /usr/share/clamav/freshclam-sleep diff --git a/clamav-update.logrotate b/clamav-update.logrotate deleted file mode 100644 index 0de6062..0000000 --- a/clamav-update.logrotate +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/freshclam.log { - monthly - notifempty -} diff --git a/clamav.init b/clamav.init new file mode 100755 index 0000000..0e001fb --- /dev/null +++ b/clamav.init @@ -0,0 +1,58 @@ +#!/bin/sh +# +# Startup script for the Clam AntiVirus Daemon +# +# chkconfig: 2345 61 39 +# description: Clam AntiVirus Daemon is a TCP/IP or socket protocol \ +# server. +# processname: clamd +# pidfile: /var/run/clamav/clamd.pid +# config: /etc/clamav.conf + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +[ -x /usr/sbin/clamd ] || exit 0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting Clam AntiVirus Daemon: " + daemon clamd + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd + ;; + stop) + echo -n "Stopping Clam AntiVirus Daemon: " + killproc clamd + rm -f /var/clamav/clamd.socket + rm -f /var/run/clamav/clamav.pid + RETVAL=$? + echo +### heres the fix... we gotta remove the stale files on restart + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamd + ;; + status) + status clamd + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + [ -e /var/lock/subsys/clamd ] && restart + RETVAL=$? + ;; + *) + echo "Usage: clamd {start|stop|status|restart|reload|condrestart}" + exit 1 +esac + +exit $RETVAL + diff --git a/clamav.spec b/clamav.spec index 88935d7..6e138d3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,879 +1,579 @@ -#global snapshot rc1 - -## Fedora Extras specific customization below... -%bcond_without fedora -%bcond_without upstart -%bcond_with unrar -%bcond_without noarch -## - -%global username clamupdate -%global homedir %_var/lib/clamav -%global freshclamlog %_var/log/freshclam.log -%global milteruser clamilt -%global milterlog %_var/log/clamav-milter.log -%global milterstatedir %_var/run/clamav-milter -%global pkgdatadir %_datadir/%name - -%global scanuser clamscan -%global scanstatedir %_var/run/clamd.scan - -%{?with_noarch:%global noarch BuildArch: noarch} -%{!?release_func:%global release_func() %1%{?dist}} - -Summary: End-user tools for the Clam Antivirus scanner -Name: clamav -Version: 0.95.3 -Release: %release_func 1200%{?snapshot:.%snapshot} - -License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} -Group: Applications/File -URL: http://www.clamav.net -%if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… -%else -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: %name-%version%{?snapshot}-norar.tar.bz2 -%endif -Source1: clamd-wrapper -Source2: clamd.sysconfig -Source3: clamd.logrotate -Source5: clamd-README -Source6: clamav-update.logrotate -Source7: clamd.SERVICE.init -Source8: clamav-notify-servers -Patch24: clamav-0.92-private.patch -Patch25: clamav-0.92-open.patch -Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95.3-umask.patch -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: clamav-lib = %version-%release -Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: ncurses-devel -BuildRequires: %_includedir/tcpd.h -BuildRequires: bc - -%package filesystem -Summary: Filesystem structure for clamav -Group: Applications/File -Provides: user(%username) = 4 -Provides: group(%username) = 4 -# Prevent version mix -Conflicts: %name < %version-%release -Conflicts: %name > %version-%release -BuildRequires: fedora-usermgmt-devel -%{?noarch} -%{?FE_USERADD_REQ} - -%package lib -Summary: Dynamic libraries for the Clam Antivirus scanner -Group: System Environment/Libraries -Requires: data(clamav) - -%package devel -Summary: Header files and libraries for the Clam Antivirus scanner -Group: Development/Libraries -Source100: clamd-gen -Requires: clamav-lib = %version-%release -Requires: clamav-filesystem = %version-%release -Requires(pre): %_libdir/pkgconfig -Requires: pkgconfig - -%package data -Summary: Virus signature data for the Clam Antivirus scanner -Group: Applications/File -Requires(pre): clamav-filesystem = %version-%release -Requires(postun): clamav-filesystem = %version-%release -Provides: data(clamav) = full -Conflicts: data(clamav) < full -Conflicts: data(clamav) > full -%{?noarch} - -%package data-empty -Summary: Empty data package for the Clam Antivirus scanner -Group: Applications/File -Provides: data(clamav) = empty -Conflicts: data(clamav) < empty -Conflicts: data(clamav) > empty -%{?noarch} - -%package update -Summary: Auto-updater for the Clam Antivirus scanner data-files -Group: Applications/File -Source200: freshclam-sleep -Source201: freshclam.sysconfig -Source202: clamav-update.cron -Requires: clamav-filesystem = %version-%release -Requires(pre): /etc/cron.d -Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod -Requires(post): group(%username) - -%package server -Summary: Clam Antivirus scanner server -Group: System Environment/Daemons -Requires: data(clamav) -Requires: clamav-filesystem = %version-%release -Requires: clamav-lib = %version-%release - -%package server-sysvinit -Summary: SysV initscripts for clamav server -Group: System Environment/Daemons -Provides: init(clamav-server) = sysv -Requires: clamav-server = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir -Provides: clamav-server-sysv = %version-%release -Obsoletes: clamav-server-sysv < %version-%release -%{?noarch} - - -%package scanner -Summary: Clamav scanner daemon -Group: System Environment/Daemons -Requires: init(clamav-scanner) -Provides: user(%scanuser) = 49 -Provides: group(%scanuser) = 49 -Requires: clamav-server = %version-%release -%{?noarch} - -%package scanner-sysvinit -Summary: SysV initscripts for clamav scanner daemon -Group: System Environment/Daemons -Provides: init(clamav-scanner) = sysv -Requires: clamav-server-sysvinit = %version-%release -Requires: clamav-scanner = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -%{?noarch} - -%package scanner-upstart -Summary: Upstart initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source410: clamd.scan.upstart -Provides: init(clamav-scanner) = upstart -Requires: clamav-scanner = %version-%release -# implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d -Requires(post): /usr/bin/killall -Requires(postun): /sbin/initctl -%{?noarch} - - -%package milter -Summary: Milter module for the Clam Antivirus scanner -Group: System Environment/Daemons -Source300: README.fedora -Requires: init(clamav-milter) -BuildRequires: sendmail-devel -BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) = 5 -Provides: group(%milteruser) = 5 -Requires(post): coreutils -%{?FE_USERADD_REQ} - -Provides: milter(clamav) = sendmail -Provides: milter(clamav) = postfix - -Provides: clamav-milter-core = %version-%release -Obsoletes: clamav-milter-core < %version-%release -Provides: clamav-milter-sendmail = %version-%release -Obsoletes: clamav-milter-sendmail < %version-%release - -%package milter-sysvinit -Summary: SysV initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source320: clamav-milter.sysv -Provides: init(clamav-milter) = sysvinit -Requires: clamav-milter = %version-%release -Requires(post): user(%milteruser) clamav-milter -Requires(preun): user(%milteruser) clamav-milter -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -Provides: clamav-milter-sysv = %version-%release -Obsoletes: clamav-milter-sysv < %version-%release -%{?noarch} - -%package milter-upstart -Summary: Upstart initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source310: clamav-milter.upstart -Provides: init(clamav-milter) = upstart -Requires: clamav-milter = %version-%release -# implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d -Requires(post): /usr/bin/killall -Requires(postun): /sbin/initctl -%{?noarch} - +### FIXME: Sysv script does not have condrestart option (redo sysv script) +### FIXME: amavisd-new requires clamd to run as user vscan, solution needed +### REMINDER: Look and sync with Petr Kristof's work + +Summary: Anti-virus software +Name: clamav +Version: 0.97 +Release: 1%{?dist} +License: GPLv2 +Group: Applications/System +URL: http://www.clamav.net/ + +# Upstream source includes libunrar that is not distributable. +#Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz +Source0: clamav-0.97-clean.tar.bz2 +Source1: clamav.init +Source2: clamav-milter.init +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel +%{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} +Requires: clamav-db = %{version}-%{release} +Requires(pre): shadow-utils + +### Fedora Extras introduced them differently :( +Obsoletes: libclamav < %{version}-%{release} +Obsoletes: clamav-lib < %{version}-%{release} +Obsoletes: clamav-filesystem < %{version}-%{release} +Provides: libclamav %description -Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this -software is the integration with mail servers (attachment scanning). The -package provides a flexible and scalable multi-threaded daemon, a command -line scanner, and a tool for automatic updating via Internet. The programs -are based on a shared library distributed with the Clam AntiVirus package, -which you can use with your own software. The virus database is based on -the virus database from OpenAntiVirus, but contains additional signatures -(including signatures for popular polymorphic viruses, too) and is KEPT UP -TO DATE. - -%description filesystem -This package provides the filesystem structure and contains the -user-creation scripts required by clamav. - -%description lib -This package contains dynamic libraries shared between applications -using the Clam Antivirus scanner. - -%description devel -This package contains headerfiles and libraries which are needed to -build applications using clamav. - -%description data -This package contains the virus-database needed by clamav. This -database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. This package and the -'clamav-data-empty' package are mutually exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description data-empty -This is an empty package to fulfill inter-package dependencies of the -clamav suite. This package and the 'clamav-data' package are mutually -exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - +Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of +this software is the integration with mail servers (attachment scanning). +The package provides a flexible and scalable multi-threaded daemon, a +command line scanner, and a tool for automatic updating via Internet. -%description update -This package contains programs which can be used to update the clamav -anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. +The programs are based on a shared library distributed with the Clam +AntiVirus package, which you can use with your own software. Most +importantly, the virus database is kept up to date -%description server -ATTENTION: most users do not need this package; the main package has -everything (or depends on it) which is needed to scan for virii on -workstations. +%package -n clamd +Summary: The Clam AntiVirus Daemon +Group: System Environment/Daemons +Requires: clamav = %{version}-%{release} -This package contains files which are needed to execute the clamd-daemon. -This daemon does not provide a system-wide service. Instead of, an instance -of this daemon should be started for each service requiring it. +### Fedora Extras introduced them differently :( +Obsoletes: clamav-server <= %{version}-%{release} +Obsoletes: clamav-server-sysv <= %{version}-%{release} -See the README file how this can be done with a minimum of effort. - - -%description server-sysvinit -SysV initscripts template for the clamav server - - -%description scanner -This package contains a generic system wide clamd service which is -e.g. used by the clamav-milter package. - -%description scanner-sysvinit -The SysV initscripts for clamav-scanner. - -%description scanner-upstart -The Upstart initscripts for clamav-scanner. +%description -n clamd +The Clam AntiVirus Daemon +%package milter +Summary: The Clam AntiVirus sendmail-milter Daemon +Group: Applications/System +Requires: clamd = %{version}-%{release} +Requires: sendmail +Obsoletes: clamav-milter-sysv <= %{version}-%{release} %description milter -This package contains files which are needed to run the clamav-milter. +The Clam AntiVirus sendmail-milter Daemon -%description milter-sysvinit -The SysV initscripts for clamav-milter. +%package db +Summary: Virus database for %{name} +Group: Applications/Databases +### Remove circular dependency +#Requires: clamav = %{version}-%{release} -%description milter-upstart -The Upstart initscripts for clamav-milter. +### Fedora Extras introduced them differently :( +Obsoletes: clamav-update <= %{version}-%{release} +Obsoletes: clamav-data <= %{version}-%{release} -## ------------------------------------------------------------ - -%prep -%setup -q -n %{name}-%{version}%{?snapshot} +%description db +The actual virus database for %{name} -%patch24 -p1 -b .private -%patch25 -p1 -b .open -%patch26 -p1 -b .cliopts -%patch27 -p1 -b .umask - -install -p -m0644 %SOURCE300 clamav-milter/ - -mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} +%package devel +Summary: Header files, libraries and development documentation for %{name} +Group: Development/Libraries +Requires: clamav = %{version}-%{release} -sed -ri \ - -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ - -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ - -e 's!^#?(User ).*!\1<USER>!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ - -e 's! /usr/local/share/clamav,! %homedir,!g' \ - etc/clamd.conf +### Fedora Extras introduced them differently :( +Obsoletes: libclamav-static-devel <= %{version}-%{release} +Obsoletes: libclamav-devel <= %{version}-%{release} +Provides: libclamav-static-devel, libclamav-devel -sed -ri \ - -e 's!^#?(UpdateLogFile )!#\1!g;' \ - -e 's!^#?(LogSyslog).*!\1 yes!g' \ - -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf +%description devel +This package contains the header files, static libraries and development +documentation for %{name}. If you like to develop programs using %{name}, +you will need to install %{name}-devel. +%prep +%setup -q + +%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure + +%{__perl} -pi.orig -e ' + s|\@DBDIR\@|\$(localstatedir)/clamav|g; + s|\@DBINST\@|\$(localstatedir)/clamav|g; + s|\@CFGDIR\@|\$(sysconfdir)|g; + s|\@CFGINST\@|\$(sysconfdir)|g; + s|^\@INSTALL_CLAMAV_CONF_TRUE\@|\t|g; + s|^\@INSTALL_FRESHCLAM_CONF_TRUE\@|\t|g; + ' database/Makefile.in etc/Makefile.in + +%{__perl} -pi.orig -e ' + s|^(Example)|#$1|; + s|^#(LogFile) .+$|$1 %{_localstatedir}/log/clamav/clamd.log|; + s|^#(LogFileMaxSize) .*|$1 0|; + s|^#(LogTime)|$1|; + s|^#(LogSyslog)|$1|; + s|^#(PidFile) .+$|$1 %{_localstatedir}/run/clamav/clamd.pid|; + s|^#(TemporaryDirectory) .+$|$1 %{_localstatedir}/tmp|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(LocalSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; + s|^#(FixStaleSocket)|$1|; + s|^#(TCPSocket) .+$|$1 3310|; + s|^#(TCPAddr) .+$|$1 127.0.0.1|; + s|^#(MaxConnectionQueueLength) .+$|$1 30|; + s|^#(StreamSaveToDisk)|$1|; + s|^#(MaxThreads) .+$|$1 50|; + s|^#(ReadTimeout) .+$|$1 300|; + s|^#(User) .+$|$1 clam|; + s|^#(AllowSupplementaryGroups).*$|$1 yes|; + s|^#(ScanPE) .+$|$1 yes|; + s|^#(ScanELF) .+$|$1 yes|; + s|^#(DetectBrokenExecutables)|$1|; + s|^#(ScanOLE2) .+$|$1 yes|; + s|^#(ScanMail)|$1|; + s|^#(ScanArchive) .+$|$1 yes|; + s|^#(ArchiveMaxCompressionRatio) .+|$1 300|; + s|^#(ArchiveBlockEncrypted)|$1|; + s|^#(ArchiveBlockMax)|$1|; + ' etc/clamd.conf + +%{__perl} -pi.orig -e ' + s|^(Example)|#$1|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(UpdateLogFile) .+$|$1 %{_localstatedir}/log/clamav/freshclam.log|; + s|^#(LogSyslog)|$1|; + s|^#(DatabaseOwner) .+$|$1 clam|; + s|^(Checks) .+$|$1 24|; + s|^#(NotifyClamd) .+$|$1 %{_sysconfdir}/clamd.conf|; + ' etc/freshclam.conf + +cat <<EOF >clamd.logrotate +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} +EOF -## ------------------------------------------------------------ +cat <<EOF >freshclam.logrotate +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} +EOF + +cat <<'EOF' >freshclam.cron +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/clamav" \ + --log="$LOG_FILE" \ + --log-verbose \ + --daemon-notify="%{_sysconfdir}/clamd.conf" +EOF + +%{__cat} <<EOF >clamav-milter.sysconfig +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS=" + --config-file=%{_sysconfdir}/clamd.conf + --force-scan + --local + --max-children=10 + --noreject + --outgoing + --quiet +" +SOCKET_ADDRESS="local:%{_localstatedir}/clamav/clmilter.socket" +EOF %build -CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" -export LDFLAGS='-Wl,--as-needed' -# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check -export LIBS='-lmilter -lpthread' -# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine -export have_cv_ipv6=yes -%configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static \ - --disable-rpath \ - --with-user=%username \ - --with-group=%username \ - %{!?with_unrar:--disable-unrar} - -# TODO: check periodically that CLAMAVUSER is used for freshclam only - - -# build with --as-needed and disable rpath -sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ - libtool - - +%configure \ + --program-prefix="%{?_program_prefix}" \ +%{!?_without_milter:--enable-milter} \ + --disable-clamav \ + --disable-static \ + --disable-zlib-vcheck \ + --disable-unrar \ + --enable-id-check \ + --enable-dns \ + --with-dbdir="%{_localstatedir}/clamav" \ + --with-group="clam" \ + --with-libcurl \ + --with-user="clam" make %{?_smp_mflags} - -## ------------------------------------------------------------ - %install -rm -rf "$RPM_BUILD_ROOT" _doc* -make DESTDIR="$RPM_BUILD_ROOT" install - -function smartsubst() { - local tmp - local regexp=$1 - shift - - tmp=$(mktemp /tmp/%name-subst.XXXXXX) - for i; do - sed -e "$regexp" "$i" >$tmp - cmp -s $tmp "$i" || cat $tmp >"$i" - rm -f $tmp - done -} - - -install -d -m755 \ - ${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,event.d} \ - ${RPM_BUILD_ROOT}%_var/log \ - ${RPM_BUILD_ROOT}%milterstatedir \ - ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir \ - ${RPM_BUILD_ROOT}%scanstatedir +rm -rf %{buildroot} +make install DESTDIR="%{buildroot}" -rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ - ${RPM_BUILD_ROOT}%_libdir/*.la - - -touch ${RPM_BUILD_ROOT}%homedir/daily.cld -touch ${RPM_BUILD_ROOT}%homedir/main.cld +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav +%if %{!?_without_milter:1}0 +install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter +install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +%else +rm %{buildroot}%{_mandir}/man8/clamav-milter.8* +%endif -## prepare the server-files -mkdir _doc_server -install -m644 -p %SOURCE2 _doc_server/clamd.sysconfig -install -m644 -p %SOURCE3 _doc_server/clamd.logrotate -install -m755 -p %SOURCE7 _doc_server/clamd.init -install -m644 -p %SOURCE5 _doc_server/README -install -m644 -p etc/clamd.conf _doc_server/clamd.conf +install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ +touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log +touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log -install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir -install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper +install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ -smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper +%post +/sbin/ldconfig +ZONES="/usr/share/zoneinfo/zone.tab" +CONFIG="/etc/sysconfig/clock" -## prepare the update-files -install -m644 -p %SOURCE6 ${RPM_BUILD_ROOT}%_sysconfdir/logrotate.d/clamav-update -install -m755 -p %SOURCE8 ${RPM_BUILD_ROOT}%_sbindir/clamav-notify-servers -touch ${RPM_BUILD_ROOT}%freshclamlog +if [ -r "$CONFIG" -a -r "$ZONES" ]; then + source "$CONFIG" + export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | head -1 | cut -f1 | tr [A-Z] [a-z])" +fi -install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update +if [ -z "$CODE" ]; then + export CODE="local" +fi -smartsubst 's!webmaster,clamav!webmaster,%username!g; - s!/usr/share/clamav!%pkgdatadir!g; - s!/usr/bin!%_bindir!g; - s!/usr/sbin!%_sbindir!g;' \ - $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ - $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +%{__perl} -pi -e ' + s|^(DatabaseMirror) database\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; + s|^(DatabaseMirror) db\.\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; + ' %{_sysconfdir}/freshclam.conf{,.rpmnew} &>/dev/null || : +%postun -p /sbin/ldconfig -### The scanner stuff -sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf +%pre +getent group clam >/dev/null || groupadd -r clam +getent passwd clam >/dev/null || \ +useradd -r -g clam -d /var/clamav -s /sbin/nologin \ + -c "Clam Anti Virus Checker" clam +exit 0 -sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ - > $RPM_BUILD_ROOT%_initrddir/clamd.scan +%pre -n clamd +getent group clam >/dev/null || groupadd -r clam +getent passwd clam >/dev/null || \ +useradd -r -g clam -d /var/clamav -s /sbin/nologin \ + -c "Clam Anti Virus Checker" clam +exit 0 -install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamd.scan +%post -n clamd +/sbin/chkconfig --add clamd -touch $RPM_BUILD_ROOT%scanstatedir/clamd.sock +%preun -n clamd +if [ $1 -eq 0 ]; then + /sbin/service clamd stop &>/dev/null || : + /sbin/chkconfig --del clamd +fi +%postun -n clamd +/sbin/service clamd condrestart &>/dev/null || : -### The milter stuff -sed -r \ - -e 's!^#?(User).*!\1 %milteruser!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ - -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ - -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ - -e 's! /tmp/clamav-milter.log! %milterlog!g' \ - etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf +%post milter +/sbin/chkconfig --add clamav-milter -install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamav-milter -install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +%preun milter +if [ $1 -eq 0 ]; then + /sbin/service clamav-milter stop &>/dev/null || : + /sbin/chkconfig --del clamav-milter +fi +%postun milter +/sbin/service clamav-milter condrestart &>/dev/null || : -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf -touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} +%pre db +getent group clam >/dev/null || groupadd -r clam +getent passwd clam >/dev/null || \ +useradd -r -g clam -d /var/clamav -s /sbin/nologin \ + -c "Clam Anti Virus Checker" clam +exit 0 -%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/event.d} +%clean +rm -rf %{buildroot} -## ------------------------------------------------------------ +%files +%defattr(-, root, root, 0755) +%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README test/ +%doc docs/*.pdf etc/freshclam.conf +%doc %{_mandir}/man1/sigtool.1* +%doc %{_mandir}/man1/clamscan.1* +%doc %{_mandir}/man1/freshclam.1* +%doc %{_mandir}/man5/freshclam.conf.5* +%config(noreplace) %{_sysconfdir}/freshclam.conf +%{_bindir}/clamscan +%{_bindir}/freshclam +%{_bindir}/sigtool +%{_bindir}/clambc +%{_libdir}/libclamav.so.* + +%files -n clamd +%defattr(-, root, root, 0755) +%doc etc/clamd.conf +%doc %{_mandir}/man1/clamdscan.1* +%doc %{_mandir}/man1/clamconf.1* +%doc %{_mandir}/man1/clamdtop.1* +%doc %{_mandir}/man5/clamd.conf.5* +%doc %{_mandir}/man8/clamd.8* +%config(noreplace) %{_sysconfdir}/clamd.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/clamav +%config %{_initrddir}/clamd +%{_sbindir}/clamd +%{_bindir}/clamconf +%{_bindir}/clamdscan + +%defattr(0644, clam, clam, 0755) +%{_localstatedir}/run/clamav/ +%dir %{_localstatedir}/clamav/ +%dir %{_localstatedir}/log/clamav/ +%ghost %{_localstatedir}/log/clamav/clamd.log +%exclude %{_localstatedir}/clamav/* + +%if %{!?_without_milter:1}0 +%files milter +%defattr(-, root, root, 0755) +%doc %{_mandir}/man5/clamav-milter.conf.5* +%doc %{_mandir}/man8/clamav-milter.8* +%config(noreplace) %{_sysconfdir}/sysconfig/clamav-milter +%config %{_initrddir}/clamav-milter +%{_sbindir}/clamav-milter +%config(noreplace) %{_sysconfdir}/clamav-milter.conf +%endif -%clean -rm -rf "$RPM_BUILD_ROOT" +%files db +%defattr(-, root, root, 0755) +%config(noreplace) %{_sysconfdir}/cron.daily/freshclam +%config(noreplace) %{_sysconfdir}/logrotate.d/freshclam -## ------------------------------------------------------------ +%defattr(0644, clam, clam, 0755) +%config(noreplace) %verify(user group mode) %{_localstatedir}/clamav/ +%dir %{_localstatedir}/log/clamav/ +%ghost %{_localstatedir}/log/clamav/freshclam.log -%triggerprein filesystem -- clamav-filesystem < 0.96 -## REMOVE me in F14 or F15 (added in pre F12) -! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { - /usr/sbin/usermod -l %username clamav || : - /usr/sbin/groupmod -n %username clamav || : - logger -t rpm/clamav "Renamed clamav user+group to %username" || : -} +%files devel +%defattr(-, root, root, 0755) +%{_bindir}/clamav-config +%{_includedir}/clamav.h +%{_libdir}/libclamav.so +%{_libdir}/pkgconfig/libclamav.pc +#%{_libdir}/libclamav.a +%exclude %{_libdir}/libclamav.la -%pre filesystem -%__fe_groupadd 4 -r %username &>/dev/null || : -%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ - -c 'Clamav database update user' -g %username %username &>/dev/null || : +%changelog +* Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 +- Update to 0.97 +- Fix up for current guidelines. -%postun filesystem -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : +* Fri Nov 23 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-3 +- Change username to get upgrades from fedora versions working. +* Thu Nov 22 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-2 +- Initial changes for EPEL version. -%pre scanner -%__fe_groupadd 49 -r %scanuser &>/dev/null || : -%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ - -g %scanuser %scanuser &>/dev/null || : +* Tue Aug 21 2007 Dag Wieers <dag(a)wieers.com> - 0.91.2-1 +- Updated to release 0.91.2. -%postun scanner -%__fe_userdel %scanuser &>/dev/null || : -%__fe_groupdel %scanuser &>/dev/null || : +* Tue Jul 17 2007 Dag Wieers <dag(a)wieers.com> - 0.91.1-1 +- Updated to release 0.91.1. +* Wed Jul 11 2007 Dag Wieers <dag(a)wieers.com> - 0.91-1 +- Updated to release 0.91. -%post scanner-sysvinit -/sbin/chkconfig --add clamd.scan +* Thu May 31 2007 Dag Wieers <dag(a)wieers.com> - 0.90.3-1 +- Updated to release 0.90.3. -%preun scanner-sysvinit -test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.scan +* Fri Apr 27 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-2 +- Added clamav-milter support for EL2.1 now that it comes with a newer sendmail. (Tom G. Christensen) -%postun scanner-sysvinit -test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : +* Sun Apr 15 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-1 +- Updated to release 0.90.2. +* Fri Mar 09 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-4 +- Removed circular dependency. -%post scanner-upstart -/usr/bin/killall -u %scanuser clamd 2>/dev/null || : +* Thu Mar 08 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-3 +- Cleaned up default options to clamav-milter. (Adam T. Bowen) +- Removed -b/--bounce as it is no longer recognized. (Gerald Teschl) -%preun scanner-upstart -test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : +* Mon Mar 05 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-2 +- Removed the erroneous --dont-clean-log from the clamav-milter sysconfig. (Gerald Teschl) +* Fri Mar 02 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-1 +- Updated to release 0.90.1. +* Tue Feb 20 2007 Dag Wieers <dag(a)wieers.com> - 0.90-3 +- Do the right thing... -%post update -test -e %freshclamlog || { - touch %freshclamlog - %__chmod 0664 %freshclamlog - %__chown root:%username %freshclamlog -} +* Mon Feb 19 2007 Dag Wieers <dag(a)wieers.com> - 0.90-2 +- The tarball was re-rolled before public release. Sigh. +* Tue Feb 13 2007 Dag Wieers <dag(a)wieers.com> - 0.90-1 +- Updated to release 0.90. -%triggerin milter -- clamav-scanner -# Add the milteruser to the scanuser group; this is required when -# milter and clamd communicate through local sockets -/usr/sbin/usermod -a -G %scanuser %milteruser &>/dev/null || : +* Tue Dec 12 2006 Dag Wieers <dag(a)wieers.com> - 0.88.7-1 +- Updated to release 0.88.7. -%pre milter -%__fe_groupadd 5 -r %milteruser &>/dev/null || : -%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : +* Sun Nov 05 2006 Dag Wieers <dag(a)wieers.com> - 0.88.6-1 +- Updated to release 0.88.6. +- Added condrestart to sysv scripts. (Tsai Li Ming) -%post milter -test -e %milterlog || { - touch %milterlog - chmod 0620 %milterlog - chown root:%milteruser %milterlog -} +* Sat Oct 28 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-2 +- Added missing clamav dependency to clamav-db. -%postun milter -%__fe_userdel %milteruser &>/dev/null || : -%__fe_groupdel %milteruser &>/dev/null || : +* Sun Oct 15 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-1 +- Updated to release 0.88.5. +* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.4-1 +- Updated to release 0.88.4. -%post milter-sysvinit -/sbin/chkconfig --add clamav-milter +* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-2 +- Incorporated UPX heap overflow fix. -%preun milter-sysvinit -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter +* Sat Jul 01 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-1 +- Updated to release 0.88.3. -%postun milter-sysvinit -test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : +* Sun Apr 30 2006 Dag Wieers <dag(a)wieers.com> - 0.88.2-1 +- Updated to release 0.88.2. +* Tue Apr 04 2006 Dag Wieers <dag(a)wieers.com> - 0.88.1-1 +- Updated to release 0.88.1. -%post milter-upstart -/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : +* Mon Jan 09 2006 Dag Wieers <dag(a)wieers.com> - 0.88-1 +- Updated to release 0.88. -%preun milter-upstart -test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : +* Sun Nov 13 2005 Dries Verachtert <dries(a)ulyssis.org> - 0.87.1-1 +- Updated to release 0.87.1. +* Sat Sep 17 2005 Dag Wieers <dag(a)wieers.com> - 0.87-1 +- Updated to release 0.87. -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig +* Mon Jul 25 2005 Dag Wieers <dag(a)wieers.com> - 0.86.2-1 +- Updated to release 0.86.2. +* Mon Jul 11 2005 Dag Wieers <dag(a)wieers.com> - 0.86.1-1 +- Updated to release 0.86.1. -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE -%doc docs/*.pdf -%_bindir/* -%_mandir/man[15]/* -%exclude %_bindir/clamav-config -%exclude %_bindir/freshclam -%exclude %_mandir/*/freshclam* +* Mon May 16 2005 Dag Wieers <dag(a)wieers.com> - 0.85.1-1 +- Updated to release 0.85.1. -## ----------------------- +* Fri Apr 29 2005 Dag Wieers <dag(a)wieers.com> - 0.84-1 +- Updated to release 0.84. -%files lib -%defattr(-,root,root,-) -%_libdir/*.so.* +* Mon Feb 14 2005 Dag Wieers <dag(a)wieers.com> - 0.83-1 +- Updated to release 0.83. -## ----------------------- +* Thu Feb 10 2005 Dag Wieers <dag(a)wieers.com> - 0.82-2 +- Fix for false positive on RIFF files. (Roger Jochem) -%files devel -%defattr(-,root,root,-) -%_includedir/* -%_libdir/*.so -%pkgdatadir/template -%pkgdatadir/clamd-gen -%_libdir/pkgconfig/* -%_bindir/clamav-config +* Mon Feb 07 2005 Dag Wieers <dag(a)wieers.com> - 0.82-1 +- Updated to release 0.82. -## ----------------------- +* Thu Jan 27 2005 Dag Wieers <dag(a)wieers.com> - 0.81-1 +- Improved logrotate scripts. (Filippo Grassilli) +- Updated to release 0.81. -%files filesystem -%attr(-,%username,%username) %dir %homedir -%attr(-,root,root) %dir %pkgdatadir +* Wed Dec 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-2 +- Added %%dir /var/clamav/log. (Adam Bowns) +- Changed logrotate script to use clamd.log. (Stuart Schneider) +- Added curl dependency. (Petr Kristof) +- Synchronized some options from Petr. (Petr Kristof) +- Fixed another clamav.conf reference. (Michael Best) -## ----------------------- +* Mon Nov 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-1 +- Updated package description. (Arvin Troels) +- Incorporated fixes from Jima. (Jima) +- Config clamav.conf renamed to clamd.conf. +- Removed obsolete patch. +- Added macros for building without milter. +- Updated to release 0.80. -%files data -%defattr(-,%username,%username,-) -# use %%config to keep files which were updated by 'freshclam' -# already. Without this tag, they would be overridden with older -# versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %homedir/*.cvd +* Fri Jul 30 2004 Dag Wieers <dag(a)wieers.com> - 0.75.1-1 +- Added obsoletes for fedora.us. +- Updated to release 0.75.1. +* Mon Jul 26 2004 Dag Wieers <dag(a)wieers.com> - 0.75-2 +- Fixed a problem where $CODE was empty. -%files data-empty -%defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/*.cvd +* Fri Jul 23 2004 Dag Wieers <dag(a)wieers.com> - 0.75-1 +- Updated to release 0.75. +* Wed Jun 30 2004 Dag Wieers <dag(a)wieers.com> - 0.74-1 +- Updated to release 0.74. -## ----------------------- +* Tue Jun 15 2004 Dag Wieers <dag(a)wieers.com> - 0.73-1 +- Updated to release 0.73. -%files update -%defattr(-,root,root,-) -%_bindir/freshclam -%_mandir/*/freshclam* -%pkgdatadir/freshclam-sleep -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* -%config(noreplace) %_sysconfdir/cron.d/* -%config(noreplace) %_sysconfdir/sysconfig/freshclam +* Thu Jun 03 2004 Dag Wieers <dag(a)wieers.com> - 0.72-1 +- Updated to release 0.72. -%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/*.cld +* Thu May 20 2004 Dag Wieers <dag(a)wieers.com> - 0.71-1 +- Updated to release 0.71. +* Sun May 02 2004 Dag Wieers <dag(a)wieers.com> - 0.70-2 +- Fixed the installation check for conf files. (Richard Soderberg, Udo Ruecker) +- Changed the init-order of the sysv scripts. (Will McCutcheon) +- Changes to the default configuration files. -## ----------------------- +* Sat Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 +- Updated to release 0.70. -%files server -%defattr(-,root,root,-) -%doc _doc_server/* -%_mandir/man[58]/clamd* -%_sbindir/* -%pkgdatadir/clamd-wrapper -%dir %_sysconfdir/clamd.d +* Tue Mar 16 2004 Dag Wieers <dag(a)wieers.com> - 0.68-1 +- Updated to release 0.68. -%exclude %_sbindir/*milter* -%exclude %_mandir/man8/clamav-milter* +* Fri Mar 12 2004 Dag Wieers <dag(a)wieers.com> - 0.67.1-1 +- Updated to release 0.67-1. +- Added clamdwatch and trashcan to clamd. +* Mon Mar 08 2004 Dag Wieers <dag(a)wieers.com> - 0.67-1 +- Personalized SPEC file. -%files server-sysvinit -%defattr(-,root,root,-) -%_initrddir/clamd-wrapper +* Mon Aug 22 2003 Matthias Saou/Che +- Added "--without milter" build option. (Matthias Saou) +- Fixed freshclam cron (Matthias Saou) +- Built the new package. (Che) +* Tue Jun 24 2003 Che +- clamav-milter introduced. +- a few more smaller fixes. -## ----------------------- +* Sun Jun 22 2003 Che +- version upgrade -%files scanner -%defattr(-,root,root,-) -%dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%config(noreplace) %_sysconfdir/clamd.d/scan.conf -%ghost %scanstatedir/clamd.sock +* Mon Jun 16 2003 Che +- rh9 build +- various fixes +- got rid of rpm-helper prereq -%files scanner-sysvinit -%attr(0755,root,root) %config %_initrddir/clamd.scan +* Fri Mar 24 2003 Che +- some cleanups and fixes +- new patch added -%if 0%{?with_upstart:1} -%files scanner-upstart -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/event.d/clamd.scan -%endif +* Fri Nov 22 2002 Che +- fixed a config patch issue -## ----------------------- +* Fri Nov 22 2002 Che +- version upgrade and some fixes -%files milter -%defattr(-,root,root,-) -%doc clamav-milter/README.fedora -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %_sysconfdir/mail/clamav-milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%attr(0710,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterstatedir/* - -%files milter-sysvinit -%defattr(-,root,root,-) -%config %_initrddir/clamav-milter - -%if 0%{?with_upstart:1} -%files milter-upstart -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/event.d/clamav-milter -%endif +* Sat Nov 02 2002 Che +- version upgrade +* Wed Oct 24 2002 Che +- some important changes for lsb compliance -%changelog -* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- adjusted chkconfig positions for clamav-milter (#530101) - -* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1200 -- updated to 0.95.3 - -* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- conditionalized build of noarch subpackages to ease packaging under RHEL5 - -* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 -- modified freshclam configuration to log by syslog by default -- disabled LocalSocket option in sample configuration -- fixed clamav-milter sysv initscript to use bash interpreter and to - be disabled by default - -* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 -- renamed 'clamav' user/group to 'clamupdate' -- add the '%milteruser' user to the '%scanuser' group when the -scanner - subpackage is installed - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 -- updated to 0.95.2 - -* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 -- fixed '--without upstart' operation - -* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 -- added '%%bcond_without upstart' conditional to ease skipping of - -upstart subpackage creation e.g. on EL5 systems -- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which - broke update path - -* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 -- Upgrade to 0.95.1 (#495039) - -* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 -- updated to final 0.95 -- added ncurses-devel (-> clamdtop) BR -- enforced IPv6 support - -* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 -- updated to 0.95rc1 -- added -upstart subpackages -- renamed -sysv to -sysvinit to make -upstart win the default dep resolving -- reworked complete milter stuff -- added -scanner subpackage which contains a preconfigured daemon - (e.g. for use by -milter) -- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old - -* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 -- made some subpackages noarch -- fixed typo in SysV initscript which removes 'touch' file (#473513) - -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 -- Upgrade to 0.94.2 (#474002) - -* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 -- Upgrade to 0.94.1 - -* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 -- Upgrade to 0.94 (SECURITY), fixes #461461: -- CVE-2008-1389 Invalid memory access in the CHM unpacker -- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg -- CVE-2008-3913 Memory leak in code path in freshclam's manager.c -- CVE-2008-3914 Multiple file descriptor leaks on the code paths - -* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 -- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read - on petite files) -- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) -- rediffed patches - -* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 -- updated to 0.93.1 -- rediffed -path patch -- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability - -* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 -- updated to final 0.93 -- removed daily.inc + main.inc directories; they are now replaced by - *.cld containers -- trimmed down MAILTO list of cronjob to 'root' again; every well - configured system has an alias for this recipient - -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 -- moved -milter scriptlets into -milter-core subpackage -- added a requirement on the milteruser to the -milter-sendmail - subpackage (reported by Bruce Jerrick) - -* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 -- updated to 0.93rc1 -- fixed rpath issues - -* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 -- updated to 0.92.1 - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 -- redisabled unrar stuff completely by using clean sources -- splitted -milter subpackage into pieces to allow use without sendmail - (#239037) - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 -- use a better way to disable RPATH-generation (needed for '--with - unrar' builds) - -* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 -- added a README.fedora to the milter package (#240610) -- ship original sources again; unrar is now licensed correctly (no more - stolen code put under GPL). Nevertheless, this license is not GPL - compatible, and to allow libclamav to be used by GPL applications, - unrar is disabled by a ./configure switch. -- use pkg-config in clamav-config to emulate --cflags and --libs - operations (fixes partly multilib issues) -- registered some more auto-updated files and marked them as %%ghost - -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 -- updated to 0.92 (SECURITY): -- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability - -* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of - legal problems (resolves 334371) -- correct license tag - -* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 -- Bump release for upgrade path. - -* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 -- updated to 0.91.2 (SECURITY): -- CVE-2007-4510 DOS in RTF parser -- DOS in html normalizer -- arbitrary command execution by special crafted recipients in - clamav-milter's black-hole mode -- fixed an open(2) issue - -* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 -- updated to 0.91.1 - -* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 -- updated to 0.91 - -* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 -- updated to 0.90.3 -- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both - in FC6- and F7+ - -* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 -- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 -- updated to 0.90.1 -- updated %%doc list - -* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 -- updated to final 0.90 -- removed -visibility patch since fixed upstream - -* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 -- build with -Wl,-as-needed and cleaned up pkgconfig file -- removed old hack which forced installation of freshclam.conf; related - check was removed upstream -- removed static library -- removed %%changelog entries from before 2004 - -* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 -- updated to 0.90rc3 -- splitted mandatory parts from the data-file into a separate -filesystem - subpackage -- added a -data-empty subpackage to allow a setup where database is - updated per cron-job and user does not want to download the large - -data package with outdated virus definitations (#214949) -- %%ghost'ed the files downloaded by freshclam +* Wed Oct 23 2002 Che +- initial rpm release diff --git a/clamd-README b/clamd-README deleted file mode 100644 index e62b487..0000000 --- a/clamd-README +++ /dev/null @@ -1,58 +0,0 @@ -To create individual clamd-instance take the following files and -modify/copy them in the suggested way: - -clamd.conf: - * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with an unique service-name; - e.g. as /etc/clamd.d/<SERVICE>.conf - - To make logfile rotation work properly, the LogFile should be - writable for the assigned User. Recommended way to reach this, is - to: - * make it owned by the User's *group* - * assign at least 0620 (u+rw,g+w) permissions - - A suitable command might be - | # touch <logfile> - | # chgrp <user> <logfile> - | # chmod 0620 <logfile> - - NEVER use 'clamav' as the user since he can modify the database. - This is the user who is running the application; e.g. for mimedefang - (http://www.roaringpenguin.com/mimedefang) the user might be - 'defang'.Theoretically, distinct users could be used, but it must be - made sure that the application-user can write into the socket-file, - and that the clamd-user can access the files asked by the - application to be checked. - - -clamd.logrotate: - * set the correct value for the logfile - * place it into /etc/logrotate.d - -clamd.sysconfig: - * set the name of the config-file and the local socket - * copy it to /etc/sysconfig/clamd.<SERVICE> - -clamd.init: - * set the service-name - * place it into /etc/init.d/ with an unique name and activate it - (e.g. with /sbin/chkconfig clamd.<SERVICE> on) - -Additionally, a symlink must be set to clamd in a way like - | # ln -s clamd /usr/sbin/clamd.<SERVICE> -and the directory for the socket file must be created (see 'LocalSocket' -in clamd.conf) - | # mkdir -p /var/run/clamd.<SERVICE> - - -This directory must be writable by the 'User' chosen in the config-file. - - - -[Disclaimer: - this file and the script/configfiles are not part of the official - clamav package. - - Please send complaints and comments to - mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamd-gen b/clamd-gen deleted file mode 100755 index ac5dae2..0000000 --- a/clamd-gen +++ /dev/null @@ -1,269 +0,0 @@ -#! /bin/bash - -# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -function showHelp() -{ - echo \ -$"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> - --license=<LICENSE> --username=>USERNAME> -" - exit 0 -} - -function rpm.generatePreamble() -{ - cat <<EOF -%{!?release_func:%define release_func() %1%{?dist}} -# The name of the minit service -%define minitsvcdir %minitdir/services/%name -# The configuration file for the SysV initservice -%define conffile %_sysconfdir/clamd.d/%service.conf -# The directory, where the milter socket will be placed into; this -# socket will be named clamd.sock -%define rundir /var/run/clamd.%service -# The name of the logfile -%define logfile /var/log/clamd.%service -# The user under whose id, the clamd shall be running. This user must -# be able to read the files from the base-service and is usually -# created there. -%define username $USERNAME -# The packagename of the service -%define service $SERVICE -# The service name as used by the system's initscripts; usually this -# is %service -%define baseservice %service - -%define __chkconfig /sbin/chkconfig -%define minitdir %_sysconfdir/minit - - -EOF -} - -function rpm.generateHeader() -{ - cat <<EOF -Summary: Clamav server for '%service' -Name: clamd.%service -Version: $VERSION -Release: %release_func $RELEASE -Epoch: 0 -License: $LICENSE -Group: System Environment/Daemons -BuildRoot: %_tmppath/%name-%version-%release-root -BuildArch: noarch -Requires: init(%name) -Requires(pre): %service -Requires: clamav-server -BuildRequires: clamav-devel - -%package sysv -Summary: SysV initscripts for a %service clamav-server -Group: System Environment/Daemons -Provides: init(%name) = sysv -Conflicts: init(%name) < sysv -Conflicts: init(%name) > sysv -Requires: clamav-server-sysv -Requires(post): %name = %epoch:%version-%release -Requires(post): diffutils mktemp %__chkconfig -Requires(preun): %__chkconfig -Requires(pre): %_initrddir -Requires(postun): %_initrddir - -%package minit -Summary: minit initscripts for a %service clamav-server -Group: System Environment/Daemons -Provides: init(%name) = minit -Conflicts: init(%name) < minit -Conflicts: init(%name) > minit -Requires(post): %name = %epoch:%version-%release -Requires(post): diffutils mktemp -Requires(pre): minit-setup -Requires(postun): minit-setup -Requires(triggers): minit-tools - - -%description -Basic setup for a clamav server for '%service'. - - -%description sysv -Basic setup for a clamav server for '%service'. - -This package contains initscripts for SysV based systems. - - -%description minit -Basic setup for a clamav server for '%service'. - -This package contains initscripts for minit based systems. - -EOF -} - - -function rpm.genBody() -{ - cat <<"XEOFX" -%prep -%build - -%install -rm -rf $RPM_BUILD_ROOT -%__install -d -m755 $RPM_BUILD_ROOT{%minitsvcdir,%_sbindir,%rundir,/var/log} - -d=/usr/share/clamav/template - -function subst -{ - src=$d/$1 - dst=$RPM_BUILD_ROOT$2 - - %__install -d -m755 $(dirname "$dst") - sed -e 's!^$#?LogFile $.*!\1%logfile!g; - s!^#?$LocalSocket $.*!\1%rundir/clamd.sock!g; - s!^#?$PidFile $.*!\1%rundir/clamd.pid!g; - s!<SERVICE>!%service!g; - s!<USER>!%username!g;' "$src" >"$dst" - chmod --reference "$src" "$dst" -} - -subst clamd.conf %conffile -subst clamd.logrotate %_sysconfdir/logrotate.d/clamd.%service - -%if 0%{!?_without_sysv:1} -subst clamd.sysconfig %_sysconfdir/sysconfig/clamd.%service -subst clamd.init %_initrddir/clamd.%service -%endif - -ln -s clamd $RPM_BUILD_ROOT%_sbindir/clamd.%service - -touch $RPM_BUILD_ROOT%logfile -touch $RPM_BUILD_ROOT%rundir/clamd.sock - -%if 0%{!?_without_minit:1} -ln -s %_sbindir/clamd.%service $RPM_BUILD_ROOT%minitsvcdir/run -touch $RPM_BUILD_ROOT%minitsvcdir/respawn -cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params --c -%conffile -EOF -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - - -%triggerin minit -- %baseservice -minit-svc add services/clamd.%service services/%baseservice/ - -%triggerun minit -- %baseservice -test "$1" != 0 -a "$2" != 0 || \ - minit-svc del services/clamd.%service services/%baseservice/ - - -%post minit -d=$(mktemp /tmp/clamd.%service.XXXXXX) -sed -e 's!^#Foreground!Foreground!' "%conffile" >"$d" -grep -q '^Foreground' $d || echo 'Foreground' >>$d -cmp -s "$d" %conffile || cat "$d" >"%conffile" -rm -f "$d" - -%post sysv -d=$(mktemp /tmp/clamd.%service.XXXXXX) -sed -e 's!^Foreground!#Foreground!' "%conffile" >"$d" -cmp -s "$d" %conffile || cat "$d" >"%conffile" -rm -f "$d" - -%__chkconfig --add %name - - -%preun sysv -test "$1" != 0 || %__chkconfig --del %name - -XEOFX -} - - -function rpm.genFiles -{ - cat <<"EOF" -%files -%defattr(-,root,root,-) -%doc -%config(noreplace) %verify(not size md5 mtime) %attr(0620,root,%username) %logfile -%config(noreplace) %verify(not mtime) %conffile -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/clamd.%service -%_sbindir/clamd.%service -%dir %attr(0700,%username,root) %rundir -%ghost %rundir/clamd.sock - - -%if 0%{!?_without_sysv:1} -%files sysv -%defattr(-,root,root,-) -%config %verify(not mtime) %_initrddir/clamd.%service -%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamd.%service -%endif - - -%if 0%{!?_without_minit:1} -%files minit -%defattr(-,root,root,-) -%dir %minitsvcdir -%config(noreplace) %verify(not mtime) %minitsvcdir/params -%config %minitsvcdir/run - %minitsvcdir/respawn -%endif -EOF -} - - -SERVICE= -VERSION= -RELEASE= -LICENSE= -USERNAME= -tmp=$(getopt -o '' --long service:,version:,release:,license:,username:,help -n "$0" -- "$@") || exit 1 -eval set -- "$tmp" - -while true; do - case "$1" in - (--help) showHelp $0;; - (--service) SERVICE=$2; shift;; - (--version) VERSION=$2; shift;; - (--release) RELEASE=$2; shift;; - (--license) LICENSE=$2; shift;; - (--username) USERNAME=$2; shift;; - (--) shift; break;; - esac - shift -done - -for i in SERVICE VERSION RELEASE LICENSE USERNAME; do - eval tmp=\$${i} - test "$tmp" || { - echo $"No value for $i specified; assuming @${i}@" >&2; - eval $i=@${i}@; - } -done - - -rpm.generatePreamble -rpm.generateHeader -rpm.genBody -rpm.genFiles diff --git a/clamd-wrapper b/clamd-wrapper deleted file mode 100644 index ec785d0..0000000 --- a/clamd-wrapper +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash -# -# Xchkconfig: - 75 25 -# Xdescription: The clamd daemon listens for incoming connections on \ -# Unix or TCP socket and scans files or directories on demand. - -test "$CLAMD_SERVICE" || { - echo $"*** $0 can not be called in this way" - echo $"*** Please see /usr/share/doc/clamav-server-*/README how" - echo $"*** the clamav-server can be configured" - exit 6 -} - -# Source function library. -. /etc/init.d/functions - -# Get config. -test -r /etc/sysconfig/network && . /etc/sysconfig/network - -# Check that networking is up. -test "$NETWORKING" != "no" || exit 6 - -lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} -sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} -procname=clamd.${CLAMD_SERVICE} - -CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -CLAMD_OPTIONS= -CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid -## backward-compatibility check... -for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do - CLAMD_SOCKET=$i - test ! -e "$i" || break -done -test -f "$sysconffile" && . "$sysconffile" - - -RETVAL=0 -prog="clamd.${CLAMD_SERVICE}" - -start () { - echo -n $"Starting $prog: " - daemon --pidfile=${CLAMD_PIDFILE} \ - exec -a $procname /usr/sbin/clamd \ - ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop () { - echo -n $"Stopping $prog: " - killproc -p ${CLAMD_PIDFILE} $procname - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -reload() { - rc=0 - echo -n $"Reloading $prog: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? - echo - echo -n $"Loading new virus-database: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? - echo - return $rc -} - -restart () { - stop - start -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 ;; - status) - status -p ${CLAMD_PIDFILE} $procname ;; - condrestart) - test ! -f $lockfile || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 2 -esac diff --git a/clamd.SERVICE.init b/clamd.SERVICE.init deleted file mode 100644 index 9681351..0000000 --- a/clamd.SERVICE.init +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 75 25 -# description: The clamd server running for <SERVICE> - -CLAMD_SERVICE=<SERVICE> -. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate deleted file mode 100644 index 0b0b531..0000000 --- a/clamd.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/clamd.<SERVICE> { - monthly - notifempty - missingok - - postrotate - killall -HUP clamd.<SERVICE> 2>/dev/null || : - endscript -} diff --git a/clamd.scan.upstart b/clamd.scan.upstart deleted file mode 100644 index b6280f5..0000000 --- a/clamd.scan.upstart +++ /dev/null @@ -1,14 +0,0 @@ -### Uncomment these lines when you want clamd.scan to be a scanner -### for a locally running clamav-milter -#start on starting clamav-milter - -### Uncomment these lines when you want clamd.scan to be a generic -### scanner service -#start on starting local - -stop on runlevel 0 -stop on runlevel 1 -stop on runlevel 6 - -respawn -exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes diff --git a/clamd.sysconfig b/clamd.sysconfig deleted file mode 100644 index 4933e7e..0000000 --- a/clamd.sysconfig +++ /dev/null @@ -1,3 +0,0 @@ -#CLAMD_CONFIGFILE=/etc/clamd.d/<SERVICE>.conf -#CLAMD_SOCKET=/var/run/clamd.<SERVICE>/clamd.sock -#CLAMD_OPTIONS= diff --git a/freshclam-sleep b/freshclam-sleep deleted file mode 100755 index 7bdcf78..0000000 --- a/freshclam-sleep +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/bash -# Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -FRESHCLAM_MOD=$[ 3*60 ] # 3 hours - -f=/etc/sysconfig/freshclam -test ! -e "$f" || . "$f" - - -case x"$1" in - (xnow) FRESHCLAM_DELAY=0;; - (x|xrandom) : ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};; - (*) FRESHCLAM_DELAY=$1;; -esac - -set -e - -case $FRESHCLAM_DELAY in - (disabled-warn) - echo $"\ -WARNING: update of clamav database is disabled; please see - '$f' - for information how to enable the periodic update resp. how to turn - off this message." >&2 - exit 1 - ;; - - (disabled) - exit 0 - ;; - - (*) - let FRESHCLAM_MOD*=60 - sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] - ;; -esac - - -/usr/bin/freshclam --quiet && { - test -x /usr/sbin/clamav-notify-servers && \ - exec /usr/sbin/clamav-notify-servers || \ - : -} diff --git a/freshclam.sysconfig b/freshclam.sysconfig deleted file mode 100644 index 94035f8..0000000 --- a/freshclam.sysconfig +++ /dev/null @@ -1,24 +0,0 @@ -## When changing the periodicity of freshclam runs in the crontab, -## this value must be adjusted also. Its value is the timespan between -## two subsequent freshclam runs in minutes. E.g. for the default -## -## | 0 */3 * * * ... -## -## crontab line, the value is 180 (minutes). -# FRESHCLAM_MOD= - -## A predefined value for the delay in seconds. By default, the value is -## calculated by the 'hostid' program. This predefined value guarantees -## constant timespans of 3 hours between two subsequent freshclam runs. -## -## This option accepts two special values: -## 'disabled-warn' ... disables the automatic freshclam update and -## gives out a warning -## 'disabled' ... disables the automatic freshclam silently -# FRESHCLAM_DELAY= - - -### !!!!! REMOVE ME !!!!!! -### REMOVE ME: By default, the freshclam update is disabled to avoid -### REMOVE ME: network access without prior activation -FRESHCLAM_DELAY=disabled-warn # REMOVE ME diff --git a/lastver b/lastver deleted file mode 100644 index 4d8fc8c..0000000 --- a/lastver +++ /dev/null @@ -1 +0,0 @@ -0.95.3 diff --git a/sources b/sources index 898c137..70d67b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a76425f5cffb9973d6ee45580dc2094 clamav-0.95.3-norar.tar.bz2 +44e7df79718d104db0666d5db3f08682 clamav-0.97-clean.tar.bz2 diff --git a/verinfo b/verinfo deleted file mode 100644 index 814d953..0000000 --- a/verinfo +++ /dev/null @@ -1,2 +0,0 @@ -http://sourceforge.net/project/showfiles.php?group_id=86638&package_id=90197 -clamav-([0-9.-]*?)\.tar\. commit a58de3534bdbfcf065092de38967589e296c80b0 Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Wed Jul 28 11:45:26 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5b7c836..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -clamav-0.95.3-norar.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5b7c836 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +clamav-0.95.3-norar.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 4a3ae71..0000000 --- a/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Makefile for source rpm: clamav -NAME := clamav -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) - - -# can not use final tarball name here as it will conflict with rules -# within Makefile.common -TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp -TARBALL = ${NAME}-${VERSION}.tar.gz - -clean-sources: ${TARBALL_CLEAN} - -${TARBALL_CLEAN}: ${TARBALL} - rm -f $@.tmp - zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp - mv $@.tmp $@ diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 commit 0909a88ae9e869be8c375d52a412f21d4e70ff8a Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Wed Jul 28 11:45:04 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index c07be39..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -clamav-0.95.1-norar.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c07be39 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +clamav-0.95.1-norar.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index eea4c6f..0000000 --- a/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# Makefile for source rpm: clamav -# $Id$ -NAME := clamav -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) - - -# can not use final tarball name here as it will conflict with rules -# within Makefile.common -TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp -TARBALL = ${NAME}-${VERSION}.tar.gz - -clean-sources: ${TARBALL_CLEAN} - -${TARBALL_CLEAN}: ${TARBALL} - rm -f $@.tmp - zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp - mv $@.tmp $@ diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 commit 7c49c405c76a391d8f3bd861380768224f6d6443 Author: Dennis Gilmore <ausil(a)fedoraproject.org> Date: Sat May 8 01:45:25 2010 +0000 Initialize branch EL-6 for clamav diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 commit 672986e1a1820dfcf501808eb7af818f2430063c Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Thu Nov 26 01:29:38 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index 2cc62a7..eea4c6f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := clamav SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit 45d3d6a99cdfb183c8743a9637160afecef8fd02 Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Thu Nov 26 01:29:38 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index ed9c5e4..4a3ae71 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ NAME := clamav SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit 42e3c91be468fd3efce34f772fc8ac585e860a3b Author: ensc <ensc(a)fedoraproject.org> Date: Sun Nov 22 10:47:16 2009 +0000 removed stanza from upstart script which waited for 'starting\ XXX'; wrongly named upstart events have been fixed in recent initscripts (#501155) diff --git a/README.fedora b/README.fedora index 4f12058..8df192d 100644 --- a/README.fedora +++ b/README.fedora @@ -67,12 +67,11 @@ B) On the clamav-milter host (assumed hostname 'host-milter') and all the other options which are required on your system - 3. Edit /etc/event.d/clamav-milter and uncomment the both + 3. Edit /etc/event.d/clamav-milter and uncomment the - | start on starting\ local | start on starting local - lines. Restart your system or execute + line. Restart your system or execute | initctl emit starting local @@ -98,12 +97,11 @@ C) On the clamav-scanner host (assumed hostname 'host-scanner') comment out possible 'LocalSocket' lines and set all the other options which are required on your system - 3. Edit /etc/event.d/clamav-scanner and uncomment the both + 3. Edit /etc/event.d/clamav-scanner and uncomment the - | start on starting\ local | start on starting local - lines. Restart your system or execute + line. Restart your system or execute | initctl emit starting local diff --git a/clamav-milter.upstart b/clamav-milter.upstart index 165829e..e0a63f2 100644 --- a/clamav-milter.upstart +++ b/clamav-milter.upstart @@ -1,14 +1,10 @@ - ### Uncomment these lines when you want clamav-milter to be a milter ### for a locally running MTA -#start on starting\ sendmail #start on starting sendmail -#start on starting\ postfix #start on starting postfix ### Uncomment these lines when you want clamav-milter to be a milter ### for a remotely running MTA -#start on starting\ local #start on starting local stop on runlevel 0 diff --git a/clamd.scan.upstart b/clamd.scan.upstart index 6c769e0..b6280f5 100644 --- a/clamd.scan.upstart +++ b/clamd.scan.upstart @@ -4,7 +4,6 @@ ### Uncomment these lines when you want clamd.scan to be a generic ### scanner service -#start on starting\ local #start on starting local stop on runlevel 0 commit 46fb0b613780cb65be722bfed8039b10f3c0cb05 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Nov 21 20:20:43 2009 +0000 - adjusted chkconfig positions for clamav-milter (#530101) diff --git a/clamav-milter.sysv b/clamav-milter.sysv index 693d4ee..170cdc1 100644 --- a/clamav-milter.sysv +++ b/clamav-milter.sysv @@ -2,7 +2,7 @@ # # clamav-milter Starts/stop the "clamav-milter" daemon # -# chkconfig: - 99 1 +# chkconfig: - 79 21 # description: A virus scanning milter # Source function library. diff --git a/clamav.spec b/clamav.spec index 4875437..88935d7 100644 --- a/clamav.spec +++ b/clamav.spec @@ -696,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) + * Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1200 - updated to 0.95.3 commit 71bd83f9182d730978dfbbd9b2e8d9fab7db70a2 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Oct 29 09:10:29 2009 +0000 updated to 0.95.3 diff --git a/.cvsignore b/.cvsignore index e2c64e0..5b7c836 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95.2-norar.tar.bz2 +clamav-0.95.3-norar.tar.bz2 diff --git a/clamav-0.95.3-umask.patch b/clamav-0.95.3-umask.patch new file mode 100644 index 0000000..220f7ab --- /dev/null +++ b/clamav-0.95.3-umask.patch @@ -0,0 +1,39 @@ +Index: clamav-0.95.3/clamav-milter/clamav-milter.c +=================================================================== +--- clamav-0.95.3.orig/clamav-milter/clamav-milter.c ++++ clamav-0.95.3/clamav-milter/clamav-milter.c +@@ -306,7 +306,7 @@ int main(int argc, char **argv) { + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0002); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +Index: clamav-0.95.3/shared/output.c +=================================================================== +--- clamav-0.95.3.orig/shared/output.c ++++ clamav-0.95.3/shared/output.c +@@ -270,7 +270,7 @@ int logg(const char *str, ...) + #endif + if(logg_file) { + if(!logg_fp) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +Index: clamav-0.95.3/freshclam/freshclam.c +=================================================================== +--- clamav-0.95.3.orig/freshclam/freshclam.c ++++ clamav-0.95.3/freshclam/freshclam.c +@@ -102,7 +102,7 @@ static void writepid(const char *pidfile + { + FILE *fd; + int old_umask; +- old_umask = umask(0006); ++ old_umask = umask(0022); + if((fd = fopen(pidfile, "w")) == NULL) { + logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); + } else { diff --git a/clamav-0.95rc1-umask.patch b/clamav-0.95rc1-umask.patch deleted file mode 100644 index 8a46216..0000000 --- a/clamav-0.95rc1-umask.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: clamav-0.95rc1/clamav-milter/clamav-milter.c -=================================================================== ---- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c -+++ clamav-0.95rc1/clamav-milter/clamav-milter.c -@@ -287,7 +287,7 @@ int main(int argc, char **argv) { - - if((opt = optget(opts, "PidFile"))->enabled) { - FILE *fd; -- mode_t old_umask = umask(0006); -+ mode_t old_umask = umask(0022); - - if((fd = fopen(opt->strarg, "w")) == NULL) { - logg("!Can't save PID in file %s\n", opt->strarg); -Index: clamav-0.95rc1/shared/output.c -=================================================================== ---- clamav-0.95rc1.orig/shared/output.c -+++ clamav-0.95rc1/shared/output.c -@@ -250,7 +250,7 @@ int logg(const char *str, ...) - #endif - if(logg_file) { - if(!logg_fp) { -- old_umask = umask(0037); -+ old_umask = umask(0077); - if((logg_fp = fopen(logg_file, "at")) == NULL) { - umask(old_umask); - #ifdef CL_THREAD_SAFE -Index: clamav-0.95rc1/freshclam/freshclam.c -=================================================================== ---- clamav-0.95rc1.orig/freshclam/freshclam.c -+++ clamav-0.95rc1/freshclam/freshclam.c -@@ -102,7 +102,7 @@ static void writepid(const char *pidfile - { - FILE *fd; - int old_umask; -- old_umask = umask(0006); -+ old_umask = umask(0022); - if((fd = fopen(pidfile, "w")) == NULL) { - logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); - } else { diff --git a/clamav.spec b/clamav.spec index f8e774c..4875437 100644 --- a/clamav.spec +++ b/clamav.spec @@ -23,8 +23,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.95.2 -Release: %release_func 5%{?snapshot:.%snapshot} +Version: 0.95.3 +Release: %release_func 1200%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -49,7 +49,7 @@ Source8: clamav-notify-servers Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95rc1-umask.patch +Patch27: clamav-0.95.3-umask.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -696,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1200 +- updated to 0.95.3 + * Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - conditionalized build of noarch subpackages to ease packaging under RHEL5 diff --git a/lastver b/lastver index e7f6f8b..4d8fc8c 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.95.2 +0.95.3 diff --git a/sources b/sources index 5744218..898c137 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -377aed737db63d902e641be8d923cda9 clamav-0.95.2-norar.tar.bz2 +7a76425f5cffb9973d6ee45580dc2094 clamav-0.95.3-norar.tar.bz2 commit a5349bae95013a679d45818025d52f560ce2ce4d Author: ensc <ensc(a)fedoraproject.org> Date: Sun Sep 13 13:43:34 2009 +0000 - conditionalized build of noarch subpackages diff --git a/clamav.spec b/clamav.spec index c070641..f8e774c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,9 +1,10 @@ #global snapshot rc1 ## Fedora Extras specific customization below... -%bcond_without fedora +%bcond_without fedora %bcond_without upstart %bcond_with unrar +%bcond_without noarch ## %global username clamupdate @@ -17,6 +18,7 @@ %global scanuser clamscan %global scanstatedir %_var/run/clamd.scan +%{?with_noarch:%global noarch BuildArch: noarch} %{!?release_func:%global release_func() %1%{?dist}} Summary: End-user tools for the Clam Antivirus scanner @@ -31,7 +33,7 @@ URL: http://www.clamav.net Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… %else -# Unfortunately, clamav includes support for RAR v3, derived from GPL +# Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by # make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] @@ -59,13 +61,13 @@ BuildRequires: bc %package filesystem Summary: Filesystem structure for clamav Group: Applications/File -BuildArch: noarch Provides: user(%username) = 4 Provides: group(%username) = 4 # Prevent version mix Conflicts: %name < %version-%release Conflicts: %name > %version-%release BuildRequires: fedora-usermgmt-devel +%{?noarch} %{?FE_USERADD_REQ} %package lib @@ -85,20 +87,20 @@ Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -BuildArch: noarch Requires(pre): clamav-filesystem = %version-%release Requires(postun): clamav-filesystem = %version-%release Provides: data(clamav) = full Conflicts: data(clamav) < full Conflicts: data(clamav) > full +%{?noarch} %package data-empty Summary: Empty data package for the Clam Antivirus scanner Group: Applications/File -BuildArch: noarch Provides: data(clamav) = empty Conflicts: data(clamav) < empty Conflicts: data(clamav) > empty +%{?noarch} %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -122,28 +124,27 @@ Requires: clamav-lib = %version-%release %package server-sysvinit Summary: SysV initscripts for clamav server Group: System Environment/Daemons -BuildArch: noarch Provides: init(clamav-server) = sysv Requires: clamav-server = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir Provides: clamav-server-sysv = %version-%release Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} %package scanner Summary: Clamav scanner daemon Group: System Environment/Daemons -BuildArch: noarch Requires: init(clamav-scanner) Provides: user(%scanuser) = 49 Provides: group(%scanuser) = 49 Requires: clamav-server = %version-%release +%{?noarch} %package scanner-sysvinit Summary: SysV initscripts for clamav scanner daemon Group: System Environment/Daemons -BuildArch: noarch Provides: init(clamav-scanner) = sysv Requires: clamav-server-sysvinit = %version-%release Requires: clamav-scanner = %version-%release @@ -151,18 +152,19 @@ Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts +%{?noarch} %package scanner-upstart Summary: Upstart initscripts for clamav scanner daemon Group: System Environment/Daemons -BuildArch: noarch Source410: clamd.scan.upstart Provides: init(clamav-scanner) = upstart Requires: clamav-scanner = %version-%release # implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d +Requires(pre): /etc/event.d Requires(post): /usr/bin/killall Requires(postun): /sbin/initctl +%{?noarch} %package milter @@ -188,7 +190,6 @@ Obsoletes: clamav-milter-sendmail < %version-%release %package milter-sysvinit Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons -BuildArch: noarch Source320: clamav-milter.sysv Provides: init(clamav-milter) = sysvinit Requires: clamav-milter = %version-%release @@ -200,18 +201,19 @@ Requires(post): chkconfig Requires(preun): chkconfig initscripts Provides: clamav-milter-sysv = %version-%release Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} %package milter-upstart Summary: Upstart initscripts for the clamav sendmail-milter Group: System Environment/Daemons -BuildArch: noarch Source310: clamav-milter.upstart Provides: init(clamav-milter) = upstart Requires: clamav-milter = %version-%release # implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d +Requires(pre): /etc/event.d Requires(post): /usr/bin/killall Requires(postun): /sbin/initctl +%{?noarch} %description @@ -356,7 +358,7 @@ export have_cv_ipv6=yes # build with --as-needed and disable rpath sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ libtool @@ -406,10 +408,10 @@ mkdir _doc_server install -m644 -p %SOURCE2 _doc_server/clamd.sysconfig install -m644 -p %SOURCE3 _doc_server/clamd.logrotate install -m755 -p %SOURCE7 _doc_server/clamd.init -install -m644 -p %SOURCE5 _doc_server/README +install -m644 -p %SOURCE5 _doc_server/README install -m644 -p etc/clamd.conf _doc_server/clamd.conf -install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir +install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper @@ -473,7 +475,7 @@ rm -rf "$RPM_BUILD_ROOT" %triggerprein filesystem -- clamav-filesystem < 0.96 ## REMOVE me in F14 or F15 (added in pre F12) -! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { +! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { /usr/sbin/usermod -l %username clamav || : /usr/sbin/groupmod -n %username clamav || : logger -t rpm/clamav "Renamed clamav user+group to %username" || : @@ -694,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + * Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 - modified freshclam configuration to log by syslog by default - disabled LocalSocket option in sample configuration @@ -811,7 +816,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of +- remove RAR decompression code from source tarball because of legal problems (resolves 334371) - correct license tag @@ -838,7 +843,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : in FC6- and F7+ * Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 * Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 - BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' commit 97fc8d8d655604267f6afec2800848c279e98b0b Author: ensc <ensc(a)fedoraproject.org> Date: Sun Aug 9 11:25:35 2009 +0000 - modified freshclam configuration to log by syslog by default - disabled LocalSocket option in sample configuration - fixed clamav-milter sysv initscript to use bash interpreter and to be disabled by default diff --git a/clamav-milter.sysv b/clamav-milter.sysv index c0fad96..693d4ee 100644 --- a/clamav-milter.sysv +++ b/clamav-milter.sysv @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # # clamav-milter Starts/stop the "clamav-milter" daemon # -# chkconfig: 345 99 1 +# chkconfig: - 99 1 # description: A virus scanning milter # Source function library. diff --git a/clamav.spec b/clamav.spec index 4452722..c070641 100644 --- a/clamav.spec +++ b/clamav.spec @@ -321,15 +321,18 @@ mkdir -p libclamunrar{,_iface} %{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} sed -ri \ - -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ -e 's!^#?(User ).*!\1<USER>!g' \ -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ -e 's! /usr/local/share/clamav,! %homedir,!g' \ etc/clamd.conf -sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf +sed -ri \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf ## ------------------------------------------------------------ @@ -468,7 +471,7 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ -%triggerprein filesystem -- clamav-filesystem < 0.95.2-3 +%triggerprein filesystem -- clamav-filesystem < 0.96 ## REMOVE me in F14 or F15 (added in pre F12) ! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { /usr/sbin/usermod -l %username clamav || : @@ -691,6 +694,12 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + * Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 - renamed 'clamav' user/group to 'clamupdate' - add the '%milteruser' user to the '%scanuser' group when the -scanner commit f7479cda344719b4f462fd6efccdbdae5194e7bd Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 8 13:33:12 2009 +0000 - renamed 'clamav' user/group to 'clamupdate' - add the '%milteruser' user to the '%scanuser' group when the -scanner subpackage is installed diff --git a/clamav.spec b/clamav.spec index 2408882..4452722 100644 --- a/clamav.spec +++ b/clamav.spec @@ -6,7 +6,7 @@ %bcond_with unrar ## -%global username clamav +%global username clamupdate %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log %global milteruser clamilt @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.2 -Release: %release_func 2%{?snapshot:.%snapshot} +Release: %release_func 5%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -110,7 +110,7 @@ Requires: clamav-filesystem = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod -Requires(post): group(clamav) +Requires(post): group(%username) %package server Summary: Clam Antivirus scanner server @@ -344,8 +344,13 @@ export have_cv_ipv6=yes %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --enable-milter --disable-static \ --disable-rpath \ + --with-user=%username \ + --with-group=%username \ %{!?with_unrar:--disable-unrar} +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + # build with --as-needed and disable rpath sed -i \ -e 's! -shared ! -Wl,--as-needed\0!g' \ @@ -463,6 +468,14 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ +%triggerprein filesystem -- clamav-filesystem < 0.95.2-3 +## REMOVE me in F14 or F15 (added in pre F12) +! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { + /usr/sbin/usermod -l %username clamav || : + /usr/sbin/groupmod -n %username clamav || : + logger -t rpm/clamav "Renamed clamav user+group to %username" || : +} + %pre filesystem %__fe_groupadd 4 -r %username &>/dev/null || : %__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ @@ -509,6 +522,12 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/usermod -a -G %scanuser %milteruser &>/dev/null || : + %pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ @@ -672,6 +691,11 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + * Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild commit 9101729e44ad27862d4ee94d199a5fda9f737316 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 1 09:44:42 2009 +0000 fixed inconsistencies added EXAMPLE section for milter setup diff --git a/README.fedora b/README.fedora index 603526c..4f12058 100644 --- a/README.fedora +++ b/README.fedora @@ -29,10 +29,10 @@ A clamav-milter setup consists of the following three components: --> you should know how to install this... When communicating across unix sockets with the clamav-milter, it is - suggested to use the /var/run/clamav-milter/clamav.sock path. You - have to add something like + suggested to use the /var/run/clamav-milter/clamav-milter.socket + path. You have to add something like - INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav-milter.socket, F=, T=S:4m;R:4m')dnl to your sendmail.mc. @@ -40,3 +40,79 @@ A clamav-milter setup consists of the following three components: It is suggested that components communicate through TCP sockets as this eases setup. Please add corresponding packet filter rules! + + +EXAMPLE +======= + +For clamav-milter, a possible setup might be created by + +A) On the MTA (assumed hostname 'host-mta') + + 1. Add to sendmail.mc + + | INPUT_MAIL_FILTER(`clamav', `S=inet:6666@host-milter, F=, T=S:4m;R:4m')dnl + + 2. Rebuild sendmail.cf + + +B) On the clamav-milter host (assumed hostname 'host-milter') + + 1. Install clamav-milter + clamav-milter-upstart packages + + 2. Set in /etc/mail/clamav-milter.conf + + | MilterSocket inet:6666 + | ClamdSocket tcp:host-scanner:6665 + + and all the other options which are required on your system + + 3. Edit /etc/event.d/clamav-milter and uncomment the both + + | start on starting\ local + | start on starting local + + lines. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cmilt + | iptables -A IN-cmilt -s host-mta -j ACCEPT + | iptables -A IN-cmilt -j DROP + + | iptables -A INPUT -p tcp --dport 6666 -j IN-cmilt + + to your firewall setup + +C) On the clamav-scanner host (assumed hostname 'host-scanner') + + 1. Install clamav-scanner + clamav-scanner-upstart packages + + 2. Add to /etc/clamd.d/scan.conf + + | TCPSocket 6665 + | TCPAddr host-scanner + + comment out possible 'LocalSocket' lines and set all the other + options which are required on your system + + 3. Edit /etc/event.d/clamav-scanner and uncomment the both + + | start on starting\ local + | start on starting local + + lines. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cscan + | iptables -A IN-cscan -s host-milter -j ACCEPT + | iptables -A IN-cscan -j DROP + + | iptables -A INPUT -p tcp --dport 6665 -j IN-csan + + to your firewall setup commit f2505c3d26166d5c9d500c56f8fc5fbbc7ad0c85 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Fri Jul 24 19:00:16 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/clamav.spec b/clamav.spec index 9961085..2408882 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.2 -Release: %release_func 1%{?snapshot:.%snapshot} +Release: %release_func 2%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -672,6 +672,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 - updated to 0.95.2 commit 589fdb228f2fc67231de9a3a0203433b1e881f46 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jun 11 07:27:31 2009 +0000 updated diff --git a/.cvsignore b/.cvsignore index c07be39..e2c64e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95.1-norar.tar.bz2 +clamav-0.95.2-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index be9a21f..9961085 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.95.1 -Release: %release_func 3%{?snapshot:.%snapshot} +Version: 0.95.2 +Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -672,6 +672,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + * Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 - fixed '--without upstart' operation diff --git a/lastver b/lastver index fd6d73e..e7f6f8b 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.95 +0.95.2 diff --git a/sources b/sources index acd143c..5744218 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ddd9f341dd0299a6bc5398ee26f4ebf clamav-0.95.1-norar.tar.bz2 +377aed737db63d902e641be8d923cda9 clamav-0.95.2-norar.tar.bz2 commit a4b44dcd073a0a23591471fcd66b03a3263b580a Author: ensc <ensc(a)fedoraproject.org> Date: Sun Apr 19 10:31:25 2009 +0000 fixed '--without upstart' operation diff --git a/clamav.spec b/clamav.spec index e56399f..be9a21f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.1 -Release: %release_func 2%{?snapshot:.%snapshot} +Release: %release_func 3%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -454,7 +454,7 @@ install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} -%{!?with_upstart:rm -rf %_sysconfdir/event.d} +%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/event.d} ## ------------------------------------------------------------ @@ -672,6 +672,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + * Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 - added '%%bcond_without upstart' conditional to ease skipping of -upstart subpackage creation e.g. on EL5 systems commit f3bc46b75404e44c1b18aa0710782d298871e8a5 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Apr 15 14:14:27 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index 2daad57..e56399f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -2,6 +2,7 @@ ## Fedora Extras specific customization below... %bcond_without fedora +%bcond_without upstart %bcond_with unrar ## @@ -21,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.1 -Release: %release_func 1%{?snapshot:.%snapshot} +Release: %release_func 2%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -197,8 +198,8 @@ Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts -Provides: milter-sysv = %version-%release -Obsoletes: milter-sysv < %version-%release +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release %package milter-upstart Summary: Upstart initscripts for the clamav sendmail-milter @@ -453,6 +454,7 @@ install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} +%{!?with_upstart:rm -rf %_sysconfdir/event.d} ## ------------------------------------------------------------ @@ -640,9 +642,11 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %files scanner-sysvinit %attr(0755,root,root) %config %_initrddir/clamd.scan +%if 0%{?with_upstart:1} %files scanner-upstart %defattr(-,root,root,-) %config(noreplace) %_sysconfdir/event.d/clamd.scan +%endif ## ----------------------- @@ -660,12 +664,20 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %defattr(-,root,root,-) %config %_initrddir/clamav-milter +%if 0%{?with_upstart:1} %files milter-upstart %defattr(-,root,root,-) %config(noreplace) %_sysconfdir/event.d/clamav-milter +%endif %changelog +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + * Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 - Upgrade to 0.95.1 (#495039) commit fa9656200e23fc036ec7e31084e5b111e070e32e Author: Robert Scheck <robert(a)fedoraproject.org> Date: Fri Apr 10 21:10:04 2009 +0000 - Upgrade to 0.95.1 (#495036, #495039) and enabled IPv6 support - Fixed typo in SysV initscript which removes 'touch' file (#473513) - Added build requirement to ncurses-devel for clamdtop diff --git a/.cvsignore b/.cvsignore index 336c23f..c07be39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.2-norar.tar.bz2 +clamav-0.95.1-norar.tar.bz2 diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch deleted file mode 100644 index 66b662e..0000000 --- a/clamav-0.90rc3-private.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 -+++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 -@@ -6,6 +6,6 @@ - Name: libclamav - Description: A GPL virus scanner - Version: @LIBCLAMAV_VERSION@ --Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -- -+Libs: -L${libdir} -lclamav -+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ -+Cflags: -I${includedir} ---- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 -+++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 -@@ -55,11 +55,11 @@ - ;; - - --cflags) -- echo -I@includedir@ @CFLAGS@ -+ echo -I@includedir@ - ;; - - --libs) -- echo -L@libdir@ @LIBCLAMAV_LIBS@ -+ echo -L@libdir@ -lclamav - ;; - - *) diff --git a/clamav-0.92-private.patch b/clamav-0.92-private.patch new file mode 100644 index 0000000..bab2948 --- /dev/null +++ b/clamav-0.92-private.patch @@ -0,0 +1,29 @@ +--- clamav-0.92/libclamav.pc.in.private ++++ clamav-0.92/libclamav.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.92/clamav-config.in.private ++++ clamav-0.92/clamav-config.in +@@ -54,12 +54,8 @@ while test $# -gt 0; do + usage 0 + ;; + +- --cflags) +- echo -I@includedir@ @CFLAGS@ +- ;; +- +- --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ (--cflags|--libs) ++ ${PKG_CONFIG:-pkg-config} "$1" libclamav + ;; + + *) diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch deleted file mode 100644 index 4f1872c..0000000 --- a/clamav-0.93.1-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path -+++ clamav-0.93.1/contrib/init/RedHat/clamav-milter -@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -87,7 +86,7 @@ case "$1" in - restart - ;; - condrestart) -- test -f ${lockfile} && $0 restart || : -+ test -f ${lockfile} && restart || : - ;; - status) - if [ ! -z $pidfile ]; then diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch deleted file mode 100644 index 899d32b..0000000 --- a/clamav-0.93.3-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff -+++ clamav-0.93.3/contrib/init/RedHat/clamav-milter -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes \ - # email messages for virus scanning with ClamAV diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch deleted file mode 100644 index de29887..0000000 --- a/clamav-0.93.3-pid.patch +++ /dev/null @@ -1,17 +0,0 @@ -Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora -initscripts do not support killing of whole processgroups. Hence, disable -feature which posts negative pgrp into pidfile and use plain pid instead -of. - -diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c ---- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 -+++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 -@@ -1985,7 +1985,7 @@ main(int argc, char **argv) - logg(_("!Can't save PID in file %s\n"), pidfile); - return EX_CONFIG; - } --#ifdef C_LINUX -+#if defined(C_LINUX) && 0 - /* Ensure that all threads are kill()ed */ - fprintf(fd, "-%d\n", (int)getpgrp()); - #else diff --git a/clamav-0.95-cliopts.patch b/clamav-0.95-cliopts.patch new file mode 100644 index 0000000..90d173f --- /dev/null +++ b/clamav-0.95-cliopts.patch @@ -0,0 +1,13 @@ +Index: clamav-0.95rc1/shared/optparser.c +=================================================================== +--- clamav-0.95rc1.orig/shared/optparser.c ++++ clamav-0.95rc1/shared/optparser.c +@@ -211,7 +211,7 @@ const struct clam_option clam_options[] + + { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, + +- { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, ++ { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, + + { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, + diff --git a/clamav-0.95rc1-umask.patch b/clamav-0.95rc1-umask.patch new file mode 100644 index 0000000..8a46216 --- /dev/null +++ b/clamav-0.95rc1-umask.patch @@ -0,0 +1,39 @@ +Index: clamav-0.95rc1/clamav-milter/clamav-milter.c +=================================================================== +--- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c ++++ clamav-0.95rc1/clamav-milter/clamav-milter.c +@@ -287,7 +287,7 @@ int main(int argc, char **argv) { + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0006); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +Index: clamav-0.95rc1/shared/output.c +=================================================================== +--- clamav-0.95rc1.orig/shared/output.c ++++ clamav-0.95rc1/shared/output.c +@@ -250,7 +250,7 @@ int logg(const char *str, ...) + #endif + if(logg_file) { + if(!logg_fp) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +Index: clamav-0.95rc1/freshclam/freshclam.c +=================================================================== +--- clamav-0.95rc1.orig/freshclam/freshclam.c ++++ clamav-0.95rc1/freshclam/freshclam.c +@@ -102,7 +102,7 @@ static void writepid(const char *pidfile + { + FILE *fd; + int old_umask; +- old_umask = umask(0006); ++ old_umask = umask(0022); + if((fd = fopen(pidfile, "w")) == NULL) { + logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); + } else { diff --git a/clamav-milter.sysv b/clamav-milter.sysv new file mode 100644 index 0000000..7c06c60 --- /dev/null +++ b/clamav-milter.sysv @@ -0,0 +1,103 @@ +#!/bin/sh +# +# clamav-milter This script starts and stops the clamav-milter daemon +# +# chkconfig: - 79 40 +# +# description: clamav-milter is a daemon which hooks into sendmail and routes \ +# email messages for virus scanning with ClamAV +# processname: clamav-milter +# pidfile: /var/lock/subsys/clamav-milter + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +# Local clamav-milter config +CLAMAV_FLAGS= +test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter + +# Check that networking is up. +[ ${NETWORKING} = "no" ] && exit 0 + +PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin + +RETVAL=0 + +# Clamav-milter must have write access to the pid file, /var/run is not suitable +default_pidfile= +[ -d /var/run/clamav-milter ] && default_pidfile=/var/run/clamav-milter/clamav-milter.pid +[ -d /var/clamav ] && default_pidfile=/var/clamav/clamav-milter.pid +pidfile=${PIDFILE:-$default_pidfile} + +lockfile=/var/lock/subsys/clamav-milter + +start() { + echo -n "Starting clamav-milter: " + # Don't allow files larger than 25M to be created, to limit DoS + # Needs to be large enough to extract the signature files + ulimit -f 25600 + if [ ! -z $pidfile ]; then + CLAMAV_PID=--pidfile=${pidfile} + PID=`pidofproc -p ${pidfile} clamav-milter` + else + CLAMAV_PID= + PID=`pidofproc clamav-milter` + fi + [ -n "$PID" ] && echo " already running!" && return 1 + LANG= daemon clamav-milter $CLAMAV_PID ${CLAMAV_FLAGS} + RETVAL=$? + [ ! -z $pidfile -a -f $pidfile ] && sed -i -e 's/-//' $pidfile + echo + test $RETVAL -eq 0 && touch ${lockfile} + return $RETVAL +} + +stop() { + echo -n "Shutting down clamav-milter: " + if [ ! -z $pidfile ]; then + killproc -p ${pidfile} clamav-milter + else + killproc clamav-milter + fi + RETVAL=$? + echo + test $RETVAL -eq 0 && rm -f ${lockfile} ${pidfile} +} + +restart() { + stop + start +} + +# See how we were called. +case "$1" in + start) + # Start daemon. + start + ;; + stop) + # Stop daemon. + stop + ;; + restart|reload) + restart + ;; + condrestart) + test -f ${lockfile} && restart || : + ;; + status) + if [ ! -z $pidfile ]; then + status -p ${pidfile} clamav-milter + else + status clamav-milter + fi + ;; + *) + echo "Usage: $0 {start|stop|reload|restart|condrestart|status}" + exit 1 +esac + +exit $? diff --git a/clamav.spec b/clamav.spec index 4fe1dee..3f5dea1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.2 +Version: 0.95.1 Release: %release_func 1 License: GPLv2 @@ -25,7 +25,7 @@ URL: http://www.clamav.net # incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by # make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: clamav-%{version}-norar.tar.bz2 +Source0: %name-%version-norar.tar.bz2 # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. # Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig @@ -36,15 +36,15 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.93.3-initoff.patch -Patch24: clamav-0.90rc3-private.patch +Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.93.3-pid.patch +Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95rc1-umask.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel BuildRequires: %_includedir/tcpd.h BuildRequires: bc @@ -71,6 +71,7 @@ Source100: clamd-gen Requires: clamav-lib = %version-%release Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig +Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner @@ -131,6 +132,7 @@ Requires(post): coreutils %package milter-sysv Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons +Source320: clamav-milter.sysv Provides: init(clamav-milter) = sysv Requires: clamav-milter = %version-%release Requires(post): user(%milteruser) clamav-milter @@ -229,23 +231,24 @@ The SysV initscripts for clamav-milter. %prep %setup -q -%patch21 -p1 -b .path -%patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .pid +%patch26 -p1 -b .cliopts +%patch27 -p1 -b .umask mkdir -p libclamunrar{,_iface} touch libclamunrar/{Makefile.in,all,install} -perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; - s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; - s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g; - s!^#?(User ).*!\1<USER>!g; - s! /usr/local/share/clamav,! %homedir,!g; - ' etc/clamd.conf +sed -ri \ + -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf -perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf +sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ @@ -255,12 +258,17 @@ CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' -%configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static --disable-unrar -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -# No rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes +%configure --disable-clamav --with-dbdir=/var/lib/clamav \ + --enable-milter --disable-static \ + --disable-rpath --disable-unrar + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool make %{?_smp_mflags} @@ -297,6 +305,7 @@ install -d -m755 \ rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la + touch ${RPM_BUILD_ROOT}%homedir/daily.cld touch ${RPM_BUILD_ROOT}%homedir/main.cld @@ -348,7 +357,8 @@ cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' EOF -install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog @@ -455,6 +465,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %defattr(-,%username,%username,-) %ghost %attr(0664,%username,%username) %homedir/*.cvd + ## ----------------------- %files update @@ -468,7 +479,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %config(noreplace) %_sysconfdir/sysconfig/freshclam %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog - %ghost %attr(0664,%username,%username) %homedir/*.cld @@ -495,13 +505,12 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files milter %defattr(-,root,root,-) -%doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%attr(0700,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%attr(0710,%milteruser,%milteruser) %dir %milterstatedir +%ghost %milterstatedir/* %files milter-sysv @@ -511,6 +520,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495036, #495039) and enabled IPv6 support +- Fixed typo in SysV initscript which removes 'touch' file (#473513) +- Added build requirement to ncurses-devel for clamdtop + * Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 - Upgrade to 0.94.2 (#474002) diff --git a/clamd-wrapper b/clamd-wrapper index 372005f..14c04a5 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -28,7 +28,7 @@ CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf CLAMD_OPTIONS= ## backward-compatibility check... for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do + /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do CLAMD_SOCKET=$i test ! -e "$i" || break done @@ -52,7 +52,7 @@ stop () { killproc $procname RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f touch $lockfile + [ $RETVAL -eq 0 ] && rm -f $lockfile return $RETVAL } diff --git a/sources b/sources index e115b9a..acd143c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 +0ddd9f341dd0299a6bc5398ee26f4ebf clamav-0.95.1-norar.tar.bz2 commit aef9a638f4c2b07f96790dc7e3cdd427fd67552d Author: Robert Scheck <robert(a)fedoraproject.org> Date: Fri Apr 10 20:17:31 2009 +0000 Upgrade to 0.95.1 (#495039) diff --git a/.cvsignore b/.cvsignore index 10b1622..c07be39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95-norar.tar.bz2 +clamav-0.95.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index a7b09ae..2daad57 100644 --- a/clamav.spec +++ b/clamav.spec @@ -20,7 +20,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.95 +Version: 0.95.1 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -666,6 +666,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + * Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 - updated to final 0.95 - added ncurses-devel (-> clamdtop) BR diff --git a/sources b/sources index 186409f..acd143c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6ede74787379f1683a368ee6da62cea clamav-0.95-norar.tar.bz2 +0ddd9f341dd0299a6bc5398ee26f4ebf clamav-0.95.1-norar.tar.bz2 commit 3054d5609e5b4a832d67e35d946906fbead966cf Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 25 22:03:44 2009 +0000 updated diff --git a/.cvsignore b/.cvsignore index 334ef5c..10b1622 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95rc1-norar.tar.bz2 +clamav-0.95-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index f6c79f5..a7b09ae 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -%global snapshot rc1 +#global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95 -Release: %release_func 0.1%{?snapshot:.%snapshot} +Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -51,6 +51,7 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel BuildRequires: %_includedir/tcpd.h BuildRequires: bc @@ -337,6 +338,8 @@ CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --enable-milter --disable-static \ --disable-rpath \ @@ -663,6 +666,11 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + * Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 - updated to 0.95rc1 - added -upstart subpackages diff --git a/lastver b/lastver index d89b314..fd6d73e 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.94.2 +0.95 diff --git a/sources b/sources index 5f92b5e..186409f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40d13c0d39568b17aec35fe793233861 clamav-0.95rc1-norar.tar.bz2 +f6ede74787379f1683a368ee6da62cea clamav-0.95-norar.tar.bz2 commit 5e13498992d054b9cb059fd390b3d6251426b891 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 14:49:39 2009 +0000 updated diff --git a/README.fedora b/README.fedora index d46b193..603526c 100644 --- a/README.fedora +++ b/README.fedora @@ -24,7 +24,7 @@ A clamav-milter setup consists of the following three components: -upstart requires modification of /etc/event.d/clamd.scan to enable automatic startup. See comments there for more details. -* the MDA (sendmail/postfix) +* the MTA (sendmail/postfix) --> you should know how to install this... diff --git a/clamav-milter.upstart b/clamav-milter.upstart index 12a5d0c..165829e 100644 --- a/clamav-milter.upstart +++ b/clamav-milter.upstart @@ -1,13 +1,13 @@ ### Uncomment these lines when you want clamav-milter to be a milter -### for a locally running MDA +### for a locally running MTA #start on starting\ sendmail #start on starting sendmail #start on starting\ postfix #start on starting postfix ### Uncomment these lines when you want clamav-milter to be a milter -### for a remotely running MDA +### for a remotely running MTA #start on starting\ local #start on starting local commit 8e678e525b999e5eaca946ece8e9fb67a7b0c065 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 13:24:07 2009 +0000 updated diff --git a/README.fedora b/README.fedora index b9f572e..d46b193 100644 --- a/README.fedora +++ b/README.fedora @@ -1,5 +1,42 @@ -Add +A clamav-milter setup consists of the following three components: - INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl +* the clamav-milter itself -to your sendmail.mc. + --> this is provided by the 'clamav-milter' package plus (alternatively) + 'clamav-milter-upstart' or 'clamav-milter-sysvinit' + + The main configuration is in /etc/mail/clamav-milter.conf and MUST + be changed before first use. + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamav-milter to + enable automatic startup. See comments there for more details. + +* a clamav scanner daemon + + --> this package is called 'clamav-scanner' plus (alternatively) + 'clamav-scanner-upstart' or 'clamav-scanner-sysvinit' + + The daemon is configured by /etc/clamd.d/scan.conf (which MUST be + edited before first use). + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamd.scan to enable + automatic startup. See comments there for more details. + +* the MDA (sendmail/postfix) + + --> you should know how to install this... + + When communicating across unix sockets with the clamav-milter, it is + suggested to use the /var/run/clamav-milter/clamav.sock path. You + have to add something like + + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl + + to your sendmail.mc. + + + +It is suggested that components communicate through TCP sockets as +this eases setup. Please add corresponding packet filter rules! diff --git a/clamav-0.95rc1-umask.patch b/clamav-0.95rc1-umask.patch new file mode 100644 index 0000000..8a46216 --- /dev/null +++ b/clamav-0.95rc1-umask.patch @@ -0,0 +1,39 @@ +Index: clamav-0.95rc1/clamav-milter/clamav-milter.c +=================================================================== +--- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c ++++ clamav-0.95rc1/clamav-milter/clamav-milter.c +@@ -287,7 +287,7 @@ int main(int argc, char **argv) { + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0006); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +Index: clamav-0.95rc1/shared/output.c +=================================================================== +--- clamav-0.95rc1.orig/shared/output.c ++++ clamav-0.95rc1/shared/output.c +@@ -250,7 +250,7 @@ int logg(const char *str, ...) + #endif + if(logg_file) { + if(!logg_fp) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +Index: clamav-0.95rc1/freshclam/freshclam.c +=================================================================== +--- clamav-0.95rc1.orig/freshclam/freshclam.c ++++ clamav-0.95rc1/freshclam/freshclam.c +@@ -102,7 +102,7 @@ static void writepid(const char *pidfile + { + FILE *fd; + int old_umask; +- old_umask = umask(0006); ++ old_umask = umask(0022); + if((fd = fopen(pidfile, "w")) == NULL) { + logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); + } else { diff --git a/clamav-milter.sysv b/clamav-milter.sysv index 8ff51b3..c0fad96 100644 --- a/clamav-milter.sysv +++ b/clamav-milter.sysv @@ -11,7 +11,7 @@ exec=/usr/sbin/clamav-milter prog="clamav-milter" -OPTS= +OPTS='-c /etc/mail/clamav-milter.conf' [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog pidfile=/var/run/clamav-milter/milter.pid @@ -21,8 +21,7 @@ start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " - daemon --pidfile=${pidfile} \ - $exec $OPTS --nofork=no --pid=${pidfile} && success || failure + daemon --pidfile=${pidfile} $exec $OPTS --nofork=no --pid=${pidfile} retval=$? echo [ $retval -eq 0 ] && touch $lockfile @@ -31,7 +30,7 @@ start() { stop() { echo -n $"Stopping $prog: " - killproc -o "${pidfile} $exec && success || failure + killproc -p "${pidfile}" $exec retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile @@ -53,7 +52,7 @@ force_reload() { rh_status() { # run checks to determine if the service is running or use generic status - status $prog + status -p "${pidfile}" $prog } rh_status_q() { diff --git a/clamav-milter.upstart b/clamav-milter.upstart index f211818..12a5d0c 100644 --- a/clamav-milter.upstart +++ b/clamav-milter.upstart @@ -16,4 +16,4 @@ stop on runlevel 1 stop on runlevel 6 respawn -exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter --nofork=yes +exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --nofork=yes diff --git a/clamav.spec b/clamav.spec index 8b5758c..f6c79f5 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95 -Release: %release_func 0.0.3%{?snapshot:.%snapshot} +Release: %release_func 0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File diff --git a/clamd-wrapper b/clamd-wrapper index 5baca59..ec785d0 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -42,7 +42,8 @@ prog="clamd.${CLAMD_SERVICE}" start () { echo -n $"Starting $prog: " daemon --pidfile=${CLAMD_PIDFILE} \ - $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} + exec -a $procname /usr/sbin/clamd \ + ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/clamd.scan.upstart b/clamd.scan.upstart index e96b37e..6c769e0 100644 --- a/clamd.scan.upstart +++ b/clamd.scan.upstart @@ -12,4 +12,4 @@ stop on runlevel 1 stop on runlevel 6 respawn -exec /usr/sbin/clamd -c /etc/clamd.d/clamd.scan --nofork=yes +exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes commit 9cba4633a4309d7d2b7456c54fbcf0a85fa4efb7 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 12:53:03 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index f08684d..8b5758c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -134,8 +134,8 @@ Summary: Clamav scanner daemon Group: System Environment/Daemons BuildArch: noarch Requires: init(clamav-scanner) -Provides: user(%scanuser) = 99 -Provides: group(%scanuser) = 99 +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 Requires: clamav-server = %version-%release %package scanner-sysvinit diff --git a/clamd-wrapper b/clamd-wrapper index b601cf2..5baca59 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -51,7 +51,7 @@ start () { stop () { echo -n $"Stopping $prog: " - killproc $procname + killproc -p ${CLAMD_PIDFILE} $procname RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $lockfile @@ -79,7 +79,7 @@ case "$1" in start|stop|restart|reload) $1 ;; status) - status $procname ;; + status -p ${CLAMD_PIDFILE} $procname ;; condrestart) test ! -f $lockfile || restart ;; commit 71c33552b35a0ee478fc90c5696dfd548c7c81b4 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 12:47:20 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index 941cbc9..f08684d 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95 -Release: %release_func 0.0.1%{?snapshot:.%snapshot} +Release: %release_func 0.0.3%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -46,6 +46,7 @@ Source8: clamav-notify-servers Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95rc1-umask.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -310,6 +311,7 @@ The Upstart initscripts for clamav-milter. %patch24 -p1 -b .private %patch25 -p1 -b .open %patch26 -p1 -b .cliopts +%patch27 -p1 -b .umask install -p -m0644 %SOURCE300 clamav-milter/ @@ -422,7 +424,7 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; ### The scanner stuff sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/clamd.scan + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ > $RPM_BUILD_ROOT%_initrddir/clamd.scan @@ -629,7 +631,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %files scanner %defattr(-,root,root,-) %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%config(noreplace) %_sysconfdir/clamd.d/clamd.scan +%config(noreplace) %_sysconfdir/clamd.d/scan.conf %ghost %scanstatedir/clamd.sock %files scanner-sysvinit commit 0981a17d0b3b976ba2b2a6196e1a76db59a3b54c Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 11:38:36 2009 +0000 updated diff --git a/.cvsignore b/.cvsignore index 336c23f..334ef5c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.2-norar.tar.bz2 +clamav-0.95rc1-norar.tar.bz2 diff --git a/ChangeLog-rpm.old b/ChangeLog-rpm.old new file mode 100644 index 0000000..44c8556 --- /dev/null +++ b/ChangeLog-rpm.old @@ -0,0 +1,279 @@ +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + +* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 +- updated to 0.88.6 + +* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 +- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 +- added patch to set '__attribute__ ((visibility("hidden")))' for + exported MD5_*() functions (fixes #202043) + +* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 +- splitted SysV initscripts of -milter and -server into own subpackages + +* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 +- rebuilt + +* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 +- updated to 0.88.4 (SECURITY) + +* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed the clamdscan(1) manpage from the -server subpackage + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed a superfluous '}' +- removed some code which was relevant for FC-3 only + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 +- updated to 0.88.3 +- updated to new fedora-usermgmt macros + +* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 +- cleanups: removed unneeded curlies, use plain command instead of + %%__XXX macro, whitespace cleanup, removed unneeded versioned + dependencies +- added a 'Requires(post): group(clamav)' dependencies for -update and + added the corresponding Provides: to -data +- removed the %%_without_milter conditional; you won't gain anything + when milter would be disabled at buildtime + +* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 +- updated to 0.88.2 (SECURITY) +- rediffed patches; most issues handled by 0.88.1-2 are fixed in + 0.88.2 + +* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 +- added patch which fixes some classes of compiler warnings; at least + the using of implicitly declared functions was reported to cause + segfaults on AMD64 (brought to my attention by Marc Perkel) +- added patch which fixes wrong usage of strncpy(3) in unrarlib.c + +* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 +- updated to 0.88.1 (SECURITY) + +* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 +- rebuilt for FC5 + +* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 +- updated to 0.88 +- added pseudo-versions for the 'init(...)' provides as a first step + for the support of alternative initmethods + +* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 +- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) +- ship 'clamd.conf.5' man page in the -server subpackage *too*. The + same file is contained in multiple packages now, but this man-page + can not be removed from the base package because it also applies to + 'clamdscan' there (#173221). + +* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 +- updated to 0.87.1 + +* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 +- updated to 0.87 (SECURITY) +- removed -timeout patch; it is solved upstream +- reverted the -exim changes; they add yet more complexity, their + functionality can go into an own package and they contained flaws + +* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 +- Add clamav-exim configuration package + +* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + +* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 +- updated to 0.86.2 (SECURITY) +- changed the freshclam updating mechanism (again); now, it consists + of a crontab which does not need to be changed and a helper script + (freshclam-sleep). This helper script is configured by + /etc/sysconfig/freshclam + +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 +- updated to 0.86.1 +- fixed randomization in %%post scriptlet: hour should be a range but + not a single number + +* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 +- updated to 0.86 +- randomize freshclam startup times in -update's %%post script (suggested + by Stephen Smoogen); this requires some more Requires(post): also + +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 +- fix dist tagging the way Enrico wants it + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 +- Rebuild + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 +- Update + +* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 +- updated to 0.85 + +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 +- updated to 0.84 + +* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> +- rebuilt + +* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 +- updated to 0.83 + +* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 +- updated to 0.82 +- minor spec cleanups + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 +- build the package with '--disable-zlib-vcheck' because RH is unable to + apply a fix for a 5 month old and solved security issue. Please fill + your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +- added 'BuildRequires: bc' (should work without also, but ./configure + gives out ugly warnings else) + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 +- updated to 0.81 +- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports + an internal mode now which is enabled by default +- updated -milter %%description + +* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 +- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update + subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) + +* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 +- updated to 0.80 +- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore +- buildrequire 'curl-devel' +- renamed clamav.conf to clamd.conf (upstream change) +- updated -initoff patch + +* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 +- updated to 0.75.1 +- use %%configure, the problems with the architecture specification + seem to have passed (probably because of an autoconf update) +- set mode 0600 for the cron-script (required by vixie-cron) +- made the cronjob a spambot and send mail about deactivated freshclam + service to nearly everybody... (root, postmaster, webmaster) +- other fixes in the notification cronjob + +* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 +- updated to 0.75 + +* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 +- moved /usr/bin/clamav-config from main into -devel + +* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 +- updated to 0.74 + +* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 +- updated to 0.73 +- added pkgconfig file + +* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 +- notify the user about a deactivated clamav-update service +- added clamd-gen script which generates template spec-files for + services using clamd +- copied template configuration files to %pkgdatadir/template (needed + for clamd-gen) +- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink + will be provided for compatibility reasons +- conditionalized building of the -milter subpackage ('--without + milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) + +* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 +- removed 'BuildRequires: dietlibc'; it was a leftover from the + pre-use-signal era (before 0.70) (bug #1716) + +* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 +- updated to 0.72 + +* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 +- removed the randomization in the cronjob; it seems to be impossible + to use the mod-operator (%%) there. Instead of, the user has to + replace some placeholders... + +* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 +- updated to 0.71 + +* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 +- quote 'EOF' to delay $RANDOM expansion + +* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 +- updated GECOS entry for the 'clamav' user to describe its purpose + more accurately +- use explicit '-m755' when creating directories with install + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 +- updated to 0.70; rediffed some patches +- updated logrotate script to use signals and documented the steps + which are needed to make it work +- adapted initscript to use signals instead of sockwrite +- removed sockwrite; signals can now be used to reload the database +- added logfile to the -milter subpackage + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 +- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets + +* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 +- split the double Requires(...,...): statements; see + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 +- require the recent fedora-usermgmt package (0.7) which fixes similar + ordering issues + +* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 +- updated to 0.68 (using the -1 version) +- ship milter-files in the -milter instead of the -server subpackage + +* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 +- fixed ':' vs. '.' in chown + +* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 +- randomize freshclam startup to prevent server peaks + +* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 +- updated to 0.67 (using the -1 version) + +* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 +- updated to 0.66; important, packaging-relevant changes are + freshclam: + * $http_proxy is not supported anymore; you have to configure it in + /etc/freshclam.conf + * the logfile has been renamed to /var/log/freshclam.log +- removed %%check section; buildroot check is implemented in local + testsuite already +- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew + files +- added some directory-Requires: +- activated milter-package and made it work +- added patch to disable clamav-milter service by default +- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this + makes things more consistently but can break backward compatibility. The + initscript should deal with the old version too, but I would not bet on + it... +- updated some descriptions +- fixed the update-mechanism; now it happens in two stages: at first, + the files will be downloaded as user 'clamav' and then, root initiates + the daemon-reload. + +* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 +- added security fix for + http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch deleted file mode 100644 index 4f1872c..0000000 --- a/clamav-0.93.1-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path -+++ clamav-0.93.1/contrib/init/RedHat/clamav-milter -@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -87,7 +86,7 @@ case "$1" in - restart - ;; - condrestart) -- test -f ${lockfile} && $0 restart || : -+ test -f ${lockfile} && restart || : - ;; - status) - if [ ! -z $pidfile ]; then diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch deleted file mode 100644 index 899d32b..0000000 --- a/clamav-0.93.3-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff -+++ clamav-0.93.3/contrib/init/RedHat/clamav-milter -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes \ - # email messages for virus scanning with ClamAV diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch deleted file mode 100644 index de29887..0000000 --- a/clamav-0.93.3-pid.patch +++ /dev/null @@ -1,17 +0,0 @@ -Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora -initscripts do not support killing of whole processgroups. Hence, disable -feature which posts negative pgrp into pidfile and use plain pid instead -of. - -diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c ---- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 -+++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 -@@ -1985,7 +1985,7 @@ main(int argc, char **argv) - logg(_("!Can't save PID in file %s\n"), pidfile); - return EX_CONFIG; - } --#ifdef C_LINUX -+#if defined(C_LINUX) && 0 - /* Ensure that all threads are kill()ed */ - fprintf(fd, "-%d\n", (int)getpgrp()); - #else diff --git a/clamav-0.95-cliopts.patch b/clamav-0.95-cliopts.patch new file mode 100644 index 0000000..90d173f --- /dev/null +++ b/clamav-0.95-cliopts.patch @@ -0,0 +1,13 @@ +Index: clamav-0.95rc1/shared/optparser.c +=================================================================== +--- clamav-0.95rc1.orig/shared/optparser.c ++++ clamav-0.95rc1/shared/optparser.c +@@ -211,7 +211,7 @@ const struct clam_option clam_options[] + + { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, + +- { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, ++ { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, + + { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, + diff --git a/clamav-milter.sysv b/clamav-milter.sysv new file mode 100644 index 0000000..8ff51b3 --- /dev/null +++ b/clamav-milter.sysv @@ -0,0 +1,94 @@ +#!/bin/sh +# +# clamav-milter Starts/stop the "clamav-milter" daemon +# +# chkconfig: 345 99 1 +# description: A virus scanning milter + +# Source function library. +. /etc/rc.d/init.d/functions + +exec=/usr/sbin/clamav-milter +prog="clamav-milter" + +OPTS= +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +pidfile=/var/run/clamav-milter/milter.pid +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + [ -f $config ] || exit 6 + echo -n $"Starting $prog: " + daemon --pidfile=${pidfile} \ + $exec $OPTS --nofork=no --pid=${pidfile} && success || failure + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -o "${pidfile} $exec && success || failure + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + # run checks to determine if the service is running or use generic status + status $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? diff --git a/clamav-milter.upstart b/clamav-milter.upstart new file mode 100644 index 0000000..f211818 --- /dev/null +++ b/clamav-milter.upstart @@ -0,0 +1,19 @@ + +### Uncomment these lines when you want clamav-milter to be a milter +### for a locally running MDA +#start on starting\ sendmail +#start on starting sendmail +#start on starting\ postfix +#start on starting postfix + +### Uncomment these lines when you want clamav-milter to be a milter +### for a remotely running MDA +#start on starting\ local +#start on starting local + +stop on runlevel 0 +stop on runlevel 1 +stop on runlevel 6 + +respawn +exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter --nofork=yes diff --git a/clamav.spec b/clamav.spec index e03bcaa..941cbc9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -#global snapshot rc1 +%global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -8,18 +8,20 @@ %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log -%global milterlog %_var/log/clamd.milter %global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log %global milterstatedir %_var/run/clamav-milter %global pkgdatadir %_datadir/%name +%global scanuser clamscan +%global scanstatedir %_var/run/clamd.scan %{!?release_func:%global release_func() %1%{?dist}} Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.2 -Release: %release_func 3%{?snapshot:.%snapshot} +Version: 0.95 +Release: %release_func 0.0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -41,11 +43,9 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.93.3-pid.patch +Patch26: clamav-0.95-cliopts.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -56,8 +56,9 @@ BuildRequires: bc %package filesystem Summary: Filesystem structure for clamav Group: Applications/File -Provides: user(clamav) -Provides: group(clamav) +BuildArch: noarch +Provides: user(%username) = 4 +Provides: group(%username) = 4 # Prevent version mix Conflicts: %name < %version-%release Conflicts: %name > %version-%release @@ -81,7 +82,7 @@ Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -BuildArch: noarch +BuildArch: noarch Requires(pre): clamav-filesystem = %version-%release Requires(postun): clamav-filesystem = %version-%release Provides: data(clamav) = full @@ -111,12 +112,11 @@ Requires(post): group(clamav) %package server Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Requires: init(clamav-server) Requires: data(clamav) Requires: clamav-filesystem = %version-%release Requires: clamav-lib = %version-%release -%package server-sysv +%package server-sysvinit Summary: SysV initscripts for clamav server Group: System Environment/Daemons BuildArch: noarch @@ -124,48 +124,91 @@ Provides: init(clamav-server) = sysv Requires: clamav-server = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release -%package milter -Summary: Milter module for the Clam Antivirus scanner + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +BuildArch: noarch +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 99 +Provides: group(%scanuser) = 99 +Requires: clamav-server = %version-%release + +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon Group: System Environment/Daemons -Requires: clamav-milter-core = %version-%release -Requires: milter(clamav) +BuildArch: noarch +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts -%package milter-core -Summary: Core milter module for the Clam Antivirus scanner +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon Group: System Environment/Daemons +BuildArch: noarch +Source410: clamd.scan.upstart +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl + + +%package milter +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Source300: README.fedora Requires: init(clamav-milter) BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) -Provides: group(%milteruser) +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 Requires(post): coreutils %{?FE_USERADD_REQ} -%package milter-sendmail -Summary: Sendmail customizations for clamav-milter -Group: System Environment/Daemons -Source300: README.fedora -Requires: sendmail -Requires: clamav-milter-core = %version-%release -Requires(pre): user(%milteruser) -Requires(pre): group(%milteruser) Provides: milter(clamav) = sendmail -Conflicts: milter(clamav) < sendmail -Conflicts: milter(clamav) > sendmail +Provides: milter(clamav) = postfix -%package milter-sysv +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release + +%package milter-sysvinit Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons -Provides: init(clamav-milter) = sysv -Requires: clamav-milter = %version-%release BuildArch: noarch +Source320: clamav-milter.sysv +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release Requires(post): user(%milteruser) clamav-milter Requires(preun): user(%milteruser) clamav-milter Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts +Provides: milter-sysv = %version-%release +Obsoletes: milter-sysv < %version-%release + +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +BuildArch: noarch +Source310: clamav-milter.upstart +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl %description @@ -235,47 +278,54 @@ of this daemon should be started for each service requiring it. See the README file how this can be done with a minimum of effort. -%description server-sysv +%description server-sysvinit SysV initscripts template for the clamav server +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + + %description milter This package contains files which are needed to run the clamav-milter. -%description milter-sysv +%description milter-sysvinit The SysV initscripts for clamav-milter. -%description milter-core -Core files for the clamav-milter. - -%description milter-sendmail -Sendmail customizations of the clamav-milter. - +%description milter-upstart +The Upstart initscripts for clamav-milter. ## ------------------------------------------------------------ %prep %setup -q -n %{name}-%{version}%{?snapshot} -%patch21 -p1 -b .path -%patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .pid +%patch26 -p1 -b .cliopts install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} %{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} -perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; - s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; - s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g; - s!^#?(User ).*!\1<USER>!g; - s! /usr/local/share/clamav,! %homedir,!g; - ' etc/clamd.conf +sed -ri \ + -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf -perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf +sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ @@ -321,12 +371,13 @@ function smartsubst() { install -d -m755 \ - ${RPM_BUILD_ROOT}%_sysconfdir/{clamd.d,cron.d,logrotate.d,sysconfig} \ + ${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,event.d} \ ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir + ${RPM_BUILD_ROOT}%homedir \ + ${RPM_BUILD_ROOT}%scanstatedir rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la @@ -369,22 +420,33 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -#### The milter stuff -function subst() { - sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" -} +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/clamd.scan + +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan + +install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamd.scan + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.sock -subst etc/clamd.conf /etc/clamd.d/milter.conf \ - 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf +install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamav-milter +install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter -cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter -CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' -EOF -install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter -touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} ## ------------------------------------------------------------ @@ -404,6 +466,35 @@ rm -rf "$RPM_BUILD_ROOT" %__fe_groupdel %username &>/dev/null || : +%pre scanner +%__fe_groupadd 49 -r %scanuser &>/dev/null || : +%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ + -g %scanuser %scanuser &>/dev/null || : + +%postun scanner +%__fe_userdel %scanuser &>/dev/null || : +%__fe_groupdel %scanuser &>/dev/null || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + + %post update test -e %freshclamlog || { touch %freshclamlog @@ -411,34 +502,41 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%pre milter-core +%pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : -%post milter-core +%post milter test -e %milterlog || { touch %milterlog chmod 0620 %milterlog chown root:%milteruser %milterlog } -%postun milter-core +%postun milter %__fe_userdel %milteruser &>/dev/null || : %__fe_groupdel %milteruser &>/dev/null || : -%post milter-sysv +%post milter-sysvinit /sbin/chkconfig --add clamav-milter -%preun milter-sysv +%preun milter-sysvinit test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : test "$1" != 0 || /sbin/chkconfig --del clamav-milter -%postun milter-sysv +%postun milter-sysvinit test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : + +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : + + %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -521,37 +619,57 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %exclude %_mandir/man8/clamav-milter* -%files server-sysv +%files server-sysvinit %defattr(-,root,root,-) %_initrddir/clamd-wrapper ## ----------------------- -%files milter +%files scanner %defattr(-,root,root,-) +%dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%config(noreplace) %_sysconfdir/clamd.d/clamd.scan +%ghost %scanstatedir/clamd.sock -%files milter-core +%files scanner-sysvinit +%attr(0755,root,root) %config %_initrddir/clamd.scan + +%files scanner-upstart %defattr(-,root,root,-) -%doc clamav-milter/INSTALL -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%config(noreplace) %_sysconfdir/event.d/clamd.scan + +## ----------------------- -%files milter-sendmail +%files milter %defattr(-,root,root,-) %doc clamav-milter/README.fedora -%attr(0700,%milteruser,%milteruser) %dir %milterstatedir +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%attr(0710,%milteruser,%milteruser) %dir %milterstatedir %ghost %milterstatedir/* -%files milter-sysv +%files milter-sysvinit %defattr(-,root,root,-) %config %_initrddir/clamav-milter -%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter + +%files milter-upstart +%defattr(-,root,root,-) +%config(noreplace) %_sysconfdir/event.d/clamav-milter %changelog +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + * Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 - made some subpackages noarch - fixed typo in SysV initscript which removes 'touch' file (#473513) @@ -681,283 +799,3 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : updated per cron-job and user does not want to download the large -data package with outdated virus definitations (#214949) - %%ghost'ed the files downloaded by freshclam - -* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 -- updated to 0.88.7 - -* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 -- updated to 0.88.6 - -* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 -- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 -- added patch to set '__attribute__ ((visibility("hidden")))' for - exported MD5_*() functions (fixes #202043) - -* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 -- splitted SysV initscripts of -milter and -server into own subpackages - -* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 -- rebuilt - -* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 -- updated to 0.88.4 (SECURITY) - -* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed the clamdscan(1) manpage from the -server subpackage - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed a superfluous '}' -- removed some code which was relevant for FC-3 only - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 -- updated to 0.88.3 -- updated to new fedora-usermgmt macros - -* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 -- cleanups: removed unneeded curlies, use plain command instead of - %%__XXX macro, whitespace cleanup, removed unneeded versioned - dependencies -- added a 'Requires(post): group(clamav)' dependencies for -update and - added the corresponding Provides: to -data -- removed the %%_without_milter conditional; you won't gain anything - when milter would be disabled at buildtime - -* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 -- updated to 0.88.2 (SECURITY) -- rediffed patches; most issues handled by 0.88.1-2 are fixed in - 0.88.2 - -* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 -- added patch which fixes some classes of compiler warnings; at least - the using of implicitly declared functions was reported to cause - segfaults on AMD64 (brought to my attention by Marc Perkel) -- added patch which fixes wrong usage of strncpy(3) in unrarlib.c - -* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 -- updated to 0.88.1 (SECURITY) - -* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 -- rebuilt for FC5 - -* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 -- updated to 0.88 -- added pseudo-versions for the 'init(...)' provides as a first step - for the support of alternative initmethods - -* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 -- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) -- ship 'clamd.conf.5' man page in the -server subpackage *too*. The - same file is contained in multiple packages now, but this man-page - can not be removed from the base package because it also applies to - 'clamdscan' there (#173221). - -* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 -- updated to 0.87.1 - -* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 -- updated to 0.87 (SECURITY) -- removed -timeout patch; it is solved upstream -- reverted the -exim changes; they add yet more complexity, their - functionality can go into an own package and they contained flaws - -* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 -- Add clamav-exim configuration package - -* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 -- [milter] create the milter-logfile in the %%post scriptlet -- [milter] reverted the change of the default child_timeout value; it - was set to 5 minutes in 0.86.2 which conflicts with the internal - mode where a timeout must not be set. So, the clamav-milter would - not run with the default configuration - -* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 -- Fixed calculation of sleep duration; on some systems/IPs, `hostid` - results in a negative number which is retained by the bash - modulo-operation. So the sleep may get a negative number of seconds - being interpreted as an option. This version makes sure that the - module-operations returns a non-negative value. [BZ #164494, James - Wilkinson] -- added support for a /usr/sbin/clamav-notify-servers.local hook; this - file will be executed (source'd) before all other actions and can - abort the entire processing by invoking 'exit' - -* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 -- updated to 0.86.2 (SECURITY) -- changed the freshclam updating mechanism (again); now, it consists - of a crontab which does not need to be changed and a helper script - (freshclam-sleep). This helper script is configured by - /etc/sysconfig/freshclam - -* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 -- updated to 0.86.1 -- fixed randomization in %%post scriptlet: hour should be a range but - not a single number - -* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 -- updated to 0.86 -- randomize freshclam startup times in -update's %%post script (suggested - by Stephen Smoogen); this requires some more Requires(post): also - -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 -- fix dist tagging the way Enrico wants it - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 -- Rebuild - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 -- Update - -* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 -- updated to 0.85 - -* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 -- updated to 0.84 - -* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> -- rebuilt - -* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 -- updated to 0.83 - -* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 -- updated to 0.82 -- minor spec cleanups - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 -- build the package with '--disable-zlib-vcheck' because RH is unable to - apply a fix for a 5 month old and solved security issue. Please fill - your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 -- added 'BuildRequires: bc' (should work without also, but ./configure - gives out ugly warnings else) - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 -- updated to 0.81 -- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports - an internal mode now which is enabled by default -- updated -milter %%description - -* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 -- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update - subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) - -* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 -- updated to 0.80 -- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore -- buildrequire 'curl-devel' -- renamed clamav.conf to clamd.conf (upstream change) -- updated -initoff patch - -* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 -- updated to 0.75.1 -- use %%configure, the problems with the architecture specification - seem to have passed (probably because of an autoconf update) -- set mode 0600 for the cron-script (required by vixie-cron) -- made the cronjob a spambot and send mail about deactivated freshclam - service to nearly everybody... (root, postmaster, webmaster) -- other fixes in the notification cronjob - -* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 -- updated to 0.75 - -* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 -- moved /usr/bin/clamav-config from main into -devel - -* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 -- updated to 0.74 - -* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 -- updated to 0.73 -- added pkgconfig file - -* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 -- notify the user about a deactivated clamav-update service -- added clamd-gen script which generates template spec-files for - services using clamd -- copied template configuration files to %pkgdatadir/template (needed - for clamd-gen) -- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink - will be provided for compatibility reasons -- conditionalized building of the -milter subpackage ('--without - milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) - -* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 -- removed 'BuildRequires: dietlibc'; it was a leftover from the - pre-use-signal era (before 0.70) (bug #1716) - -* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 -- updated to 0.72 - -* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 -- removed the randomization in the cronjob; it seems to be impossible - to use the mod-operator (%%) there. Instead of, the user has to - replace some placeholders... - -* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 -- updated to 0.71 - -* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 -- quote 'EOF' to delay $RANDOM expansion - -* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 -- updated GECOS entry for the 'clamav' user to describe its purpose - more accurately -- use explicit '-m755' when creating directories with install - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 -- updated to 0.70; rediffed some patches -- updated logrotate script to use signals and documented the steps - which are needed to make it work -- adapted initscript to use signals instead of sockwrite -- removed sockwrite; signals can now be used to reload the database -- added logfile to the -milter subpackage - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 -- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets - -* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 -- split the double Requires(...,...): statements; see - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 -- require the recent fedora-usermgmt package (0.7) which fixes similar - ordering issues - -* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 -- updated to 0.68 (using the -1 version) -- ship milter-files in the -milter instead of the -server subpackage - -* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 -- fixed ':' vs. '.' in chown - -* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 -- randomize freshclam startup to prevent server peaks - -* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 -- updated to 0.67 (using the -1 version) - -* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 -- updated to 0.66; important, packaging-relevant changes are - freshclam: - * $http_proxy is not supported anymore; you have to configure it in - /etc/freshclam.conf - * the logfile has been renamed to /var/log/freshclam.log -- removed %%check section; buildroot check is implemented in local - testsuite already -- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew - files -- added some directory-Requires: -- activated milter-package and made it work -- added patch to disable clamav-milter service by default -- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this - makes things more consistently but can break backward compatibility. The - initscript should deal with the old version too, but I would not bet on - it... -- updated some descriptions -- fixed the update-mechanism; now it happens in two stages: at first, - the files will be downloaded as user 'clamav' and then, root initiates - the daemon-reload. - -* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 -- added security fix for - http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/clamd-wrapper b/clamd-wrapper index 14c04a5..b601cf2 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -26,6 +26,7 @@ procname=clamd.${CLAMD_SERVICE} CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf CLAMD_OPTIONS= +CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid ## backward-compatibility check... for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do @@ -40,7 +41,8 @@ prog="clamd.${CLAMD_SERVICE}" start () { echo -n $"Starting $prog: " - daemon $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} + daemon --pidfile=${CLAMD_PIDFILE} \ + $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile @@ -59,10 +61,10 @@ stop () { reload() { rc=0 echo -n $"Reloading $prog: " - killproc $procname -SIGHUP || rc=$? + killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? echo echo -n $"Loading new virus-database: " - killproc $procname -SIGUSR2 || rc=$? + killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? echo return $rc } diff --git a/clamd.scan.upstart b/clamd.scan.upstart new file mode 100644 index 0000000..e96b37e --- /dev/null +++ b/clamd.scan.upstart @@ -0,0 +1,15 @@ +### Uncomment these lines when you want clamd.scan to be a scanner +### for a locally running clamav-milter +#start on starting clamav-milter + +### Uncomment these lines when you want clamd.scan to be a generic +### scanner service +#start on starting\ local +#start on starting local + +stop on runlevel 0 +stop on runlevel 1 +stop on runlevel 6 + +respawn +exec /usr/sbin/clamd -c /etc/clamd.d/clamd.scan --nofork=yes diff --git a/lastver b/lastver index 5e4a9c1..d89b314 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.93.3 +0.94.2 diff --git a/sources b/sources index e115b9a..5f92b5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 +40d13c0d39568b17aec35fe793233861 clamav-0.95rc1-norar.tar.bz2 commit 3717d73615ddb16892f77ab78066a28db6f96ec0 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Feb 25 08:58:23 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index 2bc0418..e03bcaa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.94.2 -Release: %release_func 2%{?snapshot:.%snapshot} +Release: %release_func 3%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -81,6 +81,7 @@ Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File +BuildArch: noarch Requires(pre): clamav-filesystem = %version-%release Requires(postun): clamav-filesystem = %version-%release Provides: data(clamav) = full @@ -90,6 +91,7 @@ Conflicts: data(clamav) > full %package data-empty Summary: Empty data package for the Clam Antivirus scanner Group: Applications/File +BuildArch: noarch Provides: data(clamav) = empty Conflicts: data(clamav) < empty Conflicts: data(clamav) > empty @@ -117,6 +119,7 @@ Requires: clamav-lib = %version-%release %package server-sysv Summary: SysV initscripts for clamav server Group: System Environment/Daemons +BuildArch: noarch Provides: init(clamav-server) = sysv Requires: clamav-server = %version-%release Requires(pre): %_initrddir @@ -156,6 +159,7 @@ Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons Provides: init(clamav-milter) = sysv Requires: clamav-milter = %version-%release +BuildArch: noarch Requires(post): user(%milteruser) clamav-milter Requires(preun): user(%milteruser) clamav-milter Requires(pre): %_initrddir @@ -548,6 +552,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + * Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/clamd-wrapper b/clamd-wrapper index c32e34e..14c04a5 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -52,7 +52,7 @@ stop () { killproc $procname RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f touch $lockfile + [ $RETVAL -eq 0 ] && rm -f $lockfile return $RETVAL } diff --git a/verinfo b/verinfo index a4a0b38..814d953 100644 --- a/verinfo +++ b/verinfo @@ -1,2 +1,2 @@ -http://prdownloads.sourceforge.net/sourceforge/clamav/ +http://sourceforge.net/project/showfiles.php?group_id=86638&package_id=90197 clamav-([0-9.-]*?)\.tar\. commit a843b1831a1f03926eeebf884ffecfb73e6fb551 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Tue Feb 24 07:37:58 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/clamav.spec b/clamav.spec index ab6ef56..2bc0418 100644 --- a/clamav.spec +++ b/clamav.spec @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.94.2 -Release: %release_func 1%{?snapshot:.%snapshot} +Release: %release_func 2%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -548,6 +548,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 - Upgrade to 0.94.2 (#474002) commit 3ef6d7cff563db71bc8c64dca022138fb4bca716 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Dec 2 22:26:31 2008 +0000 Upgrade to 0.94.2 (#474002) diff --git a/.cvsignore b/.cvsignore index 0a417f9..336c23f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.1-norar.tar.bz2 +clamav-0.94.2-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index 8ab44ec..4fe1dee 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.1 +Version: 0.94.2 Release: %release_func 1 License: GPLv2 @@ -511,6 +511,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + * Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 - Upgrade to 0.94.1 diff --git a/sources b/sources index a29b987..e115b9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 +9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 commit b4e507d2995e34811d8a03e7e5a4b5eaacd48ec2 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Dec 2 22:26:31 2008 +0000 Upgrade to 0.94.2 (#474002) diff --git a/.cvsignore b/.cvsignore index 0a417f9..336c23f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.1-norar.tar.bz2 +clamav-0.94.2-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index e39ffaa..ab6ef56 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.1 +Version: 0.94.2 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -548,6 +548,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + * Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 - Upgrade to 0.94.1 diff --git a/sources b/sources index a29b987..e115b9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 +9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 commit fc9b9c469299fb1d0289b3d170e87680f4757f96 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Nov 5 19:50:09 2008 +0000 Upgrade to 0.94.1 diff --git a/.cvsignore b/.cvsignore index e015b0c..0a417f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94-norar.tar.bz2 +clamav-0.94.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index c20f532..8ab44ec 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94 +Version: 0.94.1 Release: %release_func 1 License: GPLv2 @@ -511,6 +511,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + * Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker diff --git a/sources b/sources index ec908dc..a29b987 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 +7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 commit c063e179aa855be52af01f273a3a93171e096835 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Nov 5 19:50:09 2008 +0000 Upgrade to 0.94.1 diff --git a/.cvsignore b/.cvsignore index e015b0c..0a417f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94-norar.tar.bz2 +clamav-0.94.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index f8d8778..e39ffaa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94 +Version: 0.94.1 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -548,6 +548,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + * Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker diff --git a/sources b/sources index ec908dc..a29b987 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 +7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 commit 3a1d2b5e3ca38ce6c5e6619c49a07d91a8043aae Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Oct 26 17:48:00 2008 +0000 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker - CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg - CVE-2008-3913 Memory leak in code path in freshclam's manager.c - CVE-2008-3914 Multiple file descriptor leaks on the code paths diff --git a/.cvsignore b/.cvsignore index a51ec3e..e015b0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.3-norar.tar.bz2 +clamav-0.94-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index aa1497f..f8d8778 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.3 +Version: 0.94 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -548,6 +548,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + * Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 - updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read on petite files) diff --git a/sources b/sources index 7ccec62..ec908dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 +a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 commit da4aada21147f2e98cda179eabc647f2078dc9d8 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Oct 26 17:38:04 2008 +0000 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker - CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg - CVE-2008-3913 Memory leak in code path in freshclam's manager.c - CVE-2008-3914 Multiple file descriptor leaks on the code paths diff --git a/.cvsignore b/.cvsignore index a51ec3e..e015b0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.3-norar.tar.bz2 +clamav-0.94-norar.tar.bz2 diff --git a/Makefile b/Makefile index 21be25f..2cc62a7 100644 --- a/Makefile +++ b/Makefile @@ -19,3 +19,16 @@ MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) + + +# can not use final tarball name here as it will conflict with rules +# within Makefile.common +TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp +TARBALL = ${NAME}-${VERSION}.tar.gz + +clean-sources: ${TARBALL_CLEAN} + +${TARBALL_CLEAN}: ${TARBALL} + rm -f $@.tmp + zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp + mv $@.tmp $@ diff --git a/clamav.spec b/clamav.spec index 1a799d2..c20f532 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,16 +15,16 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.3 +Version: 0.94 Release: %release_func 1 License: GPLv2 Group: Applications/File URL: http://www.clamav.net -# Unfortunately, clamav includes support for RAR v3, derived from GPL +# Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. -# All that is needed to make the clean tarball is: rm -rf libclamunrar* -# Note that you also need patch26. +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] Source0: clamav-%{version}-norar.tar.bz2 # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. @@ -511,6 +511,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + * Mon Jul 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.3-1 - Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: - CVE-2008-2713 Out-of-bounds read on petite files diff --git a/sources b/sources index 7ccec62..ec908dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 +a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 commit 20b50894331b06649484c380c0c35f84cf8795eb Author: Robert Scheck <robert(a)fedoraproject.org> Date: Mon Jul 14 10:34:44 2008 +0000 - Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: - CVE-2008-2713 Out-of-bounds read on petite files - Put pid instead of pgrp into pid file of clamav-milter (#452359) diff --git a/.cvsignore b/.cvsignore index 48c3a65..a51ec3e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.1-norar.tar.bz2 +clamav-0.93.3-norar.tar.bz2 diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch deleted file mode 100644 index db4e000..0000000 --- a/clamav-0.80-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes - # email messages to clamav diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch new file mode 100644 index 0000000..899d32b --- /dev/null +++ b/clamav-0.93.3-initoff.patch @@ -0,0 +1,11 @@ +--- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff ++++ clamav-0.93.3/contrib/init/RedHat/clamav-milter +@@ -2,7 +2,7 @@ + # + # clamav-milter This script starts and stops the clamav-milter daemon + # +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 + # + # description: clamav-milter is a daemon which hooks into sendmail and routes \ + # email messages for virus scanning with ClamAV diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch new file mode 100644 index 0000000..de29887 --- /dev/null +++ b/clamav-0.93.3-pid.patch @@ -0,0 +1,17 @@ +Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora +initscripts do not support killing of whole processgroups. Hence, disable +feature which posts negative pgrp into pidfile and use plain pid instead +of. + +diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c +--- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 ++++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 +@@ -1985,7 +1985,7 @@ main(int argc, char **argv) + logg(_("!Can't save PID in file %s\n"), pidfile); + return EX_CONFIG; + } +-#ifdef C_LINUX ++#if defined(C_LINUX) && 0 + /* Ensure that all threads are kill()ed */ + fprintf(fd, "-%d\n", (int)getpgrp()); + #else diff --git a/clamav.spec b/clamav.spec index 682f593..1a799d2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,5 +1,3 @@ -## $Id: clamav.spec,v 1.50 2008/04/14 20:31:45 robert Exp $ - ## Fedora Extras specific customization below... # %bcond_without fedora ## @@ -17,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.1 +Version: 0.93.3 Release: %release_func 1 License: GPLv2 @@ -39,9 +37,10 @@ Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.80-initoff.patch +Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.90rc3-private.patch Patch25: clamav-0.92-open.patch +Patch26: clamav-0.93.3-pid.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -234,6 +233,7 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .pid mkdir -p libclamunrar{,_iface} touch libclamunrar/{Makefile.in,all,install} @@ -511,8 +511,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Jul 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.3-1 +- Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: +- CVE-2008-2713 Out-of-bounds read on petite files +- Put pid instead of pgrp into pid file of clamav-milter (#452359) + * Wed Jun 18 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.1-1 -- Upgrade to 0.93.1, rediffed -path patch +- Upgrade to 0.93.1 (SECURITY), rediffed -path patch: - CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability * Mon Apr 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93-1 diff --git a/sources b/sources index 3875ac9..7ccec62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 +53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 commit 6a9c737ebd351c9b269dcedec4338158e767b7c1 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:36:07 2008 +0000 rediffed patches diff --git a/clamav.spec b/clamav.spec index 65c92e8..aa1497f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -42,7 +42,7 @@ Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.80-initoff.patch +Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch Patch26: clamav-0.93.3-pid.patch @@ -552,6 +552,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read on petite files) - put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches * Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 - updated to 0.93.1 commit 422a07557176c65c5f04a4759298ddf64efdff44 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:33:38 2008 +0000 rediffed diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch deleted file mode 100644 index db4e000..0000000 --- a/clamav-0.80-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes - # email messages to clamav diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch new file mode 100644 index 0000000..899d32b --- /dev/null +++ b/clamav-0.93.3-initoff.patch @@ -0,0 +1,11 @@ +--- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff ++++ clamav-0.93.3/contrib/init/RedHat/clamav-milter +@@ -2,7 +2,7 @@ + # + # clamav-milter This script starts and stops the clamav-milter daemon + # +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 + # + # description: clamav-milter is a daemon which hooks into sendmail and routes \ + # email messages for virus scanning with ClamAV commit cc612e64b642ec9f0284f1c799b5d4254bb59a0c Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:20:40 2008 +0000 - updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read on petite files) - put pid instead of pgrp into pidfile of clamav-milter (bz #452359) diff --git a/clamav.spec b/clamav.spec index 55e2a2f..65c92e8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.1 +Version: 0.93.3 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -45,6 +45,7 @@ Patch21: clamav-0.93.1-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch +Patch26: clamav-0.93.3-pid.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -256,6 +257,7 @@ Sendmail customizations of the clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .pid install -p -m0644 %SOURCE300 clamav-milter/ @@ -546,6 +548,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) + * Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 - updated to 0.93.1 - rediffed -path patch commit 8775e9b2f26ed4dec631ecd4f3700077d589957f Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:12:31 2008 +0000 updated to 0.93.3 diff --git a/.cvsignore b/.cvsignore index 48c3a65..a51ec3e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.1-norar.tar.bz2 +clamav-0.93.3-norar.tar.bz2 diff --git a/lastver b/lastver index a16a6df..5e4a9c1 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.93.1 +0.93.3 diff --git a/sources b/sources index 3875ac9..7ccec62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 +53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 commit a7fdf91c087bd185fc7bb18332bf0e10e633cef9 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:09:15 2008 +0000 initial checkin diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch new file mode 100644 index 0000000..de29887 --- /dev/null +++ b/clamav-0.93.3-pid.patch @@ -0,0 +1,17 @@ +Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora +initscripts do not support killing of whole processgroups. Hence, disable +feature which posts negative pgrp into pidfile and use plain pid instead +of. + +diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c +--- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 ++++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 +@@ -1985,7 +1985,7 @@ main(int argc, char **argv) + logg(_("!Can't save PID in file %s\n"), pidfile); + return EX_CONFIG; + } +-#ifdef C_LINUX ++#if defined(C_LINUX) && 0 + /* Ensure that all threads are kill()ed */ + fprintf(fd, "-%d\n", (int)getpgrp()); + #else commit 61e30bf5ea1d3cd2f608f9f1b20e993c5a3d91e1 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 21 14:55:11 2008 +0000 removed CVS tags diff --git a/Makefile b/Makefile index 2cc62a7..ed9c5e4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ # Makefile for source rpm: clamav -# $Id$ NAME := clamav SPECFILE = $(firstword $(wildcard *.spec)) diff --git a/clamav.spec b/clamav.spec index 1486ed8..55e2a2f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,5 +1,3 @@ -## $Id: clamav.spec,v 1.72 2008/06/17 19:57:54 ensc Exp $ - #global snapshot rc1 ## Fedora Extras specific customization below... commit 55d261d5465594de69aee6a408ef2b39bb9445dd Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Jun 18 10:13:26 2008 +0000 - Upgrade to 0.93.1, rediffed -path patch - CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability diff --git a/.cvsignore b/.cvsignore index 069bca4..48c3a65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93-norar.tar.bz2 +clamav-0.93.1-norar.tar.bz2 diff --git a/clamav-0.70-path.patch b/clamav-0.70-path.patch deleted file mode 100644 index 3312e38..0000000 --- a/clamav-0.70-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.path 2003-06-26 15:38:06.000000000 +0200 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 15:39:01.000000000 +0200 -@@ -22,7 +22,6 @@ - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -63,7 +62,7 @@ - restart - ;; - condrestart) -- test -f /var/lock/subsys/clamav-milter && $0 restart || : -+ test -f /var/lock/subsys/clamav-milter && restart || : - ;; - status) - status clamav-milter diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch new file mode 100644 index 0000000..4f1872c --- /dev/null +++ b/clamav-0.93.1-path.patch @@ -0,0 +1,19 @@ +--- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path ++++ clamav-0.93.1/contrib/init/RedHat/clamav-milter +@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && + # Check that networking is up. + [ ${NETWORKING} = "no" ] && exit 0 + +-[ -x /usr/local/sbin/clamav-milter ] || exit 0 + PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin + + RETVAL=0 +@@ -87,7 +86,7 @@ case "$1" in + restart + ;; + condrestart) +- test -f ${lockfile} && $0 restart || : ++ test -f ${lockfile} && restart || : + ;; + status) + if [ ! -z $pidfile ]; then diff --git a/clamav.spec b/clamav.spec index a6c30f4..682f593 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.49 2008/02/14 16:00:40 robert Exp $ +## $Id: clamav.spec,v 1.50 2008/04/14 20:31:45 robert Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93 +Version: 0.93.1 Release: %release_func 1 License: GPLv2 @@ -38,7 +38,7 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.70-path.patch +Patch21: clamav-0.93.1-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch Patch25: clamav-0.92-open.patch @@ -511,6 +511,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Jun 18 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.1-1 +- Upgrade to 0.93.1, rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + * Mon Apr 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93-1 - Upgrade to 0.93 (SECURITY): - CVE-2008-1100 Upack processing buffer overflow (#442360) diff --git a/sources b/sources index 444be31..3875ac9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 +c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 commit 56aef066d81499de3563d7775cf1d8d52fe75f7d Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 17 20:03:53 2008 +0000 updated diff --git a/.cvsignore b/.cvsignore index 069bca4..48c3a65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93-norar.tar.bz2 +clamav-0.93.1-norar.tar.bz2 diff --git a/clamav-0.70-path.patch b/clamav-0.70-path.patch deleted file mode 100644 index 3312e38..0000000 --- a/clamav-0.70-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.path 2003-06-26 15:38:06.000000000 +0200 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 15:39:01.000000000 +0200 -@@ -22,7 +22,6 @@ - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -63,7 +62,7 @@ - restart - ;; - condrestart) -- test -f /var/lock/subsys/clamav-milter && $0 restart || : -+ test -f /var/lock/subsys/clamav-milter && restart || : - ;; - status) - status clamav-milter diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch new file mode 100644 index 0000000..4f1872c --- /dev/null +++ b/clamav-0.93.1-path.patch @@ -0,0 +1,19 @@ +--- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path ++++ clamav-0.93.1/contrib/init/RedHat/clamav-milter +@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && + # Check that networking is up. + [ ${NETWORKING} = "no" ] && exit 0 + +-[ -x /usr/local/sbin/clamav-milter ] || exit 0 + PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin + + RETVAL=0 +@@ -87,7 +86,7 @@ case "$1" in + restart + ;; + condrestart) +- test -f ${lockfile} && $0 restart || : ++ test -f ${lockfile} && restart || : + ;; + status) + if [ ! -z $pidfile ]; then diff --git a/clamav.spec b/clamav.spec index ebadcd9..1486ed8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.70 2008/03/12 08:40:04 ensc Exp $ +## $Id: clamav.spec,v 1.72 2008/06/17 19:57:54 ensc Exp $ #global snapshot rc1 @@ -20,7 +20,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93 +Version: 0.93.1 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -43,7 +43,7 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.70-path.patch +Patch21: clamav-0.93.1-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch @@ -548,6 +548,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + * Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 - updated to final 0.93 - removed daily.inc + main.inc directories; they are now replaced by diff --git a/lastver b/lastver index 341ad3c..a16a6df 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.93 +0.93.1 diff --git a/sources b/sources index 444be31..3875ac9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 +c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 commit dbbdf5e26efedef21283e6ccd639f1724e49adcc Author: Robert Scheck <robert(a)fedoraproject.org> Date: Mon Apr 14 20:31:45 2008 +0000 - Upgrade to 0.93 (SECURITY): - CVE-2008-1100 Upack processing buffer overflow (#442360) - Removed *.inc directories; got replaced by *.cld containers diff --git a/.cvsignore b/.cvsignore index 9a29028..069bca4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.92.1-norar.tar.bz2 +clamav-0.93-norar.tar.bz2 diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch deleted file mode 100644 index b63921e..0000000 --- a/clamav-0.92-nounrar.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in ---- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 -+++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 -@@ -242,7 +242,7 @@ target_os = @target_os@ - target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - bin_SCRIPTS = clamav-config - pkgconfigdir = $(libdir)/pkgconfig -diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in ---- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 -+++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 -@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex - AC_C_FPU_BIGENDIAN - - AC_OUTPUT([ --libclamunrar/Makefile --libclamunrar_iface/Makefile - libclamav/Makefile - clamscan/Makefile - database/Makefile -diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am ---- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 -+++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 -@@ -16,7 +16,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - # MA 02110-1301, USA. - --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - - bin_SCRIPTS=clamav-config -diff -up clamav-0.92/configure.BAD clamav-0.92/configure ---- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 -+++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 -@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi - esac - - --ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" -+ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -27013,8 +27013,6 @@ do - case $ac_config_target in - "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; -- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; - "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; - "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; - "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav.spec b/clamav.spec index a0dff5c..a6c30f4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.48 2007/12/21 19:23:28 spot Exp $ +## $Id: clamav.spec,v 1.49 2008/02/14 16:00:40 robert Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92.1 +Version: 0.93 Release: %release_func 1 License: GPLv2 @@ -42,7 +42,6 @@ Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -235,7 +234,9 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .nounrar + +mkdir -p libclamunrar{,_iface} +touch libclamunrar/{Makefile.in,all,install} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -291,14 +292,13 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir/daily.inc + ${RPM_BUILD_ROOT}%homedir rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la -for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do - touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i -done +touch ${RPM_BUILD_ROOT}%homedir/daily.cld +touch ${RPM_BUILD_ROOT}%homedir/main.cld ## prepare the server-files @@ -439,7 +439,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files filesystem %attr(-,%username,%username) %dir %homedir -%attr(-,%username,%username) %dir %homedir/daily.inc %attr(-,root,root) %dir %pkgdatadir ## ----------------------- @@ -454,7 +453,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files data-empty %defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/main.cvd +%ghost %attr(0664,%username,%username) %homedir/*.cvd ## ----------------------- @@ -470,14 +469,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd +%ghost %attr(0664,%username,%username) %homedir/*.cld ## ----------------------- @@ -519,6 +511,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Apr 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93-1 +- Upgrade to 0.93 (SECURITY): +- CVE-2008-1100 Upack processing buffer overflow (#442360) +- Removed *.inc directories; got replaced by *.cld containers + * Thu Feb 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.92.1-1 - Upgrade to 0.92.1 (SECURITY): - CVE-2008-0318 Integer overflow in libclamav (#432623) diff --git a/sources b/sources index 6e9b8a3..444be31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 +141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 commit 72cb5cff7c03a0348e09aa055d1d79ef616321f2 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 14 18:36:29 2008 +0000 - updated to final 0.93 - removed daily.inc + main.inc directories; they are now replaced by *.cld containers diff --git a/clamav.spec b/clamav.spec index 6aa5e2b..ebadcd9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,6 +1,6 @@ -## $Id: clamav.spec,v 1.69 2008/03/12 08:38:02 ensc Exp $ +## $Id: clamav.spec,v 1.70 2008/03/12 08:40:04 ensc Exp $ -%global snapshot rc1 +#global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.93 -Release: %release_func 0.1%{?snapshot:.%snapshot} +Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -322,19 +322,14 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir/{main,daily}.inc + ${RPM_BUILD_ROOT}%homedir rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la -for i in cfg db fp hdb info mdb mdu ndb ndu pdb wdb zmd; do - touch ${RPM_BUILD_ROOT}%homedir/daily.inc/daily.$i - touch ${RPM_BUILD_ROOT}%homedir/main.inc/main.$i -done - -touch ${RPM_BUILD_ROOT}%homedir/daily.inc/COPYING -touch ${RPM_BUILD_ROOT}%homedir/main.inc/COPYING +touch ${RPM_BUILD_ROOT}%homedir/daily.cld +touch ${RPM_BUILD_ROOT}%homedir/main.cld ## prepare the server-files @@ -475,7 +470,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files filesystem %attr(-,%username,%username) %dir %homedir -%attr(-,%username,%username) %dir %homedir/daily.inc %attr(-,root,root) %dir %pkgdatadir ## ----------------------- @@ -490,7 +484,8 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files data-empty %defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/main.cvd +%ghost %attr(0664,%username,%username) %homedir/*.cvd + ## ----------------------- @@ -505,9 +500,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %config(noreplace) %_sysconfdir/sysconfig/freshclam %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog - -%ghost %attr(0664,%username,%username) %homedir/daily.inc/* -%ghost %attr(0664,%username,%username) %homedir/main.inc/* +%ghost %attr(0664,%username,%username) %homedir/*.cld ## ----------------------- @@ -555,6 +548,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + * Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 - moved -milter scriptlets into -milter-core subpackage - added a requirement on the milteruser to the -milter-sendmail commit 3e418407a561822f535ccbb038fe0971dce644d0 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 14 18:35:02 2008 +0000 trimmed down MAILTO list of cronjob to 'root' again; every well configured system has an alias for this recipient diff --git a/clamav-update.cron b/clamav-update.cron index 3f1b005..3a69901 100644 --- a/clamav-update.cron +++ b/clamav-update.cron @@ -1,5 +1,5 @@ ## Adjust this line... -MAILTO=root,postmaster,webmaster,clamav +MAILTO=root ## It is ok to execute it as root; freshclam drops privileges and becomes ## user 'clamav' as soon as possible commit 9a66eef1308862e95496555c836f296dcd0bff8a Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 14 18:28:07 2008 +0000 updated to final 0.93 diff --git a/.cvsignore b/.cvsignore index d34f911..069bca4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -clamav-*.tar.gz* -clamav-*.tar.bz2* -clamav-*.*.rpm +clamav-0.93-norar.tar.bz2 diff --git a/lastver b/lastver index da011ce..341ad3c 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.92.1 +0.93 diff --git a/sources b/sources index 47ab841..444be31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d7b2be9783f20956b7e090437105699 clamav-0.93rc1-norar.tar.bz2 +141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 commit 5fb728d2ef5c915ed0f1cc17b50643c0b39862d5 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 12 08:40:04 2008 +0000 added missing version to %changelog diff --git a/clamav.spec b/clamav.spec index 000b2d3..6aa5e2b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.68 2008/03/05 07:30:58 ensc Exp $ +## $Id: clamav.spec,v 1.69 2008/03/12 08:38:02 ensc Exp $ %global snapshot rc1 @@ -555,7 +555,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 - moved -milter scriptlets into -milter-core subpackage - added a requirement on the milteruser to the -milter-sendmail subpackage (reported by Bruce Jerrick) commit f5d1e31d7c361732661a7318830c91da7daffd97 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 12 08:38:02 2008 +0000 - moved -milter scriptlets into -milter-core subpackage - added a requirement on the milteruser to the -milter-sendmail subpackage (reported by Bruce Jerrick) diff --git a/clamav.spec b/clamav.spec index 2fe72e1..000b2d3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.67 2008/02/11 22:30:35 ensc Exp $ +## $Id: clamav.spec,v 1.68 2008/03/05 07:30:58 ensc Exp $ %global snapshot rc1 @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.93 -Release: %release_func 0.0%{?snapshot:.%snapshot} +Release: %release_func 0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -146,6 +146,8 @@ Group: System Environment/Daemons Source300: README.fedora Requires: sendmail Requires: clamav-milter-core = %version-%release +Requires(pre): user(%milteruser) +Requires(pre): group(%milteruser) Provides: milter(clamav) = sendmail Conflicts: milter(clamav) < sendmail Conflicts: milter(clamav) > sendmail @@ -410,19 +412,19 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%pre milter +%pre milter-core %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : -%post milter +%post milter-core test -e %milterlog || { touch %milterlog chmod 0620 %milterlog chown root:%milteruser %milterlog } -%postun milter +%postun milter-core %__fe_userdel %milteruser &>/dev/null || : %__fe_groupdel %milteruser &>/dev/null || : @@ -553,6 +555,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + * Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 - updated to 0.93rc1 - fixed rpath issues commit 1f82fa929ae02cbeee422a5d4e04cf7bb686aeb2 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 5 07:30:58 2008 +0000 - updated to 0.93rc1 - fixed rpath issues diff --git a/clamav.spec b/clamav.spec index 70932c8..2fe72e1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,6 @@ -## $Id: clamav.spec,v 1.66 2008/01/01 17:33:05 ensc Exp $ +## $Id: clamav.spec,v 1.67 2008/02/11 22:30:35 ensc Exp $ + +%global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,26 +20,21 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92.1 -Release: %release_func 1 +Version: 0.93 +Release: %release_func 0.0%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net %if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… %else # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by -# -# zcat clamav-$V.tar.gz | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > clamav-$V-norar.tar.bz2 -# -# or -# -# make clean-sources [TARBALL=<original-tarball>] -Source0: %name-%version-norar.tar.bz2 +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +Source0: %name-%version%{?snapshot}-norar.tar.bz2 %endif Source1: clamd-wrapper Source2: clamd.sysconfig @@ -253,7 +250,7 @@ Sendmail customizations of the clamav-milter. ## ------------------------------------------------------------ %prep -%setup -q +%setup -q -n %{name}-%{version}%{?snapshot} %patch21 -p1 -b .path %patch22 -p1 -b .initoff @@ -284,12 +281,13 @@ export LDFLAGS='-Wl,--as-needed' export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --enable-milter --disable-static \ + --disable-rpath \ %{!?with_unrar:--disable-unrar} # build with --as-needed and disable rpath sed -i \ -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ libtool @@ -555,6 +553,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + * Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 - updated to 0.92.1 commit d7a04eea73382ccc812607bc031a6aa4c43bfda2 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 5 07:29:47 2008 +0000 updated to 0.93rc1 diff --git a/sources b/sources index 6e9b8a3..47ab841 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 +7d7b2be9783f20956b7e090437105699 clamav-0.93rc1-norar.tar.bz2 commit d86d8a8a765d07f7d26dd84d7019d7639464e7d0 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Feb 14 16:00:40 2008 +0000 - Upgrade to 0.92.1 (SECURITY): - CVE-2008-0318 Integer overflow in libclamav (#432623) diff --git a/.cvsignore b/.cvsignore index f6ee3be..9a29028 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -clamav-*.tar.gz* -clamav-*.*.rpm +clamav-0.92.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index e006b41..a0dff5c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.47 2007/12/21 19:12:19 spot Exp $ +## $Id: clamav.spec,v 1.48 2007/12/21 19:23:28 spot Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92 -Release: %release_func 4.1 +Version: 0.92.1 +Release: %release_func 1 License: GPLv2 Group: Applications/File @@ -27,7 +27,7 @@ URL: http://www.clamav.net # incompatible unrar from RARlabs. We have to pull this code out. # All that is needed to make the clean tarball is: rm -rf libclamunrar* # Note that you also need patch26. -Source0: clamav-%{version}.clean.tar.gz +Source0: clamav-%{version}-norar.tar.bz2 # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. # Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig @@ -519,6 +519,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu Feb 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.92.1-1 +- Upgrade to 0.92.1 (SECURITY): +- CVE-2008-0318 Integer overflow in libclamav (#432623) + * Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-4 - EPEL fixes diff --git a/sources b/sources index 10dd892..6e9b8a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz +aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 commit 869e18548a9fa2dcab5307559ee885a1b0704ef6 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Feb 14 15:42:36 2008 +0000 Removed old, unneeded patches diff --git a/clamav-0.70-user.patch b/clamav-0.70-user.patch deleted file mode 100644 index f7f42b1..0000000 --- a/clamav-0.70-user.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.user 2000-02-19 07:04:00.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 14:35:01.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # - # clamav-milter This script starts and stops the clamav-milter daemon - # -@@ -16,6 +16,7 @@ - - # Local clamav-milter config - CLAMAV_FLAGS= -+CLAMAV_USER= - test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter - - # Check that networking is up. -@@ -28,7 +29,7 @@ - - start() { - echo -n "Starting clamav-milter: " -- daemon clamav-milter ${CLAMAV_FLAGS} -+ daemon ${CLAMAV_USER:+--user $CLAMAV_USER} setsid /usr/sbin/clamav-milter ${CLAMAV_FLAGS} </dev/null - RETVAL=$? - echo - test $RETVAL -eq 0 && touch /var/lock/subsys/clamav-milter diff --git a/clamav-0.88.1-strncpy.patch b/clamav-0.88.1-strncpy.patch deleted file mode 100644 index ceceb7d..0000000 --- a/clamav-0.88.1-strncpy.patch +++ /dev/null @@ -1,26 +0,0 @@ -2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { diff --git a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch deleted file mode 100644 index 38f9d9d..0000000 --- a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- clamav-0.88.2/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-29 19:46:09.000000000 +0200 -+++ clamav-0.88.2/libclamav/pe.c 2006-04-30 11:25:53.000000000 +0200 -@@ -1555,7 +1555,7 @@ int cli_peheader(int desc, struct cli_pe - { - uint16_t e_magic; /* DOS signature ("MZ") */ - uint32_t e_lfanew; /* address of new exe header */ -- uint32_t min, max; -+ uint32_t min=0, max=0; - struct pe_image_file_hdr file_hdr; - struct pe_image_optional_hdr optional_hdr; - struct pe_image_section_hdr *section_hdr; ---- clamav-0.88.2/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 -+++ clamav-0.88.2/libclamav/htmlnorm.c 2006-04-30 11:25:53.000000000 +0200 -@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ - { - int fd_tmp, tag_length, tag_arg_length, binary; - int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; -- FILE *stream_in; -+ FILE *stream_in = 0; - html_state state=HTML_NORM, next_state=HTML_BAD_STATE; - char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; - char tag_val[HTML_STR_LENGTH+1], *tmp_file; diff --git a/clamav-0.88.4-visibility.patch b/clamav-0.88.4-visibility.patch deleted file mode 100644 index 34ef51e..0000000 --- a/clamav-0.88.4-visibility.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- clamav-0.88.4/libclamav/md5.c.visibility 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.4/libclamav/md5.c 2006-08-11 08:19:02.000000000 +0200 -@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da - return ptr; - } - --void MD5_Init(MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx) - { - ctx->a = 0x67452301; - ctx->b = 0xefcdab89; -@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx) - ctx->hi = 0; - } - --void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) -+void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) - { - MD5_u32plus saved_lo; - unsigned long used, free; -@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data - memcpy(ctx->buffer, data, size); - } - --void MD5_Final(unsigned char *result, MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx) - { - unsigned long used, free; - commit 693b061eac2a68f66601c2f80fa51621872b7a95 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Feb 11 22:30:35 2008 +0000 updated to 0.92.1 diff --git a/.cvsignore b/.cvsignore index f6ee3be..d34f911 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ clamav-*.tar.gz* +clamav-*.tar.bz2* clamav-*.*.rpm diff --git a/Makefile b/Makefile index 21be25f..2cc62a7 100644 --- a/Makefile +++ b/Makefile @@ -19,3 +19,16 @@ MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) + + +# can not use final tarball name here as it will conflict with rules +# within Makefile.common +TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp +TARBALL = ${NAME}-${VERSION}.tar.gz + +clean-sources: ${TARBALL_CLEAN} + +${TARBALL_CLEAN}: ${TARBALL} + rm -f $@.tmp + zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp + mv $@.tmp $@ diff --git a/clamav.spec b/clamav.spec index 919bf65..70932c8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.65 2008/01/01 17:10:12 ensc Exp $ +## $Id: clamav.spec,v 1.66 2008/01/01 17:33:05 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92 -Release: %release_func 6 +Version: 0.92.1 +Release: %release_func 1 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -30,8 +30,14 @@ Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar %else # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. -# All that is needed to make the clean tarball is: rm -rf libclamunrar* -Source0: %name-%version.clean.tar.gz +# tarball was created by +# +# zcat clamav-$V.tar.gz | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > clamav-$V-norar.tar.bz2 +# +# or +# +# make clean-sources [TARBALL=<original-tarball>] +Source0: %name-%version-norar.tar.bz2 %endif Source1: clamd-wrapper Source2: clamd.sysconfig @@ -257,7 +263,7 @@ Sendmail customizations of the clamav-milter. install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar{,_iface}/{Makefile.in,all,install}} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -549,6 +555,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + * Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 - redisabled unrar stuff completely by using clean sources - splitted -milter subpackage into pieces to allow use without sendmail diff --git a/lastver b/lastver index ca6156a..da011ce 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.92 +0.92.1 diff --git a/sources b/sources index 10dd892..6e9b8a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz +aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 commit 089cc9d166636f758fe483327989d9ad695b0457 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 17:33:05 2008 +0000 minor optimizations diff --git a/clamav.spec b/clamav.spec index 64e1074..919bf65 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.64 2008/01/01 14:59:15 ensc Exp $ +## $Id: clamav.spec,v 1.65 2008/01/01 17:10:12 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -257,7 +257,7 @@ Sendmail customizations of the clamav-milter. install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} -%{!?with_unrar:> libclamunrar/Makefile.in; >libclamunrar_iface/Makefile.in; touch libclamunrar{,_iface}/{all,install}} +%{!?with_unrar:touch libclamunrar{,_iface}/{Makefile.in,all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; commit 46c82f4bf86733c97dfab69594ef9f91336a21e2 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 17:10:12 2008 +0000 - redisabled unrar stuff completely by using clean sources - splitted -milter subpackage into pieces to allow use without sendmail (#239037) diff --git a/clamav.spec b/clamav.spec index fe53a7b..64e1074 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.63 2008/01/01 13:19:16 ensc Exp $ +## $Id: clamav.spec,v 1.64 2008/01/01 14:59:15 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,13 +19,20 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 5 +Release: %release_func 6 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net +%if 0%{?with_unrar:1} Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +%else +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# All that is needed to make the clean tarball is: rm -rf libclamunrar* +Source0: %name-%version.clean.tar.gz +%endif Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -114,18 +121,32 @@ Requires(pre): %_initrddir Requires(postun): %_initrddir %package milter -Summary: Sendmail-milter for the Clam Antivirus scanner +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Requires: clamav-milter-core = %version-%release +Requires: milter(clamav) + +%package milter-core +Summary: Core milter module for the Clam Antivirus scanner Group: System Environment/Daemons Requires: init(clamav-milter) -Source300: README.fedora BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel Provides: user(%milteruser) Provides: group(%milteruser) -Requires: sendmail Requires(post): coreutils %{?FE_USERADD_REQ} +%package milter-sendmail +Summary: Sendmail customizations for clamav-milter +Group: System Environment/Daemons +Source300: README.fedora +Requires: sendmail +Requires: clamav-milter-core = %version-%release +Provides: milter(clamav) = sendmail +Conflicts: milter(clamav) < sendmail +Conflicts: milter(clamav) > sendmail + %package milter-sysv Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons @@ -216,6 +237,12 @@ This package contains files which are needed to run the clamav-milter. %description milter-sysv The SysV initscripts for clamav-milter. +%description milter-core +Core files for the clamav-milter. + +%description milter-sendmail +Sendmail customizations of the clamav-milter. + ## ------------------------------------------------------------ @@ -229,6 +256,8 @@ The SysV initscripts for clamav-milter. install -p -m0644 %SOURCE300 clamav-milter/ +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:> libclamunrar/Makefile.in; >libclamunrar_iface/Makefile.in; touch libclamunrar{,_iface}/{all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -498,14 +527,20 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files milter %defattr(-,root,root,-) -%doc clamav-milter/INSTALL clamav-milter/README.fedora + +%files milter-core +%defattr(-,root,root,-) +%doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%attr(0700,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%files milter-sendmail +%defattr(-,root,root,-) +%doc clamav-milter/README.fedora +%attr(0700,%milteruser,%milteruser) %dir %milterstatedir +%ghost %milterstatedir/* %files milter-sysv %defattr(-,root,root,-) @@ -514,6 +549,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + * Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 - use a better way to disable RPATH-generation (needed for '--with unrar' builds) diff --git a/sources b/sources index 6999f43..10dd892 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -e500651858a9187a87025c8a5c23969c clamav-0.92.tar.gz -5ac3264d9b01b7dce93f646e247b2621 clamav-0.92.tar.gz.sig +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz commit 00b1bfee950f366b37e29456d9ef3535b1ee820e Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 14:59:15 2008 +0000 use a better way to disable RPATH-generation (needed for '--with unrar' builds) diff --git a/clamav.spec b/clamav.spec index 71c14f3..fe53a7b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.62 2007/12/21 18:11:32 spot Exp $ +## $Id: clamav.spec,v 1.63 2008/01/01 13:19:16 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 4 +Release: %release_func 5 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -248,14 +248,13 @@ export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static --disable-rpath \ + --enable-milter --disable-static \ %{!?with_unrar:--disable-unrar} # build with --as-needed and disable rpath sed -i \ -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g' \ libtool @@ -515,6 +514,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + * Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 - added a README.fedora to the milter package (#240610) - ship original sources again; unrar is now licensed correctly (no more commit 019ada64a99a5d99349f06e27c29cfbaec008c10 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 13:19:16 2008 +0000 merged with F-8 diff --git a/.cvsignore b/.cvsignore index cdd308b..f6ee3be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -clamav-0.92.clean.tar.gz +clamav-*.tar.gz* +clamav-*.*.rpm diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..b9f572e --- /dev/null +++ b/README.fedora @@ -0,0 +1,5 @@ +Add + + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl + +to your sendmail.mc. diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch deleted file mode 100644 index 66b662e..0000000 --- a/clamav-0.90rc3-private.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 -+++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 -@@ -6,6 +6,6 @@ - Name: libclamav - Description: A GPL virus scanner - Version: @LIBCLAMAV_VERSION@ --Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -- -+Libs: -L${libdir} -lclamav -+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ -+Cflags: -I${includedir} ---- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 -+++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 -@@ -55,11 +55,11 @@ - ;; - - --cflags) -- echo -I@includedir@ @CFLAGS@ -+ echo -I@includedir@ - ;; - - --libs) -- echo -L@libdir@ @LIBCLAMAV_LIBS@ -+ echo -L@libdir@ -lclamav - ;; - - *) diff --git a/clamav-0.91.2-open.patch b/clamav-0.91.2-open.patch deleted file mode 100644 index b933e46..0000000 --- a/clamav-0.91.2-open.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 -+++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 -@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da - if (dazuko->device < 0) - { - -- dazuko->device = open("/dev/dazuko", 0); -+ dazuko->device = open("/dev/dazuko", O_RDONLY); - if (dazuko->device < 0) - return -1; - ---- clamav-0.91.2/shared/misc.c.open 2007-03-31 21:27:31.000000000 +0200 -+++ clamav-0.91.2/shared/misc.c 2007-08-25 12:36:30.000000000 +0200 -@@ -165,7 +165,7 @@ int filecopy(const char *src, const char - if((s = open(src, O_RDONLY|O_BINARY)) == -1) - return -1; - -- if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY)) == -1) { -+ if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, 0600)) == -1) { - close(s); - return -1; - } diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch deleted file mode 100644 index b63921e..0000000 --- a/clamav-0.92-nounrar.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in ---- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 -+++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 -@@ -242,7 +242,7 @@ target_os = @target_os@ - target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - bin_SCRIPTS = clamav-config - pkgconfigdir = $(libdir)/pkgconfig -diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in ---- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 -+++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 -@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex - AC_C_FPU_BIGENDIAN - - AC_OUTPUT([ --libclamunrar/Makefile --libclamunrar_iface/Makefile - libclamav/Makefile - clamscan/Makefile - database/Makefile -diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am ---- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 -+++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 -@@ -16,7 +16,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - # MA 02110-1301, USA. - --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - - bin_SCRIPTS=clamav-config -diff -up clamav-0.92/configure.BAD clamav-0.92/configure ---- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 -+++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 -@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi - esac - - --ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" -+ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -27013,8 +27013,6 @@ do - case $ac_config_target in - "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; -- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; - "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; - "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; - "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav-0.92-private.patch b/clamav-0.92-private.patch new file mode 100644 index 0000000..bab2948 --- /dev/null +++ b/clamav-0.92-private.patch @@ -0,0 +1,29 @@ +--- clamav-0.92/libclamav.pc.in.private ++++ clamav-0.92/libclamav.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.92/clamav-config.in.private ++++ clamav-0.92/clamav-config.in +@@ -54,12 +54,8 @@ while test $# -gt 0; do + usage 0 + ;; + +- --cflags) +- echo -I@includedir@ @CFLAGS@ +- ;; +- +- --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ (--cflags|--libs) ++ ${PKG_CONFIG:-pkg-config} "$1" libclamav + ;; + + *) diff --git a/clamav-notify-servers b/clamav-notify-servers index 22d57a6..f115e89 100644 --- a/clamav-notify-servers +++ b/clamav-notify-servers @@ -1,16 +1,16 @@ #! /bin/bash # Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # 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. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/clamav.spec b/clamav.spec index 0e049d1..71c14f3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,7 +1,8 @@ -## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ +## $Id: clamav.spec,v 1.62 2007/12/21 18:11:32 spot Exp $ ## Fedora Extras specific customization below... -%bcond_without fedora +%bcond_without fedora +%bcond_with unrar ## %global username clamav @@ -18,19 +19,13 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 3 +Release: %release_func 4 -License: GPLv2 +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# All that is needed to make the clean tarball is: rm -rf libclamunrar* -# Note that you also need patch26. -Source0: clamav-%{version}.clean.tar.gz -# Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -# No sense in using this file for the time being. -# Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -40,9 +35,8 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch24: clamav-0.90rc3-private.patch +Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -73,6 +67,7 @@ Source100: clamd-gen Requires: clamav-lib = %version-%release Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig +Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner @@ -122,6 +117,7 @@ Requires(postun): %_initrddir Summary: Sendmail-milter for the Clam Antivirus scanner Group: System Environment/Daemons Requires: init(clamav-milter) +Source300: README.fedora BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel Provides: user(%milteruser) @@ -215,12 +211,7 @@ SysV initscripts template for the clamav server %description milter -This package contains files which are needed to run the clamav-milter. It -can be activated by adding - -| INPUT_MAIL_FILTER(`clamav', `S=local:%milterstatedir/clamav.sock, F=, T=S:4m;R:4m')dnl - -to your sendmail.mc. +This package contains files which are needed to run the clamav-milter. %description milter-sysv The SysV initscripts for clamav-milter. @@ -235,7 +226,9 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .nounrar + +install -p -m0644 %SOURCE300 clamav-milter/ + perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -254,12 +247,16 @@ CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' -%configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static --disable-unrar -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -# No rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%configure --disable-clamav --with-dbdir=/var/lib/clamav \ + --enable-milter --disable-static --disable-rpath \ + %{!?with_unrar:--disable-unrar} + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + libtool make %{?_smp_mflags} @@ -291,15 +288,20 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir/daily.inc + ${RPM_BUILD_ROOT}%homedir/{main,daily}.inc rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la -for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do - touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i + +for i in cfg db fp hdb info mdb mdu ndb ndu pdb wdb zmd; do + touch ${RPM_BUILD_ROOT}%homedir/daily.inc/daily.$i + touch ${RPM_BUILD_ROOT}%homedir/main.inc/main.$i done +touch ${RPM_BUILD_ROOT}%homedir/daily.inc/COPYING +touch ${RPM_BUILD_ROOT}%homedir/main.inc/COPYING + ## prepare the server-files mkdir _doc_server @@ -470,14 +472,8 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd +%ghost %attr(0664,%username,%username) %homedir/daily.inc/* +%ghost %attr(0664,%username,%username) %homedir/main.inc/* ## ----------------------- @@ -503,7 +499,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files milter %defattr(-,root,root,-) -%doc clamav-milter/INSTALL +%doc clamav-milter/INSTALL clamav-milter/README.fedora %_sbindir/*milter* %_mandir/man8/clamav-milter* %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf @@ -519,6 +515,16 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + * Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability diff --git a/clamd-gen b/clamd-gen index 46739ba..ac5dae2 100755 --- a/clamd-gen +++ b/clamd-gen @@ -1,16 +1,16 @@ #! /bin/bash # Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # 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. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -19,7 +19,7 @@ function showHelp() { echo \ $"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> - --license=<LICENSE> --username=>USERNAME> + --license=<LICENSE> --username=>USERNAME> " exit 0 } @@ -227,7 +227,7 @@ function rpm.genFiles %dir %minitsvcdir %config(noreplace) %verify(not mtime) %minitsvcdir/params %config %minitsvcdir/run - %minitsvcdir/respawn + %minitsvcdir/respawn %endif EOF } diff --git a/clamd-wrapper b/clamd-wrapper index 372005f..c32e34e 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -28,7 +28,7 @@ CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf CLAMD_OPTIONS= ## backward-compatibility check... for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do + /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do CLAMD_SOCKET=$i test ! -e "$i" || break done diff --git a/freshclam-sleep b/freshclam-sleep index 2cb6bb2..7bdcf78 100755 --- a/freshclam-sleep +++ b/freshclam-sleep @@ -1,15 +1,15 @@ #! /bin/bash # Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # 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. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -33,7 +33,7 @@ case $FRESHCLAM_DELAY in (disabled-warn) echo $"\ WARNING: update of clamav database is disabled; please see - '$f' + '$f' for information how to enable the periodic update resp. how to turn off this message." >&2 exit 1 diff --git a/lastver b/lastver index 021c263..ca6156a 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.91.2 +0.92 diff --git a/sources b/sources index 10dd892..6999f43 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz +e500651858a9187a87025c8a5c23969c clamav-0.92.tar.gz +5ac3264d9b01b7dce93f646e247b2621 clamav-0.92.tar.gz.sig diff --git a/verinfo b/verinfo index 2d35ad0..a4a0b38 100644 --- a/verinfo +++ b/verinfo @@ -1,2 +1,2 @@ http://prdownloads.sourceforge.net/sourceforge/clamav/ -clamav-(.*?)\.tar\. +clamav-([0-9.-]*?)\.tar\. commit 128b1e458fc8dcab82f7d6a9bc6a98a5a873355a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 19:23:28 2007 +0000 clamav-0.90rc3-private.patch needed to be resynced diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch index 7ef309e..db4e000 100644 --- a/clamav-0.80-initoff.patch +++ b/clamav-0.80-initoff.patch @@ -4,8 +4,8 @@ # # clamav-milter This script starts and stops the clamav-milter daemon # --# chkconfig: 2345 71 40 -+# chkconfig: - 71 40 +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 # # description: clamav-milter is a daemon which hooks into sendmail and routes # email messages to clamav diff --git a/clamav.spec b/clamav.spec index 28ef9f3..e006b41 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.28 2007/12/21 18:10:56 spot Exp $ +## $Id: clamav.spec,v 1.47 2007/12/21 19:12:19 spot Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 4 +Release: %release_func 4.1 License: GPLv2 Group: Applications/File commit 0cb76702f80a28fead3971b25d00d1fcf5b1cd3e Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 19:12:19 2007 +0000 Fix EPEL diff --git a/clamav.spec b/clamav.spec index 0e049d1..28ef9f3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,7 +1,7 @@ -## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ +## $Id: clamav.spec,v 1.28 2007/12/21 18:10:56 spot Exp $ ## Fedora Extras specific customization below... -%bcond_without fedora +# %bcond_without fedora ## %global username clamav @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 3 +Release: %release_func 4 License: GPLv2 Group: Applications/File @@ -519,6 +519,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-4 +- EPEL fixes + * Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability commit cf29647a15f7741d92b6cbf16daf19917c5cce16 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:11:32 2007 +0000 Fix changelog to match version diff --git a/clamav.spec b/clamav.spec index 69321c3..0e049d1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ +## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -519,7 +519,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability commit 9d37ba25fb56f5cecc8d04aa734139f63a468879 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:11:02 2007 +0000 Fix changelog to match version diff --git a/clamav.spec b/clamav.spec index 69321c3..0e049d1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ +## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -519,7 +519,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability commit 34e19ca3c910b337f8c0e086ded8db511d089a4b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:06:29 2007 +0000 0.92 on all active branches diff --git a/.cvsignore b/.cvsignore index 3fc2429..cdd308b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.91.2-clean.tar.bz2 +clamav-0.92.clean.tar.gz diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch new file mode 100644 index 0000000..b63921e --- /dev/null +++ b/clamav-0.92-nounrar.patch @@ -0,0 +1,57 @@ +diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in +--- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 ++++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 +@@ -242,7 +242,7 @@ target_os = @target_os@ + target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + bin_SCRIPTS = clamav-config + pkgconfigdir = $(libdir)/pkgconfig +diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in +--- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 ++++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 +@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex + AC_C_FPU_BIGENDIAN + + AC_OUTPUT([ +-libclamunrar/Makefile +-libclamunrar_iface/Makefile + libclamav/Makefile + clamscan/Makefile + database/Makefile +diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am +--- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 ++++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 +@@ -16,7 +16,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + # MA 02110-1301, USA. + +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + + bin_SCRIPTS=clamav-config +diff -up clamav-0.92/configure.BAD clamav-0.92/configure +--- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 ++++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 +@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi + esac + + +-ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" ++ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -27013,8 +27013,6 @@ do + case $ac_config_target in + "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; +- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; + "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; + "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; + "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav-0.92-open.patch b/clamav-0.92-open.patch new file mode 100644 index 0000000..040fc20 --- /dev/null +++ b/clamav-0.92-open.patch @@ -0,0 +1,11 @@ +--- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 ++++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 +@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da + if (dazuko->device < 0) + { + +- dazuko->device = open("/dev/dazuko", 0); ++ dazuko->device = open("/dev/dazuko", O_RDONLY); + if (dazuko->device < 0) + return -1; + diff --git a/clamav.spec b/clamav.spec index 6278230..69321c3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.60 2007/10/29 10:22:00 spot Exp $ +## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.91.2 +Version: 0.92 Release: %release_func 3 License: GPLv2 @@ -25,7 +25,9 @@ Group: Applications/File URL: http://www.clamav.net # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. -Source0: clamav-0.91.2-clean.tar.bz2 +# All that is needed to make the clean tarball is: rm -rf libclamunrar* +# Note that you also need patch26. +Source0: clamav-%{version}.clean.tar.gz # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. # Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig @@ -39,7 +41,8 @@ Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch -Patch25: clamav-0.91.2-open.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -232,6 +235,7 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .nounrar perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -251,8 +255,12 @@ export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static + --enable-milter --disable-static --disable-unrar sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +# No rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + make %{?_smp_mflags} @@ -511,6 +519,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 - remove RAR decompression code from source tarball because of legal problems (resolves 334371) diff --git a/sources b/sources index 8a090b8..10dd892 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c072b629b19d97ebe246b87269bd2ac2 clamav-0.91.2-clean.tar.bz2 +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz commit 85ce1bf814ac36ef561c1d03008282782885b305 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:06:01 2007 +0000 0.92 on all active branches diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch new file mode 100644 index 0000000..66b662e --- /dev/null +++ b/clamav-0.90rc3-private.patch @@ -0,0 +1,28 @@ +--- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 ++++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 +@@ -6,6 +6,6 @@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 ++++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 +@@ -55,11 +55,11 @@ + ;; + + --cflags) +- echo -I@includedir@ @CFLAGS@ ++ echo -I@includedir@ + ;; + + --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ echo -L@libdir@ -lclamav + ;; + + *) diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch new file mode 100644 index 0000000..b63921e --- /dev/null +++ b/clamav-0.92-nounrar.patch @@ -0,0 +1,57 @@ +diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in +--- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 ++++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 +@@ -242,7 +242,7 @@ target_os = @target_os@ + target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + bin_SCRIPTS = clamav-config + pkgconfigdir = $(libdir)/pkgconfig +diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in +--- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 ++++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 +@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex + AC_C_FPU_BIGENDIAN + + AC_OUTPUT([ +-libclamunrar/Makefile +-libclamunrar_iface/Makefile + libclamav/Makefile + clamscan/Makefile + database/Makefile +diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am +--- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 ++++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 +@@ -16,7 +16,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + # MA 02110-1301, USA. + +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + + bin_SCRIPTS=clamav-config +diff -up clamav-0.92/configure.BAD clamav-0.92/configure +--- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 ++++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 +@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi + esac + + +-ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" ++ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -27013,8 +27013,6 @@ do + case $ac_config_target in + "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; +- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; + "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; + "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; + "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav-0.92-open.patch b/clamav-0.92-open.patch new file mode 100644 index 0000000..040fc20 --- /dev/null +++ b/clamav-0.92-open.patch @@ -0,0 +1,11 @@ +--- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 ++++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 +@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da + if (dazuko->device < 0) + { + +- dazuko->device = open("/dev/dazuko", 0); ++ dazuko->device = open("/dev/dazuko", O_RDONLY); + if (dazuko->device < 0) + return -1; + diff --git a/clamav.spec b/clamav.spec index f893c9a..69321c3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,10 +1,9 @@ -## $Id: clamav.spec,v 1.43 2006/10/18 07:22:18 ensc Exp $ +## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora ## - %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log @@ -18,14 +17,20 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.6 -Release: %release_func 1 +Version: 0.92 +Release: %release_func 3 -License: GPL +License: GPLv2 Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# All that is needed to make the clean tarball is: rm -rf libclamunrar* +# Note that you also need patch26. +Source0: clamav-%{version}.clean.tar.gz +# Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +# No sense in using this file for the time being. +# Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -33,18 +38,29 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch0: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch -Patch1: clamav-0.88.1-strncpy.patch -Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch23: clamav-0.88.4-visibility.patch +Patch24: clamav-0.90rc3-private.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: %_includedir/tcpd.h BuildRequires: bc +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(clamav) +Provides: group(clamav) +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?FE_USERADD_REQ} + %package lib Summary: Dynamic libraries for the Clam Antivirus scanner Group: System Environment/Libraries @@ -54,17 +70,25 @@ Requires: data(clamav) Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %version-%release +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -Provides: data(clamav) -Provides: user(clamav) -Provides: group(clamav) -BuildRequires: fedora-usermgmt-devel -%{?FE_USERADD_REQ} +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -72,7 +96,7 @@ Group: Applications/File Source200: freshclam-sleep Source201: freshclam.sysconfig Source202: clamav-update.cron -Requires: clamav-data = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod @@ -83,7 +107,8 @@ Summary: Clam Antivirus scanner server Group: System Environment/Daemons Requires: init(clamav-server) Requires: data(clamav) -Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release %package server-sysv Summary: SysV initscripts for clamav server @@ -129,6 +154,9 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. %description lib This package contains dynamic libraries shared between applications @@ -141,7 +169,29 @@ build applications using clamav. %description data This package contains the virus-database needed by clamav. This database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + %description update This package contains programs which can be used to update the clamav @@ -180,13 +230,12 @@ The SysV initscripts for clamav-milter. %prep %setup -q -%patch0 -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch' -%patch1 -p1 -b .strncpy -%patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff -%patch23 -p1 -b .visibility +%patch24 -p1 -b .private +%patch25 -p1 -b .open +%patch26 -p1 -b .nounrar perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -202,15 +251,16 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf %build CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check +export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter + --enable-milter --disable-static --disable-unrar +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +# No rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -## HACK: ./configure checks if freshclam.conf/clamd.conf are existing -## in current filesystem and skips its installation then. Was introduced -## by 0.66. -perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; - s!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_FALSE\@),[^,]*,!\1,\#,!g' config.status -./config.status make %{?_smp_mflags} @@ -240,11 +290,16 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%_initrddir + ${RPM_BUILD_ROOT}%_initrddir \ + ${RPM_BUILD_ROOT}%homedir/daily.inc rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la +for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do + touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i +done + ## prepare the server-files mkdir _doc_server @@ -290,10 +345,7 @@ subst etc/clamd.conf /etc/clamd.d/milter.conf \ cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter -## The '-blo' options might be usefully here -- especially for testing; see -## "man 8 clamav-milter" for further options -CLAMAV_FLAGS='--max-children=2 -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' -CLAMAV_USER='%milteruser' +CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' EOF install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter @@ -307,11 +359,16 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ -%pre data +%pre filesystem %__fe_groupadd 4 -r %username &>/dev/null || : %__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ -c 'Clamav database update user' -g %username %username &>/dev/null || : +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + %post update test -e %freshclamlog || { touch %freshclamlog @@ -319,10 +376,6 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%postun data -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - %pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ @@ -357,7 +410,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files %defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE %doc docs/*.pdf %_bindir/* %_mandir/man[15]/* @@ -376,9 +429,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files devel %defattr(-,root,root,-) %_includedir/* -%_libdir/*.*a %_libdir/*.so -%dir %pkgdatadir %pkgdatadir/template %pkgdatadir/clamd-gen %_libdir/pkgconfig/* @@ -386,14 +437,25 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : ## ----------------------- +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,%username,%username) %dir %homedir/daily.inc +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + %files data %defattr(-,%username,%username,-) -%dir %homedir # use %%config to keep files which were updated by 'freshclam' # already. Without this tag, they would be overridden with older # versions whenever a new -data package is installed. %config %verify(not size md5 mtime) %homedir/*.cvd + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/main.cvd + ## ----------------------- %files update @@ -408,6 +470,16 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd + + ## ----------------------- %files server @@ -415,7 +487,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc _doc_server/* %_mandir/man[58]/clamd* %_sbindir/* -%dir %pkgdatadir %pkgdatadir/clamd-wrapper %dir %_sysconfdir/clamd.d @@ -448,6 +519,70 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam + +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + * Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 - updated to 0.88.6 @@ -724,83 +859,3 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : * Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 - added security fix for http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 - -* Fri Nov 28 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.4 -- fixed typo in README (sysconf.d vs. sysconf) -- make build on rhl8 succeed by adding '|| :' to %%check - -* Tue Nov 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.3 -- substitute 'User' in sample cfg-file also -- uncommented some cfg-options which are needed for a proper operation -- fixed typos in README (thanks to Michael Schwendt) - -* Mon Nov 17 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.2 -- fixed path of 'LocalSocket' and documented steps how to create it -- added a missing backslash at the configure-call -- do not package clamav-milter.8 manpage -- documented 'User' in the README - -* Sat Nov 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.1 -- updated to 0.65 -- added gmp-devel buildrequires: -- changed installed databases from 'viruses.db*' to '*.cvb' -- made milter-build conditional; 0.65 is missing some files which would break the build else -- fixed typo (clamav-notify-server -> clamav-notify-servers) - -* Fri Oct 31 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.60-0.fdr.5 -- created -update subpackage and filled it with files from main and -data package -- set more reasonable default-values in the sample config-file -- made the README in -server more clear -- moved clamav-milter man-page into -milter subpackage -- use fedora-usermgmt -- renamed -daemon subpackage and related files to -server -- use abstract 'data(clamav)' notation for clamav-data dependencies -- use 'init(...)' requirements as placeholder for future -sysv/-minit subpackages - -* Sat Aug 16 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.4 -- backported clamav-sockwrite.c to C89 - -* Fri Aug 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- updated Source0 URL -- fixed portuguese i18n-abbreviation - -* Fri Jul 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- use LSB compliant exit-codes in the init-script -- other init-script cleanups - -* Tue Jul 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.2 -- updated %%description -- removed README from %%doc-list - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.1 -- disabled -milter subpackage; I do not get it to run :( - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.0.1 -- updated to 0.60 -- modernized usercreation -- added -milter subpackage - -* Thu May 8 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.2 -- added BUGS file -- moved clamd.8 man-page into daemon-subpackage -- some cosmetical cleanups -- removed config-patch; it was unused -- made some paths more fedora-compliant -- honor $RPM_OPT_FLAGS -- added clamav-notify-daemons script -- removed obsoleted %%socketdir - -* Wed May 7 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.0.1 -- splitted into additional -data/-daemon packages -- added clamav-sockwrite program -- updated to recent fedora policies - -* Thu Nov 21 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.54-1 -- updated to 0.54 -- updated config-patch - -* Tue Oct 29 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.52-1 -- updated to 0.52 - -* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- Initial build. diff --git a/sources b/sources index e74691d..10dd892 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz -38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz commit 73644b64f36c4e5953029b0d53a6a0d1f363d780 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 29 14:25:28 2007 +0000 Pull out rar code from clamav, resolve legal issue (334371). diff --git a/.cvsignore b/.cvsignore index f6ee3be..3fc2429 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -clamav-*.tar.gz* -clamav-*.*.rpm +clamav-0.91.2-clean.tar.bz2 diff --git a/clamav.spec b/clamav.spec index a0b599e..6278230 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.58 2007/08/25 10:40:56 ensc Exp $ +## $Id: clamav.spec,v 1.60 2007/10/29 10:22:00 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,13 +18,17 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.91.2 -Release: %release_func 2 +Release: %release_func 3 -License: GPL +License: GPLv2 Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +Source0: clamav-0.91.2-clean.tar.bz2 +# Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +# No sense in using this file for the time being. +# Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -507,6 +511,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + * Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 - Bump release for upgrade path. diff --git a/sources b/sources index 7a01a39..8a090b8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -2a7265d17cfa80c32858978f16a3f47b clamav-0.91.2.tar.gz -9e1b4659b506315dbc9f1c06dbe6273b clamav-0.91.2.tar.gz.sig +c072b629b19d97ebe246b87269bd2ac2 clamav-0.91.2-clean.tar.bz2 commit 0b7f0c1221f44311cd97327030b5f71d44b6ef35 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Mon Sep 24 18:17:46 2007 +0000 - Bump release for upgrade path. diff --git a/clamav.spec b/clamav.spec index 5b0e5cd..a0b599e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.57 2007/08/25 10:12:31 ensc Exp $ +## $Id: clamav.spec,v 1.58 2007/08/25 10:40:56 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.91.2 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -507,6 +507,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + * Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 - updated to 0.91.2 (SECURITY): - CVE-2007-4510 DOS in RTF parser commit d9370ed2889a28fee0176e2e0798a91aec5eb629 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Sep 2 11:30:08 2007 +0000 initial checkin diff --git a/lastver b/lastver new file mode 100644 index 0000000..021c263 --- /dev/null +++ b/lastver @@ -0,0 +1 @@ +0.91.2 diff --git a/verinfo b/verinfo new file mode 100644 index 0000000..2d35ad0 --- /dev/null +++ b/verinfo @@ -0,0 +1,2 @@ +http://prdownloads.sourceforge.net/sourceforge/clamav/ +clamav-(.*?)\.tar\. commit 7aecf13b517885415cebd7da07efce9b70b82573 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 25 10:40:56 2007 +0000 fixed an open(2) issue diff --git a/clamav-0.91.2-open.patch b/clamav-0.91.2-open.patch new file mode 100644 index 0000000..b933e46 --- /dev/null +++ b/clamav-0.91.2-open.patch @@ -0,0 +1,22 @@ +--- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 ++++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 +@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da + if (dazuko->device < 0) + { + +- dazuko->device = open("/dev/dazuko", 0); ++ dazuko->device = open("/dev/dazuko", O_RDONLY); + if (dazuko->device < 0) + return -1; + +--- clamav-0.91.2/shared/misc.c.open 2007-03-31 21:27:31.000000000 +0200 ++++ clamav-0.91.2/shared/misc.c 2007-08-25 12:36:30.000000000 +0200 +@@ -165,7 +165,7 @@ int filecopy(const char *src, const char + if((s = open(src, O_RDONLY|O_BINARY)) == -1) + return -1; + +- if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY)) == -1) { ++ if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, 0600)) == -1) { + close(s); + return -1; + } diff --git a/clamav.spec b/clamav.spec index 4b6b705..5b0e5cd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.56 2007/07/17 07:27:38 ensc Exp $ +## $Id: clamav.spec,v 1.57 2007/08/25 10:12:31 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -35,6 +35,7 @@ Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch +Patch25: clamav-0.91.2-open.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -226,6 +227,7 @@ The SysV initscripts for clamav-milter. %patch21 -p1 -b .path %patch22 -p1 -b .initoff %patch24 -p1 -b .private +%patch25 -p1 -b .open perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -511,6 +513,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - DOS in html normalizer - arbitrary command execution by special crafted recipients in clamav-milter's black-hole mode +- fixed an open(2) issue * Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 - updated to 0.91.1 commit 1d4259aaa9d4d2b5e387166d7660164c0f298575 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 25 10:12:31 2007 +0000 - updated to 0.91.2 (SECURITY): - CVE-2007-4510 DOS in RTF parser - DOS in html normalizer - arbitrary command execution by special crafted recipients in clamav-milter's black-hole mode diff --git a/clamav.spec b/clamav.spec index 361371c..4b6b705 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.55 2007/07/12 07:31:31 ensc Exp $ +## $Id: clamav.spec,v 1.56 2007/07/17 07:27:38 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.91.1 -Release: %release_func 0 +Version: 0.91.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -505,6 +505,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode + * Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 - updated to 0.91.1 diff --git a/sources b/sources index 4366c05..7a01a39 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -60152bf1e24b3fbdf0473794199e5215 clamav-0.91.1.tar.gz -79dd6dd870dbeb5d5a88e1327f82a015 clamav-0.91.1.tar.gz.sig +2a7265d17cfa80c32858978f16a3f47b clamav-0.91.2.tar.gz +9e1b4659b506315dbc9f1c06dbe6273b clamav-0.91.2.tar.gz.sig commit 07ca3e8f63ce599893ef168485711bc61b3d3e31 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jul 17 07:27:38 2007 +0000 updated to 0.91.1 diff --git a/clamav.spec b/clamav.spec index 732c243..361371c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.54 2007/05/31 19:37:44 ensc Exp $ +## $Id: clamav.spec,v 1.55 2007/07/12 07:31:31 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.91 +Version: 0.91.1 Release: %release_func 0 License: GPL @@ -505,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + * Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 - updated to 0.91 diff --git a/sources b/sources index 06a6d28..4366c05 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -35192423e44642c86ea69dc93f59cfb1 clamav-0.91.tar.gz -85b2e343dd60024bbb8b57671fd525ef clamav-0.91.tar.gz.sig +60152bf1e24b3fbdf0473794199e5215 clamav-0.91.1.tar.gz +79dd6dd870dbeb5d5a88e1327f82a015 clamav-0.91.1.tar.gz.sig commit c1a7b3706b72cefd1d58bee3f5945687f4223a70 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 12 07:31:31 2007 +0000 updated to 0.91 diff --git a/clamav.spec b/clamav.spec index 7009f84..732c243 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.53 2007/05/31 07:40:24 ensc Exp $ +## $Id: clamav.spec,v 1.54 2007/05/31 19:37:44 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90.3 -Release: %release_func 1 +Version: 0.91 +Release: %release_func 0 License: GPL Group: Applications/File @@ -505,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + * Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 - updated to 0.90.3 - BR tcpd.h instead of tcp_wrappers(-devel) to make it build both diff --git a/sources b/sources index 6f2abc1..06a6d28 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d42ccf7a32daeb7c7cc3c8c23a7793ea clamav-0.90.3.tar.gz -f6c5b6e941bcd2bed7105f7ce29a02f9 clamav-0.90.3.tar.gz.sig +35192423e44642c86ea69dc93f59cfb1 clamav-0.91.tar.gz +85b2e343dd60024bbb8b57671fd525ef clamav-0.91.tar.gz.sig commit a640334a8eab063415707665657ac2b2ee73294c Author: ensc <ensc(a)fedoraproject.org> Date: Thu May 31 19:37:44 2007 +0000 fixed tcp-wrappers BR diff --git a/clamav.spec b/clamav.spec index ec59663..7009f84 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.52 2007/04/13 07:37:40 ensc Exp $ +## $Id: clamav.spec,v 1.53 2007/05/31 07:40:24 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -39,7 +39,7 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: %_libdir/libwrap.so +BuildRequires: %_includedir/tcpd.h BuildRequires: bc %package filesystem @@ -507,7 +507,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog * Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 - updated to 0.90.3 -- BR libwrap.so instead of tcp_wrappers(-devel) to make it build both +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both in FC6- and F7+ * Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 commit f9850d977e524b00f51192143d8563322a45a878 Author: ensc <ensc(a)fedoraproject.org> Date: Thu May 31 07:40:24 2007 +0000 - updated to 0.90.3 - BR libwrap.so instead of tcp_wrappers(-devel) to make it build both in FC6- and F7+ diff --git a/clamav.spec b/clamav.spec index 0ab56f8..ec59663 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.51 2007/03/02 17:59:09 ensc Exp $ +## $Id: clamav.spec,v 1.52 2007/04/13 07:37:40 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90.2 +Version: 0.90.3 Release: %release_func 1 License: GPL @@ -39,7 +39,7 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: tcp_wrappers-devel +BuildRequires: %_libdir/libwrap.so BuildRequires: bc %package filesystem @@ -505,6 +505,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR libwrap.so instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + * Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 - [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 diff --git a/sources b/sources index af58feb..6f2abc1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -39d1f07a399b551b55096b6ec7325c33 clamav-0.90.2.tar.gz -eb31a4a230930568d55bc2dd45f373c0 clamav-0.90.2.tar.gz.sig +d42ccf7a32daeb7c7cc3c8c23a7793ea clamav-0.90.3.tar.gz +f6c5b6e941bcd2bed7105f7ce29a02f9 clamav-0.90.3.tar.gz.sig commit 20d8116dd064b707793cefa323761dcdded5e105 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Apr 13 07:37:40 2007 +0000 [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch index 7ef309e..db4e000 100644 --- a/clamav-0.80-initoff.patch +++ b/clamav-0.80-initoff.patch @@ -4,8 +4,8 @@ # # clamav-milter This script starts and stops the clamav-milter daemon # --# chkconfig: 2345 71 40 -+# chkconfig: - 71 40 +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 # # description: clamav-milter is a daemon which hooks into sendmail and routes # email messages to clamav diff --git a/clamav.spec b/clamav.spec index bd25be1..0ab56f8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.50 2007/03/02 17:17:37 ensc Exp $ +## $Id: clamav.spec,v 1.51 2007/03/02 17:59:09 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90.1 -Release: %release_func 2 +Version: 0.90.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -505,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + * Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 - BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' diff --git a/sources b/sources index 598ffdb..af58feb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -cd11c05b5476262eaea4fa3bd7dc25bf clamav-0.90.1.tar.gz -97061af5fe626136e70db3861640f381 clamav-0.90.1.tar.gz.sig +39d1f07a399b551b55096b6ec7325c33 clamav-0.90.2.tar.gz +eb31a4a230930568d55bc2dd45f373c0 clamav-0.90.2.tar.gz.sig commit 164549699e502c87d099635a9910c0d0daac094f Author: ensc <ensc(a)fedoraproject.org> Date: Fri Mar 2 17:59:09 2007 +0000 BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' diff --git a/clamav.spec b/clamav.spec index 59406af..bd25be1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.49 2007/02/18 21:25:26 ensc Exp $ +## $Id: clamav.spec,v 1.50 2007/03/02 17:17:37 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90.1 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -38,7 +38,8 @@ Patch24: clamav-0.90rc3-private.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: tcp_wrappers-devel BuildRequires: bc %package filesystem @@ -504,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + * Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 - updated to 0.90.1 - updated %%doc list commit 3077ab218570c4c6398ce451a01ae1c1f2e9ab9c Author: ensc <ensc(a)fedoraproject.org> Date: Fri Mar 2 17:17:37 2007 +0000 - updated to 0.90.1 - updated %%doc list diff --git a/clamav.spec b/clamav.spec index ac86cc3..59406af 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.48 2007/02/18 21:19:28 ensc Exp $ +## $Id: clamav.spec,v 1.49 2007/02/18 21:25:26 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90 +Version: 0.90.1 Release: %release_func 1 License: GPL @@ -395,7 +395,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files %defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE %doc docs/*.pdf %_bindir/* %_mandir/man[15]/* @@ -504,6 +504,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + * Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 - updated to final 0.90 - removed -visibility patch since fixed upstream diff --git a/sources b/sources index 32bb4ec..598ffdb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9d5d53eed766976c2cfc9b14d56b2bba clamav-0.90.tar.gz.sig -f04372e49c3c5ff3bd94bbe1fef2eaca clamav-0.90.tar.gz +cd11c05b5476262eaea4fa3bd7dc25bf clamav-0.90.1.tar.gz +97061af5fe626136e70db3861640f381 clamav-0.90.1.tar.gz.sig commit 5df338709c6f2fe74ee74c820afe830660390c91 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Feb 18 21:25:26 2007 +0000 updated release diff --git a/clamav.spec b/clamav.spec index 69f08ae..ac86cc3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.47 2007/02/04 11:57:35 ensc Exp $ +## $Id: clamav.spec,v 1.48 2007/02/18 21:19:28 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.4 +Release: %release_func 1 License: GPL Group: Applications/File commit b842833b0bed60711642f5b40286dfb7fe7c40ba Author: ensc <ensc(a)fedoraproject.org> Date: Sun Feb 18 21:19:28 2007 +0000 - updated to final 0.90 - removed -visibility patch since fixed upstream diff --git a/clamav-0.88.4-visibility.patch b/clamav-0.88.4-visibility.patch deleted file mode 100644 index 34ef51e..0000000 --- a/clamav-0.88.4-visibility.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- clamav-0.88.4/libclamav/md5.c.visibility 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.4/libclamav/md5.c 2006-08-11 08:19:02.000000000 +0200 -@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da - return ptr; - } - --void MD5_Init(MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx) - { - ctx->a = 0x67452301; - ctx->b = 0xefcdab89; -@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx) - ctx->hi = 0; - } - --void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) -+void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) - { - MD5_u32plus saved_lo; - unsigned long used, free; -@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data - memcpy(ctx->buffer, data, size); - } - --void MD5_Final(unsigned char *result, MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx) - { - unsigned long used, free; - diff --git a/clamav.spec b/clamav.spec index 6ae90e2..69f08ae 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,12 +1,9 @@ -## $Id: clamav.spec,v 1.46 2007/02/03 15:16:08 ensc Exp $ +## $Id: clamav.spec,v 1.47 2007/02/04 11:57:35 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora ## - -%global rcver rc3 - %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log @@ -21,13 +18,13 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.3.rc3 +Release: %release_func 0.4 License: GPL Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -37,7 +34,6 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch23: clamav-0.88.4-visibility.patch Patch24: clamav-0.90rc3-private.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release @@ -224,11 +220,10 @@ The SysV initscripts for clamav-milter. ## ------------------------------------------------------------ %prep -%setup -q -n %name-%version%{?rcver} +%setup -q %patch21 -p1 -b .path %patch22 -p1 -b .initoff -%patch23 -p1 -b .visibility %patch24 -p1 -b .private perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; @@ -509,6 +504,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + * Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 - build with -Wl,-as-needed and cleaned up pkgconfig file - removed old hack which forced installation of freshclam.conf; related diff --git a/sources b/sources index 6527451..32bb4ec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5af2bdbbb255829dd590609d900c1854 clamav-0.90rc3.tar.gz -978715ae312d5dda63a0591b0a4eae14 clamav-0.90rc3.tar.gz.sig +9d5d53eed766976c2cfc9b14d56b2bba clamav-0.90.tar.gz.sig +f04372e49c3c5ff3bd94bbe1fef2eaca clamav-0.90.tar.gz commit 0e58ab345a08dba81aea0155270a8e1a43cd07f4 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Feb 4 11:57:35 2007 +0000 - build with -Wl,-as-needed and cleaned up pkgconfig file - removed old hack which forced installation of freshclam.conf; related check was removed upstream - removed static library - removed %%changelog entries from before 2004 diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch new file mode 100644 index 0000000..66b662e --- /dev/null +++ b/clamav-0.90rc3-private.patch @@ -0,0 +1,28 @@ +--- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 ++++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 +@@ -6,6 +6,6 @@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 ++++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 +@@ -55,11 +55,11 @@ + ;; + + --cflags) +- echo -I@includedir@ @CFLAGS@ ++ echo -I@includedir@ + ;; + + --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ echo -L@libdir@ -lclamav + ;; + + *) diff --git a/clamav.spec b/clamav.spec index 4bd460e..6ae90e2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.45 2006/12/12 08:17:53 ensc Exp $ +## $Id: clamav.spec,v 1.46 2007/02/03 15:16:08 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.2.rc3 +Release: %release_func 0.3.rc3 License: GPL Group: Applications/File @@ -38,6 +38,7 @@ Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch23: clamav-0.88.4-visibility.patch +Patch24: clamav-0.90rc3-private.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -228,6 +229,7 @@ The SysV initscripts for clamav-milter. %patch21 -p1 -b .path %patch22 -p1 -b .initoff %patch23 -p1 -b .visibility +%patch24 -p1 -b .private perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -243,15 +245,12 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf %build CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check +export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter - -## HACK: ./configure checks if freshclam.conf/clamd.conf are existing -## in current filesystem and skips its installation then. Was introduced -## by 0.66. -perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; - s!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_FALSE\@),[^,]*,!\1,\#,!g' config.status -./config.status + --enable-milter --disable-static +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} @@ -420,7 +419,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files devel %defattr(-,root,root,-) %_includedir/* -%_libdir/*.*a %_libdir/*.so %pkgdatadir/template %pkgdatadir/clamd-gen @@ -511,6 +509,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + * Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 - updated to 0.90rc3 - splitted mandatory parts from the data-file into a separate -filesystem @@ -799,83 +804,3 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : * Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 - added security fix for http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 - -* Fri Nov 28 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.4 -- fixed typo in README (sysconf.d vs. sysconf) -- make build on rhl8 succeed by adding '|| :' to %%check - -* Tue Nov 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.3 -- substitute 'User' in sample cfg-file also -- uncommented some cfg-options which are needed for a proper operation -- fixed typos in README (thanks to Michael Schwendt) - -* Mon Nov 17 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.2 -- fixed path of 'LocalSocket' and documented steps how to create it -- added a missing backslash at the configure-call -- do not package clamav-milter.8 manpage -- documented 'User' in the README - -* Sat Nov 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.1 -- updated to 0.65 -- added gmp-devel buildrequires: -- changed installed databases from 'viruses.db*' to '*.cvb' -- made milter-build conditional; 0.65 is missing some files which would break the build else -- fixed typo (clamav-notify-server -> clamav-notify-servers) - -* Fri Oct 31 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.60-0.fdr.5 -- created -update subpackage and filled it with files from main and -data package -- set more reasonable default-values in the sample config-file -- made the README in -server more clear -- moved clamav-milter man-page into -milter subpackage -- use fedora-usermgmt -- renamed -daemon subpackage and related files to -server -- use abstract 'data(clamav)' notation for clamav-data dependencies -- use 'init(...)' requirements as placeholder for future -sysv/-minit subpackages - -* Sat Aug 16 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.4 -- backported clamav-sockwrite.c to C89 - -* Fri Aug 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- updated Source0 URL -- fixed portuguese i18n-abbreviation - -* Fri Jul 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- use LSB compliant exit-codes in the init-script -- other init-script cleanups - -* Tue Jul 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.2 -- updated %%description -- removed README from %%doc-list - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.1 -- disabled -milter subpackage; I do not get it to run :( - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.0.1 -- updated to 0.60 -- modernized usercreation -- added -milter subpackage - -* Thu May 8 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.2 -- added BUGS file -- moved clamd.8 man-page into daemon-subpackage -- some cosmetical cleanups -- removed config-patch; it was unused -- made some paths more fedora-compliant -- honor $RPM_OPT_FLAGS -- added clamav-notify-daemons script -- removed obsoleted %%socketdir - -* Wed May 7 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.0.1 -- splitted into additional -data/-daemon packages -- added clamav-sockwrite program -- updated to recent fedora policies - -* Thu Nov 21 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.54-1 -- updated to 0.54 -- updated config-patch - -* Tue Oct 29 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.52-1 -- updated to 0.52 - -* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- Initial build. commit 4ae894ed3f5bee1d9751813ca3d85d07e8678c4b Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 3 15:33:47 2007 +0000 - updated to 0.90rc3 diff --git a/sources b/sources index 5117994..6527451 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -34a9d58cf5bcb04dbe3eb32b5367a3f8 clamav-0.88.7.tar.gz -b19286b26aafe255c7e1e1d0fc4d3797 clamav-0.88.7.tar.gz.sig +5af2bdbbb255829dd590609d900c1854 clamav-0.90rc3.tar.gz +978715ae312d5dda63a0591b0a4eae14 clamav-0.90rc3.tar.gz.sig commit fead405bc3234e38069316b5c11507248c584727 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 3 15:16:08 2007 +0000 - updated to 0.90rc3 - splitted mandatory parts from the data-file into a separate -filesystem subpackage - added a -data-empty subpackage to allow a setup where database is updated per cron-job and user does not want to download the large -data package with outdated virus definitations (#214949) - %ghost'ed the files downloaded by freshclam diff --git a/clamav.spec b/clamav.spec index e564b35..4bd460e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,10 +1,12 @@ -## $Id: clamav.spec,v 1.44 2006/11/05 20:11:19 ensc Exp $ +## $Id: clamav.spec,v 1.45 2006/12/12 08:17:53 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora ## +%global rcver rc3 + %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log @@ -18,14 +20,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.7 -Release: %release_func 1 +Version: 0.90 +Release: %release_func 0.2.rc3 License: GPL Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -33,9 +35,6 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch0: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch -Patch1: clamav-0.88.1-strncpy.patch -Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch23: clamav-0.88.4-visibility.patch @@ -45,6 +44,17 @@ Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel BuildRequires: bc +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(clamav) +Provides: group(clamav) +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?FE_USERADD_REQ} + %package lib Summary: Dynamic libraries for the Clam Antivirus scanner Group: System Environment/Libraries @@ -54,17 +64,25 @@ Requires: data(clamav) Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %version-%release +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -Provides: data(clamav) -Provides: user(clamav) -Provides: group(clamav) -BuildRequires: fedora-usermgmt-devel -%{?FE_USERADD_REQ} +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -72,7 +90,7 @@ Group: Applications/File Source200: freshclam-sleep Source201: freshclam.sysconfig Source202: clamav-update.cron -Requires: clamav-data = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod @@ -83,7 +101,8 @@ Summary: Clam Antivirus scanner server Group: System Environment/Daemons Requires: init(clamav-server) Requires: data(clamav) -Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release %package server-sysv Summary: SysV initscripts for clamav server @@ -129,6 +148,9 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. %description lib This package contains dynamic libraries shared between applications @@ -141,7 +163,29 @@ build applications using clamav. %description data This package contains the virus-database needed by clamav. This database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + %description update This package contains programs which can be used to update the clamav @@ -179,11 +223,8 @@ The SysV initscripts for clamav-milter. ## ------------------------------------------------------------ %prep -%setup -q -%patch0 -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch' -%patch1 -p1 -b .strncpy +%setup -q -n %name-%version%{?rcver} -%patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff %patch23 -p1 -b .visibility @@ -240,11 +281,16 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%_initrddir + ${RPM_BUILD_ROOT}%_initrddir \ + ${RPM_BUILD_ROOT}%homedir/daily.inc rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la +for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do + touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i +done + ## prepare the server-files mkdir _doc_server @@ -290,10 +336,7 @@ subst etc/clamd.conf /etc/clamd.d/milter.conf \ cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter -## The '-blo' options might be usefully here -- especially for testing; see -## "man 8 clamav-milter" for further options -CLAMAV_FLAGS='--max-children=2 -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' -CLAMAV_USER='%milteruser' +CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' EOF install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter @@ -307,11 +350,16 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ -%pre data +%pre filesystem %__fe_groupadd 4 -r %username &>/dev/null || : %__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ -c 'Clamav database update user' -g %username %username &>/dev/null || : +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + %post update test -e %freshclamlog || { touch %freshclamlog @@ -319,10 +367,6 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%postun data -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - %pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ @@ -378,7 +422,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %_includedir/* %_libdir/*.*a %_libdir/*.so -%dir %pkgdatadir %pkgdatadir/template %pkgdatadir/clamd-gen %_libdir/pkgconfig/* @@ -386,14 +429,25 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : ## ----------------------- +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,%username,%username) %dir %homedir/daily.inc +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + %files data %defattr(-,%username,%username,-) -%dir %homedir # use %%config to keep files which were updated by 'freshclam' # already. Without this tag, they would be overridden with older # versions whenever a new -data package is installed. %config %verify(not size md5 mtime) %homedir/*.cvd + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/main.cvd + ## ----------------------- %files update @@ -408,6 +462,16 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd + + ## ----------------------- %files server @@ -415,7 +479,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc _doc_server/* %_mandir/man[58]/clamd* %_sbindir/* -%dir %pkgdatadir %pkgdatadir/clamd-wrapper %dir %_sysconfdir/clamd.d @@ -448,6 +511,15 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam + * Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 - updated to 0.88.7 commit 552980be36d784c5ff10bc150171b46564399ac9 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 3 15:15:39 2007 +0000 updated to 0.90rc3; these patches don't apply anymore diff --git a/clamav-0.70-user.patch b/clamav-0.70-user.patch deleted file mode 100644 index f7f42b1..0000000 --- a/clamav-0.70-user.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.user 2000-02-19 07:04:00.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 14:35:01.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # - # clamav-milter This script starts and stops the clamav-milter daemon - # -@@ -16,6 +16,7 @@ - - # Local clamav-milter config - CLAMAV_FLAGS= -+CLAMAV_USER= - test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter - - # Check that networking is up. -@@ -28,7 +29,7 @@ - - start() { - echo -n "Starting clamav-milter: " -- daemon clamav-milter ${CLAMAV_FLAGS} -+ daemon ${CLAMAV_USER:+--user $CLAMAV_USER} setsid /usr/sbin/clamav-milter ${CLAMAV_FLAGS} </dev/null - RETVAL=$? - echo - test $RETVAL -eq 0 && touch /var/lock/subsys/clamav-milter diff --git a/clamav-0.88.1-strncpy.patch b/clamav-0.88.1-strncpy.patch deleted file mode 100644 index ceceb7d..0000000 --- a/clamav-0.88.1-strncpy.patch +++ /dev/null @@ -1,26 +0,0 @@ -2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { diff --git a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch deleted file mode 100644 index 38f9d9d..0000000 --- a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- clamav-0.88.2/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-29 19:46:09.000000000 +0200 -+++ clamav-0.88.2/libclamav/pe.c 2006-04-30 11:25:53.000000000 +0200 -@@ -1555,7 +1555,7 @@ int cli_peheader(int desc, struct cli_pe - { - uint16_t e_magic; /* DOS signature ("MZ") */ - uint32_t e_lfanew; /* address of new exe header */ -- uint32_t min, max; -+ uint32_t min=0, max=0; - struct pe_image_file_hdr file_hdr; - struct pe_image_optional_hdr optional_hdr; - struct pe_image_section_hdr *section_hdr; ---- clamav-0.88.2/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 -+++ clamav-0.88.2/libclamav/htmlnorm.c 2006-04-30 11:25:53.000000000 +0200 -@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ - { - int fd_tmp, tag_length, tag_arg_length, binary; - int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; -- FILE *stream_in; -+ FILE *stream_in = 0; - html_state state=HTML_NORM, next_state=HTML_BAD_STATE; - char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; - char tag_val[HTML_STR_LENGTH+1], *tmp_file; commit 714bcbb9b4238e9c0480c92646505184d493d281 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Dec 12 08:17:53 2006 +0000 updated to 0.88.7 diff --git a/clamav.spec b/clamav.spec index f893c9a..e564b35 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.43 2006/10/18 07:22:18 ensc Exp $ +## $Id: clamav.spec,v 1.44 2006/11/05 20:11:19 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.6 +Version: 0.88.7 Release: %release_func 1 License: GPL @@ -448,6 +448,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + * Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 - updated to 0.88.6 diff --git a/sources b/sources index e74691d..5117994 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz -38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig +34a9d58cf5bcb04dbe3eb32b5367a3f8 clamav-0.88.7.tar.gz +b19286b26aafe255c7e1e1d0fc4d3797 clamav-0.88.7.tar.gz.sig commit 095844cfcac1d7bd6a1f31f96cd5d3bfa5b1b923 Author: Dennis Gilmore <ausil(a)fedoraproject.org> Date: Thu Nov 30 17:23:00 2006 +0000 Initialize branch EL-5 for clamav diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 commit a8e23fb58bf80a8697ad5e2bc49bcff217004cc0 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Nov 5 20:11:19 2006 +0000 updated to 0.88.6 diff --git a/clamav.spec b/clamav.spec index a3fba4e..f893c9a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.42 2006/10/04 22:32:25 c4chris Exp $ +## $Id: clamav.spec,v 1.43 2006/10/18 07:22:18 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.5 -Release: %release_func 1 +Version: 0.88.6 +Release: %release_func 1 License: GPL Group: Applications/File @@ -448,6 +448,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 +- updated to 0.88.6 + * Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 - added patch to set '__attribute__ ((visibility("hidden")))' for diff --git a/sources b/sources index fc5c4da..e74691d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d62376205647b208eba4191dde821830 clamav-0.88.5.tar.gz -5daea1b5d8ab49257dea3ccc5dacaf35 clamav-0.88.5.tar.gz.sig +db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz +38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig commit 953d4e4dc1de1f092691cace8019737596ad8113 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Oct 18 07:22:18 2006 +0000 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 - added patch to set '__attribute__ ((visibility("hidden")))' for exported MD5_*() functions (fixes #202043) diff --git a/clamav-0.88.4-visibility.patch b/clamav-0.88.4-visibility.patch new file mode 100644 index 0000000..34ef51e --- /dev/null +++ b/clamav-0.88.4-visibility.patch @@ -0,0 +1,29 @@ +--- clamav-0.88.4/libclamav/md5.c.visibility 2005-06-23 22:03:12.000000000 +0200 ++++ clamav-0.88.4/libclamav/md5.c 2006-08-11 08:19:02.000000000 +0200 +@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da + return ptr; + } + +-void MD5_Init(MD5_CTX *ctx) ++void __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx) + { + ctx->a = 0x67452301; + ctx->b = 0xefcdab89; +@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx) + ctx->hi = 0; + } + +-void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) ++void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) + { + MD5_u32plus saved_lo; + unsigned long used, free; +@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data + memcpy(ctx->buffer, data, size); + } + +-void MD5_Final(unsigned char *result, MD5_CTX *ctx) ++void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx) + { + unsigned long used, free; + diff --git a/clamav.spec b/clamav.spec index b6bb6f4..a3fba4e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.41 2006/09/21 18:27:43 ensc Exp $ +## $Id: clamav.spec,v 1.42 2006/10/04 22:32:25 c4chris Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.4 -Release: %release_func 4 +Version: 0.88.5 +Release: %release_func 1 License: GPL Group: Applications/File @@ -38,6 +38,7 @@ Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch +Patch23: clamav-0.88.4-visibility.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -185,6 +186,7 @@ The SysV initscripts for clamav-milter. %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff +%patch23 -p1 -b .visibility perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -446,6 +448,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 +- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 +- added patch to set '__attribute__ ((visibility("hidden")))' for + exported MD5_*() functions (fixes #202043) + * Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 diff --git a/sources b/sources index bca4b2c..fc5c4da 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7759784aa4506b314e6543e0f2a8587b clamav-0.88.4.tar.gz -450d59c0a663b5986cda1105b85ae673 clamav-0.88.4.tar.gz.sig +d62376205647b208eba4191dde821830 clamav-0.88.5.tar.gz +5daea1b5d8ab49257dea3ccc5dacaf35 clamav-0.88.5.tar.gz.sig commit d5918e831444dc5f65de614c9d6f2eb4b5f265c3 Author: Christian Iseli <c4chris(a)fedoraproject.org> Date: Wed Oct 4 22:32:25 2006 +0000 automated bump and rebuild diff --git a/clamav.spec b/clamav.spec index ea23148..b6bb6f4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.40 2006/09/15 06:21:38 ensc Exp $ +## $Id: clamav.spec,v 1.41 2006/09/21 18:27:43 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.4 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -446,6 +446,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + * Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 - splitted SysV initscripts of -milter and -server into own subpackages commit f1f8b458cd18df3134a3d6707ca818735440e83f Author: ensc <ensc(a)fedoraproject.org> Date: Thu Sep 21 18:27:43 2006 +0000 splitted SysV initscripts of -milter and -server into own subpackages diff --git a/clamav.spec b/clamav.spec index 90f84fb..ea23148 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.39 2006/08/09 06:48:12 ensc Exp $ +## $Id: clamav.spec,v 1.40 2006/09/15 06:21:38 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.4 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -80,33 +80,41 @@ Requires(post): group(clamav) %package server Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Provides: clamav-daemon = %version-%release -Obsoletes: clamav-daemon < %version-%release -Conflicts: clamav-daemon > %version-%release -## For now, use this as a placeholder. Later, generate separate -sysv -## and -minit subpackages Requires: init(clamav-server) -Provides: init(clamav-server) = sysv Requires: data(clamav) Requires: clamav-lib = %version-%release + +%package server-sysv +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir %package milter Summary: Sendmail-milter for the Clam Antivirus scanner Group: System Environment/Daemons -## For now, use this as a placeholder. Later, generate separate -sysv -## and -minit subpackages Requires: init(clamav-milter) -Provides: init(clamav-milter) = sysv BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel -Requires: sendmail +Provides: user(%milteruser) +Provides: group(%milteruser) +Requires: sendmail +Requires(post): coreutils +%{?FE_USERADD_REQ} + +%package milter-sysv +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = sysv +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts -Requires(post): chkconfig coreutils +Requires(post): chkconfig Requires(preun): chkconfig initscripts -%{?FE_USERADD_REQ} %description @@ -150,6 +158,11 @@ of this daemon should be started for each service requiring it. See the README file how this can be done with a minimum of effort. + +%description server-sysv +SysV initscripts template for the clamav server + + %description milter This package contains files which are needed to run the clamav-milter. It can be activated by adding @@ -158,7 +171,9 @@ can be activated by adding to your sendmail.mc. -THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! +%description milter-sysv +The SysV initscripts for clamav-milter. + ## ------------------------------------------------------------ @@ -312,20 +327,25 @@ test -e %freshclamlog || { -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : %post milter -/sbin/chkconfig --add clamav-milter test -e %milterlog || { touch %milterlog chmod 0620 %milterlog chown root:%milteruser %milterlog } -%preun milter -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter - %postun milter %__fe_userdel %milteruser &>/dev/null || : %__fe_groupdel %milteruser &>/dev/null || : + + +%post milter-sysv +/sbin/chkconfig --add clamav-milter + +%preun milter-sysv +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter + +%postun milter-sysv test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : @@ -393,15 +413,19 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc _doc_server/* %_mandir/man[58]/clamd* %_sbindir/* -%_initrddir/clamd-wrapper %dir %pkgdatadir -%dir %_sysconfdir/clamd.d %pkgdatadir/clamd-wrapper - +%dir %_sysconfdir/clamd.d %exclude %_sbindir/*milter* %exclude %_mandir/man8/clamav-milter* + +%files server-sysv +%defattr(-,root,root,-) +%_initrddir/clamd-wrapper + + ## ----------------------- %files milter @@ -409,14 +433,22 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* -%config %_initrddir/clamav-milter %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter %attr(0700,%milteruser,%milteruser) %dir %milterstatedir %ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog + +%files milter-sysv +%defattr(-,root,root,-) +%config %_initrddir/clamav-milter +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter + + %changelog +* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 +- splitted SysV initscripts of -milter and -server into own subpackages + * Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 - rebuilt diff --git a/clamd-gen b/clamd-gen index 134e149..46739ba 100755 --- a/clamd-gen +++ b/clamd-gen @@ -77,6 +77,7 @@ Group: System Environment/Daemons Provides: init(%name) = sysv Conflicts: init(%name) < sysv Conflicts: init(%name) > sysv +Requires: clamav-server-sysv Requires(post): %name = %epoch:%version-%release Requires(post): diffutils mktemp %__chkconfig Requires(preun): %__chkconfig commit 3ae7322b01e875dcba5e77103c6a08f75f656f0f Author: ensc <ensc(a)fedoraproject.org> Date: Fri Sep 15 06:21:38 2006 +0000 rebuilt diff --git a/clamav.spec b/clamav.spec index 8f1221e..90f84fb 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.38 2006/08/09 06:30:01 ensc Exp $ +## $Id: clamav.spec,v 1.39 2006/08/09 06:48:12 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.4 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -417,6 +417,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog %changelog +* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 +- rebuilt + * Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 - updated to 0.88.4 (SECURITY) diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild commit f18c7ca19f194bce8d74b533c4bebcc7f7e724e5 Author: Ville Skyttä <scop(a)fedoraproject.org> Date: Sun Aug 27 20:18:44 2006 +0000 http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild commit 3446373d245d02b9a486e901a86cc89da43aa8f3 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Aug 9 06:49:22 2006 +0000 cleanup; removed old sources diff --git a/sources b/sources index 1fe5f15..bca4b2c 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ -330206089713e73a44afc7a4d6450225 clamav-0.88.3.tar.gz -dc0e3b56253c7974ef9f3e9011017e0c clamav-0.88.3.tar.gz.sig 7759784aa4506b314e6543e0f2a8587b clamav-0.88.4.tar.gz 450d59c0a663b5986cda1105b85ae673 clamav-0.88.4.tar.gz.sig commit 72cd79d86160b8cc3d648f0cb11f35afdef67caa Author: ensc <ensc(a)fedoraproject.org> Date: Wed Aug 9 06:48:12 2006 +0000 removed a superfluous %doc diff --git a/clamav.spec b/clamav.spec index b6adf26..8f1221e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.37 2006/07/08 15:57:54 ensc Exp $ +## $Id: clamav.spec,v 1.38 2006/08/09 06:30:01 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -391,7 +391,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc %_mandir/man[58]/clamd* +%_mandir/man[58]/clamd* %_sbindir/* %_initrddir/clamd-wrapper %dir %pkgdatadir commit 87b2de41e228d562296b18dcc46539d5b010adf1 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Aug 9 06:30:01 2006 +0000 - updated to 0.88.4 (SECURITY) - removed the clamdscan(1) manpage from the -server subpackage diff --git a/clamav.spec b/clamav.spec index ccf532b..b6adf26 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.36 2006/07/08 13:17:12 ensc Exp $ +## $Id: clamav.spec,v 1.37 2006/07/08 15:57:54 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.3 +Version: 0.88.4 Release: %release_func 1 License: GPL @@ -337,8 +337,8 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO %doc docs/*.pdf -%doc %_mandir/man[15]/* %_bindir/* +%_mandir/man[15]/* %exclude %_bindir/clamav-config %exclude %_bindir/freshclam %exclude %_mandir/*/freshclam* @@ -391,7 +391,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc %_mandir/*/clamd* +%doc %_mandir/man[58]/clamd* %_sbindir/* %_initrddir/clamd-wrapper %dir %pkgdatadir @@ -417,6 +417,12 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog %changelog +* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 +- updated to 0.88.4 (SECURITY) + +* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed the clamdscan(1) manpage from the -server subpackage + * Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - removed a superfluous '}' - removed some code which was relevant for FC-3 only diff --git a/sources b/sources index 4710962..1fe5f15 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ 330206089713e73a44afc7a4d6450225 clamav-0.88.3.tar.gz dc0e3b56253c7974ef9f3e9011017e0c clamav-0.88.3.tar.gz.sig +7759784aa4506b314e6543e0f2a8587b clamav-0.88.4.tar.gz +450d59c0a663b5986cda1105b85ae673 clamav-0.88.4.tar.gz.sig commit bf7d59e040c87f39767e4ed2e87467659399ebeb Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jul 8 15:57:54 2006 +0000 - removed a superfluous '}' - removed some code which was relevant for FC-3 only diff --git a/clamav.spec b/clamav.spec index 9047da9..ccf532b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.35 2006/04/30 10:07:15 ensc Exp $ +## $Id: clamav.spec,v 1.36 2006/07/08 13:17:12 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -82,7 +82,7 @@ Summary: Clam Antivirus scanner server Group: System Environment/Daemons Provides: clamav-daemon = %version-%release Obsoletes: clamav-daemon < %version-%release -Conflicts: clamav-daemon > %version-%release} +Conflicts: clamav-daemon > %version-%release ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) @@ -184,16 +184,8 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ %build -## '--disable-zlib-vcheck' is used because every FC<=3 ships zlib-1.2.1* -## but clamav checks for zlib >= 1.2.2. This option can be removed for -## FC4 builds. -## -## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and -## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 -## also -CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --disable-zlib-vcheck \ --enable-milter ## HACK: ./configure checks if freshclam.conf/clamd.conf are existing @@ -425,6 +417,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog %changelog +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed a superfluous '}' +- removed some code which was relevant for FC-3 only + * Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 - updated to 0.88.3 - updated to new fedora-usermgmt macros commit 6ff0a52518d97ffc37166b594e41c187a9477246 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jul 8 13:17:12 2006 +0000 - updated to 0.88.3 - updated to new fedora-usermgmt macros - cleanups: removed unneeded curlies, use plain command instead of %%__XXX macro, whitespace cleanup, removed unneeded versioned dependencies - added a 'Requires(post): group(clamav)' dependencies for -update and added the corresponding Provides: to -data - removed the %%_without_milter conditional; you won't gain anything when milter would be disabled at buildtime diff --git a/clamav.spec b/clamav.spec index 8cfc0cd..9047da9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,10 +1,7 @@ -## $Id: clamav.spec,v 1.34 2006/04/24 22:05:44 ensc Exp $ - -## This package understands the following switches: -## --without milter ... deactivate the -milter subpackage - +## $Id: clamav.spec,v 1.35 2006/04/30 10:07:15 ensc Exp $ ## Fedora Extras specific customization below... +%bcond_without fedora ## @@ -21,14 +18,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.2 +Version: 0.88.3 Release: %release_func 1 License: GPL Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -41,8 +38,8 @@ Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: clamav-lib = %{version}-%{release} +BuildRoot: %_tmppath/%name-%version-%release-root +Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel BuildRequires: bc @@ -56,15 +53,17 @@ Requires: data(clamav) Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %{version}-%{release} +Requires: clamav-lib = %version-%release Requires(pre): %_libdir/pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File Provides: data(clamav) -Requires(pre): fedora-usermgmt >= 0.7 -Requires(postun): fedora-usermgmt >= 0.7 +Provides: user(clamav) +Provides: group(clamav) +BuildRequires: fedora-usermgmt-devel +%{?FE_USERADD_REQ} %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -72,23 +71,24 @@ Group: Applications/File Source200: freshclam-sleep Source201: freshclam.sysconfig Source202: clamav-update.cron -Requires: clamav-data = %{version}-%{release} +Requires: clamav-data = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod +Requires(post): group(clamav) %package server Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Provides: clamav-daemon = %{version}-%{release} -Obsoletes: clamav-daemon < %{version}-%{release} -Conflicts: clamav-daemon > %{version}-%{release} +Provides: clamav-daemon = %version-%release +Obsoletes: clamav-daemon < %version-%release +Conflicts: clamav-daemon > %version-%release} ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) Provides: init(clamav-server) = sysv Requires: data(clamav) -Requires: clamav-lib = %{version}-%{release} +Requires: clamav-lib = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir @@ -99,14 +99,14 @@ Group: System Environment/Daemons ## and -minit subpackages Requires: init(clamav-milter) Provides: init(clamav-milter) = sysv -%{!?_without_milter:BuildRequires: sendmail-devel} +BuildRequires: sendmail-devel +BuildRequires: fedora-usermgmt-devel Requires: sendmail Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig coreutils Requires(preun): chkconfig initscripts -Requires(pre): fedora-usermgmt >= 0.7 -Requires(postun): fedora-usermgmt >= 0.7 +%{?FE_USERADD_REQ} %description @@ -194,7 +194,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --disable-zlib-vcheck \ - %{!?_without_milter:--enable-milter} + --enable-milter ## HACK: ./configure checks if freshclam.conf/clamd.conf are existing ## in current filesystem and skips its installation then. Was introduced @@ -203,14 +203,14 @@ perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; s!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_FALSE\@),[^,]*,!\1,\#,!g' config.status ./config.status -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} ## ------------------------------------------------------------ %install rm -rf "$RPM_BUILD_ROOT" _doc* -%{__make} DESTDIR="$RPM_BUILD_ROOT" install +make DESTDIR="$RPM_BUILD_ROOT" install function smartsubst() { local tmp @@ -226,43 +226,41 @@ function smartsubst() { } -%{__install} -d -m755 \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ - ${RPM_BUILD_ROOT}%{_var}/log \ +install -d -m755 \ + ${RPM_BUILD_ROOT}%_sysconfdir/{clamd.d,cron.d,logrotate.d,sysconfig} \ + ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%{_initrddir} - -rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/clamd.conf \ - ${RPM_BUILD_ROOT}%{_libdir}/*.la + ${RPM_BUILD_ROOT}%_initrddir -%{?_without_milter:rm -f $RPM_BUILD_ROOT%_mandir/*/*milter*} +rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ + ${RPM_BUILD_ROOT}%_libdir/*.la ## prepare the server-files mkdir _doc_server -%{__install} -m644 -p %{SOURCE2} _doc_server/clamd.sysconfig -%{__install} -m644 -p %{SOURCE3} _doc_server/clamd.logrotate -%{__install} -m755 -p %{SOURCE7} _doc_server/clamd.init -%{__install} -m644 -p %{SOURCE5} _doc_server/README -%__install -m644 -p etc/clamd.conf _doc_server/clamd.conf +install -m644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -m644 -p %SOURCE3 _doc_server/clamd.logrotate +install -m755 -p %SOURCE7 _doc_server/clamd.init +install -m644 -p %SOURCE5 _doc_server/README +install -m644 -p etc/clamd.conf _doc_server/clamd.conf -%__install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir -%__install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper +install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir +install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper ## prepare the update-files -%{__install} -m644 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/clamav-update -%{__install} -m755 -p %{SOURCE8} ${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers -touch ${RPM_BUILD_ROOT}%{freshclamlog} +install -m644 -p %SOURCE6 ${RPM_BUILD_ROOT}%_sysconfdir/logrotate.d/clamav-update +install -m755 -p %SOURCE8 ${RPM_BUILD_ROOT}%_sbindir/clamav-notify-servers +touch ${RPM_BUILD_ROOT}%freshclamlog -%__install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -%__install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -%__install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update +install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update smartsubst 's!webmaster,clamav!webmaster,%username!g; s!/usr/share/clamav!%pkgdatadir!g; @@ -272,9 +270,7 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -%if 0%{!?_without_milter:1} #### The milter stuff - function subst() { sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } @@ -291,9 +287,8 @@ CLAMAV_FLAGS='--max-children=2 -c /etc/clamd.d/milter.conf local:%milterstatedir CLAMAV_USER='%milteruser' EOF -%__install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog -%endif # _without_milter ## ------------------------------------------------------------ @@ -304,25 +299,25 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ %pre data -/usr/sbin/fedora-groupadd 4 -r %{username} &>/dev/null || : -/usr/sbin/fedora-useradd 4 -r -s /sbin/nologin -d %{homedir} -M \ - -c 'Clamav database update user' -g %{username} %{username} &>/dev/null || : +%__fe_groupadd 4 -r %username &>/dev/null || : +%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ + -c 'Clamav database update user' -g %username %username &>/dev/null || : %post update -test -e %{freshclamlog} || { - touch %{freshclamlog} - %{__chmod} 0664 %{freshclamlog} - %{__chown} root:%{username} %{freshclamlog} +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%username %freshclamlog } %postun data -test "$1" != 0 || /usr/sbin/fedora-userdel %{username} &>/dev/null || : -test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : %pre milter -/usr/sbin/fedora-groupadd 5 -r %milteruser &>/dev/null || : -/usr/sbin/fedora-useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : +%__fe_groupadd 5 -r %milteruser &>/dev/null || : +%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ + -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : %post milter /sbin/chkconfig --add clamav-milter @@ -333,13 +328,13 @@ test -e %milterlog || { } %preun milter -test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : test "$1" != 0 || /sbin/chkconfig --del clamav-milter %postun milter -test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : -test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : -test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : +%__fe_userdel %milteruser &>/dev/null || : +%__fe_groupdel %milteruser &>/dev/null || : +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %post lib -p /sbin/ldconfig @@ -350,8 +345,8 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO %doc docs/*.pdf -%doc %{_mandir}/man[15]/* -%{_bindir}/* +%doc %_mandir/man[15]/* +%_bindir/* %exclude %_bindir/clamav-config %exclude %_bindir/freshclam %exclude %_mandir/*/freshclam* @@ -360,15 +355,15 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files lib %defattr(-,root,root,-) -%{_libdir}/*.so.* +%_libdir/*.so.* ## ----------------------- %files devel %defattr(-,root,root,-) -%{_includedir}/* -%{_libdir}/*.*a -%{_libdir}/*.so +%_includedir/* +%_libdir/*.*a +%_libdir/*.so %dir %pkgdatadir %pkgdatadir/template %pkgdatadir/clamd-gen @@ -378,12 +373,12 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : ## ----------------------- %files data -%defattr(-,%{username},%{username},-) -%dir %{homedir} +%defattr(-,%username,%username,-) +%dir %homedir # use %%config to keep files which were updated by 'freshclam' # already. Without this tag, they would be overridden with older # versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %{homedir}/*.cvd +%config %verify(not size md5 mtime) %homedir/*.cvd ## ----------------------- @@ -397,7 +392,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %config(noreplace) %_sysconfdir/cron.d/* %config(noreplace) %_sysconfdir/sysconfig/freshclam -%ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog} +%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog ## ----------------------- @@ -405,14 +400,13 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc _doc_server/* %doc %_mandir/*/clamd* -%{_sbindir}/* +%_sbindir/* %_initrddir/clamd-wrapper %dir %pkgdatadir -%dir %{_sysconfdir}/clamd.d +%dir %_sysconfdir/clamd.d %pkgdatadir/clamd-wrapper -%if 0%{!?_without_milter:1} %exclude %_sbindir/*milter* %exclude %_mandir/man8/clamav-milter* @@ -423,15 +417,27 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* -%config %{_initrddir}/clamav-milter -%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/milter.conf -%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamav-milter +%config %_initrddir/clamav-milter +%config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter %attr(0700,%milteruser,%milteruser) %dir %milterstatedir %ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%endif # _without_milter %changelog +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 +- updated to 0.88.3 +- updated to new fedora-usermgmt macros + +* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 +- cleanups: removed unneeded curlies, use plain command instead of + %%__XXX macro, whitespace cleanup, removed unneeded versioned + dependencies +- added a 'Requires(post): group(clamav)' dependencies for -update and + added the corresponding Provides: to -data +- removed the %%_without_milter conditional; you won't gain anything + when milter would be disabled at buildtime + * Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 - updated to 0.88.2 (SECURITY) - rediffed patches; most issues handled by 0.88.1-2 are fixed in diff --git a/sources b/sources index 1cdc576..4710962 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f0a1c610a1fb70bd748a08bea69c736c clamav-0.88.2.tar.gz -6846cb50e005c18ab4b39ff9aa7126fc clamav-0.88.2.tar.gz.sig +330206089713e73a44afc7a4d6450225 clamav-0.88.3.tar.gz +dc0e3b56253c7974ef9f3e9011017e0c clamav-0.88.3.tar.gz.sig commit de4634e5814c6fcb4136e155c81e9fcf60c6d687 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Apr 30 10:07:15 2006 +0000 - updated to 0.88.2 (SECURITY) - rediffed patches; most issues handled by 0.88.1-2 are fixed in 0.88.2 diff --git a/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch deleted file mode 100644 index 9bc9723..0000000 --- a/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +++ /dev/null @@ -1,157 +0,0 @@ -2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - - * Guys, please read the compiler warnings before releasing a - new version. The compiler is clever enough to warn you about - issues like - - | encrypted = (zdirent.d_flags & 0x2041 != 0); - - with - - | scanners.c:381: warning: suggest parentheses around comparison in operand of & - - - Ditto about the usage of implicitly declared functions. - - Warnings about uninitialized variables shall be taken - seriously too; this patch fixes one existing issue. The - htmlnorm.c parser should be reviewed. - - - * this patch does not fix: - - - things like - | ole2_extract.c:86: warning: 'packed' attribute ignored for field of type 'unsigned char[7u]' - - which are caused by - - struct foo { - char a[2] __attribute__((__packed__)); - char b __attribute__((__packed__)); - }; - - which can/should be written as - - struct foo { - char a[2]; - char b; - } __attribute__((__packed__)); - - - signed/unsigned comparisions. This was really too much to - get fixed now. It will require rewrite/review of the - complete code to use 'size_t' instead of 'int' for sizes. - - Lot of bufferover- and underflows can be prevented by - correct signess. - - - missing prototypes like - - | warning: no previous prototype for - - - 'clamav' is used to operate on hostile data so its source - code should have a good quality. Building with a high warning - level and removing reasons for such warnings is a cheap way - to eliminate a huge part of potential problems. - - - ---- clamav-0.88.1/clamd/others.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-10-30 21:22:01.000000000 +0100 -+++ clamav-0.88.1/clamd/others.c 2006-04-24 22:53:27.000000000 +0200 -@@ -30,6 +30,7 @@ - #include <sys/stat.h> - #include <errno.h> - #include <sys/time.h> -+#include <sys/wait.h> - - #if HAVE_SYS_PARAM_H - #include <sys/param.h> -@@ -68,6 +69,7 @@ - #include "memory.h" - #include "cfgparser.h" - #include "session.h" -+#include "../shared/output.h" - - #define ENV_FILE "CLAM_VIRUSEVENT_FILENAME" - #define ENV_VIRUS "CLAM_VIRUSEVENT_VIRUSNAME" ---- clamav-0.88.1/shared/misc.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-12-23 22:25:10.000000000 +0100 -+++ clamav-0.88.1/shared/misc.c 2006-04-24 22:53:27.000000000 +0200 -@@ -28,6 +28,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <ctype.h> - - #include "clamav.h" - #include "cfgparser.h" ---- clamav-0.88.1/freshclam/manager.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-25 18:39:25.000000000 +0100 -+++ clamav-0.88.1/freshclam/manager.c 2006-04-24 22:53:27.000000000 +0200 -@@ -50,6 +50,7 @@ - #include "../libclamav/others.h" - #include "../libclamav/str.h" /* cli_strtok */ - #include "dns.h" -+#include "execute.h" - - - int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, const char *hostname) ---- clamav-0.88.1/libclamav/zziplib/zzip-zip.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 01:43:53.000000000 +0200 -+++ clamav-0.88.1/libclamav/zziplib/zzip-zip.c 2006-04-24 22:57:44.000000000 +0200 -@@ -16,6 +16,7 @@ - #endif - - #include "target.h" -+#include "others.h" - - #include <zzip.h> /* archive handling */ - #include <zzip-file.h> ---- clamav-0.88.1/libclamav/scanners.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-04 11:32:55.000000000 +0200 -+++ clamav-0.88.1/libclamav/scanners.c 2006-04-24 22:53:27.000000000 +0200 -@@ -69,6 +69,7 @@ extern int cli_mbox(const char *dir, int - #include "untar.h" - #include "special.h" - #include "binhex.h" -+#include "../tnef.h" - - #ifdef HAVE_ZLIB_H - #include <zlib.h> -@@ -378,7 +379,7 @@ static int cli_scanzip(int desc, const c - * Bit 6: Strong encryption was used - * Bit 13: Encrypted central directory - */ -- encrypted = (zdirent.d_flags & 0x2041 != 0); -+ encrypted = (zdirent.d_flags & 0x2041) != 0; - - cli_dbgmsg("Zip: %s, crc32: 0x%x, offset: %d, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", zdirent.d_name, zdirent.d_crc32, zdirent.d_off, encrypted, zdirent.d_csize, zdirent.st_size, zdirent.d_compr, zdirent.d_csize ? (zdirent.st_size / zdirent.d_csize) : 0, limits ? limits->maxratio : 0); - ---- clamav-0.88.1/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 21:22:02.000000000 +0200 -+++ clamav-0.88.1/libclamav/pe.c 2006-04-24 22:53:27.000000000 +0200 -@@ -1451,7 +1451,7 @@ int cli_peheader(int desc, struct cli_pe - { - uint16_t e_magic; /* DOS signature ("MZ") */ - uint32_t e_lfanew; /* address of new exe header */ -- uint32_t min, max; -+ uint32_t min=0, max=0; - struct pe_image_file_hdr file_hdr; - struct pe_image_optional_hdr optional_hdr; - struct pe_image_section_hdr *section_hdr; ---- clamav-0.88.1/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 -+++ clamav-0.88.1/libclamav/htmlnorm.c 2006-04-24 22:53:27.000000000 +0200 -@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ - { - int fd_tmp, tag_length, tag_arg_length, binary; - int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; -- FILE *stream_in; -+ FILE *stream_in = 0; - html_state state=HTML_NORM, next_state=HTML_BAD_STATE; - char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; - char tag_val[HTML_STR_LENGTH+1], *tmp_file; ---- clamav-0.88.1/libclamav/special.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-06-23 22:03:13.000000000 +0200 -+++ clamav-0.88.1/libclamav/special.c 2006-04-24 22:53:27.000000000 +0200 -@@ -25,6 +25,7 @@ - #include <netinet/in.h> - #include <string.h> - -+#include "special.h" - #include "clamav.h" - #include "others.h" - #include "cltypes.h" diff --git a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch new file mode 100644 index 0000000..38f9d9d --- /dev/null +++ b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch @@ -0,0 +1,22 @@ +--- clamav-0.88.2/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-29 19:46:09.000000000 +0200 ++++ clamav-0.88.2/libclamav/pe.c 2006-04-30 11:25:53.000000000 +0200 +@@ -1555,7 +1555,7 @@ int cli_peheader(int desc, struct cli_pe + { + uint16_t e_magic; /* DOS signature ("MZ") */ + uint32_t e_lfanew; /* address of new exe header */ +- uint32_t min, max; ++ uint32_t min=0, max=0; + struct pe_image_file_hdr file_hdr; + struct pe_image_optional_hdr optional_hdr; + struct pe_image_section_hdr *section_hdr; +--- clamav-0.88.2/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 ++++ clamav-0.88.2/libclamav/htmlnorm.c 2006-04-30 11:25:53.000000000 +0200 +@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ + { + int fd_tmp, tag_length, tag_arg_length, binary; + int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; +- FILE *stream_in; ++ FILE *stream_in = 0; + html_state state=HTML_NORM, next_state=HTML_BAD_STATE; + char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; + char tag_val[HTML_STR_LENGTH+1], *tmp_file; diff --git a/clamav.spec b/clamav.spec index d1894a2..8cfc0cd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.33 2006/04/06 16:50:58 ensc Exp $ +## $Id: clamav.spec,v 1.34 2006/04/24 22:05:44 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.1 -Release: %release_func 2 +Version: 0.88.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -36,7 +36,7 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch0: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +Patch0: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch @@ -432,6 +432,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 +- updated to 0.88.2 (SECURITY) +- rediffed patches; most issues handled by 0.88.1-2 are fixed in + 0.88.2 + * Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 - added patch which fixes some classes of compiler warnings; at least the using of implicitly declared functions was reported to cause diff --git a/sources b/sources index 2b31a40..1cdc576 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9fe8c47037051e350077513dd94fb76a clamav-0.88.1.tar.gz -bc06324bf070679854689235df5042d8 clamav-0.88.1.tar.gz.sig +f0a1c610a1fb70bd748a08bea69c736c clamav-0.88.2.tar.gz +6846cb50e005c18ab4b39ff9aa7126fc clamav-0.88.2.tar.gz.sig commit e1f2fc085e8bfcdc36448341173f31e6a4ec4ef5 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 24 22:05:45 2006 +0000 - added patch which fixes some classes of compiler warnings; at least the using of implicitly declared functions was reported to cause segfaults on AMD64 (brought to my attention by Marc Perkel) - added patch which fixes wrong usage of strncpy(3) in unrarlib.c diff --git a/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch new file mode 100644 index 0000000..9bc9723 --- /dev/null +++ b/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch @@ -0,0 +1,157 @@ +2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> + + * Guys, please read the compiler warnings before releasing a + new version. The compiler is clever enough to warn you about + issues like + + | encrypted = (zdirent.d_flags & 0x2041 != 0); + + with + + | scanners.c:381: warning: suggest parentheses around comparison in operand of & + + + Ditto about the usage of implicitly declared functions. + + Warnings about uninitialized variables shall be taken + seriously too; this patch fixes one existing issue. The + htmlnorm.c parser should be reviewed. + + + * this patch does not fix: + + - things like + | ole2_extract.c:86: warning: 'packed' attribute ignored for field of type 'unsigned char[7u]' + + which are caused by + + struct foo { + char a[2] __attribute__((__packed__)); + char b __attribute__((__packed__)); + }; + + which can/should be written as + + struct foo { + char a[2]; + char b; + } __attribute__((__packed__)); + + - signed/unsigned comparisions. This was really too much to + get fixed now. It will require rewrite/review of the + complete code to use 'size_t' instead of 'int' for sizes. + + Lot of bufferover- and underflows can be prevented by + correct signess. + + - missing prototypes like + + | warning: no previous prototype for + + + 'clamav' is used to operate on hostile data so its source + code should have a good quality. Building with a high warning + level and removing reasons for such warnings is a cheap way + to eliminate a huge part of potential problems. + + + +--- clamav-0.88.1/clamd/others.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-10-30 21:22:01.000000000 +0100 ++++ clamav-0.88.1/clamd/others.c 2006-04-24 22:53:27.000000000 +0200 +@@ -30,6 +30,7 @@ + #include <sys/stat.h> + #include <errno.h> + #include <sys/time.h> ++#include <sys/wait.h> + + #if HAVE_SYS_PARAM_H + #include <sys/param.h> +@@ -68,6 +69,7 @@ + #include "memory.h" + #include "cfgparser.h" + #include "session.h" ++#include "../shared/output.h" + + #define ENV_FILE "CLAM_VIRUSEVENT_FILENAME" + #define ENV_VIRUS "CLAM_VIRUSEVENT_VIRUSNAME" +--- clamav-0.88.1/shared/misc.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-12-23 22:25:10.000000000 +0100 ++++ clamav-0.88.1/shared/misc.c 2006-04-24 22:53:27.000000000 +0200 +@@ -28,6 +28,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <ctype.h> + + #include "clamav.h" + #include "cfgparser.h" +--- clamav-0.88.1/freshclam/manager.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-25 18:39:25.000000000 +0100 ++++ clamav-0.88.1/freshclam/manager.c 2006-04-24 22:53:27.000000000 +0200 +@@ -50,6 +50,7 @@ + #include "../libclamav/others.h" + #include "../libclamav/str.h" /* cli_strtok */ + #include "dns.h" ++#include "execute.h" + + + int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, const char *hostname) +--- clamav-0.88.1/libclamav/zziplib/zzip-zip.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 01:43:53.000000000 +0200 ++++ clamav-0.88.1/libclamav/zziplib/zzip-zip.c 2006-04-24 22:57:44.000000000 +0200 +@@ -16,6 +16,7 @@ + #endif + + #include "target.h" ++#include "others.h" + + #include <zzip.h> /* archive handling */ + #include <zzip-file.h> +--- clamav-0.88.1/libclamav/scanners.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-04 11:32:55.000000000 +0200 ++++ clamav-0.88.1/libclamav/scanners.c 2006-04-24 22:53:27.000000000 +0200 +@@ -69,6 +69,7 @@ extern int cli_mbox(const char *dir, int + #include "untar.h" + #include "special.h" + #include "binhex.h" ++#include "../tnef.h" + + #ifdef HAVE_ZLIB_H + #include <zlib.h> +@@ -378,7 +379,7 @@ static int cli_scanzip(int desc, const c + * Bit 6: Strong encryption was used + * Bit 13: Encrypted central directory + */ +- encrypted = (zdirent.d_flags & 0x2041 != 0); ++ encrypted = (zdirent.d_flags & 0x2041) != 0; + + cli_dbgmsg("Zip: %s, crc32: 0x%x, offset: %d, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", zdirent.d_name, zdirent.d_crc32, zdirent.d_off, encrypted, zdirent.d_csize, zdirent.st_size, zdirent.d_compr, zdirent.d_csize ? (zdirent.st_size / zdirent.d_csize) : 0, limits ? limits->maxratio : 0); + +--- clamav-0.88.1/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 21:22:02.000000000 +0200 ++++ clamav-0.88.1/libclamav/pe.c 2006-04-24 22:53:27.000000000 +0200 +@@ -1451,7 +1451,7 @@ int cli_peheader(int desc, struct cli_pe + { + uint16_t e_magic; /* DOS signature ("MZ") */ + uint32_t e_lfanew; /* address of new exe header */ +- uint32_t min, max; ++ uint32_t min=0, max=0; + struct pe_image_file_hdr file_hdr; + struct pe_image_optional_hdr optional_hdr; + struct pe_image_section_hdr *section_hdr; +--- clamav-0.88.1/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 ++++ clamav-0.88.1/libclamav/htmlnorm.c 2006-04-24 22:53:27.000000000 +0200 +@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ + { + int fd_tmp, tag_length, tag_arg_length, binary; + int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; +- FILE *stream_in; ++ FILE *stream_in = 0; + html_state state=HTML_NORM, next_state=HTML_BAD_STATE; + char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; + char tag_val[HTML_STR_LENGTH+1], *tmp_file; +--- clamav-0.88.1/libclamav/special.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-06-23 22:03:13.000000000 +0200 ++++ clamav-0.88.1/libclamav/special.c 2006-04-24 22:53:27.000000000 +0200 +@@ -25,6 +25,7 @@ + #include <netinet/in.h> + #include <string.h> + ++#include "special.h" + #include "clamav.h" + #include "others.h" + #include "cltypes.h" diff --git a/clamav-0.88.1-strncpy.patch b/clamav-0.88.1-strncpy.patch new file mode 100644 index 0000000..ceceb7d --- /dev/null +++ b/clamav-0.88.1-strncpy.patch @@ -0,0 +1,26 @@ +2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> + + * libclamav/unrarlib.c/stricomp(): terminate the string copied + with strncpy() explicitly with '\0'. Does not seem to be + exploitable at the moment due to deeply buried constraints + (function will be called for buffers with a static size of + 260 only). + + But it is better to fix it now than to run into problems + when function is used for other purposes. + +--- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 ++++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 +@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) + char S1[512],S2[512]; + char *chptr; + +- strncpy(S1,Str1,sizeof(S1)); +- strncpy(S2,Str2,sizeof(S2)); ++ strncpy(S1,Str1,sizeof(S1)); ++ strncpy(S2,Str2,sizeof(S2)); ++ S1[sizeof(S1)-1] = '\0'; ++ S2[sizeof(S2)-1] = '\0'; + + while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ + { diff --git a/clamav.spec b/clamav.spec index 50dba49..d1894a2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.32 2006/02/18 09:33:59 ensc Exp $ +## $Id: clamav.spec,v 1.33 2006/04/06 16:50:58 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.1 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -36,6 +36,8 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers +Patch0: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch @@ -162,6 +164,9 @@ THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! %prep %setup -q +%patch0 -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch' +%patch1 -p1 -b .strncpy + %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff @@ -186,6 +191,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and ## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 ## also +CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --disable-zlib-vcheck \ %{!?_without_milter:--enable-milter} @@ -426,6 +432,12 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 +- added patch which fixes some classes of compiler warnings; at least + the using of implicitly declared functions was reported to cause + segfaults on AMD64 (brought to my attention by Marc Perkel) +- added patch which fixes wrong usage of strncpy(3) in unrarlib.c + * Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 - updated to 0.88.1 (SECURITY) commit cf9eaf4edbd86067499e209368d9c64ac576609d Author: ensc <ensc(a)fedoraproject.org> Date: Thu Apr 6 16:50:58 2006 +0000 updated to 0.88.1 (SECURITY) diff --git a/clamav.spec b/clamav.spec index f79ed76..50dba49 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.31 2006/01/09 23:27:46 ensc Exp $ +## $Id: clamav.spec,v 1.32 2006/02/18 09:33:59 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88 -Release: %release_func 2 +Version: 0.88.1 +Release: %release_func 1 License: GPL Group: Applications/File @@ -426,6 +426,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 +- updated to 0.88.1 (SECURITY) + * Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 - rebuilt for FC5 diff --git a/sources b/sources index 79339ac..2b31a40 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5d23205673c32e2b1b6db95000e6da74 clamav-0.88.tar.gz -12816c52cf4434f861c1c7faa196361a clamav-0.88.tar.gz.sig +9fe8c47037051e350077513dd94fb76a clamav-0.88.1.tar.gz +bc06324bf070679854689235df5042d8 clamav-0.88.1.tar.gz.sig commit f03dc9cffc7b47746b6a9280dc5169ebdef14b24 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 18 09:33:59 2006 +0000 rebuilt for FC5 diff --git a/clamav.spec b/clamav.spec index b4b1e90..f79ed76 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.30 2005/11/04 12:55:25 ensc Exp $ +## $Id: clamav.spec,v 1.31 2006/01/09 23:27:46 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -426,6 +426,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 +- rebuilt for FC5 + * Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 - updated to 0.88 - added pseudo-versions for the 'init(...)' provides as a first step commit 0a90d8190cc98d4ff5a94b19033e2de3146ab2dd Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jan 9 23:27:46 2006 +0000 - updated to 0.88 - added pseudo-versions for the 'init(...)' provides as a first step for the support of alternative initmethods - moved 'freshclam.conf.5' man page into the -update subpackage (#173221) - ship 'clamd.conf.5' man page in the -server subpackage *too*. The same file is contained in multiple packages now, but this man-page can not be removed from the base package because it also applies to 'clamdscan' there (#173221). diff --git a/clamav.spec b/clamav.spec index 6f1f1c9..b4b1e90 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.29 2005/09/17 09:01:24 ensc Exp $ +## $Id: clamav.spec,v 1.30 2005/11/04 12:55:25 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.87.1 +Version: 0.88 Release: %release_func 1 License: GPL @@ -84,7 +84,7 @@ Conflicts: clamav-daemon > %{version}-%{release} ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) -Provides: init(clamav-server) +Provides: init(clamav-server) = sysv Requires: data(clamav) Requires: clamav-lib = %{version}-%{release} Requires(pre): %_initrddir @@ -96,7 +96,7 @@ Group: System Environment/Daemons ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-milter) -Provides: init(clamav-milter) +Provides: init(clamav-milter) = sysv %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir @@ -348,7 +348,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %{_bindir}/* %exclude %_bindir/clamav-config %exclude %_bindir/freshclam -%exclude %_mandir/man1/freshclam* +%exclude %_mandir/*/freshclam* ## ----------------------- @@ -384,7 +384,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files update %defattr(-,root,root,-) %_bindir/freshclam -%_mandir/man1/freshclam* +%_mandir/*/freshclam* %pkgdatadir/freshclam-sleep %config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf %config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* @@ -398,7 +398,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc %{_mandir}/man8/* +%doc %_mandir/*/clamd* %{_sbindir}/* %_initrddir/clamd-wrapper %dir %pkgdatadir @@ -426,6 +426,18 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 +- updated to 0.88 +- added pseudo-versions for the 'init(...)' provides as a first step + for the support of alternative initmethods + +* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 +- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) +- ship 'clamd.conf.5' man page in the -server subpackage *too*. The + same file is contained in multiple packages now, but this man-page + can not be removed from the base package because it also applies to + 'clamdscan' there (#173221). + * Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 - updated to 0.87.1 diff --git a/sources b/sources index e805da2..79339ac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bf9f038edf0b6d5f76552e1b8d014b81 clamav-0.87.1.tar.gz -4685754c9888f14dfa0bd879002566b3 clamav-0.87.1.tar.gz.sig +5d23205673c32e2b1b6db95000e6da74 clamav-0.88.tar.gz +12816c52cf4434f861c1c7faa196361a clamav-0.88.tar.gz.sig commit 443889f1fbf4fe4134291809fcffe23a7ee7d5e3 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Nov 4 12:56:50 2005 +0000 do not add the '.fdr.' repotag to the generated spec-files diff --git a/clamd-gen b/clamd-gen index cd4c61c..134e149 100755 --- a/clamd-gen +++ b/clamd-gen @@ -27,7 +27,7 @@ $"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> function rpm.generatePreamble() { cat <<EOF -%{!?release_func:%define release_func() 0.fdr.%1} +%{!?release_func:%define release_func() %1%{?dist}} # The name of the minit service %define minitsvcdir %minitdir/services/%name # The configuration file for the SysV initservice commit 3176f3c12c66ec4c869ad579c6bfce7e0829efa7 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Nov 4 12:55:25 2005 +0000 synced with the FC-4 branch diff --git a/clamav.spec b/clamav.spec index ea1f750..6f1f1c9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.28 2005/09/10 11:20:26 dwmw2 Exp $ +## $Id: clamav.spec,v 1.29 2005/09/17 09:01:24 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.87 +Version: 0.87.1 Release: %release_func 1 License: GPL @@ -426,6 +426,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 +- updated to 0.87.1 + * Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 - updated to 0.87 (SECURITY) - removed -timeout patch; it is solved upstream diff --git a/sources b/sources index 617685e..e805da2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -dd0a12deb4f48f760fa1fcd378ae7c24 clamav-0.87.tar.gz -db9c17eec9e05085795b48ba199af895 clamav-0.87.tar.gz.sig +bf9f038edf0b6d5f76552e1b8d014b81 clamav-0.87.1.tar.gz +4685754c9888f14dfa0bd879002566b3 clamav-0.87.1.tar.gz.sig commit ecc95d934504ae863c4f6f37530a35edbb2f82c9 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 09:01:24 2005 +0000 - updated to 0.87 (SECURITY) - removed -timeout patch; it is solved upstream - reverted the -exim changes; they add yet more complexity, their functionality can go into an own package and they contained flaws diff --git a/clamav.spec b/clamav.spec index bd1e8d5..ea1f750 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.26 2005/07/29 16:37:45 ensc Exp $ +## $Id: clamav.spec,v 1.28 2005/09/10 11:20:26 dwmw2 Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -14,9 +14,6 @@ %global milterlog %_var/log/clamd.milter %global milteruser clamilt %global milterstatedir %_var/run/clamav-milter -%global clameximlog %_var/log/clamd.exim -%global clameximuser clamexim -%global clameximstatedir %_var/run/clamd.exim %global pkgdatadir %_datadir/%name @@ -24,14 +21,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.2 -Release: %release_func 5 +Version: 0.87 +Release: %release_func 1 License: GPL Group: Applications/File URL: http://www.clamav.net Source0: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz -#Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… +Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -42,7 +39,6 @@ Source8: clamav-notify-servers Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch23: clamav-0.86.2-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: clamav-lib = %{version}-%{release} Requires: data(clamav) @@ -110,21 +106,6 @@ Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 -%package exim -Summary: Exim dæmon configuration for the Clam Antivirus scanner -Group: System Environment/Daemons -## For now, use this as a placeholder. Later, generate separate -sysv -## and -minit subpackages -Requires: init(clamav-exim) -Provides: init(clamav-exim) -Requires(pre): exim -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig coreutils -Requires(preun): chkconfig initscripts -Requires(pre): fedora-usermgmt >= 0.7 -Requires(postun): fedora-usermgmt >= 0.7 - %description Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this @@ -177,22 +158,6 @@ to your sendmail.mc. THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! -%description exim -This package contains files which are needed to run the clamav dæmon for use -by the Exim MTA. It can be activated by adding - - av_scanner = clamd:%clameximstatedir/clamd.sock - -to your exim.conf, and using the 'malware' condition in the data ACL, -as follows: - - deny message = This message contains malware ($malware_name) - demime = * - malware = * - -For further details of Exim content scanning, see chapter 40 of the Exim -specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html - ## ------------------------------------------------------------ %prep @@ -200,7 +165,6 @@ specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff -%patch23 -p1 -b .timeout perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -260,7 +224,6 @@ function smartsubst() { ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ ${RPM_BUILD_ROOT}%milterstatedir \ - ${RPM_BUILD_ROOT}%clameximstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%{_initrddir} @@ -303,34 +266,15 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -#### The Exim stuff +%if 0%{!?_without_milter:1} +#### The milter stuff function subst() { - sed -e "s!<SERVICE>!$3!g;s!<USER>!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2" + sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } -subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \ - 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive$$\)!\1!;s!^Example!#Example!;' - -subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser '' -chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim -subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser '' - -cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim -CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf' -CLAMD_SOCKET=%clameximstatedir/clamd.sock -EOF - -mkdir -p $RPM_BUILD_ROOT/%clameximstatedir -ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim - -touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog - -%if 0%{!?_without_milter:1} -#### The milter stuff - -subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \ +subst etc/clamd.conf /etc/clamd.d/milter.conf \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' @@ -391,26 +335,6 @@ test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : -%pre exim -/usr/sbin/fedora-useradd 5 -r -s /sbin/nologin -d %clameximstatedir -M \ - -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || : - -%post exim -/sbin/chkconfig --add clamd.exim -test -e %clameximlog || { - touch %clameximlog - chmod 0620 %clameximlog - chown root:exim %clameximlog -} - -%preun exim -test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.exim - -%postun exim -test "$1" != 0 || /usr/sbin/fedora-userdel %{clameximuser} &>/dev/null || : -test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : - %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -488,19 +412,6 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : ## ----------------------- -%files exim -%defattr(-,root,root,-) -%_sbindir/clamd.exim -%config %{_initrddir}/clamd.exim -%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf -%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim -%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim -%attr(0750,%clameximuser,exim) %dir %clameximstatedir -%ghost %clameximstatedir/* -%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog - -## ----------------------- - %files milter %defattr(-,root,root,-) %doc clamav-milter/INSTALL @@ -515,6 +426,12 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : %endif # _without_milter %changelog +* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 +- updated to 0.87 (SECURITY) +- removed -timeout patch; it is solved upstream +- reverted the -exim changes; they add yet more complexity, their + functionality can go into an own package and they contained flaws + * Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 - Add clamav-exim configuration package commit c0efe2d256191354a85f763cad1ec0f4566b7408 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 09:00:16 2005 +0000 version 0.87 diff --git a/sources b/sources index bc5ea4f..617685e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -870de14ba123d6e9cba9850498c49f5d clamav-0.86.2.tar.gz -7d9ffe964a67ee6db157e112203a2678 clamav-0.86.2.tar.gz.sig +dd0a12deb4f48f760fa1fcd378ae7c24 clamav-0.87.tar.gz +db9c17eec9e05085795b48ba199af895 clamav-0.87.tar.gz.sig commit 5ef1a038cf71c098ec58d09769076517442a8b97 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 08:59:16 2005 +0000 fixed typo diff --git a/freshclam.sysconfig b/freshclam.sysconfig index b11e207..94035f8 100644 --- a/freshclam.sysconfig +++ b/freshclam.sysconfig @@ -11,7 +11,7 @@ ## calculated by the 'hostid' program. This predefined value guarantees ## constant timespans of 3 hours between two subsequent freshclam runs. ## -## This options accepts two special values: +## This option accepts two special values: ## 'disabled-warn' ... disables the automatic freshclam update and ## gives out a warning ## 'disabled' ... disables the automatic freshclam silently commit c6699d2e8fb799f2b9253e08627f0f6daaba5cbd Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 08:58:53 2005 +0000 not needed for 0.87 anymore diff --git a/clamav-0.86.2-timeout.patch b/clamav-0.86.2-timeout.patch deleted file mode 100644 index af252b2..0000000 --- a/clamav-0.86.2-timeout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout -+++ clamav-0.86.2/clamav-milter/clamav-milter.c -@@ -373,7 +373,7 @@ - static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; - static volatile unsigned int n_children = 0; - static unsigned int max_children = 0; --static int child_timeout = 300; /* number of seconds to wait for -+static int child_timeout = 0; /* number of seconds to wait for - * a child to die. Set to 0 to - * wait forever - */ commit d22637741f46aba02b802c3c9ad31db456cf87e1 Author: David Woodhouse <dwmw2(a)fedoraproject.org> Date: Sat Sep 10 11:20:26 2005 +0000 add clamav-exim subpackage diff --git a/clamav.spec b/clamav.spec index 062897b..bd1e8d5 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.26 2005/07/28 15:35:10 ensc Exp $ +## $Id: clamav.spec,v 1.26 2005/07/29 16:37:45 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -14,6 +14,9 @@ %global milterlog %_var/log/clamd.milter %global milteruser clamilt %global milterstatedir %_var/run/clamav-milter +%global clameximlog %_var/log/clamd.exim +%global clameximuser clamexim +%global clameximstatedir %_var/run/clamd.exim %global pkgdatadir %_datadir/%name @@ -22,7 +25,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 4 +Release: %release_func 5 License: GPL Group: Applications/File @@ -107,6 +110,21 @@ Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 +%package exim +Summary: Exim dæmon configuration for the Clam Antivirus scanner +Group: System Environment/Daemons +## For now, use this as a placeholder. Later, generate separate -sysv +## and -minit subpackages +Requires: init(clamav-exim) +Provides: init(clamav-exim) +Requires(pre): exim +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts +Requires(pre): fedora-usermgmt >= 0.7 +Requires(postun): fedora-usermgmt >= 0.7 + %description Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this @@ -159,6 +177,22 @@ to your sendmail.mc. THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! +%description exim +This package contains files which are needed to run the clamav dæmon for use +by the Exim MTA. It can be activated by adding + + av_scanner = clamd:%clameximstatedir/clamd.sock + +to your exim.conf, and using the 'malware' condition in the data ACL, +as follows: + + deny message = This message contains malware ($malware_name) + demime = * + malware = * + +For further details of Exim content scanning, see chapter 40 of the Exim +specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html + ## ------------------------------------------------------------ %prep @@ -226,6 +260,7 @@ function smartsubst() { ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ ${RPM_BUILD_ROOT}%milterstatedir \ + ${RPM_BUILD_ROOT}%clameximstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%{_initrddir} @@ -268,15 +303,34 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -%if 0%{!?_without_milter:1} -#### The milter stuff +#### The Exim stuff function subst() { - sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" + sed -e "s!<SERVICE>!$3!g;s!<USER>!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2" } +subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \ + 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive$$\)!\1!;s!^Example!#Example!;' + -subst etc/clamd.conf /etc/clamd.d/milter.conf \ +subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser '' +chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim +subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser '' + +cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim +CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf' +CLAMD_SOCKET=%clameximstatedir/clamd.sock +EOF + +mkdir -p $RPM_BUILD_ROOT/%clameximstatedir +ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim + +touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog + +%if 0%{!?_without_milter:1} +#### The milter stuff + +subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' @@ -337,6 +391,26 @@ test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : +%pre exim +/usr/sbin/fedora-useradd 5 -r -s /sbin/nologin -d %clameximstatedir -M \ + -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || : + +%post exim +/sbin/chkconfig --add clamd.exim +test -e %clameximlog || { + touch %clameximlog + chmod 0620 %clameximlog + chown root:exim %clameximlog +} + +%preun exim +test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.exim + +%postun exim +test "$1" != 0 || /usr/sbin/fedora-userdel %{clameximuser} &>/dev/null || : +test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : + %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -414,6 +488,19 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : ## ----------------------- +%files exim +%defattr(-,root,root,-) +%_sbindir/clamd.exim +%config %{_initrddir}/clamd.exim +%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf +%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim +%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim +%attr(0750,%clameximuser,exim) %dir %clameximstatedir +%ghost %clameximstatedir/* +%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog + +## ----------------------- + %files milter %defattr(-,root,root,-) %doc clamav-milter/INSTALL @@ -428,6 +515,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 +- Add clamav-exim configuration package + * Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 - [milter] create the milter-logfile in the %%post scriptlet - [milter] reverted the change of the default child_timeout value; it commit 5f98a1413790fce863ee762488f2070c1997b221 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Jul 29 16:29:09 2005 +0000 - [milter] create the milter-logfile in the %%post scriptlet - [milter] reverted the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration diff --git a/clamav.spec b/clamav.spec index 4f5ffb9..062897b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.25 2005/07/25 17:56:56 ensc Exp $ +## $Id: clamav.spec,v 1.26 2005/07/28 15:35:10 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -39,6 +39,7 @@ Source8: clamav-notify-servers Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch +Patch23: clamav-0.86.2-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: clamav-lib = %{version}-%{release} Requires: data(clamav) @@ -100,11 +101,9 @@ Provides: init(clamav-milter) %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir -Requires(postun): %_initrddir -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 @@ -167,6 +166,7 @@ THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff +%patch23 -p1 -b .timeout perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -177,6 +177,7 @@ perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf + ## ------------------------------------------------------------ %build @@ -321,6 +322,11 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : %post milter /sbin/chkconfig --add clamav-milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : @@ -422,6 +428,13 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + * Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash commit fcb173893df176fd8469eb974cd6d75a3e4221bb Author: ensc <ensc(a)fedoraproject.org> Date: Fri Jul 29 16:28:05 2005 +0000 this patch reverts the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration diff --git a/clamav-0.86.2-timeout.patch b/clamav-0.86.2-timeout.patch new file mode 100644 index 0000000..af252b2 --- /dev/null +++ b/clamav-0.86.2-timeout.patch @@ -0,0 +1,11 @@ +--- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout ++++ clamav-0.86.2/clamav-milter/clamav-milter.c +@@ -373,7 +373,7 @@ + static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; + static volatile unsigned int n_children = 0; + static unsigned int max_children = 0; +-static int child_timeout = 300; /* number of seconds to wait for ++static int child_timeout = 0; /* number of seconds to wait for + * a child to die. Set to 0 to + * wait forever + */ commit 4c5e9e7ce3164112e9887d2671af41eca4323dff Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 28 15:35:10 2005 +0000 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash modulo-operation. So the sleep may get a negative number of seconds being interpreted as an option. This version makes sure that the module-operations returns a non-negative value. [BZ #164494, James Wilkinson] - added support for a /usr/sbin/clamav-notify-servers.local hook; this file will be executed (source'd) before all other actions and can abort the entire processing by invoking 'exit' diff --git a/clamav.spec b/clamav.spec index 554754c..4f5ffb9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.24 2005/07/25 17:19:21 ensc Exp $ +## $Id: clamav.spec,v 1.25 2005/07/25 17:56:56 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -422,6 +422,17 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + * Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists commit fe1f906f7a698666d2c19ef36d4966805a2b9c28 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 28 12:10:28 2005 +0000 added support for a /usr/sbin/clamav-notify-servers.local hook; this file will be executed (source'd) before all other actions and can abort the entire processing by invoking 'exit' diff --git a/clamav-notify-servers b/clamav-notify-servers index 11b443d..22d57a6 100644 --- a/clamav-notify-servers +++ b/clamav-notify-servers @@ -23,6 +23,9 @@ INITRDDIR=/etc/init.d ok=1 +f=/usr/sbin/clamav-notify-servers.local +test ! -e "$f" || . "$f" + for i in ${BASE}*; do test -e "$i" || continue commit 21bb824bafe08936866df1e56aa02c535f4bfaa4 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 28 12:06:36 2005 +0000 Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash modulo-operation. So the sleep may get a negative number of seconds being interpreted as an option. This version makes sure that the module-operations returns a non-negative value. [BZ #164494, James Wilkinson] diff --git a/freshclam-sleep b/freshclam-sleep index 25c3067..2cb6bb2 100755 --- a/freshclam-sleep +++ b/freshclam-sleep @@ -44,7 +44,8 @@ WARNING: update of clamav database is disabled; please see ;; (*) - sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] ;; esac commit 07f7b7b9b355cbfd2f4c1bf8cf1b82bb8d15977d Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:56:56 2005 +0000 bump release: to fix broken cvs tags diff --git a/clamav.spec b/clamav.spec index 41a4731..554754c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.23 2005/06/25 18:01:32 ensc Exp $ +## $Id: clamav.spec,v 1.24 2005/07/25 17:19:21 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -422,7 +422,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-1 +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists of a crontab which does not need to be changed and a helper script commit 34ee90c2defad8af819b7da7d889179c6e4b5d4c Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:19:38 2005 +0000 version 0.86.2 diff --git a/sources b/sources index a1edad3..bc5ea4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -df7116898cdd80ce56721a91e9cff206 clamav-0.86.1.tar.gz -dd5b89f732f84112207843748df5218c clamav-0.86.1.tar.gz.sig +870de14ba123d6e9cba9850498c49f5d clamav-0.86.2.tar.gz +7d9ffe964a67ee6db157e112203a2678 clamav-0.86.2.tar.gz.sig commit e5f388088b24008eefc97b54c51511b210391408 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:19:21 2005 +0000 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists of a crontab which does not need to be changed and a helper script (freshclam-sleep). This helper script is configured by /etc/sysconfig/freshclam diff --git a/clamav.spec b/clamav.spec index 1912e3b..41a4731 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.22 2005/06/25 17:38:35 ensc Exp $ +## $Id: clamav.spec,v 1.23 2005/06/25 18:01:32 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.1 -Release: %release_func 2 +Version: 0.86.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -67,10 +67,13 @@ Requires(postun): fedora-usermgmt >= 0.7 %package update Summary: Auto-updater for the Clam Antivirus scanner data-files Group: Applications/File +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.cron Requires: clamav-data = %{version}-%{release} Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod %__sed diffutils +Requires(post): %__chown %__chmod %package server Summary: Clam Antivirus scanner server @@ -204,6 +207,20 @@ perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; rm -rf "$RPM_BUILD_ROOT" _doc* %{__make} DESTDIR="$RPM_BUILD_ROOT" install +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + %{__install} -d -m755 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ @@ -230,10 +247,7 @@ mkdir _doc_server cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper -f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper -sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp -cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f" -rm -f "$f".tmp +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper ## prepare the update-files @@ -241,17 +255,17 @@ rm -f "$f".tmp %{__install} -m755 -p %{SOURCE8} ${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers touch ${RPM_BUILD_ROOT}%{freshclamlog} -cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF" -## Adjust this line... -MAILTO=root,postmaster,webmaster,%username +%__install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +%__install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +%__install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update -## It is ok to execute it as root; freshclam drops privileges and becomes -## user 'clamav' as soon as possible -# @MIN@ @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } +smartsubst 's!webmaster,clamav!webmaster,%username!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -## Comment out or remove this line... -1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2' -EOF %if 0%{!?_without_milter:1} #### The milter stuff @@ -260,6 +274,7 @@ function subst() { sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } + subst etc/clamd.conf /etc/clamd.d/milter.conf \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' @@ -295,15 +310,6 @@ test -e %{freshclamlog} || { %{__chown} root:%{username} %{freshclamlog} } -min=$[ RANDOM % 60 ] -hour=$[ RANDOM % 3 ] -tmp=$(mktemp /tmp/freshclam-cron.XXXXXX) -src=%_sysconfdir/cron.d/clamav-update -%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp -cmp -s $tmp "$src" || cat "$tmp" >"$src" -rm -f $tmp - - %postun data test "$1" != 0 || /usr/sbin/fedora-userdel %{username} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : @@ -375,9 +381,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %_bindir/freshclam %_mandir/man1/freshclam* -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/* -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/* +%config(noreplace) %_sysconfdir/sysconfig/freshclam %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog} @@ -414,6 +422,13 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-1 +- updated to 0.86.2 (SECURITY) +- changed the freshclam updating mechanism (again); now, it consists + of a crontab which does not need to be changed and a helper script + (freshclam-sleep). This helper script is configured by + /etc/sysconfig/freshclam + * Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 - updated to 0.86.1 - fixed randomization in %%post scriptlet: hour should be a range but commit 0ce16b40647c3f3f4f93b06e371b9c2aa6d0160b Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:17:06 2005 +0000 initial checkin diff --git a/clamav-update.cron b/clamav-update.cron new file mode 100644 index 0000000..3f1b005 --- /dev/null +++ b/clamav-update.cron @@ -0,0 +1,6 @@ +## Adjust this line... +MAILTO=root,postmaster,webmaster,clamav + +## It is ok to execute it as root; freshclam drops privileges and becomes +## user 'clamav' as soon as possible +0 */3 * * * root /usr/share/clamav/freshclam-sleep diff --git a/freshclam-sleep b/freshclam-sleep new file mode 100755 index 0000000..25c3067 --- /dev/null +++ b/freshclam-sleep @@ -0,0 +1,56 @@ +#! /bin/bash +# Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +FRESHCLAM_MOD=$[ 3*60 ] # 3 hours + +f=/etc/sysconfig/freshclam +test ! -e "$f" || . "$f" + + +case x"$1" in + (xnow) FRESHCLAM_DELAY=0;; + (x|xrandom) : ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};; + (*) FRESHCLAM_DELAY=$1;; +esac + +set -e + +case $FRESHCLAM_DELAY in + (disabled-warn) + echo $"\ +WARNING: update of clamav database is disabled; please see + '$f' + for information how to enable the periodic update resp. how to turn + off this message." >&2 + exit 1 + ;; + + (disabled) + exit 0 + ;; + + (*) + sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + ;; +esac + + +/usr/bin/freshclam --quiet && { + test -x /usr/sbin/clamav-notify-servers && \ + exec /usr/sbin/clamav-notify-servers || \ + : +} diff --git a/freshclam.sysconfig b/freshclam.sysconfig new file mode 100644 index 0000000..b11e207 --- /dev/null +++ b/freshclam.sysconfig @@ -0,0 +1,24 @@ +## When changing the periodicity of freshclam runs in the crontab, +## this value must be adjusted also. Its value is the timespan between +## two subsequent freshclam runs in minutes. E.g. for the default +## +## | 0 */3 * * * ... +## +## crontab line, the value is 180 (minutes). +# FRESHCLAM_MOD= + +## A predefined value for the delay in seconds. By default, the value is +## calculated by the 'hostid' program. This predefined value guarantees +## constant timespans of 3 hours between two subsequent freshclam runs. +## +## This options accepts two special values: +## 'disabled-warn' ... disables the automatic freshclam update and +## gives out a warning +## 'disabled' ... disables the automatic freshclam silently +# FRESHCLAM_DELAY= + + +### !!!!! REMOVE ME !!!!!! +### REMOVE ME: By default, the freshclam update is disabled to avoid +### REMOVE ME: network access without prior activation +FRESHCLAM_DELAY=disabled-warn # REMOVE ME commit a5bcab3926635c345dcd6c6522c1d8b5320fcc24 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 18:01:32 2005 +0000 sometime I should learn the difference between Release: and Version:... diff --git a/clamav.spec b/clamav.spec index 470ecee..1912e3b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.21 2005/06/25 17:25:50 ensc Exp $ +## $Id: clamav.spec,v 1.22 2005/06/25 17:38:35 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.2 -Release: %release_func 1 +Version: 0.86.1 +Release: %release_func 2 License: GPL Group: Applications/File commit fd1ada700391ea4328061dc708216465cdcec922 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 17:38:35 2005 +0000 increased release due a failed previous 'make tag'... diff --git a/clamav.spec b/clamav.spec index e0c1f8b..470ecee 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.20 2005/06/21 07:25:56 ensc Exp $ +## $Id: clamav.spec,v 1.21 2005/06/25 17:25:50 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.1 +Version: 0.86.2 Release: %release_func 1 License: GPL @@ -414,7 +414,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-1 +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 - updated to 0.86.1 - fixed randomization in %%post scriptlet: hour should be a range but not a single number commit 6162ba3c1464a8297fbad160a722c8f8da129fa5 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 17:35:47 2005 +0000 version 0.86.1 diff --git a/sources b/sources index 7072f09..a1edad3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1c886e4f4f4c3e4e76250b7b52c000b4 clamav-0.86.tar.gz -57948dbd3a9093265fe0ac4abd40c4c2 clamav-0.86.tar.gz.sig +df7116898cdd80ce56721a91e9cff206 clamav-0.86.1.tar.gz +dd5b89f732f84112207843748df5218c clamav-0.86.1.tar.gz.sig commit 48f46c14d083d743d84498f1423071a20a20c1c6 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 17:25:50 2005 +0000 - updated to 0.86.1 - fixed randomization in %%post scriptlet: hour should be a range but not a single number diff --git a/clamav.spec b/clamav.spec index 85a12fa..e0c1f8b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.19 2005/05/19 07:45:09 wtogami Exp $ +## $Id: clamav.spec,v 1.20 2005/06/21 07:25:56 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86 +Version: 0.86.1 Release: %release_func 1 License: GPL @@ -296,10 +296,10 @@ test -e %{freshclamlog} || { } min=$[ RANDOM % 60 ] -hour=$[ RANDOM % 24 ] +hour=$[ RANDOM % 3 ] tmp=$(mktemp /tmp/freshclam-cron.XXXXXX) src=%_sysconfdir/cron.d/clamav-update -%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour!g" "$src" >$tmp +%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp cmp -s $tmp "$src" || cat "$tmp" >"$src" rm -f $tmp @@ -414,6 +414,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-1 +- updated to 0.86.1 +- fixed randomization in %%post scriptlet: hour should be a range but + not a single number + * Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 - updated to 0.86 - randomize freshclam startup times in -update's %%post script (suggested commit 013c2bcebdca8d5314618be86e1d25bfb7b5f7c5 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 21 07:27:20 2005 +0000 version 0.86 diff --git a/sources b/sources index 07ebabb..7072f09 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b0675c3273785d61eefc1afa304745c0 clamav-0.85.1.tar.gz -a7472bf7044adf4b21be39d7b93360f0 clamav-0.85.1.tar.gz.sig +1c886e4f4f4c3e4e76250b7b52c000b4 clamav-0.86.tar.gz +57948dbd3a9093265fe0ac4abd40c4c2 clamav-0.86.tar.gz.sig commit ea2eaf4e94d18b4d33adfb704dae91416e79d25d Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 21 07:26:54 2005 +0000 typo diff --git a/clamd-README b/clamd-README index d717d39..e62b487 100644 --- a/clamd-README +++ b/clamd-README @@ -3,7 +3,7 @@ modify/copy them in the suggested way: clamd.conf: * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with a unique service-name; + * place this file into /etc/clamd.d with an unique service-name; e.g. as /etc/clamd.d/<SERVICE>.conf To make logfile rotation work properly, the LogFile should be commit 2d2f85be2fe304db356a1b949fef42644e9e2d71 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 21 07:25:56 2005 +0000 - updated to 0.86 - randomize freshclam startup times in -update's %%post script (suggested by Stephen Smoogen); this requires some more Requires(post): also diff --git a/clamav.spec b/clamav.spec index 6a711cf..85a12fa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.18 2005/05/19 07:41:38 wtogami Exp $ +## $Id: clamav.spec,v 1.19 2005/05/19 07:45:09 wtogami Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.85.1 -Release: %release_func 4 +Version: 0.86 +Release: %release_func 1 License: GPL Group: Applications/File @@ -70,7 +70,7 @@ Group: Applications/File Requires: clamav-data = %{version}-%{release} Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d -Requires(post): %{__chown} %{__chmod} +Requires(post): %__chown %__chmod %__sed diffutils %package server Summary: Clam Antivirus scanner server @@ -247,8 +247,7 @@ MAILTO=root,postmaster,webmaster,%username ## It is ok to execute it as root; freshclam drops privileges and becomes ## user 'clamav' as soon as possible -## Note: replace 'MIN' and 'HOUR' with random values -# MIN HOUR/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } +# @MIN@ @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } ## Comment out or remove this line... 1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2' @@ -296,6 +295,15 @@ test -e %{freshclamlog} || { %{__chown} root:%{username} %{freshclamlog} } +min=$[ RANDOM % 60 ] +hour=$[ RANDOM % 24 ] +tmp=$(mktemp /tmp/freshclam-cron.XXXXXX) +src=%_sysconfdir/cron.d/clamav-update +%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour!g" "$src" >$tmp +cmp -s $tmp "$src" || cat "$tmp" >"$src" +rm -f $tmp + + %postun data test "$1" != 0 || /usr/sbin/fedora-userdel %{username} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : @@ -406,6 +414,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 +- updated to 0.86 +- randomize freshclam startup times in -update's %%post script (suggested + by Stephen Smoogen); this requires some more Requires(post): also + * Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 - fix dist tagging the way Enrico wants it commit aaf71503391ab41e52637beec651d1aef92ec69c Author: ensc <ensc(a)fedoraproject.org> Date: Thu May 19 17:16:39 2005 +0000 reverted last changes diff --git a/.cvsignore b/.cvsignore index 1c1caee..f6ee3be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -clamav-0.85.1.tar.gz -clamav-0.85.1.tar.gz.sig +clamav-*.tar.gz* +clamav-*.*.rpm commit a7b6ed15124250eb324aee28c1402070655c1fda Author: Warren Togami <wtogami(a)fedoraproject.org> Date: Thu May 19 07:45:09 2005 +0000 bump because I screwed up the last tag diff --git a/clamav.spec b/clamav.spec index 524a1ec..6a711cf 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.17 2005/05/19 07:35:49 wtogami Exp $ +## $Id: clamav.spec,v 1.18 2005/05/19 07:41:38 wtogami Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.85.1 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -406,7 +406,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-3 +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 - fix dist tagging the way Enrico wants it * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 commit 6179079faec83bfe1430ed6a9cb2e3c446a6fd65 Author: Warren Togami <wtogami(a)fedoraproject.org> Date: Thu May 19 07:41:38 2005 +0000 fix typo diff --git a/clamav.spec b/clamav.spec index 7aea152..524a1ec 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.16 2005/05/19 06:27:21 oliver Exp $ +## $Id: clamav.spec,v 1.17 2005/05/19 07:35:49 wtogami Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -406,7 +406,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85-3 +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-3 - fix dist tagging the way Enrico wants it * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 commit d52962c3c636ac4dd1f4ec8737bc335b042c91c1 Author: Warren Togami <wtogami(a)fedoraproject.org> Date: Thu May 19 07:35:49 2005 +0000 fix dist tagging the way Enrico wants it diff --git a/clamav.spec b/clamav.spec index a1bb51d..7aea152 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.15 2005/05/17 06:41:27 oliver Exp $ +## $Id: clamav.spec,v 1.16 2005/05/19 06:27:21 oliver Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -17,12 +17,12 @@ %global pkgdatadir %_datadir/%name -%{!?release_func:%global release_func() %1} +%{!?release_func:%global release_func() %1%{?dist}} Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.85.1 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85-3 +- fix dist tagging the way Enrico wants it + * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 - Rebuild commit ec3e79546b429dd62f3b30ebe80a65e903e382fc Author: Oliver Falk <oliver(a)fedoraproject.org> Date: Thu May 19 06:27:21 2005 +0000 As the release version (2) was wrong (typo), I force a rebuild. Sorry. diff --git a/clamav.spec b/clamav.spec index 3836e02..a1bb51d 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.14 2005/05/14 08:56:12 ensc Exp $ +## $Id: clamav.spec,v 1.15 2005/05/17 06:41:27 oliver Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 +- Rebuild + * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 - Update commit bd5c6a1fc262f757a40fc1ed921092d6963ccc37 Author: Oliver Falk <oliver(a)fedoraproject.org> Date: Tue May 17 06:41:27 2005 +0000 Update from 0.85 to 0.85.1 diff --git a/.cvsignore b/.cvsignore index f6ee3be..1c1caee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -clamav-*.tar.gz* -clamav-*.*.rpm +clamav-0.85.1.tar.gz +clamav-0.85.1.tar.gz.sig diff --git a/clamav.spec b/clamav.spec index a78ed2d..3836e02 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.11 2005/03/29 23:52:48 ensc Exp $ +## $Id: clamav.spec,v 1.14 2005/05/14 08:56:12 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.85 -Release: %release_func 1 +Version: 0.85.1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 +- Update + * Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 - updated to 0.85 diff --git a/sources b/sources index dac75a1..07ebabb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -938952faec9f4deffe2c0f6772d64b97 clamav-0.85.tar.gz.sig -b6bf9b04d69b4e9cf917beca99d8169a clamav-0.85.tar.gz +b0675c3273785d61eefc1afa304745c0 clamav-0.85.1.tar.gz +a7472bf7044adf4b21be39d7b93360f0 clamav-0.85.1.tar.gz.sig commit 031b1c0a071352a41e2926767140d9ea4f7e1e22 Author: ensc <ensc(a)fedoraproject.org> Date: Sat May 14 08:56:12 2005 +0000 version 0.85 diff --git a/clamav.spec b/clamav.spec index 9e01022..a78ed2d 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.84 -Release: %release_func 0 +Version: 0.85 +Release: %release_func 1 License: GPL Group: Applications/File @@ -406,7 +406,10 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84 +* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 +- updated to 0.85 + +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 - updated to 0.84 * Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> diff --git a/sources b/sources index 13ee400..dac75a1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4c89908cc3e8ea7684bbea4cfeae025a clamav-0.84.tar.gz.sig -c43213da01d510faf117daa9a4d5326c clamav-0.84.tar.gz +938952faec9f4deffe2c0f6772d64b97 clamav-0.85.tar.gz.sig +b6bf9b04d69b4e9cf917beca99d8169a clamav-0.85.tar.gz commit 71de95e1ff2a117bd20ac64220229bc5fd2b6646 Author: ensc <ensc(a)fedoraproject.org> Date: Sun May 1 11:03:39 2005 +0000 version 0.84 diff --git a/clamav.spec b/clamav.spec index f361b89..9e01022 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,14 +21,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.83 -Release: %release_func 2 +Version: 0.84 +Release: %release_func 0 License: GPL Group: Applications/File URL: http://www.clamav.net Source0: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… +#Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84 +- updated to 0.84 + * Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - rebuilt diff --git a/sources b/sources index e519735..13ee400 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e3a1b6bbda8095c5aae4eb7bc753804c clamav-0.83.tar.gz -8bd9bb753a1f0cceb588f96dd0f002ab clamav-0.83.tar.gz.sig +4c89908cc3e8ea7684bbea4cfeae025a clamav-0.84.tar.gz.sig +c43213da01d510faf117daa9a4d5326c clamav-0.84.tar.gz commit 4d6873538bda3dae621909346d49ae09b3a2746e Author: Michael Schwendt <mschwendt(a)fedoraproject.org> Date: Wed Apr 6 22:11:35 2005 +0000 mass release bump for packages not rebuilt after FC-3-split diff --git a/clamav.spec b/clamav.spec index 9f404d8..f361b89 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id$ +## $Id: clamav.spec,v 1.11 2005/03/29 23:52:48 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.83 -Release: %release_func 1 +Release: %release_func 2 + License: GPL Group: Applications/File URL: http://www.clamav.net @@ -405,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> +- rebuilt + * Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 - updated to 0.83 commit a71f8e3289baf0878ecfe9eb04fdb06d8364613a Author: ensc <ensc(a)fedoraproject.org> Date: Tue Mar 29 23:52:48 2005 +0000 use %global instead of %define diff --git a/clamav.spec b/clamav.spec index 7c3a1e9..9f404d8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -8,16 +8,16 @@ ## -%define username clamav -%define homedir %_var/lib/clamav -%define freshclamlog %_var/log/freshclam.log -%define milterlog %_var/log/clamd.milter -%define milteruser clamilt -%define milterstatedir %_var/run/clamav-milter -%define pkgdatadir %_datadir/%name +%global username clamav +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milterlog %_var/log/clamd.milter +%global milteruser clamilt +%global milterstatedir %_var/run/clamav-milter +%global pkgdatadir %_datadir/%name -%{!?release_func:%define release_func() %1} +%{!?release_func:%global release_func() %1} Summary: End-user tools for the Clam Antivirus scanner Name: clamav commit f8eda023689b189f1760424a2c68acdbec99c166 Author: Michael Schwendt <mschwendt(a)fedoraproject.org> Date: Thu Mar 3 21:23:41 2005 +0000 *** empty log message *** diff --git a/clamav.spec b/clamav.spec index 62358d0..7c3a1e9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -60,8 +60,8 @@ Requires(pre): %_libdir/pkgconfig Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File Provides: data(clamav) -Requires(pre): fedora-usermgmt >= 0:0.7 -Requires(postun): fedora-usermgmt >= 0:0.7 +Requires(pre): fedora-usermgmt >= 0.7 +Requires(postun): fedora-usermgmt >= 0.7 %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -101,8 +101,8 @@ Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts -Requires(pre): fedora-usermgmt >= 0:0.7 -Requires(postun): fedora-usermgmt >= 0:0.7 +Requires(pre): fedora-usermgmt >= 0.7 +Requires(postun): fedora-usermgmt >= 0.7 %description commit 4563bd9bb7150614176e76b4e3d344c773ce9550 Author: Matthias Saou <thias(a)fedoraproject.org> Date: Thu Mar 3 20:08:36 2005 +0000 Mass letter "c" update, one or more apply : - Drop epoch: 0 - Remove %{epoch} requirements in sub-packages - Remove trailing white spaces - Keep consistent between spaces and tabs diff --git a/clamav.spec b/clamav.spec index 8a0ed30..62358d0 100644 --- a/clamav.spec +++ b/clamav.spec @@ -23,7 +23,6 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.83 Release: %release_func 1 -Epoch: 0 License: GPL Group: Applications/File URL: http://www.clamav.net @@ -40,7 +39,7 @@ Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires: clamav-lib = %{version}-%{release} Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel BuildRequires: bc @@ -51,44 +50,44 @@ Group: System Environment/Libraries Requires: data(clamav) %package devel -Summary: Headerfiles and libraries for the Clam Antivirus scanner +Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires: clamav-lib = %{version}-%{release} Requires(pre): %_libdir/pkgconfig %package data -Summary: The virus-signatures for clamav +Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File Provides: data(clamav) Requires(pre): fedora-usermgmt >= 0:0.7 Requires(postun): fedora-usermgmt >= 0:0.7 %package update -Summary: Auto-updater for clamav data-files +Summary: Auto-updater for the Clam Antivirus scanner data-files Group: Applications/File -Requires: clamav-data = %epoch:%version-%release +Requires: clamav-data = %{version}-%{release} Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %{__chown} %{__chmod} %package server -Summary: The clamav server +Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Provides: clamav-daemon = %epoch:%version-%release -Obsoletes: clamav-daemon < %epoch:%version-%release -Conflicts: clamav-daemon > %epoch:%version-%release +Provides: clamav-daemon = %{version}-%{release} +Obsoletes: clamav-daemon < %{version}-%{release} +Conflicts: clamav-daemon > %{version}-%{release} ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) Provides: init(clamav-server) Requires: data(clamav) -Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires: clamav-lib = %{version}-%{release} Requires(pre): %_initrddir Requires(postun): %_initrddir %package milter -Summary: A sendmail-milter for clamav +Summary: Sendmail-milter for the Clam Antivirus scanner Group: System Environment/Daemons ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages @@ -626,5 +625,5 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : * Tue Oct 29 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.52-1 - updated to 0.52 -* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - Initial build. commit c19278e4f79fa0cebe6a2d7921beab2ba7d38daa Author: ensc <ensc(a)fedoraproject.org> Date: Tue Feb 15 08:40:51 2005 +0000 updated to 0.83 diff --git a/clamav.spec b/clamav.spec index c02e110..8a0ed30 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.82 +Version: 0.83 Release: %release_func 1 Epoch: 0 License: GPL @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 +- updated to 0.83 + * Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 - updated to 0.82 - minor spec cleanups diff --git a/sources b/sources index 155b8af..e519735 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1b58972d8918f5174d7f05a35a48856b clamav-0.82.tar.gz -f4010a5d15408fb83077fc5eb468eeb0 clamav-0.82.tar.gz.sig +e3a1b6bbda8095c5aae4eb7bc753804c clamav-0.83.tar.gz +8bd9bb753a1f0cceb588f96dd0f002ab clamav-0.83.tar.gz.sig commit e75ca52c9f36c2ea3423449659015ba2cdc61e7e Author: ensc <ensc(a)fedoraproject.org> Date: Tue Feb 8 23:01:08 2005 +0000 updated diff --git a/.cvsignore b/.cvsignore index ff8c3c5..f6ee3be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ clamav-*.tar.gz* -clamav-0.81.tar.gz -clamav-0.81.tar.gz.sig +clamav-*.*.rpm diff --git a/sources b/sources index c9f586e..155b8af 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -60081ddd9f29cbb8f0a2fe575e5a8afa clamav-0.81.tar.gz -b3c33479713c18794dfe83aa7397c604 clamav-0.81.tar.gz.sig +1b58972d8918f5174d7f05a35a48856b clamav-0.82.tar.gz +f4010a5d15408fb83077fc5eb468eeb0 clamav-0.82.tar.gz.sig commit 5ec291e507237bec6628b38dbd5fc9cd006b0f41 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Feb 8 23:00:37 2005 +0000 - updated to 0.82 - minor spec cleanups diff --git a/clamav.spec b/clamav.spec index babe1b2..c02e110 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,9 +1,10 @@ +## $Id$ + ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage ## Fedora Extras specific customization below... -%{!?release_func:%define release_func() %1} ## @@ -15,10 +16,13 @@ %define milterstatedir %_var/run/clamav-milter %define pkgdatadir %_datadir/%name + +%{!?release_func:%define release_func() %1} + Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.81 -Release: %release_func 2 +Version: 0.82 +Release: %release_func 1 Epoch: 0 License: GPL Group: Applications/File @@ -113,15 +117,6 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. -WARNING: this package was built with '--disable-zlib-vcheck' because Red Hat - is unable to apply a simple security fix within 5 months. On - failures or successful DOS attacks on your mailserver, please - blame RH but not fedora.us. - - See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and - http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 - for references - %description lib This package contains dynamic libraries shared between applications @@ -182,23 +177,13 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ %build -cat <<EOF -********************* -** -** WARNING: building with '--disable-zlib-vcheck' because Red Hat is unable -** to apply a simple security fix within 5 months. On failures or -** successful DOS attacks on your mailserver, please blame RH -** but not fedora.us. -** -** See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 -** and http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 -** for references -** -********************* -EOF - -sleep 10 - +## '--disable-zlib-vcheck' is used because every FC<=3 ships zlib-1.2.1* +## but clamav checks for zlib >= 1.2.2. This option can be removed for +## FC4 builds. +## +## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and +## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 +## also %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --disable-zlib-vcheck \ %{!?_without_milter:--enable-milter} @@ -421,6 +406,10 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 +- updated to 0.82 +- minor spec cleanups + * Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 - build the package with '--disable-zlib-vcheck' because RH is unable to apply a fix for a 5 month old and solved security issue. Please fill commit b77bb64a6a20ba072422bcfd7e45c5c310d67c82 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Feb 3 08:40:44 2005 +0000 - build the package with '--disable-zlib-vcheck' because RH is unable to apply a fix for a 5 month old and solved security issue. Please fill your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 - added 'BuildRequires: bc' (should work without also, but ./configure gives out ugly warnings else) 0.81-0.fdr.1 - updated to 0.81 - do not ship the 'clamd.milter' daemon anymore; clamav-milter supports an internal mode now which is enabled by default - updated -milter %%description 0.80-0.fdr.2 - s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) 0.80-0.fdr.1 - updated to 0.80 - removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore - buildrequire 'curl-devel' - renamed clamav.conf to clamd.conf (upstream change) - updated -initoff patch 0.75.1-0.fdr.1 - updated to 0.75.1 - use %%configure, the problems with the architecture specification seem to have passed (probably because of an autoconf update) - set mode 0600 for the cron-script (required by vixie-cron) - made the cronjob a spambot and send mail about deactivated freshclam service to nearly everybody... (root, postmaster, webmaster) - other fixes in the notification cronjob 0.75-0.fdr.1 - updated to 0.75 0.74-0.fdr.2 - moved /usr/bin/clamav-config from main into -devel 0.74-0.fdr.1 - updated to 0.74 0.73-0.fdr.1 - updated to 0.73 - added pkgconfig file 0.72-0.fdr.3 - notify the user about a deactivated clamav-update service - added clamd-gen script which generates template spec-files for services using clamd - copied template configuration files to %pkgdatadir/template (needed for clamd-gen) - moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink will be provided for compatibility reasons - conditionalized building of the -milter subpackage ('--without milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) 0.72-0.fdr.2 - removed 'BuildRequires: dietlibc'; it was a leftover from the pre-use-signal era (before 0.70) (bug #1716) 0.72-0.fdr.1 - updated to 0.72 diff --git a/.cvsignore b/.cvsignore index 0196009..ff8c3c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,3 @@ -clamav-0.71.tar.gz +clamav-*.tar.gz* +clamav-0.81.tar.gz +clamav-0.81.tar.gz.sig diff --git a/clamav-0.70-initoff.patch b/clamav-0.70-initoff.patch deleted file mode 100644 index c1e1860..0000000 --- a/clamav-0.70-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 91 30 -+# chkconfig: - 79 31 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes - # email messages to clamav diff --git a/clamav-0.71.tar.gz.sig b/clamav-0.71.tar.gz.sig deleted file mode 100644 index 2d70446..0000000 Binary files a/clamav-0.71.tar.gz.sig and /dev/null differ diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch new file mode 100644 index 0000000..7ef309e --- /dev/null +++ b/clamav-0.80-initoff.patch @@ -0,0 +1,11 @@ +--- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 ++++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 +@@ -2,7 +2,7 @@ + # + # clamav-milter This script starts and stops the clamav-milter daemon + # +-# chkconfig: 2345 71 40 ++# chkconfig: - 71 40 + # + # description: clamav-milter is a daemon which hooks into sendmail and routes + # email messages to clamav diff --git a/clamav.spec b/clamav.spec index e264659..babe1b2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,15 +1,24 @@ +## This package understands the following switches: +## --without milter ... deactivate the -milter subpackage + + +## Fedora Extras specific customization below... +%{!?release_func:%define release_func() %1} +## + + %define username clamav %define homedir %_var/lib/clamav %define freshclamlog %_var/log/freshclam.log %define milterlog %_var/log/clamd.milter %define milteruser clamilt %define milterstatedir %_var/run/clamav-milter -%define milterclamddir %_var/run/clamd.milter +%define pkgdatadir %_datadir/%name Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.71 -Release: 2 +Version: 0.81 +Release: %release_func 2 Epoch: 0 License: GPL Group: Applications/File @@ -25,11 +34,12 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch -Patch22: clamav-0.70-initoff.patch +Patch22: clamav-0.80-initoff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: clamav-lib = %{epoch}:%{version}-%{release} Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers +BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel +BuildRequires: bc %package lib Summary: Dynamic libraries for the Clam Antivirus scanner @@ -39,7 +49,9 @@ Requires: data(clamav) %package devel Summary: Headerfiles and libraries for the Clam Antivirus scanner Group: Development/Libraries +Source100: clamd-gen Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires(pre): %_libdir/pkgconfig %package data Summary: The virus-signatures for clamav @@ -68,7 +80,6 @@ Requires: init(clamav-server) Provides: init(clamav-server) Requires: data(clamav) Requires: clamav-lib = %{epoch}:%{version}-%{release} -BuildRequires: dietlibc Requires(pre): %_initrddir Requires(postun): %_initrddir @@ -79,9 +90,7 @@ Group: System Environment/Daemons ## and -minit subpackages Requires: init(clamav-milter) Provides: init(clamav-milter) -BuildRequires: sendmail-devel -Requires(preun): clamav-server = %{epoch}:%{version}-%{release} -Requires(postun): clamav-server = %{epoch}:%{version}-%{release} +%{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir Requires(postun): %_initrddir @@ -104,6 +113,16 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. +WARNING: this package was built with '--disable-zlib-vcheck' because Red Hat + is unable to apply a simple security fix within 5 months. On + failures or successful DOS attacks on your mailserver, please + blame RH but not fedora.us. + + See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and + http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 + for references + + %description lib This package contains dynamic libraries shared between applications using the Clam Antivirus scanner. @@ -120,7 +139,7 @@ ships a corresponding cron-job. %description update This package contains programs which can be used to update the clamav anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav. +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. %description server ATTENTION: most users do not need this package; the main package has @@ -138,7 +157,6 @@ This package contains files which are needed to run the clamav-milter. It can be activated by adding | INPUT_MAIL_FILTER(`clamav', `S=local:%milterstatedir/clamav.sock, F=, T=S:4m;R:4m')dnl -| define(`confINPUT_MAIL_FILTERS', `clamav')dnl to your sendmail.mc. @@ -157,23 +175,35 @@ perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g; s!^#?(User ).*!\1<USER>!g; s! /usr/local/share/clamav,! %homedir,!g; - ' etc/clamav.conf + ' etc/clamd.conf perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ %build -#%%configure --disable-clamav --with-dbdir=/var/lib/clamav -## The %%configure macro can not be used since the script breaks on -## the old architecture specification +cat <<EOF +********************* +** +** WARNING: building with '--disable-zlib-vcheck' because Red Hat is unable +** to apply a simple security fix within 5 months. On failures or +** successful DOS attacks on your mailserver, please blame RH +** but not fedora.us. +** +** See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +** and http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 +** for references +** +********************* +EOF -CFLAGS=$RPM_OPT_FLAGS; export CFLAGS -./configure --prefix=%{_prefix} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \ - --disable-clamav --with-dbdir=%{homedir} \ - --enable-milter +sleep 10 -## HACK: ./configure checks if freshclam.conf/clamav.conf are existing +%configure --disable-clamav --with-dbdir=/var/lib/clamav \ + --disable-zlib-vcheck \ + %{!?_without_milter:--enable-milter} + +## HACK: ./configure checks if freshclam.conf/clamd.conf are existing ## in current filesystem and skips its installation then. Was introduced ## by 0.66. perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; @@ -192,20 +222,34 @@ rm -rf "$RPM_BUILD_ROOT" _doc* %{__install} -d -m755 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ - ${RPM_BUILD_ROOT}{%milterstatedir,%milterclamddir} \ + ${RPM_BUILD_ROOT}%milterstatedir \ + ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%{_initrddir} -rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/clamav.conf \ +rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/clamd.conf \ ${RPM_BUILD_ROOT}%{_libdir}/*.la +%{?_without_milter:rm -f $RPM_BUILD_ROOT%_mandir/*/*milter*} + ## prepare the server-files mkdir _doc_server -%{__install} -m644 -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_initrddir}/clamd-wrapper %{__install} -m644 -p %{SOURCE2} _doc_server/clamd.sysconfig %{__install} -m644 -p %{SOURCE3} _doc_server/clamd.logrotate %{__install} -m755 -p %{SOURCE7} _doc_server/clamd.init %{__install} -m644 -p %{SOURCE5} _doc_server/README +%__install -m644 -p etc/clamd.conf _doc_server/clamd.conf + +%__install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir +%__install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper + +f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper +sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp +cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f" +rm -f "$f".tmp + ## prepare the update-files %{__install} -m644 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/clamav-update @@ -213,26 +257,28 @@ mkdir _doc_server touch ${RPM_BUILD_ROOT}%{freshclamlog} cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF" +## Adjust this line... +MAILTO=root,postmaster,webmaster,%username + ## It is ok to execute it as root; freshclam drops privileges and becomes ## user 'clamav' as soon as possible ## Note: replace 'MIN' and 'HOUR' with random values # MIN HOUR/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } -EOF +## Comment out or remove this line... +1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2' +EOF +%if 0%{!?_without_milter:1} #### The milter stuff function subst() { sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } -subst %SOURCE3 /etc/logrotate.d/clamd.milter -subst %SOURCE7 %_initrddir/clamd.milter -subst etc/clamav.conf /etc/clamd.d/milter.conf \ +subst etc/clamd.conf /etc/clamd.d/milter.conf \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' -chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.milter -ln -s ./clamd $RPM_BUILD_ROOT%_sbindir/clamd.milter cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter ## The '-blo' options might be usefully here -- especially for testing; see @@ -242,8 +288,9 @@ CLAMAV_USER='%milteruser' EOF %__install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter -touch $RPM_BUILD_ROOT%milterclamddir/{clamd.sock,clamd.pid,milter.sock} touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog +%endif # _without_milter + ## ------------------------------------------------------------ @@ -275,18 +322,14 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : %post milter /sbin/chkconfig --add clamav-milter -/sbin/chkconfig --add clamd.milter %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : -test "$1" != 0 || %{_initrddir}/clamd.milter stop &>/dev/null || : test "$1" != 0 || /sbin/chkconfig --del clamav-milter -test "$1" != 0 || /sbin/chkconfig --del clamd.milter %postun milter test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : -test "$1" = 0 || %{_initrddir}/clamd.milter condrestart >/dev/null || : test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : @@ -298,15 +341,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO %doc docs/*.pdf -%doc docs/html docs/DMS docs/FreeBSD-HowTo -%lang(fr) %doc docs/French -%lang(ja) %doc docs/Japanese -%lang(pl) %doc docs/Polish -%lang(pt) %doc docs/Portugese -%lang(es) %doc docs/Spanish -%lang(tr) %doc docs/Turkish %doc %{_mandir}/man[15]/* %{_bindir}/* +%exclude %_bindir/clamav-config %exclude %_bindir/freshclam %exclude %_mandir/man1/freshclam* @@ -323,12 +360,20 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %{_includedir}/* %{_libdir}/*.*a %{_libdir}/*.so +%dir %pkgdatadir +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config ## ----------------------- %files data %defattr(-,%{username},%{username},-) %dir %{homedir} +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. %config %verify(not size md5 mtime) %{homedir}/*.cvd ## ----------------------- @@ -338,7 +383,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %_bindir/freshclam %_mandir/man1/freshclam* %config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/cron.d/* +%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/* %config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog} @@ -348,12 +393,15 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc etc/clamav.conf %doc %{_mandir}/man8/* %{_sbindir}/* -%config %{_initrddir}/clamd-wrapper +%_initrddir/clamd-wrapper +%dir %pkgdatadir %dir %{_sysconfdir}/clamd.d +%pkgdatadir/clamd-wrapper + +%if 0%{!?_without_milter:1} %exclude %_sbindir/*milter* %exclude %_mandir/man8/clamav-milter* @@ -364,18 +412,79 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* -%config %{_initrddir}/clamd.milter %config %{_initrddir}/clamav-milter %config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/milter.conf %config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamav-milter -%attr(0700,%milteruser,%milteruser) %dir %milterclamddir %attr(0700,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterclamddir/* %ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog - +%endif # _without_milter %changelog +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 +- build the package with '--disable-zlib-vcheck' because RH is unable to + apply a fix for a 5 month old and solved security issue. Please fill + your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +- added 'BuildRequires: bc' (should work without also, but ./configure + gives out ugly warnings else) + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 +- updated to 0.81 +- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports + an internal mode now which is enabled by default +- updated -milter %%description + +* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 +- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update + subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) + +* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 +- updated to 0.80 +- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore +- buildrequire 'curl-devel' +- renamed clamav.conf to clamd.conf (upstream change) +- updated -initoff patch + +* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 +- updated to 0.75.1 +- use %%configure, the problems with the architecture specification + seem to have passed (probably because of an autoconf update) +- set mode 0600 for the cron-script (required by vixie-cron) +- made the cronjob a spambot and send mail about deactivated freshclam + service to nearly everybody... (root, postmaster, webmaster) +- other fixes in the notification cronjob + +* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 +- updated to 0.75 + +* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 +- moved /usr/bin/clamav-config from main into -devel + +* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 +- updated to 0.74 + +* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 +- updated to 0.73 +- added pkgconfig file + +* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 +- notify the user about a deactivated clamav-update service +- added clamd-gen script which generates template spec-files for + services using clamd +- copied template configuration files to %pkgdatadir/template (needed + for clamd-gen) +- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink + will be provided for compatibility reasons +- conditionalized building of the -milter subpackage ('--without + milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) + +* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 +- removed 'BuildRequires: dietlibc'; it was a leftover from the + pre-use-signal era (before 0.70) (bug #1716) + +* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 +- updated to 0.72 + * Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 - removed the randomization in the cronjob; it seems to be impossible to use the mod-operator (%%) there. Instead of, the user has to diff --git a/clamd-README b/clamd-README index 7d8e676..d717d39 100644 --- a/clamd-README +++ b/clamd-README @@ -1,7 +1,7 @@ To create individual clamd-instance take the following files and modify/copy them in the suggested way: -clamav.conf: +clamd.conf: * set LogFile, PidFile, LocalSocket and User to suitable values * place this file into /etc/clamd.d with a unique service-name; e.g. as /etc/clamd.d/<SERVICE>.conf @@ -42,7 +42,7 @@ clamd.init: Additionally, a symlink must be set to clamd in a way like | # ln -s clamd /usr/sbin/clamd.<SERVICE> and the directory for the socket file must be created (see 'LocalSocket' -in clamav.conf) +in clamd.conf) | # mkdir -p /var/run/clamd.<SERVICE> diff --git a/clamd-gen b/clamd-gen new file mode 100755 index 0000000..cd4c61c --- /dev/null +++ b/clamd-gen @@ -0,0 +1,268 @@ +#! /bin/bash + +# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +function showHelp() +{ + echo \ +$"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> + --license=<LICENSE> --username=>USERNAME> +" + exit 0 +} + +function rpm.generatePreamble() +{ + cat <<EOF +%{!?release_func:%define release_func() 0.fdr.%1} +# The name of the minit service +%define minitsvcdir %minitdir/services/%name +# The configuration file for the SysV initservice +%define conffile %_sysconfdir/clamd.d/%service.conf +# The directory, where the milter socket will be placed into; this +# socket will be named clamd.sock +%define rundir /var/run/clamd.%service +# The name of the logfile +%define logfile /var/log/clamd.%service +# The user under whose id, the clamd shall be running. This user must +# be able to read the files from the base-service and is usually +# created there. +%define username $USERNAME +# The packagename of the service +%define service $SERVICE +# The service name as used by the system's initscripts; usually this +# is %service +%define baseservice %service + +%define __chkconfig /sbin/chkconfig +%define minitdir %_sysconfdir/minit + + +EOF +} + +function rpm.generateHeader() +{ + cat <<EOF +Summary: Clamav server for '%service' +Name: clamd.%service +Version: $VERSION +Release: %release_func $RELEASE +Epoch: 0 +License: $LICENSE +Group: System Environment/Daemons +BuildRoot: %_tmppath/%name-%version-%release-root +BuildArch: noarch +Requires: init(%name) +Requires(pre): %service +Requires: clamav-server +BuildRequires: clamav-devel + +%package sysv +Summary: SysV initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = sysv +Conflicts: init(%name) < sysv +Conflicts: init(%name) > sysv +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp %__chkconfig +Requires(preun): %__chkconfig +Requires(pre): %_initrddir +Requires(postun): %_initrddir + +%package minit +Summary: minit initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = minit +Conflicts: init(%name) < minit +Conflicts: init(%name) > minit +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp +Requires(pre): minit-setup +Requires(postun): minit-setup +Requires(triggers): minit-tools + + +%description +Basic setup for a clamav server for '%service'. + + +%description sysv +Basic setup for a clamav server for '%service'. + +This package contains initscripts for SysV based systems. + + +%description minit +Basic setup for a clamav server for '%service'. + +This package contains initscripts for minit based systems. + +EOF +} + + +function rpm.genBody() +{ + cat <<"XEOFX" +%prep +%build + +%install +rm -rf $RPM_BUILD_ROOT +%__install -d -m755 $RPM_BUILD_ROOT{%minitsvcdir,%_sbindir,%rundir,/var/log} + +d=/usr/share/clamav/template + +function subst +{ + src=$d/$1 + dst=$RPM_BUILD_ROOT$2 + + %__install -d -m755 $(dirname "$dst") + sed -e 's!^$#?LogFile $.*!\1%logfile!g; + s!^#?$LocalSocket $.*!\1%rundir/clamd.sock!g; + s!^#?$PidFile $.*!\1%rundir/clamd.pid!g; + s!<SERVICE>!%service!g; + s!<USER>!%username!g;' "$src" >"$dst" + chmod --reference "$src" "$dst" +} + +subst clamd.conf %conffile +subst clamd.logrotate %_sysconfdir/logrotate.d/clamd.%service + +%if 0%{!?_without_sysv:1} +subst clamd.sysconfig %_sysconfdir/sysconfig/clamd.%service +subst clamd.init %_initrddir/clamd.%service +%endif + +ln -s clamd $RPM_BUILD_ROOT%_sbindir/clamd.%service + +touch $RPM_BUILD_ROOT%logfile +touch $RPM_BUILD_ROOT%rundir/clamd.sock + +%if 0%{!?_without_minit:1} +ln -s %_sbindir/clamd.%service $RPM_BUILD_ROOT%minitsvcdir/run +touch $RPM_BUILD_ROOT%minitsvcdir/respawn +cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params +-c +%conffile +EOF +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + + +%triggerin minit -- %baseservice +minit-svc add services/clamd.%service services/%baseservice/ + +%triggerun minit -- %baseservice +test "$1" != 0 -a "$2" != 0 || \ + minit-svc del services/clamd.%service services/%baseservice/ + + +%post minit +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^#Foreground!Foreground!' "%conffile" >"$d" +grep -q '^Foreground' $d || echo 'Foreground' >>$d +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%post sysv +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^Foreground!#Foreground!' "%conffile" >"$d" +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%__chkconfig --add %name + + +%preun sysv +test "$1" != 0 || %__chkconfig --del %name + +XEOFX +} + + +function rpm.genFiles +{ + cat <<"EOF" +%files +%defattr(-,root,root,-) +%doc +%config(noreplace) %verify(not size md5 mtime) %attr(0620,root,%username) %logfile +%config(noreplace) %verify(not mtime) %conffile +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/clamd.%service +%_sbindir/clamd.%service +%dir %attr(0700,%username,root) %rundir +%ghost %rundir/clamd.sock + + +%if 0%{!?_without_sysv:1} +%files sysv +%defattr(-,root,root,-) +%config %verify(not mtime) %_initrddir/clamd.%service +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamd.%service +%endif + + +%if 0%{!?_without_minit:1} +%files minit +%defattr(-,root,root,-) +%dir %minitsvcdir +%config(noreplace) %verify(not mtime) %minitsvcdir/params +%config %minitsvcdir/run + %minitsvcdir/respawn +%endif +EOF +} + + +SERVICE= +VERSION= +RELEASE= +LICENSE= +USERNAME= +tmp=$(getopt -o '' --long service:,version:,release:,license:,username:,help -n "$0" -- "$@") || exit 1 +eval set -- "$tmp" + +while true; do + case "$1" in + (--help) showHelp $0;; + (--service) SERVICE=$2; shift;; + (--version) VERSION=$2; shift;; + (--release) RELEASE=$2; shift;; + (--license) LICENSE=$2; shift;; + (--username) USERNAME=$2; shift;; + (--) shift; break;; + esac + shift +done + +for i in SERVICE VERSION RELEASE LICENSE USERNAME; do + eval tmp=\$${i} + test "$tmp" || { + echo $"No value for $i specified; assuming @${i}@" >&2; + eval $i=@${i}@; + } +done + + +rpm.generatePreamble +rpm.generateHeader +rpm.genBody +rpm.genFiles diff --git a/clamd.SERVICE.init b/clamd.SERVICE.init index 5906b10..9681351 100644 --- a/clamd.SERVICE.init +++ b/clamd.SERVICE.init @@ -4,4 +4,4 @@ # description: The clamd server running for <SERVICE> CLAMD_SERVICE=<SERVICE> -. /etc/init.d/clamd-wrapper +. /usr/share/clamav/clamd-wrapper diff --git a/sources b/sources index 32295b7..c9f586e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -096cffd2633cbac5a14b7080b6f67a67 clamav-0.71.tar.gz +60081ddd9f29cbb8f0a2fe575e5a8afa clamav-0.81.tar.gz +b3c33479713c18794dfe83aa7397c604 clamav-0.81.tar.gz.sig commit 9b62e0af2851c28f6381b6b4626c4739d8573ac7 Author: Michael Schwendt <mschwendt(a)fedoraproject.org> Date: Fri Dec 10 22:03:01 2004 +0000 Bump release, strip off fedora.us prefix and dist tag. diff --git a/clamav.spec b/clamav.spec index d338b5d..e264659 100644 --- a/clamav.spec +++ b/clamav.spec @@ -9,7 +9,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.71 -Release: 0.fdr.2.2 +Release: 2 Epoch: 0 License: GPL Group: Applications/File commit a0e1e1da964db851c8383047d93ac78320b42c3e Author: gafton <gafton(a)fedoraproject.org> Date: Wed Nov 24 03:10:01 2004 +0000 Fix braindead import typo artifact in the default generated Makefile. Oh well, the fedora extras commits list needs a workout anyway... diff --git a/Makefile b/Makefile index aefa629..21be25f 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common))

1 0

Architecture specific change in rpms/clamav.git
by githook-noreply＠fedoraproject.org 27 Jan '18

27 Jan '18

The package rpms/clamav.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=f5659018a4a4a… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=162c660fd5b57… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=656658e8d6f02… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=1b188a1f3f19a… https://src.fedoraproject.org/cgit/rpms/clamav.git/commit/?id=14d21bc46d3a5…. Change: -%ifnarch s390 s390x +%ifnarch s390 s390x +%ifnarch s390 s390x -%ifnarch s390 s390x +%ifnarch s390 s390x Thanks. Full change: ============ commit c93e477aa420f38a4421934d407eb576adb57473 Merge: c67bf0c 162c660 Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Sat Jan 27 02:21:29 2018 +0000 Merge branch 'el6' commit 162c660fd5b57e919c56c0bd981e25adbb01d65d Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Fri Jan 26 22:54:22 2018 +0000 Clamav 0.99.3 with git "merge" master i.e.: git diff HEAD..master | patch -p1 and git add ChangeLog-rpm.old README.fedora clamav-0.98-umask.patch clamav-0.99-private.patch clamav-milter.systemd clamav-milter.sysv clamav-milter.upstart clamav-update.crond clamav-update.logrotate clamd-README clamd-gen clamd-wrapper clamd.SERVICE.init clamd.scan.upstart clamd.sysconfig clamd@.service clamd(a)scan.service freshclam-sleep freshclam.sysconfig llvm-glibc.patch and again git diff HEAD..master | patch -p1 patching file clamd-gen patching file freshclam-sleep diff --git a/.gitignore b/.gitignore index d87d52b..0c8b00b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ -/clamd-wrapper.tar.bz2 /clamav-*-norar.tar.xz /main*.cvd /daily*.cvd /bytecode-278.cvd +/bytecode-319.cvd diff --git a/ChangeLog-rpm.old b/ChangeLog-rpm.old new file mode 100644 index 0000000..44c8556 --- /dev/null +++ b/ChangeLog-rpm.old @@ -0,0 +1,279 @@ +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + +* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 +- updated to 0.88.6 + +* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 +- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 +- added patch to set '__attribute__ ((visibility("hidden")))' for + exported MD5_*() functions (fixes #202043) + +* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 +- splitted SysV initscripts of -milter and -server into own subpackages + +* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 +- rebuilt + +* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 +- updated to 0.88.4 (SECURITY) + +* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed the clamdscan(1) manpage from the -server subpackage + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed a superfluous '}' +- removed some code which was relevant for FC-3 only + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 +- updated to 0.88.3 +- updated to new fedora-usermgmt macros + +* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 +- cleanups: removed unneeded curlies, use plain command instead of + %%__XXX macro, whitespace cleanup, removed unneeded versioned + dependencies +- added a 'Requires(post): group(clamav)' dependencies for -update and + added the corresponding Provides: to -data +- removed the %%_without_milter conditional; you won't gain anything + when milter would be disabled at buildtime + +* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 +- updated to 0.88.2 (SECURITY) +- rediffed patches; most issues handled by 0.88.1-2 are fixed in + 0.88.2 + +* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 +- added patch which fixes some classes of compiler warnings; at least + the using of implicitly declared functions was reported to cause + segfaults on AMD64 (brought to my attention by Marc Perkel) +- added patch which fixes wrong usage of strncpy(3) in unrarlib.c + +* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 +- updated to 0.88.1 (SECURITY) + +* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 +- rebuilt for FC5 + +* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 +- updated to 0.88 +- added pseudo-versions for the 'init(...)' provides as a first step + for the support of alternative initmethods + +* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 +- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) +- ship 'clamd.conf.5' man page in the -server subpackage *too*. The + same file is contained in multiple packages now, but this man-page + can not be removed from the base package because it also applies to + 'clamdscan' there (#173221). + +* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 +- updated to 0.87.1 + +* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 +- updated to 0.87 (SECURITY) +- removed -timeout patch; it is solved upstream +- reverted the -exim changes; they add yet more complexity, their + functionality can go into an own package and they contained flaws + +* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 +- Add clamav-exim configuration package + +* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + +* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 +- updated to 0.86.2 (SECURITY) +- changed the freshclam updating mechanism (again); now, it consists + of a crontab which does not need to be changed and a helper script + (freshclam-sleep). This helper script is configured by + /etc/sysconfig/freshclam + +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 +- updated to 0.86.1 +- fixed randomization in %%post scriptlet: hour should be a range but + not a single number + +* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 +- updated to 0.86 +- randomize freshclam startup times in -update's %%post script (suggested + by Stephen Smoogen); this requires some more Requires(post): also + +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 +- fix dist tagging the way Enrico wants it + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 +- Rebuild + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 +- Update + +* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 +- updated to 0.85 + +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 +- updated to 0.84 + +* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> +- rebuilt + +* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 +- updated to 0.83 + +* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 +- updated to 0.82 +- minor spec cleanups + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 +- build the package with '--disable-zlib-vcheck' because RH is unable to + apply a fix for a 5 month old and solved security issue. Please fill + your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +- added 'BuildRequires: bc' (should work without also, but ./configure + gives out ugly warnings else) + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 +- updated to 0.81 +- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports + an internal mode now which is enabled by default +- updated -milter %%description + +* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 +- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update + subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) + +* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 +- updated to 0.80 +- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore +- buildrequire 'curl-devel' +- renamed clamav.conf to clamd.conf (upstream change) +- updated -initoff patch + +* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 +- updated to 0.75.1 +- use %%configure, the problems with the architecture specification + seem to have passed (probably because of an autoconf update) +- set mode 0600 for the cron-script (required by vixie-cron) +- made the cronjob a spambot and send mail about deactivated freshclam + service to nearly everybody... (root, postmaster, webmaster) +- other fixes in the notification cronjob + +* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 +- updated to 0.75 + +* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 +- moved /usr/bin/clamav-config from main into -devel + +* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 +- updated to 0.74 + +* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 +- updated to 0.73 +- added pkgconfig file + +* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 +- notify the user about a deactivated clamav-update service +- added clamd-gen script which generates template spec-files for + services using clamd +- copied template configuration files to %pkgdatadir/template (needed + for clamd-gen) +- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink + will be provided for compatibility reasons +- conditionalized building of the -milter subpackage ('--without + milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) + +* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 +- removed 'BuildRequires: dietlibc'; it was a leftover from the + pre-use-signal era (before 0.70) (bug #1716) + +* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 +- updated to 0.72 + +* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 +- removed the randomization in the cronjob; it seems to be impossible + to use the mod-operator (%%) there. Instead of, the user has to + replace some placeholders... + +* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 +- updated to 0.71 + +* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 +- quote 'EOF' to delay $RANDOM expansion + +* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 +- updated GECOS entry for the 'clamav' user to describe its purpose + more accurately +- use explicit '-m755' when creating directories with install + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 +- updated to 0.70; rediffed some patches +- updated logrotate script to use signals and documented the steps + which are needed to make it work +- adapted initscript to use signals instead of sockwrite +- removed sockwrite; signals can now be used to reload the database +- added logfile to the -milter subpackage + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 +- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets + +* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 +- split the double Requires(...,...): statements; see + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 +- require the recent fedora-usermgmt package (0.7) which fixes similar + ordering issues + +* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 +- updated to 0.68 (using the -1 version) +- ship milter-files in the -milter instead of the -server subpackage + +* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 +- fixed ':' vs. '.' in chown + +* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 +- randomize freshclam startup to prevent server peaks + +* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 +- updated to 0.67 (using the -1 version) + +* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 +- updated to 0.66; important, packaging-relevant changes are + freshclam: + * $http_proxy is not supported anymore; you have to configure it in + /etc/freshclam.conf + * the logfile has been renamed to /var/log/freshclam.log +- removed %%check section; buildroot check is implemented in local + testsuite already +- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew + files +- added some directory-Requires: +- activated milter-package and made it work +- added patch to disable clamav-milter service by default +- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this + makes things more consistently but can break backward compatibility. The + initscript should deal with the old version too, but I would not bet on + it... +- updated some descriptions +- fixed the update-mechanism; now it happens in two stages: at first, + the files will be downloaded as user 'clamav' and then, root initiates + the daemon-reload. + +* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 +- added security fix for + http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..8df192d --- /dev/null +++ b/README.fedora @@ -0,0 +1,116 @@ +A clamav-milter setup consists of the following three components: + +* the clamav-milter itself + + --> this is provided by the 'clamav-milter' package plus (alternatively) + 'clamav-milter-upstart' or 'clamav-milter-sysvinit' + + The main configuration is in /etc/mail/clamav-milter.conf and MUST + be changed before first use. + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamav-milter to + enable automatic startup. See comments there for more details. + +* a clamav scanner daemon + + --> this package is called 'clamav-scanner' plus (alternatively) + 'clamav-scanner-upstart' or 'clamav-scanner-sysvinit' + + The daemon is configured by /etc/clamd.d/scan.conf (which MUST be + edited before first use). + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamd.scan to enable + automatic startup. See comments there for more details. + +* the MTA (sendmail/postfix) + + --> you should know how to install this... + + When communicating across unix sockets with the clamav-milter, it is + suggested to use the /var/run/clamav-milter/clamav-milter.socket + path. You have to add something like + + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav-milter.socket, F=, T=S:4m;R:4m')dnl + + to your sendmail.mc. + + + +It is suggested that components communicate through TCP sockets as +this eases setup. Please add corresponding packet filter rules! + + +EXAMPLE +======= + +For clamav-milter, a possible setup might be created by + +A) On the MTA (assumed hostname 'host-mta') + + 1. Add to sendmail.mc + + | INPUT_MAIL_FILTER(`clamav', `S=inet:6666@host-milter, F=, T=S:4m;R:4m')dnl + + 2. Rebuild sendmail.cf + + +B) On the clamav-milter host (assumed hostname 'host-milter') + + 1. Install clamav-milter + clamav-milter-upstart packages + + 2. Set in /etc/mail/clamav-milter.conf + + | MilterSocket inet:6666 + | ClamdSocket tcp:host-scanner:6665 + + and all the other options which are required on your system + + 3. Edit /etc/event.d/clamav-milter and uncomment the + + | start on starting local + + line. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cmilt + | iptables -A IN-cmilt -s host-mta -j ACCEPT + | iptables -A IN-cmilt -j DROP + + | iptables -A INPUT -p tcp --dport 6666 -j IN-cmilt + + to your firewall setup + +C) On the clamav-scanner host (assumed hostname 'host-scanner') + + 1. Install clamav-scanner + clamav-scanner-upstart packages + + 2. Add to /etc/clamd.d/scan.conf + + | TCPSocket 6665 + | TCPAddr host-scanner + + comment out possible 'LocalSocket' lines and set all the other + options which are required on your system + + 3. Edit /etc/event.d/clamav-scanner and uncomment the + + | start on starting local + + line. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cscan + | iptables -A IN-cscan -s host-milter -j ACCEPT + | iptables -A IN-cscan -j DROP + + | iptables -A INPUT -p tcp --dport 6665 -j IN-csan + + to your firewall setup diff --git a/clamav-0.98-umask.patch b/clamav-0.98-umask.patch new file mode 100644 index 0000000..b9aa421 --- /dev/null +++ b/clamav-0.98-umask.patch @@ -0,0 +1,33 @@ +--- clamav-0.98/clamav-milter/clamav-milter.c 2013-09-16 21:28:14.000000000 +0200 ++++ clamav-0.98/clamav-milter/clamav-milter.c.umask 2013-10-06 20:39:08.000000000 +0200 +@@ -374,7 +374,7 @@ + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0002); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +--- clamav-0.98/shared/output.c 2013-09-16 21:28:14.000000000 +0200 ++++ clamav-0.98/shared/output.c.umask 2013-10-06 20:39:28.000000000 +0200 +@@ -348,7 +348,7 @@ + logg_open(); + + if(!logg_fp && logg_file) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +--- clamav-0.98/freshclam/freshclam.c 2013-09-16 21:28:14.000000000 +0200 ++++ clamav-0.98/freshclam/freshclam.c.umask 2013-10-06 20:39:47.000000000 +0200 +@@ -123,7 +123,7 @@ + { + FILE *fd; + int old_umask; +- old_umask = umask (0006); ++ old_umask = umask (0022); + if ((fd = fopen (pidfile, "w")) == NULL) + { + logg ("!Can't save PID to file %s: %s\n", pidfile, strerror (errno)); diff --git a/clamav-0.99-private.patch b/clamav-0.99-private.patch new file mode 100644 index 0000000..7f9f563 --- /dev/null +++ b/clamav-0.99-private.patch @@ -0,0 +1,27 @@ +--- clamav-0.99/libclamav.pc.in 2015-09-18 22:48:25.000000000 +0200 ++++ clamav-0.99/libclamav.pc.in.private 2015-12-02 01:30:30.055231319 +0100 +@@ -7,6 +7,6 @@ + Description: A GPL virus scanner + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} -lclamav +-Libs.private: @LIBCLAMAV_LIBS@ ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ + Cflags: -I${includedir} + +--- clamav-0.99/clamav-config.in 2015-05-28 23:56:25.000000000 +0200 ++++ clamav-0.99/clamav-config.in.private 2015-12-02 01:31:34.933705763 +0100 +@@ -54,12 +54,8 @@ + usage 0 + ;; + +- --cflags) +- echo -I@includedir@ @CFLAGS@ +- ;; +- +- --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ (--cflags|--libs) ++ ${PKG_CONFIG:-pkg-config} "$1" libclamav + ;; + + *) diff --git a/clamav-milter.init b/clamav-milter.init deleted file mode 100644 index d9fb037..0000000 --- a/clamav-milter.init +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/sh -# -# Startup script for the Clamav Milter Daemon -# -# chkconfig: - 77 23 -# description: clamav-milter is a daemon which hooks into sendmail \ -# and routes email messages to clamav. -# processname: clamav-milter -# pidfile: /var/run/clamav/clamav-milter.pid -# config: /etc/sysconfig/clamav-milter - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -[ -x /usr/sbin/clamav-milter ] || exit 0 - -# Local clamav-milter config -CLAMAV_FLAGS= -test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter - -# See how we were called. -case "$1" in - start) - echo -n "Starting Clamav Milter Daemon: " - daemon clamav-milter $CLAMAV_FLAGS - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamav-milter - ;; - stop) - echo -n "Stopping Clamav Milter Daemon: " - killproc clamav-milter - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamav-milter - ;; - status) - status clamav-milter - RETVAL=$? - ;; - restart|reload) - $0 stop - $0 start - RETVAL=$? - ;; - condrestart) - [ -e /var/lock/subsys/clamav-milter ] && $0 restart - RETVAL=$? - ;; - *) - echo "Usage: clamav-milter {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -exit $RETVAL diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig deleted file mode 100644 index 834b0cd..0000000 --- a/clamav-milter.sysconfig +++ /dev/null @@ -1,4 +0,0 @@ -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" diff --git a/clamav-milter.systemd b/clamav-milter.systemd new file mode 100644 index 0000000..7571038 --- /dev/null +++ b/clamav-milter.systemd @@ -0,0 +1,25 @@ +[Unit] +Description = Milter module for the Clam Antivirus scanner +After = syslog.target nss-lookup.target network.target +Before = sendmail.service +Before = postfix.service +After = clamd(a)scan.service + +[Service] +Type = forking +ExecStart = /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf +Restart = on-failure + +User=clamilt +Group=clamilt + +PrivateTmp=yes +PrivateDevices=yes +CapabilityBoundingSet=CAP_KILL + +ReadOnlyDirectories=/etc +ReadOnlyDirectories=/usr +ReadOnlyDirectories=/var/lib + +[Install] +WantedBy = multi-user.target diff --git a/clamav-milter.sysv b/clamav-milter.sysv new file mode 100644 index 0000000..3e37ae0 --- /dev/null +++ b/clamav-milter.sysv @@ -0,0 +1,93 @@ +#!/bin/bash +# +# clamav-milter Starts/stop the "clamav-milter" daemon +# +# chkconfig: - 79 31 +# description: A virus scanning milter + +# Source function library. +. /etc/rc.d/init.d/functions + +exec=/usr/sbin/clamav-milter +prog="clamav-milter" + +OPTS='-c /etc/mail/clamav-milter.conf' +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +pidfile=/var/run/clamav-milter/milter.pid +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + [ -f $config ] || exit 6 + echo -n $"Starting $prog: " + daemon --pidfile=${pidfile} $exec $OPTS --foreground=no --pid=${pidfile} + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -p "${pidfile}" $exec + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + # run checks to determine if the service is running or use generic status + status -p "${pidfile}" $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? diff --git a/clamav-milter.upstart b/clamav-milter.upstart new file mode 100644 index 0000000..1a10b8e --- /dev/null +++ b/clamav-milter.upstart @@ -0,0 +1,14 @@ +### !!! Uncomment only *one* of the 'start on' statements !!! + +### Uncomment these lines when you want clamav-milter to be a milter +### for a locally running MTA +#start on (starting sendmail or starting postfix) + +### Uncomment these lines when you want clamav-milter to be a milter +### for a remotely running MTA +#start on runlevel [345] and starting local + +stop on runlevel [!345] + +respawn +exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --foreground=yes diff --git a/clamav-update.crond b/clamav-update.crond new file mode 100644 index 0000000..dc85745 --- /dev/null +++ b/clamav-update.crond @@ -0,0 +1,6 @@ +## Adjust this line... +MAILTO=root + +## It is ok to execute it as root; freshclam drops privileges and becomes +## user 'clamupdate' as soon as possible +0 */3 * * * root /usr/share/clamav/freshclam-sleep diff --git a/clamav-update.logrotate b/clamav-update.logrotate new file mode 100644 index 0000000..0de6062 --- /dev/null +++ b/clamav-update.logrotate @@ -0,0 +1,4 @@ +/var/log/freshclam.log { + monthly + notifempty +} diff --git a/clamav.init b/clamav.init deleted file mode 100755 index 633c301..0000000 --- a/clamav.init +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# -# Startup script for the Clam AntiVirus Daemon -# -# chkconfig: - 61 39 -# description: Clam AntiVirus Daemon is a TCP/IP or socket protocol \ -# server. -# processname: clamd -# pidfile: /var/run/clamav/clamd.pid -# config: /etc/clamd.conf - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -[ -x /usr/sbin/clamd ] || exit 0 - -# Local clamd config -test -f /etc/sysconfig/clamd && . /etc/sysconfig/clamd - -# See how we were called. -case "$1" in - start) - echo -n "Starting Clam AntiVirus Daemon: " - daemon clamd - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd - ;; - stop) - echo -n "Stopping Clam AntiVirus Daemon: " - killproc clamd - rm -f /var/run/clamav/clamd.sock - rm -f /var/run/clamav/clamd.pid - RETVAL=$? - echo -### heres the fix... we gotta remove the stale files on restart - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamd - ;; - status) - status clamd - RETVAL=$? - ;; - restart|reload) - $0 stop - $0 start - RETVAL=$? - ;; - condrestart) - [ -e /var/lock/subsys/clamd ] && $0 restart - RETVAL=$? - ;; - *) - echo "Usage: clamd {start|stop|status|restart|reload|condrestart}" - exit 1 -esac - -exit $RETVAL diff --git a/clamav.spec b/clamav.spec index 2fd02bd..a44be34 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,762 +1,1418 @@ -### FIXME: Sysv script does not have condrestart option (redo sysv script) -### FIXME: amavisd-new requires clamd to run as user vscan, solution needed -### REMINDER: Look and sync with Petr Kristof's work - -Summary: Anti-virus software -Name: clamav -Version: 0.99.2 -Release: 3%{?dist} -License: GPLv2 -Group: Applications/System -URL: http://www.clamav.net/ +#global prerelease rc1 + +## Fedora Extras specific customization below... +%bcond_without fedora +%if 0%{?fedora} || 0%{?rhel} > 6 +%bcond_without systemd +%bcond_without tmpfiles +%bcond_with sysv +%bcond_with upstart +%else +%if 0%{?rhel} == 6 +%bcond_with systemd +%bcond_with tmpfiles +%bcond_without sysv +%bcond_without upstart +%else +%bcond_with systemd +%bcond_with tmpfiles +%bcond_without sysv +%bcond_with upstart +%endif +%endif +%bcond_with unrar +%bcond_without noarch +%bcond_without bytecode +## + +%global _hardened_build 1 +%ifnarch s390 s390x +%global have_ocaml 1 +%else +%global have_ocaml 0 +%endif + +%{!?_rundir:%global _rundir /var/run} + +%global updateuser clamupdate +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log +%global milterstatedir %_rundir/clamav-milter +%global pkgdatadir %_datadir/%name + +%global scanuser clamscan +%global scanstatedir %_rundir/clamd.scan + +%{?with_noarch:%global noarch BuildArch: noarch} +%{!?_unitdir:%global _unitdir /lib/systemd/system} +%{!?_initrddir:%global _initrddir /etc/rc.d/init.d} +%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} +%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ +%nil} +%{!?systemd_reqs:%global systemd_reqs \ +Requires(post): /bin/systemctl\ +Requires(preun): /bin/systemctl\ +Requires(postun): /bin/systemctl\ +%nil} +%{!?systemd_install:%global systemd_install()\ +%post %1\ +%systemd_post %2 \ +%preun %1\ +%systemd_preun %2 \ +%postun %1\ +%systemd_postun_with_restart %2 \ +%nil} + + +Summary: End-user tools for the Clam Antivirus scanner +Name: clamav +Version: 0.99.3 +Release: 1%{?dist} +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} +Group: Applications/File +URL: http://www.clamav.net +%if %{with unrar} +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +%else # Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. This +# incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by # make clean-sources NAME=clamav VERSION=<version> TARBALL=clamav-<version>.tar.gz TARBALL_CLEAN=clamav-<version>-norar.tar.xz -# Upstream: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-%{version}-norar.tar.xz -Source1: clamav.init -Source2: clamav-milter.init -Source3: clamd-wrapper.tar.bz2 - -Source7: freshclam.cron -Source8: freshclam.logrotate -Source9: clamd.logrotate -Source10: clamav-milter.sysconfig - +Source0: %name-%version%{?prerelease}-norar.tar.xz +%endif +#for server +Source2: clamd.sysconfig +Source3: clamd.logrotate +Source5: clamd-README +Source7: clamd.SERVICE.init # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). -Source11: http://db.local.clamav.net/main-57.cvd -Source12: http://db.local.clamav.net/daily-21723.cvd -Source13: http://db.local.clamav.net/bytecode-278.cvd +# Check the first line of the file for version, file is not working +# see https://bugzilla.redhat.com/show_bug.cgi?id=1539107 +Source10: http://db.local.clamav.net/main-58.cvd +Source11: http://db.local.clamav.net/daily-24253.cvd +Source12: http://db.local.clamav.net/bytecode-319.cvd +#for devel +Source100: clamd-gen +#for update +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.crond +Source203: clamav-update.logrotate +#for milter +Source300: README.fedora +#for clamav-milter.upstart +Source310: clamav-milter.upstart +#for milter-sysvinit +Source320: clamav-milter.sysv +#for clamav-milter.systemd +Source330: clamav-milter.systemd +#for scanner-upstart +Source410: clamd.scan.upstart +#for scanner-systemd +Source430: clamd(a)scan.service +#for server-sysvinit +Source520: clamd-wrapper +#for server-systemd +Source530: clamd@.service + +Patch24: clamav-0.99-private.patch +Patch27: clamav-0.98-umask.patch +# https://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/Int… +Patch30: llvm-glibc.patch +Patch31: clamav-0.99.1-setsebool.patch +Patch33: clamav-0.99.2-temp-cleanup.patch + + + +BuildRequires: autoconf automake gettext-devel libtool libtool-ltdl-devel +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel openssl-devel libxml2-devel +BuildRequires: %_includedir/tcpd.h +%{?with_bytecode:BuildRequires: bc tcl groff graphviz} +%if %{have_ocaml} +%{?with_bytecode:BuildRequires: ocaml} +%endif +# nc reuqired for tests +BuildRequires: nc +%if %{with systemd} +BuildRequires: systemd +%endif +#for milter +BuildRequires: sendmail-devel -Patch31: clamav-0.99.1-setsebool.patch -Patch32: clamav-0.99.2-temp-cleanup.patch +Requires: clamav-lib = %version-%release +Requires: data(clamav) -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%description +Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this +software is the integration with mail servers (attachment scanning). The +package provides a flexible and scalable multi-threaded daemon, a command +line scanner, and a tool for automatic updating via Internet. The programs +are based on a shared library distributed with the Clam AntiVirus package, +which you can use with your own software. The virus database is based on +the virus database from OpenAntiVirus, but contains additional signatures +(including signatures for popular polymorphic viruses, too) and is KEPT UP +TO DATE. + +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(%updateuser) = 4 +Provides: group(%updateuser) = 4 +Provides: group(virusgroup) +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +Requires(pre): shadow-utils +%{?noarch} + +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. + + +%package lib +Summary: Dynamic libraries for the Clam Antivirus scanner +Group: System Environment/Libraries +Requires: data(clamav) + +%description lib +This package contains dynamic libraries shared between applications +using the Clam Antivirus scanner. -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel, pcre-devel -%{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} -Requires: clamav-db = %{version}-%{release} -Requires(pre): shadow-utils +%package devel +Summary: Header files and libraries for the Clam Antivirus scanner +Group: Development/Libraries +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release +Requires: openssl-devel -### Fedora Extras introduced them differently :( -Provides: libclamav -Obsoletes: libclamav < %{version}-%{release} -Provides: clamav-lib = %{version}-%{release} -Obsoletes: clamav-lib < %{version}-%{release} +%description devel +This package contains headerfiles and libraries which are needed to +build applications using clamav. + + +%package data +Summary: Virus signature data for the Clam Antivirus scanner +Group: Applications/File +Requires: clamav-filesystem = %version-%release +Requires: clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full +%{?noarch} + +%description data +This package contains the virus-database needed by clamav. This +database should be updated regularly; the 'clamav-update' package +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty +%{?noarch} + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%package update +Summary: Auto-updater for the Clam Antivirus scanner data-files +Group: Applications/File +Requires: clamav-filesystem = %version-%release +Requires: crontabs +Requires: /etc/cron.d +Requires(post): %__chown %__chmod +Requires(post): group(%updateuser) + +%description update +This package contains programs which can be used to update the clamav +anti-virus database automatically. It uses the freshclam(1) utility for +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. + + +%package server +Summary: Clam Antivirus scanner server +Group: System Environment/Daemons +Requires: data(clamav) +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release +Requires: coreutils +%if ! %{with sysv} +Obsoletes: clamav-server-sysvinit < %version-%release +%endif + +%description server +ATTENTION: most users do not need this package; the main package has +everything (or depends on it) which is needed to scan for virii on +workstations. + +This package contains files which are needed to execute the clamd-daemon. +This daemon does not provide a system-wide service. Instead of, an instance +of this daemon should be started for each service requiring it. + +See the README file how this can be done with a minimum of effort. + + +%package server-sysvinit +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release +Requires: %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} + +%description server-sysvinit +SysV initscripts template for the clamav server + + +%package server-systemd +Summary: Systemd initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = systemd +Requires: clamav-server = %version-%release +%{?systemd_reqs} +%{?noarch} + +%description server-systemd +Systemd template for the clamav server + + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 +Requires: clamav-server = %version-%release +Requires(pre): shadow-utils +Requires(pre): group(virusgroup) +%if ! %{with sysv} +Obsoletes: clamav-scanner-sysvinit < %version-%release +%endif +%if ! %{with upstart} +Obsoletes: clamav-scanner-upstart < %version-%release +%endif +%{?noarch} + +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + + +# Remove me after EOL of RHEL5 +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires: %_initrddir +Requires(postun): initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +%{?noarch} + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + + +# Remove me after EOL of RHEL6 +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +Requires: /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + + +%package scanner-systemd +Summary: Systemd initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = systemd +Requires: clamav-scanner = %version-%release +Requires: clamav-server-systemd = %version-%release +%{?systemd_reqs} +%{?noarch} + +%description scanner-systemd +The systemd initscripts for clamav-scanner. -%description -Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of -this software is the integration with mail servers (attachment scanning). -The package provides a flexible and scalable multi-threaded daemon, a -command line scanner, and a tool for automatic updating via Internet. - -The programs are based on a shared library distributed with the Clam -AntiVirus package, which you can use with your own software. Most -importantly, the virus database is kept up to date - -%package -n clamd -Summary: The Clam AntiVirus Daemon -Group: System Environment/Daemons -Requires: clamav = %{version}-%{release} - -### Fedora Extras introduced them differently :( -Provides: clamav-server = %{version}-%{release} -Obsoletes: clamav-server < %{version}-%{release} -Provides: clamav-server-sysv = %{version}-%{release} -Obsoletes: clamav-server-sysv < %{version}-%{release} -Provides: clamav-scanner = %{version}-%{release} -Obsoletes: clamav-scanner < %{version}-%{release} -Provides: clamav-scanner-upstart = %{version}-%{release} -Obsoletes: clamav-scanner-upstart < %{version}-%{release} -Provides: clamav-server-sysvinit = %{version}-%{release} -Obsoletes: clamav-server-sysvinit < %{version}-%{release} - - -%description -n clamd -The Clam AntiVirus Daemon %package milter -Summary: The Clam AntiVirus sendmail-milter Daemon -Group: Applications/System -Requires: clamd = %{version}-%{release} -Requires: /usr/sbin/sendmail -Provides: clamav-milter-sysv = %{version}-%{release} -Obsoletes: clamav-milter-sysv < %{version}-%{release} -Provides: clamav-milter-sysvinit = %{version}-%{release} -Obsoletes: clamav-milter-sysvinit < %{version}-%{release} +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Requires: init(clamav-milter) +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 +Requires(post): coreutils +Requires(pre): shadow-utils +Requires(pre): group(virusgroup) + +Provides: milter(clamav) = sendmail +Provides: milter(clamav) = postfix + +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release +%if ! %{with sysv} +Obsoletes: clamav-milter-sysvinit < %version-%release +%endif +%if ! %{with upstart} +Obsoletes: clamav-milter-upstart < %version-%release +%endif %description milter -The Clam AntiVirus sendmail-milter Daemon - -%package db -Summary: Virus database for %{name} -Group: Applications/Databases -### Remove circular dependency -#Requires: clamav = %{version}-%{release} - -### Fedora Extras introduced them differently :( -Provides: clamav-update = %{version}-%{release} -Obsoletes: clamav-update < %{version}-%{release} -Provides: clamav-data = %{version}-%{release} -Obsoletes: clamav-data < %{version}-%{release} -Obsoletes: clamav-data-empty <= %{version}-%{release} -# Ugly to put these in the db-package, but needed -# here to handle upgrades on EL5. -Provides: clamav-filesystem = %{version}-%{release} -Obsoletes: clamav-filesystem < %{version}-%{release} - -%description db -The actual virus database for %{name} +This package contains files which are needed to run the clamav-milter. + + +# Remove me after EOL of RHEL5 +%package milter-sysvinit +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter +Requires: %_initrddir +Requires(postun): initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} + +%description milter-sysvinit +The SysV initscripts for clamav-milter. + + +# Remove me after EOL of RHEL6 +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +Requires: /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%description milter-upstart +The Upstart initscripts for clamav-milter. + + +%package milter-systemd +Summary: Systemd initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = systemd +Requires: clamav-milter = %version-%release +%{?systemd_reqs} +%{?noarch} + +%description milter-systemd +The systemd initscripts for clamav-scanner. +## ------------------------------------------------------------ -%package devel -Summary: Header files, libraries and development documentation for %{name} -Group: Development/Libraries -Requires: clamav = %{version}-%{release}, openssl-devel +%prep +%setup -q -n %{name}-%{version}%{?prerelease} -### Fedora Extras introduced them differently :( -Obsoletes: libclamav-static-devel <= %{version}-%{release} -Obsoletes: libclamav-devel <= %{version}-%{release} -Provides: libclamav-static-devel, libclamav-devel +%apply -n24 -p1 -b .private +%apply -n27 -p1 -b .umask +%apply -n30 -p1 +%apply -n31 -p1 -b .setsebool +%apply -n33 -p1 -b .temp-cleanup +%{?apply_end} -%description devel -This package contains the header files, static libraries and development -documentation for %{name}. If you like to develop programs using %{name}, -you will need to install %{name}-devel. +install -p -m0644 %SOURCE300 clamav-milter/ + +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} + +sed -ri \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf.sample + +sed -ri \ + -e 's!^Example!#Example!' \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%updateuser!g' etc/freshclam.conf.sample -%prep -# Handle that rpmbuild in RHEL < 6 doesn't handle xz archives automatically. -%setup -q -T -c -xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) -%patch31 -p1 -b .setsebool -%patch32 -p1 -b .temp-cleanup - -%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure - -%{__perl} -pi.orig -e ' - s|\@DBDIR\@|\$(localstatedir)/lib/clamav|g; - s|\@DBINST\@|\$(localstatedir)/lib/clamav|g; - s|\@CFGDIR\@|\$(sysconfdir)|g; - s|\@CFGINST\@|\$(sysconfdir)|g; - s|^\@INSTALL_CLAMAV_CONF_TRUE\@|\t|g; - s|^\@INSTALL_FRESHCLAM_CONF_TRUE\@|\t|g; - ' database/Makefile.in etc/Makefile.in - -%{__perl} -pi.orig -e ' - s|^(Example)|#$1|; - s|^#(LogFile) .+$|$1 %{_localstatedir}/log/clamav/clamd.log|; - s|^#(LogFileMaxSize) .*|$1 0|; - s|^#(LogTime)|$1|; - s|^#(LogSyslog)|$1|; - s|^#(PidFile) .+$|$1 %{_localstatedir}/run/clamav/clamd.pid|; - s|^#(TemporaryDirectory) .+$|$1 %{_localstatedir}/tmp|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; - s|^#(LocalSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; - s|^#(FixStaleSocket)|$1|; - s|^#(TCPSocket) .+$|$1 3310|; - s|^#(TCPAddr) .+$|$1 127.0.0.1|; - s|^#(MaxConnectionQueueLength) .+$|$1 30|; - s|^#(StreamSaveToDisk)|$1|; - s|^#(MaxThreads) .+$|$1 50|; - s|^#(ReadTimeout) .+$|$1 300|; - s|^#(User) .+$|$1 clam|; - s|^#(AllowSupplementaryGroups).*$|$1 yes|; - s|^#(ScanPE) .+$|$1 yes|; - s|^#(ScanELF) .+$|$1 yes|; - s|^#(DetectBrokenExecutables)|$1|; - s|^#(ScanOLE2) .+$|$1 yes|; - s|^#(ScanMail)|$1|; - s|^#(ScanArchive) .+$|$1 yes|; - s|^#(ArchiveMaxCompressionRatio) .+|$1 300|; - s|^#(ArchiveBlockEncrypted)|$1|; - s|^#(ArchiveBlockMax)|$1|; - ' etc/clamd.conf.sample - -%{__perl} -pi.orig -e ' - s|^(Example)|#$1|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; - s|^#(UpdateLogFile) .+$|$1 %{_localstatedir}/log/clamav/freshclam.log|; - s|^#(LogSyslog)|$1|; - s|^#(DatabaseOwner) .+$|$1 clam|; - s|^(Checks) .+$|$1 24|; - ' etc/freshclam.conf.sample - -%{__perl} -pi.orig -e ' - s|^(Example)|#$1|; - s|^#(User) .+$|$1 clam|; - s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|; - s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|; - s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf.sample + +## ------------------------------------------------------------ %build -%configure \ - --program-prefix="%{?_program_prefix}" \ -%{!?_without_milter:--enable-milter} \ - --disable-clamav \ - --disable-static \ - --disable-zlib-vcheck \ - --disable-unrar \ - --enable-id-check \ - --enable-dns \ - --with-dbdir="%{_localstatedir}/lib/clamav" \ - --with-group="clam" \ - --with-libcurl=%{_prefix} \ - --with-user="clam" \ -# --disable-llvm - -make %{?_smp_mflags} +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +CXXFLAGS="$RPM_OPT_FLAGS -std=gnu++98" +export LDFLAGS='%{?__global_ldflags} -Wl,--as-needed' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes + +rm -rf libltdl autom4te.cache Makefile.in +autoreconf -i +%configure \ + --disable-static \ + --disable-rpath \ + --disable-silent-rules \ + --disable-clamav \ + --with-user=%updateuser \ + --with-group=%updateuser \ + --with-libcurl=%{_prefix} \ + --with-dbdir=%homedir \ + --enable-milter \ + --enable-clamdtop \ + --disable-zlib-vcheck \ + %{!?with_bytecode:--disable-llvm} \ + %{!?with_unrar:--disable-unrar} + +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool + +%make_build + + +## ------------------------------------------------------------ %install -rm -rf %{buildroot} -make install DESTDIR="%{buildroot}" +rm -rf "$RPM_BUILD_ROOT" _doc* +%make_install + +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + +install -d -m 0755 \ + $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,logrotate.d} \ + $RPM_BUILD_ROOT%_tmpfilesdir \ + $RPM_BUILD_ROOT%_rundir \ + $RPM_BUILD_ROOT%_var/log \ + $RPM_BUILD_ROOT%milterstatedir \ + $RPM_BUILD_ROOT%pkgdatadir/template \ + $RPM_BUILD_ROOT%_initrddir \ + $RPM_BUILD_ROOT%homedir \ + $RPM_BUILD_ROOT%scanstatedir + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf.sample \ + $RPM_BUILD_ROOT%_libdir/*.la + + +%{?with_bytecode:touch $RPM_BUILD_ROOT%homedir/bytecode.cld} +touch $RPM_BUILD_ROOT%homedir/{daily,main}.cld +touch $RPM_BUILD_ROOT%homedir/mirrors.dat + +install -D -m 0644 -p %SOURCE10 $RPM_BUILD_ROOT%homedir/main.cvd +install -D -m 0644 -p %SOURCE11 $RPM_BUILD_ROOT%homedir/daily.cvd +%{?with_bytecode:install -D -m 0644 -p %SOURCE12 $RPM_BUILD_ROOT%homedir/bytecode.cvd} + +## prepare the server-files +install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate +%if %{with sysv} +install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init +%endif +install -D -m 0644 -p %SOURCE5 _doc_server/README +install -D -m 0644 -p etc/clamd.conf.sample _doc_server/clamd.conf -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd -install -Dp -m0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav +%if %{with sysv} +install -m 0644 -p %SOURCE520 $RPM_BUILD_ROOT%pkgdatadir/ +%endif +install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template -mv -f %{buildroot}%{_sysconfdir}/clamd.conf{.sample,} -mv -f %{buildroot}%{_sysconfdir}/freshclam.conf{.sample,} +%if %{with sysv} +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper +%endif +install -D -p -m 0644 %SOURCE530 $RPM_BUILD_ROOT%_unitdir/clamd@.service -# now rewrite scripts and config files in-place -sed -i \ - -e 's!%%{_sbindir}!%{_sbindir}!g' \ - -e 's!%%{_bindir}!%{_bindir}!g' \ - -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ - %{buildroot}%{_sysconfdir}/cron.daily/freshclam \ - %{buildroot}%{_sysconfdir}/logrotate.d/* - -%if %{!?_without_milter:1}0 -install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter -mv -f %{buildroot}%{_sysconfdir}/clamav-milter.conf{.sample,} -%else -rm %{buildroot}%{_mandir}/man8/clamav-milter.8* + +## prepare the update-files +install -D -m 0644 -p %SOURCE203 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update +touch $RPM_BUILD_ROOT%freshclamlog + +install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update +mv -f $RPM_BUILD_ROOT%_sysconfdir/freshclam.conf{.sample,} + +smartsubst 's!webmaster,clamav!webmaster,%updateuser!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep + + +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf.sample > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf + +%if %{with sysv} +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan %endif -# Install clamav-wrapper: -tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share -install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ -touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log -touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log +install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf +install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd(a)scan.service + +cat << EOF > $RPM_BUILD_ROOT%_tmpfilesdir/clamd.scan.conf +d %scanstatedir 0710 %scanuser %scanuser +EOF + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} -install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ -install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd -install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd -install -Dp -m0644 %{SOURCE13} %{buildroot}%{_localstatedir}/lib/clamav/bytecode.cvd -touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/bytecode.cld -touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/{daily,main}.cld -touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/mirrors.dat +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /var/run/clamd/clamd.socket! %scanstatedir/clamd.sock!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf.sample > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf + +install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf +%if %{with sysv} +install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +%endif +install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service +cat << EOF > $RPM_BUILD_ROOT%_tmpfilesdir/clamav-milter.conf +d %milterstatedir 0710 %milteruser %milteruser +EOF -# Clean up for later usage in documentation -for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf.sample +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} -%post -/sbin/ldconfig +%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} +%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} +%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} +%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_rundir/*/*.pid} +%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_tmpfilesdir} -ZONES="/usr/share/zoneinfo/zone.tab" -CONFIG="/etc/sysconfig/clock" +%if %{with systemd} +# TODO: Evaluate using upstream's unit files +rm $RPM_BUILD_ROOT%_unitdir/clamav-{daemon,freshclam}.* +%endif -if [ -r "$CONFIG" -a -r "$ZONES" -a -n "$ZONE" ]; then - source "$CONFIG" - export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | grep -v ^# | head -1 | cut -f1 | tr [A-Z] [a-z])" -fi +%if %{with sysv} +# keep clamd-wrapper in every case because it might be needed by other +# packages +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper +%endif -if [ -z "$CODE" ]; then - export CODE="local" -fi +## ------------------------------------------------------------ -%{__perl} -pi -e ' - s|^(DatabaseMirror) database\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; - s|^(DatabaseMirror) db\.\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; - ' %{_sysconfdir}/freshclam.conf{,.rpmnew} &>/dev/null || : +%check +make check -%postun -p /sbin/ldconfig +## ------------------------------------------------------------ -%pre -getent group clam >/dev/null || groupadd -r clam -getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ - -c "Clam Anti Virus Checker" clam +%pre filesystem +getent group %{updateuser} >/dev/null || groupadd -r %{updateuser} +getent passwd %{updateuser} >/dev/null || \ + useradd -r -g %{updateuser} -d %{homedir} -s /sbin/nologin \ + -c "Clamav database update user" %{updateuser} +getent group virusgroup >/dev/null || groupadd -r virusgroup +usermod %{updateuser} -a -G virusgroup exit 0 -%pre -n clamd -getent group clam >/dev/null || groupadd -r clam -getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ - -c "Clam Anti Virus Checker" clam + +%pre scanner +getent group %{scanuser} >/dev/null || groupadd -r %{scanuser} +getent passwd %{scanuser} >/dev/null || \ + useradd -r -g %{scanuser} -d / -s /sbin/nologin \ + -c "Clamav scanner user" %{scanuser} +usermod %{scanuser} -a -G virusgroup exit 0 -%post -n clamd -/sbin/chkconfig --add clamd -%preun -n clamd -if [ $1 -eq 0 ]; then - /sbin/service clamd stop &>/dev/null || : - /sbin/chkconfig --del clamd -fi +%{?with_tmpfiles: +%post scanner +%{?with_systemd:/bin/systemd-tmpfiles --create %_tmpfilesdir/clamd.scan.conf || :}} + + +%post server-systemd +test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || : + +%postun server-systemd +/bin/systemctl daemon-reload >/dev/null 2>&1 || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + +%systemd_install scanner-systemd clamd(a)scan.service + + +%post update +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%updateuser %freshclamlog + ! test -x /sbin/restorecon || /sbin/restorecon %freshclamlog +} + +%triggerin update -- %name-update < 0.97.3-1704 +# remove me after F19 +! test -x /sbin/restorecon || /sbin/restorecon %freshclamlog &>/dev/null || : + + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : + +%pre milter +getent group %{milteruser} >/dev/null || groupadd -r %{milteruser} +getent passwd %{milteruser} >/dev/null || \ + useradd -r -g %{milteruser} -d %{milterstatedir} -s /sbin/nologin \ + -c "Clamav Milter user" %{milteruser} +usermod %{milteruser} -a -G virusgroup +exit 0 -%postun -n clamd -/sbin/service clamd condrestart &>/dev/null || : %post milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog + ! test -x /sbin/restorecon || /sbin/restorecon %milterlog +} +%{?with_systemd:/bin/systemd-tmpfiles --create %_tmpfilesdir/clamav-milter.conf || :} + + +%triggerin milter -- %name-milter < 0.97.3-1704 +# remove me after F19 +! test -x /sbin/restorecon || /sbin/restorecon %milterlog &>/dev/null || : + + +%post milter-sysvinit /sbin/chkconfig --add clamav-milter -%preun milter -if [ $1 -eq 0 ]; then - /sbin/service clamav-milter stop &>/dev/null || : - /sbin/chkconfig --del clamav-milter -fi +%preun milter-sysvinit +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter -%postun milter -/sbin/service clamav-milter condrestart &>/dev/null || : +%postun milter-sysvinit +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : -%pre db -getent group clam >/dev/null || groupadd -r clam -getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ - -c "Clam Anti Virus Checker" clam -exit 0 -%post db -# Remove old mirrors.dat, mostly because it will have the wrong -# owner after upgrading from clamav < 0.97: -test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat -exit 0 +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : -%clean -rm -rf %{buildroot} +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : -%files -%defattr(-, root, root, 0755) -%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README -%doc docs/*.pdf etc/freshclam.conf -%doc %{_mandir}/man1/sigtool.1* -%doc %{_mandir}/man1/clamscan.1* -%doc %{_mandir}/man1/freshclam.1* -%doc %{_mandir}/man1/clamsubmit.1* -%doc %{_mandir}/man5/freshclam.conf.5* -%config(noreplace) %{_sysconfdir}/freshclam.conf -%{_bindir}/clamscan -%{_bindir}/freshclam -%{_bindir}/sigtool -%{_bindir}/clambc -%{_bindir}/clamsubmit -%{_libdir}/libclamav.so.* - -%files -n clamd -%defattr(-, root, root, 0755) -%doc etc/clamd.conf -%doc %{_mandir}/man1/clamdscan.1* -%doc %{_mandir}/man1/clamconf.1* -%doc %{_mandir}/man1/clamdtop.1* -%doc %{_mandir}/man1/clambc.1* -%doc %{_mandir}/man5/clamd.conf.5* -%doc %{_mandir}/man8/clamd.8* -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd-wrapper -%config(noreplace) %{_sysconfdir}/clamd.conf -%config(noreplace) %{_sysconfdir}/logrotate.d/clamav -%{_sysconfdir}/clamd.d -%config %{_initrddir}/clamd -%{_sbindir}/clamd -%{_bindir}/clamconf -%{_bindir}/clamdscan -%{_bindir}/clamdtop - -%defattr(0644, clam, clam, 0755) -%{_localstatedir}/run/clamav/ -%dir %{_localstatedir}/lib/clamav/ -%dir %{_localstatedir}/log/clamav/ -%ghost %{_localstatedir}/log/clamav/clamd.log -%exclude %{_localstatedir}/lib/clamav/* - -%if %{!?_without_milter:1}0 -%files milter -%defattr(-, root, root, 0755) -%doc %{_mandir}/man5/clamav-milter.conf.5* -%doc %{_mandir}/man8/clamav-milter.8* -%config(noreplace) %{_sysconfdir}/sysconfig/clamav-milter -%config %{_initrddir}/clamav-milter -%{_sbindir}/clamav-milter -%config(noreplace) %{_sysconfdir}/clamav-milter.conf -%endif -%files db -%defattr(-, root, root, 0755) -%config(noreplace) %{_sysconfdir}/cron.daily/freshclam -%config(noreplace) %{_sysconfdir}/logrotate.d/freshclam +%systemd_install milter-systemd clamav-milter.service -%defattr(0644, clam, clam, 0755) -%config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ -%dir %{_localstatedir}/log/clamav/ -%ghost %{_localstatedir}/log/clamav/freshclam.log -%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/*.cld -%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/mirrors.dat +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig -%files devel -%defattr(-, root, root, 0755) -%{_bindir}/clamav-config -%{_includedir}/clamav.h -%{_libdir}/libclamav.so -%{_libdir}/pkgconfig/libclamav.pc -#%{_libdir}/libclamav.a -%exclude %{_libdir}/libclamav.la -%changelog -* Sun Nov 26 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-3 -- Backported upstream patch to unbreak e2guardian vs. temp files +%files +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE +%doc docs/*.pdf +%_bindir/* +%_mandir/man[15]/* +%exclude %_bindir/clamav-config +%exclude %_bindir/freshclam +%exclude %_mandir/*/freshclam* -* Tue Mar 28 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-2 -- Ensure that missing or invalid timezone configuration does not - mangle /etc/freshclam.conf in %%post (#1154756) +## ----------------------- -* Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 -- Update to 0.99.2 -- Enable llvm -- Drop cliopts patch fixed upstream, use upstream's "--forground" option name -- Fix main.cvd (fedora #1325482, epel #1325717) -- Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd -- Update daily.cvd -- Fixup Requires(pre) usage (#1319151) +%files lib +%_libdir/*.so.* -* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 -- Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) +## ----------------------- -* Mon Dec 07 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-3 -- Added missing build-time requirement to pcre-devel +%files devel +%_includedir/* +%_libdir/*.so +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config -* Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 -- Require openssl-devel for clamav-devel +## ----------------------- -* Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 -- Upgrade to 0.99 and updated daily.cvd (#1287327) +%files filesystem +%attr(-,%updateuser,%updateuser) %dir %homedir +%attr(-,root,root) %dir %pkgdatadir +%dir %_sysconfdir/clamd.d -* Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 -- Upgrade to 0.98.7 and updated daily.cvd (#1217014) +## ----------------------- -* Tue Feb 24 2015 Joel Smith <joelsmith(a)fedoraproject.org> - 0.98.6-2 -- Make init script source /etc/sysconfig/clamd if present (#1195864) +%files data +%defattr(-,%updateuser,%updateuser,-) +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. +%config %verify(not size md5 mtime) %homedir/*.cvd -* Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 -- Upgrade to 0.98.6 and updated daily.cvd (#1187050) -* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 -- Upgrade to 0.98.5 and updated daily.cvd (#1138101) +%files data-empty +%defattr(-,%updateuser,%updateuser,-) +%ghost %attr(0664,%updateuser,%updateuser) %homedir/*.cvd -* Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 -- Upgrade to 0.98.4 and updated daily.cvd (#1111811) -- Add build requirement to libxml2 for DMG, OpenIOC and XAR -* Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 -- Upgrade to 0.98.3 -- Fix --with-libcurl parameter to avoid automatic path detection breakage -- openssl-devel is now required for hashing code. -- Added clamsubmit to main package -- Re-enabled --with-llvm as this speeds up deployment a lot. -- Fixed older changelog dates +## ----------------------- -* Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 -- Upgrade to 0.98.1 and updated daily.cvd (#1053400) +%files update +%_bindir/freshclam +%_mandir/*/freshclam* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/clamav-update +%config(noreplace) %_sysconfdir/sysconfig/freshclam -* Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 -- Really fix all discrepancies between clamd initscript and clamd - config file (#960923, thanks to John Horne) -- Ensure that a clamd and clamav-milter condrestart via initscript - works (#1018312, thanks to Filippo Carletti) +%ghost %attr(0664,root,%updateuser) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%updateuser,%updateuser) %homedir/*.cld +%ghost %attr(0664,%updateuser,%updateuser) %homedir/mirrors.dat -* Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 -- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) -- Fixed discrepancies between clamd initscript and clamd config - file (#960923, thanks to John Horne) -- Added build requirement to ncurses-devel for clamdtop (again) -- Moved clamd wrapper script and documentation into correct sub- - package (#782596, thanks to Philip Prindeville) - -* Tue Apr 23 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.8-1 -- Upgrade to 0.97.8 -- Updated daily.cvd - -* Mon Mar 18 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.7-1 -- Upgrade to 0.97.7 - -* Tue Sep 18 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.6-1 -- Upgrade to 0.97.6 - -* Wed Jun 20 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.5-1 -- Upgrade to 0.97.5 -- Fix CVE-2012-1419 clamav: specially-crafted POSIX tar files evade detection -- Fix CVE-2012-1457 clamav: overly long length field in tar files evade detection -- Fix CVE-2012-1443 clamav: specially-crafted RAR files evade detection -- Fix CVE-2012-1458 clamav: specially-crafted CHM files evade detection -- Fix CVE-2012-1459 clamav: specially-crafted length field in tar files evade detection -- Ship local copy of virus database; it was removed by accident from 0.97.5 tarball - -* Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 -- Split files out into SCM instead of in the spec - -* Sun Jan 1 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-3 -- Revert patch from 0.97.3-2 - -* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 -- Update to 0.97.3 -- Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 - -* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-5 -- Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. - (bz#727894) - -* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-3 -- include updated clamd-wrapper which get the PidFile setting from the - service configuration file. -- updated to 0.97.2 -- Build-require xz -- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) -* Wed Jun 29 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97-14 -- Require /usr/sbin/sendmail instead of sendmail +## ----------------------- -* Tue Apr 26 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-13 -- Obsolete and provide clamav-milter-sysvinit (bz#696856) +%files server +%doc _doc_server/* +%_mandir/man5/clamd.conf.5* +%_mandir/man8/clamd.8* +%_sbindir/clamd -* Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 -- Move deletion of /var/lib/clamav/mirrors.dat to db package. -- Don't enable NotifyClamd in freshclam config and cronjob, as not - everybody is running clamd. Running clamd's will anyway notice - when db is updated. +%if %{with sysv} +%files server-sysvinit +%_initrddir/clamd-wrapper +%pkgdatadir/clamd-wrapper +%endif + +%if %{with systemd} +%files server-systemd + %_unitdir/clamd@.service +%endif -* Fri Mar 18 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-11 -- Delete /var/lib/clamav/mirrors.dat, it will be recreated on first run. -- clamav-milter config cleanups. +## ----------------------- -* Wed Mar 16 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-10 -- Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. -- Don't start clamd or milter service by default. +%files scanner +%config(noreplace) %_sysconfdir/clamd.d/scan.conf +%ghost %scanstatedir/clamd.sock -* Tue Mar 15 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-7 -- rpm-provide all old package names that are now obsoleted +%if %{with tmpfiles} + %_tmpfilesdir/clamd.scan.conf + %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%else + %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%endif -* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-6 -- clam-db obsoletes old clamav-data-empty. +%if %{with sysv} +%files scanner-sysvinit + %attr(0755,root,root) %config %_initrddir/clamd.scan + %ghost %scanstatedir/clamd.pid +%endif -* Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 -- Add back clamd-wrapper to stay compatible with users - of old packaging (amavisd-new). +%if %{with upstart} +%files scanner-upstart + %config(noreplace) %_sysconfdir/init/clamd.scan* +%endif -* Wed Feb 23 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.097-3 -- Move db to /var/lib/clamav -- Ship empty directory /etc/clamd.d for amavisd-new +%if %{with systemd} +%files scanner-systemd + %_unitdir/clamd(a)scan.service +%endif -* Thu Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 -- Disable llvm. +## ----------------------- -* Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 -- Update to 0.97 -- Fix up for current guidelines. +%files milter +%doc clamav-milter/README.fedora +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%dir %_sysconfdir/mail +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%ghost %milterstatedir/clamav-milter.socket + +%if %{with tmpfiles} + %_tmpfilesdir/clamav-milter.conf + %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%else + %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%endif -* Fri Nov 23 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-3 -- Change username to get upgrades from fedora versions working. +%if %{with sysv} +%files milter-sysvinit + %config %_initrddir/clamav-milter + %ghost %milterstatedir/clamav-milter.pid +%endif -* Thu Nov 22 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-2 -- Initial changes for EPEL version. +%if %{with upstart} +%files milter-upstart + %config(noreplace) %_sysconfdir/init/clamav-milter* +%endif -* Tue Aug 21 2007 Dag Wieers <dag(a)wieers.com> - 0.91.2-1 -- Updated to release 0.91.2. +%if %{with systemd} +%files milter-systemd + %_unitdir/clamav-milter.service +%endif -* Tue Jul 17 2007 Dag Wieers <dag(a)wieers.com> - 0.91.1-1 -- Updated to release 0.91.1. -* Wed Jul 11 2007 Dag Wieers <dag(a)wieers.com> - 0.91-1 -- Updated to release 0.91. +%changelog +* Fri Jan 26 2018 Orion Poplawski <orion(a)nwra.com> - 0.99.3-1 +- Update to 0.99.3 +- Security fixes CVE-2017-12374 CVE-2017-12375 CVE-2017-12376 CVE-2017-12377 + CVE-2017-12378 CVE-2017-12379 CVE-2017-12380 (bug #1539030) +- Drop clamav-notify-servers and it's dependency on ncat (bug #1530678) + +* Wed Jan 17 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-18 +- Fix type of clamd@ service +- Fix packages name of Obsoletes directives +- Also fix type of clamav-milter.service + +* Thu Jan 11 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-17 +- Security fixes CVE-2017-6420 (#1483910), CVE-2017-6418 (#1483908) + +* Tue Jan 09 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-16 +- Make sure that Obsoletes sysv and upstart for Epel upgrade and update + +* Mon Jan 08 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-15 +- Fix rundir path (#1126595) +- Update main.cvd, daily.cvd and bytecode.cvd +- Fixes for rhbz 1464269 and rhbz 1126625 +- Move Sources and BuildRequires to the beginning +- Build systemd for F22+ and el7+ +- Build sysv and upstart for el6 else build only sysv +- Only enable tmpfiles with systemd enabled +- Move descritions to near the package macro and remove his build + conditionals, this also fix the generation of src.rpm +- Remove hack from 2010 (git show e1a9be60) +- Use autoreconf without --force + +* Thu Jan 04 2018 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-14 +- Use 4 spaces instead tabs +- Fix rhbz #1530678 +- Fix rhbz #1518016 +- Simplify conditional builds reference: /usr/lib/rpm/macros +- use make_build and make install macros + +* Sun Nov 26 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-13 +- Backported upstream patch to unbreak e2guardian vs. temp files -* Thu May 31 2007 Dag Wieers <dag(a)wieers.com> - 0.90.3-1 -- Updated to release 0.90.3. +* Fri Sep 15 2017 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-12 +- Try fix rhbz #1473642 -* Fri Apr 27 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-2 -- Added clamav-milter support for EL2.1 now that it comes with a newer sendmail. (Tom G. Christensen) +* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild -* Sun Apr 15 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-1 -- Updated to release 0.90.2. +* Wed Jul 26 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild -* Fri Mar 09 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-4 -- Removed circular dependency. +* Mon Jul 17 2017 Sérgio Basto <sergio(a)serjux.com> - 0.99.2-9 +- Add patch for openssl-1.1 -* Thu Mar 08 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-3 -- Cleaned up default options to clamav-milter. (Adam T. Bowen) -- Removed -b/--bounce as it is no longer recognized. (Gerald Teschl) +* Mon Mar 27 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-8 +- Create virusgroup group and add the various clam* users to it -* Mon Mar 05 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-2 -- Removed the erroneous --dont-clean-log from the clamav-milter sysconfig. (Gerald Teschl) +* Sun Mar 26 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-7 +- Fix clamav-milter startup under selinux (bug #1434176) +- Move /etc/clam.d to clamav-filesystem (bug #1275630) +- Make clamav-milter own /etc/mail (bug #1175473) -* Fri Mar 02 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-1 -- Updated to release 0.90.1. +* Sun Mar 26 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-6 +- Start clamav-milter after clamd@scan (bug #1356507)) -* Tue Feb 20 2007 Dag Wieers <dag(a)wieers.com> - 0.90-3 -- Do the right thing... +* Sun Mar 26 2017 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-5 +- Allow freshclam to run automatically on install (bug #1408649) -* Mon Feb 19 2007 Dag Wieers <dag(a)wieers.com> - 0.90-2 -- The tarball was re-rolled before public release. Sigh. +* Fri Feb 10 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild -* Tue Feb 13 2007 Dag Wieers <dag(a)wieers.com> - 0.90-1 -- Updated to release 0.90. +* Mon Nov 07 2016 Richard W.M. Jones <rjones(a)redhat.com> - 0.99.2-3 +- Rebuild for OCaml 4.04.0. -* Tue Dec 12 2006 Dag Wieers <dag(a)wieers.com> - 0.88.7-1 -- Updated to release 0.88.7. +* Tue Oct 18 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-2 +- Also send logrotate script stdout to /dev/null (bug #1376815) -* Sun Nov 05 2006 Dag Wieers <dag(a)wieers.com> - 0.88.6-1 -- Updated to release 0.88.6. -- Added condrestart to sysv scripts. (Tsai Li Ming) +* Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 +- Update to 0.99.2 +- Drop cliopts patch fixed upstream, use upstream's "--forground" option name +- Fix main.cvd (fedora #1325482, epel #1325717) +- Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd +- Update daily.cvd +- Fixup Requires(pre) usage (#1319151) -* Sat Oct 28 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-2 -- Added missing clamav dependency to clamav-db. +* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 +- Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) +- Complain about antivirus_use_jit rather clamd_use_jit (#1295473) -* Sun Oct 15 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-1 -- Updated to release 0.88.5. +* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99-4 +- Link using %%{?__global_ldflags} for hardened builds (#1321173) +- Build using -std=gnu++98 (#1307378, thanks to Yaakov Selkowitz) -* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.4-1 -- Updated to release 0.88.4. +* Wed Feb 03 2016 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.99-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild -* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-2 -- Incorporated UPX heap overflow fix. +* Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 +- Require openssl-devel for clamav-devel +- Change clamav-milter unit for upstream changes (#1287795) -* Sat Jul 01 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-1 -- Updated to release 0.88.3. +* Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 +- Upgrade to 0.99 and updated daily.cvd (#1287327) -* Sun Apr 30 2006 Dag Wieers <dag(a)wieers.com> - 0.88.2-1 -- Updated to release 0.88.2. +* Tue Jun 30 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-3 +- Move /etc/tmpfiles.d/ to /usr/lib/tmpfiles.d/ (#1126595) -* Tue Apr 04 2006 Dag Wieers <dag(a)wieers.com> - 0.88.1-1 -- Updated to release 0.88.1. +* Wed Jun 17 2015 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -* Mon Jan 09 2006 Dag Wieers <dag(a)wieers.com> - 0.88-1 -- Updated to release 0.88. +* Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 +- Upgrade to 0.98.7 and updated daily.cvd (#1217014) -* Sun Nov 13 2005 Dries Verachtert <dries(a)ulyssis.org> - 0.87.1-1 -- Updated to release 0.87.1. +* Tue Mar 10 2015 Adam Jackson <ajax(a)redhat.com> 0.98.6-2 +- Drop sysvinit subpackages in F23+ -* Sat Sep 17 2005 Dag Wieers <dag(a)wieers.com> - 0.87-1 -- Updated to release 0.87. +* Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 +- Upgrade to 0.98.6 and updated daily.cvd (#1187050) -* Mon Jul 25 2005 Dag Wieers <dag(a)wieers.com> - 0.86.2-1 -- Updated to release 0.86.2. +* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-2 +- Corrected summary of clamav-server-systemd package (#1165672) -* Mon Jul 11 2005 Dag Wieers <dag(a)wieers.com> - 0.86.1-1 -- Updated to release 0.86.1. +* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 +- Upgrade to 0.98.5 and updated daily.cvd (#1138101) -* Mon May 16 2005 Dag Wieers <dag(a)wieers.com> - 0.85.1-1 -- Updated to release 0.85.1. +* Sat Aug 16 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild -* Fri Apr 29 2005 Dag Wieers <dag(a)wieers.com> - 0.84-1 -- Updated to release 0.84. +* Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 +- Upgrade to 0.98.4 and updated daily.cvd (#1111811) +- Add build requirement to libxml2 for DMG, OpenIOC and XAR -* Mon Feb 14 2005 Dag Wieers <dag(a)wieers.com> - 0.83-1 -- Updated to release 0.83. +* Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.98.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild -* Thu Feb 10 2005 Dag Wieers <dag(a)wieers.com> - 0.82-2 -- Fix for false positive on RIFF files. (Roger Jochem) +* Sat May 10 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.3-1 +- Upgrade to 0.98.3 and updated daily.cvd (#1095614) +- Avoid automatic path detection breakage regarding curl +- Added build requirement to openssl-devel for hasing code +- Added clamsubmit to main package -* Mon Feb 07 2005 Dag Wieers <dag(a)wieers.com> - 0.82-1 -- Updated to release 0.82. +* Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 +- Upgrade to 0.98.1 and updated daily.cvd (#1053400) -* Thu Jan 27 2005 Dag Wieers <dag(a)wieers.com> - 0.81-1 -- Improved logrotate scripts. (Filippo Grassilli) -- Updated to release 0.81. +* Wed Oct 09 2013 Dan Horák <dan[at]danny.cz> - 0.98-2 +- Use fanotify from glibc instead of the limited hand-crafted version -* Wed Dec 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-2 -- Added %%dir /var/clamav/log. (Adam Bowns) -- Changed logrotate script to use clamd.log. (Stuart Schneider) -- Added curl dependency. (Petr Kristof) -- Synchronized some options from Petr. (Petr Kristof) -- Fixed another clamav.conf reference. (Michael Best) +* Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 +- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) -* Mon Nov 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-1 -- Updated package description. (Arvin Troels) -- Incorporated fixes from Jima. (Jima) -- Config clamav.conf renamed to clamd.conf. -- Removed obsolete patch. -- Added macros for building without milter. -- Updated to release 0.80. +* Wed Aug 07 2013 Pierre-Yves Chibon <pingou(a)pingoured.fr> - 0.97.8-4 +- Add a missing requirement on crontabs to spec file +- Fix RHBZ#988605 -* Fri Jul 30 2004 Dag Wieers <dag(a)wieers.com> - 0.75.1-1 -- Added obsoletes for fedora.us. -- Updated to release 0.75.1. +* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.97.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild -* Mon Jul 26 2004 Dag Wieers <dag(a)wieers.com> - 0.75-2 -- Fixed a problem where $CODE was empty. +* Thu May 2 2013 Nick Bebout <nb(a)fedoraproject.org> - 0.97.8-1 +- Update to 0.97.8 -* Fri Jul 23 2004 Dag Wieers <dag(a)wieers.com> - 0.75-1 -- Updated to release 0.75. +* Wed Apr 10 2013 Jon Ciesla <limburgher(a)gmail.com> - 0.97.7-2 +- Migrate from fedora-usermgmt to guideline scriptlets. -* Wed Jun 30 2004 Dag Wieers <dag(a)wieers.com> - 0.74-1 -- Updated to release 0.74. +* Sat Mar 23 2013 Nick Bebout <nb(a)fedoraproject.org> - 0.97.7-1 +- Update to 0.97.7 -* Tue Jun 15 2004 Dag Wieers <dag(a)wieers.com> - 0.73-1 -- Updated to release 0.73. +* Wed Feb 13 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.97.6-1901 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild -* Thu Jun 03 2004 Dag Wieers <dag(a)wieers.com> - 0.72-1 -- Updated to release 0.72. +* Sat Sep 22 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.6-1900 +- updated to 0.97.6 +- use %%systemd macros -* Thu May 20 2004 Dag Wieers <dag(a)wieers.com> - 0.71-1 -- Updated to release 0.71. +* Tue Aug 14 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.5-1900 +- disabled upstart support -* Sun May 02 2004 Dag Wieers <dag(a)wieers.com> - 0.70-2 -- Fixed the installation check for conf files. (Richard Soderberg, Udo Ruecker) -- Changed the init-order of the sysv scripts. (Will McCutcheon) -- Changes to the default configuration files. +* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.97.5-1801 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -* Wed Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 -- Updated to release 0.70. +* Sat Jun 16 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.5-1800 +- updated to 0.97.5 +- 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 +- ship local copy of virus database; it was removed by accident from + 0.97.5 tarball +- removed sysv compat stuff -* Tue Mar 16 2004 Dag Wieers <dag(a)wieers.com> - 0.68-1 -- Updated to release 0.68. +* Fri Apr 13 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.4-1801 +- build with -fPIE -* Fri Mar 12 2004 Dag Wieers <dag(a)wieers.com> - 0.67.1-1 -- Updated to release 0.67-1. -- Added clamdwatch and trashcan to clamd. +* Fri Mar 16 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.4-1800 +- updated to 0.97.4 -* Mon Mar 08 2004 Dag Wieers <dag(a)wieers.com> - 0.67-1 -- Personalized SPEC file. +* Sun Feb 5 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.3-1703 +- fixed SELinux restorecon invocation +- added trigger to fix SELinux contexts of logfiles created by old + packages +- fixed build with recent gcc/glibc toolchain -* Fri Aug 22 2003 Matthias Saou/Che -- Added "--without milter" build option. (Matthias Saou) -- Fixed freshclam cron (Matthias Saou) -- Built the new package. (Che) +* Sat Jan 21 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.3-1703 +- rewrote clamav-notify-servers to be init system neutral +- set PrivateTmp systemd option (#782488) -* Tue Jun 24 2003 Che -- clamav-milter introduced. -- a few more smaller fixes. +* Sun Jan 8 2012 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.3-1702 +- set correct SELinux context for logfiles generated in %%post (#754555) +- create systemd tmpfiles in %%post +- created -server-systemd subpackage providing a clamd@.service template +- made script in -scanner-systemd an instance of clamd@.service -* Sun Jun 22 2003 Che -- version upgrade +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 +- updated to 0.97.3 +- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 -* Mon Jun 16 2003 Che -- rh9 build -- various fixes -- got rid of rpm-helper prereq +* Thu Aug 4 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1700 +- moved sysv wrapper script into -sysv subpackage +- start systemd services after network.target and nss-lookup.target -* Mon Mar 24 2003 Che -- some cleanups and fixes -- new patch added +* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 +- updated to 0.97.2 +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) +- fixed systemd scripts and their installation + +* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 +- updated to 0.97.1 +- fixed Requires(preun) vs. Requires(postun) inconsistency -* Fri Nov 22 2002 Che -- fixed a config patch issue +* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 +- fixed tmpfiles.d syntax (#696812) -* Fri Nov 22 2002 Che -- version upgrade and some fixes +* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 +- updated to 0.97 +- rediffed some patches -* Sat Nov 02 2002 Che -- version upgrade +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 +- fixed signal specifier in clamd-wrapper (#668131, James Ralston) -* Thu Oct 24 2002 Che -- some important changes for lsb compliance +* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 +- added systemd init scripts which obsolete to old sysvinit ones +- added tmpfiles.d/ descriptions -* Wed Oct 23 2002 Che -- initial rpm release +* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 +- updated to 0.96.5 +- CVE-2010-4260 Multiple errors within the processing of PDF files can + be exploited to e.g. cause a crash. +- CVE-2010-4261 An off-by-one error within the "icon_cb()" function + can be exploited to cause a memory corruption. + +* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 +- updated to 0.96.4 +- execute 'make check' (#640347) but ignore errors for now because + four checks are failing on f13 + +* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 +- lowered stop priority of sysv initscripts (#629435) + +* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 +- updated to 0.96.3 +- fixes CVE-2010-0405 in shipped bzlib.c copy + +* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 +- updated to 0.96.2 +- rediffed patches +- removed the -jit-disable patch which is replaced upstream by a more + detailed configuration option. + +* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed old %%trigger which renamed the 'clamav' user- and groupnames + to 'clamupdate' +- use 'groupmems', not 'usermod' to add a user to a group because + 'usermod' does not work when user does not exist in local /etc/passwd + +* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 +- ocaml not available (at least) on s390(x) + +* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 +- updated to 0.96.1 +- rediffed patches + +* Sat May 29 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 +- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) + +* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 +- updated to final 0.96 +- applied upstream patch which allows to disable JIT compiler (#573191) +- build JIT compiler again +- disabled JIT compiler by default +- removed explicit 'pkgconfig' requirements in -devel (#533956) + +* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 +- do not build the bytecode JIT compiler for now until it can be disabled + at runtime (#573191) + +* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 +- updated to 0.96rc1 +- added some BRs + +* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 +- updated -upstart to upstart 0.6.3 + +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) +- use %%apply instead of %%patch + +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 +- updated to 0.95.3 + +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches + +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam diff --git a/clamd-README b/clamd-README new file mode 100644 index 0000000..fa6eea5 --- /dev/null +++ b/clamd-README @@ -0,0 +1,59 @@ +To create individual clamd-instance take the following files and +modify/copy them in the suggested way: + +clamd.conf: + * set LocalSocket (or better: TCPSocket) and User to suitable values; + avoid PidFile unless it is required by system monitoring or something + else. Logging through syslog is usually better than an individual + Logfile. + * place this file into /etc/clamd.d with an unique service-name; + e.g. as /etc/clamd.d/<SERVICE>.conf + + When using TCPSocket, create iptables rules which are limiting the + access by source and/or by using '-m owner'. + + When LogFile feature is wanted, it must be writable for the assigned + User. Recommended way to reach this, is to: + * make it owned by the User's *group* + * assign at least 0620 (u+rw,g+w) permissions + + A suitable command might be + | # touch <logfile> + | # chgrp <user> <logfile> + | # chmod 0620 <logfile> + | # restorecon <logfile> + + NEVER use 'clamav' as the user since he can modify the database. + This is the user who is running the application; e.g. for mimedefang + (http://www.roaringpenguin.com/mimedefang) the user might be + 'defang'.Theoretically, distinct users could be used, but it must be + made sure that the application-user can write into the socket-file, + and that the clamd-user can access the files asked by the + application to be checked. + +clamd.logrotate: (only when LogFile feature is used) + * set the correct value for the logfile + * place it into /etc/logrotate.d + +clamd@<SERVICE>.service: (systemd instance) + * instance of clamd@.service + +Additionally, when using LocalSocket instead of TCPSocket, the directory +for the socket file must be created. For tmpfiles based systems, you +might want to create a file /usr/lib/tmpfiles.d/clamd.<SERVICE>.conf +with a content of + + | d /var/run/clamd.<SERVICE> <MODE> <USER> <GROUP> + +Adjust <MODE> (0710 should suffice for most cases) and <USER> + <GROUP> +so that the socket can be accessed by clamd and by the applications +using clamd. Make sure that the socket is not world accessible; else, +DOS attacks or worse are trivial. + + +[Disclaimer: + this file and the script/configfiles are not part of the official + clamav package. + + Please send complaints and comments to + mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamd-gen b/clamd-gen new file mode 100755 index 0000000..ac5dae2 --- /dev/null +++ b/clamd-gen @@ -0,0 +1,269 @@ +#! /bin/bash + +# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +function showHelp() +{ + echo \ +$"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> + --license=<LICENSE> --username=>USERNAME> +" + exit 0 +} + +function rpm.generatePreamble() +{ + cat <<EOF +%{!?release_func:%define release_func() %1%{?dist}} +# The name of the minit service +%define minitsvcdir %minitdir/services/%name +# The configuration file for the SysV initservice +%define conffile %_sysconfdir/clamd.d/%service.conf +# The directory, where the milter socket will be placed into; this +# socket will be named clamd.sock +%define rundir /var/run/clamd.%service +# The name of the logfile +%define logfile /var/log/clamd.%service +# The user under whose id, the clamd shall be running. This user must +# be able to read the files from the base-service and is usually +# created there. +%define username $USERNAME +# The packagename of the service +%define service $SERVICE +# The service name as used by the system's initscripts; usually this +# is %service +%define baseservice %service + +%define __chkconfig /sbin/chkconfig +%define minitdir %_sysconfdir/minit + + +EOF +} + +function rpm.generateHeader() +{ + cat <<EOF +Summary: Clamav server for '%service' +Name: clamd.%service +Version: $VERSION +Release: %release_func $RELEASE +Epoch: 0 +License: $LICENSE +Group: System Environment/Daemons +BuildRoot: %_tmppath/%name-%version-%release-root +BuildArch: noarch +Requires: init(%name) +Requires(pre): %service +Requires: clamav-server +BuildRequires: clamav-devel + +%package sysv +Summary: SysV initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = sysv +Conflicts: init(%name) < sysv +Conflicts: init(%name) > sysv +Requires: clamav-server-sysv +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp %__chkconfig +Requires(preun): %__chkconfig +Requires(pre): %_initrddir +Requires(postun): %_initrddir + +%package minit +Summary: minit initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = minit +Conflicts: init(%name) < minit +Conflicts: init(%name) > minit +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp +Requires(pre): minit-setup +Requires(postun): minit-setup +Requires(triggers): minit-tools + + +%description +Basic setup for a clamav server for '%service'. + + +%description sysv +Basic setup for a clamav server for '%service'. + +This package contains initscripts for SysV based systems. + + +%description minit +Basic setup for a clamav server for '%service'. + +This package contains initscripts for minit based systems. + +EOF +} + + +function rpm.genBody() +{ + cat <<"XEOFX" +%prep +%build + +%install +rm -rf $RPM_BUILD_ROOT +%__install -d -m755 $RPM_BUILD_ROOT{%minitsvcdir,%_sbindir,%rundir,/var/log} + +d=/usr/share/clamav/template + +function subst +{ + src=$d/$1 + dst=$RPM_BUILD_ROOT$2 + + %__install -d -m755 $(dirname "$dst") + sed -e 's!^$#?LogFile $.*!\1%logfile!g; + s!^#?$LocalSocket $.*!\1%rundir/clamd.sock!g; + s!^#?$PidFile $.*!\1%rundir/clamd.pid!g; + s!<SERVICE>!%service!g; + s!<USER>!%username!g;' "$src" >"$dst" + chmod --reference "$src" "$dst" +} + +subst clamd.conf %conffile +subst clamd.logrotate %_sysconfdir/logrotate.d/clamd.%service + +%if 0%{!?_without_sysv:1} +subst clamd.sysconfig %_sysconfdir/sysconfig/clamd.%service +subst clamd.init %_initrddir/clamd.%service +%endif + +ln -s clamd $RPM_BUILD_ROOT%_sbindir/clamd.%service + +touch $RPM_BUILD_ROOT%logfile +touch $RPM_BUILD_ROOT%rundir/clamd.sock + +%if 0%{!?_without_minit:1} +ln -s %_sbindir/clamd.%service $RPM_BUILD_ROOT%minitsvcdir/run +touch $RPM_BUILD_ROOT%minitsvcdir/respawn +cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params +-c +%conffile +EOF +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + + +%triggerin minit -- %baseservice +minit-svc add services/clamd.%service services/%baseservice/ + +%triggerun minit -- %baseservice +test "$1" != 0 -a "$2" != 0 || \ + minit-svc del services/clamd.%service services/%baseservice/ + + +%post minit +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^#Foreground!Foreground!' "%conffile" >"$d" +grep -q '^Foreground' $d || echo 'Foreground' >>$d +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%post sysv +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^Foreground!#Foreground!' "%conffile" >"$d" +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%__chkconfig --add %name + + +%preun sysv +test "$1" != 0 || %__chkconfig --del %name + +XEOFX +} + + +function rpm.genFiles +{ + cat <<"EOF" +%files +%defattr(-,root,root,-) +%doc +%config(noreplace) %verify(not size md5 mtime) %attr(0620,root,%username) %logfile +%config(noreplace) %verify(not mtime) %conffile +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/clamd.%service +%_sbindir/clamd.%service +%dir %attr(0700,%username,root) %rundir +%ghost %rundir/clamd.sock + + +%if 0%{!?_without_sysv:1} +%files sysv +%defattr(-,root,root,-) +%config %verify(not mtime) %_initrddir/clamd.%service +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamd.%service +%endif + + +%if 0%{!?_without_minit:1} +%files minit +%defattr(-,root,root,-) +%dir %minitsvcdir +%config(noreplace) %verify(not mtime) %minitsvcdir/params +%config %minitsvcdir/run + %minitsvcdir/respawn +%endif +EOF +} + + +SERVICE= +VERSION= +RELEASE= +LICENSE= +USERNAME= +tmp=$(getopt -o '' --long service:,version:,release:,license:,username:,help -n "$0" -- "$@") || exit 1 +eval set -- "$tmp" + +while true; do + case "$1" in + (--help) showHelp $0;; + (--service) SERVICE=$2; shift;; + (--version) VERSION=$2; shift;; + (--release) RELEASE=$2; shift;; + (--license) LICENSE=$2; shift;; + (--username) USERNAME=$2; shift;; + (--) shift; break;; + esac + shift +done + +for i in SERVICE VERSION RELEASE LICENSE USERNAME; do + eval tmp=\$${i} + test "$tmp" || { + echo $"No value for $i specified; assuming @${i}@" >&2; + eval $i=@${i}@; + } +done + + +rpm.generatePreamble +rpm.generateHeader +rpm.genBody +rpm.genFiles diff --git a/clamd-wrapper b/clamd-wrapper new file mode 100644 index 0000000..0a30628 --- /dev/null +++ b/clamd-wrapper @@ -0,0 +1,90 @@ +#!/bin/bash +# +# Xchkconfig: - 75 35 +# Xdescription: The clamd daemon listens for incoming connections on \ +# Unix or TCP socket and scans files or directories on demand. + +test "$CLAMD_SERVICE" || { + echo $"*** $0 can not be called in this way" + echo $"*** Please see /usr/share/doc/clamav-server-*/README how" + echo $"*** the clamav-server can be configured" + exit 6 +} + +# Source function library. +. /etc/init.d/functions + +# Get config. +test -r /etc/sysconfig/network && . /etc/sysconfig/network + +# Check that networking is up. +test "$NETWORKING" != "no" || exit 6 + +lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} +sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} +procname=clamd.${CLAMD_SERVICE} + +CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf +CLAMD_OPTIONS= +CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid +## backward-compatibility check... +for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ + /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do + CLAMD_SOCKET=$i + test ! -e "$i" || break +done +test -f "$sysconffile" && . "$sysconffile" + + +RETVAL=0 +prog="clamd.${CLAMD_SERVICE}" + +start () { + echo -n $"Starting $prog: " + daemon --pidfile=${CLAMD_PIDFILE} \ + exec -a $procname /usr/sbin/clamd \ + ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch $lockfile + return $RETVAL +} + +stop () { + echo -n $"Stopping $prog: " + killproc -p ${CLAMD_PIDFILE} $procname + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $lockfile + return $RETVAL +} + +reload() { + rc=0 + echo -n $"Reloading $prog: " + killproc -p ${CLAMD_PIDFILE} $procname -HUP || rc=$? + echo + echo -n $"Loading new virus-database: " + killproc -p ${CLAMD_PIDFILE} $procname -USR2 || rc=$? + echo + return $rc +} + +restart () { + stop + start +} + +# See how we were called. +case "$1" in + start|stop|restart|reload) + $1 ;; + status) + status -p ${CLAMD_PIDFILE} $procname ;; + condrestart) + test ! -f $lockfile || restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" + exit 2 +esac diff --git a/clamd.SERVICE.init b/clamd.SERVICE.init new file mode 100644 index 0000000..f2f9191 --- /dev/null +++ b/clamd.SERVICE.init @@ -0,0 +1,7 @@ +#!/bin/bash +# +# chkconfig: - 75 35 +# description: The clamd server running for <SERVICE> + +CLAMD_SERVICE=<SERVICE> +. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate index b233f3a..315f352 100644 --- a/clamd.logrotate +++ b/clamd.logrotate @@ -1,8 +1,9 @@ -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript +/var/log/clamd.<SERVICE> { + monthly + notifempty + missingok + + postrotate + killall -HUP clamd.<SERVICE> >/dev/null 2>&1 || : + endscript } diff --git a/clamd.scan.upstart b/clamd.scan.upstart new file mode 100644 index 0000000..54482e6 --- /dev/null +++ b/clamd.scan.upstart @@ -0,0 +1,14 @@ +### !!! Uncomment only *one* of the 'start on' statements !!! + +### Uncomment this line when you want clamd.scan to be a scanner for a +### locally running clamav-milter +#start on starting clamav-milter + +### Uncomment this line when you want clamd.scan to be a generic +### scanner service +#start on runlevel [345] and starting local + +stop on runlevel [!345] + +respawn +exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --foreground=yes diff --git a/clamd.sysconfig b/clamd.sysconfig new file mode 100644 index 0000000..4933e7e --- /dev/null +++ b/clamd.sysconfig @@ -0,0 +1,3 @@ +#CLAMD_CONFIGFILE=/etc/clamd.d/<SERVICE>.conf +#CLAMD_SOCKET=/var/run/clamd.<SERVICE>/clamd.sock +#CLAMD_OPTIONS= diff --git a/clamd@.service b/clamd@.service new file mode 100644 index 0000000..4e3556f --- /dev/null +++ b/clamd@.service @@ -0,0 +1,8 @@ +[Unit] +Description = clamd scanner (%i) daemon +After = syslog.target nss-lookup.target network.target + +[Service] +Type = forking +ExecStart = /usr/sbin/clamd -c /etc/clamd.d/%i.conf +Restart = on-failure diff --git a/clamd(a)scan.service b/clamd(a)scan.service new file mode 100644 index 0000000..c329612 --- /dev/null +++ b/clamd(a)scan.service @@ -0,0 +1,7 @@ +.include /lib/systemd/system/clamd@.service + +[Unit] +Description = Generic clamav scanner daemon + +[Install] +WantedBy = multi-user.target diff --git a/freshclam-sleep b/freshclam-sleep new file mode 100755 index 0000000..fddb922 --- /dev/null +++ b/freshclam-sleep @@ -0,0 +1,52 @@ +#! /bin/bash +# Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +FRESHCLAM_MOD=$[ 3*60 ] # 3 hours + +f=/etc/sysconfig/freshclam +test ! -e "$f" || . "$f" + + +case x"$1" in + (xnow) FRESHCLAM_DELAY=0;; + (x|xrandom) : ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};; + (*) FRESHCLAM_DELAY=$1;; +esac + +set -e + +case $FRESHCLAM_DELAY in + (disabled-warn) + echo $"\ +WARNING: update of clamav database is disabled; please see + '$f' + for information how to enable the periodic update resp. how to turn + off this message." >&2 + exit 1 + ;; + + (disabled) + exit 0 + ;; + + (*) + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] + ;; +esac + +/usr/bin/freshclam --quiet diff --git a/freshclam.cron b/freshclam.cron deleted file mode 100644 index e40d8ef..0000000 --- a/freshclam.cron +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate deleted file mode 100644 index 272d220..0000000 --- a/freshclam.logrotate +++ /dev/null @@ -1,5 +0,0 @@ -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} diff --git a/freshclam.sysconfig b/freshclam.sysconfig new file mode 100644 index 0000000..417dafc --- /dev/null +++ b/freshclam.sysconfig @@ -0,0 +1,18 @@ +## When changing the periodicity of freshclam runs in the crontab, +## this value must be adjusted also. Its value is the timespan between +## two subsequent freshclam runs in minutes. E.g. for the default +## +## | 0 */3 * * * ... +## +## crontab line, the value is 180 (minutes). +# FRESHCLAM_MOD= + +## A predefined value for the delay in seconds. By default, the value is +## calculated by the 'hostid' program. This predefined value guarantees +## constant timespans of 3 hours between two subsequent freshclam runs. +## +## This option accepts two special values: +## 'disabled-warn' ... disables the automatic freshclam update and +## gives out a warning +## 'disabled' ... disables the automatic freshclam silently +# FRESHCLAM_DELAY= diff --git a/llvm-glibc.patch b/llvm-glibc.patch new file mode 100644 index 0000000..67dbdd7 --- /dev/null +++ b/llvm-glibc.patch @@ -0,0 +1,12 @@ +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 +@@ -52,6 +52,7 @@ static void runAtExitHandlers() { + #include <sys/stat.h> + #endif + #include <fcntl.h> ++#include <unistd.h> + /* stat functions are redirecting to __xstat with a version number. On x86-64 + * linking with libc_nonshared.a and -Wl,--export-dynamic doesn't make 'stat' + * available as an exported symbol, so we have to add it explicitly. diff --git a/sources b/sources index 0573f02..113ca26 100644 --- a/sources +++ b/sources @@ -1,5 +1,4 @@ -a4517adbd9c72a3fec3fbb1384dd3234 clamav-0.99.2-norar.tar.xz -d71fbb44799945970f2c2b75e40ec105 daily-21723.cvd -f13ead862171f50019c15c946d25e91f main-57.cvd -c545b6a9775ccb72a293d259335589be bytecode-278.cvd -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +SHA512 (clamav-0.99.3-norar.tar.xz) = d80b20c982d35eecd2719af325bc774a5a5fe63a97f3d855c74919f6cfac6fe3f12c51479e49d96031ae0e9a3dedcf446dd22426cceba22ec4b641e9ea1f250a +SHA512 (bytecode-319.cvd) = 1b2785fde078e0dae5a4b8a5161a0da55b26b010deda9fd9dc5edb7113d46d6eb45f644c16b4cb3882e7192d0b389d7b1826fbb718377aa40e1bac3485829acc +SHA512 (daily-24253.cvd) = cef70a86f7989ec330c0479f6070e735181168c0331e981cfcd8d9a5aebdd6be42d772167c701f6f33219a4b41aced806e70c156e9a2a060c30ba55e73743fcd +SHA512 (main-58.cvd) = 71309a7ea26f0fbfe329252c728173c895b107b7ea2e0bd613b12475db1d0270a496d707c4d80c842bf8b6f21680e86edfa7fa3b8aea075e93d67c91d696603a commit 4f3fd81e6aff2829d95ecf971feb5ba34b761c76 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Nov 26 03:55:21 2017 +0100 Backported upstream patch to unbreak e2guardian vs. temp files diff --git a/clamav-0.99.2-temp-cleanup.patch b/clamav-0.99.2-temp-cleanup.patch new file mode 100644 index 0000000..1b01341 --- /dev/null +++ b/clamav-0.99.2-temp-cleanup.patch @@ -0,0 +1,137 @@ +https://github.com/vrtadmin/clamav-devel/commit/f5bc94cf01e6a19d5255c0e5f9a5bc2336f5a2b1 +backported (re-merge). See also: + + - https://bugzilla.clamav.net/show_bug.cgi?id=11549 + - https://github.com/e2guardian/e2guardian/issues/159 + +--- clamav-0.99.2/libclamav/scanners.c 2016-04-22 17:02:19.000000000 +0200 ++++ clamav-0.99.2/libclamav/scanners.c.temp-cleanup 2017-11-17 00:59:14.295670694 +0100 +@@ -1342,37 +1342,33 @@ + return CL_CLEAN; + } + +- /* dump to disk only if explicitly asked to +- * or if necessary to check relative offsets, +- * otherwise we can process just in-memory */ +- if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) { +- if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) { +- cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n"); +- return ret; +- } +- if (ctx->engine->keeptmp) +- cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname); +- } +- + if(!(normalized = cli_malloc(SCANBUFF + maxpatlen))) { + cli_dbgmsg("cli_scanscript: Unable to malloc %u bytes\n", SCANBUFF); +- free(tmpname); + return CL_EMEM; + } +- + text_normalize_init(&state, normalized, SCANBUFF + maxpatlen); +- ret = CL_CLEAN; +- + + if ((ret = cli_ac_initdata(&tmdata, troot?troot->ac_partsigs:0, troot?troot->ac_lsigs:0, troot?troot->ac_reloff_num:0, CLI_DEFAULT_AC_TRACKLEN))) { +- free(tmpname); +- return ret; ++ free(normalized); ++ return ret; + } + + if ((ret = cli_ac_initdata(&gmdata, groot->ac_partsigs, groot->ac_lsigs, groot->ac_reloff_num, CLI_DEFAULT_AC_TRACKLEN))) { +- cli_ac_freedata(&tmdata); +- free(tmpname); +- return ret; ++ cli_ac_freedata(&tmdata); ++ free(normalized); ++ return ret; ++ } ++ ++ /* dump to disk only if explicitly asked to ++ * or if necessary to check relative offsets, ++ * otherwise we can process just in-memory */ ++ if(ctx->engine->keeptmp || (troot && troot->ac_reloff_num > 0)) { ++ if((ret = cli_gentempfd(ctx->engine->tmpdir, &tmpname, &ofd))) { ++ cli_dbgmsg("cli_scanscript: Can't generate temporary file/descriptor\n"); ++ goto done; ++ } ++ if (ctx->engine->keeptmp) ++ cli_dbgmsg("cli_scanscript: saving normalized file to %s\n", tmpname); + } + + mdata[0] = &tmdata; +@@ -1387,10 +1383,9 @@ + map_off += written; + + if (write(ofd, state.out, state.out_pos) == -1) { +- cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname); +- close(ofd); +- free(tmpname); +- return CL_EWRITE; ++ cli_errmsg("cli_scanscript: can't write to file %s\n",tmpname); ++ ret = CL_EWRITE; ++ goto done; + } + text_normalize_reset(&state); + } +@@ -1409,11 +1404,6 @@ + funmap(*ctx->fmap); + } + *ctx->fmap = map; +- +- /* If we aren't keeping temps, delete the normalized file after scan. */ +- if(!(ctx->engine->keeptmp)) +- if (cli_unlink(tmpname)) ret = CL_EUNLINK; +- + } else { + /* Since the above is moderately costly all in all, + * do the old stuff if there's no relative offsets. */ +@@ -1421,11 +1411,8 @@ + if (troot) { + cli_targetinfo(&info, 7, map); + ret = cli_ac_caloff(troot, &tmdata, &info); +- if (ret) { +- cli_ac_freedata(&tmdata); +- free(tmpname); +- return ret; +- } ++ if (ret) ++ goto done; + } + + while(1) { +@@ -1466,13 +1453,6 @@ + + } + +- if(ctx->engine->keeptmp) { +- free(tmpname); +- if (ofd >= 0) +- close(ofd); +- } +- free(normalized); +- + if(ret != CL_VIRUS || SCAN_ALL) { + if ((ret = cli_exp_eval(ctx, troot, &tmdata, NULL, NULL)) == CL_VIRUS) + viruses_found++; +@@ -1481,9 +1461,19 @@ + viruses_found++; + } + ++done: ++ free(normalized); + cli_ac_freedata(&tmdata); + cli_ac_freedata(&gmdata); + ++ if (ofd != -1) ++ close(ofd); ++ if (tmpname != NULL) { ++ if (!ctx->engine->keeptmp) ++ cli_unlink(tmpname); ++ free(tmpname); ++ } ++ + if (SCAN_ALL && viruses_found) + return CL_VIRUS; + diff --git a/clamav.spec b/clamav.spec index edf30f2..2fd02bd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -32,6 +32,7 @@ Source12: http://db.local.clamav.net/daily-21723.cvd Source13: http://db.local.clamav.net/bytecode-278.cvd Patch31: clamav-0.99.1-setsebool.patch +Patch32: clamav-0.99.2-temp-cleanup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -131,6 +132,7 @@ you will need to install %{name}-devel. %setup -q -T -c xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %patch31 -p1 -b .setsebool +%patch32 -p1 -b .temp-cleanup %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure @@ -410,6 +412,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Nov 26 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-3 +- Backported upstream patch to unbreak e2guardian vs. temp files + * Tue Mar 28 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-2 - Ensure that missing or invalid timezone configuration does not mangle /etc/freshclam.conf in %%post (#1154756) commit f7d8e9087c523eb46dce29552fcb37c2a69e0ffc Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Mar 28 21:54:37 2017 +0200 Ensure that missing or invalid timezone configuration does not mangle /etc/freshclam.conf in %post (#1154756) diff --git a/clamav.spec b/clamav.spec index 315b839..edf30f2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -262,9 +262,9 @@ for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done ZONES="/usr/share/zoneinfo/zone.tab" CONFIG="/etc/sysconfig/clock" -if [ -r "$CONFIG" -a -r "$ZONES" ]; then +if [ -r "$CONFIG" -a -r "$ZONES" -a -n "$ZONE" ]; then source "$CONFIG" - export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | head -1 | cut -f1 | tr [A-Z] [a-z])" + export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | grep -v ^# | head -1 | cut -f1 | tr [A-Z] [a-z])" fi if [ -z "$CODE" ]; then @@ -410,6 +410,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Mar 28 2017 Robert Scheck <robert(a)fedoraproject.org> - 0.99.2-2 +- Ensure that missing or invalid timezone configuration does not + mangle /etc/freshclam.conf in %%post (#1154756) + * Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 - Update to 0.99.2 - Enable llvm commit 0577117bb2cb0095605995c4ad488e03951e809a Author: Orion Poplawski <orion(a)cora.nwra.com> Date: Mon Jun 13 11:36:38 2016 -0600 Update to 0.99.2 - Enable llvm - Drop cliopts patch fixed upstream, use upstream's "--forground" option name - Fix main.cvd (fedora #1325482, epel #1325717) - Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd - Update daily.cvd - Fixup Requires(pre) usage (#1319151) Conflicts: clamav-milter.systemd clamav-milter.sysv clamav-milter.upstart clamav.spec clamd.scan.upstart clamd@.service sources diff --git a/.gitignore b/.gitignore index cdb6045..d87d52b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /clamav-*-norar.tar.xz /main*.cvd /daily*.cvd +/bytecode-278.cvd diff --git a/clamav-0.99.1-setsebool.patch b/clamav-0.99.1-setsebool.patch new file mode 100644 index 0000000..f168b55 --- /dev/null +++ b/clamav-0.99.1-setsebool.patch @@ -0,0 +1,15 @@ +Patch by Robert Scheck <robert(a)fedoraproject.org> for clamav >= 0.99.1 which changes the SELinux +boolean name from the obsolete (and former alias) clamd_use_jit to the current antivirus_use_jit. +See also: https://bugzilla.redhat.com/show_bug.cgi?id=1295473 + +--- clamav-0.99.1/libclamav/builtin_bytecodes.h 2015-12-11 17:26:02.000000000 +0100 ++++ clamav-0.99.1/libclamav/builtin_bytecodes.h.setsebool 2016-03-29 23:32:03.000000000 +0200 +@@ -139,7 +139,7 @@ + if (env.os_features & (1 << feature_selinux)) + /* all SELinux versions deny RWX mapping when policy says so */ + disable_jit_if("^SELinux is preventing 'execmem' access.\n" +- "Run 'setsebool -P clamd_use_jit on'.", 0, 1); ++ "Run 'setsebool -P antivirus_use_jit on'.", 0, 1); + else if (env.os_features & (1 << feature_pax)) + /* recent versions of PaX deny RWX mapping */ + disable_jit_if("^PaX is preventing 'mprotect' access.\n" diff --git a/clamav.spec b/clamav.spec index 0f0f118..315b839 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.99.1 +Version: 0.99.2 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,12 +28,16 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-57.cvd -Source12: http://db.local.clamav.net/daily-21478.cvd +Source12: http://db.local.clamav.net/daily-21723.cvd +Source13: http://db.local.clamav.net/bytecode-278.cvd + +Patch31: clamav-0.99.1-setsebool.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel, pcre-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} + Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -126,6 +130,7 @@ you will need to install %{name}-devel. # Handle that rpmbuild in RHEL < 6 doesn't handle xz archives automatically. %setup -q -T -c xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) +%patch31 -p1 -b .setsebool %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure @@ -199,7 +204,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) --with-group="clam" \ --with-libcurl=%{_prefix} \ --with-user="clam" \ - --disable-llvm +# --disable-llvm make %{?_smp_mflags} @@ -242,6 +247,11 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +install -Dp -m0644 %{SOURCE13} %{buildroot}%{_localstatedir}/lib/clamav/bytecode.cvd +touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/bytecode.cld +touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/{daily,main}.cld +touch $RPM_BUILD_ROOT%{_localstatedir}/lib/clamav/mirrors.dat + # Clean up for later usage in documentation for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done @@ -387,6 +397,9 @@ rm -rf %{buildroot} %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log +%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/*.cld +%ghost %attr(0664,%username,%username) %{_localstatedir}/lib/clamav/mirrors.dat + %files devel %defattr(-, root, root, 0755) %{_bindir}/clamav-config @@ -397,6 +410,15 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Jun 13 2016 Orion Poplawski <orion(a)cora.nwra.com> - 0.99.2-1 +- Update to 0.99.2 +- Enable llvm +- Drop cliopts patch fixed upstream, use upstream's "--forground" option name +- Fix main.cvd (fedora #1325482, epel #1325717) +- Own bytecode.cld (#1176252) and mirrors.dat, ship bytecode.cvd +- Update daily.cvd +- Fixup Requires(pre) usage (#1319151) + * Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 - Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) diff --git a/sources b/sources index c0744a1..0573f02 100644 --- a/sources +++ b/sources @@ -1,4 +1,5 @@ -6bf23527691890664c66e62e7bee44ff clamav-0.99.1-norar.tar.xz -85b8dd2229ba4a0ddd8bf048fe2b2078 main-57.cvd -b82f2fc713069d378d79b8e4e3db0b74 daily-21478.cvd +a4517adbd9c72a3fec3fbb1384dd3234 clamav-0.99.2-norar.tar.xz +d71fbb44799945970f2c2b75e40ec105 daily-21723.cvd +f13ead862171f50019c15c946d25e91f main-57.cvd +c545b6a9775ccb72a293d259335589be bytecode-278.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit ea28252658542e37209d2a5ef1b1c1ef58ac7b0b Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Mar 30 00:14:00 2016 +0200 Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) diff --git a/clamav.spec b/clamav.spec index b381569..0f0f118 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,8 +4,8 @@ Summary: Anti-virus software Name: clamav -Version: 0.99 -Release: 3%{?dist} +Version: 0.99.1 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -27,8 +27,8 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). -Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-21123.cvd +Source11: http://db.local.clamav.net/main-57.cvd +Source12: http://db.local.clamav.net/daily-21478.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Mar 29 2016 Robert Scheck <robert(a)fedoraproject.org> - 0.99.1-1 +- Upgrade to 0.99.1 and updated main.cvd and daily.cvd (#1314115) + * Mon Dec 07 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-3 - Added missing build-time requirement to pcre-devel diff --git a/sources b/sources index 2d52233..c0744a1 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -a972a59e09ef86fdfaaf028f714996e5 clamav-0.99-norar.tar.xz -06f660f474d1a6863de4a00eb02521e3 main-55.cvd -547dca19d7c3f1bfb51a3e0dad4ad52e daily-21123.cvd +6bf23527691890664c66e62e7bee44ff clamav-0.99.1-norar.tar.xz +85b8dd2229ba4a0ddd8bf048fe2b2078 main-57.cvd +b82f2fc713069d378d79b8e4e3db0b74 daily-21478.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 22de990d883ff79a5b7465d9cdb256036839e87c Author: Robert Scheck <robert(a)fedoraproject.org> Date: Mon Dec 7 21:26:22 2015 +0100 Added missing build-time requirement to pcre-devel diff --git a/clamav.spec b/clamav.spec index 2943bcc..b381569 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -32,7 +32,7 @@ Source12: http://db.local.clamav.net/daily-21123.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel, pcre-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Dec 07 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-3 +- Added missing build-time requirement to pcre-devel + * Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 - Require openssl-devel for clamav-devel commit f889ba1f96dfdcf315ae3c6dfb575be290b79571 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Dec 6 18:09:17 2015 +0100 Require openssl-devel for clamav-devel diff --git a/clamav.spec b/clamav.spec index 8021b31..2943bcc 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.99 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -110,7 +110,7 @@ The actual virus database for %{name} %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries -Requires: clamav = %{version}-%{release} +Requires: clamav = %{version}-%{release}, openssl-devel ### Fedora Extras introduced them differently :( Obsoletes: libclamav-static-devel <= %{version}-%{release} @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Dec 06 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-2 +- Require openssl-devel for clamav-devel + * Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 - Upgrade to 0.99 and updated daily.cvd (#1287327) commit 685f0bd46bb139c57518ca0c418d262bc8acd9d1 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Dec 2 01:53:02 2015 +0100 Upgrade to 0.99 and updated daily.cvd (#1287327) diff --git a/clamav.spec b/clamav.spec index fe3e9a2..8021b31 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.7 +Version: 0.99 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-20394.cvd +Source12: http://db.local.clamav.net/daily-21123.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Dec 02 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.99-1 +- Upgrade to 0.99 and updated daily.cvd (#1287327) + * Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 - Upgrade to 0.98.7 and updated daily.cvd (#1217014) diff --git a/sources b/sources index 78b4995..2d52233 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -2dd003807614ef53c5ab6c811273ff4e clamav-0.98.7-norar.tar.xz +a972a59e09ef86fdfaaf028f714996e5 clamav-0.99-norar.tar.xz 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -223a4a02a3b8486ce01b44ea4bb56291 daily-20394.cvd +547dca19d7c3f1bfb51a3e0dad4ad52e daily-21123.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 21917faf8969ba61e367a567fa46900728e0d382 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Apr 29 20:34:24 2015 +0200 Upgrade to 0.98.7 and updated daily.cvd (#1217014) diff --git a/clamav.spec b/clamav.spec index 8b41064..fe3e9a2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,8 +4,8 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.6 -Release: 2%{?dist} +Version: 0.98.7 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-19995.cvd +Source12: http://db.local.clamav.net/daily-20394.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Apr 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.7-1 +- Upgrade to 0.98.7 and updated daily.cvd (#1217014) + * Tue Feb 24 2015 Joel Smith <joelsmith(a)fedoraproject.org> - 0.98.6-2 - Make init script source /etc/sysconfig/clamd if present (#1195864) diff --git a/sources b/sources index c1532aa..78b4995 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -a158e74b3741a4b928bcbc17ab171690 clamav-0.98.6-norar.tar.xz +2dd003807614ef53c5ab6c811273ff4e clamav-0.98.7-norar.tar.xz 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -d58cb68afd94e61caab919d6bfd34fcb daily-19995.cvd +223a4a02a3b8486ce01b44ea4bb56291 daily-20394.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 865529f4ffc69c765e572d951f1407c414c458c1 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Fri Apr 10 18:44:47 2015 +0200 Make init script source /etc/sysconfig/clamd if present (#1195864) diff --git a/clamav.init b/clamav.init index dacb403..633c301 100755 --- a/clamav.init +++ b/clamav.init @@ -17,6 +17,9 @@ [ -x /usr/sbin/clamd ] || exit 0 +# Local clamd config +test -f /etc/sysconfig/clamd && . /etc/sysconfig/clamd + # See how we were called. case "$1" in start) diff --git a/clamav.spec b/clamav.spec index b70ab17..8b41064 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.98.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Feb 24 2015 Joel Smith <joelsmith(a)fedoraproject.org> - 0.98.6-2 +- Make init script source /etc/sysconfig/clamd if present (#1195864) + * Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 - Upgrade to 0.98.6 and updated daily.cvd (#1187050) commit 1e9ece70df82b7e69409fe05d090570af80ee073 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Jan 29 22:44:11 2015 +0100 Really update daily.cvd diff --git a/clamav.spec b/clamav.spec index b1e1e60..b70ab17 100644 --- a/clamav.spec +++ b/clamav.spec @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-19651.cvd +Source12: http://db.local.clamav.net/daily-19995.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) commit ba56519d00748db57cbf148b363f8ed95ebe817b Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Jan 29 22:31:21 2015 +0100 Upgrade to 0.98.6 and updated daily.cvd (#1187050) diff --git a/clamav.spec b/clamav.spec index d87084a..b1e1e60 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.5 +Version: 0.98.6 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Thu Jan 29 2015 Robert Scheck <robert(a)fedoraproject.org> - 0.98.6-1 +- Upgrade to 0.98.6 and updated daily.cvd (#1187050) + * Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 - Upgrade to 0.98.5 and updated daily.cvd (#1138101) diff --git a/sources b/sources index 90d8e3a..c1532aa 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ +a158e74b3741a4b928bcbc17ab171690 clamav-0.98.6-norar.tar.xz 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -f83334a2cb2510cc8f9ec9750beaeada daily-19651.cvd -6455c6ce50b56ba1f545c759129f2ad1 clamav-0.98.5-norar.tar.xz +d58cb68afd94e61caab919d6bfd34fcb daily-19995.cvd e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 4548304dd3c0924b4c358097eee31b27933fb241 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Nov 19 13:13:01 2014 +0100 Upgrade to 0.98.5 and updated daily.cvd (#1138101) diff --git a/clamav.spec b/clamav.spec index 902fe8a..d87084a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.4 +Version: 0.98.5 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-19120.cvd +Source12: http://db.local.clamav.net/daily-19651.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Nov 19 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.5-1 +- Upgrade to 0.98.5 and updated daily.cvd (#1138101) + * Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 - Upgrade to 0.98.4 and updated daily.cvd (#1111811) - Add build requirement to libxml2 for DMG, OpenIOC and XAR diff --git a/sources b/sources index bb4d1f0..90d8e3a 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -14939dd869178d9c934bd2b7026104f5 daily-19120.cvd -22bca4a49928a883c90c549a93b9bcde clamav-0.98.4-norar.tar.xz +f83334a2cb2510cc8f9ec9750beaeada daily-19651.cvd +6455c6ce50b56ba1f545c759129f2ad1 clamav-0.98.5-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 242037ee812fed4dbd5eefd4e6cb9ab82ce82beb Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Jun 21 19:20:28 2014 +0200 Add build requirement to libxml2 for DMG, OpenIOC and XAR diff --git a/clamav.spec b/clamav.spec index 3b452fa..902fe8a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -32,7 +32,7 @@ Source12: http://db.local.clamav.net/daily-19120.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel, libxml2-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -399,6 +399,7 @@ rm -rf %{buildroot} %changelog * Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 - Upgrade to 0.98.4 and updated daily.cvd (#1111811) +- Add build requirement to libxml2 for DMG, OpenIOC and XAR * Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 - Upgrade to 0.98.3 commit 22850e6fbd532abf7dce4bf0ddf160b81aff3fac Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Jun 21 19:10:05 2014 +0200 Upgrade to 0.98.4 and updated daily.cvd (#1111811) diff --git a/clamav.spec b/clamav.spec index c8bc466..3b452fa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.3 +Version: 0.98.4 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-18354.cvd +Source12: http://db.local.clamav.net/daily-19120.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -397,6 +397,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sat Jun 21 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.4-1 +- Upgrade to 0.98.4 and updated daily.cvd (#1111811) + * Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 - Upgrade to 0.98.3 - Fix --with-libcurl parameter to avoid automatic path detection breakage diff --git a/sources b/sources index 05ea68b..bb4d1f0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -5a7d62d7d8ee4b237d6e08f5bc02037c daily-18354.cvd -e9210784829725bf716fda7ca536bbb0 clamav-0.98.3-norar.tar.xz +14939dd869178d9c934bd2b7026104f5 daily-19120.cvd +22bca4a49928a883c90c549a93b9bcde clamav-0.98.4-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 5db0137e5a5bd88d1ca992d9376a0e6cbfb6d1ed Author: Paul Wouters <pwouters(a)redhat.com> Date: Fri May 9 16:01:41 2014 -0400 update sources, use latest daily cvd diff --git a/clamav.spec b/clamav.spec index 49eedbf..c8bc466 100644 --- a/clamav.spec +++ b/clamav.spec @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-18353.cvd +Source12: http://db.local.clamav.net/daily-18354.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/sources b/sources index b26e5b2..05ea68b 100644 --- a/sources +++ b/sources @@ -1 +1,4 @@ +06f660f474d1a6863de4a00eb02521e3 main-55.cvd +5a7d62d7d8ee4b237d6e08f5bc02037c daily-18354.cvd e9210784829725bf716fda7ca536bbb0 clamav-0.98.3-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit e7e53f9ced1d1f2babecad82953cfb613109cf35 Author: Paul Wouters <pwouters(a)redhat.com> Date: Fri May 9 13:10:48 2014 -0400 * Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 - Upgrade to 0.98.3 - Fix --with-libcurl parameter to avoid automatic path detection breakage - openssl-devel is now required for hashing code. - Added clamsubmit to main package - Re-enabled --with-llvm as this speeds up deployment a lot. - Fixed older changelog dates diff --git a/clamav.spec b/clamav.spec index fc1bfc9..49eedbf 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.98.1 +Version: 0.98.3 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -13,7 +13,7 @@ URL: http://www.clamav.net/ # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. This # tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +# make clean-sources NAME=clamav VERSION=<version> TARBALL=clamav-<version>.tar.gz TARBALL_CLEAN=clamav-<version>-norar.tar.xz # Upstream: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init @@ -32,7 +32,7 @@ Source12: http://db.local.clamav.net/daily-18353.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel, openssl-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -197,7 +197,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) --enable-dns \ --with-dbdir="%{_localstatedir}/lib/clamav" \ --with-group="clam" \ - --with-libcurl \ + --with-libcurl=%{_prefix} \ --with-user="clam" \ --disable-llvm @@ -329,12 +329,14 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/sigtool.1* %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* +%doc %{_mandir}/man1/clamsubmit.1* %doc %{_mandir}/man5/freshclam.conf.5* %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam %{_bindir}/sigtool %{_bindir}/clambc +%{_bindir}/clamsubmit %{_libdir}/libclamav.so.* %files -n clamd @@ -395,6 +397,14 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Fri May 09 2014 Paul Wouters <pwouters(a)redhat.com> - 0.98.3-1 +- Upgrade to 0.98.3 +- Fix --with-libcurl parameter to avoid automatic path detection breakage +- openssl-devel is now required for hashing code. +- Added clamsubmit to main package +- Re-enabled --with-llvm as this speeds up deployment a lot. +- Fixed older changelog dates + * Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 - Upgrade to 0.98.1 and updated daily.cvd (#1053400) @@ -486,7 +496,7 @@ rm -rf %{buildroot} - Move db to /var/lib/clamav - Ship empty directory /etc/clamd.d for amavisd-new -* Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 +* Thu Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 - Disable llvm. * Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 @@ -643,7 +653,7 @@ rm -rf %{buildroot} - Changed the init-order of the sysv scripts. (Will McCutcheon) - Changes to the default configuration files. -* Sat Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 +* Wed Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 - Updated to release 0.70. * Tue Mar 16 2004 Dag Wieers <dag(a)wieers.com> - 0.68-1 @@ -656,7 +666,7 @@ rm -rf %{buildroot} * Mon Mar 08 2004 Dag Wieers <dag(a)wieers.com> - 0.67-1 - Personalized SPEC file. -* Mon Aug 22 2003 Matthias Saou/Che +* Fri Aug 22 2003 Matthias Saou/Che - Added "--without milter" build option. (Matthias Saou) - Fixed freshclam cron (Matthias Saou) - Built the new package. (Che) @@ -673,7 +683,7 @@ rm -rf %{buildroot} - various fixes - got rid of rpm-helper prereq -* Fri Mar 24 2003 Che +* Mon Mar 24 2003 Che - some cleanups and fixes - new patch added @@ -686,7 +696,7 @@ rm -rf %{buildroot} * Sat Nov 02 2002 Che - version upgrade -* Wed Oct 24 2002 Che +* Thu Oct 24 2002 Che - some important changes for lsb compliance * Wed Oct 23 2002 Che diff --git a/sources b/sources index c4d296c..b26e5b2 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -8944174b2dca6f38d96a2a2a7146d36e clamav-0.98.1-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -06f660f474d1a6863de4a00eb02521e3 main-55.cvd -52ce049e8df4693766c5c42697890d35 daily-18353.cvd +e9210784829725bf716fda7ca536bbb0 clamav-0.98.3-norar.tar.xz commit 584867bec03059e970dcac11001d6026b6435975 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Jan 15 09:23:52 2014 +0100 Upgrade to 0.98.1 and updated daily.cvd (#1053400) diff --git a/clamav.spec b/clamav.spec index 555b18f..fc1bfc9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,8 +4,8 @@ Summary: Anti-virus software Name: clamav -Version: 0.98 -Release: 2%{?dist} +Version: 0.98.1 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -28,7 +28,7 @@ Source10: clamav-milter.sysconfig # To download the *.cvd, go to http://www.clamav.net and use the links # there (I renamed the files to add the -version suffix for verifying). Source11: http://db.local.clamav.net/main-55.cvd -Source12: http://db.local.clamav.net/daily-17940.cvd +Source12: http://db.local.clamav.net/daily-18353.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -395,6 +395,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jan 15 2014 Robert Scheck <robert(a)fedoraproject.org> - 0.98.1-1 +- Upgrade to 0.98.1 and updated daily.cvd (#1053400) + * Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 - Really fix all discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) diff --git a/sources b/sources index 3dd1c22..c4d296c 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -500ed097cdd1f27ba2ed5fbc605eba37 clamav-0.98-norar.tar.xz +8944174b2dca6f38d96a2a2a7146d36e clamav-0.98.1-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 06f660f474d1a6863de4a00eb02521e3 main-55.cvd -012af1d3ee7156db8bad20650c89a94d daily-17940.cvd +52ce049e8df4693766c5c42697890d35 daily-18353.cvd commit c4cf2b1e61514556e725ec8990e063b89a099008 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Oct 19 14:18:35 2013 +0200 Ensure that a clamd and clamav-milter condrestart via initscript works (#1018312, thanks to Filippo Carletti) diff --git a/clamav-milter.init b/clamav-milter.init index 347fe4b..d9fb037 100644 --- a/clamav-milter.init +++ b/clamav-milter.init @@ -47,7 +47,7 @@ case "$1" in RETVAL=$? ;; condrestart) - [ -e /var/lock/subsys/clamd ] && restart + [ -e /var/lock/subsys/clamav-milter ] && $0 restart RETVAL=$? ;; *) diff --git a/clamav.init b/clamav.init index b2eb0c6..dacb403 100755 --- a/clamav.init +++ b/clamav.init @@ -46,7 +46,7 @@ case "$1" in RETVAL=$? ;; condrestart) - [ -e /var/lock/subsys/clamd ] && restart + [ -e /var/lock/subsys/clamd ] && $0 restart RETVAL=$? ;; *) @@ -55,4 +55,3 @@ case "$1" in esac exit $RETVAL - diff --git a/clamav.spec b/clamav.spec index 1ec0861..555b18f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -398,6 +398,8 @@ rm -rf %{buildroot} * Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 - Really fix all discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) +- Ensure that a clamd and clamav-milter condrestart via initscript + works (#1018312, thanks to Filippo Carletti) * Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 - Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) commit 9fa6d109df873b43c0c93dc7fe48c8588d625899 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sat Oct 19 13:54:54 2013 +0200 Really fix all discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) diff --git a/clamav.init b/clamav.init index c3b28ac..b2eb0c6 100755 --- a/clamav.init +++ b/clamav.init @@ -30,7 +30,7 @@ case "$1" in echo -n "Stopping Clam AntiVirus Daemon: " killproc clamd rm -f /var/run/clamav/clamd.sock - rm -f /var/run/clamav/clamav.pid + rm -f /var/run/clamav/clamd.pid RETVAL=$? echo ### heres the fix... we gotta remove the stale files on restart diff --git a/clamav.spec b/clamav.spec index a33d41f..1ec0861 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.98 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -395,6 +395,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sat Oct 19 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-2 +- Really fix all discrepancies between clamd initscript and clamd + config file (#960923, thanks to John Horne) + * Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 - Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) - Fixed discrepancies between clamd initscript and clamd config commit a1ce11dec47f24429d7485ee95460b8d13faa0a9 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Oct 6 18:41:28 2013 +0200 - Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) - Fixed discrepancies between clamd initscript and clamd config file (#960923, thanks to John Horne) - Added build requirement to ncurses-devel for clamdtop (again) - Moved clamd wrapper script and documentation into correct sub-package (#782596, thanks to Philip Prindeville) diff --git a/.gitignore b/.gitignore index 7301ddf..cdb6045 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,4 @@ /clamd-wrapper.tar.bz2 -/clamav-0.97.5-norar.tar.xz -/main-54.cvd -/daily-15103.cvd -/clamav-0.97.6-norar.tar.xz -/daily-15408.cvd -/clamav-0.97.7-norar.tar.xz -/daily.cvd -/main.cvd -/clamav-0.97.8-norar.tar.xz +/clamav-*-norar.tar.xz +/main*.cvd +/daily*.cvd diff --git a/clamav.init b/clamav.init index 848dbce..c3b28ac 100755 --- a/clamav.init +++ b/clamav.init @@ -7,7 +7,7 @@ # server. # processname: clamd # pidfile: /var/run/clamav/clamd.pid -# config: /etc/clamav.conf +# config: /etc/clamd.conf # Source function library. . /etc/rc.d/init.d/functions @@ -29,7 +29,7 @@ case "$1" in stop) echo -n "Stopping Clam AntiVirus Daemon: " killproc clamd - rm -f /var/clamav/clamd.socket + rm -f /var/run/clamav/clamd.sock rm -f /var/run/clamav/clamav.pid RETVAL=$? echo diff --git a/clamav.spec b/clamav.spec index daf0015..a33d41f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,15 +4,17 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.8 +Version: 0.98 Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ -# Upstream source includes libunrar that is not distributable. -# rm -r libclamunrar -#Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. This +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +# Upstream: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init @@ -23,12 +25,14 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig -Source11: http://db.local.clamav.net/main.cvd -Source12: http://db.local.clamav.net/daily.cvd +# To download the *.cvd, go to http://www.clamav.net and use the links +# there (I renamed the files to add the -version suffix for verifying). +Source11: http://db.local.clamav.net/main-55.cvd +Source12: http://db.local.clamav.net/daily-17940.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz, ncurses-devel %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -123,7 +127,7 @@ you will need to install %{name}-devel. %setup -q -T -c xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) -%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure +%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' configure %{__perl} -pi.orig -e ' s|\@DBDIR\@|\$(localstatedir)/lib/clamav|g; @@ -162,7 +166,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ArchiveMaxCompressionRatio) .+|$1 300|; s|^#(ArchiveBlockEncrypted)|$1|; s|^#(ArchiveBlockMax)|$1|; - ' etc/clamd.conf + ' etc/clamd.conf.sample %{__perl} -pi.orig -e ' s|^(Example)|#$1|; @@ -171,7 +175,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(LogSyslog)|$1|; s|^#(DatabaseOwner) .+$|$1 clam|; s|^(Checks) .+$|$1 24|; - ' etc/freshclam.conf + ' etc/freshclam.conf.sample %{__perl} -pi.orig -e ' s|^(Example)|#$1|; @@ -179,14 +183,14 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|; s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|; s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf + ' etc/clamav-milter.conf.sample %build %configure \ --program-prefix="%{?_program_prefix}" \ %{!?_without_milter:--enable-milter} \ --disable-clamav \ - --disable-static \ + --disable-static \ --disable-zlib-vcheck \ --disable-unrar \ --enable-id-check \ @@ -195,7 +199,7 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) --with-group="clam" \ --with-libcurl \ --with-user="clam" \ - --disable-llvm + --disable-llvm make %{?_smp_mflags} @@ -208,6 +212,9 @@ install -Dp -m0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/cron.daily/freshclam install -Dp -m0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav +mv -f %{buildroot}%{_sysconfdir}/clamd.conf{.sample,} +mv -f %{buildroot}%{_sysconfdir}/freshclam.conf{.sample,} + # now rewrite scripts and config files in-place sed -i \ -e 's!%%{_sbindir}!%{_sbindir}!g' \ @@ -219,6 +226,7 @@ sed -i \ %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +mv -f %{buildroot}%{_sysconfdir}/clamav-milter.conf{.sample,} %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif @@ -235,6 +243,9 @@ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +# Clean up for later usage in documentation +for conf in etc/*.sample; do mv ${conf} ${conf%%.sample}; done + %post /sbin/ldconfig @@ -313,14 +324,12 @@ rm -rf %{buildroot} %files %defattr(-, root, root, 0755) -%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README test/ +%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README %doc docs/*.pdf etc/freshclam.conf %doc %{_mandir}/man1/sigtool.1* %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -337,6 +346,8 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clambc.1* %doc %{_mandir}/man5/clamd.conf.5* %doc %{_mandir}/man8/clamd.8* +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav %{_sysconfdir}/clamd.d @@ -344,6 +355,7 @@ rm -rf %{buildroot} %{_sbindir}/clamd %{_bindir}/clamconf %{_bindir}/clamdscan +%{_bindir}/clamdtop %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ @@ -383,6 +395,14 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Oct 06 2013 Robert Scheck <robert(a)fedoraproject.org> - 0.98-1 +- Upgrade to 0.98 and updated main.cvd and daily.cvd (#1010168) +- Fixed discrepancies between clamd initscript and clamd config + file (#960923, thanks to John Horne) +- Added build requirement to ncurses-devel for clamdtop (again) +- Moved clamd wrapper script and documentation into correct sub- + package (#782596, thanks to Philip Prindeville) + * Tue Apr 23 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.8-1 - Upgrade to 0.97.8 - Updated daily.cvd diff --git a/sources b/sources index ec1a084..3dd1c22 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -8cfa8b280084a97518d3e80575e98938 clamav-0.97.8-norar.tar.xz +500ed097cdd1f27ba2ed5fbc605eba37 clamav-0.98-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -bbe585f65fb04504544ce3d6e07d38e9 daily.cvd -eb12490fda87d602e476d4b163f8a34b main.cvd +06f660f474d1a6863de4a00eb02521e3 main-55.cvd +012af1d3ee7156db8bad20650c89a94d daily-17940.cvd commit faa3f19f0380abcb265cbc388f3b3fff9cdf4742 Author: Orion Poplawski <orion(a)nwra.com> Date: Tue Apr 23 16:09:44 2013 -0600 - Upgrade to 0.97.8 - Updated daily.cvd diff --git a/.gitignore b/.gitignore index 6d3c72d..7301ddf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /clamav-0.97.7-norar.tar.xz /daily.cvd /main.cvd +/clamav-0.97.8-norar.tar.xz diff --git a/clamav.spec b/clamav.spec index d5f7c57..daf0015 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,13 +4,14 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.7 +Version: 0.97.8 Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. +# rm -r libclamunrar #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init @@ -382,6 +383,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Apr 23 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.8-1 +- Upgrade to 0.97.8 +- Updated daily.cvd + * Mon Mar 18 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.7-1 - Upgrade to 0.97.7 diff --git a/sources b/sources index 410fab6..ec1a084 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -e0dba8d8326cd88293224dc4ac398b21 clamav-0.97.7-norar.tar.xz +8cfa8b280084a97518d3e80575e98938 clamav-0.97.8-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -e3044fecc863b90996f023d20822b6c2 daily.cvd +bbe585f65fb04504544ce3d6e07d38e9 daily.cvd eb12490fda87d602e476d4b163f8a34b main.cvd commit a5b7bfd560a1a7d7b77d3c852601a4ede74b304b Author: Orion Poplawski <orion(a)nwra.com> Date: Mon Mar 18 09:19:41 2013 -0600 Upgrade to 0.97.7 diff --git a/.gitignore b/.gitignore index 25dfb7b..6d3c72d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ /daily-15103.cvd /clamav-0.97.6-norar.tar.xz /daily-15408.cvd +/clamav-0.97.7-norar.tar.xz +/daily.cvd +/main.cvd diff --git a/clamav.spec b/clamav.spec index 00e0c98..d5f7c57 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.6 +Version: 0.97.7 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -12,7 +12,7 @@ URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.6-norar.tar.xz +Source0: clamav-%{version}-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -22,9 +22,8 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig -# Temporary workaround for broken 0.97.6 tarball -Source11: http://db.local.clamav.net/main-54.cvd -Source12: http://db.local.clamav.net/daily-15408.cvd +Source11: http://db.local.clamav.net/main.cvd +Source12: http://db.local.clamav.net/daily.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -383,6 +382,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Mar 18 2013 Orion Poplawski <orion(a)cora.nwra.com> - 0.97.7-1 +- Upgrade to 0.97.7 + * Tue Sep 18 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.6-1 - Upgrade to 0.97.6 diff --git a/sources b/sources index aeaf952..410fab6 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz +e0dba8d8326cd88293224dc4ac398b21 clamav-0.97.7-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -eb12490fda87d602e476d4b163f8a34b main-54.cvd -47b966d960e28a28e505fd178c4cb095 daily-15408.cvd +e3044fecc863b90996f023d20822b6c2 daily.cvd +eb12490fda87d602e476d4b163f8a34b main.cvd commit 15b6ada7a385abb0d64f32bee632a77aeb4c5b4f Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Sep 27 19:41:50 2012 +0200 Ship local copy of virus database; it was removed by accident from 0.97.6 tarball diff --git a/.gitignore b/.gitignore index 128c670..25dfb7b 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /main-54.cvd /daily-15103.cvd /clamav-0.97.6-norar.tar.xz +/daily-15408.cvd diff --git a/clamav.spec b/clamav.spec index 927809e..00e0c98 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,9 +22,9 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig -# Temporary workaround for broken 0.97.5 tarball -#Source11: http://db.local.clamav.net/main-54.cvd -#Source12: http://db.local.clamav.net/daily-15103.cvd +# Temporary workaround for broken 0.97.6 tarball +Source11: http://db.local.clamav.net/main-54.cvd +Source12: http://db.local.clamav.net/daily-15408.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -232,8 +232,8 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -#install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd -#install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd +install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd %post /sbin/ldconfig diff --git a/sources b/sources index 65f9425..aeaf952 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +eb12490fda87d602e476d4b163f8a34b main-54.cvd +47b966d960e28a28e505fd178c4cb095 daily-15408.cvd commit ff8b3932d288c49b40a0ec2fb72b58332b614367 Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 22:37:08 2012 -0500 Comment out SOURCE11 SOURCE12 diff --git a/clamav.spec b/clamav.spec index 81ba9f3..927809e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -232,8 +232,8 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd -install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd +#install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd +#install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd %post /sbin/ldconfig commit eee4fecd3edceaa0ff7f16c925006f023afd0a03 Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 22:26:37 2012 -0500 Fix sources file diff --git a/sources b/sources index c31c394..65f9425 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit f3c9a633373d1d3c3a48e4929cb17087f01331c4 Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 18:32:24 2012 -0500 Add clamav-wrapper.tar.bz2 back to sources diff --git a/sources b/sources index 0d5102d..c31c394 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 36e6d2dd7cd2b00e25478821cbb4b0836d9f5eea Author: Nick Bebout <nb(a)laptop.bebout.net> Date: Tue Sep 18 18:18:16 2012 -0500 Update to 0.97.6 diff --git a/.gitignore b/.gitignore index 36d7010..128c670 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /clamav-0.97.5-norar.tar.xz /main-54.cvd /daily-15103.cvd +/clamav-0.97.6-norar.tar.xz diff --git a/clamav.spec b/clamav.spec index 0e4e8f4..81ba9f3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,7 +4,7 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.5 +Version: 0.97.6 Release: 1%{?dist} License: GPLv2 Group: Applications/System @@ -12,7 +12,7 @@ URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.5-norar.tar.xz +Source0: clamav-0.97.6-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -23,8 +23,8 @@ Source9: clamd.logrotate Source10: clamav-milter.sysconfig # Temporary workaround for broken 0.97.5 tarball -Source11: http://db.local.clamav.net/main-54.cvd -Source12: http://db.local.clamav.net/daily-15103.cvd +#Source11: http://db.local.clamav.net/main-54.cvd +#Source12: http://db.local.clamav.net/daily-15103.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -383,6 +383,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Sep 18 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.6-1 +- Upgrade to 0.97.6 + * Wed Jun 20 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.5-1 - Upgrade to 0.97.5 - Fix CVE-2012-1419 clamav: specially-crafted POSIX tar files evade detection diff --git a/sources b/sources index 14401b5..0d5102d 100644 --- a/sources +++ b/sources @@ -1,4 +1 @@ -f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 -eb12490fda87d602e476d4b163f8a34b main-54.cvd -1606d4b9dd4cf9658b22cb8bd135a0e3 daily-15103.cvd +ea488837891f272a05eeed297a52b4c8 clamav-0.97.6-norar.tar.xz commit 6bd5ce5307f4581e68d96b4849f47dad5edb384f Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:55:11 2012 +0200 Correct my broken previous commit :( diff --git a/.gitignore b/.gitignore index 23e3e8f..36d7010 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /clamd-wrapper.tar.bz2 /clamav-0.97.5-norar.tar.xz /main-54.cvd -/daily-15050.cvd +/daily-15103.cvd diff --git a/clamav.spec b/clamav.spec index 2bc1881..0e4e8f4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -24,7 +24,7 @@ Source10: clamav-milter.sysconfig # Temporary workaround for broken 0.97.5 tarball Source11: http://db.local.clamav.net/main-54.cvd -Source12: http://db.local.clamav.net/daily-15050.cvd +Source12: http://db.local.clamav.net/daily-15103.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/sources b/sources index 78cc194..14401b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ +f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 eb12490fda87d602e476d4b163f8a34b main-54.cvd -d41d8cd98f00b204e9800998ecf8427e daily-15050.cvd +1606d4b9dd4cf9658b22cb8bd135a0e3 daily-15103.cvd commit df3eb6be0d66e27aa8e51e09d87d08abd8a98c74 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:47:19 2012 +0200 Ship local copy of virus database; it was removed by accident from 0.97.5 tarball diff --git a/.gitignore b/.gitignore index 916d9f6..23e3e8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -/clamav-0.97.2-norar.tar.xz -/clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 -/clamav-0.97.3-norar.tar.xz /clamav-0.97.5-norar.tar.xz +/main-54.cvd +/daily-15050.cvd diff --git a/clamav.spec b/clamav.spec index ee10cb8..2bc1881 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,6 +22,10 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig +# Temporary workaround for broken 0.97.5 tarball +Source11: http://db.local.clamav.net/main-54.cvd +Source12: http://db.local.clamav.net/daily-15050.cvd + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -228,6 +232,9 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ +install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd +install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd + %post /sbin/ldconfig @@ -383,6 +390,7 @@ rm -rf %{buildroot} - Fix CVE-2012-1443 clamav: specially-crafted RAR files evade detection - Fix CVE-2012-1458 clamav: specially-crafted CHM files evade detection - Fix CVE-2012-1459 clamav: specially-crafted length field in tar files evade detection +- Ship local copy of virus database; it was removed by accident from 0.97.5 tarball * Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 - Split files out into SCM instead of in the spec diff --git a/sources b/sources index ec6a603..78cc194 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +eb12490fda87d602e476d4b163f8a34b main-54.cvd +d41d8cd98f00b204e9800998ecf8427e daily-15050.cvd commit c732ee62430052119672ccaba84b9651bdd673ca Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:25:02 2012 +0200 /var/clamav should be /var/lib/clamav (as it was somewhen in the past) diff --git a/clamav.spec b/clamav.spec index 56f5aa7..ee10cb8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -253,14 +253,14 @@ fi %pre getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 %pre -n clamd getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 @@ -291,7 +291,7 @@ fi %pre db getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 commit 70dabdfb2ee545108398b8dc23ede0523531d862 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 20 22:26:09 2012 -0500 Add clamav-wrapper.tar.bz2 to sources diff --git a/sources b/sources index 94f05dd..ec6a603 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 278449beafd0d102b6d043fd1eba36f79c88e041 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 20 21:56:56 2012 -0500 Upgrade to 0.97.5 diff --git a/.gitignore b/.gitignore index b09a0a5..916d9f6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 /clamav-0.97.3-norar.tar.xz +/clamav-0.97.5-norar.tar.xz diff --git a/sources b/sources index 47b00bc..94f05dd 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz commit 1da35f528b76c172da1be61516633bf4774ba2f4 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 20 21:56:33 2012 -0500 Upgrade to 0.97.5 diff --git a/clamav.spec b/clamav.spec index b5d68b2..56f5aa7 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,15 +4,15 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.3 -Release: 4%{?dist} +Version: 0.97.5 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.3-norar.tar.xz +Source0: clamav-0.97.5-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -376,6 +376,14 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jun 20 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.5-1 +- Upgrade to 0.97.5 +- Fix CVE-2012-1419 clamav: specially-crafted POSIX tar files evade detection +- Fix CVE-2012-1457 clamav: overly long length field in tar files evade detection +- Fix CVE-2012-1443 clamav: specially-crafted RAR files evade detection +- Fix CVE-2012-1458 clamav: specially-crafted CHM files evade detection +- Fix CVE-2012-1459 clamav: specially-crafted length field in tar files evade detection + * Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 - Split files out into SCM instead of in the spec commit b6a2788bdb2d6594a798987b9112ebcfb3ea3406 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Thu Jan 19 19:33:03 2012 -0600 Split out files into SCM instead of in spec diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig new file mode 100644 index 0000000..834b0cd --- /dev/null +++ b/clamav-milter.sysconfig @@ -0,0 +1,4 @@ +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" diff --git a/clamav.spec b/clamav.spec index ba4b951..b5d68b2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -16,6 +16,12 @@ Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 + +Source7: freshclam.cron +Source8: freshclam.logrotate +Source9: clamd.logrotate +Source10: clamav-milter.sysconfig + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -171,53 +177,6 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf - -cat <<EOF >clamd.logrotate -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript -} -EOF - -cat <<EOF >freshclam.logrotate -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} -EOF - -cat <<'EOF' >freshclam.cron -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" -EOF - -%{__cat} <<EOF >clamav-milter.sysconfig -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" -EOF - %build %configure \ --program-prefix="%{?_program_prefix}" \ @@ -241,13 +200,21 @@ rm -rf %{buildroot} make install DESTDIR="%{buildroot}" install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd -install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav +install -Dp -m0755 %{SOURCE7} %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav + +# now rewrite scripts and config files in-place +sed -i \ + -e 's!%%{_sbindir}!%{_sbindir}!g' \ + -e 's!%%{_bindir}!%{_bindir}!g' \ + -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ + %{buildroot}%{_sysconfdir}/cron.daily/freshclam \ + %{buildroot}%{_sysconfdir}/logrotate.d/* %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif @@ -409,6 +376,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 +- Split files out into SCM instead of in the spec + * Sun Jan 1 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-3 - Revert patch from 0.97.3-2 diff --git a/clamd.logrotate b/clamd.logrotate new file mode 100644 index 0000000..b233f3a --- /dev/null +++ b/clamd.logrotate @@ -0,0 +1,8 @@ +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} diff --git a/freshclam.cron b/freshclam.cron new file mode 100644 index 0000000..e40d8ef --- /dev/null +++ b/freshclam.cron @@ -0,0 +1,17 @@ +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate new file mode 100644 index 0000000..272d220 --- /dev/null +++ b/freshclam.logrotate @@ -0,0 +1,5 @@ +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} commit 9650322a3c84c2129ddcb0da4f23373ce6960169 Merge: a638626 2cfebfc Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:44:31 2012 -0600 Merge branch 'el6' of ssh://pkgs.fedoraproject.org/clamav into el6 Conflicts: freshclam.logrotate commit a6386267af7aef72c90d01b8364113b49e293dec Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:40:48 2012 -0600 Bump to 0.97.3-3 diff --git a/clamav.spec b/clamav.spec index bd8c933..ba4b951 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 1%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -409,6 +409,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Jan 1 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-3 +- Revert patch from 0.97.3-2 + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - Update to 0.97.3 - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 commit 1b188a1f3f19a9a627083b1407aa831810ad6c2f Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:39:31 2012 -0600 Revert "Add files from bug 756854" This reverts commit 14d21bc46d3a59c90e91420a310f14102e8d859b. diff --git a/README.clamd-wrapper b/README.clamd-wrapper deleted file mode 100644 index 5cd1b91..0000000 --- a/README.clamd-wrapper +++ /dev/null @@ -1,116 +0,0 @@ -To create individual clamd-instance take the following files and -modify/copy them in the suggested way: - -clamd.conf: - * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with an unique service-name; - e.g. as /etc/clamd.d/<SERVICE>.conf - - To make logfile rotation work properly, the LogFile should be - writable for the assigned User. Recommended way to reach this, is - to: - * make it owned by the User's *group* - * assign at least 0620 (u+rw,g+w) permissions - - A suitable command might be - | # touch <logfile> - | # chgrp <user> <logfile> - | # chmod 0620 <logfile> - - NEVER use 'clamav' as the user since he can modify the database. - This is the user who is running the application; e.g. for mimedefang - (http://www.roaringpenguin.com/mimedefang) the user might be - 'defang'.Theoretically, distinct users could be used, but it must be - made sure that the application-user can write into the socket-file, - and that the clamd-user can access the files asked by the - application to be checked. - - -clamd.logrotate: - * set the correct value for the logfile - * place it into /etc/logrotate.d - -clamd.sysconfig: - * set the name of the config-file and the local socket - * copy it to /etc/sysconfig/clamd.<SERVICE> - -clamd.init: - * set the service-name - * place it into /etc/init.d/ with an unique name and activate it - (e.g. with /sbin/chkconfig clamd.<SERVICE> on) - -Additionally, a symlink must be set to clamd in a way like - | # ln -s clamd /usr/sbin/clamd.<SERVICE> -and the directory for the socket file must be created (see 'LocalSocket' -in clamd.conf) - | # mkdir -p /var/run/clamd.<SERVICE> - - -This directory must be writable by the 'User' chosen in the config-file. - - - -[Disclaimer: - this file and the script/configfiles are not part of the official - clamav package. - - Please send complaints and comments to - mailto:enrico.scholz@informatik.tu-chemnitz.de!] -To create individual clamd-instance take the following files and -modify/copy them in the suggested way: - -clamd.conf: - * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with an unique service-name; - e.g. as /etc/clamd.d/<SERVICE>.conf - - To make logfile rotation work properly, the LogFile should be - writable for the assigned User. Recommended way to reach this, is - to: - * make it owned by the User's *group* - * assign at least 0620 (u+rw,g+w) permissions - - A suitable command might be - | # touch <logfile> - | # chgrp <user> <logfile> - | # chmod 0620 <logfile> - - NEVER use 'clamav' as the user since he can modify the database. - This is the user who is running the application; e.g. for mimedefang - (http://www.roaringpenguin.com/mimedefang) the user might be - 'defang'.Theoretically, distinct users could be used, but it must be - made sure that the application-user can write into the socket-file, - and that the clamd-user can access the files asked by the - application to be checked. - - -clamd.logrotate: - * set the correct value for the logfile - * place it into /etc/logrotate.d - -clamd.sysconfig: - * set the name of the config-file and the local socket - * copy it to /etc/sysconfig/clamd.<SERVICE> - -clamd.init: - * set the service-name - * place it into /etc/init.d/ with an unique name and activate it - (e.g. with /sbin/chkconfig clamd.<SERVICE> on) - -Additionally, a symlink must be set to clamd in a way like - | # ln -s clamd /usr/sbin/clamd.<SERVICE> -and the directory for the socket file must be created (see 'LocalSocket' -in clamd.conf) - | # mkdir -p /var/run/clamd.<SERVICE> - - -This directory must be writable by the 'User' chosen in the config-file. - - - -[Disclaimer: - this file and the script/configfiles are not part of the official - clamav package. - - Please send complaints and comments to - mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig deleted file mode 100644 index bd82488..0000000 --- a/clamav-milter.sysconfig +++ /dev/null @@ -1,8 +0,0 @@ -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" diff --git a/clamav.spec b/clamav.spec index 53db81e..bd8c933 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -15,14 +15,7 @@ URL: http://www.clamav.net/ Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init -Source3: clamd-wrapper -Source4: clamd.init -Source5: README.clamd-wrapper -Source6: clamd.sysconfig -Source7: freshclam.logrotate -Source8: freshclam.cron -Source9: clamd.logrotate -Source10: clamav-milter.sysconfig +Source3: clamd-wrapper.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -178,6 +171,53 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf + +cat <<EOF >clamd.logrotate +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} +EOF + +cat <<EOF >freshclam.logrotate +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} +EOF + +cat <<'EOF' >freshclam.cron +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" +EOF + +%{__cat} <<EOF >clamav-milter.sysconfig +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" +EOF + %build %configure \ --program-prefix="%{?_program_prefix}" \ @@ -200,30 +240,19 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR="%{buildroot}" -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav -install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav - -# now rewrite scripts and config files in-place -sed -i \ - -e 's!%%{_sbindir}!%{_sbindir}!g' \ - -e 's!%%{_bindir}!%{_bindir}!g' \ - -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ - %{buildroot}%{_sysconfdir}/logrotate.d/* \ - %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif - # Install clamav-wrapper: -install -d -m0755 %{buildroot}/%{_prefix}/share/clamav -install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} -install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} +tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log @@ -316,6 +345,8 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -335,12 +366,10 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav %{_sysconfdir}/clamd.d -%config %{_initrddir}/clamav +%config %{_initrddir}/clamd %{_sbindir}/clamd %{_bindir}/clamconf %{_bindir}/clamdscan -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd* %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ @@ -380,10 +409,6 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 -- Add missing clamd-wrapper supporting files -- Remove from init script the unused CLAMD_SOCKET variable - * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - Update to 0.97.3 - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamav.spec.orig b/clamav.spec.orig deleted file mode 100644 index 45aa5db..0000000 --- a/clamav.spec.orig +++ /dev/null @@ -1,1091 +0,0 @@ -#global prerelease rc1 - -## Fedora Extras specific customization below... -%bcond_without fedora -%bcond_without upstart -%bcond_without systemd -%bcond_with sysv -%bcond_without tmpfiles -%bcond_with unrar -%bcond_without noarch -%bcond_without bytecode -## - -%ifnarch s390 s390x -%global have_ocaml 1 -%else -%global have_ocaml 0 -%endif - -%global username clamupdate -%global homedir %_var/lib/clamav -%global freshclamlog %_var/log/freshclam.log -%global milteruser clamilt -%global milterlog %_var/log/clamav-milter.log -%global milterstatedir %_var/run/clamav-milter -%global pkgdatadir %_datadir/%name - -%global scanuser clamscan -%global scanstatedir %_var/run/clamd.scan - -%{?with_noarch:%global noarch BuildArch: noarch} -%{!?_unitdir:%global _unitdir /lib/systemd/system} -%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} -%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ -%nil} -%{!?systemd_reqs:%global systemd_reqs \ -Requires(post): /bin/systemctl\ -Requires(preun): /bin/systemctl\ -Requires(postun): /bin/systemctl\ -%nil} -%{!?systemd_install:%global systemd_install()\ -%post %1\ -test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -%preun %1\ -test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ -test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ -%postun %1\ -/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ -%nil} - - -Summary: End-user tools for the Clam Antivirus scanner -Name: clamav -Version: 0.97.3 -Release: %release_func 1700 -License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} -Group: Applications/File -URL: http://www.clamav.net -%if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -%else -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: %name-%version%{?prerelease}-norar.tar.xz -%endif -Source1: clamd-wrapper -Source2: clamd.sysconfig -Source3: clamd.logrotate -Source5: clamd-README -Source6: clamav-update.logrotate -Source7: clamd.SERVICE.init -Source8: clamav-notify-servers -Patch24: clamav-0.92-private.patch -Patch25: clamav-0.92-open.patch -Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95.3-umask.patch -# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… -Patch29: clamav-0.96.2-jitoff.patch -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: clamav-lib = %version-%release -Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: ncurses-devel -BuildRequires: %_includedir/tcpd.h -%{?with_bytecode:BuildRequires: bc tcl groff graphviz} -%if %{have_ocaml} -%{?with_bytecode:BuildRequires: ocaml} -%endif - -%package filesystem -Summary: Filesystem structure for clamav -Group: Applications/File -Provides: user(%username) = 4 -Provides: group(%username) = 4 -# Prevent version mix -Conflicts: %name < %version-%release -Conflicts: %name > %version-%release -BuildRequires: fedora-usermgmt-devel -%{?noarch} -%{?FE_USERADD_REQ} - -%package lib -Summary: Dynamic libraries for the Clam Antivirus scanner -Group: System Environment/Libraries -Requires: data(clamav) - -%package devel -Summary: Header files and libraries for the Clam Antivirus scanner -Group: Development/Libraries -Source100: clamd-gen -Requires: clamav-lib = %version-%release -Requires: clamav-filesystem = %version-%release - -%package data -Summary: Virus signature data for the Clam Antivirus scanner -Group: Applications/File -Requires(pre): clamav-filesystem = %version-%release -Requires(postun): clamav-filesystem = %version-%release -Provides: data(clamav) = full -Conflicts: data(clamav) < full -Conflicts: data(clamav) > full -%{?noarch} - -%package data-empty -Summary: Empty data package for the Clam Antivirus scanner -Group: Applications/File -Provides: data(clamav) = empty -Conflicts: data(clamav) < empty -Conflicts: data(clamav) > empty -%{?noarch} - -%package update -Summary: Auto-updater for the Clam Antivirus scanner data-files -Group: Applications/File -Source200: freshclam-sleep -Source201: freshclam.sysconfig -Source202: clamav-update.cron -Requires: clamav-filesystem = %version-%release -Requires(pre): /etc/cron.d -Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod -Requires(post): group(%username) - -%package server -Summary: Clam Antivirus scanner server -Group: System Environment/Daemons -Requires: data(clamav) -Requires: clamav-filesystem = %version-%release -Requires: clamav-lib = %version-%release - -%package server-sysvinit -Summary: SysV initscripts for clamav server -Group: System Environment/Daemons -Provides: init(clamav-server) = sysv -Requires: clamav-server = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir -Provides: clamav-server-sysv = %version-%release -Obsoletes: clamav-server-sysv < %version-%release -%{?noarch} - - -%package scanner -Summary: Clamav scanner daemon -Group: System Environment/Daemons -Requires: init(clamav-scanner) -Provides: user(%scanuser) = 49 -Provides: group(%scanuser) = 49 -Requires: clamav-server = %version-%release -%{?noarch} - -# Remove me after EOL of RHEL5 -%package scanner-sysvinit -Summary: SysV initscripts for clamav scanner daemon -Group: System Environment/Daemons -Provides: init(clamav-scanner) = sysv -Requires: clamav-server-sysvinit = %version-%release -Requires: clamav-scanner = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -%{?noarch} - -%package scanner-upstart -Summary: Upstart initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source410: clamd.scan.upstart -Provides: init(clamav-scanner) = upstart -Requires: clamav-scanner = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package scanner-systemd -Summary: Systemd initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source430: clamd.scan.systemd -Provides: init(clamav-scanner) = systemd -Requires: clamav-scanner = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-scanner-sysvinit = %version-%release -Obsoletes: %name-scanner-sysvinit < %version-%release -%endif - - -%package milter -Summary: Milter module for the Clam Antivirus scanner -Group: System Environment/Daemons -Source300: README.fedora -Requires: init(clamav-milter) -BuildRequires: sendmail-devel -BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) = 5 -Provides: group(%milteruser) = 5 -Requires(post): coreutils -%{?FE_USERADD_REQ} - -Provides: milter(clamav) = sendmail -Provides: milter(clamav) = postfix - -Provides: clamav-milter-core = %version-%release -Obsoletes: clamav-milter-core < %version-%release -Provides: clamav-milter-sendmail = %version-%release -Obsoletes: clamav-milter-sendmail < %version-%release - -# Remove me after EOL of RHEL5 -%package milter-sysvinit -Summary: SysV initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source320: clamav-milter.sysv -Provides: init(clamav-milter) = sysvinit -Requires: clamav-milter = %version-%release -Requires(post): user(%milteruser) clamav-milter -Requires(preun): user(%milteruser) clamav-milter -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -Provides: clamav-milter-sysv = %version-%release -Obsoletes: clamav-milter-sysv < %version-%release -%{?noarch} - -%package milter-upstart -Summary: Upstart initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source310: clamav-milter.upstart -Provides: init(clamav-milter) = upstart -Requires: clamav-milter = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package milter-systemd -Summary: Systemd initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source330: clamav-milter.systemd -Provides: init(clamav-milter) = systemd -Requires: clamav-milter = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-milter-sysvinit = %version-%release -Obsoletes: %name-milter-sysvinit < %version-%release -%endif - - -%description -Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this -software is the integration with mail servers (attachment scanning). The -package provides a flexible and scalable multi-threaded daemon, a command -line scanner, and a tool for automatic updating via Internet. The programs -are based on a shared library distributed with the Clam AntiVirus package, -which you can use with your own software. The virus database is based on -the virus database from OpenAntiVirus, but contains additional signatures -(including signatures for popular polymorphic viruses, too) and is KEPT UP -TO DATE. - -%description filesystem -This package provides the filesystem structure and contains the -user-creation scripts required by clamav. - -%description lib -This package contains dynamic libraries shared between applications -using the Clam Antivirus scanner. - -%description devel -This package contains headerfiles and libraries which are needed to -build applications using clamav. - -%description data -This package contains the virus-database needed by clamav. This -database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. This package and the -'clamav-data-empty' package are mutually exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description data-empty -This is an empty package to fulfill inter-package dependencies of the -clamav suite. This package and the 'clamav-data' package are mutually -exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description update -This package contains programs which can be used to update the clamav -anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. - -%description server -ATTENTION: most users do not need this package; the main package has -everything (or depends on it) which is needed to scan for virii on -workstations. - -This package contains files which are needed to execute the clamd-daemon. -This daemon does not provide a system-wide service. Instead of, an instance -of this daemon should be started for each service requiring it. - -See the README file how this can be done with a minimum of effort. - - -%description server-sysvinit -SysV initscripts template for the clamav server - - -%description scanner -This package contains a generic system wide clamd service which is -e.g. used by the clamav-milter package. - -%description scanner-sysvinit -The SysV initscripts for clamav-scanner. - -%description scanner-upstart -The Upstart initscripts for clamav-scanner. - -%description scanner-systemd -The systemd initscripts for clamav-scanner. - - -%description milter -This package contains files which are needed to run the clamav-milter. - -%description milter-sysvinit -The SysV initscripts for clamav-milter. - -%description milter-upstart -The Upstart initscripts for clamav-milter. - -%description milter-systemd -The systemd initscripts for clamav-scanner. - -## ------------------------------------------------------------ - -%prep -%setup -q -n %{name}-%{version}%{?prerelease} - -%apply -n24 -p1 -b .private -%apply -n25 -p1 -b .open -%apply -n26 -p1 -b .cliopts -%apply -n27 -p1 -b .umask -%apply -n29 -p1 -b .jitoff -%{?apply_end} - -install -p -m0644 %SOURCE300 clamav-milter/ - -mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} - -sed -ri \ - -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ - -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ - -e 's!^#?(User ).*!\1<USER>!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ - -e 's! /usr/local/share/clamav,! %homedir,!g' \ - etc/clamd.conf - -sed -ri \ - -e 's!^#?(UpdateLogFile )!#\1!g;' \ - -e 's!^#?(LogSyslog).*!\1 yes!g' \ - -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf - - -## ------------------------------------------------------------ - -%build -CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" -export LDFLAGS='-Wl,--as-needed' -# HACK: remove me... -export FRESHCLAM_LIBS='-lz' -# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine -export have_cv_ipv6=yes -%configure \ - --disable-static \ - --disable-rpath \ - --disable-silent-rules \ - --disable-clamav \ - --with-user=%username \ - --with-group=%username \ - --with-dbdir=/var/lib/clamav \ - --enable-milter \ - --enable-clamdtop \ - %{!?with_bytecode:--disable-llvm} \ - %{!?with_unrar:--disable-unrar} - -# TODO: check periodically that CLAMAVUSER is used for freshclam only - - -# build with --as-needed and disable rpath -sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ - libtool - - -make %{?_smp_mflags} - - -## ------------------------------------------------------------ - -%install -rm -rf "$RPM_BUILD_ROOT" _doc* -make DESTDIR="$RPM_BUILD_ROOT" install - -function smartsubst() { - local tmp - local regexp=$1 - shift - - tmp=$(mktemp /tmp/%name-subst.XXXXXX) - for i; do - sed -e "$regexp" "$i" >$tmp - cmp -s $tmp "$i" || cat $tmp >"$i" - rm -f $tmp - done -} - - -install -d -m 0755 \ - $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ - $RPM_BUILD_ROOT%_var/{log,run} \ - $RPM_BUILD_ROOT%milterstatedir \ - $RPM_BUILD_ROOT%pkgdatadir/template \ - $RPM_BUILD_ROOT%_initrddir \ - $RPM_BUILD_ROOT%homedir \ - $RPM_BUILD_ROOT%scanstatedir - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ - $RPM_BUILD_ROOT%_libdir/*.la - - -touch $RPM_BUILD_ROOT%homedir/daily.cld -touch $RPM_BUILD_ROOT%homedir/main.cld - - -## prepare the server-files -install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig -install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate -install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init -install -D -m 0644 -p %SOURCE5 _doc_server/README -install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf - -install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ -install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template - -smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper - - -## prepare the update-files -install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update -install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers -touch $RPM_BUILD_ROOT%freshclamlog - -install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update - -smartsubst 's!webmaster,clamav!webmaster,%username!g; - s!/usr/share/clamav!%pkgdatadir!g; - s!/usr/bin!%_bindir!g; - s!/usr/sbin!%_sbindir!g;' \ - $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ - $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep - - -### The scanner stuff -sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf - -sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ - > $RPM_BUILD_ROOT%_initrddir/clamd.scan - -install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf -install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf -d %scanstatedir 0710 %scanuser %scanuser -EOF - -touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} - - -### The milter stuff -sed -r \ - -e 's!^#?(User).*!\1 %milteruser!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ - -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ - -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ - -e 's! /tmp/clamav-milter.log! %milterlog!g' \ - etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf - -install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf -install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter -install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf -d %milterstatedir 0710 %milteruser %milteruser -EOF - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf -touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} - -%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} -%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} -%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} -%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} -%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} - -# keep clamd-wrapper in every case because it might be needed by other -# packages -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper - -## ------------------------------------------------------------ - -%check -make check - -## ------------------------------------------------------------ - -%clean -rm -rf "$RPM_BUILD_ROOT" - -## ------------------------------------------------------------ - -%pre filesystem -%__fe_groupadd 4 -r %username &>/dev/null || : -%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ - -c 'Clamav database update user' -g %username %username &>/dev/null || : - -%postun filesystem -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - - -%pre scanner -%__fe_groupadd 49 -r %scanuser &>/dev/null || : -%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ - -g %scanuser %scanuser &>/dev/null || : - -%postun scanner -%__fe_userdel %scanuser &>/dev/null || : -%__fe_groupdel %scanuser &>/dev/null || : - - -%post scanner-sysvinit -/sbin/chkconfig --add clamd.scan - -%preun scanner-sysvinit -test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.scan - -%postun scanner-sysvinit -test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : - - -%post scanner-upstart -/usr/bin/killall -u %scanuser clamd 2>/dev/null || : - -%preun scanner-upstart -test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : - - -%systemd_install scanner-systemd clamd.scan.service - - -%post update -test -e %freshclamlog || { - touch %freshclamlog - %__chmod 0664 %freshclamlog - %__chown root:%username %freshclamlog -} - - -%triggerin milter -- clamav-scanner -# Add the milteruser to the scanuser group; this is required when -# milter and clamd communicate through local sockets -/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : - -%pre milter -%__fe_groupadd 5 -r %milteruser &>/dev/null || : -%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : - -%post milter -test -e %milterlog || { - touch %milterlog - chmod 0620 %milterlog - chown root:%milteruser %milterlog -} - -%postun milter -%__fe_userdel %milteruser &>/dev/null || : -%__fe_groupdel %milteruser &>/dev/null || : - - -%post milter-sysvinit -/sbin/chkconfig --add clamav-milter - -%preun milter-sysvinit -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter - -%postun milter-sysvinit -test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - - -%post milter-upstart -/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : - -%preun milter-upstart -test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : - - -%systemd_install milter-systemd clamav-milter.service - - -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE -%doc docs/*.pdf -%_bindir/* -%_mandir/man[15]/* -%exclude %_bindir/clamav-config -%exclude %_bindir/freshclam -%exclude %_mandir/*/freshclam* - -## ----------------------- - -%files lib -%defattr(-,root,root,-) -%_libdir/*.so.* - -## ----------------------- - -%files devel -%defattr(-,root,root,-) -%_includedir/* -%_libdir/*.so -%pkgdatadir/template -%pkgdatadir/clamd-gen -%_libdir/pkgconfig/* -%_bindir/clamav-config - -## ----------------------- - -%files filesystem -%attr(-,%username,%username) %dir %homedir -%attr(-,root,root) %dir %pkgdatadir - -## ----------------------- - -%files data -%defattr(-,%username,%username,-) -# use %%config to keep files which were updated by 'freshclam' -# already. Without this tag, they would be overridden with older -# versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %homedir/*.cvd - - -%files data-empty -%defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/*.cvd - - -## ----------------------- - -%files update -%defattr(-,root,root,-) -%_bindir/freshclam -%_mandir/*/freshclam* -%pkgdatadir/freshclam-sleep -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* -%config(noreplace) %_sysconfdir/cron.d/* -%config(noreplace) %_sysconfdir/sysconfig/freshclam - -%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/*.cld - - -## ----------------------- - -%files server -%defattr(-,root,root,-) -%doc _doc_server/* -%_mandir/man[58]/clamd* -%_sbindir/* -%pkgdatadir/clamd-wrapper -%dir %_sysconfdir/clamd.d - -%exclude %_sbindir/*milter* -%exclude %_mandir/man8/clamav-milter* - - -%files server-sysvinit -%defattr(-,root,root,-) -%_initrddir/clamd-wrapper - - -## ----------------------- - -%files scanner -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/clamd.d/scan.conf -%ghost %scanstatedir/clamd.sock - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamd.scan.conf - %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%else - %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%endif - -%if 0%{?with_sysv:1} -%files scanner-sysvinit - %attr(0755,root,root) %config %_initrddir/clamd.scan - %ghost %scanstatedir/clamd.pid -%endif - -%if 0%{?with_upstart:1} -%files scanner-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamd.scan* -%endif - -%if 0%{?with_systemd:1} -%files scanner-systemd - %defattr(-,root,root,-) - %_unitdir/clamd.scan.service -%endif - -## ----------------------- - -%files milter -%defattr(-,root,root,-) -%doc clamav-milter/README.fedora -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %_sysconfdir/mail/clamav-milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%ghost %milterstatedir/clamav-milter.socket - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamav-milter.conf - %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%else - %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%endif - -%if 0%{?with_sysv:1} -%files milter-sysvinit - %defattr(-,root,root,-) - %config %_initrddir/clamav-milter - %ghost %milterstatedir/clamav-milter.pid -%endif - -%if 0%{?with_upstart:1} -%files milter-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamav-milter* -%endif - -%if 0%{?with_systemd:1} -%files milter-systemd - %defattr(-,root,root,-) - %_unitdir/clamav-milter.service -%endif - - -%changelog -* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 -- updated to 0.97.3 -- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 - -* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 -- updated to 0.97.2 -- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) -- fixed systemd scripts and their installation - -* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 -- updated to 0.97.1 -- fixed Requires(preun) vs. Requires(postun) inconsistency - -* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 -- fixed tmpfiles.d syntax (#696812) - -* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 -- updated to 0.97 -- rediffed some patches - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 -- fixed signal specifier in clamd-wrapper (#668131, James Ralston) - -* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 -- added systemd init scripts which obsolete to old sysvinit ones -- added tmpfiles.d/ descriptions - -* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 -- updated to 0.96.5 -- CVE-2010-4260 Multiple errors within the processing of PDF files can - be exploited to e.g. cause a crash. -- CVE-2010-4261 An off-by-one error within the "icon_cb()" function - can be exploited to cause a memory corruption. - -* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 -- updated to 0.96.4 -- execute 'make check' (#640347) but ignore errors for now because - four checks are failing on f13 - -* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 -- lowered stop priority of sysv initscripts (#629435) - -* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 -- updated to 0.96.3 -- fixes CVE-2010-0405 in shipped bzlib.c copy - -* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 -- updated to 0.96.2 -- rediffed patches -- removed the -jit-disable patch which is replaced upstream by a more - detailed configuration option. - -* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed old %%trigger which renamed the 'clamav' user- and groupnames - to 'clamupdate' -- use 'groupmems', not 'usermod' to add a user to a group because - 'usermod' does not work when user does not exist in local /etc/passwd - -* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 -- ocaml not available (at least) on s390(x) - -* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 -- updated to 0.96.1 -- rediffed patches - -* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 -- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) - -* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 -- updated to final 0.96 -- applied upstream patch which allows to disable JIT compiler (#573191) -- build JIT compiler again -- disabled JIT compiler by default -- removed explicit 'pkgconfig' requirements in -devel (#533956) - -* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 -- do not build the bytecode JIT compiler for now until it can be disabled - at runtime (#573191) - -* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 -- updated to 0.96rc1 -- added some BRs - -* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 -- updated -upstart to upstart 0.6.3 - -* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- adjusted chkconfig positions for clamav-milter (#530101) -- use %%apply instead of %%patch - -* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 -- updated to 0.95.3 - -* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- conditionalized build of noarch subpackages to ease packaging under RHEL5 - -* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 -- modified freshclam configuration to log by syslog by default -- disabled LocalSocket option in sample configuration -- fixed clamav-milter sysv initscript to use bash interpreter and to - be disabled by default - -* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 -- renamed 'clamav' user/group to 'clamupdate' -- add the '%milteruser' user to the '%scanuser' group when the -scanner - subpackage is installed - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 -- updated to 0.95.2 - -* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 -- fixed '--without upstart' operation - -* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 -- added '%%bcond_without upstart' conditional to ease skipping of - -upstart subpackage creation e.g. on EL5 systems -- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which - broke update path - -* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 -- Upgrade to 0.95.1 (#495039) - -* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 -- updated to final 0.95 -- added ncurses-devel (-> clamdtop) BR -- enforced IPv6 support - -* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 -- updated to 0.95rc1 -- added -upstart subpackages -- renamed -sysv to -sysvinit to make -upstart win the default dep resolving -- reworked complete milter stuff -- added -scanner subpackage which contains a preconfigured daemon - (e.g. for use by -milter) -- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old - -* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 -- made some subpackages noarch -- fixed typo in SysV initscript which removes 'touch' file (#473513) - -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 -- Upgrade to 0.94.2 (#474002) - -* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 -- Upgrade to 0.94.1 - -* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 -- Upgrade to 0.94 (SECURITY), fixes #461461: -- CVE-2008-1389 Invalid memory access in the CHM unpacker -- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg -- CVE-2008-3913 Memory leak in code path in freshclam's manager.c -- CVE-2008-3914 Multiple file descriptor leaks on the code paths - -* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 -- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read - on petite files) -- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) -- rediffed patches - -* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 -- updated to 0.93.1 -- rediffed -path patch -- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability - -* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 -- updated to final 0.93 -- removed daily.inc + main.inc directories; they are now replaced by - *.cld containers -- trimmed down MAILTO list of cronjob to 'root' again; every well - configured system has an alias for this recipient - -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 -- moved -milter scriptlets into -milter-core subpackage -- added a requirement on the milteruser to the -milter-sendmail - subpackage (reported by Bruce Jerrick) - -* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 -- updated to 0.93rc1 -- fixed rpath issues - -* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 -- updated to 0.92.1 - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 -- redisabled unrar stuff completely by using clean sources -- splitted -milter subpackage into pieces to allow use without sendmail - (#239037) - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 -- use a better way to disable RPATH-generation (needed for '--with - unrar' builds) - -* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 -- added a README.fedora to the milter package (#240610) -- ship original sources again; unrar is now licensed correctly (no more - stolen code put under GPL). Nevertheless, this license is not GPL - compatible, and to allow libclamav to be used by GPL applications, - unrar is disabled by a ./configure switch. -- use pkg-config in clamav-config to emulate --cflags and --libs - operations (fixes partly multilib issues) -- registered some more auto-updated files and marked them as %%ghost - -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 -- updated to 0.92 (SECURITY): -- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability - -* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of - legal problems (resolves 334371) -- correct license tag - -* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 -- Bump release for upgrade path. - -* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 -- updated to 0.91.2 (SECURITY): -- CVE-2007-4510 DOS in RTF parser -- DOS in html normalizer -- arbitrary command execution by special crafted recipients in - clamav-milter's black-hole mode -- fixed an open(2) issue - -* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 -- updated to 0.91.1 - -* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 -- updated to 0.91 - -* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 -- updated to 0.90.3 -- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both - in FC6- and F7+ - -* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 -- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 -- updated to 0.90.1 -- updated %%doc list - -* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 -- updated to final 0.90 -- removed -visibility patch since fixed upstream - -* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 -- build with -Wl,-as-needed and cleaned up pkgconfig file -- removed old hack which forced installation of freshclam.conf; related - check was removed upstream -- removed static library -- removed %%changelog entries from before 2004 - -* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 -- updated to 0.90rc3 -- splitted mandatory parts from the data-file into a separate -filesystem - subpackage -- added a -data-empty subpackage to allow a setup where database is - updated per cron-job and user does not want to download the large - -data package with outdated virus definitations (#214949) -- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej deleted file mode 100644 index 1096912..0000000 --- a/clamav.spec.rej +++ /dev/null @@ -1,152 +0,0 @@ ---- clamav.spec -+++ clamav.spec -@@ -5,7 +5,7 @@ - Summary: Anti-virus software - Name: clamav - Version: 0.97.3 --Release: 1%{?dist} -+Release: 2%{?dist} - License: GPLv2 - Group: Applications/System - URL: http://www.clamav.net/ -@@ -15,7 +15,14 @@ - Source0: clamav-0.97.3-norar.tar.xz - Source1: clamav.init - Source2: clamav-milter.init --Source3: clamd-wrapper.tar.bz2 -+Source3: clamd-wrapper -+Source4: clamd.init -+Source5: README.clamd-wrapper -+Source6: clamd.sysconfig -+Source7: freshclam.logrotate -+Source8: freshclam.cron -+Source9: clamd.logrotate -+Source10: clamav-milter.sysconfig - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - - BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz -@@ -171,53 +178,6 @@ - s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf - -- --cat <<EOF >clamd.logrotate --%{_localstatedir}/log/clamav/clamd.log { -- missingok -- notifempty -- create 644 clam clam -- postrotate -- killall -HUP clamd 2>/dev/null || : -- endscript --} --EOF -- --cat <<EOF >freshclam.logrotate --%{_localstatedir}/log/clamav/freshclam.log { -- missingok -- notifempty -- create 644 clam clam --} --EOF -- --cat <<'EOF' >freshclam.cron --#!/bin/sh -- --### A simple update script for the clamav virus database. --### This could as well be replaced by a SysV script. -- --### fix log file if needed --LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" --if [ ! -f "$LOG_FILE" ]; then -- touch "$LOG_FILE" -- chmod 644 "$LOG_FILE" -- chown clam.clam "$LOG_FILE" --fi -- --%{_bindir}/freshclam \ -- --quiet \ -- --datadir="%{_localstatedir}/lib/clamav" \ -- --log="$LOG_FILE" --EOF -- --%{__cat} <<EOF >clamav-milter.sysconfig --### Simple config file for clamav-milter, you should --### read the documentation and tweak it as you wish. -- --CLAMAV_FLAGS="" --EOF -- - %build - %configure \ - --program-prefix="%{?_program_prefix}" \ -@@ -240,19 +200,30 @@ - rm -rf %{buildroot} - make install DESTDIR="%{buildroot}" - --install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd --install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam --install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam --install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav -+install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -+install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -+install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+ -+# now rewrite scripts and config files in-place -+sed -i \ -+ -e 's!%%{_sbindir}!%{_sbindir}!g' \ -+ -e 's!%%{_bindir}!%{_bindir}!g' \ -+ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ -+ %{buildroot}%{_sysconfdir}/logrotate.d/* \ -+ %{buildroot}%{_sysconfdir}/cron.daily/freshclam - - %if %{!?_without_milter:1}0 - install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter --install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter -+install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter - %else - rm %{buildroot}%{_mandir}/man8/clamav-milter.8* - %endif -+ - # Install clamav-wrapper: --tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share -+install -d -m0755 %{buildroot}/%{_prefix}/share/clamav -+install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} -+install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} - - install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ - touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log -@@ -345,8 +316,6 @@ - %doc %{_mandir}/man1/clamscan.1* - %doc %{_mandir}/man1/freshclam.1* - %doc %{_mandir}/man5/freshclam.conf.5* --%doc %{_prefix}/share/clamav/README.clamd-wrapper --%{_prefix}/share/clamav/clamd-wrapper - %config(noreplace) %{_sysconfdir}/freshclam.conf - %{_bindir}/clamscan - %{_bindir}/freshclam -@@ -366,10 +335,12 @@ - %config(noreplace) %{_sysconfdir}/clamd.conf - %config(noreplace) %{_sysconfdir}/logrotate.d/clamav - %{_sysconfdir}/clamd.d --%config %{_initrddir}/clamd -+%config %{_initrddir}/clamav - %{_sbindir}/clamd - %{_bindir}/clamconf - %{_bindir}/clamdscan -+%doc %{_prefix}/share/clamav/README.clamd-wrapper -+%{_prefix}/share/clamav/clamd* - - %defattr(0644, clam, clam, 0755) - %{_localstatedir}/run/clamav/ -@@ -409,6 +380,10 @@ - %exclude %{_libdir}/libclamav.la - - %changelog -+* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 -+- Add missing clamd-wrapper supporting files -+- Remove from init script the unused CLAMD_SOCKET variable -+ - * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - - Update to 0.97.3 - - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamd-wrapper b/clamd-wrapper deleted file mode 100644 index 000dcb8..0000000 --- a/clamd-wrapper +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 75 25 -# description: The clamd daemon listens for incoming connections on \ -# Unix or TCP socket and scans files or directories on demand. - -[ -n "$CLAMD_SERVICE" ] || { - echo $"*** $0 can not be called in this way" - echo $"*** Please see /usr/share/doc/clamav-server-*/README how" - echo $"*** the clamav-server can be configured" - exit 6 -} - -# Source function library. -. /etc/init.d/functions - -# Get config. -[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network - -# Check that networking is up. -[ "$NETWORKING" != "no" ] || exit 6 - -lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} -sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} -procname=clamd.${CLAMD_SERVICE} - -CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -CLAMD_OPTIONS= -[ -f "$sysconffile" ] && . "$sysconffile" -CLAMD_PIDFILE=`grep ^PidFile ${CLAMD_CONFIGFILE} | awk '{print $2}'` - -# make sure that config file contains a PidFile setting -[ -n "$CLAMD_PIDFILE" ] || exit 6 - -RETVAL=0 -prog="clamd.${CLAMD_SERVICE}" - -start () { - echo -n $"Starting $prog: " - daemon --pidfile=${CLAMD_PIDFILE} \ - exec -a $procname /usr/sbin/clamd \ - ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop () { - echo -n $"Stopping $prog: " - killproc -p ${CLAMD_PIDFILE} $procname - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -reload() { - rc=0 - echo -n $"Reloading $prog: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? - echo - echo -n $"Loading new virus-database: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? - echo - return $rc -} - -restart () { - stop - start -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 ;; - status) - status -p ${CLAMD_PIDFILE} $procname ;; - condrestart) - [ ! -f $lockfile ] || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 2 -esac diff --git a/clamd.init b/clamd.init deleted file mode 100644 index cf25b46..0000000 --- a/clamd.init +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 75 35 -# -# description: The clamd server running for <SERVICE> -# - -CLAMD_SERVICE=<SERVICE> -. /usr/share/clamav/clamd-wrapper -#!/bin/bash -# -# chkconfig: - 75 35 -# -# description: The clamd server running for <SERVICE> -# - -CLAMD_SERVICE=<SERVICE> -. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate deleted file mode 100644 index b233f3a..0000000 --- a/clamd.logrotate +++ /dev/null @@ -1,8 +0,0 @@ -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript -} diff --git a/clamd.sysconfig b/clamd.sysconfig deleted file mode 100644 index e0e7714..0000000 --- a/clamd.sysconfig +++ /dev/null @@ -1,5 +0,0 @@ -#CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -#CLAMD_OPTIONS= -## the values below should only ever be specified in the above .conf file! -#CLAMD_SOCKET=/var/run/clamd.${CLAMD_SERVICE}/clamd.sock -#CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid diff --git a/freshclam.cron b/freshclam.cron deleted file mode 100644 index 558a2f2..0000000 --- a/freshclam.cron +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate deleted file mode 100644 index 5a5615a..0000000 --- a/freshclam.logrotate +++ /dev/null @@ -1,10 +0,0 @@ -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} diff --git a/sources b/sources index 05755a5..47b00bc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 656658e8d6f02942b3ae77ddfaa4bcfa15c91f8d Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Jan 1 16:39:21 2012 -0600 Revert "Oops, i shouldn't have commited these" This reverts commit f5659018a4a4aea8cdf89db6e1c2a05789da7529. diff --git a/clamav.spec.orig b/clamav.spec.orig new file mode 100644 index 0000000..45aa5db --- /dev/null +++ b/clamav.spec.orig @@ -0,0 +1,1091 @@ +#global prerelease rc1 + +## Fedora Extras specific customization below... +%bcond_without fedora +%bcond_without upstart +%bcond_without systemd +%bcond_with sysv +%bcond_without tmpfiles +%bcond_with unrar +%bcond_without noarch +%bcond_without bytecode +## + +%ifnarch s390 s390x +%global have_ocaml 1 +%else +%global have_ocaml 0 +%endif + +%global username clamupdate +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log +%global milterstatedir %_var/run/clamav-milter +%global pkgdatadir %_datadir/%name + +%global scanuser clamscan +%global scanstatedir %_var/run/clamd.scan + +%{?with_noarch:%global noarch BuildArch: noarch} +%{!?_unitdir:%global _unitdir /lib/systemd/system} +%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} +%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ +%nil} +%{!?systemd_reqs:%global systemd_reqs \ +Requires(post): /bin/systemctl\ +Requires(preun): /bin/systemctl\ +Requires(postun): /bin/systemctl\ +%nil} +%{!?systemd_install:%global systemd_install()\ +%post %1\ +test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +%preun %1\ +test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ +test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ +%postun %1\ +/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ +%nil} + + +Summary: End-user tools for the Clam Antivirus scanner +Name: clamav +Version: 0.97.3 +Release: %release_func 1700 +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} +Group: Applications/File +URL: http://www.clamav.net +%if 0%{?with_unrar:1} +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +%else +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +Source0: %name-%version%{?prerelease}-norar.tar.xz +%endif +Source1: clamd-wrapper +Source2: clamd.sysconfig +Source3: clamd.logrotate +Source5: clamd-README +Source6: clamav-update.logrotate +Source7: clamd.SERVICE.init +Source8: clamav-notify-servers +Patch24: clamav-0.92-private.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95.3-umask.patch +# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… +Patch29: clamav-0.96.2-jitoff.patch +BuildRoot: %_tmppath/%name-%version-%release-root +Requires: clamav-lib = %version-%release +Requires: data(clamav) +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel +BuildRequires: %_includedir/tcpd.h +%{?with_bytecode:BuildRequires: bc tcl groff graphviz} +%if %{have_ocaml} +%{?with_bytecode:BuildRequires: ocaml} +%endif + +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(%username) = 4 +Provides: group(%username) = 4 +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?noarch} +%{?FE_USERADD_REQ} + +%package lib +Summary: Dynamic libraries for the Clam Antivirus scanner +Group: System Environment/Libraries +Requires: data(clamav) + +%package devel +Summary: Header files and libraries for the Clam Antivirus scanner +Group: Development/Libraries +Source100: clamd-gen +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release + +%package data +Summary: Virus signature data for the Clam Antivirus scanner +Group: Applications/File +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full +%{?noarch} + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty +%{?noarch} + +%package update +Summary: Auto-updater for the Clam Antivirus scanner data-files +Group: Applications/File +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.cron +Requires: clamav-filesystem = %version-%release +Requires(pre): /etc/cron.d +Requires(postun): /etc/cron.d +Requires(post): %__chown %__chmod +Requires(post): group(%username) + +%package server +Summary: Clam Antivirus scanner server +Group: System Environment/Daemons +Requires: data(clamav) +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release + +%package server-sysvinit +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} + + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 +Requires: clamav-server = %version-%release +%{?noarch} + +# Remove me after EOL of RHEL5 +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +%{?noarch} + +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source410: clamd.scan.upstart +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package scanner-systemd +Summary: Systemd initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source430: clamd.scan.systemd +Provides: init(clamav-scanner) = systemd +Requires: clamav-scanner = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-scanner-sysvinit = %version-%release +Obsoletes: %name-scanner-sysvinit < %version-%release +%endif + + +%package milter +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Source300: README.fedora +Requires: init(clamav-milter) +BuildRequires: sendmail-devel +BuildRequires: fedora-usermgmt-devel +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 +Requires(post): coreutils +%{?FE_USERADD_REQ} + +Provides: milter(clamav) = sendmail +Provides: milter(clamav) = postfix + +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release + +# Remove me after EOL of RHEL5 +%package milter-sysvinit +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source320: clamav-milter.sysv +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} + +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source310: clamav-milter.upstart +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package milter-systemd +Summary: Systemd initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source330: clamav-milter.systemd +Provides: init(clamav-milter) = systemd +Requires: clamav-milter = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-milter-sysvinit = %version-%release +Obsoletes: %name-milter-sysvinit < %version-%release +%endif + + +%description +Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this +software is the integration with mail servers (attachment scanning). The +package provides a flexible and scalable multi-threaded daemon, a command +line scanner, and a tool for automatic updating via Internet. The programs +are based on a shared library distributed with the Clam AntiVirus package, +which you can use with your own software. The virus database is based on +the virus database from OpenAntiVirus, but contains additional signatures +(including signatures for popular polymorphic viruses, too) and is KEPT UP +TO DATE. + +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. + +%description lib +This package contains dynamic libraries shared between applications +using the Clam Antivirus scanner. + +%description devel +This package contains headerfiles and libraries which are needed to +build applications using clamav. + +%description data +This package contains the virus-database needed by clamav. This +database should be updated regularly; the 'clamav-update' package +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description update +This package contains programs which can be used to update the clamav +anti-virus database automatically. It uses the freshclam(1) utility for +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. + +%description server +ATTENTION: most users do not need this package; the main package has +everything (or depends on it) which is needed to scan for virii on +workstations. + +This package contains files which are needed to execute the clamd-daemon. +This daemon does not provide a system-wide service. Instead of, an instance +of this daemon should be started for each service requiring it. + +See the README file how this can be done with a minimum of effort. + + +%description server-sysvinit +SysV initscripts template for the clamav server + + +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + +%description scanner-systemd +The systemd initscripts for clamav-scanner. + + +%description milter +This package contains files which are needed to run the clamav-milter. + +%description milter-sysvinit +The SysV initscripts for clamav-milter. + +%description milter-upstart +The Upstart initscripts for clamav-milter. + +%description milter-systemd +The systemd initscripts for clamav-scanner. + +## ------------------------------------------------------------ + +%prep +%setup -q -n %{name}-%{version}%{?prerelease} + +%apply -n24 -p1 -b .private +%apply -n25 -p1 -b .open +%apply -n26 -p1 -b .cliopts +%apply -n27 -p1 -b .umask +%apply -n29 -p1 -b .jitoff +%{?apply_end} + +install -p -m0644 %SOURCE300 clamav-milter/ + +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} + +sed -ri \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf + +sed -ri \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf + + +## ------------------------------------------------------------ + +%build +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me... +export FRESHCLAM_LIBS='-lz' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes +%configure \ + --disable-static \ + --disable-rpath \ + --disable-silent-rules \ + --disable-clamav \ + --with-user=%username \ + --with-group=%username \ + --with-dbdir=/var/lib/clamav \ + --enable-milter \ + --enable-clamdtop \ + %{!?with_bytecode:--disable-llvm} \ + %{!?with_unrar:--disable-unrar} + +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool + + +make %{?_smp_mflags} + + +## ------------------------------------------------------------ + +%install +rm -rf "$RPM_BUILD_ROOT" _doc* +make DESTDIR="$RPM_BUILD_ROOT" install + +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + +install -d -m 0755 \ + $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ + $RPM_BUILD_ROOT%_var/{log,run} \ + $RPM_BUILD_ROOT%milterstatedir \ + $RPM_BUILD_ROOT%pkgdatadir/template \ + $RPM_BUILD_ROOT%_initrddir \ + $RPM_BUILD_ROOT%homedir \ + $RPM_BUILD_ROOT%scanstatedir + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ + $RPM_BUILD_ROOT%_libdir/*.la + + +touch $RPM_BUILD_ROOT%homedir/daily.cld +touch $RPM_BUILD_ROOT%homedir/main.cld + + +## prepare the server-files +install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate +install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init +install -D -m 0644 -p %SOURCE5 _doc_server/README +install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf + +install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ +install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template + +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper + + +## prepare the update-files +install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update +install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers +touch $RPM_BUILD_ROOT%freshclamlog + +install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update + +smartsubst 's!webmaster,clamav!webmaster,%username!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep + + +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf + +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan + +install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf +install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf +d %scanstatedir 0710 %scanuser %scanuser +EOF + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} + + +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf + +install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf +install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf +d %milterstatedir 0710 %milteruser %milteruser +EOF + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} + +%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} +%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} +%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} +%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} +%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} + +# keep clamd-wrapper in every case because it might be needed by other +# packages +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper + +## ------------------------------------------------------------ + +%check +make check + +## ------------------------------------------------------------ + +%clean +rm -rf "$RPM_BUILD_ROOT" + +## ------------------------------------------------------------ + +%pre filesystem +%__fe_groupadd 4 -r %username &>/dev/null || : +%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ + -c 'Clamav database update user' -g %username %username &>/dev/null || : + +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + +%pre scanner +%__fe_groupadd 49 -r %scanuser &>/dev/null || : +%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ + -g %scanuser %scanuser &>/dev/null || : + +%postun scanner +%__fe_userdel %scanuser &>/dev/null || : +%__fe_groupdel %scanuser &>/dev/null || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + +%systemd_install scanner-systemd clamd.scan.service + + +%post update +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%username %freshclamlog +} + + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : + +%pre milter +%__fe_groupadd 5 -r %milteruser &>/dev/null || : +%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ + -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : + +%post milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} + +%postun milter +%__fe_userdel %milteruser &>/dev/null || : +%__fe_groupdel %milteruser &>/dev/null || : + + +%post milter-sysvinit +/sbin/chkconfig --add clamav-milter + +%preun milter-sysvinit +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter + +%postun milter-sysvinit +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : + + +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : + +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : + + +%systemd_install milter-systemd clamav-milter.service + + +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE +%doc docs/*.pdf +%_bindir/* +%_mandir/man[15]/* +%exclude %_bindir/clamav-config +%exclude %_bindir/freshclam +%exclude %_mandir/*/freshclam* + +## ----------------------- + +%files lib +%defattr(-,root,root,-) +%_libdir/*.so.* + +## ----------------------- + +%files devel +%defattr(-,root,root,-) +%_includedir/* +%_libdir/*.so +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config + +## ----------------------- + +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + +%files data +%defattr(-,%username,%username,-) +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. +%config %verify(not size md5 mtime) %homedir/*.cvd + + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/*.cvd + + +## ----------------------- + +%files update +%defattr(-,root,root,-) +%_bindir/freshclam +%_mandir/*/freshclam* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/* +%config(noreplace) %_sysconfdir/sysconfig/freshclam + +%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/*.cld + + +## ----------------------- + +%files server +%defattr(-,root,root,-) +%doc _doc_server/* +%_mandir/man[58]/clamd* +%_sbindir/* +%pkgdatadir/clamd-wrapper +%dir %_sysconfdir/clamd.d + +%exclude %_sbindir/*milter* +%exclude %_mandir/man8/clamav-milter* + + +%files server-sysvinit +%defattr(-,root,root,-) +%_initrddir/clamd-wrapper + + +## ----------------------- + +%files scanner +%defattr(-,root,root,-) +%config(noreplace) %_sysconfdir/clamd.d/scan.conf +%ghost %scanstatedir/clamd.sock + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamd.scan.conf + %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%else + %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%endif + +%if 0%{?with_sysv:1} +%files scanner-sysvinit + %attr(0755,root,root) %config %_initrddir/clamd.scan + %ghost %scanstatedir/clamd.pid +%endif + +%if 0%{?with_upstart:1} +%files scanner-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamd.scan* +%endif + +%if 0%{?with_systemd:1} +%files scanner-systemd + %defattr(-,root,root,-) + %_unitdir/clamd.scan.service +%endif + +## ----------------------- + +%files milter +%defattr(-,root,root,-) +%doc clamav-milter/README.fedora +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%ghost %milterstatedir/clamav-milter.socket + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamav-milter.conf + %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%else + %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%endif + +%if 0%{?with_sysv:1} +%files milter-sysvinit + %defattr(-,root,root,-) + %config %_initrddir/clamav-milter + %ghost %milterstatedir/clamav-milter.pid +%endif + +%if 0%{?with_upstart:1} +%files milter-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamav-milter* +%endif + +%if 0%{?with_systemd:1} +%files milter-systemd + %defattr(-,root,root,-) + %_unitdir/clamav-milter.service +%endif + + +%changelog +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 +- updated to 0.97.3 +- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 + +* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 +- updated to 0.97.2 +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) +- fixed systemd scripts and their installation + +* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 +- updated to 0.97.1 +- fixed Requires(preun) vs. Requires(postun) inconsistency + +* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 +- fixed tmpfiles.d syntax (#696812) + +* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 +- updated to 0.97 +- rediffed some patches + +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 +- fixed signal specifier in clamd-wrapper (#668131, James Ralston) + +* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 +- added systemd init scripts which obsolete to old sysvinit ones +- added tmpfiles.d/ descriptions + +* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 +- updated to 0.96.5 +- CVE-2010-4260 Multiple errors within the processing of PDF files can + be exploited to e.g. cause a crash. +- CVE-2010-4261 An off-by-one error within the "icon_cb()" function + can be exploited to cause a memory corruption. + +* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 +- updated to 0.96.4 +- execute 'make check' (#640347) but ignore errors for now because + four checks are failing on f13 + +* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 +- lowered stop priority of sysv initscripts (#629435) + +* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 +- updated to 0.96.3 +- fixes CVE-2010-0405 in shipped bzlib.c copy + +* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 +- updated to 0.96.2 +- rediffed patches +- removed the -jit-disable patch which is replaced upstream by a more + detailed configuration option. + +* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed old %%trigger which renamed the 'clamav' user- and groupnames + to 'clamupdate' +- use 'groupmems', not 'usermod' to add a user to a group because + 'usermod' does not work when user does not exist in local /etc/passwd + +* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 +- ocaml not available (at least) on s390(x) + +* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 +- updated to 0.96.1 +- rediffed patches + +* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 +- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) + +* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 +- updated to final 0.96 +- applied upstream patch which allows to disable JIT compiler (#573191) +- build JIT compiler again +- disabled JIT compiler by default +- removed explicit 'pkgconfig' requirements in -devel (#533956) + +* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 +- do not build the bytecode JIT compiler for now until it can be disabled + at runtime (#573191) + +* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 +- updated to 0.96rc1 +- added some BRs + +* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 +- updated -upstart to upstart 0.6.3 + +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) +- use %%apply instead of %%patch + +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 +- updated to 0.95.3 + +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches + +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej new file mode 100644 index 0000000..1096912 --- /dev/null +++ b/clamav.spec.rej @@ -0,0 +1,152 @@ +--- clamav.spec ++++ clamav.spec +@@ -5,7 +5,7 @@ + Summary: Anti-virus software + Name: clamav + Version: 0.97.3 +-Release: 1%{?dist} ++Release: 2%{?dist} + License: GPLv2 + Group: Applications/System + URL: http://www.clamav.net/ +@@ -15,7 +15,14 @@ + Source0: clamav-0.97.3-norar.tar.xz + Source1: clamav.init + Source2: clamav-milter.init +-Source3: clamd-wrapper.tar.bz2 ++Source3: clamd-wrapper ++Source4: clamd.init ++Source5: README.clamd-wrapper ++Source6: clamd.sysconfig ++Source7: freshclam.logrotate ++Source8: freshclam.cron ++Source9: clamd.logrotate ++Source10: clamav-milter.sysconfig + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz +@@ -171,53 +178,6 @@ + s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; + ' etc/clamav-milter.conf + +- +-cat <<EOF >clamd.logrotate +-%{_localstatedir}/log/clamav/clamd.log { +- missingok +- notifempty +- create 644 clam clam +- postrotate +- killall -HUP clamd 2>/dev/null || : +- endscript +-} +-EOF +- +-cat <<EOF >freshclam.logrotate +-%{_localstatedir}/log/clamav/freshclam.log { +- missingok +- notifempty +- create 644 clam clam +-} +-EOF +- +-cat <<'EOF' >freshclam.cron +-#!/bin/sh +- +-### A simple update script for the clamav virus database. +-### This could as well be replaced by a SysV script. +- +-### fix log file if needed +-LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +-if [ ! -f "$LOG_FILE" ]; then +- touch "$LOG_FILE" +- chmod 644 "$LOG_FILE" +- chown clam.clam "$LOG_FILE" +-fi +- +-%{_bindir}/freshclam \ +- --quiet \ +- --datadir="%{_localstatedir}/lib/clamav" \ +- --log="$LOG_FILE" +-EOF +- +-%{__cat} <<EOF >clamav-milter.sysconfig +-### Simple config file for clamav-milter, you should +-### read the documentation and tweak it as you wish. +- +-CLAMAV_FLAGS="" +-EOF +- + %build + %configure \ + --program-prefix="%{?_program_prefix}" \ +@@ -240,19 +200,30 @@ + rm -rf %{buildroot} + make install DESTDIR="%{buildroot}" + +-install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +-install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +-install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +-install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav ++install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam ++install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam ++install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++ ++# now rewrite scripts and config files in-place ++sed -i \ ++ -e 's!%%{_sbindir}!%{_sbindir}!g' \ ++ -e 's!%%{_bindir}!%{_bindir}!g' \ ++ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ ++ %{buildroot}%{_sysconfdir}/logrotate.d/* \ ++ %{buildroot}%{_sysconfdir}/cron.daily/freshclam + + %if %{!?_without_milter:1}0 + install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter +-install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter ++install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter + %else + rm %{buildroot}%{_mandir}/man8/clamav-milter.8* + %endif ++ + # Install clamav-wrapper: +-tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share ++install -d -m0755 %{buildroot}/%{_prefix}/share/clamav ++install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} ++install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} + + install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ + touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log +@@ -345,8 +316,6 @@ + %doc %{_mandir}/man1/clamscan.1* + %doc %{_mandir}/man1/freshclam.1* + %doc %{_mandir}/man5/freshclam.conf.5* +-%doc %{_prefix}/share/clamav/README.clamd-wrapper +-%{_prefix}/share/clamav/clamd-wrapper + %config(noreplace) %{_sysconfdir}/freshclam.conf + %{_bindir}/clamscan + %{_bindir}/freshclam +@@ -366,10 +335,12 @@ + %config(noreplace) %{_sysconfdir}/clamd.conf + %config(noreplace) %{_sysconfdir}/logrotate.d/clamav + %{_sysconfdir}/clamd.d +-%config %{_initrddir}/clamd ++%config %{_initrddir}/clamav + %{_sbindir}/clamd + %{_bindir}/clamconf + %{_bindir}/clamdscan ++%doc %{_prefix}/share/clamav/README.clamd-wrapper ++%{_prefix}/share/clamav/clamd* + + %defattr(0644, clam, clam, 0755) + %{_localstatedir}/run/clamav/ +@@ -409,6 +380,10 @@ + %exclude %{_libdir}/libclamav.la + + %changelog ++* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 ++- Add missing clamd-wrapper supporting files ++- Remove from init script the unused CLAMD_SOCKET variable ++ + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 + - Update to 0.97.3 + - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 commit 2cfebfc9fa6a0f416d9849cb8bbe86ec430c9259 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Dec 20 10:31:23 2011 +0100 Remove duplicate section causing logrotate errors nightly diff --git a/freshclam.logrotate b/freshclam.logrotate index 5a5615a..272d220 100644 --- a/freshclam.logrotate +++ b/freshclam.logrotate @@ -3,8 +3,3 @@ notifempty create 644 clam clam } -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} commit f5659018a4a4aea8cdf89db6e1c2a05789da7529 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Dec 13 17:52:59 2011 -0600 Oops, i shouldn't have commited these diff --git a/clamav.spec.orig b/clamav.spec.orig deleted file mode 100644 index 45aa5db..0000000 --- a/clamav.spec.orig +++ /dev/null @@ -1,1091 +0,0 @@ -#global prerelease rc1 - -## Fedora Extras specific customization below... -%bcond_without fedora -%bcond_without upstart -%bcond_without systemd -%bcond_with sysv -%bcond_without tmpfiles -%bcond_with unrar -%bcond_without noarch -%bcond_without bytecode -## - -%ifnarch s390 s390x -%global have_ocaml 1 -%else -%global have_ocaml 0 -%endif - -%global username clamupdate -%global homedir %_var/lib/clamav -%global freshclamlog %_var/log/freshclam.log -%global milteruser clamilt -%global milterlog %_var/log/clamav-milter.log -%global milterstatedir %_var/run/clamav-milter -%global pkgdatadir %_datadir/%name - -%global scanuser clamscan -%global scanstatedir %_var/run/clamd.scan - -%{?with_noarch:%global noarch BuildArch: noarch} -%{!?_unitdir:%global _unitdir /lib/systemd/system} -%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} -%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ -%nil} -%{!?systemd_reqs:%global systemd_reqs \ -Requires(post): /bin/systemctl\ -Requires(preun): /bin/systemctl\ -Requires(postun): /bin/systemctl\ -%nil} -%{!?systemd_install:%global systemd_install()\ -%post %1\ -test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -%preun %1\ -test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ -test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ -%postun %1\ -/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ -test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ -%nil} - - -Summary: End-user tools for the Clam Antivirus scanner -Name: clamav -Version: 0.97.3 -Release: %release_func 1700 -License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} -Group: Applications/File -URL: http://www.clamav.net -%if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… -%else -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: %name-%version%{?prerelease}-norar.tar.xz -%endif -Source1: clamd-wrapper -Source2: clamd.sysconfig -Source3: clamd.logrotate -Source5: clamd-README -Source6: clamav-update.logrotate -Source7: clamd.SERVICE.init -Source8: clamav-notify-servers -Patch24: clamav-0.92-private.patch -Patch25: clamav-0.92-open.patch -Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95.3-umask.patch -# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… -Patch29: clamav-0.96.2-jitoff.patch -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: clamav-lib = %version-%release -Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: ncurses-devel -BuildRequires: %_includedir/tcpd.h -%{?with_bytecode:BuildRequires: bc tcl groff graphviz} -%if %{have_ocaml} -%{?with_bytecode:BuildRequires: ocaml} -%endif - -%package filesystem -Summary: Filesystem structure for clamav -Group: Applications/File -Provides: user(%username) = 4 -Provides: group(%username) = 4 -# Prevent version mix -Conflicts: %name < %version-%release -Conflicts: %name > %version-%release -BuildRequires: fedora-usermgmt-devel -%{?noarch} -%{?FE_USERADD_REQ} - -%package lib -Summary: Dynamic libraries for the Clam Antivirus scanner -Group: System Environment/Libraries -Requires: data(clamav) - -%package devel -Summary: Header files and libraries for the Clam Antivirus scanner -Group: Development/Libraries -Source100: clamd-gen -Requires: clamav-lib = %version-%release -Requires: clamav-filesystem = %version-%release - -%package data -Summary: Virus signature data for the Clam Antivirus scanner -Group: Applications/File -Requires(pre): clamav-filesystem = %version-%release -Requires(postun): clamav-filesystem = %version-%release -Provides: data(clamav) = full -Conflicts: data(clamav) < full -Conflicts: data(clamav) > full -%{?noarch} - -%package data-empty -Summary: Empty data package for the Clam Antivirus scanner -Group: Applications/File -Provides: data(clamav) = empty -Conflicts: data(clamav) < empty -Conflicts: data(clamav) > empty -%{?noarch} - -%package update -Summary: Auto-updater for the Clam Antivirus scanner data-files -Group: Applications/File -Source200: freshclam-sleep -Source201: freshclam.sysconfig -Source202: clamav-update.cron -Requires: clamav-filesystem = %version-%release -Requires(pre): /etc/cron.d -Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod -Requires(post): group(%username) - -%package server -Summary: Clam Antivirus scanner server -Group: System Environment/Daemons -Requires: data(clamav) -Requires: clamav-filesystem = %version-%release -Requires: clamav-lib = %version-%release - -%package server-sysvinit -Summary: SysV initscripts for clamav server -Group: System Environment/Daemons -Provides: init(clamav-server) = sysv -Requires: clamav-server = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir -Provides: clamav-server-sysv = %version-%release -Obsoletes: clamav-server-sysv < %version-%release -%{?noarch} - - -%package scanner -Summary: Clamav scanner daemon -Group: System Environment/Daemons -Requires: init(clamav-scanner) -Provides: user(%scanuser) = 49 -Provides: group(%scanuser) = 49 -Requires: clamav-server = %version-%release -%{?noarch} - -# Remove me after EOL of RHEL5 -%package scanner-sysvinit -Summary: SysV initscripts for clamav scanner daemon -Group: System Environment/Daemons -Provides: init(clamav-scanner) = sysv -Requires: clamav-server-sysvinit = %version-%release -Requires: clamav-scanner = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -%{?noarch} - -%package scanner-upstart -Summary: Upstart initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source410: clamd.scan.upstart -Provides: init(clamav-scanner) = upstart -Requires: clamav-scanner = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package scanner-systemd -Summary: Systemd initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source430: clamd.scan.systemd -Provides: init(clamav-scanner) = systemd -Requires: clamav-scanner = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-scanner-sysvinit = %version-%release -Obsoletes: %name-scanner-sysvinit < %version-%release -%endif - - -%package milter -Summary: Milter module for the Clam Antivirus scanner -Group: System Environment/Daemons -Source300: README.fedora -Requires: init(clamav-milter) -BuildRequires: sendmail-devel -BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) = 5 -Provides: group(%milteruser) = 5 -Requires(post): coreutils -%{?FE_USERADD_REQ} - -Provides: milter(clamav) = sendmail -Provides: milter(clamav) = postfix - -Provides: clamav-milter-core = %version-%release -Obsoletes: clamav-milter-core < %version-%release -Provides: clamav-milter-sendmail = %version-%release -Obsoletes: clamav-milter-sendmail < %version-%release - -# Remove me after EOL of RHEL5 -%package milter-sysvinit -Summary: SysV initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source320: clamav-milter.sysv -Provides: init(clamav-milter) = sysvinit -Requires: clamav-milter = %version-%release -Requires(post): user(%milteruser) clamav-milter -Requires(preun): user(%milteruser) clamav-milter -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -Provides: clamav-milter-sysv = %version-%release -Obsoletes: clamav-milter-sysv < %version-%release -%{?noarch} - -%package milter-upstart -Summary: Upstart initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source310: clamav-milter.upstart -Provides: init(clamav-milter) = upstart -Requires: clamav-milter = %version-%release -Requires(pre): /etc/init -Requires(post): /usr/bin/killall -Requires(preun): /sbin/initctl -%{?noarch} - -%package milter-systemd -Summary: Systemd initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source330: clamav-milter.systemd -Provides: init(clamav-milter) = systemd -Requires: clamav-milter = %version-%release -%{?systemd_reqs} -%{?noarch} - -# Remove me after F17 -%if 0%{!?with_sysv:1} -Provides: %name-milter-sysvinit = %version-%release -Obsoletes: %name-milter-sysvinit < %version-%release -%endif - - -%description -Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this -software is the integration with mail servers (attachment scanning). The -package provides a flexible and scalable multi-threaded daemon, a command -line scanner, and a tool for automatic updating via Internet. The programs -are based on a shared library distributed with the Clam AntiVirus package, -which you can use with your own software. The virus database is based on -the virus database from OpenAntiVirus, but contains additional signatures -(including signatures for popular polymorphic viruses, too) and is KEPT UP -TO DATE. - -%description filesystem -This package provides the filesystem structure and contains the -user-creation scripts required by clamav. - -%description lib -This package contains dynamic libraries shared between applications -using the Clam Antivirus scanner. - -%description devel -This package contains headerfiles and libraries which are needed to -build applications using clamav. - -%description data -This package contains the virus-database needed by clamav. This -database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. This package and the -'clamav-data-empty' package are mutually exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description data-empty -This is an empty package to fulfill inter-package dependencies of the -clamav suite. This package and the 'clamav-data' package are mutually -exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description update -This package contains programs which can be used to update the clamav -anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. - -%description server -ATTENTION: most users do not need this package; the main package has -everything (or depends on it) which is needed to scan for virii on -workstations. - -This package contains files which are needed to execute the clamd-daemon. -This daemon does not provide a system-wide service. Instead of, an instance -of this daemon should be started for each service requiring it. - -See the README file how this can be done with a minimum of effort. - - -%description server-sysvinit -SysV initscripts template for the clamav server - - -%description scanner -This package contains a generic system wide clamd service which is -e.g. used by the clamav-milter package. - -%description scanner-sysvinit -The SysV initscripts for clamav-scanner. - -%description scanner-upstart -The Upstart initscripts for clamav-scanner. - -%description scanner-systemd -The systemd initscripts for clamav-scanner. - - -%description milter -This package contains files which are needed to run the clamav-milter. - -%description milter-sysvinit -The SysV initscripts for clamav-milter. - -%description milter-upstart -The Upstart initscripts for clamav-milter. - -%description milter-systemd -The systemd initscripts for clamav-scanner. - -## ------------------------------------------------------------ - -%prep -%setup -q -n %{name}-%{version}%{?prerelease} - -%apply -n24 -p1 -b .private -%apply -n25 -p1 -b .open -%apply -n26 -p1 -b .cliopts -%apply -n27 -p1 -b .umask -%apply -n29 -p1 -b .jitoff -%{?apply_end} - -install -p -m0644 %SOURCE300 clamav-milter/ - -mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} - -sed -ri \ - -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ - -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ - -e 's!^#?(User ).*!\1<USER>!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ - -e 's! /usr/local/share/clamav,! %homedir,!g' \ - etc/clamd.conf - -sed -ri \ - -e 's!^#?(UpdateLogFile )!#\1!g;' \ - -e 's!^#?(LogSyslog).*!\1 yes!g' \ - -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf - - -## ------------------------------------------------------------ - -%build -CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" -export LDFLAGS='-Wl,--as-needed' -# HACK: remove me... -export FRESHCLAM_LIBS='-lz' -# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine -export have_cv_ipv6=yes -%configure \ - --disable-static \ - --disable-rpath \ - --disable-silent-rules \ - --disable-clamav \ - --with-user=%username \ - --with-group=%username \ - --with-dbdir=/var/lib/clamav \ - --enable-milter \ - --enable-clamdtop \ - %{!?with_bytecode:--disable-llvm} \ - %{!?with_unrar:--disable-unrar} - -# TODO: check periodically that CLAMAVUSER is used for freshclam only - - -# build with --as-needed and disable rpath -sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ - libtool - - -make %{?_smp_mflags} - - -## ------------------------------------------------------------ - -%install -rm -rf "$RPM_BUILD_ROOT" _doc* -make DESTDIR="$RPM_BUILD_ROOT" install - -function smartsubst() { - local tmp - local regexp=$1 - shift - - tmp=$(mktemp /tmp/%name-subst.XXXXXX) - for i; do - sed -e "$regexp" "$i" >$tmp - cmp -s $tmp "$i" || cat $tmp >"$i" - rm -f $tmp - done -} - - -install -d -m 0755 \ - $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ - $RPM_BUILD_ROOT%_var/{log,run} \ - $RPM_BUILD_ROOT%milterstatedir \ - $RPM_BUILD_ROOT%pkgdatadir/template \ - $RPM_BUILD_ROOT%_initrddir \ - $RPM_BUILD_ROOT%homedir \ - $RPM_BUILD_ROOT%scanstatedir - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ - $RPM_BUILD_ROOT%_libdir/*.la - - -touch $RPM_BUILD_ROOT%homedir/daily.cld -touch $RPM_BUILD_ROOT%homedir/main.cld - - -## prepare the server-files -install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig -install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate -install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init -install -D -m 0644 -p %SOURCE5 _doc_server/README -install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf - -install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ -install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template - -smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper - - -## prepare the update-files -install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update -install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers -touch $RPM_BUILD_ROOT%freshclamlog - -install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update - -smartsubst 's!webmaster,clamav!webmaster,%username!g; - s!/usr/share/clamav!%pkgdatadir!g; - s!/usr/bin!%_bindir!g; - s!/usr/sbin!%_sbindir!g;' \ - $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ - $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep - - -### The scanner stuff -sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf - -sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ - > $RPM_BUILD_ROOT%_initrddir/clamd.scan - -install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf -install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf -d %scanstatedir 0710 %scanuser %scanuser -EOF - -touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} - - -### The milter stuff -sed -r \ - -e 's!^#?(User).*!\1 %milteruser!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ - -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ - -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ - -e 's! /tmp/clamav-milter.log! %milterlog!g' \ - etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf - -install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf -install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter -install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service - -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf -d %milterstatedir 0710 %milteruser %milteruser -EOF - -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf -touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} - -%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} -%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} -%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} -%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} -%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} - -# keep clamd-wrapper in every case because it might be needed by other -# packages -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper - -## ------------------------------------------------------------ - -%check -make check - -## ------------------------------------------------------------ - -%clean -rm -rf "$RPM_BUILD_ROOT" - -## ------------------------------------------------------------ - -%pre filesystem -%__fe_groupadd 4 -r %username &>/dev/null || : -%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ - -c 'Clamav database update user' -g %username %username &>/dev/null || : - -%postun filesystem -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - - -%pre scanner -%__fe_groupadd 49 -r %scanuser &>/dev/null || : -%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ - -g %scanuser %scanuser &>/dev/null || : - -%postun scanner -%__fe_userdel %scanuser &>/dev/null || : -%__fe_groupdel %scanuser &>/dev/null || : - - -%post scanner-sysvinit -/sbin/chkconfig --add clamd.scan - -%preun scanner-sysvinit -test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.scan - -%postun scanner-sysvinit -test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : - - -%post scanner-upstart -/usr/bin/killall -u %scanuser clamd 2>/dev/null || : - -%preun scanner-upstart -test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : - - -%systemd_install scanner-systemd clamd.scan.service - - -%post update -test -e %freshclamlog || { - touch %freshclamlog - %__chmod 0664 %freshclamlog - %__chown root:%username %freshclamlog -} - - -%triggerin milter -- clamav-scanner -# Add the milteruser to the scanuser group; this is required when -# milter and clamd communicate through local sockets -/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : - -%pre milter -%__fe_groupadd 5 -r %milteruser &>/dev/null || : -%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : - -%post milter -test -e %milterlog || { - touch %milterlog - chmod 0620 %milterlog - chown root:%milteruser %milterlog -} - -%postun milter -%__fe_userdel %milteruser &>/dev/null || : -%__fe_groupdel %milteruser &>/dev/null || : - - -%post milter-sysvinit -/sbin/chkconfig --add clamav-milter - -%preun milter-sysvinit -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter - -%postun milter-sysvinit -test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - - -%post milter-upstart -/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : - -%preun milter-upstart -test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : - - -%systemd_install milter-systemd clamav-milter.service - - -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE -%doc docs/*.pdf -%_bindir/* -%_mandir/man[15]/* -%exclude %_bindir/clamav-config -%exclude %_bindir/freshclam -%exclude %_mandir/*/freshclam* - -## ----------------------- - -%files lib -%defattr(-,root,root,-) -%_libdir/*.so.* - -## ----------------------- - -%files devel -%defattr(-,root,root,-) -%_includedir/* -%_libdir/*.so -%pkgdatadir/template -%pkgdatadir/clamd-gen -%_libdir/pkgconfig/* -%_bindir/clamav-config - -## ----------------------- - -%files filesystem -%attr(-,%username,%username) %dir %homedir -%attr(-,root,root) %dir %pkgdatadir - -## ----------------------- - -%files data -%defattr(-,%username,%username,-) -# use %%config to keep files which were updated by 'freshclam' -# already. Without this tag, they would be overridden with older -# versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %homedir/*.cvd - - -%files data-empty -%defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/*.cvd - - -## ----------------------- - -%files update -%defattr(-,root,root,-) -%_bindir/freshclam -%_mandir/*/freshclam* -%pkgdatadir/freshclam-sleep -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* -%config(noreplace) %_sysconfdir/cron.d/* -%config(noreplace) %_sysconfdir/sysconfig/freshclam - -%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/*.cld - - -## ----------------------- - -%files server -%defattr(-,root,root,-) -%doc _doc_server/* -%_mandir/man[58]/clamd* -%_sbindir/* -%pkgdatadir/clamd-wrapper -%dir %_sysconfdir/clamd.d - -%exclude %_sbindir/*milter* -%exclude %_mandir/man8/clamav-milter* - - -%files server-sysvinit -%defattr(-,root,root,-) -%_initrddir/clamd-wrapper - - -## ----------------------- - -%files scanner -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/clamd.d/scan.conf -%ghost %scanstatedir/clamd.sock - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamd.scan.conf - %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%else - %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%endif - -%if 0%{?with_sysv:1} -%files scanner-sysvinit - %attr(0755,root,root) %config %_initrddir/clamd.scan - %ghost %scanstatedir/clamd.pid -%endif - -%if 0%{?with_upstart:1} -%files scanner-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamd.scan* -%endif - -%if 0%{?with_systemd:1} -%files scanner-systemd - %defattr(-,root,root,-) - %_unitdir/clamd.scan.service -%endif - -## ----------------------- - -%files milter -%defattr(-,root,root,-) -%doc clamav-milter/README.fedora -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %_sysconfdir/mail/clamav-milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%ghost %milterstatedir/clamav-milter.socket - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/clamav-milter.conf - %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%else - %dir %attr(0710,%milteruser,%milteruser) %milterstatedir -%endif - -%if 0%{?with_sysv:1} -%files milter-sysvinit - %defattr(-,root,root,-) - %config %_initrddir/clamav-milter - %ghost %milterstatedir/clamav-milter.pid -%endif - -%if 0%{?with_upstart:1} -%files milter-upstart - %defattr(-,root,root,-) - %config(noreplace) %_sysconfdir/init/clamav-milter* -%endif - -%if 0%{?with_systemd:1} -%files milter-systemd - %defattr(-,root,root,-) - %_unitdir/clamav-milter.service -%endif - - -%changelog -* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 -- updated to 0.97.3 -- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 - -* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 -- updated to 0.97.2 -- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) -- fixed systemd scripts and their installation - -* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 -- updated to 0.97.1 -- fixed Requires(preun) vs. Requires(postun) inconsistency - -* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 -- fixed tmpfiles.d syntax (#696812) - -* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 -- updated to 0.97 -- rediffed some patches - -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 -- fixed signal specifier in clamd-wrapper (#668131, James Ralston) - -* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 -- added systemd init scripts which obsolete to old sysvinit ones -- added tmpfiles.d/ descriptions - -* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 -- updated to 0.96.5 -- CVE-2010-4260 Multiple errors within the processing of PDF files can - be exploited to e.g. cause a crash. -- CVE-2010-4261 An off-by-one error within the "icon_cb()" function - can be exploited to cause a memory corruption. - -* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 -- updated to 0.96.4 -- execute 'make check' (#640347) but ignore errors for now because - four checks are failing on f13 - -* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 -- lowered stop priority of sysv initscripts (#629435) - -* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 -- updated to 0.96.3 -- fixes CVE-2010-0405 in shipped bzlib.c copy - -* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 -- updated to 0.96.2 -- rediffed patches -- removed the -jit-disable patch which is replaced upstream by a more - detailed configuration option. - -* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed old %%trigger which renamed the 'clamav' user- and groupnames - to 'clamupdate' -- use 'groupmems', not 'usermod' to add a user to a group because - 'usermod' does not work when user does not exist in local /etc/passwd - -* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 -- ocaml not available (at least) on s390(x) - -* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 -- updated to 0.96.1 -- rediffed patches - -* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 -- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) - -* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 -- updated to final 0.96 -- applied upstream patch which allows to disable JIT compiler (#573191) -- build JIT compiler again -- disabled JIT compiler by default -- removed explicit 'pkgconfig' requirements in -devel (#533956) - -* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 -- do not build the bytecode JIT compiler for now until it can be disabled - at runtime (#573191) - -* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 -- updated to 0.96rc1 -- added some BRs - -* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 -- updated -upstart to upstart 0.6.3 - -* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- adjusted chkconfig positions for clamav-milter (#530101) -- use %%apply instead of %%patch - -* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 -- updated to 0.95.3 - -* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- conditionalized build of noarch subpackages to ease packaging under RHEL5 - -* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 -- modified freshclam configuration to log by syslog by default -- disabled LocalSocket option in sample configuration -- fixed clamav-milter sysv initscript to use bash interpreter and to - be disabled by default - -* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 -- renamed 'clamav' user/group to 'clamupdate' -- add the '%milteruser' user to the '%scanuser' group when the -scanner - subpackage is installed - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 -- updated to 0.95.2 - -* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 -- fixed '--without upstart' operation - -* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 -- added '%%bcond_without upstart' conditional to ease skipping of - -upstart subpackage creation e.g. on EL5 systems -- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which - broke update path - -* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 -- Upgrade to 0.95.1 (#495039) - -* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 -- updated to final 0.95 -- added ncurses-devel (-> clamdtop) BR -- enforced IPv6 support - -* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 -- updated to 0.95rc1 -- added -upstart subpackages -- renamed -sysv to -sysvinit to make -upstart win the default dep resolving -- reworked complete milter stuff -- added -scanner subpackage which contains a preconfigured daemon - (e.g. for use by -milter) -- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old - -* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 -- made some subpackages noarch -- fixed typo in SysV initscript which removes 'touch' file (#473513) - -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 -- Upgrade to 0.94.2 (#474002) - -* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 -- Upgrade to 0.94.1 - -* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 -- Upgrade to 0.94 (SECURITY), fixes #461461: -- CVE-2008-1389 Invalid memory access in the CHM unpacker -- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg -- CVE-2008-3913 Memory leak in code path in freshclam's manager.c -- CVE-2008-3914 Multiple file descriptor leaks on the code paths - -* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 -- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read - on petite files) -- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) -- rediffed patches - -* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 -- updated to 0.93.1 -- rediffed -path patch -- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability - -* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 -- updated to final 0.93 -- removed daily.inc + main.inc directories; they are now replaced by - *.cld containers -- trimmed down MAILTO list of cronjob to 'root' again; every well - configured system has an alias for this recipient - -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 -- moved -milter scriptlets into -milter-core subpackage -- added a requirement on the milteruser to the -milter-sendmail - subpackage (reported by Bruce Jerrick) - -* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 -- updated to 0.93rc1 -- fixed rpath issues - -* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 -- updated to 0.92.1 - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 -- redisabled unrar stuff completely by using clean sources -- splitted -milter subpackage into pieces to allow use without sendmail - (#239037) - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 -- use a better way to disable RPATH-generation (needed for '--with - unrar' builds) - -* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 -- added a README.fedora to the milter package (#240610) -- ship original sources again; unrar is now licensed correctly (no more - stolen code put under GPL). Nevertheless, this license is not GPL - compatible, and to allow libclamav to be used by GPL applications, - unrar is disabled by a ./configure switch. -- use pkg-config in clamav-config to emulate --cflags and --libs - operations (fixes partly multilib issues) -- registered some more auto-updated files and marked them as %%ghost - -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 -- updated to 0.92 (SECURITY): -- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability - -* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of - legal problems (resolves 334371) -- correct license tag - -* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 -- Bump release for upgrade path. - -* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 -- updated to 0.91.2 (SECURITY): -- CVE-2007-4510 DOS in RTF parser -- DOS in html normalizer -- arbitrary command execution by special crafted recipients in - clamav-milter's black-hole mode -- fixed an open(2) issue - -* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 -- updated to 0.91.1 - -* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 -- updated to 0.91 - -* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 -- updated to 0.90.3 -- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both - in FC6- and F7+ - -* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 -- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 -- updated to 0.90.1 -- updated %%doc list - -* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 -- updated to final 0.90 -- removed -visibility patch since fixed upstream - -* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 -- build with -Wl,-as-needed and cleaned up pkgconfig file -- removed old hack which forced installation of freshclam.conf; related - check was removed upstream -- removed static library -- removed %%changelog entries from before 2004 - -* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 -- updated to 0.90rc3 -- splitted mandatory parts from the data-file into a separate -filesystem - subpackage -- added a -data-empty subpackage to allow a setup where database is - updated per cron-job and user does not want to download the large - -data package with outdated virus definitations (#214949) -- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej deleted file mode 100644 index 1096912..0000000 --- a/clamav.spec.rej +++ /dev/null @@ -1,152 +0,0 @@ ---- clamav.spec -+++ clamav.spec -@@ -5,7 +5,7 @@ - Summary: Anti-virus software - Name: clamav - Version: 0.97.3 --Release: 1%{?dist} -+Release: 2%{?dist} - License: GPLv2 - Group: Applications/System - URL: http://www.clamav.net/ -@@ -15,7 +15,14 @@ - Source0: clamav-0.97.3-norar.tar.xz - Source1: clamav.init - Source2: clamav-milter.init --Source3: clamd-wrapper.tar.bz2 -+Source3: clamd-wrapper -+Source4: clamd.init -+Source5: README.clamd-wrapper -+Source6: clamd.sysconfig -+Source7: freshclam.logrotate -+Source8: freshclam.cron -+Source9: clamd.logrotate -+Source10: clamav-milter.sysconfig - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - - BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz -@@ -171,53 +178,6 @@ - s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; - ' etc/clamav-milter.conf - -- --cat <<EOF >clamd.logrotate --%{_localstatedir}/log/clamav/clamd.log { -- missingok -- notifempty -- create 644 clam clam -- postrotate -- killall -HUP clamd 2>/dev/null || : -- endscript --} --EOF -- --cat <<EOF >freshclam.logrotate --%{_localstatedir}/log/clamav/freshclam.log { -- missingok -- notifempty -- create 644 clam clam --} --EOF -- --cat <<'EOF' >freshclam.cron --#!/bin/sh -- --### A simple update script for the clamav virus database. --### This could as well be replaced by a SysV script. -- --### fix log file if needed --LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" --if [ ! -f "$LOG_FILE" ]; then -- touch "$LOG_FILE" -- chmod 644 "$LOG_FILE" -- chown clam.clam "$LOG_FILE" --fi -- --%{_bindir}/freshclam \ -- --quiet \ -- --datadir="%{_localstatedir}/lib/clamav" \ -- --log="$LOG_FILE" --EOF -- --%{__cat} <<EOF >clamav-milter.sysconfig --### Simple config file for clamav-milter, you should --### read the documentation and tweak it as you wish. -- --CLAMAV_FLAGS="" --EOF -- - %build - %configure \ - --program-prefix="%{?_program_prefix}" \ -@@ -240,19 +200,30 @@ - rm -rf %{buildroot} - make install DESTDIR="%{buildroot}" - --install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd --install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam --install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam --install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav -+install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam -+install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -+install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav -+ -+# now rewrite scripts and config files in-place -+sed -i \ -+ -e 's!%%{_sbindir}!%{_sbindir}!g' \ -+ -e 's!%%{_bindir}!%{_bindir}!g' \ -+ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ -+ %{buildroot}%{_sysconfdir}/logrotate.d/* \ -+ %{buildroot}%{_sysconfdir}/cron.daily/freshclam - - %if %{!?_without_milter:1}0 - install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter --install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter -+install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter - %else - rm %{buildroot}%{_mandir}/man8/clamav-milter.8* - %endif -+ - # Install clamav-wrapper: --tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share -+install -d -m0755 %{buildroot}/%{_prefix}/share/clamav -+install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} -+install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} - - install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ - touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log -@@ -345,8 +316,6 @@ - %doc %{_mandir}/man1/clamscan.1* - %doc %{_mandir}/man1/freshclam.1* - %doc %{_mandir}/man5/freshclam.conf.5* --%doc %{_prefix}/share/clamav/README.clamd-wrapper --%{_prefix}/share/clamav/clamd-wrapper - %config(noreplace) %{_sysconfdir}/freshclam.conf - %{_bindir}/clamscan - %{_bindir}/freshclam -@@ -366,10 +335,12 @@ - %config(noreplace) %{_sysconfdir}/clamd.conf - %config(noreplace) %{_sysconfdir}/logrotate.d/clamav - %{_sysconfdir}/clamd.d --%config %{_initrddir}/clamd -+%config %{_initrddir}/clamav - %{_sbindir}/clamd - %{_bindir}/clamconf - %{_bindir}/clamdscan -+%doc %{_prefix}/share/clamav/README.clamd-wrapper -+%{_prefix}/share/clamav/clamd* - - %defattr(0644, clam, clam, 0755) - %{_localstatedir}/run/clamav/ -@@ -409,6 +380,10 @@ - %exclude %{_libdir}/libclamav.la - - %changelog -+* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 -+- Add missing clamd-wrapper supporting files -+- Remove from init script the unused CLAMD_SOCKET variable -+ - * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - - Update to 0.97.3 - - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 commit 14d21bc46d3a59c90e91420a310f14102e8d859b Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Dec 13 17:51:57 2011 -0600 Add files from bug 756854 diff --git a/README.clamd-wrapper b/README.clamd-wrapper new file mode 100644 index 0000000..5cd1b91 --- /dev/null +++ b/README.clamd-wrapper @@ -0,0 +1,116 @@ +To create individual clamd-instance take the following files and +modify/copy them in the suggested way: + +clamd.conf: + * set LogFile, PidFile, LocalSocket and User to suitable values + * place this file into /etc/clamd.d with an unique service-name; + e.g. as /etc/clamd.d/<SERVICE>.conf + + To make logfile rotation work properly, the LogFile should be + writable for the assigned User. Recommended way to reach this, is + to: + * make it owned by the User's *group* + * assign at least 0620 (u+rw,g+w) permissions + + A suitable command might be + | # touch <logfile> + | # chgrp <user> <logfile> + | # chmod 0620 <logfile> + + NEVER use 'clamav' as the user since he can modify the database. + This is the user who is running the application; e.g. for mimedefang + (http://www.roaringpenguin.com/mimedefang) the user might be + 'defang'.Theoretically, distinct users could be used, but it must be + made sure that the application-user can write into the socket-file, + and that the clamd-user can access the files asked by the + application to be checked. + + +clamd.logrotate: + * set the correct value for the logfile + * place it into /etc/logrotate.d + +clamd.sysconfig: + * set the name of the config-file and the local socket + * copy it to /etc/sysconfig/clamd.<SERVICE> + +clamd.init: + * set the service-name + * place it into /etc/init.d/ with an unique name and activate it + (e.g. with /sbin/chkconfig clamd.<SERVICE> on) + +Additionally, a symlink must be set to clamd in a way like + | # ln -s clamd /usr/sbin/clamd.<SERVICE> +and the directory for the socket file must be created (see 'LocalSocket' +in clamd.conf) + | # mkdir -p /var/run/clamd.<SERVICE> + + +This directory must be writable by the 'User' chosen in the config-file. + + + +[Disclaimer: + this file and the script/configfiles are not part of the official + clamav package. + + Please send complaints and comments to + mailto:enrico.scholz@informatik.tu-chemnitz.de!] +To create individual clamd-instance take the following files and +modify/copy them in the suggested way: + +clamd.conf: + * set LogFile, PidFile, LocalSocket and User to suitable values + * place this file into /etc/clamd.d with an unique service-name; + e.g. as /etc/clamd.d/<SERVICE>.conf + + To make logfile rotation work properly, the LogFile should be + writable for the assigned User. Recommended way to reach this, is + to: + * make it owned by the User's *group* + * assign at least 0620 (u+rw,g+w) permissions + + A suitable command might be + | # touch <logfile> + | # chgrp <user> <logfile> + | # chmod 0620 <logfile> + + NEVER use 'clamav' as the user since he can modify the database. + This is the user who is running the application; e.g. for mimedefang + (http://www.roaringpenguin.com/mimedefang) the user might be + 'defang'.Theoretically, distinct users could be used, but it must be + made sure that the application-user can write into the socket-file, + and that the clamd-user can access the files asked by the + application to be checked. + + +clamd.logrotate: + * set the correct value for the logfile + * place it into /etc/logrotate.d + +clamd.sysconfig: + * set the name of the config-file and the local socket + * copy it to /etc/sysconfig/clamd.<SERVICE> + +clamd.init: + * set the service-name + * place it into /etc/init.d/ with an unique name and activate it + (e.g. with /sbin/chkconfig clamd.<SERVICE> on) + +Additionally, a symlink must be set to clamd in a way like + | # ln -s clamd /usr/sbin/clamd.<SERVICE> +and the directory for the socket file must be created (see 'LocalSocket' +in clamd.conf) + | # mkdir -p /var/run/clamd.<SERVICE> + + +This directory must be writable by the 'User' chosen in the config-file. + + + +[Disclaimer: + this file and the script/configfiles are not part of the official + clamav package. + + Please send complaints and comments to + mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamav-milter.sysconfig b/clamav-milter.sysconfig new file mode 100644 index 0000000..bd82488 --- /dev/null +++ b/clamav-milter.sysconfig @@ -0,0 +1,8 @@ +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS="" diff --git a/clamav.spec b/clamav.spec index bd8c933..53db81e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -15,7 +15,14 @@ URL: http://www.clamav.net/ Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init -Source3: clamd-wrapper.tar.bz2 +Source3: clamd-wrapper +Source4: clamd.init +Source5: README.clamd-wrapper +Source6: clamd.sysconfig +Source7: freshclam.logrotate +Source8: freshclam.cron +Source9: clamd.logrotate +Source10: clamav-milter.sysconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -171,53 +178,6 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf - -cat <<EOF >clamd.logrotate -%{_localstatedir}/log/clamav/clamd.log { - missingok - notifempty - create 644 clam clam - postrotate - killall -HUP clamd 2>/dev/null || : - endscript -} -EOF - -cat <<EOF >freshclam.logrotate -%{_localstatedir}/log/clamav/freshclam.log { - missingok - notifempty - create 644 clam clam -} -EOF - -cat <<'EOF' >freshclam.cron -#!/bin/sh - -### A simple update script for the clamav virus database. -### This could as well be replaced by a SysV script. - -### fix log file if needed -LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" -if [ ! -f "$LOG_FILE" ]; then - touch "$LOG_FILE" - chmod 644 "$LOG_FILE" - chown clam.clam "$LOG_FILE" -fi - -%{_bindir}/freshclam \ - --quiet \ - --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" -EOF - -%{__cat} <<EOF >clamav-milter.sysconfig -### Simple config file for clamav-milter, you should -### read the documentation and tweak it as you wish. - -CLAMAV_FLAGS="" -EOF - %build %configure \ --program-prefix="%{?_program_prefix}" \ @@ -240,19 +200,30 @@ make %{?_smp_mflags} rm -rf %{buildroot} make install DESTDIR="%{buildroot}" -install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd -install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam -install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam -install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav +install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav + +# now rewrite scripts and config files in-place +sed -i \ + -e 's!%%{_sbindir}!%{_sbindir}!g' \ + -e 's!%%{_bindir}!%{_bindir}!g' \ + -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ + %{buildroot}%{_sysconfdir}/logrotate.d/* \ + %{buildroot}%{_sysconfdir}/cron.daily/freshclam %if %{!?_without_milter:1}0 install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter -install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif + # Install clamav-wrapper: -tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share +install -d -m0755 %{buildroot}/%{_prefix}/share/clamav +install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} +install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log @@ -345,8 +316,6 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* -%doc %{_prefix}/share/clamav/README.clamd-wrapper -%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -366,10 +335,12 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav %{_sysconfdir}/clamd.d -%config %{_initrddir}/clamd +%config %{_initrddir}/clamav %{_sbindir}/clamd %{_bindir}/clamconf %{_bindir}/clamdscan +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd* %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ @@ -409,6 +380,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 +- Add missing clamd-wrapper supporting files +- Remove from init script the unused CLAMD_SOCKET variable + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 - Update to 0.97.3 - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamav.spec.orig b/clamav.spec.orig new file mode 100644 index 0000000..45aa5db --- /dev/null +++ b/clamav.spec.orig @@ -0,0 +1,1091 @@ +#global prerelease rc1 + +## Fedora Extras specific customization below... +%bcond_without fedora +%bcond_without upstart +%bcond_without systemd +%bcond_with sysv +%bcond_without tmpfiles +%bcond_with unrar +%bcond_without noarch +%bcond_without bytecode +## + +%ifnarch s390 s390x +%global have_ocaml 1 +%else +%global have_ocaml 0 +%endif + +%global username clamupdate +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log +%global milterstatedir %_var/run/clamav-milter +%global pkgdatadir %_datadir/%name + +%global scanuser clamscan +%global scanstatedir %_var/run/clamd.scan + +%{?with_noarch:%global noarch BuildArch: noarch} +%{!?_unitdir:%global _unitdir /lib/systemd/system} +%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} +%{!?apply:%global apply(p:n:b:) %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}} \ +%nil} +%{!?systemd_reqs:%global systemd_reqs \ +Requires(post): /bin/systemctl\ +Requires(preun): /bin/systemctl\ +Requires(postun): /bin/systemctl\ +%nil} +%{!?systemd_install:%global systemd_install()\ +%post %1\ +test "$1" != "1" || /bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +%preun %1\ +test "$1" != "0" || /bin/systemctl --no-reload disable %2 >/dev/null 2>&1 || :\ +test "$1" != "0" || /bin/systemctl stop %2 >/dev/null 2>&1 || :\ +%postun %1\ +/bin/systemctl daemon-reload >/dev/null 2>&1 || :\ +test "$1" = "0" || /bin/systemctl try-restart %2 >/dev/null 2>&1 || :\ +%nil} + + +Summary: End-user tools for the Clam Antivirus scanner +Name: clamav +Version: 0.97.3 +Release: %release_func 1700 +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} +Group: Applications/File +URL: http://www.clamav.net +%if 0%{?with_unrar:1} +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?prerele… +%else +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +Source0: %name-%version%{?prerelease}-norar.tar.xz +%endif +Source1: clamd-wrapper +Source2: clamd.sysconfig +Source3: clamd.logrotate +Source5: clamd-README +Source6: clamav-update.logrotate +Source7: clamd.SERVICE.init +Source8: clamav-notify-servers +Patch24: clamav-0.92-private.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95.3-umask.patch +# https://bugzilla.redhat.com/attachment.cgi?id=403775&action=diff&context=pa… +Patch29: clamav-0.96.2-jitoff.patch +BuildRoot: %_tmppath/%name-%version-%release-root +Requires: clamav-lib = %version-%release +Requires: data(clamav) +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel +BuildRequires: %_includedir/tcpd.h +%{?with_bytecode:BuildRequires: bc tcl groff graphviz} +%if %{have_ocaml} +%{?with_bytecode:BuildRequires: ocaml} +%endif + +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(%username) = 4 +Provides: group(%username) = 4 +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?noarch} +%{?FE_USERADD_REQ} + +%package lib +Summary: Dynamic libraries for the Clam Antivirus scanner +Group: System Environment/Libraries +Requires: data(clamav) + +%package devel +Summary: Header files and libraries for the Clam Antivirus scanner +Group: Development/Libraries +Source100: clamd-gen +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release + +%package data +Summary: Virus signature data for the Clam Antivirus scanner +Group: Applications/File +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full +%{?noarch} + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty +%{?noarch} + +%package update +Summary: Auto-updater for the Clam Antivirus scanner data-files +Group: Applications/File +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.cron +Requires: clamav-filesystem = %version-%release +Requires(pre): /etc/cron.d +Requires(postun): /etc/cron.d +Requires(post): %__chown %__chmod +Requires(post): group(%username) + +%package server +Summary: Clam Antivirus scanner server +Group: System Environment/Daemons +Requires: data(clamav) +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release + +%package server-sysvinit +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} + + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 +Requires: clamav-server = %version-%release +%{?noarch} + +# Remove me after EOL of RHEL5 +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon +Group: System Environment/Daemons +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +%{?noarch} + +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source410: clamd.scan.upstart +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package scanner-systemd +Summary: Systemd initscripts for clamav scanner daemon +Group: System Environment/Daemons +Source430: clamd.scan.systemd +Provides: init(clamav-scanner) = systemd +Requires: clamav-scanner = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-scanner-sysvinit = %version-%release +Obsoletes: %name-scanner-sysvinit < %version-%release +%endif + + +%package milter +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Source300: README.fedora +Requires: init(clamav-milter) +BuildRequires: sendmail-devel +BuildRequires: fedora-usermgmt-devel +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 +Requires(post): coreutils +%{?FE_USERADD_REQ} + +Provides: milter(clamav) = sendmail +Provides: milter(clamav) = postfix + +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release + +# Remove me after EOL of RHEL5 +%package milter-sysvinit +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source320: clamav-milter.sysv +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} + +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source310: clamav-milter.upstart +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +Requires(pre): /etc/init +Requires(post): /usr/bin/killall +Requires(preun): /sbin/initctl +%{?noarch} + +%package milter-systemd +Summary: Systemd initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Source330: clamav-milter.systemd +Provides: init(clamav-milter) = systemd +Requires: clamav-milter = %version-%release +%{?systemd_reqs} +%{?noarch} + +# Remove me after F17 +%if 0%{!?with_sysv:1} +Provides: %name-milter-sysvinit = %version-%release +Obsoletes: %name-milter-sysvinit < %version-%release +%endif + + +%description +Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this +software is the integration with mail servers (attachment scanning). The +package provides a flexible and scalable multi-threaded daemon, a command +line scanner, and a tool for automatic updating via Internet. The programs +are based on a shared library distributed with the Clam AntiVirus package, +which you can use with your own software. The virus database is based on +the virus database from OpenAntiVirus, but contains additional signatures +(including signatures for popular polymorphic viruses, too) and is KEPT UP +TO DATE. + +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. + +%description lib +This package contains dynamic libraries shared between applications +using the Clam Antivirus scanner. + +%description devel +This package contains headerfiles and libraries which are needed to +build applications using clamav. + +%description data +This package contains the virus-database needed by clamav. This +database should be updated regularly; the 'clamav-update' package +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description update +This package contains programs which can be used to update the clamav +anti-virus database automatically. It uses the freshclam(1) utility for +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. + +%description server +ATTENTION: most users do not need this package; the main package has +everything (or depends on it) which is needed to scan for virii on +workstations. + +This package contains files which are needed to execute the clamd-daemon. +This daemon does not provide a system-wide service. Instead of, an instance +of this daemon should be started for each service requiring it. + +See the README file how this can be done with a minimum of effort. + + +%description server-sysvinit +SysV initscripts template for the clamav server + + +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + +%description scanner-systemd +The systemd initscripts for clamav-scanner. + + +%description milter +This package contains files which are needed to run the clamav-milter. + +%description milter-sysvinit +The SysV initscripts for clamav-milter. + +%description milter-upstart +The Upstart initscripts for clamav-milter. + +%description milter-systemd +The systemd initscripts for clamav-scanner. + +## ------------------------------------------------------------ + +%prep +%setup -q -n %{name}-%{version}%{?prerelease} + +%apply -n24 -p1 -b .private +%apply -n25 -p1 -b .open +%apply -n26 -p1 -b .cliopts +%apply -n27 -p1 -b .umask +%apply -n29 -p1 -b .jitoff +%{?apply_end} + +install -p -m0644 %SOURCE300 clamav-milter/ + +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} + +sed -ri \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf + +sed -ri \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf + + +## ------------------------------------------------------------ + +%build +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me... +export FRESHCLAM_LIBS='-lz' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes +%configure \ + --disable-static \ + --disable-rpath \ + --disable-silent-rules \ + --disable-clamav \ + --with-user=%username \ + --with-group=%username \ + --with-dbdir=/var/lib/clamav \ + --enable-milter \ + --enable-clamdtop \ + %{!?with_bytecode:--disable-llvm} \ + %{!?with_unrar:--disable-unrar} + +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool + + +make %{?_smp_mflags} + + +## ------------------------------------------------------------ + +%install +rm -rf "$RPM_BUILD_ROOT" _doc* +make DESTDIR="$RPM_BUILD_ROOT" install + +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + +install -d -m 0755 \ + $RPM_BUILD_ROOT%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,tmpfiles.d} \ + $RPM_BUILD_ROOT%_var/{log,run} \ + $RPM_BUILD_ROOT%milterstatedir \ + $RPM_BUILD_ROOT%pkgdatadir/template \ + $RPM_BUILD_ROOT%_initrddir \ + $RPM_BUILD_ROOT%homedir \ + $RPM_BUILD_ROOT%scanstatedir + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamd.conf \ + $RPM_BUILD_ROOT%_libdir/*.la + + +touch $RPM_BUILD_ROOT%homedir/daily.cld +touch $RPM_BUILD_ROOT%homedir/main.cld + + +## prepare the server-files +install -D -m 0644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -D -m 0644 -p %SOURCE3 _doc_server/clamd.logrotate +install -D -m 0755 -p %SOURCE7 _doc_server/clamd.init +install -D -m 0644 -p %SOURCE5 _doc_server/README +install -D -m 0644 -p etc/clamd.conf _doc_server/clamd.conf + +install -m 0644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir/ +install -m 0755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir/ +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template + +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper + + +## prepare the update-files +install -D -m 0644 -p %SOURCE6 $RPM_BUILD_ROOT%_sysconfdir/logrotate.d/clamav-update +install -D -m 0755 -p %SOURCE8 $RPM_BUILD_ROOT%_sbindir/clamav-notify-servers +touch $RPM_BUILD_ROOT%freshclamlog + +install -D -p -m 0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -D -p -m 0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -D -p -m 0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update + +smartsubst 's!webmaster,clamav!webmaster,%username!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep + + +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf + +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan + +install -D -p -m 0644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/init/clamd.scan.conf +install -D -p -m 0644 %SOURCE430 $RPM_BUILD_ROOT%_unitdir/clamd.scan.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamd.scan.conf +d %scanstatedir 0710 %scanuser %scanuser +EOF + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.{sock,pid} + + +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf + +install -D -p -m 0644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/init/clamav-milter.conf +install -D -p -m 0755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -D -p -m 0644 %SOURCE330 $RPM_BUILD_ROOT%_unitdir/clamav-milter.service + +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/clamav-milter.conf +d %milterstatedir 0710 %milteruser %milteruser +EOF + +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.{socket,pid},%milterlog} + +%{!?with_upstart: rm -rf $RPM_BUILD_ROOT%_sysconfdir/init} +%{!?with_systemd: rm -rf $RPM_BUILD_ROOT%_unitdir} +%{!?with_sysv: rm -f $RPM_BUILD_ROOT%_initrddir/*} +%{!?with_sysv: rm -rf $RPM_BUILD_ROOT%_var/run/*/*.pid} +%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} + +# keep clamd-wrapper in every case because it might be needed by other +# packages +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper + +## ------------------------------------------------------------ + +%check +make check + +## ------------------------------------------------------------ + +%clean +rm -rf "$RPM_BUILD_ROOT" + +## ------------------------------------------------------------ + +%pre filesystem +%__fe_groupadd 4 -r %username &>/dev/null || : +%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ + -c 'Clamav database update user' -g %username %username &>/dev/null || : + +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + +%pre scanner +%__fe_groupadd 49 -r %scanuser &>/dev/null || : +%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ + -g %scanuser %scanuser &>/dev/null || : + +%postun scanner +%__fe_userdel %scanuser &>/dev/null || : +%__fe_groupdel %scanuser &>/dev/null || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + +%systemd_install scanner-systemd clamd.scan.service + + +%post update +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%username %freshclamlog +} + + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/groupmems -g %scanuser -a %milteruser &>/dev/null || : + +%pre milter +%__fe_groupadd 5 -r %milteruser &>/dev/null || : +%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ + -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : + +%post milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} + +%postun milter +%__fe_userdel %milteruser &>/dev/null || : +%__fe_groupdel %milteruser &>/dev/null || : + + +%post milter-sysvinit +/sbin/chkconfig --add clamav-milter + +%preun milter-sysvinit +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter + +%postun milter-sysvinit +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : + + +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : + +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : + + +%systemd_install milter-systemd clamav-milter.service + + +%post lib -p /sbin/ldconfig +%postun lib -p /sbin/ldconfig + + +%files +%defattr(-,root,root,-) +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE +%doc docs/*.pdf +%_bindir/* +%_mandir/man[15]/* +%exclude %_bindir/clamav-config +%exclude %_bindir/freshclam +%exclude %_mandir/*/freshclam* + +## ----------------------- + +%files lib +%defattr(-,root,root,-) +%_libdir/*.so.* + +## ----------------------- + +%files devel +%defattr(-,root,root,-) +%_includedir/* +%_libdir/*.so +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config + +## ----------------------- + +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + +%files data +%defattr(-,%username,%username,-) +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. +%config %verify(not size md5 mtime) %homedir/*.cvd + + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/*.cvd + + +## ----------------------- + +%files update +%defattr(-,root,root,-) +%_bindir/freshclam +%_mandir/*/freshclam* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/* +%config(noreplace) %_sysconfdir/sysconfig/freshclam + +%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/*.cld + + +## ----------------------- + +%files server +%defattr(-,root,root,-) +%doc _doc_server/* +%_mandir/man[58]/clamd* +%_sbindir/* +%pkgdatadir/clamd-wrapper +%dir %_sysconfdir/clamd.d + +%exclude %_sbindir/*milter* +%exclude %_mandir/man8/clamav-milter* + + +%files server-sysvinit +%defattr(-,root,root,-) +%_initrddir/clamd-wrapper + + +## ----------------------- + +%files scanner +%defattr(-,root,root,-) +%config(noreplace) %_sysconfdir/clamd.d/scan.conf +%ghost %scanstatedir/clamd.sock + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamd.scan.conf + %ghost %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%else + %dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%endif + +%if 0%{?with_sysv:1} +%files scanner-sysvinit + %attr(0755,root,root) %config %_initrddir/clamd.scan + %ghost %scanstatedir/clamd.pid +%endif + +%if 0%{?with_upstart:1} +%files scanner-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamd.scan* +%endif + +%if 0%{?with_systemd:1} +%files scanner-systemd + %defattr(-,root,root,-) + %_unitdir/clamd.scan.service +%endif + +## ----------------------- + +%files milter +%defattr(-,root,root,-) +%doc clamav-milter/README.fedora +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%ghost %milterstatedir/clamav-milter.socket + +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/clamav-milter.conf + %ghost %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%else + %dir %attr(0710,%milteruser,%milteruser) %milterstatedir +%endif + +%if 0%{?with_sysv:1} +%files milter-sysvinit + %defattr(-,root,root,-) + %config %_initrddir/clamav-milter + %ghost %milterstatedir/clamav-milter.pid +%endif + +%if 0%{?with_upstart:1} +%files milter-upstart + %defattr(-,root,root,-) + %config(noreplace) %_sysconfdir/init/clamav-milter* +%endif + +%if 0%{?with_systemd:1} +%files milter-systemd + %defattr(-,root,root,-) + %_unitdir/clamav-milter.service +%endif + + +%changelog +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1700 +- updated to 0.97.3 +- CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 + +* Tue Jul 26 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.2-1600 +- updated to 0.97.2 +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) +- fixed systemd scripts and their installation + +* Thu Jun 9 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97.1-1600 +- updated to 0.97.1 +- fixed Requires(preun) vs. Requires(postun) inconsistency + +* Sat Apr 23 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1601 +- fixed tmpfiles.d syntax (#696812) + +* Sun Feb 20 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.97-1600 +- updated to 0.97 +- rediffed some patches + +* Tue Feb 08 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.96.5-1503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Sat Jan 8 2011 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1502 +- fixed signal specifier in clamd-wrapper (#668131, James Ralston) + +* Fri Dec 24 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1501 +- added systemd init scripts which obsolete to old sysvinit ones +- added tmpfiles.d/ descriptions + +* Sat Dec 4 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.5-1500 +- updated to 0.96.5 +- CVE-2010-4260 Multiple errors within the processing of PDF files can + be exploited to e.g. cause a crash. +- CVE-2010-4261 An off-by-one error within the "icon_cb()" function + can be exploited to cause a memory corruption. + +* Sun Oct 31 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.4-1500 +- updated to 0.96.4 +- execute 'make check' (#640347) but ignore errors for now because + four checks are failing on f13 + +* Wed Sep 29 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1501 +- lowered stop priority of sysv initscripts (#629435) + +* Wed Sep 22 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.3-1500 +- updated to 0.96.3 +- fixes CVE-2010-0405 in shipped bzlib.c copy + +* Sun Aug 15 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.2-1500 +- updated to 0.96.2 +- rediffed patches +- removed the -jit-disable patch which is replaced upstream by a more + detailed configuration option. + +* Wed Aug 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed old %%trigger which renamed the 'clamav' user- and groupnames + to 'clamupdate' +- use 'groupmems', not 'usermod' to add a user to a group because + 'usermod' does not work when user does not exist in local /etc/passwd + +* Tue Jul 13 2010 Dan Horák <dan[at]danny.cz> - 0.96.1-1401 +- ocaml not available (at least) on s390(x) + +* Tue Jun 1 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96.1-1400 +- updated to 0.96.1 +- rediffed patches + +* Sat May 19 2010 Rakesh Pandit <rakesh(a)fedoraproject.org> - 0.96.1403 +- CVE-2010-1639 Clam AntiVirus: Heap-based overflow, when processing malicious PDF file(s) + +* Wed Apr 21 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1402 +- updated to final 0.96 +- applied upstream patch which allows to disable JIT compiler (#573191) +- build JIT compiler again +- disabled JIT compiler by default +- removed explicit 'pkgconfig' requirements in -devel (#533956) + +* Sat Mar 20 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-0.1401.rc1 +- do not build the bytecode JIT compiler for now until it can be disabled + at runtime (#573191) + +* Thu Mar 11 2010 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.96-1400.rc1 +- updated to 0.96rc1 +- added some BRs + +* Sun Dec 6 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1301 +- updated -upstart to upstart 0.6.3 + +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) +- use %%apply instead of %%patch + +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1300 +- updated to 0.95.3 + +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches + +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam diff --git a/clamav.spec.rej b/clamav.spec.rej new file mode 100644 index 0000000..1096912 --- /dev/null +++ b/clamav.spec.rej @@ -0,0 +1,152 @@ +--- clamav.spec ++++ clamav.spec +@@ -5,7 +5,7 @@ + Summary: Anti-virus software + Name: clamav + Version: 0.97.3 +-Release: 1%{?dist} ++Release: 2%{?dist} + License: GPLv2 + Group: Applications/System + URL: http://www.clamav.net/ +@@ -15,7 +15,14 @@ + Source0: clamav-0.97.3-norar.tar.xz + Source1: clamav.init + Source2: clamav-milter.init +-Source3: clamd-wrapper.tar.bz2 ++Source3: clamd-wrapper ++Source4: clamd.init ++Source5: README.clamd-wrapper ++Source6: clamd.sysconfig ++Source7: freshclam.logrotate ++Source8: freshclam.cron ++Source9: clamd.logrotate ++Source10: clamav-milter.sysconfig + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz +@@ -171,53 +178,6 @@ + s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; + ' etc/clamav-milter.conf + +- +-cat <<EOF >clamd.logrotate +-%{_localstatedir}/log/clamav/clamd.log { +- missingok +- notifempty +- create 644 clam clam +- postrotate +- killall -HUP clamd 2>/dev/null || : +- endscript +-} +-EOF +- +-cat <<EOF >freshclam.logrotate +-%{_localstatedir}/log/clamav/freshclam.log { +- missingok +- notifempty +- create 644 clam clam +-} +-EOF +- +-cat <<'EOF' >freshclam.cron +-#!/bin/sh +- +-### A simple update script for the clamav virus database. +-### This could as well be replaced by a SysV script. +- +-### fix log file if needed +-LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +-if [ ! -f "$LOG_FILE" ]; then +- touch "$LOG_FILE" +- chmod 644 "$LOG_FILE" +- chown clam.clam "$LOG_FILE" +-fi +- +-%{_bindir}/freshclam \ +- --quiet \ +- --datadir="%{_localstatedir}/lib/clamav" \ +- --log="$LOG_FILE" +-EOF +- +-%{__cat} <<EOF >clamav-milter.sysconfig +-### Simple config file for clamav-milter, you should +-### read the documentation and tweak it as you wish. +- +-CLAMAV_FLAGS="" +-EOF +- + %build + %configure \ + --program-prefix="%{?_program_prefix}" \ +@@ -240,19 +200,30 @@ + rm -rf %{buildroot} + make install DESTDIR="%{buildroot}" + +-install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +-install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +-install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +-install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamav ++install -Dp -m0755 %{SOURCE8} %{buildroot}%{_sysconfdir}/cron.daily/freshclam ++install -Dp -m0644 %{SOURCE7} %{buildroot}%{_sysconfdir}/logrotate.d/freshclam ++install -Dp -m0644 %{SOURCE9} %{buildroot}%{_sysconfdir}/logrotate.d/clamav ++ ++# now rewrite scripts and config files in-place ++sed -i \ ++ -e 's!%%{_sbindir}!%{_sbindir}!g' \ ++ -e 's!%%{_bindir}!%{_bindir}!g' \ ++ -e 's!%%{_localstatedir}!%{_localstatedir}!g' \ ++ %{buildroot}%{_sysconfdir}/logrotate.d/* \ ++ %{buildroot}%{_sysconfdir}/cron.daily/freshclam + + %if %{!?_without_milter:1}0 + install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter +-install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter ++install -Dp -m0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter + %else + rm %{buildroot}%{_mandir}/man8/clamav-milter.8* + %endif ++ + # Install clamav-wrapper: +-tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share ++install -d -m0755 %{buildroot}/%{_prefix}/share/clamav ++install -m0755 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE3} %{SOURCE4} ++install -m0444 -t %{buildroot}/%{_prefix}/share/clamav %{SOURCE5} %{SOURCE6} + + install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ + touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log +@@ -345,8 +316,6 @@ + %doc %{_mandir}/man1/clamscan.1* + %doc %{_mandir}/man1/freshclam.1* + %doc %{_mandir}/man5/freshclam.conf.5* +-%doc %{_prefix}/share/clamav/README.clamd-wrapper +-%{_prefix}/share/clamav/clamd-wrapper + %config(noreplace) %{_sysconfdir}/freshclam.conf + %{_bindir}/clamscan + %{_bindir}/freshclam +@@ -366,10 +335,12 @@ + %config(noreplace) %{_sysconfdir}/clamd.conf + %config(noreplace) %{_sysconfdir}/logrotate.d/clamav + %{_sysconfdir}/clamd.d +-%config %{_initrddir}/clamd ++%config %{_initrddir}/clamav + %{_sbindir}/clamd + %{_bindir}/clamconf + %{_bindir}/clamdscan ++%doc %{_prefix}/share/clamav/README.clamd-wrapper ++%{_prefix}/share/clamav/clamd* + + %defattr(0644, clam, clam, 0755) + %{_localstatedir}/run/clamav/ +@@ -409,6 +380,10 @@ + %exclude %{_libdir}/libclamav.la + + %changelog ++* Fri Nov 25 2011 Philip Prindeville <philipp(a)fedoraproject.org> - 0.97.3-2 ++- Add missing clamd-wrapper supporting files ++- Remove from init script the unused CLAMD_SOCKET variable ++ + * Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 + - Update to 0.97.3 + - Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 diff --git a/clamd-wrapper b/clamd-wrapper new file mode 100644 index 0000000..000dcb8 --- /dev/null +++ b/clamd-wrapper @@ -0,0 +1,86 @@ +#!/bin/bash +# +# chkconfig: - 75 25 +# description: The clamd daemon listens for incoming connections on \ +# Unix or TCP socket and scans files or directories on demand. + +[ -n "$CLAMD_SERVICE" ] || { + echo $"*** $0 can not be called in this way" + echo $"*** Please see /usr/share/doc/clamav-server-*/README how" + echo $"*** the clamav-server can be configured" + exit 6 +} + +# Source function library. +. /etc/init.d/functions + +# Get config. +[ -r /etc/sysconfig/network ] && . /etc/sysconfig/network + +# Check that networking is up. +[ "$NETWORKING" != "no" ] || exit 6 + +lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} +sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} +procname=clamd.${CLAMD_SERVICE} + +CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf +CLAMD_OPTIONS= +[ -f "$sysconffile" ] && . "$sysconffile" +CLAMD_PIDFILE=`grep ^PidFile ${CLAMD_CONFIGFILE} | awk '{print $2}'` + +# make sure that config file contains a PidFile setting +[ -n "$CLAMD_PIDFILE" ] || exit 6 + +RETVAL=0 +prog="clamd.${CLAMD_SERVICE}" + +start () { + echo -n $"Starting $prog: " + daemon --pidfile=${CLAMD_PIDFILE} \ + exec -a $procname /usr/sbin/clamd \ + ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch $lockfile + return $RETVAL +} + +stop () { + echo -n $"Stopping $prog: " + killproc -p ${CLAMD_PIDFILE} $procname + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f $lockfile + return $RETVAL +} + +reload() { + rc=0 + echo -n $"Reloading $prog: " + killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? + echo + echo -n $"Loading new virus-database: " + killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? + echo + return $rc +} + +restart () { + stop + start +} + +# See how we were called. +case "$1" in + start|stop|restart|reload) + $1 ;; + status) + status -p ${CLAMD_PIDFILE} $procname ;; + condrestart) + [ ! -f $lockfile ] || restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" + exit 2 +esac diff --git a/clamd.init b/clamd.init new file mode 100644 index 0000000..cf25b46 --- /dev/null +++ b/clamd.init @@ -0,0 +1,18 @@ +#!/bin/bash +# +# chkconfig: - 75 35 +# +# description: The clamd server running for <SERVICE> +# + +CLAMD_SERVICE=<SERVICE> +. /usr/share/clamav/clamd-wrapper +#!/bin/bash +# +# chkconfig: - 75 35 +# +# description: The clamd server running for <SERVICE> +# + +CLAMD_SERVICE=<SERVICE> +. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate new file mode 100644 index 0000000..b233f3a --- /dev/null +++ b/clamd.logrotate @@ -0,0 +1,8 @@ +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} diff --git a/clamd.sysconfig b/clamd.sysconfig new file mode 100644 index 0000000..e0e7714 --- /dev/null +++ b/clamd.sysconfig @@ -0,0 +1,5 @@ +#CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf +#CLAMD_OPTIONS= +## the values below should only ever be specified in the above .conf file! +#CLAMD_SOCKET=/var/run/clamd.${CLAMD_SERVICE}/clamd.sock +#CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid diff --git a/freshclam.cron b/freshclam.cron new file mode 100644 index 0000000..558a2f2 --- /dev/null +++ b/freshclam.cron @@ -0,0 +1,34 @@ +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/lib/clamav" \ + --log="$LOG_FILE" diff --git a/freshclam.logrotate b/freshclam.logrotate new file mode 100644 index 0000000..5a5615a --- /dev/null +++ b/freshclam.logrotate @@ -0,0 +1,10 @@ +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} diff --git a/sources b/sources index 47b00bc..05755a5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 813ca6cc8c152e9fc9583c5f0acb9e3b35d347d6 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 20:09:36 2011 -0500 Add Makefile to make clean tarball diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..ec42490 --- /dev/null +++ b/Makefile @@ -0,0 +1,14 @@ +MAKEFILE_COMMON = $(HOME)/.fedora/common.mk +-include $(MAKEFILE_COMMON) + +# can not use final tarball name here as it will conflict with rules +# within Makefile.common +TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.xz.tmp +TARBALL = ${NAME}-${VERSION}.tar.gz + +clean-sources: ${TARBALL_CLEAN} + +${TARBALL_CLEAN}: ${TARBALL} + rm -f $@.tmp + zcat $< | tar --delete -f - '*/libclamunrar/*' | xz -c > $@.tmp + mv $@.tmp $@ commit f79a6d54a0d97f0b0acefa78c4819180994fd075 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 20:09:21 2011 -0500 Re-add clamd-wrapper.tar.bz2 diff --git a/sources b/sources index 05755a5..47b00bc 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 603c6c9dae1038fe7597a83a33fee2d075710c05 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 19:55:14 2011 -0500 Upgrade to 0.97.3, fixing a CVE diff --git a/.gitignore b/.gitignore index a3ff7cc..b09a0a5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /clamav-0.97.2-norar.tar.xz /clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 +/clamav-0.97.3-norar.tar.xz diff --git a/clamav.spec b/clamav.spec index 5ca4752..bd8c933 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,15 +4,15 @@ Summary: Anti-virus software Name: clamav -Version: 0.97.2 -Release: 5%{?dist} +Version: 0.97.3 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97.2-norar.tar.xz +Source0: clamav-0.97.3-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 @@ -409,6 +409,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Oct 18 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-1 +- Update to 0.97.3 +- Fix CVE-2011-3627 clamav: Recursion level crash fixed in v0.97.3 + * Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-5 - Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. (bz#727894) diff --git a/sources b/sources index 784e26c..05755a5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -c41b2314d1b6b11f091955255dfa23f5 clamav-0.97.2-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +b319a3f31a16811f1a92d63cda592521 clamav-0.97.3-norar.tar.xz commit a9247006483c53e986707cc19b0f2c224cd14c7b Author: Nick Bebout <nb(a)fedoraproject.org> Date: Tue Oct 18 19:34:24 2011 -0500 Remove clamav tarball from git diff --git a/.gitignore b/.gitignore index e230f1a..a3ff7cc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /clamav-0.97.2-norar.tar.xz +/clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 diff --git a/clamav-0.97-clean.tar.bz2 b/clamav-0.97-clean.tar.bz2 deleted file mode 100644 index 9d39f27..0000000 Binary files a/clamav-0.97-clean.tar.bz2 and /dev/null differ commit 96fb7210c39ec20d51155510e7e2565c62178638 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Thu Aug 4 10:14:11 2011 +0200 Make substitutions a little more explicit. diff --git a/clamav.spec b/clamav.spec index b4cde09..5ca4752 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -166,8 +166,8 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %{__perl} -pi.orig -e ' s|^(Example)|#$1|; s|^#(User) .+$|$1 clam|; - s|#MilterSocket inet.+$|MilterSocket /var/run/clamav/clamav-milter.sock|; - s|#PidFile .+$|PidFile /var/run/clamav/clamav-milter.pid|; + s|^#(MilterSocket) inet.+$|$1 /var/run/clamav/clamav-milter.sock|; + s|^#(PidFile) .+$|$1 /var/run/clamav/clamav-milter.pid|; s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf @@ -409,7 +409,7 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-4 +* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-5 - Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. (bz#727894) commit 3ebb6ff6bf713936d55085d2cfee375e475b0d52 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Thu Aug 4 10:10:19 2011 +0200 Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf (bz#727894). diff --git a/clamav.spec b/clamav.spec index 567babb..b4cde09 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -166,7 +166,9 @@ xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %{__perl} -pi.orig -e ' s|^(Example)|#$1|; s|^#(User) .+$|$1 clam|; - s|^#(ClamdSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; + s|#MilterSocket inet.+$|MilterSocket /var/run/clamav/clamav-milter.sock|; + s|#PidFile .+$|PidFile /var/run/clamav/clamav-milter.pid|; + s|^#(ClamdSocket) .+$|$1 unix:%{_localstatedir}/run/clamav/clamd.sock|; ' etc/clamav-milter.conf @@ -407,6 +409,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Thu Aug 4 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-4 +- Configure MilterSocket, PidFile and MilterSocket in clamav-milter.conf. + (bz#727894) + * Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-3 - include updated clamd-wrapper which get the PidFile setting from the service configuration file. commit ae959928b685373bbd37a4b9d933f26ef5d2cc46 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 10:03:06 2011 +0200 Handle xz archive SOURCE0 for rpmbuild on RHEL < 6. diff --git a/clamav.spec b/clamav.spec index 234273a..567babb 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -109,7 +109,9 @@ documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep -%setup -q +# Handle that rpmbuild in RHEL < 6 doesn't handle xz archives automatically. +%setup -q -T -c +xz -dc %{SOURCE0} | (cd .. ; tar xvvf -) %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure @@ -405,11 +407,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-2 +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-3 - include updated clamd-wrapper which get the PidFile setting from the service configuration file. - -* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-1 - updated to 0.97.2 - Build-require xz - CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) commit 7d5029a51e1c38d678117c1191668639a5a39d40 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 08:52:51 2011 +0200 Include Jeroen van Meeuwen's updated clamd-wrapper which get the PidFile setting from the service configuration file. diff --git a/clamav.spec b/clamav.spec index d49bb8f..234273a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -405,6 +405,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-2 +- include updated clamd-wrapper which get the PidFile setting from the + service configuration file. + * Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-1 - updated to 0.97.2 - Build-require xz diff --git a/sources b/sources index d15b018..784e26c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ c41b2314d1b6b11f091955255dfa23f5 clamav-0.97.2-norar.tar.xz -ae4e25e5df41b71cf6541e3a876b94a7 clamd-wrapper.tar.bz2 +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 commit 6fcce5b69503ef555029fea998fe39c8623d0c68 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 08:38:13 2011 +0200 Update sources to include clamav-0.97.1-norar.tar.xz diff --git a/sources b/sources index 27407d3..d15b018 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -44e7df79718d104db0666d5db3f08682 clamav-0.97-clean.tar.bz2 +c41b2314d1b6b11f091955255dfa23f5 clamav-0.97.2-norar.tar.xz ae4e25e5df41b71cf6541e3a876b94a7 clamd-wrapper.tar.bz2 commit 6170551529bdcc1510dc70d529b45d7073b7bc42 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Jul 27 08:36:42 2011 +0200 - updated to 0.97.2 - Build-require xz - CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) diff --git a/.gitignore b/.gitignore index bf9c05a..e230f1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -/clamav-0.97-clean.tar.bz2 +/clamav-0.97.2-norar.tar.xz /clamd-wrapper.tar.bz2 diff --git a/clamav.spec b/clamav.spec index 8bb9614..d49bb8f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -4,21 +4,21 @@ Summary: Anti-virus software Name: clamav -Version: 0.97 -Release: 14%{?dist} +Version: 0.97.2 +Release: 1%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ # Upstream source includes libunrar that is not distributable. #Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz -Source0: clamav-0.97-clean.tar.bz2 +Source0: clamav-0.97.2-norar.tar.xz Source1: clamav.init Source2: clamav-milter.init Source3: clamd-wrapper.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz %{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils @@ -356,6 +356,7 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamdscan.1* %doc %{_mandir}/man1/clamconf.1* %doc %{_mandir}/man1/clamdtop.1* +%doc %{_mandir}/man1/clambc.1* %doc %{_mandir}/man5/clamd.conf.5* %doc %{_mandir}/man8/clamd.8* %config(noreplace) %{_sysconfdir}/clamd.conf @@ -404,6 +405,11 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jul 27 2011 Jan-Frode Myklebuust <janfrode(a)tanso.net> - 0.97.2-1 +- updated to 0.97.2 +- Build-require xz +- CVE-2011-2721 Off-by-one error by scanning message hashes (#725694) + * Wed Jun 29 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97-14 - Require /usr/sbin/sendmail instead of sendmail commit 1391380976a7514bf46af8366673b4223013365b Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Jun 29 18:54:08 2011 -0500 Require /usr/sbin/sendmail instead of sendmail diff --git a/clamav.spec b/clamav.spec index 2af6305..8bb9614 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 13%{?dist} +Release: 14%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -64,7 +64,7 @@ The Clam AntiVirus Daemon Summary: The Clam AntiVirus sendmail-milter Daemon Group: Applications/System Requires: clamd = %{version}-%{release} -Requires: sendmail +Requires: /usr/sbin/sendmail Provides: clamav-milter-sysv = %{version}-%{release} Obsoletes: clamav-milter-sysv < %{version}-%{release} Provides: clamav-milter-sysvinit = %{version}-%{release} @@ -404,6 +404,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Jun 29 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.97-14 +- Require /usr/sbin/sendmail instead of sendmail + * Tue Apr 26 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-13 - Obsolete and provide clamav-milter-sysvinit (bz#696856) commit 833c6c9f451b4f48b64d5c53d773b21016d091cc Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Apr 26 08:53:58 2011 +0200 Obsolete and provide clamav-milter-sysvinit (bz#696856). diff --git a/clamav.spec b/clamav.spec index c1fa39f..2af6305 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 12%{?dist} +Release: 13%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -67,6 +67,8 @@ Requires: clamd = %{version}-%{release} Requires: sendmail Provides: clamav-milter-sysv = %{version}-%{release} Obsoletes: clamav-milter-sysv < %{version}-%{release} +Provides: clamav-milter-sysvinit = %{version}-%{release} +Obsoletes: clamav-milter-sysvinit < %{version}-%{release} %description milter The Clam AntiVirus sendmail-milter Daemon @@ -402,6 +404,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Apr 26 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-13 +- Obsolete and provide clamav-milter-sysvinit (bz#696856) + * Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 - Move deletion of /var/lib/clamav/mirrors.dat to db package. - Don't enable NotifyClamd in freshclam config and cronjob, as not commit c6b6666973bc259d9160f1894f026e5902328c42 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Wed Mar 30 12:17:31 2011 +0200 * Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 - Move deletion of /var/lib/clamav/mirrors.dat to db package. - Don't enable NotifyClamd in freshclam config and cronjob, as not everybody is running clamd. Running clamd's will anyway notice when db is updated. diff --git a/clamav.spec b/clamav.spec index 4d7776f..c1fa39f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 11%{?dist} +Release: 12%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -157,7 +157,6 @@ you will need to install %{name}-devel. s|^#(LogSyslog)|$1|; s|^#(DatabaseOwner) .+$|$1 clam|; s|^(Checks) .+$|$1 24|; - s|^#(NotifyClamd) .+$|$1 %{_sysconfdir}/clamd.conf|; ' etc/freshclam.conf %{__perl} -pi.orig -e ' @@ -203,8 +202,7 @@ fi %{_bindir}/freshclam \ --quiet \ --datadir="%{_localstatedir}/lib/clamav" \ - --log="$LOG_FILE" \ - --daemon-notify="%{_sysconfdir}/clamd.conf" + --log="$LOG_FILE" EOF %{__cat} <<EOF >clamav-milter.sysconfig @@ -258,10 +256,6 @@ install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ %post -# Remove old mirrors.dat, mostly because it will have the wrong -# owner after upgrading from clamav < 0.97: -test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat - /sbin/ldconfig ZONES="/usr/share/zoneinfo/zone.tab" @@ -328,6 +322,12 @@ useradd -r -g clam -d /var/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 +%post db +# Remove old mirrors.dat, mostly because it will have the wrong +# owner after upgrading from clamav < 0.97: +test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat +exit 0 + %clean rm -rf %{buildroot} @@ -402,6 +402,12 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Mar 30 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-12 +- Move deletion of /var/lib/clamav/mirrors.dat to db package. +- Don't enable NotifyClamd in freshclam config and cronjob, as not + everybody is running clamd. Running clamd's will anyway notice + when db is updated. + * Fri Mar 18 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-11 - Delete /var/lib/clamav/mirrors.dat, it will be recreated on first run. - clamav-milter config cleanups. commit 0de58a44516ae5ea2eab503715ab5ea2fb9bf4a7 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Fri Mar 18 09:05:10 2011 +0100 Milter cleanups after problems reported in bz#579370. Delete mirrors.dat in %post since I see no other way of getting the permissions correct. diff --git a/clamav-milter.init b/clamav-milter.init index f87efa7..347fe4b 100644 --- a/clamav-milter.init +++ b/clamav-milter.init @@ -25,7 +25,7 @@ test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter case "$1" in start) echo -n "Starting Clamav Milter Daemon: " - daemon clamav-milter $CLAMAV_FLAGS $SOCKET_ADDRESS + daemon clamav-milter $CLAMAV_FLAGS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamav-milter diff --git a/clamav.spec b/clamav.spec index 90e38b4..4d7776f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 10%{?dist} +Release: 11%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -160,6 +160,13 @@ you will need to install %{name}-devel. s|^#(NotifyClamd) .+$|$1 %{_sysconfdir}/clamd.conf|; ' etc/freshclam.conf +%{__perl} -pi.orig -e ' + s|^(Example)|#$1|; + s|^#(User) .+$|$1 clam|; + s|^#(ClamdSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; + ' etc/clamav-milter.conf + + cat <<EOF >clamd.logrotate %{_localstatedir}/log/clamav/clamd.log { missingok @@ -204,9 +211,7 @@ EOF ### Simple config file for clamav-milter, you should ### read the documentation and tweak it as you wish. -CLAMAV_FLAGS=" - --config-file=%{_sysconfdir}/clamd.conf -" +CLAMAV_FLAGS="" EOF %build @@ -252,12 +257,11 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ -# mirrors.dat might exists with the wrong user on upgrades from pre v0.97, -# touch it here, and later %ghost it so that the permissions are fixed if needed. -touch %{buildroot}%{_localstatedir}/lib/clamav/mirrors.dat - - %post +# Remove old mirrors.dat, mostly because it will have the wrong +# owner after upgrading from clamav < 0.97: +test -f /var/lib/clamav/mirrors.dat && rm -f /var/lib/clamav/mirrors.dat + /sbin/ldconfig ZONES="/usr/share/zoneinfo/zone.tab" @@ -387,7 +391,6 @@ rm -rf %{buildroot} %config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log -%ghost %{_localstatedir}/lib/clamav/mirrors.dat %files devel %defattr(-, root, root, 0755) @@ -399,6 +402,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Fri Mar 18 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-11 +- Delete /var/lib/clamav/mirrors.dat, it will be recreated on first run. +- clamav-milter config cleanups. + * Wed Mar 16 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-10 - Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. - Don't start clamd or milter service by default. commit 86972941e69b28303796b75b36f923ed94c37d88 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Thu Mar 17 10:12:35 2011 +0100 - Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. - Don't start clamd or milter service by default. diff --git a/clamav.spec b/clamav.spec index a756493..90e38b4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -252,6 +252,11 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ +# mirrors.dat might exists with the wrong user on upgrades from pre v0.97, +# touch it here, and later %ghost it so that the permissions are fixed if needed. +touch %{buildroot}%{_localstatedir}/lib/clamav/mirrors.dat + + %post /sbin/ldconfig @@ -382,6 +387,7 @@ rm -rf %{buildroot} %config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log +%ghost %{_localstatedir}/lib/clamav/mirrors.dat %files devel %defattr(-, root, root, 0755) @@ -393,6 +399,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Mar 16 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-10 +- Make sure /var/lib/clamav/mirrors.dat has owner fixed on upgrade. +- Don't start clamd or milter service by default. + * Tue Mar 15 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-7 - rpm-provide all old package names that are now obsoleted commit adb58860131bf63581ba9483ecb8440688b280dc Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 18:23:41 2011 +0100 Don't enable services by default. diff --git a/clamav-milter.init b/clamav-milter.init index 62a2f91..f87efa7 100644 --- a/clamav-milter.init +++ b/clamav-milter.init @@ -2,7 +2,7 @@ # # Startup script for the Clamav Milter Daemon # -# chkconfig: 2345 77 23 +# chkconfig: - 77 23 # description: clamav-milter is a daemon which hooks into sendmail \ # and routes email messages to clamav. # processname: clamav-milter diff --git a/clamav.init b/clamav.init index 0e001fb..848dbce 100755 --- a/clamav.init +++ b/clamav.init @@ -2,7 +2,7 @@ # # Startup script for the Clam AntiVirus Daemon # -# chkconfig: 2345 61 39 +# chkconfig: - 61 39 # description: Clam AntiVirus Daemon is a TCP/IP or socket protocol \ # server. # processname: clamd commit a8bbda52841301f275ac0ad885e98ba0ae31e3e4 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 15:11:59 2011 +0100 Remove broken or deprecated milter and freshclam options. diff --git a/clamav.spec b/clamav.spec index c5573ef..a756493 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -197,7 +197,6 @@ fi --quiet \ --datadir="%{_localstatedir}/lib/clamav" \ --log="$LOG_FILE" \ - --log-verbose \ --daemon-notify="%{_sysconfdir}/clamd.conf" EOF @@ -207,14 +206,7 @@ EOF CLAMAV_FLAGS=" --config-file=%{_sysconfdir}/clamd.conf - --force-scan - --local - --max-children=10 - --noreject - --outgoing - --quiet " -SOCKET_ADDRESS="local:%{_localstatedir}/run/clamav/clmilter.socket" EOF %build commit a89e6fd21e435b5cec12d136672b4ce32a859c46 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 11:20:34 2011 +0100 Obsolete clamav-filesystem in clamav-db package, since this is the first package in the installation chain -- and hopefull this should fix the dependency problem with old clamav-filesystem. diff --git a/clamav.spec b/clamav.spec index 4827933..c5573ef 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -28,8 +28,6 @@ Provides: libclamav Obsoletes: libclamav < %{version}-%{release} Provides: clamav-lib = %{version}-%{release} Obsoletes: clamav-lib < %{version}-%{release} -Provides: clamav-filesystem = %{version}-%{release} -Obsoletes: clamav-filesystem < %{version}-%{release} %description Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of @@ -85,6 +83,10 @@ Obsoletes: clamav-update < %{version}-%{release} Provides: clamav-data = %{version}-%{release} Obsoletes: clamav-data < %{version}-%{release} Obsoletes: clamav-data-empty <= %{version}-%{release} +# Ugly to put these in the db-package, but needed +# here to handle upgrades on EL5. +Provides: clamav-filesystem = %{version}-%{release} +Obsoletes: clamav-filesystem < %{version}-%{release} %description db The actual virus database for %{name} commit aebe2468a4b86955f41ce9ccb61a5236b8d9f481 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Tue Mar 15 10:39:53 2011 +0100 Provide all old package names that are now obsolete. Following the packaging guideline at: http://fedoraproject.org/wiki/PackageNamingGuidelines#Renaming.2Freplacing_… diff --git a/clamav.spec b/clamav.spec index d587dac..4827933 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -24,10 +24,12 @@ Requires: clamav-db = %{version}-%{release} Requires(pre): shadow-utils ### Fedora Extras introduced them differently :( +Provides: libclamav Obsoletes: libclamav < %{version}-%{release} +Provides: clamav-lib = %{version}-%{release} Obsoletes: clamav-lib < %{version}-%{release} +Provides: clamav-filesystem = %{version}-%{release} Obsoletes: clamav-filesystem < %{version}-%{release} -Provides: libclamav %description Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of @@ -45,8 +47,17 @@ Group: System Environment/Daemons Requires: clamav = %{version}-%{release} ### Fedora Extras introduced them differently :( -Obsoletes: clamav-server <= %{version}-%{release} -Obsoletes: clamav-server-sysv <= %{version}-%{release} +Provides: clamav-server = %{version}-%{release} +Obsoletes: clamav-server < %{version}-%{release} +Provides: clamav-server-sysv = %{version}-%{release} +Obsoletes: clamav-server-sysv < %{version}-%{release} +Provides: clamav-scanner = %{version}-%{release} +Obsoletes: clamav-scanner < %{version}-%{release} +Provides: clamav-scanner-upstart = %{version}-%{release} +Obsoletes: clamav-scanner-upstart < %{version}-%{release} +Provides: clamav-server-sysvinit = %{version}-%{release} +Obsoletes: clamav-server-sysvinit < %{version}-%{release} + %description -n clamd The Clam AntiVirus Daemon @@ -56,7 +67,8 @@ Summary: The Clam AntiVirus sendmail-milter Daemon Group: Applications/System Requires: clamd = %{version}-%{release} Requires: sendmail -Obsoletes: clamav-milter-sysv <= %{version}-%{release} +Provides: clamav-milter-sysv = %{version}-%{release} +Obsoletes: clamav-milter-sysv < %{version}-%{release} %description milter The Clam AntiVirus sendmail-milter Daemon @@ -68,8 +80,10 @@ Group: Applications/Databases #Requires: clamav = %{version}-%{release} ### Fedora Extras introduced them differently :( -Obsoletes: clamav-update <= %{version}-%{release} -Obsoletes: clamav-data <= %{version}-%{release} +Provides: clamav-update = %{version}-%{release} +Obsoletes: clamav-update < %{version}-%{release} +Provides: clamav-data = %{version}-%{release} +Obsoletes: clamav-data < %{version}-%{release} Obsoletes: clamav-data-empty <= %{version}-%{release} %description db @@ -385,6 +399,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Mar 15 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-7 +- rpm-provide all old package names that are now obsoleted + * Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-6 - clam-db obsoletes old clamav-data-empty. diff --git a/clamd-wrapper b/clamd-wrapper deleted file mode 100644 index 14c04a5..0000000 --- a/clamd-wrapper +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/bash -# -# Xchkconfig: - 75 25 -# Xdescription: The clamd daemon listens for incoming connections on \ -# Unix or TCP socket and scans files or directories on demand. - -test "$CLAMD_SERVICE" || { - echo $"*** $0 can not be called in this way" - echo $"*** Please see /usr/share/doc/clamav-server-*/README how" - echo $"*** the clamav-server can be configured" - exit 6 -} - -# Source function library. -. /etc/init.d/functions - -# Get config. -test -r /etc/sysconfig/network && . /etc/sysconfig/network - -# Check that networking is up. -test "$NETWORKING" != "no" || exit 6 - -lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} -sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} -procname=clamd.${CLAMD_SERVICE} - -CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -CLAMD_OPTIONS= -## backward-compatibility check... -for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do - CLAMD_SOCKET=$i - test ! -e "$i" || break -done -test -f "$sysconffile" && . "$sysconffile" - - -RETVAL=0 -prog="clamd.${CLAMD_SERVICE}" - -start () { - echo -n $"Starting $prog: " - daemon $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop () { - echo -n $"Stopping $prog: " - killproc $procname - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -reload() { - rc=0 - echo -n $"Reloading $prog: " - killproc $procname -SIGHUP || rc=$? - echo - echo -n $"Loading new virus-database: " - killproc $procname -SIGUSR2 || rc=$? - echo - return $rc -} - -restart () { - stop - start -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 ;; - status) - status $procname ;; - condrestart) - test ! -f $lockfile || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 2 -esac commit cf7db91a88bbba67a6a54ca6c23ec8bd0b7f774d Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Mon Mar 14 12:16:02 2011 +0100 Update release number. diff --git a/clamav.spec b/clamav.spec index 9f0499a..d587dac 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -385,7 +385,7 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog -* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-5 +* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-6 - clam-db obsoletes old clamav-data-empty. * Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 commit a41ce1a97cd1767ba81ec794e455e25c7ab4660a Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Mon Mar 14 12:14:30 2011 +0100 clamav-data was already listed as obsolete.. diff --git a/clamav.spec b/clamav.spec index 0fc3799..9f0499a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -64,14 +64,13 @@ The Clam AntiVirus sendmail-milter Daemon %package db Summary: Virus database for %{name} Group: Applications/Databases -Obsoletes: clamav-data <= %{version}-%{release} -Obsoletes: clamav-data-empty <= %{version}-%{release} ### Remove circular dependency #Requires: clamav = %{version}-%{release} ### Fedora Extras introduced them differently :( Obsoletes: clamav-update <= %{version}-%{release} Obsoletes: clamav-data <= %{version}-%{release} +Obsoletes: clamav-data-empty <= %{version}-%{release} %description db The actual virus database for %{name} @@ -387,7 +386,7 @@ rm -rf %{buildroot} %changelog * Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-5 -- clam-db obsoletes old clamav-data and clamav-data-empty. +- clam-db obsoletes old clamav-data-empty. * Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 - Add back clamd-wrapper to stay compatible with users commit e10bf12213c7977e02534f6d5ed364409e7f64dc Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Mon Mar 14 11:19:15 2011 +0100 Fix upgrade problem when clamav-data or clamav-data-empty was installed. clamav-db obsoletes these. diff --git a/clamav.spec b/clamav.spec index f447f08..0fc3799 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -64,6 +64,8 @@ The Clam AntiVirus sendmail-milter Daemon %package db Summary: Virus database for %{name} Group: Applications/Databases +Obsoletes: clamav-data <= %{version}-%{release} +Obsoletes: clamav-data-empty <= %{version}-%{release} ### Remove circular dependency #Requires: clamav = %{version}-%{release} @@ -384,6 +386,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Mon Mar 14 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-5 +- clam-db obsoletes old clamav-data and clamav-data-empty. + * Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 - Add back clamd-wrapper to stay compatible with users of old packaging (amavisd-new). commit 44c852187fbb517dd9084ca7100404b6fed6d05c Merge: 728c0a6 825f174 Author: Jan-Frode Myklebust <janfrode(a)tanso.net> Date: Sun Mar 13 21:37:43 2011 +0100 Merge branch 'el6' into el5 Conflicts: .gitignore diff --cc .gitignore index f6ee443,720667f..bf9c05a --- a/.gitignore +++ b/.gitignore @@@ -1,6 -1,3 +1,2 @@@ - <<<<<<< HEAD - clamav-0.95.1-norar.tar.bz2 - ======= --clamav-0.95.3-norar.tar.bz2 /clamav-0.97-clean.tar.bz2 - >>>>>>> el6 + /clamd-wrapper.tar.bz2 commit 825f174a59a4b0a16e9b39a0ef524919f00f1f32 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Sun Mar 13 20:25:23 2011 +0000 Update spec, add clamav-wrapper source diff --git a/.gitignore b/.gitignore index cd2bf84..720667f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clamav-0.95.3-norar.tar.bz2 /clamav-0.97-clean.tar.bz2 +/clamd-wrapper.tar.bz2 diff --git a/clamav.spec b/clamav.spec index 824dacd..f447f08 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -15,6 +15,7 @@ URL: http://www.clamav.net/ Source0: clamav-0.97-clean.tar.bz2 Source1: clamav.init Source2: clamav-milter.init +Source3: clamd-wrapper.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel @@ -232,6 +233,8 @@ install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/ %else rm %{buildroot}%{_mandir}/man8/clamav-milter.8* %endif +# Install clamav-wrapper: +tar xjf %{SOURCE3} -C %{buildroot}/%{_prefix}/share install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log @@ -318,6 +321,8 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/clamscan.1* %doc %{_mandir}/man1/freshclam.1* %doc %{_mandir}/man5/freshclam.conf.5* +%doc %{_prefix}/share/clamav/README.clamd-wrapper +%{_prefix}/share/clamav/clamd-wrapper %config(noreplace) %{_sysconfdir}/freshclam.conf %{_bindir}/clamscan %{_bindir}/freshclam @@ -379,6 +384,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Sun Mar 13 2011 Jan-Frode Myklebust <janfrode(a)tanso.net> - 0.97-4 +- Add back clamd-wrapper to stay compatible with users + of old packaging (amavisd-new). + * Wed Feb 23 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.097-3 - Move db to /var/lib/clamav - Ship empty directory /etc/clamd.d for amavisd-new diff --git a/sources b/sources index 70d67b2..27407d3 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 44e7df79718d104db0666d5db3f08682 clamav-0.97-clean.tar.bz2 +ae4e25e5df41b71cf6541e3a876b94a7 clamd-wrapper.tar.bz2 commit 728c0a6675486de0cac83ed18d426cc498e94670 Merge: b413e80 77e0359 Author: Dennis Gilmore <dennis(a)ausil.us> Date: Wed Feb 23 21:22:32 2011 -0600 Merge branch 'el6' into el5 Conflicts: clamav.spec commit 77e0359251880d555b1a367a4f4cb2e1e1b33fcb Author: Nick Bebout <nb(a)fedoraproject.org> Date: Wed Feb 23 17:34:22 2011 -0600 Move db to /var/lib/clamav Add /etc/clamd.d for amavisd-new diff --git a/clamav.spec b/clamav.spec index 3bd0251..824dacd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -94,8 +94,8 @@ you will need to install %{name}-devel. %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure %{__perl} -pi.orig -e ' - s|\@DBDIR\@|\$(localstatedir)/clamav|g; - s|\@DBINST\@|\$(localstatedir)/clamav|g; + s|\@DBDIR\@|\$(localstatedir)/lib/clamav|g; + s|\@DBINST\@|\$(localstatedir)/lib/clamav|g; s|\@CFGDIR\@|\$(sysconfdir)|g; s|\@CFGINST\@|\$(sysconfdir)|g; s|^\@INSTALL_CLAMAV_CONF_TRUE\@|\t|g; @@ -110,7 +110,7 @@ you will need to install %{name}-devel. s|^#(LogSyslog)|$1|; s|^#(PidFile) .+$|$1 %{_localstatedir}/run/clamav/clamd.pid|; s|^#(TemporaryDirectory) .+$|$1 %{_localstatedir}/tmp|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; s|^#(LocalSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; s|^#(FixStaleSocket)|$1|; s|^#(TCPSocket) .+$|$1 3310|; @@ -134,7 +134,7 @@ you will need to install %{name}-devel. %{__perl} -pi.orig -e ' s|^(Example)|#$1|; - s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/lib/clamav|; s|^#(UpdateLogFile) .+$|$1 %{_localstatedir}/log/clamav/freshclam.log|; s|^#(LogSyslog)|$1|; s|^#(DatabaseOwner) .+$|$1 clam|; @@ -177,7 +177,7 @@ fi %{_bindir}/freshclam \ --quiet \ - --datadir="%{_localstatedir}/clamav" \ + --datadir="%{_localstatedir}/lib/clamav" \ --log="$LOG_FILE" \ --log-verbose \ --daemon-notify="%{_sysconfdir}/clamd.conf" @@ -196,7 +196,7 @@ CLAMAV_FLAGS=" --outgoing --quiet " -SOCKET_ADDRESS="local:%{_localstatedir}/clamav/clmilter.socket" +SOCKET_ADDRESS="local:%{_localstatedir}/run/clamav/clmilter.socket" EOF %build @@ -209,7 +209,7 @@ EOF --disable-unrar \ --enable-id-check \ --enable-dns \ - --with-dbdir="%{_localstatedir}/clamav" \ + --with-dbdir="%{_localstatedir}/lib/clamav" \ --with-group="clam" \ --with-libcurl \ --with-user="clam" \ @@ -238,6 +238,7 @@ touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ +install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ %post /sbin/ldconfig @@ -334,6 +335,7 @@ rm -rf %{buildroot} %doc %{_mandir}/man8/clamd.8* %config(noreplace) %{_sysconfdir}/clamd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/clamav +%{_sysconfdir}/clamd.d %config %{_initrddir}/clamd %{_sbindir}/clamd %{_bindir}/clamconf @@ -341,10 +343,10 @@ rm -rf %{buildroot} %defattr(0644, clam, clam, 0755) %{_localstatedir}/run/clamav/ -%dir %{_localstatedir}/clamav/ +%dir %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/clamd.log -%exclude %{_localstatedir}/clamav/* +%exclude %{_localstatedir}/lib/clamav/* %if %{!?_without_milter:1}0 %files milter @@ -363,7 +365,7 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/logrotate.d/freshclam %defattr(0644, clam, clam, 0755) -%config(noreplace) %verify(user group mode) %{_localstatedir}/clamav/ +%config(noreplace) %verify(user group mode) %{_localstatedir}/lib/clamav/ %dir %{_localstatedir}/log/clamav/ %ghost %{_localstatedir}/log/clamav/freshclam.log @@ -377,6 +379,10 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Wed Feb 23 2011 Nick Bebout <nb(a)fedoraproject.org> - 0.097-3 +- Move db to /var/lib/clamav +- Ship empty directory /etc/clamd.d for amavisd-new + * Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 - Disable llvm. commit ade013989017f8044801c73b12a9ddb35ea9007d Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 16:46:26 2011 -0600 Minor changes, bump release to 2 diff --git a/clamav.spec b/clamav.spec index 6e138d3..3bd0251 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -212,7 +212,9 @@ EOF --with-dbdir="%{_localstatedir}/clamav" \ --with-group="clam" \ --with-libcurl \ - --with-user="clam" + --with-user="clam" \ + --disable-llvm + make %{?_smp_mflags} %install @@ -375,6 +377,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 +- Disable llvm. + * Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 - Update to 0.97 - Fix up for current guidelines. commit b413e8038f09e0bae6a347cd56f13f47e3900cd7 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 16:42:16 2011 -0600 Minor changes, bump to Release: 2 diff --git a/clamav.spec b/clamav.spec index 6e138d3..3bd0251 100644 --- a/clamav.spec +++ b/clamav.spec @@ -5,7 +5,7 @@ Summary: Anti-virus software Name: clamav Version: 0.97 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Group: Applications/System URL: http://www.clamav.net/ @@ -212,7 +212,9 @@ EOF --with-dbdir="%{_localstatedir}/clamav" \ --with-group="clam" \ --with-libcurl \ - --with-user="clam" + --with-user="clam" \ + --disable-llvm + make %{?_smp_mflags} %install @@ -375,6 +377,9 @@ rm -rf %{buildroot} %exclude %{_libdir}/libclamav.la %changelog +* Tue Feb 17 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-2 +- Disable llvm. + * Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 - Update to 0.97 - Fix up for current guidelines. commit 98d8227630e520e187aa14ff1c862018c4b5596c Merge: 0909a88 78c8a5a Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 16:33:19 2011 -0600 Merge branch 'el6' into el5 Conflicts: .gitignore clamav.spec clamd-wrapper sources diff --cc .gitignore index c07be39,cd2bf84..f6ee443 --- a/.gitignore +++ b/.gitignore @@@ -1,1 -1,2 +1,6 @@@ ++<<<<<<< HEAD +clamav-0.95.1-norar.tar.bz2 ++======= + clamav-0.95.3-norar.tar.bz2 + /clamav-0.97-clean.tar.bz2 ++>>>>>>> el6 commit 78c8a5ad5f7f687287d016ac730bf48645b177e0 Author: Nick Bebout <nb(a)fedoraproject.org> Date: Mon Feb 21 15:42:47 2011 -0600 Update to 0.097 with new spec diff --git a/.gitignore b/.gitignore index 5b7c836..cd2bf84 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ clamav-0.95.3-norar.tar.bz2 +/clamav-0.97-clean.tar.bz2 diff --git a/ChangeLog-rpm.old b/ChangeLog-rpm.old deleted file mode 100644 index 44c8556..0000000 --- a/ChangeLog-rpm.old +++ /dev/null @@ -1,279 +0,0 @@ -* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 -- updated to 0.88.7 - -* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 -- updated to 0.88.6 - -* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 -- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 -- added patch to set '__attribute__ ((visibility("hidden")))' for - exported MD5_*() functions (fixes #202043) - -* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 -- splitted SysV initscripts of -milter and -server into own subpackages - -* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 -- rebuilt - -* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 -- updated to 0.88.4 (SECURITY) - -* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed the clamdscan(1) manpage from the -server subpackage - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed a superfluous '}' -- removed some code which was relevant for FC-3 only - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 -- updated to 0.88.3 -- updated to new fedora-usermgmt macros - -* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 -- cleanups: removed unneeded curlies, use plain command instead of - %%__XXX macro, whitespace cleanup, removed unneeded versioned - dependencies -- added a 'Requires(post): group(clamav)' dependencies for -update and - added the corresponding Provides: to -data -- removed the %%_without_milter conditional; you won't gain anything - when milter would be disabled at buildtime - -* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 -- updated to 0.88.2 (SECURITY) -- rediffed patches; most issues handled by 0.88.1-2 are fixed in - 0.88.2 - -* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 -- added patch which fixes some classes of compiler warnings; at least - the using of implicitly declared functions was reported to cause - segfaults on AMD64 (brought to my attention by Marc Perkel) -- added patch which fixes wrong usage of strncpy(3) in unrarlib.c - -* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 -- updated to 0.88.1 (SECURITY) - -* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 -- rebuilt for FC5 - -* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 -- updated to 0.88 -- added pseudo-versions for the 'init(...)' provides as a first step - for the support of alternative initmethods - -* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 -- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) -- ship 'clamd.conf.5' man page in the -server subpackage *too*. The - same file is contained in multiple packages now, but this man-page - can not be removed from the base package because it also applies to - 'clamdscan' there (#173221). - -* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 -- updated to 0.87.1 - -* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 -- updated to 0.87 (SECURITY) -- removed -timeout patch; it is solved upstream -- reverted the -exim changes; they add yet more complexity, their - functionality can go into an own package and they contained flaws - -* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 -- Add clamav-exim configuration package - -* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 -- [milter] create the milter-logfile in the %%post scriptlet -- [milter] reverted the change of the default child_timeout value; it - was set to 5 minutes in 0.86.2 which conflicts with the internal - mode where a timeout must not be set. So, the clamav-milter would - not run with the default configuration - -* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 -- Fixed calculation of sleep duration; on some systems/IPs, `hostid` - results in a negative number which is retained by the bash - modulo-operation. So the sleep may get a negative number of seconds - being interpreted as an option. This version makes sure that the - module-operations returns a non-negative value. [BZ #164494, James - Wilkinson] -- added support for a /usr/sbin/clamav-notify-servers.local hook; this - file will be executed (source'd) before all other actions and can - abort the entire processing by invoking 'exit' - -* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 -- updated to 0.86.2 (SECURITY) -- changed the freshclam updating mechanism (again); now, it consists - of a crontab which does not need to be changed and a helper script - (freshclam-sleep). This helper script is configured by - /etc/sysconfig/freshclam - -* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 -- updated to 0.86.1 -- fixed randomization in %%post scriptlet: hour should be a range but - not a single number - -* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 -- updated to 0.86 -- randomize freshclam startup times in -update's %%post script (suggested - by Stephen Smoogen); this requires some more Requires(post): also - -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 -- fix dist tagging the way Enrico wants it - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 -- Rebuild - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 -- Update - -* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 -- updated to 0.85 - -* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 -- updated to 0.84 - -* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> -- rebuilt - -* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 -- updated to 0.83 - -* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 -- updated to 0.82 -- minor spec cleanups - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 -- build the package with '--disable-zlib-vcheck' because RH is unable to - apply a fix for a 5 month old and solved security issue. Please fill - your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 -- added 'BuildRequires: bc' (should work without also, but ./configure - gives out ugly warnings else) - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 -- updated to 0.81 -- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports - an internal mode now which is enabled by default -- updated -milter %%description - -* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 -- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update - subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) - -* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 -- updated to 0.80 -- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore -- buildrequire 'curl-devel' -- renamed clamav.conf to clamd.conf (upstream change) -- updated -initoff patch - -* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 -- updated to 0.75.1 -- use %%configure, the problems with the architecture specification - seem to have passed (probably because of an autoconf update) -- set mode 0600 for the cron-script (required by vixie-cron) -- made the cronjob a spambot and send mail about deactivated freshclam - service to nearly everybody... (root, postmaster, webmaster) -- other fixes in the notification cronjob - -* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 -- updated to 0.75 - -* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 -- moved /usr/bin/clamav-config from main into -devel - -* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 -- updated to 0.74 - -* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 -- updated to 0.73 -- added pkgconfig file - -* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 -- notify the user about a deactivated clamav-update service -- added clamd-gen script which generates template spec-files for - services using clamd -- copied template configuration files to %pkgdatadir/template (needed - for clamd-gen) -- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink - will be provided for compatibility reasons -- conditionalized building of the -milter subpackage ('--without - milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) - -* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 -- removed 'BuildRequires: dietlibc'; it was a leftover from the - pre-use-signal era (before 0.70) (bug #1716) - -* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 -- updated to 0.72 - -* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 -- removed the randomization in the cronjob; it seems to be impossible - to use the mod-operator (%%) there. Instead of, the user has to - replace some placeholders... - -* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 -- updated to 0.71 - -* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 -- quote 'EOF' to delay $RANDOM expansion - -* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 -- updated GECOS entry for the 'clamav' user to describe its purpose - more accurately -- use explicit '-m755' when creating directories with install - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 -- updated to 0.70; rediffed some patches -- updated logrotate script to use signals and documented the steps - which are needed to make it work -- adapted initscript to use signals instead of sockwrite -- removed sockwrite; signals can now be used to reload the database -- added logfile to the -milter subpackage - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 -- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets - -* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 -- split the double Requires(...,...): statements; see - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 -- require the recent fedora-usermgmt package (0.7) which fixes similar - ordering issues - -* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 -- updated to 0.68 (using the -1 version) -- ship milter-files in the -milter instead of the -server subpackage - -* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 -- fixed ':' vs. '.' in chown - -* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 -- randomize freshclam startup to prevent server peaks - -* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 -- updated to 0.67 (using the -1 version) - -* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 -- updated to 0.66; important, packaging-relevant changes are - freshclam: - * $http_proxy is not supported anymore; you have to configure it in - /etc/freshclam.conf - * the logfile has been renamed to /var/log/freshclam.log -- removed %%check section; buildroot check is implemented in local - testsuite already -- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew - files -- added some directory-Requires: -- activated milter-package and made it work -- added patch to disable clamav-milter service by default -- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this - makes things more consistently but can break backward compatibility. The - initscript should deal with the old version too, but I would not bet on - it... -- updated some descriptions -- fixed the update-mechanism; now it happens in two stages: at first, - the files will be downloaded as user 'clamav' and then, root initiates - the daemon-reload. - -* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 -- added security fix for - http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/README.fedora b/README.fedora deleted file mode 100644 index 8df192d..0000000 --- a/README.fedora +++ /dev/null @@ -1,116 +0,0 @@ -A clamav-milter setup consists of the following three components: - -* the clamav-milter itself - - --> this is provided by the 'clamav-milter' package plus (alternatively) - 'clamav-milter-upstart' or 'clamav-milter-sysvinit' - - The main configuration is in /etc/mail/clamav-milter.conf and MUST - be changed before first use. - - The -sysvinit package is managed by the traditional tools, but - -upstart requires modification of /etc/event.d/clamav-milter to - enable automatic startup. See comments there for more details. - -* a clamav scanner daemon - - --> this package is called 'clamav-scanner' plus (alternatively) - 'clamav-scanner-upstart' or 'clamav-scanner-sysvinit' - - The daemon is configured by /etc/clamd.d/scan.conf (which MUST be - edited before first use). - - The -sysvinit package is managed by the traditional tools, but - -upstart requires modification of /etc/event.d/clamd.scan to enable - automatic startup. See comments there for more details. - -* the MTA (sendmail/postfix) - - --> you should know how to install this... - - When communicating across unix sockets with the clamav-milter, it is - suggested to use the /var/run/clamav-milter/clamav-milter.socket - path. You have to add something like - - INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav-milter.socket, F=, T=S:4m;R:4m')dnl - - to your sendmail.mc. - - - -It is suggested that components communicate through TCP sockets as -this eases setup. Please add corresponding packet filter rules! - - -EXAMPLE -======= - -For clamav-milter, a possible setup might be created by - -A) On the MTA (assumed hostname 'host-mta') - - 1. Add to sendmail.mc - - | INPUT_MAIL_FILTER(`clamav', `S=inet:6666@host-milter, F=, T=S:4m;R:4m')dnl - - 2. Rebuild sendmail.cf - - -B) On the clamav-milter host (assumed hostname 'host-milter') - - 1. Install clamav-milter + clamav-milter-upstart packages - - 2. Set in /etc/mail/clamav-milter.conf - - | MilterSocket inet:6666 - | ClamdSocket tcp:host-scanner:6665 - - and all the other options which are required on your system - - 3. Edit /etc/event.d/clamav-milter and uncomment the - - | start on starting local - - line. Restart your system or execute - - | initctl emit starting local - - 4. Add something like - - | iptables -N IN-cmilt - | iptables -A IN-cmilt -s host-mta -j ACCEPT - | iptables -A IN-cmilt -j DROP - - | iptables -A INPUT -p tcp --dport 6666 -j IN-cmilt - - to your firewall setup - -C) On the clamav-scanner host (assumed hostname 'host-scanner') - - 1. Install clamav-scanner + clamav-scanner-upstart packages - - 2. Add to /etc/clamd.d/scan.conf - - | TCPSocket 6665 - | TCPAddr host-scanner - - comment out possible 'LocalSocket' lines and set all the other - options which are required on your system - - 3. Edit /etc/event.d/clamav-scanner and uncomment the - - | start on starting local - - line. Restart your system or execute - - | initctl emit starting local - - 4. Add something like - - | iptables -N IN-cscan - | iptables -A IN-cscan -s host-milter -j ACCEPT - | iptables -A IN-cscan -j DROP - - | iptables -A INPUT -p tcp --dport 6665 -j IN-csan - - to your firewall setup diff --git a/clamav-0.92-open.patch b/clamav-0.92-open.patch deleted file mode 100644 index 040fc20..0000000 --- a/clamav-0.92-open.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 -+++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 -@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da - if (dazuko->device < 0) - { - -- dazuko->device = open("/dev/dazuko", 0); -+ dazuko->device = open("/dev/dazuko", O_RDONLY); - if (dazuko->device < 0) - return -1; - diff --git a/clamav-0.92-private.patch b/clamav-0.92-private.patch deleted file mode 100644 index bab2948..0000000 --- a/clamav-0.92-private.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- clamav-0.92/libclamav.pc.in.private -+++ clamav-0.92/libclamav.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: libclamav - Description: A GPL virus scanner - Version: @LIBCLAMAV_VERSION@ --Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -- -+Libs: -L${libdir} -lclamav -+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ -+Cflags: -I${includedir} ---- clamav-0.92/clamav-config.in.private -+++ clamav-0.92/clamav-config.in -@@ -54,12 +54,8 @@ while test $# -gt 0; do - usage 0 - ;; - -- --cflags) -- echo -I@includedir@ @CFLAGS@ -- ;; -- -- --libs) -- echo -L@libdir@ @LIBCLAMAV_LIBS@ -+ (--cflags|--libs) -+ ${PKG_CONFIG:-pkg-config} "$1" libclamav - ;; - - *) diff --git a/clamav-0.95-cliopts.patch b/clamav-0.95-cliopts.patch deleted file mode 100644 index 90d173f..0000000 --- a/clamav-0.95-cliopts.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: clamav-0.95rc1/shared/optparser.c -=================================================================== ---- clamav-0.95rc1.orig/shared/optparser.c -+++ clamav-0.95rc1/shared/optparser.c -@@ -211,7 +211,7 @@ const struct clam_option clam_options[] - - { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, - -- { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, -+ { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, - - { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, - diff --git a/clamav-0.95.3-umask.patch b/clamav-0.95.3-umask.patch deleted file mode 100644 index 220f7ab..0000000 --- a/clamav-0.95.3-umask.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: clamav-0.95.3/clamav-milter/clamav-milter.c -=================================================================== ---- clamav-0.95.3.orig/clamav-milter/clamav-milter.c -+++ clamav-0.95.3/clamav-milter/clamav-milter.c -@@ -306,7 +306,7 @@ int main(int argc, char **argv) { - - if((opt = optget(opts, "PidFile"))->enabled) { - FILE *fd; -- mode_t old_umask = umask(0002); -+ mode_t old_umask = umask(0022); - - if((fd = fopen(opt->strarg, "w")) == NULL) { - logg("!Can't save PID in file %s\n", opt->strarg); -Index: clamav-0.95.3/shared/output.c -=================================================================== ---- clamav-0.95.3.orig/shared/output.c -+++ clamav-0.95.3/shared/output.c -@@ -270,7 +270,7 @@ int logg(const char *str, ...) - #endif - if(logg_file) { - if(!logg_fp) { -- old_umask = umask(0037); -+ old_umask = umask(0077); - if((logg_fp = fopen(logg_file, "at")) == NULL) { - umask(old_umask); - #ifdef CL_THREAD_SAFE -Index: clamav-0.95.3/freshclam/freshclam.c -=================================================================== ---- clamav-0.95.3.orig/freshclam/freshclam.c -+++ clamav-0.95.3/freshclam/freshclam.c -@@ -102,7 +102,7 @@ static void writepid(const char *pidfile - { - FILE *fd; - int old_umask; -- old_umask = umask(0006); -+ old_umask = umask(0022); - if((fd = fopen(pidfile, "w")) == NULL) { - logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); - } else { diff --git a/clamav-0.97-clean.tar.bz2 b/clamav-0.97-clean.tar.bz2 new file mode 100644 index 0000000..9d39f27 Binary files /dev/null and b/clamav-0.97-clean.tar.bz2 differ diff --git a/clamav-milter.init b/clamav-milter.init new file mode 100644 index 0000000..62a2f91 --- /dev/null +++ b/clamav-milter.init @@ -0,0 +1,58 @@ +#!/bin/sh +# +# Startup script for the Clamav Milter Daemon +# +# chkconfig: 2345 77 23 +# description: clamav-milter is a daemon which hooks into sendmail \ +# and routes email messages to clamav. +# processname: clamav-milter +# pidfile: /var/run/clamav/clamav-milter.pid +# config: /etc/sysconfig/clamav-milter + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +[ -x /usr/sbin/clamav-milter ] || exit 0 + +# Local clamav-milter config +CLAMAV_FLAGS= +test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter + +# See how we were called. +case "$1" in + start) + echo -n "Starting Clamav Milter Daemon: " + daemon clamav-milter $CLAMAV_FLAGS $SOCKET_ADDRESS + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamav-milter + ;; + stop) + echo -n "Stopping Clamav Milter Daemon: " + killproc clamav-milter + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamav-milter + ;; + status) + status clamav-milter + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + [ -e /var/lock/subsys/clamd ] && restart + RETVAL=$? + ;; + *) + echo "Usage: clamav-milter {start|stop|status|restart|reload|condrestart}" + exit 1 +esac + +exit $RETVAL diff --git a/clamav-milter.sysv b/clamav-milter.sysv deleted file mode 100644 index 170cdc1..0000000 --- a/clamav-milter.sysv +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/bash -# -# clamav-milter Starts/stop the "clamav-milter" daemon -# -# chkconfig: - 79 21 -# description: A virus scanning milter - -# Source function library. -. /etc/rc.d/init.d/functions - -exec=/usr/sbin/clamav-milter -prog="clamav-milter" - -OPTS='-c /etc/mail/clamav-milter.conf' -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog - -pidfile=/var/run/clamav-milter/milter.pid -lockfile=/var/lock/subsys/$prog - -start() { - [ -x $exec ] || exit 5 - [ -f $config ] || exit 6 - echo -n $"Starting $prog: " - daemon --pidfile=${pidfile} $exec $OPTS --nofork=no --pid=${pidfile} - retval=$? - echo - [ $retval -eq 0 ] && touch $lockfile - return $retval -} - -stop() { - echo -n $"Stopping $prog: " - killproc -p "${pidfile}" $exec - retval=$? - echo - [ $retval -eq 0 ] && rm -f $lockfile - return $retval -} - -restart() { - stop - start -} - -reload() { - restart -} - -force_reload() { - restart -} - -rh_status() { - # run checks to determine if the service is running or use generic status - status -p "${pidfile}" $prog -} - -rh_status_q() { - rh_status >/dev/null 2>&1 -} - - -case "$1" in - start) - rh_status_q && exit 0 - $1 - ;; - stop) - rh_status_q || exit 0 - $1 - ;; - restart) - $1 - ;; - reload) - rh_status_q || exit 7 - $1 - ;; - force-reload) - force_reload - ;; - status) - rh_status - ;; - condrestart|try-restart) - rh_status_q || exit 0 - restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" - exit 2 -esac -exit $? diff --git a/clamav-milter.upstart b/clamav-milter.upstart deleted file mode 100644 index e0a63f2..0000000 --- a/clamav-milter.upstart +++ /dev/null @@ -1,15 +0,0 @@ -### Uncomment these lines when you want clamav-milter to be a milter -### for a locally running MTA -#start on starting sendmail -#start on starting postfix - -### Uncomment these lines when you want clamav-milter to be a milter -### for a remotely running MTA -#start on starting local - -stop on runlevel 0 -stop on runlevel 1 -stop on runlevel 6 - -respawn -exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --nofork=yes diff --git a/clamav-notify-servers b/clamav-notify-servers deleted file mode 100644 index f115e89..0000000 --- a/clamav-notify-servers +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/bash - -# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# Usage: clamav-notify-servers - -CFGFILE=/etc/sysconfig/clamav-servers -BASE=/var/lock/subsys/clamd. -INITRDDIR=/etc/init.d - -ok=1 - -f=/usr/sbin/clamav-notify-servers.local -test ! -e "$f" || . "$f" - -for i in ${BASE}*; do - test -e "$i" || continue - - srv=${INITRDDIR}/clamd.${i##${BASE}} - test -e "$srv" || continue - - "$srv" reload || ok= -done >/dev/null - -test "$ok" diff --git a/clamav-update.cron b/clamav-update.cron deleted file mode 100644 index 3a69901..0000000 --- a/clamav-update.cron +++ /dev/null @@ -1,6 +0,0 @@ -## Adjust this line... -MAILTO=root - -## It is ok to execute it as root; freshclam drops privileges and becomes -## user 'clamav' as soon as possible -0 */3 * * * root /usr/share/clamav/freshclam-sleep diff --git a/clamav-update.logrotate b/clamav-update.logrotate deleted file mode 100644 index 0de6062..0000000 --- a/clamav-update.logrotate +++ /dev/null @@ -1,4 +0,0 @@ -/var/log/freshclam.log { - monthly - notifempty -} diff --git a/clamav.init b/clamav.init new file mode 100755 index 0000000..0e001fb --- /dev/null +++ b/clamav.init @@ -0,0 +1,58 @@ +#!/bin/sh +# +# Startup script for the Clam AntiVirus Daemon +# +# chkconfig: 2345 61 39 +# description: Clam AntiVirus Daemon is a TCP/IP or socket protocol \ +# server. +# processname: clamd +# pidfile: /var/run/clamav/clamd.pid +# config: /etc/clamav.conf + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +[ -x /usr/sbin/clamd ] || exit 0 + +# See how we were called. +case "$1" in + start) + echo -n "Starting Clam AntiVirus Daemon: " + daemon clamd + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/clamd + ;; + stop) + echo -n "Stopping Clam AntiVirus Daemon: " + killproc clamd + rm -f /var/clamav/clamd.socket + rm -f /var/run/clamav/clamav.pid + RETVAL=$? + echo +### heres the fix... we gotta remove the stale files on restart + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/clamd + ;; + status) + status clamd + RETVAL=$? + ;; + restart|reload) + $0 stop + $0 start + RETVAL=$? + ;; + condrestart) + [ -e /var/lock/subsys/clamd ] && restart + RETVAL=$? + ;; + *) + echo "Usage: clamd {start|stop|status|restart|reload|condrestart}" + exit 1 +esac + +exit $RETVAL + diff --git a/clamav.spec b/clamav.spec index 88935d7..6e138d3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,879 +1,579 @@ -#global snapshot rc1 - -## Fedora Extras specific customization below... -%bcond_without fedora -%bcond_without upstart -%bcond_with unrar -%bcond_without noarch -## - -%global username clamupdate -%global homedir %_var/lib/clamav -%global freshclamlog %_var/log/freshclam.log -%global milteruser clamilt -%global milterlog %_var/log/clamav-milter.log -%global milterstatedir %_var/run/clamav-milter -%global pkgdatadir %_datadir/%name - -%global scanuser clamscan -%global scanstatedir %_var/run/clamd.scan - -%{?with_noarch:%global noarch BuildArch: noarch} -%{!?release_func:%global release_func() %1%{?dist}} - -Summary: End-user tools for the Clam Antivirus scanner -Name: clamav -Version: 0.95.3 -Release: %release_func 1200%{?snapshot:.%snapshot} - -License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} -Group: Applications/File -URL: http://www.clamav.net -%if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… -%else -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# tarball was created by -# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: %name-%version%{?snapshot}-norar.tar.bz2 -%endif -Source1: clamd-wrapper -Source2: clamd.sysconfig -Source3: clamd.logrotate -Source5: clamd-README -Source6: clamav-update.logrotate -Source7: clamd.SERVICE.init -Source8: clamav-notify-servers -Patch24: clamav-0.92-private.patch -Patch25: clamav-0.92-open.patch -Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95.3-umask.patch -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: clamav-lib = %version-%release -Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: ncurses-devel -BuildRequires: %_includedir/tcpd.h -BuildRequires: bc - -%package filesystem -Summary: Filesystem structure for clamav -Group: Applications/File -Provides: user(%username) = 4 -Provides: group(%username) = 4 -# Prevent version mix -Conflicts: %name < %version-%release -Conflicts: %name > %version-%release -BuildRequires: fedora-usermgmt-devel -%{?noarch} -%{?FE_USERADD_REQ} - -%package lib -Summary: Dynamic libraries for the Clam Antivirus scanner -Group: System Environment/Libraries -Requires: data(clamav) - -%package devel -Summary: Header files and libraries for the Clam Antivirus scanner -Group: Development/Libraries -Source100: clamd-gen -Requires: clamav-lib = %version-%release -Requires: clamav-filesystem = %version-%release -Requires(pre): %_libdir/pkgconfig -Requires: pkgconfig - -%package data -Summary: Virus signature data for the Clam Antivirus scanner -Group: Applications/File -Requires(pre): clamav-filesystem = %version-%release -Requires(postun): clamav-filesystem = %version-%release -Provides: data(clamav) = full -Conflicts: data(clamav) < full -Conflicts: data(clamav) > full -%{?noarch} - -%package data-empty -Summary: Empty data package for the Clam Antivirus scanner -Group: Applications/File -Provides: data(clamav) = empty -Conflicts: data(clamav) < empty -Conflicts: data(clamav) > empty -%{?noarch} - -%package update -Summary: Auto-updater for the Clam Antivirus scanner data-files -Group: Applications/File -Source200: freshclam-sleep -Source201: freshclam.sysconfig -Source202: clamav-update.cron -Requires: clamav-filesystem = %version-%release -Requires(pre): /etc/cron.d -Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod -Requires(post): group(%username) - -%package server -Summary: Clam Antivirus scanner server -Group: System Environment/Daemons -Requires: data(clamav) -Requires: clamav-filesystem = %version-%release -Requires: clamav-lib = %version-%release - -%package server-sysvinit -Summary: SysV initscripts for clamav server -Group: System Environment/Daemons -Provides: init(clamav-server) = sysv -Requires: clamav-server = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir -Provides: clamav-server-sysv = %version-%release -Obsoletes: clamav-server-sysv < %version-%release -%{?noarch} - - -%package scanner -Summary: Clamav scanner daemon -Group: System Environment/Daemons -Requires: init(clamav-scanner) -Provides: user(%scanuser) = 49 -Provides: group(%scanuser) = 49 -Requires: clamav-server = %version-%release -%{?noarch} - -%package scanner-sysvinit -Summary: SysV initscripts for clamav scanner daemon -Group: System Environment/Daemons -Provides: init(clamav-scanner) = sysv -Requires: clamav-server-sysvinit = %version-%release -Requires: clamav-scanner = %version-%release -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -%{?noarch} - -%package scanner-upstart -Summary: Upstart initscripts for clamav scanner daemon -Group: System Environment/Daemons -Source410: clamd.scan.upstart -Provides: init(clamav-scanner) = upstart -Requires: clamav-scanner = %version-%release -# implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d -Requires(post): /usr/bin/killall -Requires(postun): /sbin/initctl -%{?noarch} - - -%package milter -Summary: Milter module for the Clam Antivirus scanner -Group: System Environment/Daemons -Source300: README.fedora -Requires: init(clamav-milter) -BuildRequires: sendmail-devel -BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) = 5 -Provides: group(%milteruser) = 5 -Requires(post): coreutils -%{?FE_USERADD_REQ} - -Provides: milter(clamav) = sendmail -Provides: milter(clamav) = postfix - -Provides: clamav-milter-core = %version-%release -Obsoletes: clamav-milter-core < %version-%release -Provides: clamav-milter-sendmail = %version-%release -Obsoletes: clamav-milter-sendmail < %version-%release - -%package milter-sysvinit -Summary: SysV initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source320: clamav-milter.sysv -Provides: init(clamav-milter) = sysvinit -Requires: clamav-milter = %version-%release -Requires(post): user(%milteruser) clamav-milter -Requires(preun): user(%milteruser) clamav-milter -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig -Requires(preun): chkconfig initscripts -Provides: clamav-milter-sysv = %version-%release -Obsoletes: clamav-milter-sysv < %version-%release -%{?noarch} - -%package milter-upstart -Summary: Upstart initscripts for the clamav sendmail-milter -Group: System Environment/Daemons -Source310: clamav-milter.upstart -Provides: init(clamav-milter) = upstart -Requires: clamav-milter = %version-%release -# implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d -Requires(post): /usr/bin/killall -Requires(postun): /sbin/initctl -%{?noarch} - +### FIXME: Sysv script does not have condrestart option (redo sysv script) +### FIXME: amavisd-new requires clamd to run as user vscan, solution needed +### REMINDER: Look and sync with Petr Kristof's work + +Summary: Anti-virus software +Name: clamav +Version: 0.97 +Release: 1%{?dist} +License: GPLv2 +Group: Applications/System +URL: http://www.clamav.net/ + +# Upstream source includes libunrar that is not distributable. +#Source: http://downloads.sourceforge.net/clamav/clamav-%{version}.tar.gz +Source0: clamav-0.97-clean.tar.bz2 +Source1: clamav.init +Source2: clamav-milter.init +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel +%{!?_without_milter:BuildRequires: sendmail-devel >= 8.12} +Requires: clamav-db = %{version}-%{release} +Requires(pre): shadow-utils + +### Fedora Extras introduced them differently :( +Obsoletes: libclamav < %{version}-%{release} +Obsoletes: clamav-lib < %{version}-%{release} +Obsoletes: clamav-filesystem < %{version}-%{release} +Provides: libclamav %description -Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this -software is the integration with mail servers (attachment scanning). The -package provides a flexible and scalable multi-threaded daemon, a command -line scanner, and a tool for automatic updating via Internet. The programs -are based on a shared library distributed with the Clam AntiVirus package, -which you can use with your own software. The virus database is based on -the virus database from OpenAntiVirus, but contains additional signatures -(including signatures for popular polymorphic viruses, too) and is KEPT UP -TO DATE. - -%description filesystem -This package provides the filesystem structure and contains the -user-creation scripts required by clamav. - -%description lib -This package contains dynamic libraries shared between applications -using the Clam Antivirus scanner. - -%description devel -This package contains headerfiles and libraries which are needed to -build applications using clamav. - -%description data -This package contains the virus-database needed by clamav. This -database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. This package and the -'clamav-data-empty' package are mutually exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - - -%description data-empty -This is an empty package to fulfill inter-package dependencies of the -clamav suite. This package and the 'clamav-data' package are mutually -exclusive. - -Use -data when you want a working (but perhaps outdated) virus scanner -immediately after package installation. - -Use -data-empty when you are updating the virus database regulary and -do not want to download a >5MB sized rpm-package with outdated virus -definitions. - +Clam AntiVirus is a GPL anti-virus toolkit for UNIX. The main purpose of +this software is the integration with mail servers (attachment scanning). +The package provides a flexible and scalable multi-threaded daemon, a +command line scanner, and a tool for automatic updating via Internet. -%description update -This package contains programs which can be used to update the clamav -anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. +The programs are based on a shared library distributed with the Clam +AntiVirus package, which you can use with your own software. Most +importantly, the virus database is kept up to date -%description server -ATTENTION: most users do not need this package; the main package has -everything (or depends on it) which is needed to scan for virii on -workstations. +%package -n clamd +Summary: The Clam AntiVirus Daemon +Group: System Environment/Daemons +Requires: clamav = %{version}-%{release} -This package contains files which are needed to execute the clamd-daemon. -This daemon does not provide a system-wide service. Instead of, an instance -of this daemon should be started for each service requiring it. +### Fedora Extras introduced them differently :( +Obsoletes: clamav-server <= %{version}-%{release} +Obsoletes: clamav-server-sysv <= %{version}-%{release} -See the README file how this can be done with a minimum of effort. - - -%description server-sysvinit -SysV initscripts template for the clamav server - - -%description scanner -This package contains a generic system wide clamd service which is -e.g. used by the clamav-milter package. - -%description scanner-sysvinit -The SysV initscripts for clamav-scanner. - -%description scanner-upstart -The Upstart initscripts for clamav-scanner. +%description -n clamd +The Clam AntiVirus Daemon +%package milter +Summary: The Clam AntiVirus sendmail-milter Daemon +Group: Applications/System +Requires: clamd = %{version}-%{release} +Requires: sendmail +Obsoletes: clamav-milter-sysv <= %{version}-%{release} %description milter -This package contains files which are needed to run the clamav-milter. +The Clam AntiVirus sendmail-milter Daemon -%description milter-sysvinit -The SysV initscripts for clamav-milter. +%package db +Summary: Virus database for %{name} +Group: Applications/Databases +### Remove circular dependency +#Requires: clamav = %{version}-%{release} -%description milter-upstart -The Upstart initscripts for clamav-milter. +### Fedora Extras introduced them differently :( +Obsoletes: clamav-update <= %{version}-%{release} +Obsoletes: clamav-data <= %{version}-%{release} -## ------------------------------------------------------------ - -%prep -%setup -q -n %{name}-%{version}%{?snapshot} +%description db +The actual virus database for %{name} -%patch24 -p1 -b .private -%patch25 -p1 -b .open -%patch26 -p1 -b .cliopts -%patch27 -p1 -b .umask - -install -p -m0644 %SOURCE300 clamav-milter/ - -mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} +%package devel +Summary: Header files, libraries and development documentation for %{name} +Group: Development/Libraries +Requires: clamav = %{version}-%{release} -sed -ri \ - -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ - -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ - -e 's!^#?(User ).*!\1<USER>!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ - -e 's! /usr/local/share/clamav,! %homedir,!g' \ - etc/clamd.conf +### Fedora Extras introduced them differently :( +Obsoletes: libclamav-static-devel <= %{version}-%{release} +Obsoletes: libclamav-devel <= %{version}-%{release} +Provides: libclamav-static-devel, libclamav-devel -sed -ri \ - -e 's!^#?(UpdateLogFile )!#\1!g;' \ - -e 's!^#?(LogSyslog).*!\1 yes!g' \ - -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf +%description devel +This package contains the header files, static libraries and development +documentation for %{name}. If you like to develop programs using %{name}, +you will need to install %{name}-devel. +%prep +%setup -q + +%{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g;' libtool configure + +%{__perl} -pi.orig -e ' + s|\@DBDIR\@|\$(localstatedir)/clamav|g; + s|\@DBINST\@|\$(localstatedir)/clamav|g; + s|\@CFGDIR\@|\$(sysconfdir)|g; + s|\@CFGINST\@|\$(sysconfdir)|g; + s|^\@INSTALL_CLAMAV_CONF_TRUE\@|\t|g; + s|^\@INSTALL_FRESHCLAM_CONF_TRUE\@|\t|g; + ' database/Makefile.in etc/Makefile.in + +%{__perl} -pi.orig -e ' + s|^(Example)|#$1|; + s|^#(LogFile) .+$|$1 %{_localstatedir}/log/clamav/clamd.log|; + s|^#(LogFileMaxSize) .*|$1 0|; + s|^#(LogTime)|$1|; + s|^#(LogSyslog)|$1|; + s|^#(PidFile) .+$|$1 %{_localstatedir}/run/clamav/clamd.pid|; + s|^#(TemporaryDirectory) .+$|$1 %{_localstatedir}/tmp|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(LocalSocket) .+$|$1 %{_localstatedir}/run/clamav/clamd.sock|; + s|^#(FixStaleSocket)|$1|; + s|^#(TCPSocket) .+$|$1 3310|; + s|^#(TCPAddr) .+$|$1 127.0.0.1|; + s|^#(MaxConnectionQueueLength) .+$|$1 30|; + s|^#(StreamSaveToDisk)|$1|; + s|^#(MaxThreads) .+$|$1 50|; + s|^#(ReadTimeout) .+$|$1 300|; + s|^#(User) .+$|$1 clam|; + s|^#(AllowSupplementaryGroups).*$|$1 yes|; + s|^#(ScanPE) .+$|$1 yes|; + s|^#(ScanELF) .+$|$1 yes|; + s|^#(DetectBrokenExecutables)|$1|; + s|^#(ScanOLE2) .+$|$1 yes|; + s|^#(ScanMail)|$1|; + s|^#(ScanArchive) .+$|$1 yes|; + s|^#(ArchiveMaxCompressionRatio) .+|$1 300|; + s|^#(ArchiveBlockEncrypted)|$1|; + s|^#(ArchiveBlockMax)|$1|; + ' etc/clamd.conf + +%{__perl} -pi.orig -e ' + s|^(Example)|#$1|; + s|^#(DatabaseDirectory) .+$|$1 %{_localstatedir}/clamav|; + s|^#(UpdateLogFile) .+$|$1 %{_localstatedir}/log/clamav/freshclam.log|; + s|^#(LogSyslog)|$1|; + s|^#(DatabaseOwner) .+$|$1 clam|; + s|^(Checks) .+$|$1 24|; + s|^#(NotifyClamd) .+$|$1 %{_sysconfdir}/clamd.conf|; + ' etc/freshclam.conf + +cat <<EOF >clamd.logrotate +%{_localstatedir}/log/clamav/clamd.log { + missingok + notifempty + create 644 clam clam + postrotate + killall -HUP clamd 2>/dev/null || : + endscript +} +EOF -## ------------------------------------------------------------ +cat <<EOF >freshclam.logrotate +%{_localstatedir}/log/clamav/freshclam.log { + missingok + notifempty + create 644 clam clam +} +EOF + +cat <<'EOF' >freshclam.cron +#!/bin/sh + +### A simple update script for the clamav virus database. +### This could as well be replaced by a SysV script. + +### fix log file if needed +LOG_FILE="%{_localstatedir}/log/clamav/freshclam.log" +if [ ! -f "$LOG_FILE" ]; then + touch "$LOG_FILE" + chmod 644 "$LOG_FILE" + chown clam.clam "$LOG_FILE" +fi + +%{_bindir}/freshclam \ + --quiet \ + --datadir="%{_localstatedir}/clamav" \ + --log="$LOG_FILE" \ + --log-verbose \ + --daemon-notify="%{_sysconfdir}/clamd.conf" +EOF + +%{__cat} <<EOF >clamav-milter.sysconfig +### Simple config file for clamav-milter, you should +### read the documentation and tweak it as you wish. + +CLAMAV_FLAGS=" + --config-file=%{_sysconfdir}/clamd.conf + --force-scan + --local + --max-children=10 + --noreject + --outgoing + --quiet +" +SOCKET_ADDRESS="local:%{_localstatedir}/clamav/clmilter.socket" +EOF %build -CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" -export LDFLAGS='-Wl,--as-needed' -# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check -export LIBS='-lmilter -lpthread' -# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine -export have_cv_ipv6=yes -%configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static \ - --disable-rpath \ - --with-user=%username \ - --with-group=%username \ - %{!?with_unrar:--disable-unrar} - -# TODO: check periodically that CLAMAVUSER is used for freshclam only - - -# build with --as-needed and disable rpath -sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ - libtool - - +%configure \ + --program-prefix="%{?_program_prefix}" \ +%{!?_without_milter:--enable-milter} \ + --disable-clamav \ + --disable-static \ + --disable-zlib-vcheck \ + --disable-unrar \ + --enable-id-check \ + --enable-dns \ + --with-dbdir="%{_localstatedir}/clamav" \ + --with-group="clam" \ + --with-libcurl \ + --with-user="clam" make %{?_smp_mflags} - -## ------------------------------------------------------------ - %install -rm -rf "$RPM_BUILD_ROOT" _doc* -make DESTDIR="$RPM_BUILD_ROOT" install - -function smartsubst() { - local tmp - local regexp=$1 - shift - - tmp=$(mktemp /tmp/%name-subst.XXXXXX) - for i; do - sed -e "$regexp" "$i" >$tmp - cmp -s $tmp "$i" || cat $tmp >"$i" - rm -f $tmp - done -} - - -install -d -m755 \ - ${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,event.d} \ - ${RPM_BUILD_ROOT}%_var/log \ - ${RPM_BUILD_ROOT}%milterstatedir \ - ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir \ - ${RPM_BUILD_ROOT}%scanstatedir +rm -rf %{buildroot} +make install DESTDIR="%{buildroot}" -rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ - ${RPM_BUILD_ROOT}%_libdir/*.la - - -touch ${RPM_BUILD_ROOT}%homedir/daily.cld -touch ${RPM_BUILD_ROOT}%homedir/main.cld +install -Dp -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/clamd +install -Dp -m0755 freshclam.cron %{buildroot}%{_sysconfdir}/cron.daily/freshclam +install -Dp -m0644 freshclam.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/freshclam +install -Dp -m0644 clamd.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/clamav +%if %{!?_without_milter:1}0 +install -Dp -m0755 %{SOURCE2} %{buildroot}%{_initrddir}/clamav-milter +install -Dp -m0644 clamav-milter.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/clamav-milter +%else +rm %{buildroot}%{_mandir}/man8/clamav-milter.8* +%endif -## prepare the server-files -mkdir _doc_server -install -m644 -p %SOURCE2 _doc_server/clamd.sysconfig -install -m644 -p %SOURCE3 _doc_server/clamd.logrotate -install -m755 -p %SOURCE7 _doc_server/clamd.init -install -m644 -p %SOURCE5 _doc_server/README -install -m644 -p etc/clamd.conf _doc_server/clamd.conf +install -d -m0755 %{buildroot}%{_localstatedir}/log/clamav/ +touch %{buildroot}%{_localstatedir}/log/clamav/freshclam.log +touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log -install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir -install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper +install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ -smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper +%post +/sbin/ldconfig +ZONES="/usr/share/zoneinfo/zone.tab" +CONFIG="/etc/sysconfig/clock" -## prepare the update-files -install -m644 -p %SOURCE6 ${RPM_BUILD_ROOT}%_sysconfdir/logrotate.d/clamav-update -install -m755 -p %SOURCE8 ${RPM_BUILD_ROOT}%_sbindir/clamav-notify-servers -touch ${RPM_BUILD_ROOT}%freshclamlog +if [ -r "$CONFIG" -a -r "$ZONES" ]; then + source "$CONFIG" + export CODE="$(grep -E "\b$ZONE\b" "$ZONES" | head -1 | cut -f1 | tr [A-Z] [a-z])" +fi -install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update +if [ -z "$CODE" ]; then + export CODE="local" +fi -smartsubst 's!webmaster,clamav!webmaster,%username!g; - s!/usr/share/clamav!%pkgdatadir!g; - s!/usr/bin!%_bindir!g; - s!/usr/sbin!%_sbindir!g;' \ - $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ - $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +%{__perl} -pi -e ' + s|^(DatabaseMirror) database\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; + s|^(DatabaseMirror) db\.\.clamav\.net$|$1 db.$ENV{"CODE"}.clamav.net\n$1 db.local.clamav.net|; + ' %{_sysconfdir}/freshclam.conf{,.rpmnew} &>/dev/null || : +%postun -p /sbin/ldconfig -### The scanner stuff -sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf +%pre +getent group clam >/dev/null || groupadd -r clam +getent passwd clam >/dev/null || \ +useradd -r -g clam -d /var/clamav -s /sbin/nologin \ + -c "Clam Anti Virus Checker" clam +exit 0 -sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ - > $RPM_BUILD_ROOT%_initrddir/clamd.scan +%pre -n clamd +getent group clam >/dev/null || groupadd -r clam +getent passwd clam >/dev/null || \ +useradd -r -g clam -d /var/clamav -s /sbin/nologin \ + -c "Clam Anti Virus Checker" clam +exit 0 -install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamd.scan +%post -n clamd +/sbin/chkconfig --add clamd -touch $RPM_BUILD_ROOT%scanstatedir/clamd.sock +%preun -n clamd +if [ $1 -eq 0 ]; then + /sbin/service clamd stop &>/dev/null || : + /sbin/chkconfig --del clamd +fi +%postun -n clamd +/sbin/service clamd condrestart &>/dev/null || : -### The milter stuff -sed -r \ - -e 's!^#?(User).*!\1 %milteruser!g' \ - -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ - -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ - -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ - -e 's! /tmp/clamav-milter.log! %milterlog!g' \ - etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf +%post milter +/sbin/chkconfig --add clamav-milter -install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamav-milter -install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +%preun milter +if [ $1 -eq 0 ]; then + /sbin/service clamav-milter stop &>/dev/null || : + /sbin/chkconfig --del clamav-milter +fi +%postun milter +/sbin/service clamav-milter condrestart &>/dev/null || : -rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf -touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} +%pre db +getent group clam >/dev/null || groupadd -r clam +getent passwd clam >/dev/null || \ +useradd -r -g clam -d /var/clamav -s /sbin/nologin \ + -c "Clam Anti Virus Checker" clam +exit 0 -%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/event.d} +%clean +rm -rf %{buildroot} -## ------------------------------------------------------------ +%files +%defattr(-, root, root, 0755) +%doc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL NEWS README test/ +%doc docs/*.pdf etc/freshclam.conf +%doc %{_mandir}/man1/sigtool.1* +%doc %{_mandir}/man1/clamscan.1* +%doc %{_mandir}/man1/freshclam.1* +%doc %{_mandir}/man5/freshclam.conf.5* +%config(noreplace) %{_sysconfdir}/freshclam.conf +%{_bindir}/clamscan +%{_bindir}/freshclam +%{_bindir}/sigtool +%{_bindir}/clambc +%{_libdir}/libclamav.so.* + +%files -n clamd +%defattr(-, root, root, 0755) +%doc etc/clamd.conf +%doc %{_mandir}/man1/clamdscan.1* +%doc %{_mandir}/man1/clamconf.1* +%doc %{_mandir}/man1/clamdtop.1* +%doc %{_mandir}/man5/clamd.conf.5* +%doc %{_mandir}/man8/clamd.8* +%config(noreplace) %{_sysconfdir}/clamd.conf +%config(noreplace) %{_sysconfdir}/logrotate.d/clamav +%config %{_initrddir}/clamd +%{_sbindir}/clamd +%{_bindir}/clamconf +%{_bindir}/clamdscan + +%defattr(0644, clam, clam, 0755) +%{_localstatedir}/run/clamav/ +%dir %{_localstatedir}/clamav/ +%dir %{_localstatedir}/log/clamav/ +%ghost %{_localstatedir}/log/clamav/clamd.log +%exclude %{_localstatedir}/clamav/* + +%if %{!?_without_milter:1}0 +%files milter +%defattr(-, root, root, 0755) +%doc %{_mandir}/man5/clamav-milter.conf.5* +%doc %{_mandir}/man8/clamav-milter.8* +%config(noreplace) %{_sysconfdir}/sysconfig/clamav-milter +%config %{_initrddir}/clamav-milter +%{_sbindir}/clamav-milter +%config(noreplace) %{_sysconfdir}/clamav-milter.conf +%endif -%clean -rm -rf "$RPM_BUILD_ROOT" +%files db +%defattr(-, root, root, 0755) +%config(noreplace) %{_sysconfdir}/cron.daily/freshclam +%config(noreplace) %{_sysconfdir}/logrotate.d/freshclam -## ------------------------------------------------------------ +%defattr(0644, clam, clam, 0755) +%config(noreplace) %verify(user group mode) %{_localstatedir}/clamav/ +%dir %{_localstatedir}/log/clamav/ +%ghost %{_localstatedir}/log/clamav/freshclam.log -%triggerprein filesystem -- clamav-filesystem < 0.96 -## REMOVE me in F14 or F15 (added in pre F12) -! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { - /usr/sbin/usermod -l %username clamav || : - /usr/sbin/groupmod -n %username clamav || : - logger -t rpm/clamav "Renamed clamav user+group to %username" || : -} +%files devel +%defattr(-, root, root, 0755) +%{_bindir}/clamav-config +%{_includedir}/clamav.h +%{_libdir}/libclamav.so +%{_libdir}/pkgconfig/libclamav.pc +#%{_libdir}/libclamav.a +%exclude %{_libdir}/libclamav.la -%pre filesystem -%__fe_groupadd 4 -r %username &>/dev/null || : -%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ - -c 'Clamav database update user' -g %username %username &>/dev/null || : +%changelog +* Tue Feb 08 2011 Kevin Fenzi <kevin(a)tummy.com> - 0.97-1 +- Update to 0.97 +- Fix up for current guidelines. -%postun filesystem -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : +* Fri Nov 23 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-3 +- Change username to get upgrades from fedora versions working. +* Thu Nov 22 2007 Kevin Fenzi <kevin(a)tummy.com> - 0.91.2-2 +- Initial changes for EPEL version. -%pre scanner -%__fe_groupadd 49 -r %scanuser &>/dev/null || : -%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ - -g %scanuser %scanuser &>/dev/null || : +* Tue Aug 21 2007 Dag Wieers <dag(a)wieers.com> - 0.91.2-1 +- Updated to release 0.91.2. -%postun scanner -%__fe_userdel %scanuser &>/dev/null || : -%__fe_groupdel %scanuser &>/dev/null || : +* Tue Jul 17 2007 Dag Wieers <dag(a)wieers.com> - 0.91.1-1 +- Updated to release 0.91.1. +* Wed Jul 11 2007 Dag Wieers <dag(a)wieers.com> - 0.91-1 +- Updated to release 0.91. -%post scanner-sysvinit -/sbin/chkconfig --add clamd.scan +* Thu May 31 2007 Dag Wieers <dag(a)wieers.com> - 0.90.3-1 +- Updated to release 0.90.3. -%preun scanner-sysvinit -test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.scan +* Fri Apr 27 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-2 +- Added clamav-milter support for EL2.1 now that it comes with a newer sendmail. (Tom G. Christensen) -%postun scanner-sysvinit -test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : +* Sun Apr 15 2007 Dag Wieers <dag(a)wieers.com> - 0.90.2-1 +- Updated to release 0.90.2. +* Fri Mar 09 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-4 +- Removed circular dependency. -%post scanner-upstart -/usr/bin/killall -u %scanuser clamd 2>/dev/null || : +* Thu Mar 08 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-3 +- Cleaned up default options to clamav-milter. (Adam T. Bowen) +- Removed -b/--bounce as it is no longer recognized. (Gerald Teschl) -%preun scanner-upstart -test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : +* Mon Mar 05 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-2 +- Removed the erroneous --dont-clean-log from the clamav-milter sysconfig. (Gerald Teschl) +* Fri Mar 02 2007 Dag Wieers <dag(a)wieers.com> - 0.90.1-1 +- Updated to release 0.90.1. +* Tue Feb 20 2007 Dag Wieers <dag(a)wieers.com> - 0.90-3 +- Do the right thing... -%post update -test -e %freshclamlog || { - touch %freshclamlog - %__chmod 0664 %freshclamlog - %__chown root:%username %freshclamlog -} +* Mon Feb 19 2007 Dag Wieers <dag(a)wieers.com> - 0.90-2 +- The tarball was re-rolled before public release. Sigh. +* Tue Feb 13 2007 Dag Wieers <dag(a)wieers.com> - 0.90-1 +- Updated to release 0.90. -%triggerin milter -- clamav-scanner -# Add the milteruser to the scanuser group; this is required when -# milter and clamd communicate through local sockets -/usr/sbin/usermod -a -G %scanuser %milteruser &>/dev/null || : +* Tue Dec 12 2006 Dag Wieers <dag(a)wieers.com> - 0.88.7-1 +- Updated to release 0.88.7. -%pre milter -%__fe_groupadd 5 -r %milteruser &>/dev/null || : -%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : +* Sun Nov 05 2006 Dag Wieers <dag(a)wieers.com> - 0.88.6-1 +- Updated to release 0.88.6. +- Added condrestart to sysv scripts. (Tsai Li Ming) -%post milter -test -e %milterlog || { - touch %milterlog - chmod 0620 %milterlog - chown root:%milteruser %milterlog -} +* Sat Oct 28 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-2 +- Added missing clamav dependency to clamav-db. -%postun milter -%__fe_userdel %milteruser &>/dev/null || : -%__fe_groupdel %milteruser &>/dev/null || : +* Sun Oct 15 2006 Dag Wieers <dag(a)wieers.com> - 0.88.5-1 +- Updated to release 0.88.5. +* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.4-1 +- Updated to release 0.88.4. -%post milter-sysvinit -/sbin/chkconfig --add clamav-milter +* Mon Aug 07 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-2 +- Incorporated UPX heap overflow fix. -%preun milter-sysvinit -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter +* Sat Jul 01 2006 Dag Wieers <dag(a)wieers.com> - 0.88.3-1 +- Updated to release 0.88.3. -%postun milter-sysvinit -test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : +* Sun Apr 30 2006 Dag Wieers <dag(a)wieers.com> - 0.88.2-1 +- Updated to release 0.88.2. +* Tue Apr 04 2006 Dag Wieers <dag(a)wieers.com> - 0.88.1-1 +- Updated to release 0.88.1. -%post milter-upstart -/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : +* Mon Jan 09 2006 Dag Wieers <dag(a)wieers.com> - 0.88-1 +- Updated to release 0.88. -%preun milter-upstart -test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : +* Sun Nov 13 2005 Dries Verachtert <dries(a)ulyssis.org> - 0.87.1-1 +- Updated to release 0.87.1. +* Sat Sep 17 2005 Dag Wieers <dag(a)wieers.com> - 0.87-1 +- Updated to release 0.87. -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig +* Mon Jul 25 2005 Dag Wieers <dag(a)wieers.com> - 0.86.2-1 +- Updated to release 0.86.2. +* Mon Jul 11 2005 Dag Wieers <dag(a)wieers.com> - 0.86.1-1 +- Updated to release 0.86.1. -%files -%defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE -%doc docs/*.pdf -%_bindir/* -%_mandir/man[15]/* -%exclude %_bindir/clamav-config -%exclude %_bindir/freshclam -%exclude %_mandir/*/freshclam* +* Mon May 16 2005 Dag Wieers <dag(a)wieers.com> - 0.85.1-1 +- Updated to release 0.85.1. -## ----------------------- +* Fri Apr 29 2005 Dag Wieers <dag(a)wieers.com> - 0.84-1 +- Updated to release 0.84. -%files lib -%defattr(-,root,root,-) -%_libdir/*.so.* +* Mon Feb 14 2005 Dag Wieers <dag(a)wieers.com> - 0.83-1 +- Updated to release 0.83. -## ----------------------- +* Thu Feb 10 2005 Dag Wieers <dag(a)wieers.com> - 0.82-2 +- Fix for false positive on RIFF files. (Roger Jochem) -%files devel -%defattr(-,root,root,-) -%_includedir/* -%_libdir/*.so -%pkgdatadir/template -%pkgdatadir/clamd-gen -%_libdir/pkgconfig/* -%_bindir/clamav-config +* Mon Feb 07 2005 Dag Wieers <dag(a)wieers.com> - 0.82-1 +- Updated to release 0.82. -## ----------------------- +* Thu Jan 27 2005 Dag Wieers <dag(a)wieers.com> - 0.81-1 +- Improved logrotate scripts. (Filippo Grassilli) +- Updated to release 0.81. -%files filesystem -%attr(-,%username,%username) %dir %homedir -%attr(-,root,root) %dir %pkgdatadir +* Wed Dec 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-2 +- Added %%dir /var/clamav/log. (Adam Bowns) +- Changed logrotate script to use clamd.log. (Stuart Schneider) +- Added curl dependency. (Petr Kristof) +- Synchronized some options from Petr. (Petr Kristof) +- Fixed another clamav.conf reference. (Michael Best) -## ----------------------- +* Mon Nov 01 2004 Dag Wieers <dag(a)wieers.com> - 0.80-1 +- Updated package description. (Arvin Troels) +- Incorporated fixes from Jima. (Jima) +- Config clamav.conf renamed to clamd.conf. +- Removed obsolete patch. +- Added macros for building without milter. +- Updated to release 0.80. -%files data -%defattr(-,%username,%username,-) -# use %%config to keep files which were updated by 'freshclam' -# already. Without this tag, they would be overridden with older -# versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %homedir/*.cvd +* Fri Jul 30 2004 Dag Wieers <dag(a)wieers.com> - 0.75.1-1 +- Added obsoletes for fedora.us. +- Updated to release 0.75.1. +* Mon Jul 26 2004 Dag Wieers <dag(a)wieers.com> - 0.75-2 +- Fixed a problem where $CODE was empty. -%files data-empty -%defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/*.cvd +* Fri Jul 23 2004 Dag Wieers <dag(a)wieers.com> - 0.75-1 +- Updated to release 0.75. +* Wed Jun 30 2004 Dag Wieers <dag(a)wieers.com> - 0.74-1 +- Updated to release 0.74. -## ----------------------- +* Tue Jun 15 2004 Dag Wieers <dag(a)wieers.com> - 0.73-1 +- Updated to release 0.73. -%files update -%defattr(-,root,root,-) -%_bindir/freshclam -%_mandir/*/freshclam* -%pkgdatadir/freshclam-sleep -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* -%config(noreplace) %_sysconfdir/cron.d/* -%config(noreplace) %_sysconfdir/sysconfig/freshclam +* Thu Jun 03 2004 Dag Wieers <dag(a)wieers.com> - 0.72-1 +- Updated to release 0.72. -%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/*.cld +* Thu May 20 2004 Dag Wieers <dag(a)wieers.com> - 0.71-1 +- Updated to release 0.71. +* Sun May 02 2004 Dag Wieers <dag(a)wieers.com> - 0.70-2 +- Fixed the installation check for conf files. (Richard Soderberg, Udo Ruecker) +- Changed the init-order of the sysv scripts. (Will McCutcheon) +- Changes to the default configuration files. -## ----------------------- +* Sat Mar 17 2004 Dag Wieers <dag(a)wieers.com> - 0.70-1 +- Updated to release 0.70. -%files server -%defattr(-,root,root,-) -%doc _doc_server/* -%_mandir/man[58]/clamd* -%_sbindir/* -%pkgdatadir/clamd-wrapper -%dir %_sysconfdir/clamd.d +* Tue Mar 16 2004 Dag Wieers <dag(a)wieers.com> - 0.68-1 +- Updated to release 0.68. -%exclude %_sbindir/*milter* -%exclude %_mandir/man8/clamav-milter* +* Fri Mar 12 2004 Dag Wieers <dag(a)wieers.com> - 0.67.1-1 +- Updated to release 0.67-1. +- Added clamdwatch and trashcan to clamd. +* Mon Mar 08 2004 Dag Wieers <dag(a)wieers.com> - 0.67-1 +- Personalized SPEC file. -%files server-sysvinit -%defattr(-,root,root,-) -%_initrddir/clamd-wrapper +* Mon Aug 22 2003 Matthias Saou/Che +- Added "--without milter" build option. (Matthias Saou) +- Fixed freshclam cron (Matthias Saou) +- Built the new package. (Che) +* Tue Jun 24 2003 Che +- clamav-milter introduced. +- a few more smaller fixes. -## ----------------------- +* Sun Jun 22 2003 Che +- version upgrade -%files scanner -%defattr(-,root,root,-) -%dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%config(noreplace) %_sysconfdir/clamd.d/scan.conf -%ghost %scanstatedir/clamd.sock +* Mon Jun 16 2003 Che +- rh9 build +- various fixes +- got rid of rpm-helper prereq -%files scanner-sysvinit -%attr(0755,root,root) %config %_initrddir/clamd.scan +* Fri Mar 24 2003 Che +- some cleanups and fixes +- new patch added -%if 0%{?with_upstart:1} -%files scanner-upstart -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/event.d/clamd.scan -%endif +* Fri Nov 22 2002 Che +- fixed a config patch issue -## ----------------------- +* Fri Nov 22 2002 Che +- version upgrade and some fixes -%files milter -%defattr(-,root,root,-) -%doc clamav-milter/README.fedora -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %_sysconfdir/mail/clamav-milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%attr(0710,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterstatedir/* - -%files milter-sysvinit -%defattr(-,root,root,-) -%config %_initrddir/clamav-milter - -%if 0%{?with_upstart:1} -%files milter-upstart -%defattr(-,root,root,-) -%config(noreplace) %_sysconfdir/event.d/clamav-milter -%endif +* Sat Nov 02 2002 Che +- version upgrade +* Wed Oct 24 2002 Che +- some important changes for lsb compliance -%changelog -* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- adjusted chkconfig positions for clamav-milter (#530101) - -* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1200 -- updated to 0.95.3 - -* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- conditionalized build of noarch subpackages to ease packaging under RHEL5 - -* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 -- modified freshclam configuration to log by syslog by default -- disabled LocalSocket option in sample configuration -- fixed clamav-milter sysv initscript to use bash interpreter and to - be disabled by default - -* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 -- renamed 'clamav' user/group to 'clamupdate' -- add the '%milteruser' user to the '%scanuser' group when the -scanner - subpackage is installed - -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 -- updated to 0.95.2 - -* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 -- fixed '--without upstart' operation - -* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 -- added '%%bcond_without upstart' conditional to ease skipping of - -upstart subpackage creation e.g. on EL5 systems -- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which - broke update path - -* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 -- Upgrade to 0.95.1 (#495039) - -* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 -- updated to final 0.95 -- added ncurses-devel (-> clamdtop) BR -- enforced IPv6 support - -* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 -- updated to 0.95rc1 -- added -upstart subpackages -- renamed -sysv to -sysvinit to make -upstart win the default dep resolving -- reworked complete milter stuff -- added -scanner subpackage which contains a preconfigured daemon - (e.g. for use by -milter) -- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old - -* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 -- made some subpackages noarch -- fixed typo in SysV initscript which removes 'touch' file (#473513) - -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 -- Upgrade to 0.94.2 (#474002) - -* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 -- Upgrade to 0.94.1 - -* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 -- Upgrade to 0.94 (SECURITY), fixes #461461: -- CVE-2008-1389 Invalid memory access in the CHM unpacker -- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg -- CVE-2008-3913 Memory leak in code path in freshclam's manager.c -- CVE-2008-3914 Multiple file descriptor leaks on the code paths - -* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 -- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read - on petite files) -- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) -- rediffed patches - -* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 -- updated to 0.93.1 -- rediffed -path patch -- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability - -* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 -- updated to final 0.93 -- removed daily.inc + main.inc directories; they are now replaced by - *.cld containers -- trimmed down MAILTO list of cronjob to 'root' again; every well - configured system has an alias for this recipient - -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 -- moved -milter scriptlets into -milter-core subpackage -- added a requirement on the milteruser to the -milter-sendmail - subpackage (reported by Bruce Jerrick) - -* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 -- updated to 0.93rc1 -- fixed rpath issues - -* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 -- updated to 0.92.1 - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 -- redisabled unrar stuff completely by using clean sources -- splitted -milter subpackage into pieces to allow use without sendmail - (#239037) - -* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 -- use a better way to disable RPATH-generation (needed for '--with - unrar' builds) - -* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 -- added a README.fedora to the milter package (#240610) -- ship original sources again; unrar is now licensed correctly (no more - stolen code put under GPL). Nevertheless, this license is not GPL - compatible, and to allow libclamav to be used by GPL applications, - unrar is disabled by a ./configure switch. -- use pkg-config in clamav-config to emulate --cflags and --libs - operations (fixes partly multilib issues) -- registered some more auto-updated files and marked them as %%ghost - -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 -- updated to 0.92 (SECURITY): -- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability - -* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of - legal problems (resolves 334371) -- correct license tag - -* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 -- Bump release for upgrade path. - -* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 -- updated to 0.91.2 (SECURITY): -- CVE-2007-4510 DOS in RTF parser -- DOS in html normalizer -- arbitrary command execution by special crafted recipients in - clamav-milter's black-hole mode -- fixed an open(2) issue - -* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 -- updated to 0.91.1 - -* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 -- updated to 0.91 - -* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 -- updated to 0.90.3 -- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both - in FC6- and F7+ - -* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 -- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' - -* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 -- updated to 0.90.1 -- updated %%doc list - -* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 -- updated to final 0.90 -- removed -visibility patch since fixed upstream - -* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 -- build with -Wl,-as-needed and cleaned up pkgconfig file -- removed old hack which forced installation of freshclam.conf; related - check was removed upstream -- removed static library -- removed %%changelog entries from before 2004 - -* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 -- updated to 0.90rc3 -- splitted mandatory parts from the data-file into a separate -filesystem - subpackage -- added a -data-empty subpackage to allow a setup where database is - updated per cron-job and user does not want to download the large - -data package with outdated virus definitations (#214949) -- %%ghost'ed the files downloaded by freshclam +* Wed Oct 23 2002 Che +- initial rpm release diff --git a/clamd-README b/clamd-README deleted file mode 100644 index e62b487..0000000 --- a/clamd-README +++ /dev/null @@ -1,58 +0,0 @@ -To create individual clamd-instance take the following files and -modify/copy them in the suggested way: - -clamd.conf: - * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with an unique service-name; - e.g. as /etc/clamd.d/<SERVICE>.conf - - To make logfile rotation work properly, the LogFile should be - writable for the assigned User. Recommended way to reach this, is - to: - * make it owned by the User's *group* - * assign at least 0620 (u+rw,g+w) permissions - - A suitable command might be - | # touch <logfile> - | # chgrp <user> <logfile> - | # chmod 0620 <logfile> - - NEVER use 'clamav' as the user since he can modify the database. - This is the user who is running the application; e.g. for mimedefang - (http://www.roaringpenguin.com/mimedefang) the user might be - 'defang'.Theoretically, distinct users could be used, but it must be - made sure that the application-user can write into the socket-file, - and that the clamd-user can access the files asked by the - application to be checked. - - -clamd.logrotate: - * set the correct value for the logfile - * place it into /etc/logrotate.d - -clamd.sysconfig: - * set the name of the config-file and the local socket - * copy it to /etc/sysconfig/clamd.<SERVICE> - -clamd.init: - * set the service-name - * place it into /etc/init.d/ with an unique name and activate it - (e.g. with /sbin/chkconfig clamd.<SERVICE> on) - -Additionally, a symlink must be set to clamd in a way like - | # ln -s clamd /usr/sbin/clamd.<SERVICE> -and the directory for the socket file must be created (see 'LocalSocket' -in clamd.conf) - | # mkdir -p /var/run/clamd.<SERVICE> - - -This directory must be writable by the 'User' chosen in the config-file. - - - -[Disclaimer: - this file and the script/configfiles are not part of the official - clamav package. - - Please send complaints and comments to - mailto:enrico.scholz@informatik.tu-chemnitz.de!] diff --git a/clamd-gen b/clamd-gen deleted file mode 100755 index ac5dae2..0000000 --- a/clamd-gen +++ /dev/null @@ -1,269 +0,0 @@ -#! /bin/bash - -# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -function showHelp() -{ - echo \ -$"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> - --license=<LICENSE> --username=>USERNAME> -" - exit 0 -} - -function rpm.generatePreamble() -{ - cat <<EOF -%{!?release_func:%define release_func() %1%{?dist}} -# The name of the minit service -%define minitsvcdir %minitdir/services/%name -# The configuration file for the SysV initservice -%define conffile %_sysconfdir/clamd.d/%service.conf -# The directory, where the milter socket will be placed into; this -# socket will be named clamd.sock -%define rundir /var/run/clamd.%service -# The name of the logfile -%define logfile /var/log/clamd.%service -# The user under whose id, the clamd shall be running. This user must -# be able to read the files from the base-service and is usually -# created there. -%define username $USERNAME -# The packagename of the service -%define service $SERVICE -# The service name as used by the system's initscripts; usually this -# is %service -%define baseservice %service - -%define __chkconfig /sbin/chkconfig -%define minitdir %_sysconfdir/minit - - -EOF -} - -function rpm.generateHeader() -{ - cat <<EOF -Summary: Clamav server for '%service' -Name: clamd.%service -Version: $VERSION -Release: %release_func $RELEASE -Epoch: 0 -License: $LICENSE -Group: System Environment/Daemons -BuildRoot: %_tmppath/%name-%version-%release-root -BuildArch: noarch -Requires: init(%name) -Requires(pre): %service -Requires: clamav-server -BuildRequires: clamav-devel - -%package sysv -Summary: SysV initscripts for a %service clamav-server -Group: System Environment/Daemons -Provides: init(%name) = sysv -Conflicts: init(%name) < sysv -Conflicts: init(%name) > sysv -Requires: clamav-server-sysv -Requires(post): %name = %epoch:%version-%release -Requires(post): diffutils mktemp %__chkconfig -Requires(preun): %__chkconfig -Requires(pre): %_initrddir -Requires(postun): %_initrddir - -%package minit -Summary: minit initscripts for a %service clamav-server -Group: System Environment/Daemons -Provides: init(%name) = minit -Conflicts: init(%name) < minit -Conflicts: init(%name) > minit -Requires(post): %name = %epoch:%version-%release -Requires(post): diffutils mktemp -Requires(pre): minit-setup -Requires(postun): minit-setup -Requires(triggers): minit-tools - - -%description -Basic setup for a clamav server for '%service'. - - -%description sysv -Basic setup for a clamav server for '%service'. - -This package contains initscripts for SysV based systems. - - -%description minit -Basic setup for a clamav server for '%service'. - -This package contains initscripts for minit based systems. - -EOF -} - - -function rpm.genBody() -{ - cat <<"XEOFX" -%prep -%build - -%install -rm -rf $RPM_BUILD_ROOT -%__install -d -m755 $RPM_BUILD_ROOT{%minitsvcdir,%_sbindir,%rundir,/var/log} - -d=/usr/share/clamav/template - -function subst -{ - src=$d/$1 - dst=$RPM_BUILD_ROOT$2 - - %__install -d -m755 $(dirname "$dst") - sed -e 's!^$#?LogFile $.*!\1%logfile!g; - s!^#?$LocalSocket $.*!\1%rundir/clamd.sock!g; - s!^#?$PidFile $.*!\1%rundir/clamd.pid!g; - s!<SERVICE>!%service!g; - s!<USER>!%username!g;' "$src" >"$dst" - chmod --reference "$src" "$dst" -} - -subst clamd.conf %conffile -subst clamd.logrotate %_sysconfdir/logrotate.d/clamd.%service - -%if 0%{!?_without_sysv:1} -subst clamd.sysconfig %_sysconfdir/sysconfig/clamd.%service -subst clamd.init %_initrddir/clamd.%service -%endif - -ln -s clamd $RPM_BUILD_ROOT%_sbindir/clamd.%service - -touch $RPM_BUILD_ROOT%logfile -touch $RPM_BUILD_ROOT%rundir/clamd.sock - -%if 0%{!?_without_minit:1} -ln -s %_sbindir/clamd.%service $RPM_BUILD_ROOT%minitsvcdir/run -touch $RPM_BUILD_ROOT%minitsvcdir/respawn -cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params --c -%conffile -EOF -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - - -%triggerin minit -- %baseservice -minit-svc add services/clamd.%service services/%baseservice/ - -%triggerun minit -- %baseservice -test "$1" != 0 -a "$2" != 0 || \ - minit-svc del services/clamd.%service services/%baseservice/ - - -%post minit -d=$(mktemp /tmp/clamd.%service.XXXXXX) -sed -e 's!^#Foreground!Foreground!' "%conffile" >"$d" -grep -q '^Foreground' $d || echo 'Foreground' >>$d -cmp -s "$d" %conffile || cat "$d" >"%conffile" -rm -f "$d" - -%post sysv -d=$(mktemp /tmp/clamd.%service.XXXXXX) -sed -e 's!^Foreground!#Foreground!' "%conffile" >"$d" -cmp -s "$d" %conffile || cat "$d" >"%conffile" -rm -f "$d" - -%__chkconfig --add %name - - -%preun sysv -test "$1" != 0 || %__chkconfig --del %name - -XEOFX -} - - -function rpm.genFiles -{ - cat <<"EOF" -%files -%defattr(-,root,root,-) -%doc -%config(noreplace) %verify(not size md5 mtime) %attr(0620,root,%username) %logfile -%config(noreplace) %verify(not mtime) %conffile -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/clamd.%service -%_sbindir/clamd.%service -%dir %attr(0700,%username,root) %rundir -%ghost %rundir/clamd.sock - - -%if 0%{!?_without_sysv:1} -%files sysv -%defattr(-,root,root,-) -%config %verify(not mtime) %_initrddir/clamd.%service -%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamd.%service -%endif - - -%if 0%{!?_without_minit:1} -%files minit -%defattr(-,root,root,-) -%dir %minitsvcdir -%config(noreplace) %verify(not mtime) %minitsvcdir/params -%config %minitsvcdir/run - %minitsvcdir/respawn -%endif -EOF -} - - -SERVICE= -VERSION= -RELEASE= -LICENSE= -USERNAME= -tmp=$(getopt -o '' --long service:,version:,release:,license:,username:,help -n "$0" -- "$@") || exit 1 -eval set -- "$tmp" - -while true; do - case "$1" in - (--help) showHelp $0;; - (--service) SERVICE=$2; shift;; - (--version) VERSION=$2; shift;; - (--release) RELEASE=$2; shift;; - (--license) LICENSE=$2; shift;; - (--username) USERNAME=$2; shift;; - (--) shift; break;; - esac - shift -done - -for i in SERVICE VERSION RELEASE LICENSE USERNAME; do - eval tmp=\$${i} - test "$tmp" || { - echo $"No value for $i specified; assuming @${i}@" >&2; - eval $i=@${i}@; - } -done - - -rpm.generatePreamble -rpm.generateHeader -rpm.genBody -rpm.genFiles diff --git a/clamd-wrapper b/clamd-wrapper deleted file mode 100644 index ec785d0..0000000 --- a/clamd-wrapper +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash -# -# Xchkconfig: - 75 25 -# Xdescription: The clamd daemon listens for incoming connections on \ -# Unix or TCP socket and scans files or directories on demand. - -test "$CLAMD_SERVICE" || { - echo $"*** $0 can not be called in this way" - echo $"*** Please see /usr/share/doc/clamav-server-*/README how" - echo $"*** the clamav-server can be configured" - exit 6 -} - -# Source function library. -. /etc/init.d/functions - -# Get config. -test -r /etc/sysconfig/network && . /etc/sysconfig/network - -# Check that networking is up. -test "$NETWORKING" != "no" || exit 6 - -lockfile=/var/lock/subsys/clamd.${CLAMD_SERVICE} -sysconffile=/etc/sysconfig/clamd.${CLAMD_SERVICE} -procname=clamd.${CLAMD_SERVICE} - -CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf -CLAMD_OPTIONS= -CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid -## backward-compatibility check... -for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do - CLAMD_SOCKET=$i - test ! -e "$i" || break -done -test -f "$sysconffile" && . "$sysconffile" - - -RETVAL=0 -prog="clamd.${CLAMD_SERVICE}" - -start () { - echo -n $"Starting $prog: " - daemon --pidfile=${CLAMD_PIDFILE} \ - exec -a $procname /usr/sbin/clamd \ - ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch $lockfile - return $RETVAL -} - -stop () { - echo -n $"Stopping $prog: " - killproc -p ${CLAMD_PIDFILE} $procname - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f $lockfile - return $RETVAL -} - -reload() { - rc=0 - echo -n $"Reloading $prog: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? - echo - echo -n $"Loading new virus-database: " - killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? - echo - return $rc -} - -restart () { - stop - start -} - -# See how we were called. -case "$1" in - start|stop|restart|reload) - $1 ;; - status) - status -p ${CLAMD_PIDFILE} $procname ;; - condrestart) - test ! -f $lockfile || restart - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|reload|condrestart}" - exit 2 -esac diff --git a/clamd.SERVICE.init b/clamd.SERVICE.init deleted file mode 100644 index 9681351..0000000 --- a/clamd.SERVICE.init +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# -# chkconfig: - 75 25 -# description: The clamd server running for <SERVICE> - -CLAMD_SERVICE=<SERVICE> -. /usr/share/clamav/clamd-wrapper diff --git a/clamd.logrotate b/clamd.logrotate deleted file mode 100644 index 0b0b531..0000000 --- a/clamd.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/clamd.<SERVICE> { - monthly - notifempty - missingok - - postrotate - killall -HUP clamd.<SERVICE> 2>/dev/null || : - endscript -} diff --git a/clamd.scan.upstart b/clamd.scan.upstart deleted file mode 100644 index b6280f5..0000000 --- a/clamd.scan.upstart +++ /dev/null @@ -1,14 +0,0 @@ -### Uncomment these lines when you want clamd.scan to be a scanner -### for a locally running clamav-milter -#start on starting clamav-milter - -### Uncomment these lines when you want clamd.scan to be a generic -### scanner service -#start on starting local - -stop on runlevel 0 -stop on runlevel 1 -stop on runlevel 6 - -respawn -exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes diff --git a/clamd.sysconfig b/clamd.sysconfig deleted file mode 100644 index 4933e7e..0000000 --- a/clamd.sysconfig +++ /dev/null @@ -1,3 +0,0 @@ -#CLAMD_CONFIGFILE=/etc/clamd.d/<SERVICE>.conf -#CLAMD_SOCKET=/var/run/clamd.<SERVICE>/clamd.sock -#CLAMD_OPTIONS= diff --git a/freshclam-sleep b/freshclam-sleep deleted file mode 100755 index 7bdcf78..0000000 --- a/freshclam-sleep +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/bash -# Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; version 2 of the License. -# -# 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. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - -FRESHCLAM_MOD=$[ 3*60 ] # 3 hours - -f=/etc/sysconfig/freshclam -test ! -e "$f" || . "$f" - - -case x"$1" in - (xnow) FRESHCLAM_DELAY=0;; - (x|xrandom) : ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};; - (*) FRESHCLAM_DELAY=$1;; -esac - -set -e - -case $FRESHCLAM_DELAY in - (disabled-warn) - echo $"\ -WARNING: update of clamav database is disabled; please see - '$f' - for information how to enable the periodic update resp. how to turn - off this message." >&2 - exit 1 - ;; - - (disabled) - exit 0 - ;; - - (*) - let FRESHCLAM_MOD*=60 - sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] - ;; -esac - - -/usr/bin/freshclam --quiet && { - test -x /usr/sbin/clamav-notify-servers && \ - exec /usr/sbin/clamav-notify-servers || \ - : -} diff --git a/freshclam.sysconfig b/freshclam.sysconfig deleted file mode 100644 index 94035f8..0000000 --- a/freshclam.sysconfig +++ /dev/null @@ -1,24 +0,0 @@ -## When changing the periodicity of freshclam runs in the crontab, -## this value must be adjusted also. Its value is the timespan between -## two subsequent freshclam runs in minutes. E.g. for the default -## -## | 0 */3 * * * ... -## -## crontab line, the value is 180 (minutes). -# FRESHCLAM_MOD= - -## A predefined value for the delay in seconds. By default, the value is -## calculated by the 'hostid' program. This predefined value guarantees -## constant timespans of 3 hours between two subsequent freshclam runs. -## -## This option accepts two special values: -## 'disabled-warn' ... disables the automatic freshclam update and -## gives out a warning -## 'disabled' ... disables the automatic freshclam silently -# FRESHCLAM_DELAY= - - -### !!!!! REMOVE ME !!!!!! -### REMOVE ME: By default, the freshclam update is disabled to avoid -### REMOVE ME: network access without prior activation -FRESHCLAM_DELAY=disabled-warn # REMOVE ME diff --git a/lastver b/lastver deleted file mode 100644 index 4d8fc8c..0000000 --- a/lastver +++ /dev/null @@ -1 +0,0 @@ -0.95.3 diff --git a/sources b/sources index 898c137..70d67b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a76425f5cffb9973d6ee45580dc2094 clamav-0.95.3-norar.tar.bz2 +44e7df79718d104db0666d5db3f08682 clamav-0.97-clean.tar.bz2 diff --git a/verinfo b/verinfo deleted file mode 100644 index 814d953..0000000 --- a/verinfo +++ /dev/null @@ -1,2 +0,0 @@ -http://sourceforge.net/project/showfiles.php?group_id=86638&package_id=90197 -clamav-([0-9.-]*?)\.tar\. commit a58de3534bdbfcf065092de38967589e296c80b0 Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Wed Jul 28 11:45:26 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 5b7c836..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -clamav-0.95.3-norar.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5b7c836 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +clamav-0.95.3-norar.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 4a3ae71..0000000 --- a/Makefile +++ /dev/null @@ -1,33 +0,0 @@ -# Makefile for source rpm: clamav -NAME := clamav -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) - - -# can not use final tarball name here as it will conflict with rules -# within Makefile.common -TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp -TARBALL = ${NAME}-${VERSION}.tar.gz - -clean-sources: ${TARBALL_CLEAN} - -${TARBALL_CLEAN}: ${TARBALL} - rm -f $@.tmp - zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp - mv $@.tmp $@ diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 commit 0909a88ae9e869be8c375d52a412f21d4e70ff8a Author: Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> Date: Wed Jul 28 11:45:04 2010 +0000 dist-git conversion diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index c07be39..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -clamav-0.95.1-norar.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c07be39 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +clamav-0.95.1-norar.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index eea4c6f..0000000 --- a/Makefile +++ /dev/null @@ -1,34 +0,0 @@ -# Makefile for source rpm: clamav -# $Id$ -NAME := clamav -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) - - -# can not use final tarball name here as it will conflict with rules -# within Makefile.common -TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp -TARBALL = ${NAME}-${VERSION}.tar.gz - -clean-sources: ${TARBALL_CLEAN} - -${TARBALL_CLEAN}: ${TARBALL} - rm -f $@.tmp - zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp - mv $@.tmp $@ diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 commit 7c49c405c76a391d8f3bd861380768224f6d6443 Author: Dennis Gilmore <ausil(a)fedoraproject.org> Date: Sat May 8 01:45:25 2010 +0000 Initialize branch EL-6 for clamav diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 commit 672986e1a1820dfcf501808eb7af818f2430063c Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Thu Nov 26 01:29:38 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index 2cc62a7..eea4c6f 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := clamav SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit 45d3d6a99cdfb183c8743a9637160afecef8fd02 Author: Bill Nottingham <notting(a)fedoraproject.org> Date: Thu Nov 26 01:29:38 2009 +0000 Fix typo that causes a failure to update the common directory. (releng #2781) diff --git a/Makefile b/Makefile index ed9c5e4..4a3ae71 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ NAME := clamav SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) commit 42e3c91be468fd3efce34f772fc8ac585e860a3b Author: ensc <ensc(a)fedoraproject.org> Date: Sun Nov 22 10:47:16 2009 +0000 removed stanza from upstart script which waited for 'starting\ XXX'; wrongly named upstart events have been fixed in recent initscripts (#501155) diff --git a/README.fedora b/README.fedora index 4f12058..8df192d 100644 --- a/README.fedora +++ b/README.fedora @@ -67,12 +67,11 @@ B) On the clamav-milter host (assumed hostname 'host-milter') and all the other options which are required on your system - 3. Edit /etc/event.d/clamav-milter and uncomment the both + 3. Edit /etc/event.d/clamav-milter and uncomment the - | start on starting\ local | start on starting local - lines. Restart your system or execute + line. Restart your system or execute | initctl emit starting local @@ -98,12 +97,11 @@ C) On the clamav-scanner host (assumed hostname 'host-scanner') comment out possible 'LocalSocket' lines and set all the other options which are required on your system - 3. Edit /etc/event.d/clamav-scanner and uncomment the both + 3. Edit /etc/event.d/clamav-scanner and uncomment the - | start on starting\ local | start on starting local - lines. Restart your system or execute + line. Restart your system or execute | initctl emit starting local diff --git a/clamav-milter.upstart b/clamav-milter.upstart index 165829e..e0a63f2 100644 --- a/clamav-milter.upstart +++ b/clamav-milter.upstart @@ -1,14 +1,10 @@ - ### Uncomment these lines when you want clamav-milter to be a milter ### for a locally running MTA -#start on starting\ sendmail #start on starting sendmail -#start on starting\ postfix #start on starting postfix ### Uncomment these lines when you want clamav-milter to be a milter ### for a remotely running MTA -#start on starting\ local #start on starting local stop on runlevel 0 diff --git a/clamd.scan.upstart b/clamd.scan.upstart index 6c769e0..b6280f5 100644 --- a/clamd.scan.upstart +++ b/clamd.scan.upstart @@ -4,7 +4,6 @@ ### Uncomment these lines when you want clamd.scan to be a generic ### scanner service -#start on starting\ local #start on starting local stop on runlevel 0 commit 46fb0b613780cb65be722bfed8039b10f3c0cb05 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Nov 21 20:20:43 2009 +0000 - adjusted chkconfig positions for clamav-milter (#530101) diff --git a/clamav-milter.sysv b/clamav-milter.sysv index 693d4ee..170cdc1 100644 --- a/clamav-milter.sysv +++ b/clamav-milter.sysv @@ -2,7 +2,7 @@ # # clamav-milter Starts/stop the "clamav-milter" daemon # -# chkconfig: - 99 1 +# chkconfig: - 79 21 # description: A virus scanning milter # Source function library. diff --git a/clamav.spec b/clamav.spec index 4875437..88935d7 100644 --- a/clamav.spec +++ b/clamav.spec @@ -696,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sat Nov 21 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- adjusted chkconfig positions for clamav-milter (#530101) + * Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1200 - updated to 0.95.3 commit 71bd83f9182d730978dfbbd9b2e8d9fab7db70a2 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Oct 29 09:10:29 2009 +0000 updated to 0.95.3 diff --git a/.cvsignore b/.cvsignore index e2c64e0..5b7c836 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95.2-norar.tar.bz2 +clamav-0.95.3-norar.tar.bz2 diff --git a/clamav-0.95.3-umask.patch b/clamav-0.95.3-umask.patch new file mode 100644 index 0000000..220f7ab --- /dev/null +++ b/clamav-0.95.3-umask.patch @@ -0,0 +1,39 @@ +Index: clamav-0.95.3/clamav-milter/clamav-milter.c +=================================================================== +--- clamav-0.95.3.orig/clamav-milter/clamav-milter.c ++++ clamav-0.95.3/clamav-milter/clamav-milter.c +@@ -306,7 +306,7 @@ int main(int argc, char **argv) { + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0002); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +Index: clamav-0.95.3/shared/output.c +=================================================================== +--- clamav-0.95.3.orig/shared/output.c ++++ clamav-0.95.3/shared/output.c +@@ -270,7 +270,7 @@ int logg(const char *str, ...) + #endif + if(logg_file) { + if(!logg_fp) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +Index: clamav-0.95.3/freshclam/freshclam.c +=================================================================== +--- clamav-0.95.3.orig/freshclam/freshclam.c ++++ clamav-0.95.3/freshclam/freshclam.c +@@ -102,7 +102,7 @@ static void writepid(const char *pidfile + { + FILE *fd; + int old_umask; +- old_umask = umask(0006); ++ old_umask = umask(0022); + if((fd = fopen(pidfile, "w")) == NULL) { + logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); + } else { diff --git a/clamav-0.95rc1-umask.patch b/clamav-0.95rc1-umask.patch deleted file mode 100644 index 8a46216..0000000 --- a/clamav-0.95rc1-umask.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: clamav-0.95rc1/clamav-milter/clamav-milter.c -=================================================================== ---- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c -+++ clamav-0.95rc1/clamav-milter/clamav-milter.c -@@ -287,7 +287,7 @@ int main(int argc, char **argv) { - - if((opt = optget(opts, "PidFile"))->enabled) { - FILE *fd; -- mode_t old_umask = umask(0006); -+ mode_t old_umask = umask(0022); - - if((fd = fopen(opt->strarg, "w")) == NULL) { - logg("!Can't save PID in file %s\n", opt->strarg); -Index: clamav-0.95rc1/shared/output.c -=================================================================== ---- clamav-0.95rc1.orig/shared/output.c -+++ clamav-0.95rc1/shared/output.c -@@ -250,7 +250,7 @@ int logg(const char *str, ...) - #endif - if(logg_file) { - if(!logg_fp) { -- old_umask = umask(0037); -+ old_umask = umask(0077); - if((logg_fp = fopen(logg_file, "at")) == NULL) { - umask(old_umask); - #ifdef CL_THREAD_SAFE -Index: clamav-0.95rc1/freshclam/freshclam.c -=================================================================== ---- clamav-0.95rc1.orig/freshclam/freshclam.c -+++ clamav-0.95rc1/freshclam/freshclam.c -@@ -102,7 +102,7 @@ static void writepid(const char *pidfile - { - FILE *fd; - int old_umask; -- old_umask = umask(0006); -+ old_umask = umask(0022); - if((fd = fopen(pidfile, "w")) == NULL) { - logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); - } else { diff --git a/clamav.spec b/clamav.spec index f8e774c..4875437 100644 --- a/clamav.spec +++ b/clamav.spec @@ -23,8 +23,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.95.2 -Release: %release_func 5%{?snapshot:.%snapshot} +Version: 0.95.3 +Release: %release_func 1200%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -49,7 +49,7 @@ Source8: clamav-notify-servers Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch Patch26: clamav-0.95-cliopts.patch -Patch27: clamav-0.95rc1-umask.patch +Patch27: clamav-0.95.3-umask.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -696,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Thu Oct 29 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.3-1200 +- updated to 0.95.3 + * Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - conditionalized build of noarch subpackages to ease packaging under RHEL5 diff --git a/lastver b/lastver index e7f6f8b..4d8fc8c 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.95.2 +0.95.3 diff --git a/sources b/sources index 5744218..898c137 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -377aed737db63d902e641be8d923cda9 clamav-0.95.2-norar.tar.bz2 +7a76425f5cffb9973d6ee45580dc2094 clamav-0.95.3-norar.tar.bz2 commit a5349bae95013a679d45818025d52f560ce2ce4d Author: ensc <ensc(a)fedoraproject.org> Date: Sun Sep 13 13:43:34 2009 +0000 - conditionalized build of noarch subpackages diff --git a/clamav.spec b/clamav.spec index c070641..f8e774c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,9 +1,10 @@ #global snapshot rc1 ## Fedora Extras specific customization below... -%bcond_without fedora +%bcond_without fedora %bcond_without upstart %bcond_with unrar +%bcond_without noarch ## %global username clamupdate @@ -17,6 +18,7 @@ %global scanuser clamscan %global scanstatedir %_var/run/clamd.scan +%{?with_noarch:%global noarch BuildArch: noarch} %{!?release_func:%global release_func() %1%{?dist}} Summary: End-user tools for the Clam Antivirus scanner @@ -31,7 +33,7 @@ URL: http://www.clamav.net Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… %else -# Unfortunately, clamav includes support for RAR v3, derived from GPL +# Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by # make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] @@ -59,13 +61,13 @@ BuildRequires: bc %package filesystem Summary: Filesystem structure for clamav Group: Applications/File -BuildArch: noarch Provides: user(%username) = 4 Provides: group(%username) = 4 # Prevent version mix Conflicts: %name < %version-%release Conflicts: %name > %version-%release BuildRequires: fedora-usermgmt-devel +%{?noarch} %{?FE_USERADD_REQ} %package lib @@ -85,20 +87,20 @@ Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -BuildArch: noarch Requires(pre): clamav-filesystem = %version-%release Requires(postun): clamav-filesystem = %version-%release Provides: data(clamav) = full Conflicts: data(clamav) < full Conflicts: data(clamav) > full +%{?noarch} %package data-empty Summary: Empty data package for the Clam Antivirus scanner Group: Applications/File -BuildArch: noarch Provides: data(clamav) = empty Conflicts: data(clamav) < empty Conflicts: data(clamav) > empty +%{?noarch} %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -122,28 +124,27 @@ Requires: clamav-lib = %version-%release %package server-sysvinit Summary: SysV initscripts for clamav server Group: System Environment/Daemons -BuildArch: noarch Provides: init(clamav-server) = sysv Requires: clamav-server = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir Provides: clamav-server-sysv = %version-%release Obsoletes: clamav-server-sysv < %version-%release +%{?noarch} %package scanner Summary: Clamav scanner daemon Group: System Environment/Daemons -BuildArch: noarch Requires: init(clamav-scanner) Provides: user(%scanuser) = 49 Provides: group(%scanuser) = 49 Requires: clamav-server = %version-%release +%{?noarch} %package scanner-sysvinit Summary: SysV initscripts for clamav scanner daemon Group: System Environment/Daemons -BuildArch: noarch Provides: init(clamav-scanner) = sysv Requires: clamav-server-sysvinit = %version-%release Requires: clamav-scanner = %version-%release @@ -151,18 +152,19 @@ Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts +%{?noarch} %package scanner-upstart Summary: Upstart initscripts for clamav scanner daemon Group: System Environment/Daemons -BuildArch: noarch Source410: clamd.scan.upstart Provides: init(clamav-scanner) = upstart Requires: clamav-scanner = %version-%release # implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d +Requires(pre): /etc/event.d Requires(post): /usr/bin/killall Requires(postun): /sbin/initctl +%{?noarch} %package milter @@ -188,7 +190,6 @@ Obsoletes: clamav-milter-sendmail < %version-%release %package milter-sysvinit Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons -BuildArch: noarch Source320: clamav-milter.sysv Provides: init(clamav-milter) = sysvinit Requires: clamav-milter = %version-%release @@ -200,18 +201,19 @@ Requires(post): chkconfig Requires(preun): chkconfig initscripts Provides: clamav-milter-sysv = %version-%release Obsoletes: clamav-milter-sysv < %version-%release +%{?noarch} %package milter-upstart Summary: Upstart initscripts for the clamav sendmail-milter Group: System Environment/Daemons -BuildArch: noarch Source310: clamav-milter.upstart Provides: init(clamav-milter) = upstart Requires: clamav-milter = %version-%release # implicates a conflict with upstart 0.5+ -Requires(pre): /etc/event.d +Requires(pre): /etc/event.d Requires(post): /usr/bin/killall Requires(postun): /sbin/initctl +%{?noarch} %description @@ -356,7 +358,7 @@ export have_cv_ipv6=yes # build with --as-needed and disable rpath sed -i \ - -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ libtool @@ -406,10 +408,10 @@ mkdir _doc_server install -m644 -p %SOURCE2 _doc_server/clamd.sysconfig install -m644 -p %SOURCE3 _doc_server/clamd.logrotate install -m755 -p %SOURCE7 _doc_server/clamd.init -install -m644 -p %SOURCE5 _doc_server/README +install -m644 -p %SOURCE5 _doc_server/README install -m644 -p etc/clamd.conf _doc_server/clamd.conf -install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir +install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper @@ -473,7 +475,7 @@ rm -rf "$RPM_BUILD_ROOT" %triggerprein filesystem -- clamav-filesystem < 0.96 ## REMOVE me in F14 or F15 (added in pre F12) -! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { +! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { /usr/sbin/usermod -l %username clamav || : /usr/sbin/groupmod -n %username clamav || : logger -t rpm/clamav "Renamed clamav user+group to %username" || : @@ -694,6 +696,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sun Sep 13 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- conditionalized build of noarch subpackages to ease packaging under RHEL5 + * Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 - modified freshclam configuration to log by syslog by default - disabled LocalSocket option in sample configuration @@ -811,7 +816,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 -- remove RAR decompression code from source tarball because of +- remove RAR decompression code from source tarball because of legal problems (resolves 334371) - correct license tag @@ -838,7 +843,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : in FC6- and F7+ * Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 -- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 * Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 - BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' commit 97fc8d8d655604267f6afec2800848c279e98b0b Author: ensc <ensc(a)fedoraproject.org> Date: Sun Aug 9 11:25:35 2009 +0000 - modified freshclam configuration to log by syslog by default - disabled LocalSocket option in sample configuration - fixed clamav-milter sysv initscript to use bash interpreter and to be disabled by default diff --git a/clamav-milter.sysv b/clamav-milter.sysv index c0fad96..693d4ee 100644 --- a/clamav-milter.sysv +++ b/clamav-milter.sysv @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # # clamav-milter Starts/stop the "clamav-milter" daemon # -# chkconfig: 345 99 1 +# chkconfig: - 99 1 # description: A virus scanning milter # Source function library. diff --git a/clamav.spec b/clamav.spec index 4452722..c070641 100644 --- a/clamav.spec +++ b/clamav.spec @@ -321,15 +321,18 @@ mkdir -p libclamunrar{,_iface} %{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} sed -ri \ - -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \ - -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^#?(LogFile ).*!#\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^#?(LocalSocket ).*!#\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ -e 's!^#?(User ).*!\1<USER>!g' \ -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ -e 's! /usr/local/share/clamav,! %homedir,!g' \ etc/clamd.conf -sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf +sed -ri \ + -e 's!^#?(UpdateLogFile )!#\1!g;' \ + -e 's!^#?(LogSyslog).*!\1 yes!g' \ + -e 's!(DatabaseOwner *)clamav$!\1%username!g' etc/freshclam.conf ## ------------------------------------------------------------ @@ -468,7 +471,7 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ -%triggerprein filesystem -- clamav-filesystem < 0.95.2-3 +%triggerprein filesystem -- clamav-filesystem < 0.96 ## REMOVE me in F14 or F15 (added in pre F12) ! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { /usr/sbin/usermod -l %username clamav || : @@ -691,6 +694,12 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sun Aug 9 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-5 +- modified freshclam configuration to log by syslog by default +- disabled LocalSocket option in sample configuration +- fixed clamav-milter sysv initscript to use bash interpreter and to + be disabled by default + * Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 - renamed 'clamav' user/group to 'clamupdate' - add the '%milteruser' user to the '%scanuser' group when the -scanner commit f7479cda344719b4f462fd6efccdbdae5194e7bd Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 8 13:33:12 2009 +0000 - renamed 'clamav' user/group to 'clamupdate' - add the '%milteruser' user to the '%scanuser' group when the -scanner subpackage is installed diff --git a/clamav.spec b/clamav.spec index 2408882..4452722 100644 --- a/clamav.spec +++ b/clamav.spec @@ -6,7 +6,7 @@ %bcond_with unrar ## -%global username clamav +%global username clamupdate %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log %global milteruser clamilt @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.2 -Release: %release_func 2%{?snapshot:.%snapshot} +Release: %release_func 5%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -110,7 +110,7 @@ Requires: clamav-filesystem = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod -Requires(post): group(clamav) +Requires(post): group(%username) %package server Summary: Clam Antivirus scanner server @@ -344,8 +344,13 @@ export have_cv_ipv6=yes %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --enable-milter --disable-static \ --disable-rpath \ + --with-user=%username \ + --with-group=%username \ %{!?with_unrar:--disable-unrar} +# TODO: check periodically that CLAMAVUSER is used for freshclam only + + # build with --as-needed and disable rpath sed -i \ -e 's! -shared ! -Wl,--as-needed\0!g' \ @@ -463,6 +468,14 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ +%triggerprein filesystem -- clamav-filesystem < 0.95.2-3 +## REMOVE me in F14 or F15 (added in pre F12) +! /usr/bin/id clamav &>/dev/null || /usr/bin/id %username &>/dev/null || { + /usr/sbin/usermod -l %username clamav || : + /usr/sbin/groupmod -n %username clamav || : + logger -t rpm/clamav "Renamed clamav user+group to %username" || : +} + %pre filesystem %__fe_groupadd 4 -r %username &>/dev/null || : %__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ @@ -509,6 +522,12 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } + +%triggerin milter -- clamav-scanner +# Add the milteruser to the scanuser group; this is required when +# milter and clamd communicate through local sockets +/usr/sbin/usermod -a -G %scanuser %milteruser &>/dev/null || : + %pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ @@ -672,6 +691,11 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sat Aug 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-4 +- renamed 'clamav' user/group to 'clamupdate' +- add the '%milteruser' user to the '%scanuser' group when the -scanner + subpackage is installed + * Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild commit 9101729e44ad27862d4ee94d199a5fda9f737316 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 1 09:44:42 2009 +0000 fixed inconsistencies added EXAMPLE section for milter setup diff --git a/README.fedora b/README.fedora index 603526c..4f12058 100644 --- a/README.fedora +++ b/README.fedora @@ -29,10 +29,10 @@ A clamav-milter setup consists of the following three components: --> you should know how to install this... When communicating across unix sockets with the clamav-milter, it is - suggested to use the /var/run/clamav-milter/clamav.sock path. You - have to add something like + suggested to use the /var/run/clamav-milter/clamav-milter.socket + path. You have to add something like - INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav-milter.socket, F=, T=S:4m;R:4m')dnl to your sendmail.mc. @@ -40,3 +40,79 @@ A clamav-milter setup consists of the following three components: It is suggested that components communicate through TCP sockets as this eases setup. Please add corresponding packet filter rules! + + +EXAMPLE +======= + +For clamav-milter, a possible setup might be created by + +A) On the MTA (assumed hostname 'host-mta') + + 1. Add to sendmail.mc + + | INPUT_MAIL_FILTER(`clamav', `S=inet:6666@host-milter, F=, T=S:4m;R:4m')dnl + + 2. Rebuild sendmail.cf + + +B) On the clamav-milter host (assumed hostname 'host-milter') + + 1. Install clamav-milter + clamav-milter-upstart packages + + 2. Set in /etc/mail/clamav-milter.conf + + | MilterSocket inet:6666 + | ClamdSocket tcp:host-scanner:6665 + + and all the other options which are required on your system + + 3. Edit /etc/event.d/clamav-milter and uncomment the both + + | start on starting\ local + | start on starting local + + lines. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cmilt + | iptables -A IN-cmilt -s host-mta -j ACCEPT + | iptables -A IN-cmilt -j DROP + + | iptables -A INPUT -p tcp --dport 6666 -j IN-cmilt + + to your firewall setup + +C) On the clamav-scanner host (assumed hostname 'host-scanner') + + 1. Install clamav-scanner + clamav-scanner-upstart packages + + 2. Add to /etc/clamd.d/scan.conf + + | TCPSocket 6665 + | TCPAddr host-scanner + + comment out possible 'LocalSocket' lines and set all the other + options which are required on your system + + 3. Edit /etc/event.d/clamav-scanner and uncomment the both + + | start on starting\ local + | start on starting local + + lines. Restart your system or execute + + | initctl emit starting local + + 4. Add something like + + | iptables -N IN-cscan + | iptables -A IN-cscan -s host-milter -j ACCEPT + | iptables -A IN-cscan -j DROP + + | iptables -A INPUT -p tcp --dport 6665 -j IN-csan + + to your firewall setup commit f2505c3d26166d5c9d500c56f8fc5fbbc7ad0c85 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Fri Jul 24 19:00:16 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/clamav.spec b/clamav.spec index 9961085..2408882 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.2 -Release: %release_func 1%{?snapshot:.%snapshot} +Release: %release_func 2%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -672,6 +672,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Fri Jul 24 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.95.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 - updated to 0.95.2 commit 589fdb228f2fc67231de9a3a0203433b1e881f46 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jun 11 07:27:31 2009 +0000 updated diff --git a/.cvsignore b/.cvsignore index c07be39..e2c64e0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95.1-norar.tar.bz2 +clamav-0.95.2-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index be9a21f..9961085 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.95.1 -Release: %release_func 3%{?snapshot:.%snapshot} +Version: 0.95.2 +Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -672,6 +672,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Thu Jun 11 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.2-1 +- updated to 0.95.2 + * Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 - fixed '--without upstart' operation diff --git a/lastver b/lastver index fd6d73e..e7f6f8b 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.95 +0.95.2 diff --git a/sources b/sources index acd143c..5744218 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0ddd9f341dd0299a6bc5398ee26f4ebf clamav-0.95.1-norar.tar.bz2 +377aed737db63d902e641be8d923cda9 clamav-0.95.2-norar.tar.bz2 commit a4b44dcd073a0a23591471fcd66b03a3263b580a Author: ensc <ensc(a)fedoraproject.org> Date: Sun Apr 19 10:31:25 2009 +0000 fixed '--without upstart' operation diff --git a/clamav.spec b/clamav.spec index e56399f..be9a21f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.1 -Release: %release_func 2%{?snapshot:.%snapshot} +Release: %release_func 3%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -454,7 +454,7 @@ install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} -%{!?with_upstart:rm -rf %_sysconfdir/event.d} +%{!?with_upstart:rm -rf $RPM_BUILD_ROOT%_sysconfdir/event.d} ## ------------------------------------------------------------ @@ -672,6 +672,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Sun Apr 19 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-3 +- fixed '--without upstart' operation + * Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 - added '%%bcond_without upstart' conditional to ease skipping of -upstart subpackage creation e.g. on EL5 systems commit f3bc46b75404e44c1b18aa0710782d298871e8a5 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Apr 15 14:14:27 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index 2daad57..e56399f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -2,6 +2,7 @@ ## Fedora Extras specific customization below... %bcond_without fedora +%bcond_without upstart %bcond_with unrar ## @@ -21,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95.1 -Release: %release_func 1%{?snapshot:.%snapshot} +Release: %release_func 2%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -197,8 +198,8 @@ Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts -Provides: milter-sysv = %version-%release -Obsoletes: milter-sysv < %version-%release +Provides: clamav-milter-sysv = %version-%release +Obsoletes: clamav-milter-sysv < %version-%release %package milter-upstart Summary: Upstart initscripts for the clamav sendmail-milter @@ -453,6 +454,7 @@ install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} +%{!?with_upstart:rm -rf %_sysconfdir/event.d} ## ------------------------------------------------------------ @@ -640,9 +642,11 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %files scanner-sysvinit %attr(0755,root,root) %config %_initrddir/clamd.scan +%if 0%{?with_upstart:1} %files scanner-upstart %defattr(-,root,root,-) %config(noreplace) %_sysconfdir/event.d/clamd.scan +%endif ## ----------------------- @@ -660,12 +664,20 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %defattr(-,root,root,-) %config %_initrddir/clamav-milter +%if 0%{?with_upstart:1} %files milter-upstart %defattr(-,root,root,-) %config(noreplace) %_sysconfdir/event.d/clamav-milter +%endif %changelog +* Wed Apr 15 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95.1-2 +- added '%%bcond_without upstart' conditional to ease skipping of + -upstart subpackage creation e.g. on EL5 systems +- fixed Provides/Obsoletes: typo in -milter-sysvinit subpackage which + broke update path + * Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 - Upgrade to 0.95.1 (#495039) commit fa9656200e23fc036ec7e31084e5b111e070e32e Author: Robert Scheck <robert(a)fedoraproject.org> Date: Fri Apr 10 21:10:04 2009 +0000 - Upgrade to 0.95.1 (#495036, #495039) and enabled IPv6 support - Fixed typo in SysV initscript which removes 'touch' file (#473513) - Added build requirement to ncurses-devel for clamdtop diff --git a/.cvsignore b/.cvsignore index 336c23f..c07be39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.2-norar.tar.bz2 +clamav-0.95.1-norar.tar.bz2 diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch deleted file mode 100644 index 66b662e..0000000 --- a/clamav-0.90rc3-private.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 -+++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 -@@ -6,6 +6,6 @@ - Name: libclamav - Description: A GPL virus scanner - Version: @LIBCLAMAV_VERSION@ --Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -- -+Libs: -L${libdir} -lclamav -+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ -+Cflags: -I${includedir} ---- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 -+++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 -@@ -55,11 +55,11 @@ - ;; - - --cflags) -- echo -I@includedir@ @CFLAGS@ -+ echo -I@includedir@ - ;; - - --libs) -- echo -L@libdir@ @LIBCLAMAV_LIBS@ -+ echo -L@libdir@ -lclamav - ;; - - *) diff --git a/clamav-0.92-private.patch b/clamav-0.92-private.patch new file mode 100644 index 0000000..bab2948 --- /dev/null +++ b/clamav-0.92-private.patch @@ -0,0 +1,29 @@ +--- clamav-0.92/libclamav.pc.in.private ++++ clamav-0.92/libclamav.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.92/clamav-config.in.private ++++ clamav-0.92/clamav-config.in +@@ -54,12 +54,8 @@ while test $# -gt 0; do + usage 0 + ;; + +- --cflags) +- echo -I@includedir@ @CFLAGS@ +- ;; +- +- --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ (--cflags|--libs) ++ ${PKG_CONFIG:-pkg-config} "$1" libclamav + ;; + + *) diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch deleted file mode 100644 index 4f1872c..0000000 --- a/clamav-0.93.1-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path -+++ clamav-0.93.1/contrib/init/RedHat/clamav-milter -@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -87,7 +86,7 @@ case "$1" in - restart - ;; - condrestart) -- test -f ${lockfile} && $0 restart || : -+ test -f ${lockfile} && restart || : - ;; - status) - if [ ! -z $pidfile ]; then diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch deleted file mode 100644 index 899d32b..0000000 --- a/clamav-0.93.3-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff -+++ clamav-0.93.3/contrib/init/RedHat/clamav-milter -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes \ - # email messages for virus scanning with ClamAV diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch deleted file mode 100644 index de29887..0000000 --- a/clamav-0.93.3-pid.patch +++ /dev/null @@ -1,17 +0,0 @@ -Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora -initscripts do not support killing of whole processgroups. Hence, disable -feature which posts negative pgrp into pidfile and use plain pid instead -of. - -diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c ---- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 -+++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 -@@ -1985,7 +1985,7 @@ main(int argc, char **argv) - logg(_("!Can't save PID in file %s\n"), pidfile); - return EX_CONFIG; - } --#ifdef C_LINUX -+#if defined(C_LINUX) && 0 - /* Ensure that all threads are kill()ed */ - fprintf(fd, "-%d\n", (int)getpgrp()); - #else diff --git a/clamav-0.95-cliopts.patch b/clamav-0.95-cliopts.patch new file mode 100644 index 0000000..90d173f --- /dev/null +++ b/clamav-0.95-cliopts.patch @@ -0,0 +1,13 @@ +Index: clamav-0.95rc1/shared/optparser.c +=================================================================== +--- clamav-0.95rc1.orig/shared/optparser.c ++++ clamav-0.95rc1/shared/optparser.c +@@ -211,7 +211,7 @@ const struct clam_option clam_options[] + + { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, + +- { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, ++ { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, + + { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, + diff --git a/clamav-0.95rc1-umask.patch b/clamav-0.95rc1-umask.patch new file mode 100644 index 0000000..8a46216 --- /dev/null +++ b/clamav-0.95rc1-umask.patch @@ -0,0 +1,39 @@ +Index: clamav-0.95rc1/clamav-milter/clamav-milter.c +=================================================================== +--- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c ++++ clamav-0.95rc1/clamav-milter/clamav-milter.c +@@ -287,7 +287,7 @@ int main(int argc, char **argv) { + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0006); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +Index: clamav-0.95rc1/shared/output.c +=================================================================== +--- clamav-0.95rc1.orig/shared/output.c ++++ clamav-0.95rc1/shared/output.c +@@ -250,7 +250,7 @@ int logg(const char *str, ...) + #endif + if(logg_file) { + if(!logg_fp) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +Index: clamav-0.95rc1/freshclam/freshclam.c +=================================================================== +--- clamav-0.95rc1.orig/freshclam/freshclam.c ++++ clamav-0.95rc1/freshclam/freshclam.c +@@ -102,7 +102,7 @@ static void writepid(const char *pidfile + { + FILE *fd; + int old_umask; +- old_umask = umask(0006); ++ old_umask = umask(0022); + if((fd = fopen(pidfile, "w")) == NULL) { + logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); + } else { diff --git a/clamav-milter.sysv b/clamav-milter.sysv new file mode 100644 index 0000000..7c06c60 --- /dev/null +++ b/clamav-milter.sysv @@ -0,0 +1,103 @@ +#!/bin/sh +# +# clamav-milter This script starts and stops the clamav-milter daemon +# +# chkconfig: - 79 40 +# +# description: clamav-milter is a daemon which hooks into sendmail and routes \ +# email messages for virus scanning with ClamAV +# processname: clamav-milter +# pidfile: /var/lock/subsys/clamav-milter + +# Source function library. +. /etc/rc.d/init.d/functions + +# Source networking configuration. +. /etc/sysconfig/network + +# Local clamav-milter config +CLAMAV_FLAGS= +test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter + +# Check that networking is up. +[ ${NETWORKING} = "no" ] && exit 0 + +PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin + +RETVAL=0 + +# Clamav-milter must have write access to the pid file, /var/run is not suitable +default_pidfile= +[ -d /var/run/clamav-milter ] && default_pidfile=/var/run/clamav-milter/clamav-milter.pid +[ -d /var/clamav ] && default_pidfile=/var/clamav/clamav-milter.pid +pidfile=${PIDFILE:-$default_pidfile} + +lockfile=/var/lock/subsys/clamav-milter + +start() { + echo -n "Starting clamav-milter: " + # Don't allow files larger than 25M to be created, to limit DoS + # Needs to be large enough to extract the signature files + ulimit -f 25600 + if [ ! -z $pidfile ]; then + CLAMAV_PID=--pidfile=${pidfile} + PID=`pidofproc -p ${pidfile} clamav-milter` + else + CLAMAV_PID= + PID=`pidofproc clamav-milter` + fi + [ -n "$PID" ] && echo " already running!" && return 1 + LANG= daemon clamav-milter $CLAMAV_PID ${CLAMAV_FLAGS} + RETVAL=$? + [ ! -z $pidfile -a -f $pidfile ] && sed -i -e 's/-//' $pidfile + echo + test $RETVAL -eq 0 && touch ${lockfile} + return $RETVAL +} + +stop() { + echo -n "Shutting down clamav-milter: " + if [ ! -z $pidfile ]; then + killproc -p ${pidfile} clamav-milter + else + killproc clamav-milter + fi + RETVAL=$? + echo + test $RETVAL -eq 0 && rm -f ${lockfile} ${pidfile} +} + +restart() { + stop + start +} + +# See how we were called. +case "$1" in + start) + # Start daemon. + start + ;; + stop) + # Stop daemon. + stop + ;; + restart|reload) + restart + ;; + condrestart) + test -f ${lockfile} && restart || : + ;; + status) + if [ ! -z $pidfile ]; then + status -p ${pidfile} clamav-milter + else + status clamav-milter + fi + ;; + *) + echo "Usage: $0 {start|stop|reload|restart|condrestart|status}" + exit 1 +esac + +exit $? diff --git a/clamav.spec b/clamav.spec index 4fe1dee..3f5dea1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.2 +Version: 0.95.1 Release: %release_func 1 License: GPLv2 @@ -25,7 +25,7 @@ URL: http://www.clamav.net # incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by # make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] -Source0: clamav-%{version}-norar.tar.bz2 +Source0: %name-%version-norar.tar.bz2 # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. # Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig @@ -36,15 +36,15 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.93.3-initoff.patch -Patch24: clamav-0.90rc3-private.patch +Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.93.3-pid.patch +Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95rc1-umask.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel BuildRequires: %_includedir/tcpd.h BuildRequires: bc @@ -71,6 +71,7 @@ Source100: clamd-gen Requires: clamav-lib = %version-%release Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig +Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner @@ -131,6 +132,7 @@ Requires(post): coreutils %package milter-sysv Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons +Source320: clamav-milter.sysv Provides: init(clamav-milter) = sysv Requires: clamav-milter = %version-%release Requires(post): user(%milteruser) clamav-milter @@ -229,23 +231,24 @@ The SysV initscripts for clamav-milter. %prep %setup -q -%patch21 -p1 -b .path -%patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .pid +%patch26 -p1 -b .cliopts +%patch27 -p1 -b .umask mkdir -p libclamunrar{,_iface} touch libclamunrar/{Makefile.in,all,install} -perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; - s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; - s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g; - s!^#?(User ).*!\1<USER>!g; - s! /usr/local/share/clamav,! %homedir,!g; - ' etc/clamd.conf +sed -ri \ + -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf -perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf +sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ @@ -255,12 +258,17 @@ CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' -%configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static --disable-unrar -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -# No rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes +%configure --disable-clamav --with-dbdir=/var/lib/clamav \ + --enable-milter --disable-static \ + --disable-rpath --disable-unrar + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ + libtool make %{?_smp_mflags} @@ -297,6 +305,7 @@ install -d -m755 \ rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la + touch ${RPM_BUILD_ROOT}%homedir/daily.cld touch ${RPM_BUILD_ROOT}%homedir/main.cld @@ -348,7 +357,8 @@ cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' EOF -install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog @@ -455,6 +465,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %defattr(-,%username,%username,-) %ghost %attr(0664,%username,%username) %homedir/*.cvd + ## ----------------------- %files update @@ -468,7 +479,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %config(noreplace) %_sysconfdir/sysconfig/freshclam %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog - %ghost %attr(0664,%username,%username) %homedir/*.cld @@ -495,13 +505,12 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files milter %defattr(-,root,root,-) -%doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%attr(0700,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%attr(0710,%milteruser,%milteruser) %dir %milterstatedir +%ghost %milterstatedir/* %files milter-sysv @@ -511,6 +520,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495036, #495039) and enabled IPv6 support +- Fixed typo in SysV initscript which removes 'touch' file (#473513) +- Added build requirement to ncurses-devel for clamdtop + * Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 - Upgrade to 0.94.2 (#474002) diff --git a/clamd-wrapper b/clamd-wrapper index 372005f..14c04a5 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -28,7 +28,7 @@ CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf CLAMD_OPTIONS= ## backward-compatibility check... for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do + /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do CLAMD_SOCKET=$i test ! -e "$i" || break done @@ -52,7 +52,7 @@ stop () { killproc $procname RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f touch $lockfile + [ $RETVAL -eq 0 ] && rm -f $lockfile return $RETVAL } diff --git a/sources b/sources index e115b9a..acd143c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 +0ddd9f341dd0299a6bc5398ee26f4ebf clamav-0.95.1-norar.tar.bz2 commit aef9a638f4c2b07f96790dc7e3cdd427fd67552d Author: Robert Scheck <robert(a)fedoraproject.org> Date: Fri Apr 10 20:17:31 2009 +0000 Upgrade to 0.95.1 (#495039) diff --git a/.cvsignore b/.cvsignore index 10b1622..c07be39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95-norar.tar.bz2 +clamav-0.95.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index a7b09ae..2daad57 100644 --- a/clamav.spec +++ b/clamav.spec @@ -20,7 +20,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.95 +Version: 0.95.1 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -666,6 +666,9 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Fri Apr 10 2009 Robert Scheck <robert(a)fedoraproject.org> - 0.95.1-1 +- Upgrade to 0.95.1 (#495039) + * Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 - updated to final 0.95 - added ncurses-devel (-> clamdtop) BR diff --git a/sources b/sources index 186409f..acd143c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f6ede74787379f1683a368ee6da62cea clamav-0.95-norar.tar.bz2 +0ddd9f341dd0299a6bc5398ee26f4ebf clamav-0.95.1-norar.tar.bz2 commit 3054d5609e5b4a832d67e35d946906fbead966cf Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 25 22:03:44 2009 +0000 updated diff --git a/.cvsignore b/.cvsignore index 334ef5c..10b1622 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.95rc1-norar.tar.bz2 +clamav-0.95-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index f6c79f5..a7b09ae 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -%global snapshot rc1 +#global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95 -Release: %release_func 0.1%{?snapshot:.%snapshot} +Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -51,6 +51,7 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: ncurses-devel BuildRequires: %_includedir/tcpd.h BuildRequires: bc @@ -337,6 +338,8 @@ CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' +# IPv6 check is buggy and does not work when there are no IPv6 interface on build machine +export have_cv_ipv6=yes %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --enable-milter --disable-static \ --disable-rpath \ @@ -663,6 +666,11 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %changelog +* Wed Mar 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-1 +- updated to final 0.95 +- added ncurses-devel (-> clamdtop) BR +- enforced IPv6 support + * Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 - updated to 0.95rc1 - added -upstart subpackages diff --git a/lastver b/lastver index d89b314..fd6d73e 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.94.2 +0.95 diff --git a/sources b/sources index 5f92b5e..186409f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40d13c0d39568b17aec35fe793233861 clamav-0.95rc1-norar.tar.bz2 +f6ede74787379f1683a368ee6da62cea clamav-0.95-norar.tar.bz2 commit 5e13498992d054b9cb059fd390b3d6251426b891 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 14:49:39 2009 +0000 updated diff --git a/README.fedora b/README.fedora index d46b193..603526c 100644 --- a/README.fedora +++ b/README.fedora @@ -24,7 +24,7 @@ A clamav-milter setup consists of the following three components: -upstart requires modification of /etc/event.d/clamd.scan to enable automatic startup. See comments there for more details. -* the MDA (sendmail/postfix) +* the MTA (sendmail/postfix) --> you should know how to install this... diff --git a/clamav-milter.upstart b/clamav-milter.upstart index 12a5d0c..165829e 100644 --- a/clamav-milter.upstart +++ b/clamav-milter.upstart @@ -1,13 +1,13 @@ ### Uncomment these lines when you want clamav-milter to be a milter -### for a locally running MDA +### for a locally running MTA #start on starting\ sendmail #start on starting sendmail #start on starting\ postfix #start on starting postfix ### Uncomment these lines when you want clamav-milter to be a milter -### for a remotely running MDA +### for a remotely running MTA #start on starting\ local #start on starting local commit 8e678e525b999e5eaca946ece8e9fb67a7b0c065 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 13:24:07 2009 +0000 updated diff --git a/README.fedora b/README.fedora index b9f572e..d46b193 100644 --- a/README.fedora +++ b/README.fedora @@ -1,5 +1,42 @@ -Add +A clamav-milter setup consists of the following three components: - INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl +* the clamav-milter itself -to your sendmail.mc. + --> this is provided by the 'clamav-milter' package plus (alternatively) + 'clamav-milter-upstart' or 'clamav-milter-sysvinit' + + The main configuration is in /etc/mail/clamav-milter.conf and MUST + be changed before first use. + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamav-milter to + enable automatic startup. See comments there for more details. + +* a clamav scanner daemon + + --> this package is called 'clamav-scanner' plus (alternatively) + 'clamav-scanner-upstart' or 'clamav-scanner-sysvinit' + + The daemon is configured by /etc/clamd.d/scan.conf (which MUST be + edited before first use). + + The -sysvinit package is managed by the traditional tools, but + -upstart requires modification of /etc/event.d/clamd.scan to enable + automatic startup. See comments there for more details. + +* the MDA (sendmail/postfix) + + --> you should know how to install this... + + When communicating across unix sockets with the clamav-milter, it is + suggested to use the /var/run/clamav-milter/clamav.sock path. You + have to add something like + + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl + + to your sendmail.mc. + + + +It is suggested that components communicate through TCP sockets as +this eases setup. Please add corresponding packet filter rules! diff --git a/clamav-0.95rc1-umask.patch b/clamav-0.95rc1-umask.patch new file mode 100644 index 0000000..8a46216 --- /dev/null +++ b/clamav-0.95rc1-umask.patch @@ -0,0 +1,39 @@ +Index: clamav-0.95rc1/clamav-milter/clamav-milter.c +=================================================================== +--- clamav-0.95rc1.orig/clamav-milter/clamav-milter.c ++++ clamav-0.95rc1/clamav-milter/clamav-milter.c +@@ -287,7 +287,7 @@ int main(int argc, char **argv) { + + if((opt = optget(opts, "PidFile"))->enabled) { + FILE *fd; +- mode_t old_umask = umask(0006); ++ mode_t old_umask = umask(0022); + + if((fd = fopen(opt->strarg, "w")) == NULL) { + logg("!Can't save PID in file %s\n", opt->strarg); +Index: clamav-0.95rc1/shared/output.c +=================================================================== +--- clamav-0.95rc1.orig/shared/output.c ++++ clamav-0.95rc1/shared/output.c +@@ -250,7 +250,7 @@ int logg(const char *str, ...) + #endif + if(logg_file) { + if(!logg_fp) { +- old_umask = umask(0037); ++ old_umask = umask(0077); + if((logg_fp = fopen(logg_file, "at")) == NULL) { + umask(old_umask); + #ifdef CL_THREAD_SAFE +Index: clamav-0.95rc1/freshclam/freshclam.c +=================================================================== +--- clamav-0.95rc1.orig/freshclam/freshclam.c ++++ clamav-0.95rc1/freshclam/freshclam.c +@@ -102,7 +102,7 @@ static void writepid(const char *pidfile + { + FILE *fd; + int old_umask; +- old_umask = umask(0006); ++ old_umask = umask(0022); + if((fd = fopen(pidfile, "w")) == NULL) { + logg("!Can't save PID to file %s: %s\n", pidfile, strerror(errno)); + } else { diff --git a/clamav-milter.sysv b/clamav-milter.sysv index 8ff51b3..c0fad96 100644 --- a/clamav-milter.sysv +++ b/clamav-milter.sysv @@ -11,7 +11,7 @@ exec=/usr/sbin/clamav-milter prog="clamav-milter" -OPTS= +OPTS='-c /etc/mail/clamav-milter.conf' [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog pidfile=/var/run/clamav-milter/milter.pid @@ -21,8 +21,7 @@ start() { [ -x $exec ] || exit 5 [ -f $config ] || exit 6 echo -n $"Starting $prog: " - daemon --pidfile=${pidfile} \ - $exec $OPTS --nofork=no --pid=${pidfile} && success || failure + daemon --pidfile=${pidfile} $exec $OPTS --nofork=no --pid=${pidfile} retval=$? echo [ $retval -eq 0 ] && touch $lockfile @@ -31,7 +30,7 @@ start() { stop() { echo -n $"Stopping $prog: " - killproc -o "${pidfile} $exec && success || failure + killproc -p "${pidfile}" $exec retval=$? echo [ $retval -eq 0 ] && rm -f $lockfile @@ -53,7 +52,7 @@ force_reload() { rh_status() { # run checks to determine if the service is running or use generic status - status $prog + status -p "${pidfile}" $prog } rh_status_q() { diff --git a/clamav-milter.upstart b/clamav-milter.upstart index f211818..12a5d0c 100644 --- a/clamav-milter.upstart +++ b/clamav-milter.upstart @@ -16,4 +16,4 @@ stop on runlevel 1 stop on runlevel 6 respawn -exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter --nofork=yes +exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter.conf --nofork=yes diff --git a/clamav.spec b/clamav.spec index 8b5758c..f6c79f5 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95 -Release: %release_func 0.0.3%{?snapshot:.%snapshot} +Release: %release_func 0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File diff --git a/clamd-wrapper b/clamd-wrapper index 5baca59..ec785d0 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -42,7 +42,8 @@ prog="clamd.${CLAMD_SERVICE}" start () { echo -n $"Starting $prog: " daemon --pidfile=${CLAMD_PIDFILE} \ - $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} + exec -a $procname /usr/sbin/clamd \ + ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile diff --git a/clamd.scan.upstart b/clamd.scan.upstart index e96b37e..6c769e0 100644 --- a/clamd.scan.upstart +++ b/clamd.scan.upstart @@ -12,4 +12,4 @@ stop on runlevel 1 stop on runlevel 6 respawn -exec /usr/sbin/clamd -c /etc/clamd.d/clamd.scan --nofork=yes +exec /usr/sbin/clamd -c /etc/clamd.d/scan.conf --nofork=yes commit 9cba4633a4309d7d2b7456c54fbcf0a85fa4efb7 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 12:53:03 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index f08684d..8b5758c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -134,8 +134,8 @@ Summary: Clamav scanner daemon Group: System Environment/Daemons BuildArch: noarch Requires: init(clamav-scanner) -Provides: user(%scanuser) = 99 -Provides: group(%scanuser) = 99 +Provides: user(%scanuser) = 49 +Provides: group(%scanuser) = 49 Requires: clamav-server = %version-%release %package scanner-sysvinit diff --git a/clamd-wrapper b/clamd-wrapper index b601cf2..5baca59 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -51,7 +51,7 @@ start () { stop () { echo -n $"Stopping $prog: " - killproc $procname + killproc -p ${CLAMD_PIDFILE} $procname RETVAL=$? echo [ $RETVAL -eq 0 ] && rm -f $lockfile @@ -79,7 +79,7 @@ case "$1" in start|stop|restart|reload) $1 ;; status) - status $procname ;; + status -p ${CLAMD_PIDFILE} $procname ;; condrestart) test ! -f $lockfile || restart ;; commit 71c33552b35a0ee478fc90c5696dfd548c7c81b4 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 12:47:20 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index 941cbc9..f08684d 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.95 -Release: %release_func 0.0.1%{?snapshot:.%snapshot} +Release: %release_func 0.0.3%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -46,6 +46,7 @@ Source8: clamav-notify-servers Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch Patch26: clamav-0.95-cliopts.patch +Patch27: clamav-0.95rc1-umask.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -310,6 +311,7 @@ The Upstart initscripts for clamav-milter. %patch24 -p1 -b .private %patch25 -p1 -b .open %patch26 -p1 -b .cliopts +%patch27 -p1 -b .umask install -p -m0644 %SOURCE300 clamav-milter/ @@ -422,7 +424,7 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; ### The scanner stuff sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ - etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/clamd.scan + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/scan.conf sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ > $RPM_BUILD_ROOT%_initrddir/clamd.scan @@ -629,7 +631,7 @@ test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : %files scanner %defattr(-,root,root,-) %dir %attr(0710,%scanuser,%scanuser) %scanstatedir -%config(noreplace) %_sysconfdir/clamd.d/clamd.scan +%config(noreplace) %_sysconfdir/clamd.d/scan.conf %ghost %scanstatedir/clamd.sock %files scanner-sysvinit commit 0981a17d0b3b976ba2b2a6196e1a76db59a3b54c Author: ensc <ensc(a)fedoraproject.org> Date: Sun Mar 8 11:38:36 2009 +0000 updated diff --git a/.cvsignore b/.cvsignore index 336c23f..334ef5c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.2-norar.tar.bz2 +clamav-0.95rc1-norar.tar.bz2 diff --git a/ChangeLog-rpm.old b/ChangeLog-rpm.old new file mode 100644 index 0000000..44c8556 --- /dev/null +++ b/ChangeLog-rpm.old @@ -0,0 +1,279 @@ +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + +* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 +- updated to 0.88.6 + +* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 +- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 +- added patch to set '__attribute__ ((visibility("hidden")))' for + exported MD5_*() functions (fixes #202043) + +* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + +* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 +- splitted SysV initscripts of -milter and -server into own subpackages + +* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 +- rebuilt + +* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 +- updated to 0.88.4 (SECURITY) + +* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed the clamdscan(1) manpage from the -server subpackage + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed a superfluous '}' +- removed some code which was relevant for FC-3 only + +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 +- updated to 0.88.3 +- updated to new fedora-usermgmt macros + +* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 +- cleanups: removed unneeded curlies, use plain command instead of + %%__XXX macro, whitespace cleanup, removed unneeded versioned + dependencies +- added a 'Requires(post): group(clamav)' dependencies for -update and + added the corresponding Provides: to -data +- removed the %%_without_milter conditional; you won't gain anything + when milter would be disabled at buildtime + +* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 +- updated to 0.88.2 (SECURITY) +- rediffed patches; most issues handled by 0.88.1-2 are fixed in + 0.88.2 + +* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 +- added patch which fixes some classes of compiler warnings; at least + the using of implicitly declared functions was reported to cause + segfaults on AMD64 (brought to my attention by Marc Perkel) +- added patch which fixes wrong usage of strncpy(3) in unrarlib.c + +* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 +- updated to 0.88.1 (SECURITY) + +* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 +- rebuilt for FC5 + +* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 +- updated to 0.88 +- added pseudo-versions for the 'init(...)' provides as a first step + for the support of alternative initmethods + +* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 +- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) +- ship 'clamd.conf.5' man page in the -server subpackage *too*. The + same file is contained in multiple packages now, but this man-page + can not be removed from the base package because it also applies to + 'clamdscan' there (#173221). + +* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 +- updated to 0.87.1 + +* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 +- updated to 0.87 (SECURITY) +- removed -timeout patch; it is solved upstream +- reverted the -exim changes; they add yet more complexity, their + functionality can go into an own package and they contained flaws + +* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 +- Add clamav-exim configuration package + +* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + +* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 +- updated to 0.86.2 (SECURITY) +- changed the freshclam updating mechanism (again); now, it consists + of a crontab which does not need to be changed and a helper script + (freshclam-sleep). This helper script is configured by + /etc/sysconfig/freshclam + +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 +- updated to 0.86.1 +- fixed randomization in %%post scriptlet: hour should be a range but + not a single number + +* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 +- updated to 0.86 +- randomize freshclam startup times in -update's %%post script (suggested + by Stephen Smoogen); this requires some more Requires(post): also + +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 +- fix dist tagging the way Enrico wants it + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 +- Rebuild + +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 +- Update + +* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 +- updated to 0.85 + +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 +- updated to 0.84 + +* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> +- rebuilt + +* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 +- updated to 0.83 + +* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 +- updated to 0.82 +- minor spec cleanups + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 +- build the package with '--disable-zlib-vcheck' because RH is unable to + apply a fix for a 5 month old and solved security issue. Please fill + your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +- added 'BuildRequires: bc' (should work without also, but ./configure + gives out ugly warnings else) + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 +- updated to 0.81 +- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports + an internal mode now which is enabled by default +- updated -milter %%description + +* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 +- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update + subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) + +* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 +- updated to 0.80 +- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore +- buildrequire 'curl-devel' +- renamed clamav.conf to clamd.conf (upstream change) +- updated -initoff patch + +* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 +- updated to 0.75.1 +- use %%configure, the problems with the architecture specification + seem to have passed (probably because of an autoconf update) +- set mode 0600 for the cron-script (required by vixie-cron) +- made the cronjob a spambot and send mail about deactivated freshclam + service to nearly everybody... (root, postmaster, webmaster) +- other fixes in the notification cronjob + +* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 +- updated to 0.75 + +* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 +- moved /usr/bin/clamav-config from main into -devel + +* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 +- updated to 0.74 + +* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 +- updated to 0.73 +- added pkgconfig file + +* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 +- notify the user about a deactivated clamav-update service +- added clamd-gen script which generates template spec-files for + services using clamd +- copied template configuration files to %pkgdatadir/template (needed + for clamd-gen) +- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink + will be provided for compatibility reasons +- conditionalized building of the -milter subpackage ('--without + milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) + +* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 +- removed 'BuildRequires: dietlibc'; it was a leftover from the + pre-use-signal era (before 0.70) (bug #1716) + +* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 +- updated to 0.72 + +* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 +- removed the randomization in the cronjob; it seems to be impossible + to use the mod-operator (%%) there. Instead of, the user has to + replace some placeholders... + +* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 +- updated to 0.71 + +* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 +- quote 'EOF' to delay $RANDOM expansion + +* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 +- updated GECOS entry for the 'clamav' user to describe its purpose + more accurately +- use explicit '-m755' when creating directories with install + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 +- updated to 0.70; rediffed some patches +- updated logrotate script to use signals and documented the steps + which are needed to make it work +- adapted initscript to use signals instead of sockwrite +- removed sockwrite; signals can now be used to reload the database +- added logfile to the -milter subpackage + +* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 +- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets + +* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 +- split the double Requires(...,...): statements; see + https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 +- require the recent fedora-usermgmt package (0.7) which fixes similar + ordering issues + +* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 +- updated to 0.68 (using the -1 version) +- ship milter-files in the -milter instead of the -server subpackage + +* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 +- fixed ':' vs. '.' in chown + +* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 +- randomize freshclam startup to prevent server peaks + +* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 +- updated to 0.67 (using the -1 version) + +* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 +- updated to 0.66; important, packaging-relevant changes are + freshclam: + * $http_proxy is not supported anymore; you have to configure it in + /etc/freshclam.conf + * the logfile has been renamed to /var/log/freshclam.log +- removed %%check section; buildroot check is implemented in local + testsuite already +- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew + files +- added some directory-Requires: +- activated milter-package and made it work +- added patch to disable clamav-milter service by default +- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this + makes things more consistently but can break backward compatibility. The + initscript should deal with the old version too, but I would not bet on + it... +- updated some descriptions +- fixed the update-mechanism; now it happens in two stages: at first, + the files will be downloaded as user 'clamav' and then, root initiates + the daemon-reload. + +* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 +- added security fix for + http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch deleted file mode 100644 index 4f1872c..0000000 --- a/clamav-0.93.1-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path -+++ clamav-0.93.1/contrib/init/RedHat/clamav-milter -@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -87,7 +86,7 @@ case "$1" in - restart - ;; - condrestart) -- test -f ${lockfile} && $0 restart || : -+ test -f ${lockfile} && restart || : - ;; - status) - if [ ! -z $pidfile ]; then diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch deleted file mode 100644 index 899d32b..0000000 --- a/clamav-0.93.3-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff -+++ clamav-0.93.3/contrib/init/RedHat/clamav-milter -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes \ - # email messages for virus scanning with ClamAV diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch deleted file mode 100644 index de29887..0000000 --- a/clamav-0.93.3-pid.patch +++ /dev/null @@ -1,17 +0,0 @@ -Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora -initscripts do not support killing of whole processgroups. Hence, disable -feature which posts negative pgrp into pidfile and use plain pid instead -of. - -diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c ---- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 -+++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 -@@ -1985,7 +1985,7 @@ main(int argc, char **argv) - logg(_("!Can't save PID in file %s\n"), pidfile); - return EX_CONFIG; - } --#ifdef C_LINUX -+#if defined(C_LINUX) && 0 - /* Ensure that all threads are kill()ed */ - fprintf(fd, "-%d\n", (int)getpgrp()); - #else diff --git a/clamav-0.95-cliopts.patch b/clamav-0.95-cliopts.patch new file mode 100644 index 0000000..90d173f --- /dev/null +++ b/clamav-0.95-cliopts.patch @@ -0,0 +1,13 @@ +Index: clamav-0.95rc1/shared/optparser.c +=================================================================== +--- clamav-0.95rc1.orig/shared/optparser.c ++++ clamav-0.95rc1/shared/optparser.c +@@ -211,7 +211,7 @@ const struct clam_option clam_options[] + + { "ExitOnOOM", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD, "Stop the daemon when libclamav reports an out of memory condition.", "yes" }, + +- { "Foreground", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, ++ { "Foreground", "nofork", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM | OPT_MILTER, "Don't fork into background.", "no" }, + + { "Debug", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_FRESHCLAM, "Enable debug messages in libclamav.", "no" }, + diff --git a/clamav-milter.sysv b/clamav-milter.sysv new file mode 100644 index 0000000..8ff51b3 --- /dev/null +++ b/clamav-milter.sysv @@ -0,0 +1,94 @@ +#!/bin/sh +# +# clamav-milter Starts/stop the "clamav-milter" daemon +# +# chkconfig: 345 99 1 +# description: A virus scanning milter + +# Source function library. +. /etc/rc.d/init.d/functions + +exec=/usr/sbin/clamav-milter +prog="clamav-milter" + +OPTS= +[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog + +pidfile=/var/run/clamav-milter/milter.pid +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + [ -f $config ] || exit 6 + echo -n $"Starting $prog: " + daemon --pidfile=${pidfile} \ + $exec $OPTS --nofork=no --pid=${pidfile} && success || failure + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -o "${pidfile} $exec && success || failure + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + # run checks to determine if the service is running or use generic status + status $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? diff --git a/clamav-milter.upstart b/clamav-milter.upstart new file mode 100644 index 0000000..f211818 --- /dev/null +++ b/clamav-milter.upstart @@ -0,0 +1,19 @@ + +### Uncomment these lines when you want clamav-milter to be a milter +### for a locally running MDA +#start on starting\ sendmail +#start on starting sendmail +#start on starting\ postfix +#start on starting postfix + +### Uncomment these lines when you want clamav-milter to be a milter +### for a remotely running MDA +#start on starting\ local +#start on starting local + +stop on runlevel 0 +stop on runlevel 1 +stop on runlevel 6 + +respawn +exec /usr/sbin/clamav-milter -c /etc/mail/clamav-milter --nofork=yes diff --git a/clamav.spec b/clamav.spec index e03bcaa..941cbc9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -#global snapshot rc1 +%global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -8,18 +8,20 @@ %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log -%global milterlog %_var/log/clamd.milter %global milteruser clamilt +%global milterlog %_var/log/clamav-milter.log %global milterstatedir %_var/run/clamav-milter %global pkgdatadir %_datadir/%name +%global scanuser clamscan +%global scanstatedir %_var/run/clamd.scan %{!?release_func:%global release_func() %1%{?dist}} Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.2 -Release: %release_func 3%{?snapshot:.%snapshot} +Version: 0.95 +Release: %release_func 0.0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -41,11 +43,9 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.93.3-pid.patch +Patch26: clamav-0.95-cliopts.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -56,8 +56,9 @@ BuildRequires: bc %package filesystem Summary: Filesystem structure for clamav Group: Applications/File -Provides: user(clamav) -Provides: group(clamav) +BuildArch: noarch +Provides: user(%username) = 4 +Provides: group(%username) = 4 # Prevent version mix Conflicts: %name < %version-%release Conflicts: %name > %version-%release @@ -81,7 +82,7 @@ Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -BuildArch: noarch +BuildArch: noarch Requires(pre): clamav-filesystem = %version-%release Requires(postun): clamav-filesystem = %version-%release Provides: data(clamav) = full @@ -111,12 +112,11 @@ Requires(post): group(clamav) %package server Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Requires: init(clamav-server) Requires: data(clamav) Requires: clamav-filesystem = %version-%release Requires: clamav-lib = %version-%release -%package server-sysv +%package server-sysvinit Summary: SysV initscripts for clamav server Group: System Environment/Daemons BuildArch: noarch @@ -124,48 +124,91 @@ Provides: init(clamav-server) = sysv Requires: clamav-server = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir +Provides: clamav-server-sysv = %version-%release +Obsoletes: clamav-server-sysv < %version-%release -%package milter -Summary: Milter module for the Clam Antivirus scanner + +%package scanner +Summary: Clamav scanner daemon +Group: System Environment/Daemons +BuildArch: noarch +Requires: init(clamav-scanner) +Provides: user(%scanuser) = 99 +Provides: group(%scanuser) = 99 +Requires: clamav-server = %version-%release + +%package scanner-sysvinit +Summary: SysV initscripts for clamav scanner daemon Group: System Environment/Daemons -Requires: clamav-milter-core = %version-%release -Requires: milter(clamav) +BuildArch: noarch +Provides: init(clamav-scanner) = sysv +Requires: clamav-server-sysvinit = %version-%release +Requires: clamav-scanner = %version-%release +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig +Requires(preun): chkconfig initscripts -%package milter-core -Summary: Core milter module for the Clam Antivirus scanner +%package scanner-upstart +Summary: Upstart initscripts for clamav scanner daemon Group: System Environment/Daemons +BuildArch: noarch +Source410: clamd.scan.upstart +Provides: init(clamav-scanner) = upstart +Requires: clamav-scanner = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl + + +%package milter +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Source300: README.fedora Requires: init(clamav-milter) BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel -Provides: user(%milteruser) -Provides: group(%milteruser) +Provides: user(%milteruser) = 5 +Provides: group(%milteruser) = 5 Requires(post): coreutils %{?FE_USERADD_REQ} -%package milter-sendmail -Summary: Sendmail customizations for clamav-milter -Group: System Environment/Daemons -Source300: README.fedora -Requires: sendmail -Requires: clamav-milter-core = %version-%release -Requires(pre): user(%milteruser) -Requires(pre): group(%milteruser) Provides: milter(clamav) = sendmail -Conflicts: milter(clamav) < sendmail -Conflicts: milter(clamav) > sendmail +Provides: milter(clamav) = postfix -%package milter-sysv +Provides: clamav-milter-core = %version-%release +Obsoletes: clamav-milter-core < %version-%release +Provides: clamav-milter-sendmail = %version-%release +Obsoletes: clamav-milter-sendmail < %version-%release + +%package milter-sysvinit Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons -Provides: init(clamav-milter) = sysv -Requires: clamav-milter = %version-%release BuildArch: noarch +Source320: clamav-milter.sysv +Provides: init(clamav-milter) = sysvinit +Requires: clamav-milter = %version-%release Requires(post): user(%milteruser) clamav-milter Requires(preun): user(%milteruser) clamav-milter Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig Requires(preun): chkconfig initscripts +Provides: milter-sysv = %version-%release +Obsoletes: milter-sysv < %version-%release + +%package milter-upstart +Summary: Upstart initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +BuildArch: noarch +Source310: clamav-milter.upstart +Provides: init(clamav-milter) = upstart +Requires: clamav-milter = %version-%release +# implicates a conflict with upstart 0.5+ +Requires(pre): /etc/event.d +Requires(post): /usr/bin/killall +Requires(postun): /sbin/initctl %description @@ -235,47 +278,54 @@ of this daemon should be started for each service requiring it. See the README file how this can be done with a minimum of effort. -%description server-sysv +%description server-sysvinit SysV initscripts template for the clamav server +%description scanner +This package contains a generic system wide clamd service which is +e.g. used by the clamav-milter package. + +%description scanner-sysvinit +The SysV initscripts for clamav-scanner. + +%description scanner-upstart +The Upstart initscripts for clamav-scanner. + + %description milter This package contains files which are needed to run the clamav-milter. -%description milter-sysv +%description milter-sysvinit The SysV initscripts for clamav-milter. -%description milter-core -Core files for the clamav-milter. - -%description milter-sendmail -Sendmail customizations of the clamav-milter. - +%description milter-upstart +The Upstart initscripts for clamav-milter. ## ------------------------------------------------------------ %prep %setup -q -n %{name}-%{version}%{?snapshot} -%patch21 -p1 -b .path -%patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .pid +%patch26 -p1 -b .cliopts install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} %{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} -perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; - s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; - s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g; - s!^#?(User ).*!\1<USER>!g; - s! /usr/local/share/clamav,! %homedir,!g; - ' etc/clamd.conf +sed -ri \ + -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g' \ + -e 's!^(#?LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g' \ + -e 's!^(#?PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g' \ + -e 's!^#?(User ).*!\1<USER>!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog).*!\1 yes!g' \ + -e 's! /usr/local/share/clamav,! %homedir,!g' \ + etc/clamd.conf -perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf +sed -ri -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ @@ -321,12 +371,13 @@ function smartsubst() { install -d -m755 \ - ${RPM_BUILD_ROOT}%_sysconfdir/{clamd.d,cron.d,logrotate.d,sysconfig} \ + ${RPM_BUILD_ROOT}%_sysconfdir/{mail,clamd.d,cron.d,logrotate.d,sysconfig,event.d} \ ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir + ${RPM_BUILD_ROOT}%homedir \ + ${RPM_BUILD_ROOT}%scanstatedir rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la @@ -369,22 +420,33 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -#### The milter stuff -function subst() { - sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" -} +### The scanner stuff +sed -e 's!<SERVICE>!scan!g;s!<USER>!%scanuser!g' \ + etc/clamd.conf > $RPM_BUILD_ROOT%_sysconfdir/clamd.d/clamd.scan + +sed -e 's!<SERVICE>!scan!g;' $RPM_BUILD_ROOT%pkgdatadir/template/clamd.init \ + > $RPM_BUILD_ROOT%_initrddir/clamd.scan + +install -p -m 644 %SOURCE410 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamd.scan + +touch $RPM_BUILD_ROOT%scanstatedir/clamd.sock -subst etc/clamd.conf /etc/clamd.d/milter.conf \ - 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' +### The milter stuff +sed -r \ + -e 's!^#?(User).*!\1 %milteruser!g' \ + -e 's!^#?(AllowSupplementaryGroups|LogSyslog) .*!\1 yes!g' \ + -e 's! /tmp/clamav-milter.socket! %milterstatedir/clamav-milter.socket!g' \ + -e 's! /var/run/clamav-milter.pid! %milterstatedir/clamav-milter.pid!g' \ + -e 's! /tmp/clamav-milter.log! %milterlog!g' \ + etc/clamav-milter.conf > $RPM_BUILD_ROOT%_sysconfdir/mail/clamav-milter.conf +install -p -m 644 %SOURCE310 $RPM_BUILD_ROOT%_sysconfdir/event.d/clamav-milter +install -p -m 755 %SOURCE320 $RPM_BUILD_ROOT%_initrddir/clamav-milter -cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter -CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' -EOF -install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter -touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog +rm -f $RPM_BUILD_ROOT%_sysconfdir/clamav-milter.conf +touch $RPM_BUILD_ROOT{%milterstatedir/clamav-milter.socket,%milterlog} ## ------------------------------------------------------------ @@ -404,6 +466,35 @@ rm -rf "$RPM_BUILD_ROOT" %__fe_groupdel %username &>/dev/null || : +%pre scanner +%__fe_groupadd 49 -r %scanuser &>/dev/null || : +%__fe_useradd 49 -r -s /sbin/nologin -d / -M \ + -g %scanuser %scanuser &>/dev/null || : + +%postun scanner +%__fe_userdel %scanuser &>/dev/null || : +%__fe_groupdel %scanuser &>/dev/null || : + + +%post scanner-sysvinit +/sbin/chkconfig --add clamd.scan + +%preun scanner-sysvinit +test "$1" != 0 || %_initrddir/clamd.scan stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.scan + +%postun scanner-sysvinit +test "$1" = 0 || %_initrddir/clamd.scan condrestart >/dev/null || : + + +%post scanner-upstart +/usr/bin/killall -u %scanuser clamd 2>/dev/null || : + +%preun scanner-upstart +test "$1" != "0" || /sbin/initctl -q stop clamd.scan || : + + + %post update test -e %freshclamlog || { touch %freshclamlog @@ -411,34 +502,41 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%pre milter-core +%pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : -%post milter-core +%post milter test -e %milterlog || { touch %milterlog chmod 0620 %milterlog chown root:%milteruser %milterlog } -%postun milter-core +%postun milter %__fe_userdel %milteruser &>/dev/null || : %__fe_groupdel %milteruser &>/dev/null || : -%post milter-sysv +%post milter-sysvinit /sbin/chkconfig --add clamav-milter -%preun milter-sysv +%preun milter-sysvinit test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : test "$1" != 0 || /sbin/chkconfig --del clamav-milter -%postun milter-sysv +%postun milter-sysvinit test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : +%post milter-upstart +/usr/bin/killall -u %milteruser clamav-milter 2>/dev/null || : + +%preun milter-upstart +test "$1" != "0" || /sbin/initctl -q stop clamav-milter || : + + %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -521,37 +619,57 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %exclude %_mandir/man8/clamav-milter* -%files server-sysv +%files server-sysvinit %defattr(-,root,root,-) %_initrddir/clamd-wrapper ## ----------------------- -%files milter +%files scanner %defattr(-,root,root,-) +%dir %attr(0710,%scanuser,%scanuser) %scanstatedir +%config(noreplace) %_sysconfdir/clamd.d/clamd.scan +%ghost %scanstatedir/clamd.sock -%files milter-core +%files scanner-sysvinit +%attr(0755,root,root) %config %_initrddir/clamd.scan + +%files scanner-upstart %defattr(-,root,root,-) -%doc clamav-milter/INSTALL -%_sbindir/*milter* -%_mandir/man8/clamav-milter* -%config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%config(noreplace) %_sysconfdir/event.d/clamd.scan + +## ----------------------- -%files milter-sendmail +%files milter %defattr(-,root,root,-) %doc clamav-milter/README.fedora -%attr(0700,%milteruser,%milteruser) %dir %milterstatedir +%_sbindir/*milter* +%_mandir/man8/clamav-milter* +%config(noreplace) %_sysconfdir/mail/clamav-milter.conf +%ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%attr(0710,%milteruser,%milteruser) %dir %milterstatedir %ghost %milterstatedir/* -%files milter-sysv +%files milter-sysvinit %defattr(-,root,root,-) %config %_initrddir/clamav-milter -%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter + +%files milter-upstart +%defattr(-,root,root,-) +%config(noreplace) %_sysconfdir/event.d/clamav-milter %changelog +* Sun Mar 8 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.95-0.1.rc1 +- updated to 0.95rc1 +- added -upstart subpackages +- renamed -sysv to -sysvinit to make -upstart win the default dep resolving +- reworked complete milter stuff +- added -scanner subpackage which contains a preconfigured daemon + (e.g. for use by -milter) +- moved %%changelog entries from 2006 and before into ChangeLog-rpm.old + * Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 - made some subpackages noarch - fixed typo in SysV initscript which removes 'touch' file (#473513) @@ -681,283 +799,3 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : updated per cron-job and user does not want to download the large -data package with outdated virus definitations (#214949) - %%ghost'ed the files downloaded by freshclam - -* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 -- updated to 0.88.7 - -* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 -- updated to 0.88.6 - -* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 -- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 -- added patch to set '__attribute__ ((visibility("hidden")))' for - exported MD5_*() functions (fixes #202043) - -* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 - - rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 -- splitted SysV initscripts of -milter and -server into own subpackages - -* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 -- rebuilt - -* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 -- updated to 0.88.4 (SECURITY) - -* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed the clamdscan(1) manpage from the -server subpackage - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- removed a superfluous '}' -- removed some code which was relevant for FC-3 only - -* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 -- updated to 0.88.3 -- updated to new fedora-usermgmt macros - -* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 -- cleanups: removed unneeded curlies, use plain command instead of - %%__XXX macro, whitespace cleanup, removed unneeded versioned - dependencies -- added a 'Requires(post): group(clamav)' dependencies for -update and - added the corresponding Provides: to -data -- removed the %%_without_milter conditional; you won't gain anything - when milter would be disabled at buildtime - -* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 -- updated to 0.88.2 (SECURITY) -- rediffed patches; most issues handled by 0.88.1-2 are fixed in - 0.88.2 - -* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 -- added patch which fixes some classes of compiler warnings; at least - the using of implicitly declared functions was reported to cause - segfaults on AMD64 (brought to my attention by Marc Perkel) -- added patch which fixes wrong usage of strncpy(3) in unrarlib.c - -* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 -- updated to 0.88.1 (SECURITY) - -* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 -- rebuilt for FC5 - -* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 -- updated to 0.88 -- added pseudo-versions for the 'init(...)' provides as a first step - for the support of alternative initmethods - -* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 -- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) -- ship 'clamd.conf.5' man page in the -server subpackage *too*. The - same file is contained in multiple packages now, but this man-page - can not be removed from the base package because it also applies to - 'clamdscan' there (#173221). - -* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 -- updated to 0.87.1 - -* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 -- updated to 0.87 (SECURITY) -- removed -timeout patch; it is solved upstream -- reverted the -exim changes; they add yet more complexity, their - functionality can go into an own package and they contained flaws - -* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 -- Add clamav-exim configuration package - -* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 -- [milter] create the milter-logfile in the %%post scriptlet -- [milter] reverted the change of the default child_timeout value; it - was set to 5 minutes in 0.86.2 which conflicts with the internal - mode where a timeout must not be set. So, the clamav-milter would - not run with the default configuration - -* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 -- Fixed calculation of sleep duration; on some systems/IPs, `hostid` - results in a negative number which is retained by the bash - modulo-operation. So the sleep may get a negative number of seconds - being interpreted as an option. This version makes sure that the - module-operations returns a non-negative value. [BZ #164494, James - Wilkinson] -- added support for a /usr/sbin/clamav-notify-servers.local hook; this - file will be executed (source'd) before all other actions and can - abort the entire processing by invoking 'exit' - -* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 -- updated to 0.86.2 (SECURITY) -- changed the freshclam updating mechanism (again); now, it consists - of a crontab which does not need to be changed and a helper script - (freshclam-sleep). This helper script is configured by - /etc/sysconfig/freshclam - -* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 -- updated to 0.86.1 -- fixed randomization in %%post scriptlet: hour should be a range but - not a single number - -* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 -- updated to 0.86 -- randomize freshclam startup times in -update's %%post script (suggested - by Stephen Smoogen); this requires some more Requires(post): also - -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 -- fix dist tagging the way Enrico wants it - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 -- Rebuild - -* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 -- Update - -* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 -- updated to 0.85 - -* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 -- updated to 0.84 - -* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> -- rebuilt - -* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 -- updated to 0.83 - -* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 -- updated to 0.82 -- minor spec cleanups - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 -- build the package with '--disable-zlib-vcheck' because RH is unable to - apply a fix for a 5 month old and solved security issue. Please fill - your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 -- added 'BuildRequires: bc' (should work without also, but ./configure - gives out ugly warnings else) - -* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 -- updated to 0.81 -- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports - an internal mode now which is enabled by default -- updated -milter %%description - -* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 -- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update - subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) - -* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 -- updated to 0.80 -- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore -- buildrequire 'curl-devel' -- renamed clamav.conf to clamd.conf (upstream change) -- updated -initoff patch - -* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 -- updated to 0.75.1 -- use %%configure, the problems with the architecture specification - seem to have passed (probably because of an autoconf update) -- set mode 0600 for the cron-script (required by vixie-cron) -- made the cronjob a spambot and send mail about deactivated freshclam - service to nearly everybody... (root, postmaster, webmaster) -- other fixes in the notification cronjob - -* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 -- updated to 0.75 - -* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 -- moved /usr/bin/clamav-config from main into -devel - -* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 -- updated to 0.74 - -* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 -- updated to 0.73 -- added pkgconfig file - -* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 -- notify the user about a deactivated clamav-update service -- added clamd-gen script which generates template spec-files for - services using clamd -- copied template configuration files to %pkgdatadir/template (needed - for clamd-gen) -- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink - will be provided for compatibility reasons -- conditionalized building of the -milter subpackage ('--without - milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) - -* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 -- removed 'BuildRequires: dietlibc'; it was a leftover from the - pre-use-signal era (before 0.70) (bug #1716) - -* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 -- updated to 0.72 - -* Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 -- removed the randomization in the cronjob; it seems to be impossible - to use the mod-operator (%%) there. Instead of, the user has to - replace some placeholders... - -* Wed May 19 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.1 -- updated to 0.71 - -* Fri May 7 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1.1 -- quote 'EOF' to delay $RANDOM expansion - -* Tue Apr 27 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.2 -- updated GECOS entry for the 'clamav' user to describe its purpose - more accurately -- use explicit '-m755' when creating directories with install - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.70-0.fdr.1 -- updated to 0.70; rediffed some patches -- updated logrotate script to use signals and documented the steps - which are needed to make it work -- adapted initscript to use signals instead of sockwrite -- removed sockwrite; signals can now be used to reload the database -- added logfile to the -milter subpackage - -* Tue Apr 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2.1 -- tagged some Requires:, since clamav-server is required in the milter-%%post* scriptlets - -* Sat Mar 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.2 -- split the double Requires(...,...): statements; see - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=118773 -- require the recent fedora-usermgmt package (0.7) which fixes similar - ordering issues - -* Thu Mar 18 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.68-0.fdr.1 -- updated to 0.68 (using the -1 version) -- ship milter-files in the -milter instead of the -server subpackage - -* Tue Feb 24 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.3 -- fixed ':' vs. '.' in chown - -* Tue Feb 17 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.2 -- randomize freshclam startup to prevent server peaks - -* Mon Feb 16 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.67-0.fdr.1 -- updated to 0.67 (using the -1 version) - -* Wed Feb 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.66-0.fdr.2 -- updated to 0.66; important, packaging-relevant changes are - freshclam: - * $http_proxy is not supported anymore; you have to configure it in - /etc/freshclam.conf - * the logfile has been renamed to /var/log/freshclam.log -- removed %%check section; buildroot check is implemented in local - testsuite already -- added some %%verify(not mtime) modifiers to avoid unnecessary .rpmnew - files -- added some directory-Requires: -- activated milter-package and made it work -- added patch to disable clamav-milter service by default -- renamed /var/run/clamav.<SERVICE> to /var/run/clamd.<SERVICE>; this - makes things more consistently but can break backward compatibility. The - initscript should deal with the old version too, but I would not bet on - it... -- updated some descriptions -- fixed the update-mechanism; now it happens in two stages: at first, - the files will be downloaded as user 'clamav' and then, root initiates - the daemon-reload. - -* Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 -- added security fix for - http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 diff --git a/clamd-wrapper b/clamd-wrapper index 14c04a5..b601cf2 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -26,6 +26,7 @@ procname=clamd.${CLAMD_SERVICE} CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf CLAMD_OPTIONS= +CLAMD_PIDFILE=/var/run/clamd.${CLAMD_SERVICE}/clamd.pid ## backward-compatibility check... for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do @@ -40,7 +41,8 @@ prog="clamd.${CLAMD_SERVICE}" start () { echo -n $"Starting $prog: " - daemon $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} + daemon --pidfile=${CLAMD_PIDFILE} \ + $procname ${CLAMD_CONFIGFILE:+-c $CLAMD_CONFIGFILE} ${CLAMD_OPTIONS} --pid ${CLAMD_PIDFILE} RETVAL=$? echo [ $RETVAL -eq 0 ] && touch $lockfile @@ -59,10 +61,10 @@ stop () { reload() { rc=0 echo -n $"Reloading $prog: " - killproc $procname -SIGHUP || rc=$? + killproc -p ${CLAMD_PIDFILE} $procname -SIGHUP || rc=$? echo echo -n $"Loading new virus-database: " - killproc $procname -SIGUSR2 || rc=$? + killproc -p ${CLAMD_PIDFILE} $procname -SIGUSR2 || rc=$? echo return $rc } diff --git a/clamd.scan.upstart b/clamd.scan.upstart new file mode 100644 index 0000000..e96b37e --- /dev/null +++ b/clamd.scan.upstart @@ -0,0 +1,15 @@ +### Uncomment these lines when you want clamd.scan to be a scanner +### for a locally running clamav-milter +#start on starting clamav-milter + +### Uncomment these lines when you want clamd.scan to be a generic +### scanner service +#start on starting\ local +#start on starting local + +stop on runlevel 0 +stop on runlevel 1 +stop on runlevel 6 + +respawn +exec /usr/sbin/clamd -c /etc/clamd.d/clamd.scan --nofork=yes diff --git a/lastver b/lastver index 5e4a9c1..d89b314 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.93.3 +0.94.2 diff --git a/sources b/sources index e115b9a..5f92b5e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 +40d13c0d39568b17aec35fe793233861 clamav-0.95rc1-norar.tar.bz2 commit 3717d73615ddb16892f77ab78066a28db6f96ec0 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Feb 25 08:58:23 2009 +0000 updated diff --git a/clamav.spec b/clamav.spec index 2bc0418..e03bcaa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.94.2 -Release: %release_func 2%{?snapshot:.%snapshot} +Release: %release_func 3%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -81,6 +81,7 @@ Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File +BuildArch: noarch Requires(pre): clamav-filesystem = %version-%release Requires(postun): clamav-filesystem = %version-%release Provides: data(clamav) = full @@ -90,6 +91,7 @@ Conflicts: data(clamav) > full %package data-empty Summary: Empty data package for the Clam Antivirus scanner Group: Applications/File +BuildArch: noarch Provides: data(clamav) = empty Conflicts: data(clamav) < empty Conflicts: data(clamav) > empty @@ -117,6 +119,7 @@ Requires: clamav-lib = %version-%release %package server-sysv Summary: SysV initscripts for clamav server Group: System Environment/Daemons +BuildArch: noarch Provides: init(clamav-server) = sysv Requires: clamav-server = %version-%release Requires(pre): %_initrddir @@ -156,6 +159,7 @@ Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons Provides: init(clamav-milter) = sysv Requires: clamav-milter = %version-%release +BuildArch: noarch Requires(post): user(%milteruser) clamav-milter Requires(preun): user(%milteruser) clamav-milter Requires(pre): %_initrddir @@ -548,6 +552,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Feb 25 2009 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.94.2-3 +- made some subpackages noarch +- fixed typo in SysV initscript which removes 'touch' file (#473513) + * Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/clamd-wrapper b/clamd-wrapper index c32e34e..14c04a5 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -52,7 +52,7 @@ stop () { killproc $procname RETVAL=$? echo - [ $RETVAL -eq 0 ] && rm -f touch $lockfile + [ $RETVAL -eq 0 ] && rm -f $lockfile return $RETVAL } diff --git a/verinfo b/verinfo index a4a0b38..814d953 100644 --- a/verinfo +++ b/verinfo @@ -1,2 +1,2 @@ -http://prdownloads.sourceforge.net/sourceforge/clamav/ +http://sourceforge.net/project/showfiles.php?group_id=86638&package_id=90197 clamav-([0-9.-]*?)\.tar\. commit a843b1831a1f03926eeebf884ffecfb73e6fb551 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Tue Feb 24 07:37:58 2009 +0000 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/clamav.spec b/clamav.spec index ab6ef56..2bc0418 100644 --- a/clamav.spec +++ b/clamav.spec @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.94.2 -Release: %release_func 1%{?snapshot:.%snapshot} +Release: %release_func 2%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -548,6 +548,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Feb 23 2009 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.94.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 - Upgrade to 0.94.2 (#474002) commit 3ef6d7cff563db71bc8c64dca022138fb4bca716 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Dec 2 22:26:31 2008 +0000 Upgrade to 0.94.2 (#474002) diff --git a/.cvsignore b/.cvsignore index 0a417f9..336c23f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.1-norar.tar.bz2 +clamav-0.94.2-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index 8ab44ec..4fe1dee 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.1 +Version: 0.94.2 Release: %release_func 1 License: GPLv2 @@ -511,6 +511,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + * Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 - Upgrade to 0.94.1 diff --git a/sources b/sources index a29b987..e115b9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 +9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 commit b4e507d2995e34811d8a03e7e5a4b5eaacd48ec2 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Tue Dec 2 22:26:31 2008 +0000 Upgrade to 0.94.2 (#474002) diff --git a/.cvsignore b/.cvsignore index 0a417f9..336c23f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94.1-norar.tar.bz2 +clamav-0.94.2-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index e39ffaa..ab6ef56 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94.1 +Version: 0.94.2 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -548,6 +548,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Dec 02 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.2-1 +- Upgrade to 0.94.2 (#474002) + * Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 - Upgrade to 0.94.1 diff --git a/sources b/sources index a29b987..e115b9a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 +9b04d010c17c607ace4ed5e9318104d4 clamav-0.94.2-norar.tar.bz2 commit fc9b9c469299fb1d0289b3d170e87680f4757f96 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Nov 5 19:50:09 2008 +0000 Upgrade to 0.94.1 diff --git a/.cvsignore b/.cvsignore index e015b0c..0a417f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94-norar.tar.bz2 +clamav-0.94.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index c20f532..8ab44ec 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94 +Version: 0.94.1 Release: %release_func 1 License: GPLv2 @@ -511,6 +511,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + * Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker diff --git a/sources b/sources index ec908dc..a29b987 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 +7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 commit c063e179aa855be52af01f273a3a93171e096835 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Nov 5 19:50:09 2008 +0000 Upgrade to 0.94.1 diff --git a/.cvsignore b/.cvsignore index e015b0c..0a417f9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.94-norar.tar.bz2 +clamav-0.94.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index f8d8778..e39ffaa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.94 +Version: 0.94.1 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -548,6 +548,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Nov 05 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94.1-1 +- Upgrade to 0.94.1 + * Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker diff --git a/sources b/sources index ec908dc..a29b987 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 +7da93ec3951ada1b91ced0e3da42f939 clamav-0.94.1-norar.tar.bz2 commit 3a1d2b5e3ca38ce6c5e6619c49a07d91a8043aae Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Oct 26 17:48:00 2008 +0000 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker - CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg - CVE-2008-3913 Memory leak in code path in freshclam's manager.c - CVE-2008-3914 Multiple file descriptor leaks on the code paths diff --git a/.cvsignore b/.cvsignore index a51ec3e..e015b0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.3-norar.tar.bz2 +clamav-0.94-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index aa1497f..f8d8778 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.3 +Version: 0.94 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -548,6 +548,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + * Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 - updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read on petite files) diff --git a/sources b/sources index 7ccec62..ec908dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 +a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 commit da4aada21147f2e98cda179eabc647f2078dc9d8 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Oct 26 17:38:04 2008 +0000 - Upgrade to 0.94 (SECURITY), fixes #461461: - CVE-2008-1389 Invalid memory access in the CHM unpacker - CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg - CVE-2008-3913 Memory leak in code path in freshclam's manager.c - CVE-2008-3914 Multiple file descriptor leaks on the code paths diff --git a/.cvsignore b/.cvsignore index a51ec3e..e015b0c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.3-norar.tar.bz2 +clamav-0.94-norar.tar.bz2 diff --git a/Makefile b/Makefile index 21be25f..2cc62a7 100644 --- a/Makefile +++ b/Makefile @@ -19,3 +19,16 @@ MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) + + +# can not use final tarball name here as it will conflict with rules +# within Makefile.common +TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp +TARBALL = ${NAME}-${VERSION}.tar.gz + +clean-sources: ${TARBALL_CLEAN} + +${TARBALL_CLEAN}: ${TARBALL} + rm -f $@.tmp + zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp + mv $@.tmp $@ diff --git a/clamav.spec b/clamav.spec index 1a799d2..c20f532 100644 --- a/clamav.spec +++ b/clamav.spec @@ -15,16 +15,16 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.3 +Version: 0.94 Release: %release_func 1 License: GPLv2 Group: Applications/File URL: http://www.clamav.net -# Unfortunately, clamav includes support for RAR v3, derived from GPL +# Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. -# All that is needed to make the clean tarball is: rm -rf libclamunrar* -# Note that you also need patch26. +# tarball was created by +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] Source0: clamav-%{version}-norar.tar.bz2 # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. @@ -511,6 +511,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Oct 26 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.94-1 +- Upgrade to 0.94 (SECURITY), fixes #461461: +- CVE-2008-1389 Invalid memory access in the CHM unpacker +- CVE-2008-3912 Out-of-memory NULL pointer dereference in mbox/msg +- CVE-2008-3913 Memory leak in code path in freshclam's manager.c +- CVE-2008-3914 Multiple file descriptor leaks on the code paths + * Mon Jul 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.3-1 - Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: - CVE-2008-2713 Out-of-bounds read on petite files diff --git a/sources b/sources index 7ccec62..ec908dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 +a2ace45354b5b44bb334a0bfe8416e14 clamav-0.94-norar.tar.bz2 commit 20b50894331b06649484c380c0c35f84cf8795eb Author: Robert Scheck <robert(a)fedoraproject.org> Date: Mon Jul 14 10:34:44 2008 +0000 - Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: - CVE-2008-2713 Out-of-bounds read on petite files - Put pid instead of pgrp into pid file of clamav-milter (#452359) diff --git a/.cvsignore b/.cvsignore index 48c3a65..a51ec3e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.1-norar.tar.bz2 +clamav-0.93.3-norar.tar.bz2 diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch deleted file mode 100644 index db4e000..0000000 --- a/clamav-0.80-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes - # email messages to clamav diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch new file mode 100644 index 0000000..899d32b --- /dev/null +++ b/clamav-0.93.3-initoff.patch @@ -0,0 +1,11 @@ +--- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff ++++ clamav-0.93.3/contrib/init/RedHat/clamav-milter +@@ -2,7 +2,7 @@ + # + # clamav-milter This script starts and stops the clamav-milter daemon + # +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 + # + # description: clamav-milter is a daemon which hooks into sendmail and routes \ + # email messages for virus scanning with ClamAV diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch new file mode 100644 index 0000000..de29887 --- /dev/null +++ b/clamav-0.93.3-pid.patch @@ -0,0 +1,17 @@ +Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora +initscripts do not support killing of whole processgroups. Hence, disable +feature which posts negative pgrp into pidfile and use plain pid instead +of. + +diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c +--- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 ++++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 +@@ -1985,7 +1985,7 @@ main(int argc, char **argv) + logg(_("!Can't save PID in file %s\n"), pidfile); + return EX_CONFIG; + } +-#ifdef C_LINUX ++#if defined(C_LINUX) && 0 + /* Ensure that all threads are kill()ed */ + fprintf(fd, "-%d\n", (int)getpgrp()); + #else diff --git a/clamav.spec b/clamav.spec index 682f593..1a799d2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,5 +1,3 @@ -## $Id: clamav.spec,v 1.50 2008/04/14 20:31:45 robert Exp $ - ## Fedora Extras specific customization below... # %bcond_without fedora ## @@ -17,7 +15,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.1 +Version: 0.93.3 Release: %release_func 1 License: GPLv2 @@ -39,9 +37,10 @@ Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.80-initoff.patch +Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.90rc3-private.patch Patch25: clamav-0.92-open.patch +Patch26: clamav-0.93.3-pid.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -234,6 +233,7 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .pid mkdir -p libclamunrar{,_iface} touch libclamunrar/{Makefile.in,all,install} @@ -511,8 +511,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Jul 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.3-1 +- Upgrade to 0.93.3 (SECURITY), rediffed -initoff patch: +- CVE-2008-2713 Out-of-bounds read on petite files +- Put pid instead of pgrp into pid file of clamav-milter (#452359) + * Wed Jun 18 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.1-1 -- Upgrade to 0.93.1, rediffed -path patch +- Upgrade to 0.93.1 (SECURITY), rediffed -path patch: - CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability * Mon Apr 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93-1 diff --git a/sources b/sources index 3875ac9..7ccec62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 +53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 commit 6a9c737ebd351c9b269dcedec4338158e767b7c1 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:36:07 2008 +0000 rediffed patches diff --git a/clamav.spec b/clamav.spec index 65c92e8..aa1497f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -42,7 +42,7 @@ Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.93.1-path.patch -Patch22: clamav-0.80-initoff.patch +Patch22: clamav-0.93.3-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch Patch26: clamav-0.93.3-pid.patch @@ -552,6 +552,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read on petite files) - put pid instead of pgrp into pidfile of clamav-milter (bz #452359) +- rediffed patches * Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 - updated to 0.93.1 commit 422a07557176c65c5f04a4759298ddf64efdff44 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:33:38 2008 +0000 rediffed diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch deleted file mode 100644 index db4e000..0000000 --- a/clamav-0.80-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 79 40 -+# chkconfig: - 79 40 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes - # email messages to clamav diff --git a/clamav-0.93.3-initoff.patch b/clamav-0.93.3-initoff.patch new file mode 100644 index 0000000..899d32b --- /dev/null +++ b/clamav-0.93.3-initoff.patch @@ -0,0 +1,11 @@ +--- clamav-0.93.3/contrib/init/RedHat/clamav-milter.initoff ++++ clamav-0.93.3/contrib/init/RedHat/clamav-milter +@@ -2,7 +2,7 @@ + # + # clamav-milter This script starts and stops the clamav-milter daemon + # +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 + # + # description: clamav-milter is a daemon which hooks into sendmail and routes \ + # email messages for virus scanning with ClamAV commit cc612e64b642ec9f0284f1c799b5d4254bb59a0c Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:20:40 2008 +0000 - updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read on petite files) - put pid instead of pgrp into pidfile of clamav-milter (bz #452359) diff --git a/clamav.spec b/clamav.spec index 55e2a2f..65c92e8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93.1 +Version: 0.93.3 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -45,6 +45,7 @@ Patch21: clamav-0.93.1-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch +Patch26: clamav-0.93.3-pid.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -256,6 +257,7 @@ Sendmail customizations of the clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .pid install -p -m0644 %SOURCE300 clamav-milter/ @@ -546,6 +548,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Jul 13 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.3-1 +- updated to 0.93.3; another fix for CVE-2008-2713 (out-of-bounds read + on petite files) +- put pid instead of pgrp into pidfile of clamav-milter (bz #452359) + * Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 - updated to 0.93.1 - rediffed -path patch commit 8775e9b2f26ed4dec631ecd4f3700077d589957f Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:12:31 2008 +0000 updated to 0.93.3 diff --git a/.cvsignore b/.cvsignore index 48c3a65..a51ec3e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93.1-norar.tar.bz2 +clamav-0.93.3-norar.tar.bz2 diff --git a/lastver b/lastver index a16a6df..5e4a9c1 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.93.1 +0.93.3 diff --git a/sources b/sources index 3875ac9..7ccec62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 +53d288ddafd9cc198eeb69ffe8c83d02 clamav-0.93.3-norar.tar.bz2 commit a7fdf91c087bd185fc7bb18332bf0e10e633cef9 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Jul 13 19:09:15 2008 +0000 initial checkin diff --git a/clamav-0.93.3-pid.patch b/clamav-0.93.3-pid.patch new file mode 100644 index 0000000..de29887 --- /dev/null +++ b/clamav-0.93.3-pid.patch @@ -0,0 +1,17 @@ +Try to fix https://bugzilla.redhat.com/show_bug.cgi?id=452359; RH/Fedora +initscripts do not support killing of whole processgroups. Hence, disable +feature which posts negative pgrp into pidfile and use plain pid instead +of. + +diff -up clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ clamav-0.93.3/clamav-milter/clamav-milter.c +--- clamav-0.93.3/clamav-milter/clamav-milter.c.~1~ 2008-07-07 20:02:10.000000000 +0200 ++++ clamav-0.93.3/clamav-milter/clamav-milter.c 2008-07-13 20:15:12.000000000 +0200 +@@ -1985,7 +1985,7 @@ main(int argc, char **argv) + logg(_("!Can't save PID in file %s\n"), pidfile); + return EX_CONFIG; + } +-#ifdef C_LINUX ++#if defined(C_LINUX) && 0 + /* Ensure that all threads are kill()ed */ + fprintf(fd, "-%d\n", (int)getpgrp()); + #else commit 61e30bf5ea1d3cd2f608f9f1b20e993c5a3d91e1 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 21 14:55:11 2008 +0000 removed CVS tags diff --git a/Makefile b/Makefile index 2cc62a7..ed9c5e4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ # Makefile for source rpm: clamav -# $Id$ NAME := clamav SPECFILE = $(firstword $(wildcard *.spec)) diff --git a/clamav.spec b/clamav.spec index 1486ed8..55e2a2f 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,5 +1,3 @@ -## $Id: clamav.spec,v 1.72 2008/06/17 19:57:54 ensc Exp $ - #global snapshot rc1 ## Fedora Extras specific customization below... commit 55d261d5465594de69aee6a408ef2b39bb9445dd Author: Robert Scheck <robert(a)fedoraproject.org> Date: Wed Jun 18 10:13:26 2008 +0000 - Upgrade to 0.93.1, rediffed -path patch - CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability diff --git a/.cvsignore b/.cvsignore index 069bca4..48c3a65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93-norar.tar.bz2 +clamav-0.93.1-norar.tar.bz2 diff --git a/clamav-0.70-path.patch b/clamav-0.70-path.patch deleted file mode 100644 index 3312e38..0000000 --- a/clamav-0.70-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.path 2003-06-26 15:38:06.000000000 +0200 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 15:39:01.000000000 +0200 -@@ -22,7 +22,6 @@ - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -63,7 +62,7 @@ - restart - ;; - condrestart) -- test -f /var/lock/subsys/clamav-milter && $0 restart || : -+ test -f /var/lock/subsys/clamav-milter && restart || : - ;; - status) - status clamav-milter diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch new file mode 100644 index 0000000..4f1872c --- /dev/null +++ b/clamav-0.93.1-path.patch @@ -0,0 +1,19 @@ +--- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path ++++ clamav-0.93.1/contrib/init/RedHat/clamav-milter +@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && + # Check that networking is up. + [ ${NETWORKING} = "no" ] && exit 0 + +-[ -x /usr/local/sbin/clamav-milter ] || exit 0 + PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin + + RETVAL=0 +@@ -87,7 +86,7 @@ case "$1" in + restart + ;; + condrestart) +- test -f ${lockfile} && $0 restart || : ++ test -f ${lockfile} && restart || : + ;; + status) + if [ ! -z $pidfile ]; then diff --git a/clamav.spec b/clamav.spec index a6c30f4..682f593 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.49 2008/02/14 16:00:40 robert Exp $ +## $Id: clamav.spec,v 1.50 2008/04/14 20:31:45 robert Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93 +Version: 0.93.1 Release: %release_func 1 License: GPLv2 @@ -38,7 +38,7 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.70-path.patch +Patch21: clamav-0.93.1-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch Patch25: clamav-0.92-open.patch @@ -511,6 +511,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Jun 18 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93.1-1 +- Upgrade to 0.93.1, rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + * Mon Apr 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93-1 - Upgrade to 0.93 (SECURITY): - CVE-2008-1100 Upack processing buffer overflow (#442360) diff --git a/sources b/sources index 444be31..3875ac9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 +c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 commit 56aef066d81499de3563d7775cf1d8d52fe75f7d Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 17 20:03:53 2008 +0000 updated diff --git a/.cvsignore b/.cvsignore index 069bca4..48c3a65 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.93-norar.tar.bz2 +clamav-0.93.1-norar.tar.bz2 diff --git a/clamav-0.70-path.patch b/clamav-0.70-path.patch deleted file mode 100644 index 3312e38..0000000 --- a/clamav-0.70-path.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.path 2003-06-26 15:38:06.000000000 +0200 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 15:39:01.000000000 +0200 -@@ -22,7 +22,6 @@ - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 - --[ -x /usr/local/sbin/clamav-milter ] || exit 0 - PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin - - RETVAL=0 -@@ -63,7 +62,7 @@ - restart - ;; - condrestart) -- test -f /var/lock/subsys/clamav-milter && $0 restart || : -+ test -f /var/lock/subsys/clamav-milter && restart || : - ;; - status) - status clamav-milter diff --git a/clamav-0.93.1-path.patch b/clamav-0.93.1-path.patch new file mode 100644 index 0000000..4f1872c --- /dev/null +++ b/clamav-0.93.1-path.patch @@ -0,0 +1,19 @@ +--- clamav-0.93.1/contrib/init/RedHat/clamav-milter.path ++++ clamav-0.93.1/contrib/init/RedHat/clamav-milter +@@ -22,7 +22,6 @@ test -f /etc/sysconfig/clamav-milter && + # Check that networking is up. + [ ${NETWORKING} = "no" ] && exit 0 + +-[ -x /usr/local/sbin/clamav-milter ] || exit 0 + PATH=$PATH:/usr/bin:/usr/local/sbin:/usr/local/bin + + RETVAL=0 +@@ -87,7 +86,7 @@ case "$1" in + restart + ;; + condrestart) +- test -f ${lockfile} && $0 restart || : ++ test -f ${lockfile} && restart || : + ;; + status) + if [ ! -z $pidfile ]; then diff --git a/clamav.spec b/clamav.spec index ebadcd9..1486ed8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.70 2008/03/12 08:40:04 ensc Exp $ +## $Id: clamav.spec,v 1.72 2008/06/17 19:57:54 ensc Exp $ #global snapshot rc1 @@ -20,7 +20,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.93 +Version: 0.93.1 Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} @@ -43,7 +43,7 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch21: clamav-0.70-path.patch +Patch21: clamav-0.93.1-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch @@ -548,6 +548,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jun 17 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93.1-1 +- updated to 0.93.1 +- rediffed -path patch +- CVE-2008-2713 Invalid Memory Access Denial Of Service Vulnerability + * Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 - updated to final 0.93 - removed daily.inc + main.inc directories; they are now replaced by diff --git a/lastver b/lastver index 341ad3c..a16a6df 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.93 +0.93.1 diff --git a/sources b/sources index 444be31..3875ac9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 +c9eca40bd39cc049b3b2b424879fa06e clamav-0.93.1-norar.tar.bz2 commit dbbdf5e26efedef21283e6ccd639f1724e49adcc Author: Robert Scheck <robert(a)fedoraproject.org> Date: Mon Apr 14 20:31:45 2008 +0000 - Upgrade to 0.93 (SECURITY): - CVE-2008-1100 Upack processing buffer overflow (#442360) - Removed *.inc directories; got replaced by *.cld containers diff --git a/.cvsignore b/.cvsignore index 9a29028..069bca4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.92.1-norar.tar.bz2 +clamav-0.93-norar.tar.bz2 diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch deleted file mode 100644 index b63921e..0000000 --- a/clamav-0.92-nounrar.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in ---- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 -+++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 -@@ -242,7 +242,7 @@ target_os = @target_os@ - target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - bin_SCRIPTS = clamav-config - pkgconfigdir = $(libdir)/pkgconfig -diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in ---- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 -+++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 -@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex - AC_C_FPU_BIGENDIAN - - AC_OUTPUT([ --libclamunrar/Makefile --libclamunrar_iface/Makefile - libclamav/Makefile - clamscan/Makefile - database/Makefile -diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am ---- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 -+++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 -@@ -16,7 +16,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - # MA 02110-1301, USA. - --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - - bin_SCRIPTS=clamav-config -diff -up clamav-0.92/configure.BAD clamav-0.92/configure ---- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 -+++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 -@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi - esac - - --ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" -+ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -27013,8 +27013,6 @@ do - case $ac_config_target in - "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; -- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; - "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; - "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; - "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav.spec b/clamav.spec index a0dff5c..a6c30f4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.48 2007/12/21 19:23:28 spot Exp $ +## $Id: clamav.spec,v 1.49 2008/02/14 16:00:40 robert Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92.1 +Version: 0.93 Release: %release_func 1 License: GPLv2 @@ -42,7 +42,6 @@ Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -235,7 +234,9 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .nounrar + +mkdir -p libclamunrar{,_iface} +touch libclamunrar/{Makefile.in,all,install} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -291,14 +292,13 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir/daily.inc + ${RPM_BUILD_ROOT}%homedir rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la -for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do - touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i -done +touch ${RPM_BUILD_ROOT}%homedir/daily.cld +touch ${RPM_BUILD_ROOT}%homedir/main.cld ## prepare the server-files @@ -439,7 +439,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files filesystem %attr(-,%username,%username) %dir %homedir -%attr(-,%username,%username) %dir %homedir/daily.inc %attr(-,root,root) %dir %pkgdatadir ## ----------------------- @@ -454,7 +453,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files data-empty %defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/main.cvd +%ghost %attr(0664,%username,%username) %homedir/*.cvd ## ----------------------- @@ -470,14 +469,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd +%ghost %attr(0664,%username,%username) %homedir/*.cld ## ----------------------- @@ -519,6 +511,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Apr 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.93-1 +- Upgrade to 0.93 (SECURITY): +- CVE-2008-1100 Upack processing buffer overflow (#442360) +- Removed *.inc directories; got replaced by *.cld containers + * Thu Feb 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.92.1-1 - Upgrade to 0.92.1 (SECURITY): - CVE-2008-0318 Integer overflow in libclamav (#432623) diff --git a/sources b/sources index 6e9b8a3..444be31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 +141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 commit 72cb5cff7c03a0348e09aa055d1d79ef616321f2 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 14 18:36:29 2008 +0000 - updated to final 0.93 - removed daily.inc + main.inc directories; they are now replaced by *.cld containers diff --git a/clamav.spec b/clamav.spec index 6aa5e2b..ebadcd9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,6 +1,6 @@ -## $Id: clamav.spec,v 1.69 2008/03/12 08:38:02 ensc Exp $ +## $Id: clamav.spec,v 1.70 2008/03/12 08:40:04 ensc Exp $ -%global snapshot rc1 +#global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.93 -Release: %release_func 0.1%{?snapshot:.%snapshot} +Release: %release_func 1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -322,19 +322,14 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir/{main,daily}.inc + ${RPM_BUILD_ROOT}%homedir rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la -for i in cfg db fp hdb info mdb mdu ndb ndu pdb wdb zmd; do - touch ${RPM_BUILD_ROOT}%homedir/daily.inc/daily.$i - touch ${RPM_BUILD_ROOT}%homedir/main.inc/main.$i -done - -touch ${RPM_BUILD_ROOT}%homedir/daily.inc/COPYING -touch ${RPM_BUILD_ROOT}%homedir/main.inc/COPYING +touch ${RPM_BUILD_ROOT}%homedir/daily.cld +touch ${RPM_BUILD_ROOT}%homedir/main.cld ## prepare the server-files @@ -475,7 +470,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files filesystem %attr(-,%username,%username) %dir %homedir -%attr(-,%username,%username) %dir %homedir/daily.inc %attr(-,root,root) %dir %pkgdatadir ## ----------------------- @@ -490,7 +484,8 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files data-empty %defattr(-,%username,%username,-) -%ghost %attr(0664,%username,%username) %homedir/main.cvd +%ghost %attr(0664,%username,%username) %homedir/*.cvd + ## ----------------------- @@ -505,9 +500,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %config(noreplace) %_sysconfdir/sysconfig/freshclam %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog - -%ghost %attr(0664,%username,%username) %homedir/daily.inc/* -%ghost %attr(0664,%username,%username) %homedir/main.inc/* +%ghost %attr(0664,%username,%username) %homedir/*.cld ## ----------------------- @@ -555,6 +548,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Apr 14 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-1 +- updated to final 0.93 +- removed daily.inc + main.inc directories; they are now replaced by + *.cld containers +- trimmed down MAILTO list of cronjob to 'root' again; every well + configured system has an alias for this recipient + * Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 - moved -milter scriptlets into -milter-core subpackage - added a requirement on the milteruser to the -milter-sendmail commit 3e418407a561822f535ccbb038fe0971dce644d0 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 14 18:35:02 2008 +0000 trimmed down MAILTO list of cronjob to 'root' again; every well configured system has an alias for this recipient diff --git a/clamav-update.cron b/clamav-update.cron index 3f1b005..3a69901 100644 --- a/clamav-update.cron +++ b/clamav-update.cron @@ -1,5 +1,5 @@ ## Adjust this line... -MAILTO=root,postmaster,webmaster,clamav +MAILTO=root ## It is ok to execute it as root; freshclam drops privileges and becomes ## user 'clamav' as soon as possible commit 9a66eef1308862e95496555c836f296dcd0bff8a Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 14 18:28:07 2008 +0000 updated to final 0.93 diff --git a/.cvsignore b/.cvsignore index d34f911..069bca4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1 @@ -clamav-*.tar.gz* -clamav-*.tar.bz2* -clamav-*.*.rpm +clamav-0.93-norar.tar.bz2 diff --git a/lastver b/lastver index da011ce..341ad3c 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.92.1 +0.93 diff --git a/sources b/sources index 47ab841..444be31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d7b2be9783f20956b7e090437105699 clamav-0.93rc1-norar.tar.bz2 +141ea153f0bf19e98f914d3e855cb715 clamav-0.93-norar.tar.bz2 commit 5fb728d2ef5c915ed0f1cc17b50643c0b39862d5 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 12 08:40:04 2008 +0000 added missing version to %changelog diff --git a/clamav.spec b/clamav.spec index 000b2d3..6aa5e2b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.68 2008/03/05 07:30:58 ensc Exp $ +## $Id: clamav.spec,v 1.69 2008/03/12 08:38:02 ensc Exp $ %global snapshot rc1 @@ -555,7 +555,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog -* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.1.rc1 - moved -milter scriptlets into -milter-core subpackage - added a requirement on the milteruser to the -milter-sendmail subpackage (reported by Bruce Jerrick) commit f5d1e31d7c361732661a7318830c91da7daffd97 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 12 08:38:02 2008 +0000 - moved -milter scriptlets into -milter-core subpackage - added a requirement on the milteruser to the -milter-sendmail subpackage (reported by Bruce Jerrick) diff --git a/clamav.spec b/clamav.spec index 2fe72e1..000b2d3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.67 2008/02/11 22:30:35 ensc Exp $ +## $Id: clamav.spec,v 1.68 2008/03/05 07:30:58 ensc Exp $ %global snapshot rc1 @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.93 -Release: %release_func 0.0%{?snapshot:.%snapshot} +Release: %release_func 0.1%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -146,6 +146,8 @@ Group: System Environment/Daemons Source300: README.fedora Requires: sendmail Requires: clamav-milter-core = %version-%release +Requires(pre): user(%milteruser) +Requires(pre): group(%milteruser) Provides: milter(clamav) = sendmail Conflicts: milter(clamav) < sendmail Conflicts: milter(clamav) > sendmail @@ -410,19 +412,19 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%pre milter +%pre milter-core %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : -%post milter +%post milter-core test -e %milterlog || { touch %milterlog chmod 0620 %milterlog chown root:%milteruser %milterlog } -%postun milter +%postun milter-core %__fe_userdel %milteruser &>/dev/null || : %__fe_groupdel %milteruser &>/dev/null || : @@ -553,6 +555,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Mar 12 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- moved -milter scriptlets into -milter-core subpackage +- added a requirement on the milteruser to the -milter-sendmail + subpackage (reported by Bruce Jerrick) + * Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 - updated to 0.93rc1 - fixed rpath issues commit 1f82fa929ae02cbeee422a5d4e04cf7bb686aeb2 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 5 07:30:58 2008 +0000 - updated to 0.93rc1 - fixed rpath issues diff --git a/clamav.spec b/clamav.spec index 70932c8..2fe72e1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,6 @@ -## $Id: clamav.spec,v 1.66 2008/01/01 17:33:05 ensc Exp $ +## $Id: clamav.spec,v 1.67 2008/02/11 22:30:35 ensc Exp $ + +%global snapshot rc1 ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,26 +20,21 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92.1 -Release: %release_func 1 +Version: 0.93 +Release: %release_func 0.0%{?snapshot:.%snapshot} License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net %if 0%{?with_unrar:1} -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?snapsho… %else # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. # tarball was created by -# -# zcat clamav-$V.tar.gz | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > clamav-$V-norar.tar.bz2 -# -# or -# -# make clean-sources [TARBALL=<original-tarball>] -Source0: %name-%version-norar.tar.bz2 +# make clean-sources [TARBALL=<original-tarball>] [VERSION=<version>] +Source0: %name-%version%{?snapshot}-norar.tar.bz2 %endif Source1: clamd-wrapper Source2: clamd.sysconfig @@ -253,7 +250,7 @@ Sendmail customizations of the clamav-milter. ## ------------------------------------------------------------ %prep -%setup -q +%setup -q -n %{name}-%{version}%{?snapshot} %patch21 -p1 -b .path %patch22 -p1 -b .initoff @@ -284,12 +281,13 @@ export LDFLAGS='-Wl,--as-needed' export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --enable-milter --disable-static \ + --disable-rpath \ %{!?with_unrar:--disable-unrar} # build with --as-needed and disable rpath sed -i \ -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!\"\/lib \/usr\/lib !/\"/%_lib /usr/%_lib !g' \ libtool @@ -555,6 +553,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Mar 4 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.93-0.0.rc1 +- updated to 0.93rc1 +- fixed rpath issues + * Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 - updated to 0.92.1 commit d7a04eea73382ccc812607bc031a6aa4c43bfda2 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Mar 5 07:29:47 2008 +0000 updated to 0.93rc1 diff --git a/sources b/sources index 6e9b8a3..47ab841 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 +7d7b2be9783f20956b7e090437105699 clamav-0.93rc1-norar.tar.bz2 commit d86d8a8a765d07f7d26dd84d7019d7639464e7d0 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Feb 14 16:00:40 2008 +0000 - Upgrade to 0.92.1 (SECURITY): - CVE-2008-0318 Integer overflow in libclamav (#432623) diff --git a/.cvsignore b/.cvsignore index f6ee3be..9a29028 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -clamav-*.tar.gz* -clamav-*.*.rpm +clamav-0.92.1-norar.tar.bz2 diff --git a/clamav.spec b/clamav.spec index e006b41..a0dff5c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.47 2007/12/21 19:12:19 spot Exp $ +## $Id: clamav.spec,v 1.48 2007/12/21 19:23:28 spot Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92 -Release: %release_func 4.1 +Version: 0.92.1 +Release: %release_func 1 License: GPLv2 Group: Applications/File @@ -27,7 +27,7 @@ URL: http://www.clamav.net # incompatible unrar from RARlabs. We have to pull this code out. # All that is needed to make the clean tarball is: rm -rf libclamunrar* # Note that you also need patch26. -Source0: clamav-%{version}.clean.tar.gz +Source0: clamav-%{version}-norar.tar.bz2 # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. # Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig @@ -519,6 +519,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu Feb 14 2008 Robert Scheck <robert(a)fedoraproject.org> - 0.92.1-1 +- Upgrade to 0.92.1 (SECURITY): +- CVE-2008-0318 Integer overflow in libclamav (#432623) + * Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-4 - EPEL fixes diff --git a/sources b/sources index 10dd892..6e9b8a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz +aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 commit 869e18548a9fa2dcab5307559ee885a1b0704ef6 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Thu Feb 14 15:42:36 2008 +0000 Removed old, unneeded patches diff --git a/clamav-0.70-user.patch b/clamav-0.70-user.patch deleted file mode 100644 index f7f42b1..0000000 --- a/clamav-0.70-user.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.user 2000-02-19 07:04:00.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 14:35:01.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # - # clamav-milter This script starts and stops the clamav-milter daemon - # -@@ -16,6 +16,7 @@ - - # Local clamav-milter config - CLAMAV_FLAGS= -+CLAMAV_USER= - test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter - - # Check that networking is up. -@@ -28,7 +29,7 @@ - - start() { - echo -n "Starting clamav-milter: " -- daemon clamav-milter ${CLAMAV_FLAGS} -+ daemon ${CLAMAV_USER:+--user $CLAMAV_USER} setsid /usr/sbin/clamav-milter ${CLAMAV_FLAGS} </dev/null - RETVAL=$? - echo - test $RETVAL -eq 0 && touch /var/lock/subsys/clamav-milter diff --git a/clamav-0.88.1-strncpy.patch b/clamav-0.88.1-strncpy.patch deleted file mode 100644 index ceceb7d..0000000 --- a/clamav-0.88.1-strncpy.patch +++ /dev/null @@ -1,26 +0,0 @@ -2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { diff --git a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch deleted file mode 100644 index 38f9d9d..0000000 --- a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- clamav-0.88.2/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-29 19:46:09.000000000 +0200 -+++ clamav-0.88.2/libclamav/pe.c 2006-04-30 11:25:53.000000000 +0200 -@@ -1555,7 +1555,7 @@ int cli_peheader(int desc, struct cli_pe - { - uint16_t e_magic; /* DOS signature ("MZ") */ - uint32_t e_lfanew; /* address of new exe header */ -- uint32_t min, max; -+ uint32_t min=0, max=0; - struct pe_image_file_hdr file_hdr; - struct pe_image_optional_hdr optional_hdr; - struct pe_image_section_hdr *section_hdr; ---- clamav-0.88.2/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 -+++ clamav-0.88.2/libclamav/htmlnorm.c 2006-04-30 11:25:53.000000000 +0200 -@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ - { - int fd_tmp, tag_length, tag_arg_length, binary; - int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; -- FILE *stream_in; -+ FILE *stream_in = 0; - html_state state=HTML_NORM, next_state=HTML_BAD_STATE; - char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; - char tag_val[HTML_STR_LENGTH+1], *tmp_file; diff --git a/clamav-0.88.4-visibility.patch b/clamav-0.88.4-visibility.patch deleted file mode 100644 index 34ef51e..0000000 --- a/clamav-0.88.4-visibility.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- clamav-0.88.4/libclamav/md5.c.visibility 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.4/libclamav/md5.c 2006-08-11 08:19:02.000000000 +0200 -@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da - return ptr; - } - --void MD5_Init(MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx) - { - ctx->a = 0x67452301; - ctx->b = 0xefcdab89; -@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx) - ctx->hi = 0; - } - --void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) -+void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) - { - MD5_u32plus saved_lo; - unsigned long used, free; -@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data - memcpy(ctx->buffer, data, size); - } - --void MD5_Final(unsigned char *result, MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx) - { - unsigned long used, free; - commit 693b061eac2a68f66601c2f80fa51621872b7a95 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Feb 11 22:30:35 2008 +0000 updated to 0.92.1 diff --git a/.cvsignore b/.cvsignore index f6ee3be..d34f911 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ clamav-*.tar.gz* +clamav-*.tar.bz2* clamav-*.*.rpm diff --git a/Makefile b/Makefile index 21be25f..2cc62a7 100644 --- a/Makefile +++ b/Makefile @@ -19,3 +19,16 @@ MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) + + +# can not use final tarball name here as it will conflict with rules +# within Makefile.common +TARBALL_CLEAN = ${NAME}-${VERSION}-norar.tar.bz2.tmp +TARBALL = ${NAME}-${VERSION}.tar.gz + +clean-sources: ${TARBALL_CLEAN} + +${TARBALL_CLEAN}: ${TARBALL} + rm -f $@.tmp + zcat $< | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > $@.tmp + mv $@.tmp $@ diff --git a/clamav.spec b/clamav.spec index 919bf65..70932c8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.65 2008/01/01 17:10:12 ensc Exp $ +## $Id: clamav.spec,v 1.66 2008/01/01 17:33:05 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.92 -Release: %release_func 6 +Version: 0.92.1 +Release: %release_func 1 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -30,8 +30,14 @@ Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar %else # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. -# All that is needed to make the clean tarball is: rm -rf libclamunrar* -Source0: %name-%version.clean.tar.gz +# tarball was created by +# +# zcat clamav-$V.tar.gz | tar --delete -f - '*/libclamunrar/*' | bzip2 -c > clamav-$V-norar.tar.bz2 +# +# or +# +# make clean-sources [TARBALL=<original-tarball>] +Source0: %name-%version-norar.tar.bz2 %endif Source1: clamd-wrapper Source2: clamd.sysconfig @@ -257,7 +263,7 @@ Sendmail customizations of the clamav-milter. install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} -%{!?with_unrar:touch libclamunrar{,_iface}/{Makefile.in,all,install}} +%{!?with_unrar:touch libclamunrar/{Makefile.in,all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -549,6 +555,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Feb 11 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92.1-1 +- updated to 0.92.1 + * Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 - redisabled unrar stuff completely by using clean sources - splitted -milter subpackage into pieces to allow use without sendmail diff --git a/lastver b/lastver index ca6156a..da011ce 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.92 +0.92.1 diff --git a/sources b/sources index 10dd892..6e9b8a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz +aecbcc39bf5b85e8967ddfa2bef4eb90 clamav-0.92.1-norar.tar.bz2 commit 089cc9d166636f758fe483327989d9ad695b0457 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 17:33:05 2008 +0000 minor optimizations diff --git a/clamav.spec b/clamav.spec index 64e1074..919bf65 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.64 2008/01/01 14:59:15 ensc Exp $ +## $Id: clamav.spec,v 1.65 2008/01/01 17:10:12 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -257,7 +257,7 @@ Sendmail customizations of the clamav-milter. install -p -m0644 %SOURCE300 clamav-milter/ mkdir -p libclamunrar{,_iface} -%{!?with_unrar:> libclamunrar/Makefile.in; >libclamunrar_iface/Makefile.in; touch libclamunrar{,_iface}/{all,install}} +%{!?with_unrar:touch libclamunrar{,_iface}/{Makefile.in,all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; commit 46c82f4bf86733c97dfab69594ef9f91336a21e2 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 17:10:12 2008 +0000 - redisabled unrar stuff completely by using clean sources - splitted -milter subpackage into pieces to allow use without sendmail (#239037) diff --git a/clamav.spec b/clamav.spec index fe53a7b..64e1074 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.63 2008/01/01 13:19:16 ensc Exp $ +## $Id: clamav.spec,v 1.64 2008/01/01 14:59:15 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,13 +19,20 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 5 +Release: %release_func 6 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net +%if 0%{?with_unrar:1} Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +%else +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# All that is needed to make the clean tarball is: rm -rf libclamunrar* +Source0: %name-%version.clean.tar.gz +%endif Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -114,18 +121,32 @@ Requires(pre): %_initrddir Requires(postun): %_initrddir %package milter -Summary: Sendmail-milter for the Clam Antivirus scanner +Summary: Milter module for the Clam Antivirus scanner +Group: System Environment/Daemons +Requires: clamav-milter-core = %version-%release +Requires: milter(clamav) + +%package milter-core +Summary: Core milter module for the Clam Antivirus scanner Group: System Environment/Daemons Requires: init(clamav-milter) -Source300: README.fedora BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel Provides: user(%milteruser) Provides: group(%milteruser) -Requires: sendmail Requires(post): coreutils %{?FE_USERADD_REQ} +%package milter-sendmail +Summary: Sendmail customizations for clamav-milter +Group: System Environment/Daemons +Source300: README.fedora +Requires: sendmail +Requires: clamav-milter-core = %version-%release +Provides: milter(clamav) = sendmail +Conflicts: milter(clamav) < sendmail +Conflicts: milter(clamav) > sendmail + %package milter-sysv Summary: SysV initscripts for the clamav sendmail-milter Group: System Environment/Daemons @@ -216,6 +237,12 @@ This package contains files which are needed to run the clamav-milter. %description milter-sysv The SysV initscripts for clamav-milter. +%description milter-core +Core files for the clamav-milter. + +%description milter-sendmail +Sendmail customizations of the clamav-milter. + ## ------------------------------------------------------------ @@ -229,6 +256,8 @@ The SysV initscripts for clamav-milter. install -p -m0644 %SOURCE300 clamav-milter/ +mkdir -p libclamunrar{,_iface} +%{!?with_unrar:> libclamunrar/Makefile.in; >libclamunrar_iface/Makefile.in; touch libclamunrar{,_iface}/{all,install}} perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -498,14 +527,20 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files milter %defattr(-,root,root,-) -%doc clamav-milter/INSTALL clamav-milter/README.fedora + +%files milter-core +%defattr(-,root,root,-) +%doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%attr(0700,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog +%files milter-sendmail +%defattr(-,root,root,-) +%doc clamav-milter/README.fedora +%attr(0700,%milteruser,%milteruser) %dir %milterstatedir +%ghost %milterstatedir/* %files milter-sysv %defattr(-,root,root,-) @@ -514,6 +549,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-6 +- redisabled unrar stuff completely by using clean sources +- splitted -milter subpackage into pieces to allow use without sendmail + (#239037) + * Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 - use a better way to disable RPATH-generation (needed for '--with unrar' builds) diff --git a/sources b/sources index 6999f43..10dd892 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -e500651858a9187a87025c8a5c23969c clamav-0.92.tar.gz -5ac3264d9b01b7dce93f646e247b2621 clamav-0.92.tar.gz.sig +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz commit 00b1bfee950f366b37e29456d9ef3535b1ee820e Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 14:59:15 2008 +0000 use a better way to disable RPATH-generation (needed for '--with unrar' builds) diff --git a/clamav.spec b/clamav.spec index 71c14f3..fe53a7b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.62 2007/12/21 18:11:32 spot Exp $ +## $Id: clamav.spec,v 1.63 2008/01/01 13:19:16 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 4 +Release: %release_func 5 License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File @@ -248,14 +248,13 @@ export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static --disable-rpath \ + --enable-milter --disable-static \ %{!?with_unrar:--disable-unrar} # build with --as-needed and disable rpath sed -i \ -e 's! -shared ! -Wl,--as-needed\0!g' \ - -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ - -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + -e '/sys_lib_dlsearch_path_spec=\"\/lib \/usr\/lib /s!/lib!/%_lib!g' \ libtool @@ -515,6 +514,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jan 1 2008 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-5 +- use a better way to disable RPATH-generation (needed for '--with + unrar' builds) + * Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 - added a README.fedora to the milter package (#240610) - ship original sources again; unrar is now licensed correctly (no more commit 019ada64a99a5d99349f06e27c29cfbaec008c10 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jan 1 13:19:16 2008 +0000 merged with F-8 diff --git a/.cvsignore b/.cvsignore index cdd308b..f6ee3be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -clamav-0.92.clean.tar.gz +clamav-*.tar.gz* +clamav-*.*.rpm diff --git a/README.fedora b/README.fedora new file mode 100644 index 0000000..b9f572e --- /dev/null +++ b/README.fedora @@ -0,0 +1,5 @@ +Add + + INPUT_MAIL_FILTER(`clamav', `S=local:/var/run/clamav-milter/clamav.sock, F=, T=S:4m;R:4m')dnl + +to your sendmail.mc. diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch deleted file mode 100644 index 66b662e..0000000 --- a/clamav-0.90rc3-private.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 -+++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 -@@ -6,6 +6,6 @@ - Name: libclamav - Description: A GPL virus scanner - Version: @LIBCLAMAV_VERSION@ --Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ --Cflags: -I${includedir} @CFLAGS@ -- -+Libs: -L${libdir} -lclamav -+Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ -+Cflags: -I${includedir} ---- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 -+++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 -@@ -55,11 +55,11 @@ - ;; - - --cflags) -- echo -I@includedir@ @CFLAGS@ -+ echo -I@includedir@ - ;; - - --libs) -- echo -L@libdir@ @LIBCLAMAV_LIBS@ -+ echo -L@libdir@ -lclamav - ;; - - *) diff --git a/clamav-0.91.2-open.patch b/clamav-0.91.2-open.patch deleted file mode 100644 index b933e46..0000000 --- a/clamav-0.91.2-open.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 -+++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 -@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da - if (dazuko->device < 0) - { - -- dazuko->device = open("/dev/dazuko", 0); -+ dazuko->device = open("/dev/dazuko", O_RDONLY); - if (dazuko->device < 0) - return -1; - ---- clamav-0.91.2/shared/misc.c.open 2007-03-31 21:27:31.000000000 +0200 -+++ clamav-0.91.2/shared/misc.c 2007-08-25 12:36:30.000000000 +0200 -@@ -165,7 +165,7 @@ int filecopy(const char *src, const char - if((s = open(src, O_RDONLY|O_BINARY)) == -1) - return -1; - -- if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY)) == -1) { -+ if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, 0600)) == -1) { - close(s); - return -1; - } diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch deleted file mode 100644 index b63921e..0000000 --- a/clamav-0.92-nounrar.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in ---- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 -+++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 -@@ -242,7 +242,7 @@ target_os = @target_os@ - target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - bin_SCRIPTS = clamav-config - pkgconfigdir = $(libdir)/pkgconfig -diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in ---- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 -+++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 -@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex - AC_C_FPU_BIGENDIAN - - AC_OUTPUT([ --libclamunrar/Makefile --libclamunrar_iface/Makefile - libclamav/Makefile - clamscan/Makefile - database/Makefile -diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am ---- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 -+++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 -@@ -16,7 +16,7 @@ - # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - # MA 02110-1301, USA. - --SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter -+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter - EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL - - bin_SCRIPTS=clamav-config -diff -up clamav-0.92/configure.BAD clamav-0.92/configure ---- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 -+++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 -@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi - esac - - --ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" -+ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -27013,8 +27013,6 @@ do - case $ac_config_target in - "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; - "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; -- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; -- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; - "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; - "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; - "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav-0.92-private.patch b/clamav-0.92-private.patch new file mode 100644 index 0000000..bab2948 --- /dev/null +++ b/clamav-0.92-private.patch @@ -0,0 +1,29 @@ +--- clamav-0.92/libclamav.pc.in.private ++++ clamav-0.92/libclamav.pc.in +@@ -6,6 +6,6 @@ includedir=@includedir@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.92/clamav-config.in.private ++++ clamav-0.92/clamav-config.in +@@ -54,12 +54,8 @@ while test $# -gt 0; do + usage 0 + ;; + +- --cflags) +- echo -I@includedir@ @CFLAGS@ +- ;; +- +- --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ (--cflags|--libs) ++ ${PKG_CONFIG:-pkg-config} "$1" libclamav + ;; + + *) diff --git a/clamav-notify-servers b/clamav-notify-servers index 22d57a6..f115e89 100644 --- a/clamav-notify-servers +++ b/clamav-notify-servers @@ -1,16 +1,16 @@ #! /bin/bash # Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # 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. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. diff --git a/clamav.spec b/clamav.spec index 0e049d1..71c14f3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,7 +1,8 @@ -## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ +## $Id: clamav.spec,v 1.62 2007/12/21 18:11:32 spot Exp $ ## Fedora Extras specific customization below... -%bcond_without fedora +%bcond_without fedora +%bcond_with unrar ## %global username clamav @@ -18,19 +19,13 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 3 +Release: %release_func 4 -License: GPLv2 +License: %{?with_unrar:proprietary}%{!?with_unrar:GPLv2} Group: Applications/File URL: http://www.clamav.net -# Unfortunately, clamav includes support for RAR v3, derived from GPL -# incompatible unrar from RARlabs. We have to pull this code out. -# All that is needed to make the clean tarball is: rm -rf libclamunrar* -# Note that you also need patch26. -Source0: clamav-%{version}.clean.tar.gz -# Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -# No sense in using this file for the time being. -# Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -40,9 +35,8 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch24: clamav-0.90rc3-private.patch +Patch24: clamav-0.92-private.patch Patch25: clamav-0.92-open.patch -Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -73,6 +67,7 @@ Source100: clamd-gen Requires: clamav-lib = %version-%release Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig +Requires: pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner @@ -122,6 +117,7 @@ Requires(postun): %_initrddir Summary: Sendmail-milter for the Clam Antivirus scanner Group: System Environment/Daemons Requires: init(clamav-milter) +Source300: README.fedora BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel Provides: user(%milteruser) @@ -215,12 +211,7 @@ SysV initscripts template for the clamav server %description milter -This package contains files which are needed to run the clamav-milter. It -can be activated by adding - -| INPUT_MAIL_FILTER(`clamav', `S=local:%milterstatedir/clamav.sock, F=, T=S:4m;R:4m')dnl - -to your sendmail.mc. +This package contains files which are needed to run the clamav-milter. %description milter-sysv The SysV initscripts for clamav-milter. @@ -235,7 +226,9 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open -%patch26 -p1 -b .nounrar + +install -p -m0644 %SOURCE300 clamav-milter/ + perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -254,12 +247,16 @@ CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' -%configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static --disable-unrar -sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool -# No rpath -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool +%configure --disable-clamav --with-dbdir=/var/lib/clamav \ + --enable-milter --disable-static --disable-rpath \ + %{!?with_unrar:--disable-unrar} + +# build with --as-needed and disable rpath +sed -i \ + -e 's! -shared ! -Wl,--as-needed\0!g' \ + -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ + -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ + libtool make %{?_smp_mflags} @@ -291,15 +288,20 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%_initrddir \ - ${RPM_BUILD_ROOT}%homedir/daily.inc + ${RPM_BUILD_ROOT}%homedir/{main,daily}.inc rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la -for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do - touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i + +for i in cfg db fp hdb info mdb mdu ndb ndu pdb wdb zmd; do + touch ${RPM_BUILD_ROOT}%homedir/daily.inc/daily.$i + touch ${RPM_BUILD_ROOT}%homedir/main.inc/main.$i done +touch ${RPM_BUILD_ROOT}%homedir/daily.inc/COPYING +touch ${RPM_BUILD_ROOT}%homedir/main.inc/COPYING + ## prepare the server-files mkdir _doc_server @@ -470,14 +472,8 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog -%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb -%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd +%ghost %attr(0664,%username,%username) %homedir/daily.inc/* +%ghost %attr(0664,%username,%username) %homedir/main.inc/* ## ----------------------- @@ -503,7 +499,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files milter %defattr(-,root,root,-) -%doc clamav-milter/INSTALL +%doc clamav-milter/INSTALL clamav-milter/README.fedora %_sbindir/*milter* %_mandir/man8/clamav-milter* %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf @@ -519,6 +515,16 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Dec 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.92-4 +- added a README.fedora to the milter package (#240610) +- ship original sources again; unrar is now licensed correctly (no more + stolen code put under GPL). Nevertheless, this license is not GPL + compatible, and to allow libclamav to be used by GPL applications, + unrar is disabled by a ./configure switch. +- use pkg-config in clamav-config to emulate --cflags and --libs + operations (fixes partly multilib issues) +- registered some more auto-updated files and marked them as %%ghost + * Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability diff --git a/clamd-gen b/clamd-gen index 46739ba..ac5dae2 100755 --- a/clamd-gen +++ b/clamd-gen @@ -1,16 +1,16 @@ #! /bin/bash # Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # 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. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -19,7 +19,7 @@ function showHelp() { echo \ $"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> - --license=<LICENSE> --username=>USERNAME> + --license=<LICENSE> --username=>USERNAME> " exit 0 } @@ -227,7 +227,7 @@ function rpm.genFiles %dir %minitsvcdir %config(noreplace) %verify(not mtime) %minitsvcdir/params %config %minitsvcdir/run - %minitsvcdir/respawn + %minitsvcdir/respawn %endif EOF } diff --git a/clamd-wrapper b/clamd-wrapper index 372005f..c32e34e 100644 --- a/clamd-wrapper +++ b/clamd-wrapper @@ -28,7 +28,7 @@ CLAMD_CONFIGFILE=/etc/clamd.d/${CLAMD_SERVICE}.conf CLAMD_OPTIONS= ## backward-compatibility check... for i in /var/run/clamd.${CLAMD_SERVICE}/clamd.sock \ - /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do + /var/run/clamav.${CLAMD_SERVICE}/clamd.sock; do CLAMD_SOCKET=$i test ! -e "$i" || break done diff --git a/freshclam-sleep b/freshclam-sleep index 2cb6bb2..7bdcf78 100755 --- a/freshclam-sleep +++ b/freshclam-sleep @@ -1,15 +1,15 @@ #! /bin/bash # Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -# +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. -# +# # 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. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -33,7 +33,7 @@ case $FRESHCLAM_DELAY in (disabled-warn) echo $"\ WARNING: update of clamav database is disabled; please see - '$f' + '$f' for information how to enable the periodic update resp. how to turn off this message." >&2 exit 1 diff --git a/lastver b/lastver index 021c263..ca6156a 100644 --- a/lastver +++ b/lastver @@ -1 +1 @@ -0.91.2 +0.92 diff --git a/sources b/sources index 10dd892..6999f43 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz +e500651858a9187a87025c8a5c23969c clamav-0.92.tar.gz +5ac3264d9b01b7dce93f646e247b2621 clamav-0.92.tar.gz.sig diff --git a/verinfo b/verinfo index 2d35ad0..a4a0b38 100644 --- a/verinfo +++ b/verinfo @@ -1,2 +1,2 @@ http://prdownloads.sourceforge.net/sourceforge/clamav/ -clamav-(.*?)\.tar\. +clamav-([0-9.-]*?)\.tar\. commit 128b1e458fc8dcab82f7d6a9bc6a98a5a873355a Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 19:23:28 2007 +0000 clamav-0.90rc3-private.patch needed to be resynced diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch index 7ef309e..db4e000 100644 --- a/clamav-0.80-initoff.patch +++ b/clamav-0.80-initoff.patch @@ -4,8 +4,8 @@ # # clamav-milter This script starts and stops the clamav-milter daemon # --# chkconfig: 2345 71 40 -+# chkconfig: - 71 40 +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 # # description: clamav-milter is a daemon which hooks into sendmail and routes # email messages to clamav diff --git a/clamav.spec b/clamav.spec index 28ef9f3..e006b41 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.28 2007/12/21 18:10:56 spot Exp $ +## $Id: clamav.spec,v 1.47 2007/12/21 19:12:19 spot Exp $ ## Fedora Extras specific customization below... # %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 4 +Release: %release_func 4.1 License: GPLv2 Group: Applications/File commit 0cb76702f80a28fead3971b25d00d1fcf5b1cd3e Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 19:12:19 2007 +0000 Fix EPEL diff --git a/clamav.spec b/clamav.spec index 0e049d1..28ef9f3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,7 +1,7 @@ -## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ +## $Id: clamav.spec,v 1.28 2007/12/21 18:10:56 spot Exp $ ## Fedora Extras specific customization below... -%bcond_without fedora +# %bcond_without fedora ## %global username clamav @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.92 -Release: %release_func 3 +Release: %release_func 4 License: GPLv2 Group: Applications/File @@ -519,6 +519,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-4 +- EPEL fixes + * Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability commit cf29647a15f7741d92b6cbf16daf19917c5cce16 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:11:32 2007 +0000 Fix changelog to match version diff --git a/clamav.spec b/clamav.spec index 69321c3..0e049d1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ +## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -519,7 +519,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability commit 9d37ba25fb56f5cecc8d04aa734139f63a468879 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:11:02 2007 +0000 Fix changelog to match version diff --git a/clamav.spec b/clamav.spec index 69321c3..0e049d1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ +## $Id: clamav.spec,v 1.61 2007/12/21 18:06:29 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -519,7 +519,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog -* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-3 - updated to 0.92 (SECURITY): - CVE-2007-6335 MEW PE File Integer Overflow Vulnerability commit 34e19ca3c910b337f8c0e086ded8db511d089a4b Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:06:29 2007 +0000 0.92 on all active branches diff --git a/.cvsignore b/.cvsignore index 3fc2429..cdd308b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -clamav-0.91.2-clean.tar.bz2 +clamav-0.92.clean.tar.gz diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch new file mode 100644 index 0000000..b63921e --- /dev/null +++ b/clamav-0.92-nounrar.patch @@ -0,0 +1,57 @@ +diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in +--- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 ++++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 +@@ -242,7 +242,7 @@ target_os = @target_os@ + target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + bin_SCRIPTS = clamav-config + pkgconfigdir = $(libdir)/pkgconfig +diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in +--- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 ++++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 +@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex + AC_C_FPU_BIGENDIAN + + AC_OUTPUT([ +-libclamunrar/Makefile +-libclamunrar_iface/Makefile + libclamav/Makefile + clamscan/Makefile + database/Makefile +diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am +--- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 ++++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 +@@ -16,7 +16,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + # MA 02110-1301, USA. + +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + + bin_SCRIPTS=clamav-config +diff -up clamav-0.92/configure.BAD clamav-0.92/configure +--- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 ++++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 +@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi + esac + + +-ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" ++ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -27013,8 +27013,6 @@ do + case $ac_config_target in + "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; +- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; + "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; + "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; + "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav-0.92-open.patch b/clamav-0.92-open.patch new file mode 100644 index 0000000..040fc20 --- /dev/null +++ b/clamav-0.92-open.patch @@ -0,0 +1,11 @@ +--- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 ++++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 +@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da + if (dazuko->device < 0) + { + +- dazuko->device = open("/dev/dazuko", 0); ++ dazuko->device = open("/dev/dazuko", O_RDONLY); + if (dazuko->device < 0) + return -1; + diff --git a/clamav.spec b/clamav.spec index 6278230..69321c3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.60 2007/10/29 10:22:00 spot Exp $ +## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.91.2 +Version: 0.92 Release: %release_func 3 License: GPLv2 @@ -25,7 +25,9 @@ Group: Applications/File URL: http://www.clamav.net # Unfortunately, clamav includes support for RAR v3, derived from GPL # incompatible unrar from RARlabs. We have to pull this code out. -Source0: clamav-0.91.2-clean.tar.bz2 +# All that is needed to make the clean tarball is: rm -rf libclamunrar* +# Note that you also need patch26. +Source0: clamav-%{version}.clean.tar.gz # Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz # No sense in using this file for the time being. # Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig @@ -39,7 +41,8 @@ Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch -Patch25: clamav-0.91.2-open.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -232,6 +235,7 @@ The SysV initscripts for clamav-milter. %patch22 -p1 -b .initoff %patch24 -p1 -b .private %patch25 -p1 -b .open +%patch26 -p1 -b .nounrar perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -251,8 +255,12 @@ export LDFLAGS='-Wl,--as-needed' # HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter --disable-static + --enable-milter --disable-static --disable-unrar sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +# No rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + make %{?_smp_mflags} @@ -511,6 +519,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + * Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 - remove RAR decompression code from source tarball because of legal problems (resolves 334371) diff --git a/sources b/sources index 8a090b8..10dd892 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c072b629b19d97ebe246b87269bd2ac2 clamav-0.91.2-clean.tar.bz2 +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz commit 85ce1bf814ac36ef561c1d03008282782885b305 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Dec 21 18:06:01 2007 +0000 0.92 on all active branches diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch new file mode 100644 index 0000000..66b662e --- /dev/null +++ b/clamav-0.90rc3-private.patch @@ -0,0 +1,28 @@ +--- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 ++++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 +@@ -6,6 +6,6 @@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 ++++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 +@@ -55,11 +55,11 @@ + ;; + + --cflags) +- echo -I@includedir@ @CFLAGS@ ++ echo -I@includedir@ + ;; + + --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ echo -L@libdir@ -lclamav + ;; + + *) diff --git a/clamav-0.92-nounrar.patch b/clamav-0.92-nounrar.patch new file mode 100644 index 0000000..b63921e --- /dev/null +++ b/clamav-0.92-nounrar.patch @@ -0,0 +1,57 @@ +diff -up clamav-0.92/Makefile.in.BAD clamav-0.92/Makefile.in +--- clamav-0.92/Makefile.in.BAD 2007-12-21 12:39:00.000000000 -0500 ++++ clamav-0.92/Makefile.in 2007-12-21 12:39:11.000000000 -0500 +@@ -242,7 +242,7 @@ target_os = @target_os@ + target_vendor = @target_vendor@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + bin_SCRIPTS = clamav-config + pkgconfigdir = $(libdir)/pkgconfig +diff -up clamav-0.92/configure.in.BAD clamav-0.92/configure.in +--- clamav-0.92/configure.in.BAD 2007-12-21 12:37:51.000000000 -0500 ++++ clamav-0.92/configure.in 2007-12-21 12:38:00.000000000 -0500 +@@ -1214,8 +1214,6 @@ AC_MSG_RESULT($have_signed_rightshift_ex + AC_C_FPU_BIGENDIAN + + AC_OUTPUT([ +-libclamunrar/Makefile +-libclamunrar_iface/Makefile + libclamav/Makefile + clamscan/Makefile + database/Makefile +diff -up clamav-0.92/Makefile.am.BAD clamav-0.92/Makefile.am +--- clamav-0.92/Makefile.am.BAD 2007-12-21 12:38:39.000000000 -0500 ++++ clamav-0.92/Makefile.am 2007-12-21 12:38:47.000000000 -0500 +@@ -16,7 +16,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + # MA 02110-1301, USA. + +-SUBDIRS = libclamunrar libclamunrar_iface libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter ++SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter + EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis COPYING.unrar COPYING.LGPL + + bin_SCRIPTS=clamav-config +diff -up clamav-0.92/configure.BAD clamav-0.92/configure +--- clamav-0.92/configure.BAD 2007-12-21 12:45:38.000000000 -0500 ++++ clamav-0.92/configure 2007-12-21 12:46:05.000000000 -0500 +@@ -26397,7 +26397,7 @@ echo "$as_me: WARNING: Unable to determi + esac + + +-ac_config_files="$ac_config_files libclamunrar/Makefile libclamunrar_iface/Makefile libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" ++ac_config_files="$ac_config_files libclamav/Makefile clamscan/Makefile database/Makefile docs/Makefile clamd/Makefile clamdscan/Makefile clamav-milter/Makefile freshclam/Makefile sigtool/Makefile clamconf/Makefile etc/Makefile Makefile clamav-config libclamav.pc docs/man/clamav-milter.8 docs/man/clamconf.1 docs/man/clamd.8 docs/man/clamd.conf.5 docs/man/clamdscan.1 docs/man/clamscan.1 docs/man/freshclam.1 docs/man/freshclam.conf.5 docs/man/sigtool.1" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -27013,8 +27013,6 @@ do + case $ac_config_target in + "clamav-config.h") CONFIG_HEADERS="$CONFIG_HEADERS clamav-config.h" ;; + "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; +- "libclamunrar/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar/Makefile" ;; +- "libclamunrar_iface/Makefile") CONFIG_FILES="$CONFIG_FILES libclamunrar_iface/Makefile" ;; + "libclamav/Makefile") CONFIG_FILES="$CONFIG_FILES libclamav/Makefile" ;; + "clamscan/Makefile") CONFIG_FILES="$CONFIG_FILES clamscan/Makefile" ;; + "database/Makefile") CONFIG_FILES="$CONFIG_FILES database/Makefile" ;; diff --git a/clamav-0.92-open.patch b/clamav-0.92-open.patch new file mode 100644 index 0000000..040fc20 --- /dev/null +++ b/clamav-0.92-open.patch @@ -0,0 +1,11 @@ +--- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 ++++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 +@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da + if (dazuko->device < 0) + { + +- dazuko->device = open("/dev/dazuko", 0); ++ dazuko->device = open("/dev/dazuko", O_RDONLY); + if (dazuko->device < 0) + return -1; + diff --git a/clamav.spec b/clamav.spec index f893c9a..69321c3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,10 +1,9 @@ -## $Id: clamav.spec,v 1.43 2006/10/18 07:22:18 ensc Exp $ +## $Id: clamav.spec,v 1.60 2007/10/29 14:25:28 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora ## - %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log @@ -18,14 +17,20 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.6 -Release: %release_func 1 +Version: 0.92 +Release: %release_func 3 -License: GPL +License: GPLv2 Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +# All that is needed to make the clean tarball is: rm -rf libclamunrar* +# Note that you also need patch26. +Source0: clamav-%{version}.clean.tar.gz +# Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +# No sense in using this file for the time being. +# Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -33,18 +38,29 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch0: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch -Patch1: clamav-0.88.1-strncpy.patch -Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch23: clamav-0.88.4-visibility.patch +Patch24: clamav-0.90rc3-private.patch +Patch25: clamav-0.92-open.patch +Patch26: clamav-0.92-nounrar.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: %_includedir/tcpd.h BuildRequires: bc +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(clamav) +Provides: group(clamav) +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?FE_USERADD_REQ} + %package lib Summary: Dynamic libraries for the Clam Antivirus scanner Group: System Environment/Libraries @@ -54,17 +70,25 @@ Requires: data(clamav) Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %version-%release +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -Provides: data(clamav) -Provides: user(clamav) -Provides: group(clamav) -BuildRequires: fedora-usermgmt-devel -%{?FE_USERADD_REQ} +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -72,7 +96,7 @@ Group: Applications/File Source200: freshclam-sleep Source201: freshclam.sysconfig Source202: clamav-update.cron -Requires: clamav-data = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod @@ -83,7 +107,8 @@ Summary: Clam Antivirus scanner server Group: System Environment/Daemons Requires: init(clamav-server) Requires: data(clamav) -Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release %package server-sysv Summary: SysV initscripts for clamav server @@ -129,6 +154,9 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. %description lib This package contains dynamic libraries shared between applications @@ -141,7 +169,29 @@ build applications using clamav. %description data This package contains the virus-database needed by clamav. This database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + %description update This package contains programs which can be used to update the clamav @@ -180,13 +230,12 @@ The SysV initscripts for clamav-milter. %prep %setup -q -%patch0 -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch' -%patch1 -p1 -b .strncpy -%patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff -%patch23 -p1 -b .visibility +%patch24 -p1 -b .private +%patch25 -p1 -b .open +%patch26 -p1 -b .nounrar perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -202,15 +251,16 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf %build CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check +export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter + --enable-milter --disable-static --disable-unrar +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool +# No rpath +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -## HACK: ./configure checks if freshclam.conf/clamd.conf are existing -## in current filesystem and skips its installation then. Was introduced -## by 0.66. -perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; - s!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_FALSE\@),[^,]*,!\1,\#,!g' config.status -./config.status make %{?_smp_mflags} @@ -240,11 +290,16 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%_initrddir + ${RPM_BUILD_ROOT}%_initrddir \ + ${RPM_BUILD_ROOT}%homedir/daily.inc rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la +for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do + touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i +done + ## prepare the server-files mkdir _doc_server @@ -290,10 +345,7 @@ subst etc/clamd.conf /etc/clamd.d/milter.conf \ cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter -## The '-blo' options might be usefully here -- especially for testing; see -## "man 8 clamav-milter" for further options -CLAMAV_FLAGS='--max-children=2 -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' -CLAMAV_USER='%milteruser' +CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' EOF install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter @@ -307,11 +359,16 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ -%pre data +%pre filesystem %__fe_groupadd 4 -r %username &>/dev/null || : %__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ -c 'Clamav database update user' -g %username %username &>/dev/null || : +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + %post update test -e %freshclamlog || { touch %freshclamlog @@ -319,10 +376,6 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%postun data -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - %pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ @@ -357,7 +410,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files %defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE %doc docs/*.pdf %_bindir/* %_mandir/man[15]/* @@ -376,9 +429,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files devel %defattr(-,root,root,-) %_includedir/* -%_libdir/*.*a %_libdir/*.so -%dir %pkgdatadir %pkgdatadir/template %pkgdatadir/clamd-gen %_libdir/pkgconfig/* @@ -386,14 +437,25 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : ## ----------------------- +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,%username,%username) %dir %homedir/daily.inc +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + %files data %defattr(-,%username,%username,-) -%dir %homedir # use %%config to keep files which were updated by 'freshclam' # already. Without this tag, they would be overridden with older # versions whenever a new -data package is installed. %config %verify(not size md5 mtime) %homedir/*.cvd + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/main.cvd + ## ----------------------- %files update @@ -408,6 +470,16 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd + + ## ----------------------- %files server @@ -415,7 +487,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc _doc_server/* %_mandir/man[58]/clamd* %_sbindir/* -%dir %pkgdatadir %pkgdatadir/clamd-wrapper %dir %_sysconfdir/clamd.d @@ -448,6 +519,70 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Dec 21 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.92-1 +- updated to 0.92 (SECURITY): +- CVE-2007-6335 MEW PE File Integer Overflow Vulnerability + +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode +- fixed an open(2) issue + +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam + +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + * Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 - updated to 0.88.6 @@ -724,83 +859,3 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : * Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 - added security fix for http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 - -* Fri Nov 28 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.4 -- fixed typo in README (sysconf.d vs. sysconf) -- make build on rhl8 succeed by adding '|| :' to %%check - -* Tue Nov 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.3 -- substitute 'User' in sample cfg-file also -- uncommented some cfg-options which are needed for a proper operation -- fixed typos in README (thanks to Michael Schwendt) - -* Mon Nov 17 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.2 -- fixed path of 'LocalSocket' and documented steps how to create it -- added a missing backslash at the configure-call -- do not package clamav-milter.8 manpage -- documented 'User' in the README - -* Sat Nov 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.1 -- updated to 0.65 -- added gmp-devel buildrequires: -- changed installed databases from 'viruses.db*' to '*.cvb' -- made milter-build conditional; 0.65 is missing some files which would break the build else -- fixed typo (clamav-notify-server -> clamav-notify-servers) - -* Fri Oct 31 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.60-0.fdr.5 -- created -update subpackage and filled it with files from main and -data package -- set more reasonable default-values in the sample config-file -- made the README in -server more clear -- moved clamav-milter man-page into -milter subpackage -- use fedora-usermgmt -- renamed -daemon subpackage and related files to -server -- use abstract 'data(clamav)' notation for clamav-data dependencies -- use 'init(...)' requirements as placeholder for future -sysv/-minit subpackages - -* Sat Aug 16 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.4 -- backported clamav-sockwrite.c to C89 - -* Fri Aug 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- updated Source0 URL -- fixed portuguese i18n-abbreviation - -* Fri Jul 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- use LSB compliant exit-codes in the init-script -- other init-script cleanups - -* Tue Jul 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.2 -- updated %%description -- removed README from %%doc-list - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.1 -- disabled -milter subpackage; I do not get it to run :( - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.0.1 -- updated to 0.60 -- modernized usercreation -- added -milter subpackage - -* Thu May 8 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.2 -- added BUGS file -- moved clamd.8 man-page into daemon-subpackage -- some cosmetical cleanups -- removed config-patch; it was unused -- made some paths more fedora-compliant -- honor $RPM_OPT_FLAGS -- added clamav-notify-daemons script -- removed obsoleted %%socketdir - -* Wed May 7 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.0.1 -- splitted into additional -data/-daemon packages -- added clamav-sockwrite program -- updated to recent fedora policies - -* Thu Nov 21 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.54-1 -- updated to 0.54 -- updated config-patch - -* Tue Oct 29 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.52-1 -- updated to 0.52 - -* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- Initial build. diff --git a/sources b/sources index e74691d..10dd892 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz -38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig +554d44a5b2265808750553d2e4d0d6fb clamav-0.92.clean.tar.gz commit 73644b64f36c4e5953029b0d53a6a0d1f363d780 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Mon Oct 29 14:25:28 2007 +0000 Pull out rar code from clamav, resolve legal issue (334371). diff --git a/.cvsignore b/.cvsignore index f6ee3be..3fc2429 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -clamav-*.tar.gz* -clamav-*.*.rpm +clamav-0.91.2-clean.tar.bz2 diff --git a/clamav.spec b/clamav.spec index a0b599e..6278230 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.58 2007/08/25 10:40:56 ensc Exp $ +## $Id: clamav.spec,v 1.60 2007/10/29 10:22:00 spot Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,13 +18,17 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.91.2 -Release: %release_func 2 +Release: %release_func 3 -License: GPL +License: GPLv2 Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +# Unfortunately, clamav includes support for RAR v3, derived from GPL +# incompatible unrar from RARlabs. We have to pull this code out. +Source0: clamav-0.91.2-clean.tar.bz2 +# Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +# No sense in using this file for the time being. +# Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -507,6 +511,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Oct 29 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> - 0.91.2-3 +- remove RAR decompression code from source tarball because of + legal problems (resolves 334371) +- correct license tag + * Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 - Bump release for upgrade path. diff --git a/sources b/sources index 7a01a39..8a090b8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -2a7265d17cfa80c32858978f16a3f47b clamav-0.91.2.tar.gz -9e1b4659b506315dbc9f1c06dbe6273b clamav-0.91.2.tar.gz.sig +c072b629b19d97ebe246b87269bd2ac2 clamav-0.91.2-clean.tar.bz2 commit 0b7f0c1221f44311cd97327030b5f71d44b6ef35 Author: Jesse Keating <jkeating(a)fedoraproject.org> Date: Mon Sep 24 18:17:46 2007 +0000 - Bump release for upgrade path. diff --git a/clamav.spec b/clamav.spec index 5b0e5cd..a0b599e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.57 2007/08/25 10:12:31 ensc Exp $ +## $Id: clamav.spec,v 1.58 2007/08/25 10:40:56 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.91.2 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -507,6 +507,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Mon Sep 24 2007 Jesse Keating <jkeating(a)redhat.com> - 0.91.2-2 +- Bump release for upgrade path. + * Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 - updated to 0.91.2 (SECURITY): - CVE-2007-4510 DOS in RTF parser commit d9370ed2889a28fee0176e2e0798a91aec5eb629 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Sep 2 11:30:08 2007 +0000 initial checkin diff --git a/lastver b/lastver new file mode 100644 index 0000000..021c263 --- /dev/null +++ b/lastver @@ -0,0 +1 @@ +0.91.2 diff --git a/verinfo b/verinfo new file mode 100644 index 0000000..2d35ad0 --- /dev/null +++ b/verinfo @@ -0,0 +1,2 @@ +http://prdownloads.sourceforge.net/sourceforge/clamav/ +clamav-(.*?)\.tar\. commit 7aecf13b517885415cebd7da07efce9b70b82573 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 25 10:40:56 2007 +0000 fixed an open(2) issue diff --git a/clamav-0.91.2-open.patch b/clamav-0.91.2-open.patch new file mode 100644 index 0000000..b933e46 --- /dev/null +++ b/clamav-0.91.2-open.patch @@ -0,0 +1,22 @@ +--- clamav-0.91.2/clamd/dazukoio_compat12.c.open 2007-03-06 14:38:06.000000000 +0100 ++++ clamav-0.91.2/clamd/dazukoio_compat12.c 2007-08-25 12:36:30.000000000 +0200 +@@ -89,7 +89,7 @@ int dazukoRegister_TS_compat12(struct da + if (dazuko->device < 0) + { + +- dazuko->device = open("/dev/dazuko", 0); ++ dazuko->device = open("/dev/dazuko", O_RDONLY); + if (dazuko->device < 0) + return -1; + +--- clamav-0.91.2/shared/misc.c.open 2007-03-31 21:27:31.000000000 +0200 ++++ clamav-0.91.2/shared/misc.c 2007-08-25 12:36:30.000000000 +0200 +@@ -165,7 +165,7 @@ int filecopy(const char *src, const char + if((s = open(src, O_RDONLY|O_BINARY)) == -1) + return -1; + +- if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY)) == -1) { ++ if((d = open(dest, O_CREAT|O_WRONLY|O_TRUNC|O_BINARY, 0600)) == -1) { + close(s); + return -1; + } diff --git a/clamav.spec b/clamav.spec index 4b6b705..5b0e5cd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.56 2007/07/17 07:27:38 ensc Exp $ +## $Id: clamav.spec,v 1.57 2007/08/25 10:12:31 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -35,6 +35,7 @@ Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch24: clamav-0.90rc3-private.patch +Patch25: clamav-0.91.2-open.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -226,6 +227,7 @@ The SysV initscripts for clamav-milter. %patch21 -p1 -b .path %patch22 -p1 -b .initoff %patch24 -p1 -b .private +%patch25 -p1 -b .open perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -511,6 +513,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : - DOS in html normalizer - arbitrary command execution by special crafted recipients in clamav-milter's black-hole mode +- fixed an open(2) issue * Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 - updated to 0.91.1 commit 1d4259aaa9d4d2b5e387166d7660164c0f298575 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Aug 25 10:12:31 2007 +0000 - updated to 0.91.2 (SECURITY): - CVE-2007-4510 DOS in RTF parser - DOS in html normalizer - arbitrary command execution by special crafted recipients in clamav-milter's black-hole mode diff --git a/clamav.spec b/clamav.spec index 361371c..4b6b705 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.55 2007/07/12 07:31:31 ensc Exp $ +## $Id: clamav.spec,v 1.56 2007/07/17 07:27:38 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.91.1 -Release: %release_func 0 +Version: 0.91.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -505,6 +505,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sat Aug 25 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.2-1 +- updated to 0.91.2 (SECURITY): +- CVE-2007-4510 DOS in RTF parser +- DOS in html normalizer +- arbitrary command execution by special crafted recipients in + clamav-milter's black-hole mode + * Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 - updated to 0.91.1 diff --git a/sources b/sources index 4366c05..7a01a39 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -60152bf1e24b3fbdf0473794199e5215 clamav-0.91.1.tar.gz -79dd6dd870dbeb5d5a88e1327f82a015 clamav-0.91.1.tar.gz.sig +2a7265d17cfa80c32858978f16a3f47b clamav-0.91.2.tar.gz +9e1b4659b506315dbc9f1c06dbe6273b clamav-0.91.2.tar.gz.sig commit 07ca3e8f63ce599893ef168485711bc61b3d3e31 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jul 17 07:27:38 2007 +0000 updated to 0.91.1 diff --git a/clamav.spec b/clamav.spec index 732c243..361371c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.54 2007/05/31 19:37:44 ensc Exp $ +## $Id: clamav.spec,v 1.55 2007/07/12 07:31:31 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.91 +Version: 0.91.1 Release: %release_func 0 License: GPL @@ -505,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Jul 17 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91.1-0 +- updated to 0.91.1 + * Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 - updated to 0.91 diff --git a/sources b/sources index 06a6d28..4366c05 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -35192423e44642c86ea69dc93f59cfb1 clamav-0.91.tar.gz -85b2e343dd60024bbb8b57671fd525ef clamav-0.91.tar.gz.sig +60152bf1e24b3fbdf0473794199e5215 clamav-0.91.1.tar.gz +79dd6dd870dbeb5d5a88e1327f82a015 clamav-0.91.1.tar.gz.sig commit c1a7b3706b72cefd1d58bee3f5945687f4223a70 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 12 07:31:31 2007 +0000 updated to 0.91 diff --git a/clamav.spec b/clamav.spec index 7009f84..732c243 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.53 2007/05/31 07:40:24 ensc Exp $ +## $Id: clamav.spec,v 1.54 2007/05/31 19:37:44 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90.3 -Release: %release_func 1 +Version: 0.91 +Release: %release_func 0 License: GPL Group: Applications/File @@ -505,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu Jul 12 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.91-1 +- updated to 0.91 + * Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 - updated to 0.90.3 - BR tcpd.h instead of tcp_wrappers(-devel) to make it build both diff --git a/sources b/sources index 6f2abc1..06a6d28 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d42ccf7a32daeb7c7cc3c8c23a7793ea clamav-0.90.3.tar.gz -f6c5b6e941bcd2bed7105f7ce29a02f9 clamav-0.90.3.tar.gz.sig +35192423e44642c86ea69dc93f59cfb1 clamav-0.91.tar.gz +85b2e343dd60024bbb8b57671fd525ef clamav-0.91.tar.gz.sig commit a640334a8eab063415707665657ac2b2ee73294c Author: ensc <ensc(a)fedoraproject.org> Date: Thu May 31 19:37:44 2007 +0000 fixed tcp-wrappers BR diff --git a/clamav.spec b/clamav.spec index ec59663..7009f84 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.52 2007/04/13 07:37:40 ensc Exp $ +## $Id: clamav.spec,v 1.53 2007/05/31 07:40:24 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -39,7 +39,7 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: %_libdir/libwrap.so +BuildRequires: %_includedir/tcpd.h BuildRequires: bc %package filesystem @@ -507,7 +507,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog * Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 - updated to 0.90.3 -- BR libwrap.so instead of tcp_wrappers(-devel) to make it build both +- BR tcpd.h instead of tcp_wrappers(-devel) to make it build both in FC6- and F7+ * Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 commit f9850d977e524b00f51192143d8563322a45a878 Author: ensc <ensc(a)fedoraproject.org> Date: Thu May 31 07:40:24 2007 +0000 - updated to 0.90.3 - BR libwrap.so instead of tcp_wrappers(-devel) to make it build both in FC6- and F7+ diff --git a/clamav.spec b/clamav.spec index 0ab56f8..ec59663 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.51 2007/03/02 17:59:09 ensc Exp $ +## $Id: clamav.spec,v 1.52 2007/04/13 07:37:40 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90.2 +Version: 0.90.3 Release: %release_func 1 License: GPL @@ -39,7 +39,7 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel -BuildRequires: tcp_wrappers-devel +BuildRequires: %_libdir/libwrap.so BuildRequires: bc %package filesystem @@ -505,6 +505,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu May 31 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.3-1 +- updated to 0.90.3 +- BR libwrap.so instead of tcp_wrappers(-devel) to make it build both + in FC6- and F7+ + * Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 - [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 diff --git a/sources b/sources index af58feb..6f2abc1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -39d1f07a399b551b55096b6ec7325c33 clamav-0.90.2.tar.gz -eb31a4a230930568d55bc2dd45f373c0 clamav-0.90.2.tar.gz.sig +d42ccf7a32daeb7c7cc3c8c23a7793ea clamav-0.90.3.tar.gz +f6c5b6e941bcd2bed7105f7ce29a02f9 clamav-0.90.3.tar.gz.sig commit 20d8116dd064b707793cefa323761dcdded5e105 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Apr 13 07:37:40 2007 +0000 [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch index 7ef309e..db4e000 100644 --- a/clamav-0.80-initoff.patch +++ b/clamav-0.80-initoff.patch @@ -4,8 +4,8 @@ # # clamav-milter This script starts and stops the clamav-milter daemon # --# chkconfig: 2345 71 40 -+# chkconfig: - 71 40 +-# chkconfig: 2345 79 40 ++# chkconfig: - 79 40 # # description: clamav-milter is a daemon which hooks into sendmail and routes # email messages to clamav diff --git a/clamav.spec b/clamav.spec index bd25be1..0ab56f8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.50 2007/03/02 17:17:37 ensc Exp $ +## $Id: clamav.spec,v 1.51 2007/03/02 17:59:09 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,8 +17,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90.1 -Release: %release_func 2 +Version: 0.90.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -505,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Apr 13 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.2-1 +- [SECURITY] updated to 0.90.2; fixes CVE-2007-1745, CVE-2007-1997 + * Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 - BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' diff --git a/sources b/sources index 598ffdb..af58feb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -cd11c05b5476262eaea4fa3bd7dc25bf clamav-0.90.1.tar.gz -97061af5fe626136e70db3861640f381 clamav-0.90.1.tar.gz.sig +39d1f07a399b551b55096b6ec7325c33 clamav-0.90.2.tar.gz +eb31a4a230930568d55bc2dd45f373c0 clamav-0.90.2.tar.gz.sig commit 164549699e502c87d099635a9910c0d0daac094f Author: ensc <ensc(a)fedoraproject.org> Date: Fri Mar 2 17:59:09 2007 +0000 BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' diff --git a/clamav.spec b/clamav.spec index 59406af..bd25be1 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.49 2007/02/18 21:25:26 ensc Exp $ +## $Id: clamav.spec,v 1.50 2007/03/02 17:17:37 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90.1 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -38,7 +38,8 @@ Patch24: clamav-0.90rc3-private.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel +BuildRequires: zlib-devel bzip2-devel gmp-devel curl-devel +BuildRequires: tcp_wrappers-devel BuildRequires: bc %package filesystem @@ -504,6 +505,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-2 +- BR 'tcp_wrappers-devel' instead of plain 'tcp_wrappers' + * Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 - updated to 0.90.1 - updated %%doc list commit 3077ab218570c4c6398ce451a01ae1c1f2e9ab9c Author: ensc <ensc(a)fedoraproject.org> Date: Fri Mar 2 17:17:37 2007 +0000 - updated to 0.90.1 - updated %%doc list diff --git a/clamav.spec b/clamav.spec index ac86cc3..59406af 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.48 2007/02/18 21:19:28 ensc Exp $ +## $Id: clamav.spec,v 1.49 2007/02/18 21:25:26 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -17,7 +17,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.90 +Version: 0.90.1 Release: %release_func 1 License: GPL @@ -395,7 +395,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files %defattr(-,root,root,-) -%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO +%doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS README UPGRADE %doc docs/*.pdf %_bindir/* %_mandir/man[15]/* @@ -504,6 +504,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Fri Mar 2 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90.1-1 +- updated to 0.90.1 +- updated %%doc list + * Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 - updated to final 0.90 - removed -visibility patch since fixed upstream diff --git a/sources b/sources index 32bb4ec..598ffdb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9d5d53eed766976c2cfc9b14d56b2bba clamav-0.90.tar.gz.sig -f04372e49c3c5ff3bd94bbe1fef2eaca clamav-0.90.tar.gz +cd11c05b5476262eaea4fa3bd7dc25bf clamav-0.90.1.tar.gz +97061af5fe626136e70db3861640f381 clamav-0.90.1.tar.gz.sig commit 5df338709c6f2fe74ee74c820afe830660390c91 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Feb 18 21:25:26 2007 +0000 updated release diff --git a/clamav.spec b/clamav.spec index 69f08ae..ac86cc3 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.47 2007/02/04 11:57:35 ensc Exp $ +## $Id: clamav.spec,v 1.48 2007/02/18 21:19:28 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.4 +Release: %release_func 1 License: GPL Group: Applications/File commit b842833b0bed60711642f5b40286dfb7fe7c40ba Author: ensc <ensc(a)fedoraproject.org> Date: Sun Feb 18 21:19:28 2007 +0000 - updated to final 0.90 - removed -visibility patch since fixed upstream diff --git a/clamav-0.88.4-visibility.patch b/clamav-0.88.4-visibility.patch deleted file mode 100644 index 34ef51e..0000000 --- a/clamav-0.88.4-visibility.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- clamav-0.88.4/libclamav/md5.c.visibility 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.4/libclamav/md5.c 2006-08-11 08:19:02.000000000 +0200 -@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da - return ptr; - } - --void MD5_Init(MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx) - { - ctx->a = 0x67452301; - ctx->b = 0xefcdab89; -@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx) - ctx->hi = 0; - } - --void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) -+void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) - { - MD5_u32plus saved_lo; - unsigned long used, free; -@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data - memcpy(ctx->buffer, data, size); - } - --void MD5_Final(unsigned char *result, MD5_CTX *ctx) -+void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx) - { - unsigned long used, free; - diff --git a/clamav.spec b/clamav.spec index 6ae90e2..69f08ae 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,12 +1,9 @@ -## $Id: clamav.spec,v 1.46 2007/02/03 15:16:08 ensc Exp $ +## $Id: clamav.spec,v 1.47 2007/02/04 11:57:35 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora ## - -%global rcver rc3 - %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log @@ -21,13 +18,13 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.3.rc3 +Release: %release_func 0.4 License: GPL Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -37,7 +34,6 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch23: clamav-0.88.4-visibility.patch Patch24: clamav-0.90rc3-private.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release @@ -224,11 +220,10 @@ The SysV initscripts for clamav-milter. ## ------------------------------------------------------------ %prep -%setup -q -n %name-%version%{?rcver} +%setup -q %patch21 -p1 -b .path %patch22 -p1 -b .initoff -%patch23 -p1 -b .visibility %patch24 -p1 -b .private perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; @@ -509,6 +504,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Feb 18 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-1 +- updated to final 0.90 +- removed -visibility patch since fixed upstream + * Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 - build with -Wl,-as-needed and cleaned up pkgconfig file - removed old hack which forced installation of freshclam.conf; related diff --git a/sources b/sources index 6527451..32bb4ec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5af2bdbbb255829dd590609d900c1854 clamav-0.90rc3.tar.gz -978715ae312d5dda63a0591b0a4eae14 clamav-0.90rc3.tar.gz.sig +9d5d53eed766976c2cfc9b14d56b2bba clamav-0.90.tar.gz.sig +f04372e49c3c5ff3bd94bbe1fef2eaca clamav-0.90.tar.gz commit 0e58ab345a08dba81aea0155270a8e1a43cd07f4 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Feb 4 11:57:35 2007 +0000 - build with -Wl,-as-needed and cleaned up pkgconfig file - removed old hack which forced installation of freshclam.conf; related check was removed upstream - removed static library - removed %%changelog entries from before 2004 diff --git a/clamav-0.90rc3-private.patch b/clamav-0.90rc3-private.patch new file mode 100644 index 0000000..66b662e --- /dev/null +++ b/clamav-0.90rc3-private.patch @@ -0,0 +1,28 @@ +--- clamav-0.90rc3/libclamav.pc.in.private 2004-07-14 13:35:38.000000000 +0200 ++++ clamav-0.90rc3/libclamav.pc.in 2007-02-04 12:24:35.000000000 +0100 +@@ -6,6 +6,6 @@ + Name: libclamav + Description: A GPL virus scanner + Version: @LIBCLAMAV_VERSION@ +-Libs: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ +-Cflags: -I${includedir} @CFLAGS@ +- ++Libs: -L${libdir} -lclamav ++Libs.private: -L${libdir} -lclamav @LIBCLAMAV_LIBS@ ++Cflags: -I${includedir} +--- clamav-0.90rc3/clamav-config.in.private 2004-06-06 03:50:08.000000000 +0200 ++++ clamav-0.90rc3/clamav-config.in 2007-02-04 12:25:27.000000000 +0100 +@@ -55,11 +55,11 @@ + ;; + + --cflags) +- echo -I@includedir@ @CFLAGS@ ++ echo -I@includedir@ + ;; + + --libs) +- echo -L@libdir@ @LIBCLAMAV_LIBS@ ++ echo -L@libdir@ -lclamav + ;; + + *) diff --git a/clamav.spec b/clamav.spec index 4bd460e..6ae90e2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.45 2006/12/12 08:17:53 ensc Exp $ +## $Id: clamav.spec,v 1.46 2007/02/03 15:16:08 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.90 -Release: %release_func 0.2.rc3 +Release: %release_func 0.3.rc3 License: GPL Group: Applications/File @@ -38,6 +38,7 @@ Source8: clamav-notify-servers Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch23: clamav-0.88.4-visibility.patch +Patch24: clamav-0.90rc3-private.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -228,6 +229,7 @@ The SysV initscripts for clamav-milter. %patch21 -p1 -b .path %patch22 -p1 -b .initoff %patch23 -p1 -b .visibility +%patch24 -p1 -b .private perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -243,15 +245,12 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf %build CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +export LDFLAGS='-Wl,--as-needed' +# HACK: remove me, when configure uses $LIBS instead of $LDFLAGS for milter check +export LIBS='-lmilter -lpthread' %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --enable-milter - -## HACK: ./configure checks if freshclam.conf/clamd.conf are existing -## in current filesystem and skips its installation then. Was introduced -## by 0.66. -perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; - s!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_FALSE\@),[^,]*,!\1,\#,!g' config.status -./config.status + --enable-milter --disable-static +sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool make %{?_smp_mflags} @@ -420,7 +419,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files devel %defattr(-,root,root,-) %_includedir/* -%_libdir/*.*a %_libdir/*.so %pkgdatadir/template %pkgdatadir/clamd-gen @@ -511,6 +509,13 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Feb 4 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.3.rc3 +- build with -Wl,-as-needed and cleaned up pkgconfig file +- removed old hack which forced installation of freshclam.conf; related + check was removed upstream +- removed static library +- removed %%changelog entries from before 2004 + * Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 - updated to 0.90rc3 - splitted mandatory parts from the data-file into a separate -filesystem @@ -799,83 +804,3 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : * Mon Feb 9 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.5 - added security fix for http://www.securityfocus.com/archive/1/353194/2004-02-06/2004-02-12/1 - -* Fri Nov 28 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.4 -- fixed typo in README (sysconf.d vs. sysconf) -- make build on rhl8 succeed by adding '|| :' to %%check - -* Tue Nov 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.3 -- substitute 'User' in sample cfg-file also -- uncommented some cfg-options which are needed for a proper operation -- fixed typos in README (thanks to Michael Schwendt) - -* Mon Nov 17 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.2 -- fixed path of 'LocalSocket' and documented steps how to create it -- added a missing backslash at the configure-call -- do not package clamav-milter.8 manpage -- documented 'User' in the README - -* Sat Nov 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.65-0.fdr.1 -- updated to 0.65 -- added gmp-devel buildrequires: -- changed installed databases from 'viruses.db*' to '*.cvb' -- made milter-build conditional; 0.65 is missing some files which would break the build else -- fixed typo (clamav-notify-server -> clamav-notify-servers) - -* Fri Oct 31 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.60-0.fdr.5 -- created -update subpackage and filled it with files from main and -data package -- set more reasonable default-values in the sample config-file -- made the README in -server more clear -- moved clamav-milter man-page into -milter subpackage -- use fedora-usermgmt -- renamed -daemon subpackage and related files to -server -- use abstract 'data(clamav)' notation for clamav-data dependencies -- use 'init(...)' requirements as placeholder for future -sysv/-minit subpackages - -* Sat Aug 16 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.4 -- backported clamav-sockwrite.c to C89 - -* Fri Aug 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- updated Source0 URL -- fixed portuguese i18n-abbreviation - -* Fri Jul 18 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.3 -- use LSB compliant exit-codes in the init-script -- other init-script cleanups - -* Tue Jul 15 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.2 -- updated %%description -- removed README from %%doc-list - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.1 -- disabled -milter subpackage; I do not get it to run :( - -* Thu Jun 26 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.60-0.fdr.0.1 -- updated to 0.60 -- modernized usercreation -- added -milter subpackage - -* Thu May 8 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.2 -- added BUGS file -- moved clamd.8 man-page into daemon-subpackage -- some cosmetical cleanups -- removed config-patch; it was unused -- made some paths more fedora-compliant -- honor $RPM_OPT_FLAGS -- added clamav-notify-daemons script -- removed obsoleted %%socketdir - -* Wed May 7 2003 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0:0.54-0.fdr.0.1 -- splitted into additional -data/-daemon packages -- added clamav-sockwrite program -- updated to recent fedora policies - -* Thu Nov 21 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.54-1 -- updated to 0.54 -- updated config-patch - -* Tue Oct 29 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.52-1 -- updated to 0.52 - -* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> -- Initial build. commit 4ae894ed3f5bee1d9751813ca3d85d07e8678c4b Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 3 15:33:47 2007 +0000 - updated to 0.90rc3 diff --git a/sources b/sources index 5117994..6527451 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -34a9d58cf5bcb04dbe3eb32b5367a3f8 clamav-0.88.7.tar.gz -b19286b26aafe255c7e1e1d0fc4d3797 clamav-0.88.7.tar.gz.sig +5af2bdbbb255829dd590609d900c1854 clamav-0.90rc3.tar.gz +978715ae312d5dda63a0591b0a4eae14 clamav-0.90rc3.tar.gz.sig commit fead405bc3234e38069316b5c11507248c584727 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 3 15:16:08 2007 +0000 - updated to 0.90rc3 - splitted mandatory parts from the data-file into a separate -filesystem subpackage - added a -data-empty subpackage to allow a setup where database is updated per cron-job and user does not want to download the large -data package with outdated virus definitations (#214949) - %ghost'ed the files downloaded by freshclam diff --git a/clamav.spec b/clamav.spec index e564b35..4bd460e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,10 +1,12 @@ -## $Id: clamav.spec,v 1.44 2006/11/05 20:11:19 ensc Exp $ +## $Id: clamav.spec,v 1.45 2006/12/12 08:17:53 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora ## +%global rcver rc3 + %global username clamav %global homedir %_var/lib/clamav %global freshclamlog %_var/log/freshclam.log @@ -18,14 +20,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.7 -Release: %release_func 1 +Version: 0.90 +Release: %release_func 0.2.rc3 License: GPL Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version%{?rcver}.… Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -33,9 +35,6 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch0: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch -Patch1: clamav-0.88.1-strncpy.patch -Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch Patch23: clamav-0.88.4-visibility.patch @@ -45,6 +44,17 @@ Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel BuildRequires: bc +%package filesystem +Summary: Filesystem structure for clamav +Group: Applications/File +Provides: user(clamav) +Provides: group(clamav) +# Prevent version mix +Conflicts: %name < %version-%release +Conflicts: %name > %version-%release +BuildRequires: fedora-usermgmt-devel +%{?FE_USERADD_REQ} + %package lib Summary: Dynamic libraries for the Clam Antivirus scanner Group: System Environment/Libraries @@ -54,17 +64,25 @@ Requires: data(clamav) Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %version-%release +Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): %_libdir/pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File -Provides: data(clamav) -Provides: user(clamav) -Provides: group(clamav) -BuildRequires: fedora-usermgmt-devel -%{?FE_USERADD_REQ} +Requires(pre): clamav-filesystem = %version-%release +Requires(postun): clamav-filesystem = %version-%release +Provides: data(clamav) = full +Conflicts: data(clamav) < full +Conflicts: data(clamav) > full + +%package data-empty +Summary: Empty data package for the Clam Antivirus scanner +Group: Applications/File +Provides: data(clamav) = empty +Conflicts: data(clamav) < empty +Conflicts: data(clamav) > empty %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -72,7 +90,7 @@ Group: Applications/File Source200: freshclam-sleep Source201: freshclam.sysconfig Source202: clamav-update.cron -Requires: clamav-data = %version-%release +Requires: clamav-filesystem = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod @@ -83,7 +101,8 @@ Summary: Clam Antivirus scanner server Group: System Environment/Daemons Requires: init(clamav-server) Requires: data(clamav) -Requires: clamav-lib = %version-%release +Requires: clamav-filesystem = %version-%release +Requires: clamav-lib = %version-%release %package server-sysv Summary: SysV initscripts for clamav server @@ -129,6 +148,9 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. +%description filesystem +This package provides the filesystem structure and contains the +user-creation scripts required by clamav. %description lib This package contains dynamic libraries shared between applications @@ -141,7 +163,29 @@ build applications using clamav. %description data This package contains the virus-database needed by clamav. This database should be updated regularly; the 'clamav-update' package -ships a corresponding cron-job. +ships a corresponding cron-job. This package and the +'clamav-data-empty' package are mutually exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + + +%description data-empty +This is an empty package to fulfill inter-package dependencies of the +clamav suite. This package and the 'clamav-data' package are mutually +exclusive. + +Use -data when you want a working (but perhaps outdated) virus scanner +immediately after package installation. + +Use -data-empty when you are updating the virus database regulary and +do not want to download a >5MB sized rpm-package with outdated virus +definitions. + %description update This package contains programs which can be used to update the clamav @@ -179,11 +223,8 @@ The SysV initscripts for clamav-milter. ## ------------------------------------------------------------ %prep -%setup -q -%patch0 -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch' -%patch1 -p1 -b .strncpy +%setup -q -n %name-%version%{?rcver} -%patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff %patch23 -p1 -b .visibility @@ -240,11 +281,16 @@ install -d -m755 \ ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%_initrddir + ${RPM_BUILD_ROOT}%_initrddir \ + ${RPM_BUILD_ROOT}%homedir/daily.inc rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ ${RPM_BUILD_ROOT}%_libdir/*.la +for i in COPYING daily.{db,fp,hdb,info,ndb,pdb,zmd}; do + touch ${RPM_BUILD_ROOT}%homedir/daily.inc/$i +done + ## prepare the server-files mkdir _doc_server @@ -290,10 +336,7 @@ subst etc/clamd.conf /etc/clamd.d/milter.conf \ cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter -## The '-blo' options might be usefully here -- especially for testing; see -## "man 8 clamav-milter" for further options -CLAMAV_FLAGS='--max-children=2 -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' -CLAMAV_USER='%milteruser' +CLAMAV_FLAGS='-lo -c /etc/clamd.d/milter.conf local:%milterstatedir/clamav.sock' EOF install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter @@ -307,11 +350,16 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ -%pre data +%pre filesystem %__fe_groupadd 4 -r %username &>/dev/null || : %__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ -c 'Clamav database update user' -g %username %username &>/dev/null || : +%postun filesystem +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : + + %post update test -e %freshclamlog || { touch %freshclamlog @@ -319,10 +367,6 @@ test -e %freshclamlog || { %__chown root:%username %freshclamlog } -%postun data -%__fe_userdel %username &>/dev/null || : -%__fe_groupdel %username &>/dev/null || : - %pre milter %__fe_groupadd 5 -r %milteruser &>/dev/null || : %__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ @@ -378,7 +422,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %_includedir/* %_libdir/*.*a %_libdir/*.so -%dir %pkgdatadir %pkgdatadir/template %pkgdatadir/clamd-gen %_libdir/pkgconfig/* @@ -386,14 +429,25 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : ## ----------------------- +%files filesystem +%attr(-,%username,%username) %dir %homedir +%attr(-,%username,%username) %dir %homedir/daily.inc +%attr(-,root,root) %dir %pkgdatadir + +## ----------------------- + %files data %defattr(-,%username,%username,-) -%dir %homedir # use %%config to keep files which were updated by 'freshclam' # already. Without this tag, they would be overridden with older # versions whenever a new -data package is installed. %config %verify(not size md5 mtime) %homedir/*.cvd + +%files data-empty +%defattr(-,%username,%username,-) +%ghost %attr(0664,%username,%username) %homedir/main.cvd + ## ----------------------- %files update @@ -408,6 +462,16 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog +%ghost %attr(0664,%username,%username) %homedir/daily.inc/COPYING +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.db +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.fp +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.hdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.info +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.ndb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.pdb +%ghost %attr(0664,%username,%username) %homedir/daily.inc/daily.zmd + + ## ----------------------- %files server @@ -415,7 +479,6 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc _doc_server/* %_mandir/man[58]/clamd* %_sbindir/* -%dir %pkgdatadir %pkgdatadir/clamd-wrapper %dir %_sysconfdir/clamd.d @@ -448,6 +511,15 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sat Feb 3 2007 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.90-0.2.rc3 +- updated to 0.90rc3 +- splitted mandatory parts from the data-file into a separate -filesystem + subpackage +- added a -data-empty subpackage to allow a setup where database is + updated per cron-job and user does not want to download the large + -data package with outdated virus definitations (#214949) +- %%ghost'ed the files downloaded by freshclam + * Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 - updated to 0.88.7 commit 552980be36d784c5ff10bc150171b46564399ac9 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 3 15:15:39 2007 +0000 updated to 0.90rc3; these patches don't apply anymore diff --git a/clamav-0.70-user.patch b/clamav-0.70-user.patch deleted file mode 100644 index f7f42b1..0000000 --- a/clamav-0.70-user.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.user 2000-02-19 07:04:00.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2003-06-26 14:35:01.000000000 +0200 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # - # clamav-milter This script starts and stops the clamav-milter daemon - # -@@ -16,6 +16,7 @@ - - # Local clamav-milter config - CLAMAV_FLAGS= -+CLAMAV_USER= - test -f /etc/sysconfig/clamav-milter && . /etc/sysconfig/clamav-milter - - # Check that networking is up. -@@ -28,7 +29,7 @@ - - start() { - echo -n "Starting clamav-milter: " -- daemon clamav-milter ${CLAMAV_FLAGS} -+ daemon ${CLAMAV_USER:+--user $CLAMAV_USER} setsid /usr/sbin/clamav-milter ${CLAMAV_FLAGS} </dev/null - RETVAL=$? - echo - test $RETVAL -eq 0 && touch /var/lock/subsys/clamav-milter diff --git a/clamav-0.88.1-strncpy.patch b/clamav-0.88.1-strncpy.patch deleted file mode 100644 index ceceb7d..0000000 --- a/clamav-0.88.1-strncpy.patch +++ /dev/null @@ -1,26 +0,0 @@ -2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - - * libclamav/unrarlib.c/stricomp(): terminate the string copied - with strncpy() explicitly with '\0'. Does not seem to be - exploitable at the moment due to deeply buried constraints - (function will be called for buffers with a static size of - 260 only). - - But it is better to fix it now than to run into problems - when function is used for other purposes. - ---- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 -+++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 -@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) - char S1[512],S2[512]; - char *chptr; - -- strncpy(S1,Str1,sizeof(S1)); -- strncpy(S2,Str2,sizeof(S2)); -+ strncpy(S1,Str1,sizeof(S1)); -+ strncpy(S2,Str2,sizeof(S2)); -+ S1[sizeof(S1)-1] = '\0'; -+ S2[sizeof(S2)-1] = '\0'; - - while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ - { diff --git a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch deleted file mode 100644 index 38f9d9d..0000000 --- a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- clamav-0.88.2/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-29 19:46:09.000000000 +0200 -+++ clamav-0.88.2/libclamav/pe.c 2006-04-30 11:25:53.000000000 +0200 -@@ -1555,7 +1555,7 @@ int cli_peheader(int desc, struct cli_pe - { - uint16_t e_magic; /* DOS signature ("MZ") */ - uint32_t e_lfanew; /* address of new exe header */ -- uint32_t min, max; -+ uint32_t min=0, max=0; - struct pe_image_file_hdr file_hdr; - struct pe_image_optional_hdr optional_hdr; - struct pe_image_section_hdr *section_hdr; ---- clamav-0.88.2/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 -+++ clamav-0.88.2/libclamav/htmlnorm.c 2006-04-30 11:25:53.000000000 +0200 -@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ - { - int fd_tmp, tag_length, tag_arg_length, binary; - int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; -- FILE *stream_in; -+ FILE *stream_in = 0; - html_state state=HTML_NORM, next_state=HTML_BAD_STATE; - char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; - char tag_val[HTML_STR_LENGTH+1], *tmp_file; commit 714bcbb9b4238e9c0480c92646505184d493d281 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Dec 12 08:17:53 2006 +0000 updated to 0.88.7 diff --git a/clamav.spec b/clamav.spec index f893c9a..e564b35 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.43 2006/10/18 07:22:18 ensc Exp $ +## $Id: clamav.spec,v 1.44 2006/11/05 20:11:19 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.6 +Version: 0.88.7 Release: %release_func 1 License: GPL @@ -448,6 +448,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Tue Dec 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.7-1 +- updated to 0.88.7 + * Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 - updated to 0.88.6 diff --git a/sources b/sources index e74691d..5117994 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz -38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig +34a9d58cf5bcb04dbe3eb32b5367a3f8 clamav-0.88.7.tar.gz +b19286b26aafe255c7e1e1d0fc4d3797 clamav-0.88.7.tar.gz.sig commit 095844cfcac1d7bd6a1f31f96cd5d3bfa5b1b923 Author: Dennis Gilmore <ausil(a)fedoraproject.org> Date: Thu Nov 30 17:23:00 2006 +0000 Initialize branch EL-5 for clamav diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 commit a8e23fb58bf80a8697ad5e2bc49bcff217004cc0 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Nov 5 20:11:19 2006 +0000 updated to 0.88.6 diff --git a/clamav.spec b/clamav.spec index a3fba4e..f893c9a 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.42 2006/10/04 22:32:25 c4chris Exp $ +## $Id: clamav.spec,v 1.43 2006/10/18 07:22:18 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.5 -Release: %release_func 1 +Version: 0.88.6 +Release: %release_func 1 License: GPL Group: Applications/File @@ -448,6 +448,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Sun Nov 5 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.6-1 +- updated to 0.88.6 + * Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 - added patch to set '__attribute__ ((visibility("hidden")))' for diff --git a/sources b/sources index fc5c4da..e74691d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d62376205647b208eba4191dde821830 clamav-0.88.5.tar.gz -5daea1b5d8ab49257dea3ccc5dacaf35 clamav-0.88.5.tar.gz.sig +db7f8b947bc21023f36e04bfdd555dd0 clamav-0.88.6.tar.gz +38070a003e0eb5438ba7ad901556fd25 clamav-0.88.6.tar.gz.sig commit 953d4e4dc1de1f092691cace8019737596ad8113 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Oct 18 07:22:18 2006 +0000 - updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 - added patch to set '__attribute__ ((visibility("hidden")))' for exported MD5_*() functions (fixes #202043) diff --git a/clamav-0.88.4-visibility.patch b/clamav-0.88.4-visibility.patch new file mode 100644 index 0000000..34ef51e --- /dev/null +++ b/clamav-0.88.4-visibility.patch @@ -0,0 +1,29 @@ +--- clamav-0.88.4/libclamav/md5.c.visibility 2005-06-23 22:03:12.000000000 +0200 ++++ clamav-0.88.4/libclamav/md5.c 2006-08-11 08:19:02.000000000 +0200 +@@ -176,7 +176,7 @@ static void *body(MD5_CTX *ctx, void *da + return ptr; + } + +-void MD5_Init(MD5_CTX *ctx) ++void __attribute__ ((__visibility__("hidden"))) MD5_Init(MD5_CTX *ctx) + { + ctx->a = 0x67452301; + ctx->b = 0xefcdab89; +@@ -187,7 +187,7 @@ void MD5_Init(MD5_CTX *ctx) + ctx->hi = 0; + } + +-void MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) ++void __attribute__ ((__visibility__("hidden"))) MD5_Update(MD5_CTX *ctx, void *data, unsigned long size) + { + MD5_u32plus saved_lo; + unsigned long used, free; +@@ -221,7 +221,7 @@ void MD5_Update(MD5_CTX *ctx, void *data + memcpy(ctx->buffer, data, size); + } + +-void MD5_Final(unsigned char *result, MD5_CTX *ctx) ++void __attribute__ ((__visibility__("hidden"))) MD5_Final(unsigned char *result, MD5_CTX *ctx) + { + unsigned long used, free; + diff --git a/clamav.spec b/clamav.spec index b6bb6f4..a3fba4e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.41 2006/09/21 18:27:43 ensc Exp $ +## $Id: clamav.spec,v 1.42 2006/10/04 22:32:25 c4chris Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,8 +18,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.4 -Release: %release_func 4 +Version: 0.88.5 +Release: %release_func 1 License: GPL Group: Applications/File @@ -38,6 +38,7 @@ Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch +Patch23: clamav-0.88.4-visibility.patch BuildRoot: %_tmppath/%name-%version-%release-root Requires: clamav-lib = %version-%release Requires: data(clamav) @@ -185,6 +186,7 @@ The SysV initscripts for clamav-milter. %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff +%patch23 -p1 -b .visibility perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -446,6 +448,11 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Wed Oct 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.5-1 +- updated to 0.88.5 (SECURITY); fixes CVE-2006-4182, CVE-2006-5295 +- added patch to set '__attribute__ ((visibility("hidden")))' for + exported MD5_*() functions (fixes #202043) + * Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 diff --git a/sources b/sources index bca4b2c..fc5c4da 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -7759784aa4506b314e6543e0f2a8587b clamav-0.88.4.tar.gz -450d59c0a663b5986cda1105b85ae673 clamav-0.88.4.tar.gz.sig +d62376205647b208eba4191dde821830 clamav-0.88.5.tar.gz +5daea1b5d8ab49257dea3ccc5dacaf35 clamav-0.88.5.tar.gz.sig commit d5918e831444dc5f65de614c9d6f2eb4b5f265c3 Author: Christian Iseli <c4chris(a)fedoraproject.org> Date: Wed Oct 4 22:32:25 2006 +0000 automated bump and rebuild diff --git a/clamav.spec b/clamav.spec index ea23148..b6bb6f4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.40 2006/09/15 06:21:38 ensc Exp $ +## $Id: clamav.spec,v 1.41 2006/09/21 18:27:43 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.4 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -446,6 +446,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %changelog +* Thu Oct 05 2006 Christian Iseli <Christian.Iseli(a)licr.org> 0.88.4-4 + - rebuilt for unwind info generation, broken in gcc-4.1.1-21 + * Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 - splitted SysV initscripts of -milter and -server into own subpackages commit f1f8b458cd18df3134a3d6707ca818735440e83f Author: ensc <ensc(a)fedoraproject.org> Date: Thu Sep 21 18:27:43 2006 +0000 splitted SysV initscripts of -milter and -server into own subpackages diff --git a/clamav.spec b/clamav.spec index 90f84fb..ea23148 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.39 2006/08/09 06:48:12 ensc Exp $ +## $Id: clamav.spec,v 1.40 2006/09/15 06:21:38 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.4 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -80,33 +80,41 @@ Requires(post): group(clamav) %package server Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Provides: clamav-daemon = %version-%release -Obsoletes: clamav-daemon < %version-%release -Conflicts: clamav-daemon > %version-%release -## For now, use this as a placeholder. Later, generate separate -sysv -## and -minit subpackages Requires: init(clamav-server) -Provides: init(clamav-server) = sysv Requires: data(clamav) Requires: clamav-lib = %version-%release + +%package server-sysv +Summary: SysV initscripts for clamav server +Group: System Environment/Daemons +Provides: init(clamav-server) = sysv +Requires: clamav-server = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir %package milter Summary: Sendmail-milter for the Clam Antivirus scanner Group: System Environment/Daemons -## For now, use this as a placeholder. Later, generate separate -sysv -## and -minit subpackages Requires: init(clamav-milter) -Provides: init(clamav-milter) = sysv BuildRequires: sendmail-devel BuildRequires: fedora-usermgmt-devel -Requires: sendmail +Provides: user(%milteruser) +Provides: group(%milteruser) +Requires: sendmail +Requires(post): coreutils +%{?FE_USERADD_REQ} + +%package milter-sysv +Summary: SysV initscripts for the clamav sendmail-milter +Group: System Environment/Daemons +Provides: init(clamav-milter) = sysv +Requires: clamav-milter = %version-%release +Requires(post): user(%milteruser) clamav-milter +Requires(preun): user(%milteruser) clamav-milter Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts -Requires(post): chkconfig coreutils +Requires(post): chkconfig Requires(preun): chkconfig initscripts -%{?FE_USERADD_REQ} %description @@ -150,6 +158,11 @@ of this daemon should be started for each service requiring it. See the README file how this can be done with a minimum of effort. + +%description server-sysv +SysV initscripts template for the clamav server + + %description milter This package contains files which are needed to run the clamav-milter. It can be activated by adding @@ -158,7 +171,9 @@ can be activated by adding to your sendmail.mc. -THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! +%description milter-sysv +The SysV initscripts for clamav-milter. + ## ------------------------------------------------------------ @@ -312,20 +327,25 @@ test -e %freshclamlog || { -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : %post milter -/sbin/chkconfig --add clamav-milter test -e %milterlog || { touch %milterlog chmod 0620 %milterlog chown root:%milteruser %milterlog } -%preun milter -test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamav-milter - %postun milter %__fe_userdel %milteruser &>/dev/null || : %__fe_groupdel %milteruser &>/dev/null || : + + +%post milter-sysv +/sbin/chkconfig --add clamav-milter + +%preun milter-sysv +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamav-milter + +%postun milter-sysv test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : @@ -393,15 +413,19 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc _doc_server/* %_mandir/man[58]/clamd* %_sbindir/* -%_initrddir/clamd-wrapper %dir %pkgdatadir -%dir %_sysconfdir/clamd.d %pkgdatadir/clamd-wrapper - +%dir %_sysconfdir/clamd.d %exclude %_sbindir/*milter* %exclude %_mandir/man8/clamav-milter* + +%files server-sysv +%defattr(-,root,root,-) +%_initrddir/clamd-wrapper + + ## ----------------------- %files milter @@ -409,14 +433,22 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* -%config %_initrddir/clamav-milter %config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter %attr(0700,%milteruser,%milteruser) %dir %milterstatedir %ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog + +%files milter-sysv +%defattr(-,root,root,-) +%config %_initrddir/clamav-milter +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter + + %changelog +* Thu Sep 21 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-3 +- splitted SysV initscripts of -milter and -server into own subpackages + * Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 - rebuilt diff --git a/clamd-gen b/clamd-gen index 134e149..46739ba 100755 --- a/clamd-gen +++ b/clamd-gen @@ -77,6 +77,7 @@ Group: System Environment/Daemons Provides: init(%name) = sysv Conflicts: init(%name) < sysv Conflicts: init(%name) > sysv +Requires: clamav-server-sysv Requires(post): %name = %epoch:%version-%release Requires(post): diffutils mktemp %__chkconfig Requires(preun): %__chkconfig commit 3ae7322b01e875dcba5e77103c6a08f75f656f0f Author: ensc <ensc(a)fedoraproject.org> Date: Fri Sep 15 06:21:38 2006 +0000 rebuilt diff --git a/clamav.spec b/clamav.spec index 8f1221e..90f84fb 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.38 2006/08/09 06:30:01 ensc Exp $ +## $Id: clamav.spec,v 1.39 2006/08/09 06:48:12 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -19,7 +19,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.4 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -417,6 +417,9 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog %changelog +* Fri Sep 15 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-2 +- rebuilt + * Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 - updated to 0.88.4 (SECURITY) diff --git a/needs.rebuild b/needs.rebuild deleted file mode 100644 index 815fd29..0000000 --- a/needs.rebuild +++ /dev/null @@ -1 +0,0 @@ -http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild commit f18c7ca19f194bce8d74b533c4bebcc7f7e724e5 Author: Ville Skyttä <scop(a)fedoraproject.org> Date: Sun Aug 27 20:18:44 2006 +0000 http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild diff --git a/needs.rebuild b/needs.rebuild new file mode 100644 index 0000000..815fd29 --- /dev/null +++ b/needs.rebuild @@ -0,0 +1 @@ +http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild commit 3446373d245d02b9a486e901a86cc89da43aa8f3 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Aug 9 06:49:22 2006 +0000 cleanup; removed old sources diff --git a/sources b/sources index 1fe5f15..bca4b2c 100644 --- a/sources +++ b/sources @@ -1,4 +1,2 @@ -330206089713e73a44afc7a4d6450225 clamav-0.88.3.tar.gz -dc0e3b56253c7974ef9f3e9011017e0c clamav-0.88.3.tar.gz.sig 7759784aa4506b314e6543e0f2a8587b clamav-0.88.4.tar.gz 450d59c0a663b5986cda1105b85ae673 clamav-0.88.4.tar.gz.sig commit 72cd79d86160b8cc3d648f0cb11f35afdef67caa Author: ensc <ensc(a)fedoraproject.org> Date: Wed Aug 9 06:48:12 2006 +0000 removed a superfluous %doc diff --git a/clamav.spec b/clamav.spec index b6adf26..8f1221e 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.37 2006/07/08 15:57:54 ensc Exp $ +## $Id: clamav.spec,v 1.38 2006/08/09 06:30:01 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -391,7 +391,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc %_mandir/man[58]/clamd* +%_mandir/man[58]/clamd* %_sbindir/* %_initrddir/clamd-wrapper %dir %pkgdatadir commit 87b2de41e228d562296b18dcc46539d5b010adf1 Author: ensc <ensc(a)fedoraproject.org> Date: Wed Aug 9 06:30:01 2006 +0000 - updated to 0.88.4 (SECURITY) - removed the clamdscan(1) manpage from the -server subpackage diff --git a/clamav.spec b/clamav.spec index ccf532b..b6adf26 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.36 2006/07/08 13:17:12 ensc Exp $ +## $Id: clamav.spec,v 1.37 2006/07/08 15:57:54 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -18,7 +18,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.3 +Version: 0.88.4 Release: %release_func 1 License: GPL @@ -337,8 +337,8 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO %doc docs/*.pdf -%doc %_mandir/man[15]/* %_bindir/* +%_mandir/man[15]/* %exclude %_bindir/clamav-config %exclude %_bindir/freshclam %exclude %_mandir/*/freshclam* @@ -391,7 +391,7 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc %_mandir/*/clamd* +%doc %_mandir/man[58]/clamd* %_sbindir/* %_initrddir/clamd-wrapper %dir %pkgdatadir @@ -417,6 +417,12 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog %changelog +* Tue Aug 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.4-1 +- updated to 0.88.4 (SECURITY) + +* Wed Jul 12 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed the clamdscan(1) manpage from the -server subpackage + * Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - removed a superfluous '}' - removed some code which was relevant for FC-3 only diff --git a/sources b/sources index 4710962..1fe5f15 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ 330206089713e73a44afc7a4d6450225 clamav-0.88.3.tar.gz dc0e3b56253c7974ef9f3e9011017e0c clamav-0.88.3.tar.gz.sig +7759784aa4506b314e6543e0f2a8587b clamav-0.88.4.tar.gz +450d59c0a663b5986cda1105b85ae673 clamav-0.88.4.tar.gz.sig commit bf7d59e040c87f39767e4ed2e87467659399ebeb Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jul 8 15:57:54 2006 +0000 - removed a superfluous '}' - removed some code which was relevant for FC-3 only diff --git a/clamav.spec b/clamav.spec index 9047da9..ccf532b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.35 2006/04/30 10:07:15 ensc Exp $ +## $Id: clamav.spec,v 1.36 2006/07/08 13:17:12 ensc Exp $ ## Fedora Extras specific customization below... %bcond_without fedora @@ -82,7 +82,7 @@ Summary: Clam Antivirus scanner server Group: System Environment/Daemons Provides: clamav-daemon = %version-%release Obsoletes: clamav-daemon < %version-%release -Conflicts: clamav-daemon > %version-%release} +Conflicts: clamav-daemon > %version-%release ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) @@ -184,16 +184,8 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ %build -## '--disable-zlib-vcheck' is used because every FC<=3 ships zlib-1.2.1* -## but clamav checks for zlib >= 1.2.2. This option can be removed for -## FC4 builds. -## -## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and -## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 -## also -CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" +CFLAGS="$RPM_OPT_FLAGS -Wall -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" %configure --disable-clamav --with-dbdir=/var/lib/clamav \ - --disable-zlib-vcheck \ --enable-milter ## HACK: ./configure checks if freshclam.conf/clamd.conf are existing @@ -425,6 +417,10 @@ test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog %changelog +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +- removed a superfluous '}' +- removed some code which was relevant for FC-3 only + * Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 - updated to 0.88.3 - updated to new fedora-usermgmt macros commit 6ff0a52518d97ffc37166b594e41c187a9477246 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jul 8 13:17:12 2006 +0000 - updated to 0.88.3 - updated to new fedora-usermgmt macros - cleanups: removed unneeded curlies, use plain command instead of %%__XXX macro, whitespace cleanup, removed unneeded versioned dependencies - added a 'Requires(post): group(clamav)' dependencies for -update and added the corresponding Provides: to -data - removed the %%_without_milter conditional; you won't gain anything when milter would be disabled at buildtime diff --git a/clamav.spec b/clamav.spec index 8cfc0cd..9047da9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,10 +1,7 @@ -## $Id: clamav.spec,v 1.34 2006/04/24 22:05:44 ensc Exp $ - -## This package understands the following switches: -## --without milter ... deactivate the -milter subpackage - +## $Id: clamav.spec,v 1.35 2006/04/30 10:07:15 ensc Exp $ ## Fedora Extras specific customization below... +%bcond_without fedora ## @@ -21,14 +18,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.2 +Version: 0.88.3 Release: %release_func 1 License: GPL Group: Applications/File URL: http://www.clamav.net -Source0: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… +Source0: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz +Source999: http://download.sourceforge.net/sourceforge/clamav/%name-%version.tar.gz.sig Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -41,8 +38,8 @@ Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: clamav-lib = %{version}-%{release} +BuildRoot: %_tmppath/%name-%version-%release-root +Requires: clamav-lib = %version-%release Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel BuildRequires: bc @@ -56,15 +53,17 @@ Requires: data(clamav) Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %{version}-%{release} +Requires: clamav-lib = %version-%release Requires(pre): %_libdir/pkgconfig %package data Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File Provides: data(clamav) -Requires(pre): fedora-usermgmt >= 0.7 -Requires(postun): fedora-usermgmt >= 0.7 +Provides: user(clamav) +Provides: group(clamav) +BuildRequires: fedora-usermgmt-devel +%{?FE_USERADD_REQ} %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -72,23 +71,24 @@ Group: Applications/File Source200: freshclam-sleep Source201: freshclam.sysconfig Source202: clamav-update.cron -Requires: clamav-data = %{version}-%{release} +Requires: clamav-data = %version-%release Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %__chown %__chmod +Requires(post): group(clamav) %package server Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Provides: clamav-daemon = %{version}-%{release} -Obsoletes: clamav-daemon < %{version}-%{release} -Conflicts: clamav-daemon > %{version}-%{release} +Provides: clamav-daemon = %version-%release +Obsoletes: clamav-daemon < %version-%release +Conflicts: clamav-daemon > %version-%release} ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) Provides: init(clamav-server) = sysv Requires: data(clamav) -Requires: clamav-lib = %{version}-%{release} +Requires: clamav-lib = %version-%release Requires(pre): %_initrddir Requires(postun): %_initrddir @@ -99,14 +99,14 @@ Group: System Environment/Daemons ## and -minit subpackages Requires: init(clamav-milter) Provides: init(clamav-milter) = sysv -%{!?_without_milter:BuildRequires: sendmail-devel} +BuildRequires: sendmail-devel +BuildRequires: fedora-usermgmt-devel Requires: sendmail Requires(pre): %_initrddir Requires(postun): %_initrddir initscripts Requires(post): chkconfig coreutils Requires(preun): chkconfig initscripts -Requires(pre): fedora-usermgmt >= 0.7 -Requires(postun): fedora-usermgmt >= 0.7 +%{?FE_USERADD_REQ} %description @@ -194,7 +194,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --disable-zlib-vcheck \ - %{!?_without_milter:--enable-milter} + --enable-milter ## HACK: ./configure checks if freshclam.conf/clamd.conf are existing ## in current filesystem and skips its installation then. Was introduced @@ -203,14 +203,14 @@ perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; s!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_FALSE\@),[^,]*,!\1,\#,!g' config.status ./config.status -%{__make} %{?_smp_mflags} +make %{?_smp_mflags} ## ------------------------------------------------------------ %install rm -rf "$RPM_BUILD_ROOT" _doc* -%{__make} DESTDIR="$RPM_BUILD_ROOT" install +make DESTDIR="$RPM_BUILD_ROOT" install function smartsubst() { local tmp @@ -226,43 +226,41 @@ function smartsubst() { } -%{__install} -d -m755 \ - ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ - ${RPM_BUILD_ROOT}%{_var}/log \ +install -d -m755 \ + ${RPM_BUILD_ROOT}%_sysconfdir/{clamd.d,cron.d,logrotate.d,sysconfig} \ + ${RPM_BUILD_ROOT}%_var/log \ ${RPM_BUILD_ROOT}%milterstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ - ${RPM_BUILD_ROOT}%{_initrddir} - -rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/clamd.conf \ - ${RPM_BUILD_ROOT}%{_libdir}/*.la + ${RPM_BUILD_ROOT}%_initrddir -%{?_without_milter:rm -f $RPM_BUILD_ROOT%_mandir/*/*milter*} +rm -f ${RPM_BUILD_ROOT}%_sysconfdir/clamd.conf \ + ${RPM_BUILD_ROOT}%_libdir/*.la ## prepare the server-files mkdir _doc_server -%{__install} -m644 -p %{SOURCE2} _doc_server/clamd.sysconfig -%{__install} -m644 -p %{SOURCE3} _doc_server/clamd.logrotate -%{__install} -m755 -p %{SOURCE7} _doc_server/clamd.init -%{__install} -m644 -p %{SOURCE5} _doc_server/README -%__install -m644 -p etc/clamd.conf _doc_server/clamd.conf +install -m644 -p %SOURCE2 _doc_server/clamd.sysconfig +install -m644 -p %SOURCE3 _doc_server/clamd.logrotate +install -m755 -p %SOURCE7 _doc_server/clamd.init +install -m644 -p %SOURCE5 _doc_server/README +install -m644 -p etc/clamd.conf _doc_server/clamd.conf -%__install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir -%__install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir -cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template -ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper +install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir +install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper ## prepare the update-files -%{__install} -m644 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/clamav-update -%{__install} -m755 -p %{SOURCE8} ${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers -touch ${RPM_BUILD_ROOT}%{freshclamlog} +install -m644 -p %SOURCE6 ${RPM_BUILD_ROOT}%_sysconfdir/logrotate.d/clamav-update +install -m755 -p %SOURCE8 ${RPM_BUILD_ROOT}%_sbindir/clamav-notify-servers +touch ${RPM_BUILD_ROOT}%freshclamlog -%__install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -%__install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam -%__install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update +install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update smartsubst 's!webmaster,clamav!webmaster,%username!g; s!/usr/share/clamav!%pkgdatadir!g; @@ -272,9 +270,7 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -%if 0%{!?_without_milter:1} #### The milter stuff - function subst() { sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } @@ -291,9 +287,8 @@ CLAMAV_FLAGS='--max-children=2 -c /etc/clamd.d/milter.conf local:%milterstatedir CLAMAV_USER='%milteruser' EOF -%__install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter +install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog -%endif # _without_milter ## ------------------------------------------------------------ @@ -304,25 +299,25 @@ rm -rf "$RPM_BUILD_ROOT" ## ------------------------------------------------------------ %pre data -/usr/sbin/fedora-groupadd 4 -r %{username} &>/dev/null || : -/usr/sbin/fedora-useradd 4 -r -s /sbin/nologin -d %{homedir} -M \ - -c 'Clamav database update user' -g %{username} %{username} &>/dev/null || : +%__fe_groupadd 4 -r %username &>/dev/null || : +%__fe_useradd 4 -r -s /sbin/nologin -d %homedir -M \ + -c 'Clamav database update user' -g %username %username &>/dev/null || : %post update -test -e %{freshclamlog} || { - touch %{freshclamlog} - %{__chmod} 0664 %{freshclamlog} - %{__chown} root:%{username} %{freshclamlog} +test -e %freshclamlog || { + touch %freshclamlog + %__chmod 0664 %freshclamlog + %__chown root:%username %freshclamlog } %postun data -test "$1" != 0 || /usr/sbin/fedora-userdel %{username} &>/dev/null || : -test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : +%__fe_userdel %username &>/dev/null || : +%__fe_groupdel %username &>/dev/null || : %pre milter -/usr/sbin/fedora-groupadd 5 -r %milteruser &>/dev/null || : -/usr/sbin/fedora-useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ - -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : +%__fe_groupadd 5 -r %milteruser &>/dev/null || : +%__fe_useradd 5 -r -s /sbin/nologin -d %milterstatedir -M \ + -c 'Clamav Milter User' -g %milteruser %milteruser &>/dev/null || : %post milter /sbin/chkconfig --add clamav-milter @@ -333,13 +328,13 @@ test -e %milterlog || { } %preun milter -test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : +test "$1" != 0 || %_initrddir/clamav-milter stop &>/dev/null || : test "$1" != 0 || /sbin/chkconfig --del clamav-milter %postun milter -test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : -test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : -test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : +%__fe_userdel %milteruser &>/dev/null || : +%__fe_groupdel %milteruser &>/dev/null || : +test "$1" = 0 || %_initrddir/clamav-milter condrestart >/dev/null || : %post lib -p /sbin/ldconfig @@ -350,8 +345,8 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO %doc docs/*.pdf -%doc %{_mandir}/man[15]/* -%{_bindir}/* +%doc %_mandir/man[15]/* +%_bindir/* %exclude %_bindir/clamav-config %exclude %_bindir/freshclam %exclude %_mandir/*/freshclam* @@ -360,15 +355,15 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files lib %defattr(-,root,root,-) -%{_libdir}/*.so.* +%_libdir/*.so.* ## ----------------------- %files devel %defattr(-,root,root,-) -%{_includedir}/* -%{_libdir}/*.*a -%{_libdir}/*.so +%_includedir/* +%_libdir/*.*a +%_libdir/*.so %dir %pkgdatadir %pkgdatadir/template %pkgdatadir/clamd-gen @@ -378,12 +373,12 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : ## ----------------------- %files data -%defattr(-,%{username},%{username},-) -%dir %{homedir} +%defattr(-,%username,%username,-) +%dir %homedir # use %%config to keep files which were updated by 'freshclam' # already. Without this tag, they would be overridden with older # versions whenever a new -data package is installed. -%config %verify(not size md5 mtime) %{homedir}/*.cvd +%config %verify(not size md5 mtime) %homedir/*.cvd ## ----------------------- @@ -397,7 +392,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %config(noreplace) %_sysconfdir/cron.d/* %config(noreplace) %_sysconfdir/sysconfig/freshclam -%ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog} +%ghost %attr(0664,root,%username) %verify(not size md5 mtime) %freshclamlog ## ----------------------- @@ -405,14 +400,13 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc _doc_server/* %doc %_mandir/*/clamd* -%{_sbindir}/* +%_sbindir/* %_initrddir/clamd-wrapper %dir %pkgdatadir -%dir %{_sysconfdir}/clamd.d +%dir %_sysconfdir/clamd.d %pkgdatadir/clamd-wrapper -%if 0%{!?_without_milter:1} %exclude %_sbindir/*milter* %exclude %_mandir/man8/clamav-milter* @@ -423,15 +417,27 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* -%config %{_initrddir}/clamav-milter -%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/milter.conf -%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamav-milter +%config %_initrddir/clamav-milter +%config(noreplace) %verify(not mtime) %_sysconfdir/clamd.d/milter.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamav-milter %attr(0700,%milteruser,%milteruser) %dir %milterstatedir %ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog -%endif # _without_milter %changelog +* Sat Jul 8 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.3-1 +- updated to 0.88.3 +- updated to new fedora-usermgmt macros + +* Tue May 16 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-2 +- cleanups: removed unneeded curlies, use plain command instead of + %%__XXX macro, whitespace cleanup, removed unneeded versioned + dependencies +- added a 'Requires(post): group(clamav)' dependencies for -update and + added the corresponding Provides: to -data +- removed the %%_without_milter conditional; you won't gain anything + when milter would be disabled at buildtime + * Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 - updated to 0.88.2 (SECURITY) - rediffed patches; most issues handled by 0.88.1-2 are fixed in diff --git a/sources b/sources index 1cdc576..4710962 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f0a1c610a1fb70bd748a08bea69c736c clamav-0.88.2.tar.gz -6846cb50e005c18ab4b39ff9aa7126fc clamav-0.88.2.tar.gz.sig +330206089713e73a44afc7a4d6450225 clamav-0.88.3.tar.gz +dc0e3b56253c7974ef9f3e9011017e0c clamav-0.88.3.tar.gz.sig commit de4634e5814c6fcb4136e155c81e9fcf60c6d687 Author: ensc <ensc(a)fedoraproject.org> Date: Sun Apr 30 10:07:15 2006 +0000 - updated to 0.88.2 (SECURITY) - rediffed patches; most issues handled by 0.88.1-2 are fixed in 0.88.2 diff --git a/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch deleted file mode 100644 index 9bc9723..0000000 --- a/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +++ /dev/null @@ -1,157 +0,0 @@ -2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - - * Guys, please read the compiler warnings before releasing a - new version. The compiler is clever enough to warn you about - issues like - - | encrypted = (zdirent.d_flags & 0x2041 != 0); - - with - - | scanners.c:381: warning: suggest parentheses around comparison in operand of & - - - Ditto about the usage of implicitly declared functions. - - Warnings about uninitialized variables shall be taken - seriously too; this patch fixes one existing issue. The - htmlnorm.c parser should be reviewed. - - - * this patch does not fix: - - - things like - | ole2_extract.c:86: warning: 'packed' attribute ignored for field of type 'unsigned char[7u]' - - which are caused by - - struct foo { - char a[2] __attribute__((__packed__)); - char b __attribute__((__packed__)); - }; - - which can/should be written as - - struct foo { - char a[2]; - char b; - } __attribute__((__packed__)); - - - signed/unsigned comparisions. This was really too much to - get fixed now. It will require rewrite/review of the - complete code to use 'size_t' instead of 'int' for sizes. - - Lot of bufferover- and underflows can be prevented by - correct signess. - - - missing prototypes like - - | warning: no previous prototype for - - - 'clamav' is used to operate on hostile data so its source - code should have a good quality. Building with a high warning - level and removing reasons for such warnings is a cheap way - to eliminate a huge part of potential problems. - - - ---- clamav-0.88.1/clamd/others.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-10-30 21:22:01.000000000 +0100 -+++ clamav-0.88.1/clamd/others.c 2006-04-24 22:53:27.000000000 +0200 -@@ -30,6 +30,7 @@ - #include <sys/stat.h> - #include <errno.h> - #include <sys/time.h> -+#include <sys/wait.h> - - #if HAVE_SYS_PARAM_H - #include <sys/param.h> -@@ -68,6 +69,7 @@ - #include "memory.h" - #include "cfgparser.h" - #include "session.h" -+#include "../shared/output.h" - - #define ENV_FILE "CLAM_VIRUSEVENT_FILENAME" - #define ENV_VIRUS "CLAM_VIRUSEVENT_VIRUSNAME" ---- clamav-0.88.1/shared/misc.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-12-23 22:25:10.000000000 +0100 -+++ clamav-0.88.1/shared/misc.c 2006-04-24 22:53:27.000000000 +0200 -@@ -28,6 +28,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <ctype.h> - - #include "clamav.h" - #include "cfgparser.h" ---- clamav-0.88.1/freshclam/manager.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-25 18:39:25.000000000 +0100 -+++ clamav-0.88.1/freshclam/manager.c 2006-04-24 22:53:27.000000000 +0200 -@@ -50,6 +50,7 @@ - #include "../libclamav/others.h" - #include "../libclamav/str.h" /* cli_strtok */ - #include "dns.h" -+#include "execute.h" - - - int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, const char *hostname) ---- clamav-0.88.1/libclamav/zziplib/zzip-zip.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 01:43:53.000000000 +0200 -+++ clamav-0.88.1/libclamav/zziplib/zzip-zip.c 2006-04-24 22:57:44.000000000 +0200 -@@ -16,6 +16,7 @@ - #endif - - #include "target.h" -+#include "others.h" - - #include <zzip.h> /* archive handling */ - #include <zzip-file.h> ---- clamav-0.88.1/libclamav/scanners.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-04 11:32:55.000000000 +0200 -+++ clamav-0.88.1/libclamav/scanners.c 2006-04-24 22:53:27.000000000 +0200 -@@ -69,6 +69,7 @@ extern int cli_mbox(const char *dir, int - #include "untar.h" - #include "special.h" - #include "binhex.h" -+#include "../tnef.h" - - #ifdef HAVE_ZLIB_H - #include <zlib.h> -@@ -378,7 +379,7 @@ static int cli_scanzip(int desc, const c - * Bit 6: Strong encryption was used - * Bit 13: Encrypted central directory - */ -- encrypted = (zdirent.d_flags & 0x2041 != 0); -+ encrypted = (zdirent.d_flags & 0x2041) != 0; - - cli_dbgmsg("Zip: %s, crc32: 0x%x, offset: %d, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", zdirent.d_name, zdirent.d_crc32, zdirent.d_off, encrypted, zdirent.d_csize, zdirent.st_size, zdirent.d_compr, zdirent.d_csize ? (zdirent.st_size / zdirent.d_csize) : 0, limits ? limits->maxratio : 0); - ---- clamav-0.88.1/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 21:22:02.000000000 +0200 -+++ clamav-0.88.1/libclamav/pe.c 2006-04-24 22:53:27.000000000 +0200 -@@ -1451,7 +1451,7 @@ int cli_peheader(int desc, struct cli_pe - { - uint16_t e_magic; /* DOS signature ("MZ") */ - uint32_t e_lfanew; /* address of new exe header */ -- uint32_t min, max; -+ uint32_t min=0, max=0; - struct pe_image_file_hdr file_hdr; - struct pe_image_optional_hdr optional_hdr; - struct pe_image_section_hdr *section_hdr; ---- clamav-0.88.1/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 -+++ clamav-0.88.1/libclamav/htmlnorm.c 2006-04-24 22:53:27.000000000 +0200 -@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ - { - int fd_tmp, tag_length, tag_arg_length, binary; - int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; -- FILE *stream_in; -+ FILE *stream_in = 0; - html_state state=HTML_NORM, next_state=HTML_BAD_STATE; - char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; - char tag_val[HTML_STR_LENGTH+1], *tmp_file; ---- clamav-0.88.1/libclamav/special.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-06-23 22:03:13.000000000 +0200 -+++ clamav-0.88.1/libclamav/special.c 2006-04-24 22:53:27.000000000 +0200 -@@ -25,6 +25,7 @@ - #include <netinet/in.h> - #include <string.h> - -+#include "special.h" - #include "clamav.h" - #include "others.h" - #include "cltypes.h" diff --git a/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch new file mode 100644 index 0000000..38f9d9d --- /dev/null +++ b/clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch @@ -0,0 +1,22 @@ +--- clamav-0.88.2/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-29 19:46:09.000000000 +0200 ++++ clamav-0.88.2/libclamav/pe.c 2006-04-30 11:25:53.000000000 +0200 +@@ -1555,7 +1555,7 @@ int cli_peheader(int desc, struct cli_pe + { + uint16_t e_magic; /* DOS signature ("MZ") */ + uint32_t e_lfanew; /* address of new exe header */ +- uint32_t min, max; ++ uint32_t min=0, max=0; + struct pe_image_file_hdr file_hdr; + struct pe_image_optional_hdr optional_hdr; + struct pe_image_section_hdr *section_hdr; +--- clamav-0.88.2/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 ++++ clamav-0.88.2/libclamav/htmlnorm.c 2006-04-30 11:25:53.000000000 +0200 +@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ + { + int fd_tmp, tag_length, tag_arg_length, binary; + int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; +- FILE *stream_in; ++ FILE *stream_in = 0; + html_state state=HTML_NORM, next_state=HTML_BAD_STATE; + char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; + char tag_val[HTML_STR_LENGTH+1], *tmp_file; diff --git a/clamav.spec b/clamav.spec index d1894a2..8cfc0cd 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.33 2006/04/06 16:50:58 ensc Exp $ +## $Id: clamav.spec,v 1.34 2006/04/24 22:05:44 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88.1 -Release: %release_func 2 +Version: 0.88.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -36,7 +36,7 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers -Patch0: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +Patch0: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch @@ -432,6 +432,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sun Apr 30 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.2-1 +- updated to 0.88.2 (SECURITY) +- rediffed patches; most issues handled by 0.88.1-2 are fixed in + 0.88.2 + * Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 - added patch which fixes some classes of compiler warnings; at least the using of implicitly declared functions was reported to cause diff --git a/sources b/sources index 2b31a40..1cdc576 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9fe8c47037051e350077513dd94fb76a clamav-0.88.1.tar.gz -bc06324bf070679854689235df5042d8 clamav-0.88.1.tar.gz.sig +f0a1c610a1fb70bd748a08bea69c736c clamav-0.88.2.tar.gz +6846cb50e005c18ab4b39ff9aa7126fc clamav-0.88.2.tar.gz.sig commit e1f2fc085e8bfcdc36448341173f31e6a4ec4ef5 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Apr 24 22:05:45 2006 +0000 - added patch which fixes some classes of compiler warnings; at least the using of implicitly declared functions was reported to cause segfaults on AMD64 (brought to my attention by Marc Perkel) - added patch which fixes wrong usage of strncpy(3) in unrarlib.c diff --git a/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch b/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch new file mode 100644 index 0000000..9bc9723 --- /dev/null +++ b/clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch @@ -0,0 +1,157 @@ +2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> + + * Guys, please read the compiler warnings before releasing a + new version. The compiler is clever enough to warn you about + issues like + + | encrypted = (zdirent.d_flags & 0x2041 != 0); + + with + + | scanners.c:381: warning: suggest parentheses around comparison in operand of & + + + Ditto about the usage of implicitly declared functions. + + Warnings about uninitialized variables shall be taken + seriously too; this patch fixes one existing issue. The + htmlnorm.c parser should be reviewed. + + + * this patch does not fix: + + - things like + | ole2_extract.c:86: warning: 'packed' attribute ignored for field of type 'unsigned char[7u]' + + which are caused by + + struct foo { + char a[2] __attribute__((__packed__)); + char b __attribute__((__packed__)); + }; + + which can/should be written as + + struct foo { + char a[2]; + char b; + } __attribute__((__packed__)); + + - signed/unsigned comparisions. This was really too much to + get fixed now. It will require rewrite/review of the + complete code to use 'size_t' instead of 'int' for sizes. + + Lot of bufferover- and underflows can be prevented by + correct signess. + + - missing prototypes like + + | warning: no previous prototype for + + + 'clamav' is used to operate on hostile data so its source + code should have a good quality. Building with a high warning + level and removing reasons for such warnings is a cheap way + to eliminate a huge part of potential problems. + + + +--- clamav-0.88.1/clamd/others.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-10-30 21:22:01.000000000 +0100 ++++ clamav-0.88.1/clamd/others.c 2006-04-24 22:53:27.000000000 +0200 +@@ -30,6 +30,7 @@ + #include <sys/stat.h> + #include <errno.h> + #include <sys/time.h> ++#include <sys/wait.h> + + #if HAVE_SYS_PARAM_H + #include <sys/param.h> +@@ -68,6 +69,7 @@ + #include "memory.h" + #include "cfgparser.h" + #include "session.h" ++#include "../shared/output.h" + + #define ENV_FILE "CLAM_VIRUSEVENT_FILENAME" + #define ENV_VIRUS "CLAM_VIRUSEVENT_VIRUSNAME" +--- clamav-0.88.1/shared/misc.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-12-23 22:25:10.000000000 +0100 ++++ clamav-0.88.1/shared/misc.c 2006-04-24 22:53:27.000000000 +0200 +@@ -28,6 +28,7 @@ + #include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> ++#include <ctype.h> + + #include "clamav.h" + #include "cfgparser.h" +--- clamav-0.88.1/freshclam/manager.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-25 18:39:25.000000000 +0100 ++++ clamav-0.88.1/freshclam/manager.c 2006-04-24 22:53:27.000000000 +0200 +@@ -50,6 +50,7 @@ + #include "../libclamav/others.h" + #include "../libclamav/str.h" /* cli_strtok */ + #include "dns.h" ++#include "execute.h" + + + int downloadmanager(const struct cfgstruct *copt, const struct optstruct *opt, const char *hostname) +--- clamav-0.88.1/libclamav/zziplib/zzip-zip.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 01:43:53.000000000 +0200 ++++ clamav-0.88.1/libclamav/zziplib/zzip-zip.c 2006-04-24 22:57:44.000000000 +0200 +@@ -16,6 +16,7 @@ + #endif + + #include "target.h" ++#include "others.h" + + #include <zzip.h> /* archive handling */ + #include <zzip-file.h> +--- clamav-0.88.1/libclamav/scanners.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-04-04 11:32:55.000000000 +0200 ++++ clamav-0.88.1/libclamav/scanners.c 2006-04-24 22:53:27.000000000 +0200 +@@ -69,6 +69,7 @@ extern int cli_mbox(const char *dir, int + #include "untar.h" + #include "special.h" + #include "binhex.h" ++#include "../tnef.h" + + #ifdef HAVE_ZLIB_H + #include <zlib.h> +@@ -378,7 +379,7 @@ static int cli_scanzip(int desc, const c + * Bit 6: Strong encryption was used + * Bit 13: Encrypted central directory + */ +- encrypted = (zdirent.d_flags & 0x2041 != 0); ++ encrypted = (zdirent.d_flags & 0x2041) != 0; + + cli_dbgmsg("Zip: %s, crc32: 0x%x, offset: %d, encrypted: %d, compressed: %u, normal: %u, method: %d, ratio: %d (max: %d)\n", zdirent.d_name, zdirent.d_crc32, zdirent.d_off, encrypted, zdirent.d_csize, zdirent.st_size, zdirent.d_compr, zdirent.d_csize ? (zdirent.st_size / zdirent.d_csize) : 0, limits ? limits->maxratio : 0); + +--- clamav-0.88.1/libclamav/pe.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-28 21:22:02.000000000 +0200 ++++ clamav-0.88.1/libclamav/pe.c 2006-04-24 22:53:27.000000000 +0200 +@@ -1451,7 +1451,7 @@ int cli_peheader(int desc, struct cli_pe + { + uint16_t e_magic; /* DOS signature ("MZ") */ + uint32_t e_lfanew; /* address of new exe header */ +- uint32_t min, max; ++ uint32_t min=0, max=0; + struct pe_image_file_hdr file_hdr; + struct pe_image_optional_hdr optional_hdr; + struct pe_image_section_hdr *section_hdr; +--- clamav-0.88.1/libclamav/htmlnorm.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2006-03-22 19:03:35.000000000 +0100 ++++ clamav-0.88.1/libclamav/htmlnorm.c 2006-04-24 22:53:27.000000000 +0200 +@@ -391,7 +391,7 @@ static int cli_html_normalise(int fd, m_ + { + int fd_tmp, tag_length, tag_arg_length, binary; + int retval=FALSE, escape, value, hex, tag_val_length, table_pos, in_script=FALSE; +- FILE *stream_in; ++ FILE *stream_in = 0; + html_state state=HTML_NORM, next_state=HTML_BAD_STATE; + char filename[1024], tag[HTML_STR_LENGTH+1], tag_arg[HTML_STR_LENGTH+1]; + char tag_val[HTML_STR_LENGTH+1], *tmp_file; +--- clamav-0.88.1/libclamav/special.c.guys,please-read-the-compiler-warnings-before-doing-a-release.patch 2005-06-23 22:03:13.000000000 +0200 ++++ clamav-0.88.1/libclamav/special.c 2006-04-24 22:53:27.000000000 +0200 +@@ -25,6 +25,7 @@ + #include <netinet/in.h> + #include <string.h> + ++#include "special.h" + #include "clamav.h" + #include "others.h" + #include "cltypes.h" diff --git a/clamav-0.88.1-strncpy.patch b/clamav-0.88.1-strncpy.patch new file mode 100644 index 0000000..ceceb7d --- /dev/null +++ b/clamav-0.88.1-strncpy.patch @@ -0,0 +1,26 @@ +2006-04-24 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> + + * libclamav/unrarlib.c/stricomp(): terminate the string copied + with strncpy() explicitly with '\0'. Does not seem to be + exploitable at the moment due to deeply buried constraints + (function will be called for buffers with a static size of + 260 only). + + But it is better to fix it now than to run into problems + when function is used for other purposes. + +--- clamav-0.88.1/libclamav/unrarlib.c.strncpy 2005-06-23 22:03:12.000000000 +0200 ++++ clamav-0.88.1/libclamav/unrarlib.c 2006-04-24 23:10:07.000000000 +0200 +@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2) + char S1[512],S2[512]; + char *chptr; + +- strncpy(S1,Str1,sizeof(S1)); +- strncpy(S2,Str2,sizeof(S2)); ++ strncpy(S1,Str1,sizeof(S1)); ++ strncpy(S2,Str2,sizeof(S2)); ++ S1[sizeof(S1)-1] = '\0'; ++ S2[sizeof(S2)-1] = '\0'; + + while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash */ + { diff --git a/clamav.spec b/clamav.spec index 50dba49..d1894a2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.32 2006/02/18 09:33:59 ensc Exp $ +## $Id: clamav.spec,v 1.33 2006/04/06 16:50:58 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88.1 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -36,6 +36,8 @@ Source5: clamd-README Source6: clamav-update.logrotate Source7: clamd.SERVICE.init Source8: clamav-notify-servers +Patch0: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch +Patch1: clamav-0.88.1-strncpy.patch Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch @@ -162,6 +164,9 @@ THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! %prep %setup -q +%patch0 -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch' +%patch1 -p1 -b .strncpy + %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff @@ -186,6 +191,7 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and ## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 ## also +CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99" %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --disable-zlib-vcheck \ %{!?_without_milter:--enable-milter} @@ -426,6 +432,12 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Mon Apr 24 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-2 +- added patch which fixes some classes of compiler warnings; at least + the using of implicitly declared functions was reported to cause + segfaults on AMD64 (brought to my attention by Marc Perkel) +- added patch which fixes wrong usage of strncpy(3) in unrarlib.c + * Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 - updated to 0.88.1 (SECURITY) commit cf9eaf4edbd86067499e209368d9c64ac576609d Author: ensc <ensc(a)fedoraproject.org> Date: Thu Apr 6 16:50:58 2006 +0000 updated to 0.88.1 (SECURITY) diff --git a/clamav.spec b/clamav.spec index f79ed76..50dba49 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.31 2006/01/09 23:27:46 ensc Exp $ +## $Id: clamav.spec,v 1.32 2006/02/18 09:33:59 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.88 -Release: %release_func 2 +Version: 0.88.1 +Release: %release_func 1 License: GPL Group: Applications/File @@ -426,6 +426,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Thu Apr 06 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88.1-1 +- updated to 0.88.1 (SECURITY) + * Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 - rebuilt for FC5 diff --git a/sources b/sources index 79339ac..2b31a40 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -5d23205673c32e2b1b6db95000e6da74 clamav-0.88.tar.gz -12816c52cf4434f861c1c7faa196361a clamav-0.88.tar.gz.sig +9fe8c47037051e350077513dd94fb76a clamav-0.88.1.tar.gz +bc06324bf070679854689235df5042d8 clamav-0.88.1.tar.gz.sig commit f03dc9cffc7b47746b6a9280dc5169ebdef14b24 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Feb 18 09:33:59 2006 +0000 rebuilt for FC5 diff --git a/clamav.spec b/clamav.spec index b4b1e90..f79ed76 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.30 2005/11/04 12:55:25 ensc Exp $ +## $Id: clamav.spec,v 1.31 2006/01/09 23:27:46 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.88 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -426,6 +426,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sat Feb 18 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-2 +- rebuilt for FC5 + * Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 - updated to 0.88 - added pseudo-versions for the 'init(...)' provides as a first step commit 0a90d8190cc98d4ff5a94b19033e2de3146ab2dd Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jan 9 23:27:46 2006 +0000 - updated to 0.88 - added pseudo-versions for the 'init(...)' provides as a first step for the support of alternative initmethods - moved 'freshclam.conf.5' man page into the -update subpackage (#173221) - ship 'clamd.conf.5' man page in the -server subpackage *too*. The same file is contained in multiple packages now, but this man-page can not be removed from the base package because it also applies to 'clamdscan' there (#173221). diff --git a/clamav.spec b/clamav.spec index 6f1f1c9..b4b1e90 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.29 2005/09/17 09:01:24 ensc Exp $ +## $Id: clamav.spec,v 1.30 2005/11/04 12:55:25 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.87.1 +Version: 0.88 Release: %release_func 1 License: GPL @@ -84,7 +84,7 @@ Conflicts: clamav-daemon > %{version}-%{release} ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) -Provides: init(clamav-server) +Provides: init(clamav-server) = sysv Requires: data(clamav) Requires: clamav-lib = %{version}-%{release} Requires(pre): %_initrddir @@ -96,7 +96,7 @@ Group: System Environment/Daemons ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-milter) -Provides: init(clamav-milter) +Provides: init(clamav-milter) = sysv %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir @@ -348,7 +348,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %{_bindir}/* %exclude %_bindir/clamav-config %exclude %_bindir/freshclam -%exclude %_mandir/man1/freshclam* +%exclude %_mandir/*/freshclam* ## ----------------------- @@ -384,7 +384,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files update %defattr(-,root,root,-) %_bindir/freshclam -%_mandir/man1/freshclam* +%_mandir/*/freshclam* %pkgdatadir/freshclam-sleep %config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf %config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* @@ -398,7 +398,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc %{_mandir}/man8/* +%doc %_mandir/*/clamd* %{_sbindir}/* %_initrddir/clamd-wrapper %dir %pkgdatadir @@ -426,6 +426,18 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Jan 10 2006 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.88-1 +- updated to 0.88 +- added pseudo-versions for the 'init(...)' provides as a first step + for the support of alternative initmethods + +* Tue Nov 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-2 +- moved 'freshclam.conf.5' man page into the -update subpackage (#173221) +- ship 'clamd.conf.5' man page in the -server subpackage *too*. The + same file is contained in multiple packages now, but this man-page + can not be removed from the base package because it also applies to + 'clamdscan' there (#173221). + * Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 - updated to 0.87.1 diff --git a/sources b/sources index e805da2..79339ac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -bf9f038edf0b6d5f76552e1b8d014b81 clamav-0.87.1.tar.gz -4685754c9888f14dfa0bd879002566b3 clamav-0.87.1.tar.gz.sig +5d23205673c32e2b1b6db95000e6da74 clamav-0.88.tar.gz +12816c52cf4434f861c1c7faa196361a clamav-0.88.tar.gz.sig commit 443889f1fbf4fe4134291809fcffe23a7ee7d5e3 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Nov 4 12:56:50 2005 +0000 do not add the '.fdr.' repotag to the generated spec-files diff --git a/clamd-gen b/clamd-gen index cd4c61c..134e149 100755 --- a/clamd-gen +++ b/clamd-gen @@ -27,7 +27,7 @@ $"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> function rpm.generatePreamble() { cat <<EOF -%{!?release_func:%define release_func() 0.fdr.%1} +%{!?release_func:%define release_func() %1%{?dist}} # The name of the minit service %define minitsvcdir %minitdir/services/%name # The configuration file for the SysV initservice commit 3176f3c12c66ec4c869ad579c6bfce7e0829efa7 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Nov 4 12:55:25 2005 +0000 synced with the FC-4 branch diff --git a/clamav.spec b/clamav.spec index ea1f750..6f1f1c9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.28 2005/09/10 11:20:26 dwmw2 Exp $ +## $Id: clamav.spec,v 1.29 2005/09/17 09:01:24 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.87 +Version: 0.87.1 Release: %release_func 1 License: GPL @@ -426,6 +426,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Nov 4 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87.1-1 +- updated to 0.87.1 + * Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 - updated to 0.87 (SECURITY) - removed -timeout patch; it is solved upstream diff --git a/sources b/sources index 617685e..e805da2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -dd0a12deb4f48f760fa1fcd378ae7c24 clamav-0.87.tar.gz -db9c17eec9e05085795b48ba199af895 clamav-0.87.tar.gz.sig +bf9f038edf0b6d5f76552e1b8d014b81 clamav-0.87.1.tar.gz +4685754c9888f14dfa0bd879002566b3 clamav-0.87.1.tar.gz.sig commit ecc95d934504ae863c4f6f37530a35edbb2f82c9 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 09:01:24 2005 +0000 - updated to 0.87 (SECURITY) - removed -timeout patch; it is solved upstream - reverted the -exim changes; they add yet more complexity, their functionality can go into an own package and they contained flaws diff --git a/clamav.spec b/clamav.spec index bd1e8d5..ea1f750 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.26 2005/07/29 16:37:45 ensc Exp $ +## $Id: clamav.spec,v 1.28 2005/09/10 11:20:26 dwmw2 Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -14,9 +14,6 @@ %global milterlog %_var/log/clamd.milter %global milteruser clamilt %global milterstatedir %_var/run/clamav-milter -%global clameximlog %_var/log/clamd.exim -%global clameximuser clamexim -%global clameximstatedir %_var/run/clamd.exim %global pkgdatadir %_datadir/%name @@ -24,14 +21,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.2 -Release: %release_func 5 +Version: 0.87 +Release: %release_func 1 License: GPL Group: Applications/File URL: http://www.clamav.net Source0: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz -#Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… +Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -42,7 +39,6 @@ Source8: clamav-notify-servers Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch -Patch23: clamav-0.86.2-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: clamav-lib = %{version}-%{release} Requires: data(clamav) @@ -110,21 +106,6 @@ Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 -%package exim -Summary: Exim dæmon configuration for the Clam Antivirus scanner -Group: System Environment/Daemons -## For now, use this as a placeholder. Later, generate separate -sysv -## and -minit subpackages -Requires: init(clamav-exim) -Provides: init(clamav-exim) -Requires(pre): exim -Requires(pre): %_initrddir -Requires(postun): %_initrddir initscripts -Requires(post): chkconfig coreutils -Requires(preun): chkconfig initscripts -Requires(pre): fedora-usermgmt >= 0.7 -Requires(postun): fedora-usermgmt >= 0.7 - %description Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this @@ -177,22 +158,6 @@ to your sendmail.mc. THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! -%description exim -This package contains files which are needed to run the clamav dæmon for use -by the Exim MTA. It can be activated by adding - - av_scanner = clamd:%clameximstatedir/clamd.sock - -to your exim.conf, and using the 'malware' condition in the data ACL, -as follows: - - deny message = This message contains malware ($malware_name) - demime = * - malware = * - -For further details of Exim content scanning, see chapter 40 of the Exim -specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html - ## ------------------------------------------------------------ %prep @@ -200,7 +165,6 @@ specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff -%patch23 -p1 -b .timeout perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -260,7 +224,6 @@ function smartsubst() { ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ ${RPM_BUILD_ROOT}%milterstatedir \ - ${RPM_BUILD_ROOT}%clameximstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%{_initrddir} @@ -303,34 +266,15 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -#### The Exim stuff +%if 0%{!?_without_milter:1} +#### The milter stuff function subst() { - sed -e "s!<SERVICE>!$3!g;s!<USER>!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2" + sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } -subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \ - 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive$$\)!\1!;s!^Example!#Example!;' - -subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser '' -chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim -subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser '' - -cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim -CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf' -CLAMD_SOCKET=%clameximstatedir/clamd.sock -EOF - -mkdir -p $RPM_BUILD_ROOT/%clameximstatedir -ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim - -touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog - -%if 0%{!?_without_milter:1} -#### The milter stuff - -subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \ +subst etc/clamd.conf /etc/clamd.d/milter.conf \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' @@ -391,26 +335,6 @@ test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : -%pre exim -/usr/sbin/fedora-useradd 5 -r -s /sbin/nologin -d %clameximstatedir -M \ - -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || : - -%post exim -/sbin/chkconfig --add clamd.exim -test -e %clameximlog || { - touch %clameximlog - chmod 0620 %clameximlog - chown root:exim %clameximlog -} - -%preun exim -test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || : -test "$1" != 0 || /sbin/chkconfig --del clamd.exim - -%postun exim -test "$1" != 0 || /usr/sbin/fedora-userdel %{clameximuser} &>/dev/null || : -test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : - %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -488,19 +412,6 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : ## ----------------------- -%files exim -%defattr(-,root,root,-) -%_sbindir/clamd.exim -%config %{_initrddir}/clamd.exim -%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf -%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim -%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim -%attr(0750,%clameximuser,exim) %dir %clameximstatedir -%ghost %clameximstatedir/* -%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog - -## ----------------------- - %files milter %defattr(-,root,root,-) %doc clamav-milter/INSTALL @@ -515,6 +426,12 @@ test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : %endif # _without_milter %changelog +* Sat Sep 17 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.87-1 +- updated to 0.87 (SECURITY) +- removed -timeout patch; it is solved upstream +- reverted the -exim changes; they add yet more complexity, their + functionality can go into an own package and they contained flaws + * Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 - Add clamav-exim configuration package commit c0efe2d256191354a85f763cad1ec0f4566b7408 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 09:00:16 2005 +0000 version 0.87 diff --git a/sources b/sources index bc5ea4f..617685e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -870de14ba123d6e9cba9850498c49f5d clamav-0.86.2.tar.gz -7d9ffe964a67ee6db157e112203a2678 clamav-0.86.2.tar.gz.sig +dd0a12deb4f48f760fa1fcd378ae7c24 clamav-0.87.tar.gz +db9c17eec9e05085795b48ba199af895 clamav-0.87.tar.gz.sig commit 5ef1a038cf71c098ec58d09769076517442a8b97 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 08:59:16 2005 +0000 fixed typo diff --git a/freshclam.sysconfig b/freshclam.sysconfig index b11e207..94035f8 100644 --- a/freshclam.sysconfig +++ b/freshclam.sysconfig @@ -11,7 +11,7 @@ ## calculated by the 'hostid' program. This predefined value guarantees ## constant timespans of 3 hours between two subsequent freshclam runs. ## -## This options accepts two special values: +## This option accepts two special values: ## 'disabled-warn' ... disables the automatic freshclam update and ## gives out a warning ## 'disabled' ... disables the automatic freshclam silently commit c6699d2e8fb799f2b9253e08627f0f6daaba5cbd Author: ensc <ensc(a)fedoraproject.org> Date: Sat Sep 17 08:58:53 2005 +0000 not needed for 0.87 anymore diff --git a/clamav-0.86.2-timeout.patch b/clamav-0.86.2-timeout.patch deleted file mode 100644 index af252b2..0000000 --- a/clamav-0.86.2-timeout.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout -+++ clamav-0.86.2/clamav-milter/clamav-milter.c -@@ -373,7 +373,7 @@ - static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; - static volatile unsigned int n_children = 0; - static unsigned int max_children = 0; --static int child_timeout = 300; /* number of seconds to wait for -+static int child_timeout = 0; /* number of seconds to wait for - * a child to die. Set to 0 to - * wait forever - */ commit d22637741f46aba02b802c3c9ad31db456cf87e1 Author: David Woodhouse <dwmw2(a)fedoraproject.org> Date: Sat Sep 10 11:20:26 2005 +0000 add clamav-exim subpackage diff --git a/clamav.spec b/clamav.spec index 062897b..bd1e8d5 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.26 2005/07/28 15:35:10 ensc Exp $ +## $Id: clamav.spec,v 1.26 2005/07/29 16:37:45 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -14,6 +14,9 @@ %global milterlog %_var/log/clamd.milter %global milteruser clamilt %global milterstatedir %_var/run/clamav-milter +%global clameximlog %_var/log/clamd.exim +%global clameximuser clamexim +%global clameximstatedir %_var/run/clamd.exim %global pkgdatadir %_datadir/%name @@ -22,7 +25,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 4 +Release: %release_func 5 License: GPL Group: Applications/File @@ -107,6 +110,21 @@ Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 +%package exim +Summary: Exim dæmon configuration for the Clam Antivirus scanner +Group: System Environment/Daemons +## For now, use this as a placeholder. Later, generate separate -sysv +## and -minit subpackages +Requires: init(clamav-exim) +Provides: init(clamav-exim) +Requires(pre): exim +Requires(pre): %_initrddir +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts +Requires(pre): fedora-usermgmt >= 0.7 +Requires(postun): fedora-usermgmt >= 0.7 + %description Clam AntiVirus is an anti-virus toolkit for UNIX. The main purpose of this @@ -159,6 +177,22 @@ to your sendmail.mc. THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! +%description exim +This package contains files which are needed to run the clamav dæmon for use +by the Exim MTA. It can be activated by adding + + av_scanner = clamd:%clameximstatedir/clamd.sock + +to your exim.conf, and using the 'malware' condition in the data ACL, +as follows: + + deny message = This message contains malware ($malware_name) + demime = * + malware = * + +For further details of Exim content scanning, see chapter 40 of the Exim +specification: http://www.exim.org/exim-html-4.50/doc/html/spec_40.html + ## ------------------------------------------------------------ %prep @@ -226,6 +260,7 @@ function smartsubst() { ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ ${RPM_BUILD_ROOT}%milterstatedir \ + ${RPM_BUILD_ROOT}%clameximstatedir \ ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%{_initrddir} @@ -268,15 +303,34 @@ smartsubst 's!webmaster,clamav!webmaster,%username!g; $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -%if 0%{!?_without_milter:1} -#### The milter stuff +#### The Exim stuff function subst() { - sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" + sed -e "s!<SERVICE>!$3!g;s!<USER>!$4!g;""$5" "$1" >"$RPM_BUILD_ROOT$2" } +subst etc/clamd.conf %_sysconfdir/clamd.d/exim.conf exim %clameximuser \ + 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail\|LogTime\|ScanArchive$$\)!\1!;s!^Example!#Example!;' + -subst etc/clamd.conf /etc/clamd.d/milter.conf \ +subst %{SOURCE7} %_initrddir/clamd.exim exim %clameximuser '' +chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.exim +subst %{SOURCE3} %_sysconfdir/logrotate.d/clamd.exim exim %clameximuser '' + +cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamd.exim +CLAMD_CONFIG='%_sysconfdir/clamd.d/exim.conf' +CLAMD_SOCKET=%clameximstatedir/clamd.sock +EOF + +mkdir -p $RPM_BUILD_ROOT/%clameximstatedir +ln -sf clamd $RPM_BUILD_ROOT%_sbindir/clamd.exim + +touch $RPM_BUILD_ROOT%clameximstatedir/clamd.sock $RPM_BUILD_ROOT%clameximlog + +%if 0%{!?_without_milter:1} +#### The milter stuff + +subst etc/clamd.conf /etc/clamd.d/milter.conf milter %milteruser \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' @@ -337,6 +391,26 @@ test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : +%pre exim +/usr/sbin/fedora-useradd 5 -r -s /sbin/nologin -d %clameximstatedir -M \ + -c 'Clamav Exim User' -g exim %clameximuser &>/dev/null || : + +%post exim +/sbin/chkconfig --add clamd.exim +test -e %clameximlog || { + touch %clameximlog + chmod 0620 %clameximlog + chown root:exim %clameximlog +} + +%preun exim +test "$1" != 0 || %{_initrddir}/clamd.exim stop &>/dev/null || : +test "$1" != 0 || /sbin/chkconfig --del clamd.exim + +%postun exim +test "$1" != 0 || /usr/sbin/fedora-userdel %{clameximuser} &>/dev/null || : +test "$1" = 0 || %{_initrddir}/clamd.exim condrestart >/dev/null || : + %post lib -p /sbin/ldconfig %postun lib -p /sbin/ldconfig @@ -414,6 +488,19 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : ## ----------------------- +%files exim +%defattr(-,root,root,-) +%_sbindir/clamd.exim +%config %{_initrddir}/clamd.exim +%config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/exim.conf +%config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamd.exim +%config(noreplace) %verify(not mtime) %{_sysconfdir}/logrotate.d/clamd.exim +%attr(0750,%clameximuser,exim) %dir %clameximstatedir +%ghost %clameximstatedir/* +%ghost %attr(0620,root,exim) %verify(not size md5 mtime) %clameximlog + +## ----------------------- + %files milter %defattr(-,root,root,-) %doc clamav-milter/INSTALL @@ -428,6 +515,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Sep 9 2005 David Woodhouse <dwmw2(a)infradead.org> - 0.86.2-5 +- Add clamav-exim configuration package + * Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 - [milter] create the milter-logfile in the %%post scriptlet - [milter] reverted the change of the default child_timeout value; it commit 5f98a1413790fce863ee762488f2070c1997b221 Author: ensc <ensc(a)fedoraproject.org> Date: Fri Jul 29 16:29:09 2005 +0000 - [milter] create the milter-logfile in the %%post scriptlet - [milter] reverted the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration diff --git a/clamav.spec b/clamav.spec index 4f5ffb9..062897b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.25 2005/07/25 17:56:56 ensc Exp $ +## $Id: clamav.spec,v 1.26 2005/07/28 15:35:10 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -39,6 +39,7 @@ Source8: clamav-notify-servers Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch +Patch23: clamav-0.86.2-timeout.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: clamav-lib = %{version}-%{release} Requires: data(clamav) @@ -100,11 +101,9 @@ Provides: init(clamav-milter) %{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir -Requires(postun): %_initrddir -Requires(post): chkconfig -Requires(preun): chkconfig -Requires(preun): initscripts -Requires(postun): initscripts +Requires(postun): %_initrddir initscripts +Requires(post): chkconfig coreutils +Requires(preun): chkconfig initscripts Requires(pre): fedora-usermgmt >= 0.7 Requires(postun): fedora-usermgmt >= 0.7 @@ -167,6 +166,7 @@ THIS PACKAGE IS TO BE CONSIDERED AS EXPERIMENTAL! %patch20 -p1 -b .user %patch21 -p1 -b .path %patch22 -p1 -b .initoff +%patch23 -p1 -b .timeout perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(LocalSocket ).*!\1/var/run/clamd.<SERVICE>/clamd.sock!g; @@ -177,6 +177,7 @@ perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf + ## ------------------------------------------------------------ %build @@ -321,6 +322,11 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : %post milter /sbin/chkconfig --add clamav-milter +test -e %milterlog || { + touch %milterlog + chmod 0620 %milterlog + chown root:%milteruser %milterlog +} %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : @@ -422,6 +428,13 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Jul 29 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-4 +- [milter] create the milter-logfile in the %%post scriptlet +- [milter] reverted the change of the default child_timeout value; it + was set to 5 minutes in 0.86.2 which conflicts with the internal + mode where a timeout must not be set. So, the clamav-milter would + not run with the default configuration + * Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash commit fcb173893df176fd8469eb974cd6d75a3e4221bb Author: ensc <ensc(a)fedoraproject.org> Date: Fri Jul 29 16:28:05 2005 +0000 this patch reverts the change of the default child_timeout value; it was set to 5 minutes in 0.86.2 which conflicts with the internal mode where a timeout must not be set. So, the clamav-milter would not run with the default configuration diff --git a/clamav-0.86.2-timeout.patch b/clamav-0.86.2-timeout.patch new file mode 100644 index 0000000..af252b2 --- /dev/null +++ b/clamav-0.86.2-timeout.patch @@ -0,0 +1,11 @@ +--- clamav-0.86.2/clamav-milter/clamav-milter.c.timeout ++++ clamav-0.86.2/clamav-milter/clamav-milter.c +@@ -373,7 +373,7 @@ + static pthread_cond_t n_children_cond = PTHREAD_COND_INITIALIZER; + static volatile unsigned int n_children = 0; + static unsigned int max_children = 0; +-static int child_timeout = 300; /* number of seconds to wait for ++static int child_timeout = 0; /* number of seconds to wait for + * a child to die. Set to 0 to + * wait forever + */ commit 4c5e9e7ce3164112e9887d2671af41eca4323dff Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 28 15:35:10 2005 +0000 - Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash modulo-operation. So the sleep may get a negative number of seconds being interpreted as an option. This version makes sure that the module-operations returns a non-negative value. [BZ #164494, James Wilkinson] - added support for a /usr/sbin/clamav-notify-servers.local hook; this file will be executed (source'd) before all other actions and can abort the entire processing by invoking 'exit' diff --git a/clamav.spec b/clamav.spec index 554754c..4f5ffb9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.24 2005/07/25 17:19:21 ensc Exp $ +## $Id: clamav.spec,v 1.25 2005/07/25 17:56:56 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -422,6 +422,17 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Thu Jul 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-3 +- Fixed calculation of sleep duration; on some systems/IPs, `hostid` + results in a negative number which is retained by the bash + modulo-operation. So the sleep may get a negative number of seconds + being interpreted as an option. This version makes sure that the + module-operations returns a non-negative value. [BZ #164494, James + Wilkinson] +- added support for a /usr/sbin/clamav-notify-servers.local hook; this + file will be executed (source'd) before all other actions and can + abort the entire processing by invoking 'exit' + * Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists commit fe1f906f7a698666d2c19ef36d4966805a2b9c28 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 28 12:10:28 2005 +0000 added support for a /usr/sbin/clamav-notify-servers.local hook; this file will be executed (source'd) before all other actions and can abort the entire processing by invoking 'exit' diff --git a/clamav-notify-servers b/clamav-notify-servers index 11b443d..22d57a6 100644 --- a/clamav-notify-servers +++ b/clamav-notify-servers @@ -23,6 +23,9 @@ INITRDDIR=/etc/init.d ok=1 +f=/usr/sbin/clamav-notify-servers.local +test ! -e "$f" || . "$f" + for i in ${BASE}*; do test -e "$i" || continue commit 21bb824bafe08936866df1e56aa02c535f4bfaa4 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Jul 28 12:06:36 2005 +0000 Fixed calculation of sleep duration; on some systems/IPs, `hostid` results in a negative number which is retained by the bash modulo-operation. So the sleep may get a negative number of seconds being interpreted as an option. This version makes sure that the module-operations returns a non-negative value. [BZ #164494, James Wilkinson] diff --git a/freshclam-sleep b/freshclam-sleep index 25c3067..2cb6bb2 100755 --- a/freshclam-sleep +++ b/freshclam-sleep @@ -44,7 +44,8 @@ WARNING: update of clamav database is disabled; please see ;; (*) - sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + let FRESHCLAM_MOD*=60 + sleep $[ (FRESHCLAM_DELAY % FRESHCLAM_MOD + FRESHCLAM_MOD) % FRESHCLAM_MOD ] ;; esac commit 07f7b7b9b355cbfd2f4c1bf8cf1b82bb8d15977d Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:56:56 2005 +0000 bump release: to fix broken cvs tags diff --git a/clamav.spec b/clamav.spec index 41a4731..554754c 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.23 2005/06/25 18:01:32 ensc Exp $ +## $Id: clamav.spec,v 1.24 2005/07/25 17:19:21 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.86.2 -Release: %release_func 1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -422,7 +422,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-1 +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-2 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists of a crontab which does not need to be changed and a helper script commit 34ee90c2defad8af819b7da7d889179c6e4b5d4c Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:19:38 2005 +0000 version 0.86.2 diff --git a/sources b/sources index a1edad3..bc5ea4f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -df7116898cdd80ce56721a91e9cff206 clamav-0.86.1.tar.gz -dd5b89f732f84112207843748df5218c clamav-0.86.1.tar.gz.sig +870de14ba123d6e9cba9850498c49f5d clamav-0.86.2.tar.gz +7d9ffe964a67ee6db157e112203a2678 clamav-0.86.2.tar.gz.sig commit e5f388088b24008eefc97b54c51511b210391408 Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:19:21 2005 +0000 - updated to 0.86.2 (SECURITY) - changed the freshclam updating mechanism (again); now, it consists of a crontab which does not need to be changed and a helper script (freshclam-sleep). This helper script is configured by /etc/sysconfig/freshclam diff --git a/clamav.spec b/clamav.spec index 1912e3b..41a4731 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.22 2005/06/25 17:38:35 ensc Exp $ +## $Id: clamav.spec,v 1.23 2005/06/25 18:01:32 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.1 -Release: %release_func 2 +Version: 0.86.2 +Release: %release_func 1 License: GPL Group: Applications/File @@ -67,10 +67,13 @@ Requires(postun): fedora-usermgmt >= 0.7 %package update Summary: Auto-updater for the Clam Antivirus scanner data-files Group: Applications/File +Source200: freshclam-sleep +Source201: freshclam.sysconfig +Source202: clamav-update.cron Requires: clamav-data = %{version}-%{release} Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d -Requires(post): %__chown %__chmod %__sed diffutils +Requires(post): %__chown %__chmod %package server Summary: Clam Antivirus scanner server @@ -204,6 +207,20 @@ perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; rm -rf "$RPM_BUILD_ROOT" _doc* %{__make} DESTDIR="$RPM_BUILD_ROOT" install +function smartsubst() { + local tmp + local regexp=$1 + shift + + tmp=$(mktemp /tmp/%name-subst.XXXXXX) + for i; do + sed -e "$regexp" "$i" >$tmp + cmp -s $tmp "$i" || cat $tmp >"$i" + rm -f $tmp + done +} + + %{__install} -d -m755 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ @@ -230,10 +247,7 @@ mkdir _doc_server cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper -f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper -sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp -cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f" -rm -f "$f".tmp +smartsubst 's!/usr/share/clamav!%pkgdatadir!g' $RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper ## prepare the update-files @@ -241,17 +255,17 @@ rm -f "$f".tmp %{__install} -m755 -p %{SOURCE8} ${RPM_BUILD_ROOT}%{_sbindir}/clamav-notify-servers touch ${RPM_BUILD_ROOT}%{freshclamlog} -cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF" -## Adjust this line... -MAILTO=root,postmaster,webmaster,%username +%__install -p -m0755 %SOURCE200 $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep +%__install -p -m0644 %SOURCE201 $RPM_BUILD_ROOT%_sysconfdir/sysconfig/freshclam +%__install -p -m0600 %SOURCE202 $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update -## It is ok to execute it as root; freshclam drops privileges and becomes -## user 'clamav' as soon as possible -# @MIN@ @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } +smartsubst 's!webmaster,clamav!webmaster,%username!g; + s!/usr/share/clamav!%pkgdatadir!g; + s!/usr/bin!%_bindir!g; + s!/usr/sbin!%_sbindir!g;' \ + $RPM_BUILD_ROOT%_sysconfdir/cron.d/clamav-update \ + $RPM_BUILD_ROOT%pkgdatadir/freshclam-sleep -## Comment out or remove this line... -1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2' -EOF %if 0%{!?_without_milter:1} #### The milter stuff @@ -260,6 +274,7 @@ function subst() { sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } + subst etc/clamd.conf /etc/clamd.d/milter.conf \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' @@ -295,15 +310,6 @@ test -e %{freshclamlog} || { %{__chown} root:%{username} %{freshclamlog} } -min=$[ RANDOM % 60 ] -hour=$[ RANDOM % 3 ] -tmp=$(mktemp /tmp/freshclam-cron.XXXXXX) -src=%_sysconfdir/cron.d/clamav-update -%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp -cmp -s $tmp "$src" || cat "$tmp" >"$src" -rm -f $tmp - - %postun data test "$1" != 0 || /usr/sbin/fedora-userdel %{username} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : @@ -375,9 +381,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %_bindir/freshclam %_mandir/man1/freshclam* -%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/* -%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%pkgdatadir/freshclam-sleep +%config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* +%config(noreplace) %_sysconfdir/cron.d/* +%config(noreplace) %_sysconfdir/sysconfig/freshclam %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog} @@ -414,6 +422,13 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Mon Jul 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.2-1 +- updated to 0.86.2 (SECURITY) +- changed the freshclam updating mechanism (again); now, it consists + of a crontab which does not need to be changed and a helper script + (freshclam-sleep). This helper script is configured by + /etc/sysconfig/freshclam + * Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 - updated to 0.86.1 - fixed randomization in %%post scriptlet: hour should be a range but commit 0ce16b40647c3f3f4f93b06e371b9c2aa6d0160b Author: ensc <ensc(a)fedoraproject.org> Date: Mon Jul 25 17:17:06 2005 +0000 initial checkin diff --git a/clamav-update.cron b/clamav-update.cron new file mode 100644 index 0000000..3f1b005 --- /dev/null +++ b/clamav-update.cron @@ -0,0 +1,6 @@ +## Adjust this line... +MAILTO=root,postmaster,webmaster,clamav + +## It is ok to execute it as root; freshclam drops privileges and becomes +## user 'clamav' as soon as possible +0 */3 * * * root /usr/share/clamav/freshclam-sleep diff --git a/freshclam-sleep b/freshclam-sleep new file mode 100755 index 0000000..25c3067 --- /dev/null +++ b/freshclam-sleep @@ -0,0 +1,56 @@ +#! /bin/bash +# Copyright (C) 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + + +FRESHCLAM_MOD=$[ 3*60 ] # 3 hours + +f=/etc/sysconfig/freshclam +test ! -e "$f" || . "$f" + + +case x"$1" in + (xnow) FRESHCLAM_DELAY=0;; + (x|xrandom) : ${FRESHCLAM_DELAY:=$[ 0x`hostid` ]};; + (*) FRESHCLAM_DELAY=$1;; +esac + +set -e + +case $FRESHCLAM_DELAY in + (disabled-warn) + echo $"\ +WARNING: update of clamav database is disabled; please see + '$f' + for information how to enable the periodic update resp. how to turn + off this message." >&2 + exit 1 + ;; + + (disabled) + exit 0 + ;; + + (*) + sleep $[ FRESHCLAM_DELAY % (FRESHCLAM_MOD*60) ] + ;; +esac + + +/usr/bin/freshclam --quiet && { + test -x /usr/sbin/clamav-notify-servers && \ + exec /usr/sbin/clamav-notify-servers || \ + : +} diff --git a/freshclam.sysconfig b/freshclam.sysconfig new file mode 100644 index 0000000..b11e207 --- /dev/null +++ b/freshclam.sysconfig @@ -0,0 +1,24 @@ +## When changing the periodicity of freshclam runs in the crontab, +## this value must be adjusted also. Its value is the timespan between +## two subsequent freshclam runs in minutes. E.g. for the default +## +## | 0 */3 * * * ... +## +## crontab line, the value is 180 (minutes). +# FRESHCLAM_MOD= + +## A predefined value for the delay in seconds. By default, the value is +## calculated by the 'hostid' program. This predefined value guarantees +## constant timespans of 3 hours between two subsequent freshclam runs. +## +## This options accepts two special values: +## 'disabled-warn' ... disables the automatic freshclam update and +## gives out a warning +## 'disabled' ... disables the automatic freshclam silently +# FRESHCLAM_DELAY= + + +### !!!!! REMOVE ME !!!!!! +### REMOVE ME: By default, the freshclam update is disabled to avoid +### REMOVE ME: network access without prior activation +FRESHCLAM_DELAY=disabled-warn # REMOVE ME commit a5bcab3926635c345dcd6c6522c1d8b5320fcc24 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 18:01:32 2005 +0000 sometime I should learn the difference between Release: and Version:... diff --git a/clamav.spec b/clamav.spec index 470ecee..1912e3b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.21 2005/06/25 17:25:50 ensc Exp $ +## $Id: clamav.spec,v 1.22 2005/06/25 17:38:35 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.2 -Release: %release_func 1 +Version: 0.86.1 +Release: %release_func 2 License: GPL Group: Applications/File commit fd1ada700391ea4328061dc708216465cdcec922 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 17:38:35 2005 +0000 increased release due a failed previous 'make tag'... diff --git a/clamav.spec b/clamav.spec index e0c1f8b..470ecee 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.20 2005/06/21 07:25:56 ensc Exp $ +## $Id: clamav.spec,v 1.21 2005/06/25 17:25:50 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86.1 +Version: 0.86.2 Release: %release_func 1 License: GPL @@ -414,7 +414,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-1 +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-2 - updated to 0.86.1 - fixed randomization in %%post scriptlet: hour should be a range but not a single number commit 6162ba3c1464a8297fbad160a722c8f8da129fa5 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 17:35:47 2005 +0000 version 0.86.1 diff --git a/sources b/sources index 7072f09..a1edad3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1c886e4f4f4c3e4e76250b7b52c000b4 clamav-0.86.tar.gz -57948dbd3a9093265fe0ac4abd40c4c2 clamav-0.86.tar.gz.sig +df7116898cdd80ce56721a91e9cff206 clamav-0.86.1.tar.gz +dd5b89f732f84112207843748df5218c clamav-0.86.1.tar.gz.sig commit 48f46c14d083d743d84498f1423071a20a20c1c6 Author: ensc <ensc(a)fedoraproject.org> Date: Sat Jun 25 17:25:50 2005 +0000 - updated to 0.86.1 - fixed randomization in %%post scriptlet: hour should be a range but not a single number diff --git a/clamav.spec b/clamav.spec index 85a12fa..e0c1f8b 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.19 2005/05/19 07:45:09 wtogami Exp $ +## $Id: clamav.spec,v 1.20 2005/06/21 07:25:56 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.86 +Version: 0.86.1 Release: %release_func 1 License: GPL @@ -296,10 +296,10 @@ test -e %{freshclamlog} || { } min=$[ RANDOM % 60 ] -hour=$[ RANDOM % 24 ] +hour=$[ RANDOM % 3 ] tmp=$(mktemp /tmp/freshclam-cron.XXXXXX) src=%_sysconfdir/cron.d/clamav-update -%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour!g" "$src" >$tmp +%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour-23!g" "$src" >$tmp cmp -s $tmp "$src" || cat "$tmp" >"$src" rm -f $tmp @@ -414,6 +414,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sat Jun 25 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86.1-1 +- updated to 0.86.1 +- fixed randomization in %%post scriptlet: hour should be a range but + not a single number + * Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 - updated to 0.86 - randomize freshclam startup times in -update's %%post script (suggested commit 013c2bcebdca8d5314618be86e1d25bfb7b5f7c5 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 21 07:27:20 2005 +0000 version 0.86 diff --git a/sources b/sources index 07ebabb..7072f09 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -b0675c3273785d61eefc1afa304745c0 clamav-0.85.1.tar.gz -a7472bf7044adf4b21be39d7b93360f0 clamav-0.85.1.tar.gz.sig +1c886e4f4f4c3e4e76250b7b52c000b4 clamav-0.86.tar.gz +57948dbd3a9093265fe0ac4abd40c4c2 clamav-0.86.tar.gz.sig commit ea2eaf4e94d18b4d33adfb704dae91416e79d25d Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 21 07:26:54 2005 +0000 typo diff --git a/clamd-README b/clamd-README index d717d39..e62b487 100644 --- a/clamd-README +++ b/clamd-README @@ -3,7 +3,7 @@ modify/copy them in the suggested way: clamd.conf: * set LogFile, PidFile, LocalSocket and User to suitable values - * place this file into /etc/clamd.d with a unique service-name; + * place this file into /etc/clamd.d with an unique service-name; e.g. as /etc/clamd.d/<SERVICE>.conf To make logfile rotation work properly, the LogFile should be commit 2d2f85be2fe304db356a1b949fef42644e9e2d71 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Jun 21 07:25:56 2005 +0000 - updated to 0.86 - randomize freshclam startup times in -update's %%post script (suggested by Stephen Smoogen); this requires some more Requires(post): also diff --git a/clamav.spec b/clamav.spec index 6a711cf..85a12fa 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.18 2005/05/19 07:41:38 wtogami Exp $ +## $Id: clamav.spec,v 1.19 2005/05/19 07:45:09 wtogami Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.85.1 -Release: %release_func 4 +Version: 0.86 +Release: %release_func 1 License: GPL Group: Applications/File @@ -70,7 +70,7 @@ Group: Applications/File Requires: clamav-data = %{version}-%{release} Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d -Requires(post): %{__chown} %{__chmod} +Requires(post): %__chown %__chmod %__sed diffutils %package server Summary: Clam Antivirus scanner server @@ -247,8 +247,7 @@ MAILTO=root,postmaster,webmaster,%username ## It is ok to execute it as root; freshclam drops privileges and becomes ## user 'clamav' as soon as possible -## Note: replace 'MIN' and 'HOUR' with random values -# MIN HOUR/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } +# @MIN@ @HOUR@/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } ## Comment out or remove this line... 1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2' @@ -296,6 +295,15 @@ test -e %{freshclamlog} || { %{__chown} root:%{username} %{freshclamlog} } +min=$[ RANDOM % 60 ] +hour=$[ RANDOM % 24 ] +tmp=$(mktemp /tmp/freshclam-cron.XXXXXX) +src=%_sysconfdir/cron.d/clamav-update +%__sed -e "s!@MIN@!$min!g;s!@HOUR@!$hour!g" "$src" >$tmp +cmp -s $tmp "$src" || cat "$tmp" >"$src" +rm -f $tmp + + %postun data test "$1" != 0 || /usr/sbin/fedora-userdel %{username} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : @@ -406,6 +414,11 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Jun 21 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.86-1 +- updated to 0.86 +- randomize freshclam startup times in -update's %%post script (suggested + by Stephen Smoogen); this requires some more Requires(post): also + * Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 - fix dist tagging the way Enrico wants it commit aaf71503391ab41e52637beec651d1aef92ec69c Author: ensc <ensc(a)fedoraproject.org> Date: Thu May 19 17:16:39 2005 +0000 reverted last changes diff --git a/.cvsignore b/.cvsignore index 1c1caee..f6ee3be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -clamav-0.85.1.tar.gz -clamav-0.85.1.tar.gz.sig +clamav-*.tar.gz* +clamav-*.*.rpm commit a7b6ed15124250eb324aee28c1402070655c1fda Author: Warren Togami <wtogami(a)fedoraproject.org> Date: Thu May 19 07:45:09 2005 +0000 bump because I screwed up the last tag diff --git a/clamav.spec b/clamav.spec index 524a1ec..6a711cf 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.17 2005/05/19 07:35:49 wtogami Exp $ +## $Id: clamav.spec,v 1.18 2005/05/19 07:41:38 wtogami Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.85.1 -Release: %release_func 3 +Release: %release_func 4 License: GPL Group: Applications/File @@ -406,7 +406,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-3 +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-4 - fix dist tagging the way Enrico wants it * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 commit 6179079faec83bfe1430ed6a9cb2e3c446a6fd65 Author: Warren Togami <wtogami(a)fedoraproject.org> Date: Thu May 19 07:41:38 2005 +0000 fix typo diff --git a/clamav.spec b/clamav.spec index 7aea152..524a1ec 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.16 2005/05/19 06:27:21 oliver Exp $ +## $Id: clamav.spec,v 1.17 2005/05/19 07:35:49 wtogami Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -406,7 +406,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85-3 +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85.1-3 - fix dist tagging the way Enrico wants it * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 commit d52962c3c636ac4dd1f4ec8737bc335b042c91c1 Author: Warren Togami <wtogami(a)fedoraproject.org> Date: Thu May 19 07:35:49 2005 +0000 fix dist tagging the way Enrico wants it diff --git a/clamav.spec b/clamav.spec index a1bb51d..7aea152 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.15 2005/05/17 06:41:27 oliver Exp $ +## $Id: clamav.spec,v 1.16 2005/05/19 06:27:21 oliver Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -17,12 +17,12 @@ %global pkgdatadir %_datadir/%name -%{!?release_func:%global release_func() %1} +%{!?release_func:%global release_func() %1%{?dist}} Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.85.1 -Release: %release_func 2 +Release: %release_func 3 License: GPL Group: Applications/File @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Wed May 18 2005 Warren Togami <wtogami(a)redhat.com> - 0.85-3 +- fix dist tagging the way Enrico wants it + * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 - Rebuild commit ec3e79546b429dd62f3b30ebe80a65e903e382fc Author: Oliver Falk <oliver(a)fedoraproject.org> Date: Thu May 19 06:27:21 2005 +0000 As the release version (2) was wrong (typo), I force a rebuild. Sorry. diff --git a/clamav.spec b/clamav.spec index 3836e02..a1bb51d 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.14 2005/05/14 08:56:12 ensc Exp $ +## $Id: clamav.spec,v 1.15 2005/05/17 06:41:27 oliver Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-2 +- Rebuild + * Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 - Update commit bd5c6a1fc262f757a40fc1ed921092d6963ccc37 Author: Oliver Falk <oliver(a)fedoraproject.org> Date: Tue May 17 06:41:27 2005 +0000 Update from 0.85 to 0.85.1 diff --git a/.cvsignore b/.cvsignore index f6ee3be..1c1caee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -clamav-*.tar.gz* -clamav-*.*.rpm +clamav-0.85.1.tar.gz +clamav-0.85.1.tar.gz.sig diff --git a/clamav.spec b/clamav.spec index a78ed2d..3836e02 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id: clamav.spec,v 1.11 2005/03/29 23:52:48 ensc Exp $ +## $Id: clamav.spec,v 1.14 2005/05/14 08:56:12 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.85 -Release: %release_func 1 +Version: 0.85.1 +Release: %release_func 2 License: GPL Group: Applications/File @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue May 17 2005 Oliver Falk <oliver(a)linux-kernel.at> - 0.85.1-1 +- Update + * Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 - updated to 0.85 diff --git a/sources b/sources index dac75a1..07ebabb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -938952faec9f4deffe2c0f6772d64b97 clamav-0.85.tar.gz.sig -b6bf9b04d69b4e9cf917beca99d8169a clamav-0.85.tar.gz +b0675c3273785d61eefc1afa304745c0 clamav-0.85.1.tar.gz +a7472bf7044adf4b21be39d7b93360f0 clamav-0.85.1.tar.gz.sig commit 031b1c0a071352a41e2926767140d9ea4f7e1e22 Author: ensc <ensc(a)fedoraproject.org> Date: Sat May 14 08:56:12 2005 +0000 version 0.85 diff --git a/clamav.spec b/clamav.spec index 9e01022..a78ed2d 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,8 +21,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.84 -Release: %release_func 0 +Version: 0.85 +Release: %release_func 1 License: GPL Group: Applications/File @@ -406,7 +406,10 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog -* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84 +* Sat May 14 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.85-0 +- updated to 0.85 + +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84-0 - updated to 0.84 * Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> diff --git a/sources b/sources index 13ee400..dac75a1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4c89908cc3e8ea7684bbea4cfeae025a clamav-0.84.tar.gz.sig -c43213da01d510faf117daa9a4d5326c clamav-0.84.tar.gz +938952faec9f4deffe2c0f6772d64b97 clamav-0.85.tar.gz.sig +b6bf9b04d69b4e9cf917beca99d8169a clamav-0.85.tar.gz commit 71de95e1ff2a117bd20ac64220229bc5fd2b6646 Author: ensc <ensc(a)fedoraproject.org> Date: Sun May 1 11:03:39 2005 +0000 version 0.84 diff --git a/clamav.spec b/clamav.spec index f361b89..9e01022 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,14 +21,14 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.83 -Release: %release_func 2 +Version: 0.84 +Release: %release_func 0 License: GPL Group: Applications/File URL: http://www.clamav.net Source0: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.gz -Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… +#Source999: http://download.sourceforge.net/sourceforge/clamav/%{name}-%{version}.tar.g… Source1: clamd-wrapper Source2: clamd.sysconfig Source3: clamd.logrotate @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Sun May 1 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0.84 +- updated to 0.84 + * Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - rebuilt diff --git a/sources b/sources index e519735..13ee400 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e3a1b6bbda8095c5aae4eb7bc753804c clamav-0.83.tar.gz -8bd9bb753a1f0cceb588f96dd0f002ab clamav-0.83.tar.gz.sig +4c89908cc3e8ea7684bbea4cfeae025a clamav-0.84.tar.gz.sig +c43213da01d510faf117daa9a4d5326c clamav-0.84.tar.gz commit 4d6873538bda3dae621909346d49ae09b3a2746e Author: Michael Schwendt <mschwendt(a)fedoraproject.org> Date: Wed Apr 6 22:11:35 2005 +0000 mass release bump for packages not rebuilt after FC-3-split diff --git a/clamav.spec b/clamav.spec index 9f404d8..f361b89 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,4 +1,4 @@ -## $Id$ +## $Id: clamav.spec,v 1.11 2005/03/29 23:52:48 ensc Exp $ ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage @@ -22,7 +22,8 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.83 -Release: %release_func 1 +Release: %release_func 2 + License: GPL Group: Applications/File URL: http://www.clamav.net @@ -405,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> +- rebuilt + * Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 - updated to 0.83 commit a71f8e3289baf0878ecfe9eb04fdb06d8364613a Author: ensc <ensc(a)fedoraproject.org> Date: Tue Mar 29 23:52:48 2005 +0000 use %global instead of %define diff --git a/clamav.spec b/clamav.spec index 7c3a1e9..9f404d8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -8,16 +8,16 @@ ## -%define username clamav -%define homedir %_var/lib/clamav -%define freshclamlog %_var/log/freshclam.log -%define milterlog %_var/log/clamd.milter -%define milteruser clamilt -%define milterstatedir %_var/run/clamav-milter -%define pkgdatadir %_datadir/%name +%global username clamav +%global homedir %_var/lib/clamav +%global freshclamlog %_var/log/freshclam.log +%global milterlog %_var/log/clamd.milter +%global milteruser clamilt +%global milterstatedir %_var/run/clamav-milter +%global pkgdatadir %_datadir/%name -%{!?release_func:%define release_func() %1} +%{!?release_func:%global release_func() %1} Summary: End-user tools for the Clam Antivirus scanner Name: clamav commit f8eda023689b189f1760424a2c68acdbec99c166 Author: Michael Schwendt <mschwendt(a)fedoraproject.org> Date: Thu Mar 3 21:23:41 2005 +0000 *** empty log message *** diff --git a/clamav.spec b/clamav.spec index 62358d0..7c3a1e9 100644 --- a/clamav.spec +++ b/clamav.spec @@ -60,8 +60,8 @@ Requires(pre): %_libdir/pkgconfig Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File Provides: data(clamav) -Requires(pre): fedora-usermgmt >= 0:0.7 -Requires(postun): fedora-usermgmt >= 0:0.7 +Requires(pre): fedora-usermgmt >= 0.7 +Requires(postun): fedora-usermgmt >= 0.7 %package update Summary: Auto-updater for the Clam Antivirus scanner data-files @@ -101,8 +101,8 @@ Requires(post): chkconfig Requires(preun): chkconfig Requires(preun): initscripts Requires(postun): initscripts -Requires(pre): fedora-usermgmt >= 0:0.7 -Requires(postun): fedora-usermgmt >= 0:0.7 +Requires(pre): fedora-usermgmt >= 0.7 +Requires(postun): fedora-usermgmt >= 0.7 %description commit 4563bd9bb7150614176e76b4e3d344c773ce9550 Author: Matthias Saou <thias(a)fedoraproject.org> Date: Thu Mar 3 20:08:36 2005 +0000 Mass letter "c" update, one or more apply : - Drop epoch: 0 - Remove %{epoch} requirements in sub-packages - Remove trailing white spaces - Keep consistent between spaces and tabs diff --git a/clamav.spec b/clamav.spec index 8a0ed30..62358d0 100644 --- a/clamav.spec +++ b/clamav.spec @@ -23,7 +23,6 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.83 Release: %release_func 1 -Epoch: 0 License: GPL Group: Applications/File URL: http://www.clamav.net @@ -40,7 +39,7 @@ Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch Patch22: clamav-0.80-initoff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires: clamav-lib = %{version}-%{release} Requires: data(clamav) BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel BuildRequires: bc @@ -51,44 +50,44 @@ Group: System Environment/Libraries Requires: data(clamav) %package devel -Summary: Headerfiles and libraries for the Clam Antivirus scanner +Summary: Header files and libraries for the Clam Antivirus scanner Group: Development/Libraries Source100: clamd-gen -Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires: clamav-lib = %{version}-%{release} Requires(pre): %_libdir/pkgconfig %package data -Summary: The virus-signatures for clamav +Summary: Virus signature data for the Clam Antivirus scanner Group: Applications/File Provides: data(clamav) Requires(pre): fedora-usermgmt >= 0:0.7 Requires(postun): fedora-usermgmt >= 0:0.7 %package update -Summary: Auto-updater for clamav data-files +Summary: Auto-updater for the Clam Antivirus scanner data-files Group: Applications/File -Requires: clamav-data = %epoch:%version-%release +Requires: clamav-data = %{version}-%{release} Requires(pre): /etc/cron.d Requires(postun): /etc/cron.d Requires(post): %{__chown} %{__chmod} %package server -Summary: The clamav server +Summary: Clam Antivirus scanner server Group: System Environment/Daemons -Provides: clamav-daemon = %epoch:%version-%release -Obsoletes: clamav-daemon < %epoch:%version-%release -Conflicts: clamav-daemon > %epoch:%version-%release +Provides: clamav-daemon = %{version}-%{release} +Obsoletes: clamav-daemon < %{version}-%{release} +Conflicts: clamav-daemon > %{version}-%{release} ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages Requires: init(clamav-server) Provides: init(clamav-server) Requires: data(clamav) -Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires: clamav-lib = %{version}-%{release} Requires(pre): %_initrddir Requires(postun): %_initrddir %package milter -Summary: A sendmail-milter for clamav +Summary: Sendmail-milter for the Clam Antivirus scanner Group: System Environment/Daemons ## For now, use this as a placeholder. Later, generate separate -sysv ## and -minit subpackages @@ -626,5 +625,5 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : * Tue Oct 29 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> 0.52-1 - updated to 0.52 -* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +* Tue Sep 17 2002 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - Initial build. commit c19278e4f79fa0cebe6a2d7921beab2ba7d38daa Author: ensc <ensc(a)fedoraproject.org> Date: Tue Feb 15 08:40:51 2005 +0000 updated to 0.83 diff --git a/clamav.spec b/clamav.spec index c02e110..8a0ed30 100644 --- a/clamav.spec +++ b/clamav.spec @@ -21,7 +21,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.82 +Version: 0.83 Release: %release_func 1 Epoch: 0 License: GPL @@ -406,6 +406,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Feb 15 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.83-1 +- updated to 0.83 + * Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 - updated to 0.82 - minor spec cleanups diff --git a/sources b/sources index 155b8af..e519735 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -1b58972d8918f5174d7f05a35a48856b clamav-0.82.tar.gz -f4010a5d15408fb83077fc5eb468eeb0 clamav-0.82.tar.gz.sig +e3a1b6bbda8095c5aae4eb7bc753804c clamav-0.83.tar.gz +8bd9bb753a1f0cceb588f96dd0f002ab clamav-0.83.tar.gz.sig commit e75ca52c9f36c2ea3423449659015ba2cdc61e7e Author: ensc <ensc(a)fedoraproject.org> Date: Tue Feb 8 23:01:08 2005 +0000 updated diff --git a/.cvsignore b/.cvsignore index ff8c3c5..f6ee3be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ clamav-*.tar.gz* -clamav-0.81.tar.gz -clamav-0.81.tar.gz.sig +clamav-*.*.rpm diff --git a/sources b/sources index c9f586e..155b8af 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -60081ddd9f29cbb8f0a2fe575e5a8afa clamav-0.81.tar.gz -b3c33479713c18794dfe83aa7397c604 clamav-0.81.tar.gz.sig +1b58972d8918f5174d7f05a35a48856b clamav-0.82.tar.gz +f4010a5d15408fb83077fc5eb468eeb0 clamav-0.82.tar.gz.sig commit 5ec291e507237bec6628b38dbd5fc9cd006b0f41 Author: ensc <ensc(a)fedoraproject.org> Date: Tue Feb 8 23:00:37 2005 +0000 - updated to 0.82 - minor spec cleanups diff --git a/clamav.spec b/clamav.spec index babe1b2..c02e110 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,9 +1,10 @@ +## $Id$ + ## This package understands the following switches: ## --without milter ... deactivate the -milter subpackage ## Fedora Extras specific customization below... -%{!?release_func:%define release_func() %1} ## @@ -15,10 +16,13 @@ %define milterstatedir %_var/run/clamav-milter %define pkgdatadir %_datadir/%name + +%{!?release_func:%define release_func() %1} + Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.81 -Release: %release_func 2 +Version: 0.82 +Release: %release_func 1 Epoch: 0 License: GPL Group: Applications/File @@ -113,15 +117,6 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. -WARNING: this package was built with '--disable-zlib-vcheck' because Red Hat - is unable to apply a simple security fix within 5 months. On - failures or successful DOS attacks on your mailserver, please - blame RH but not fedora.us. - - See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and - http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 - for references - %description lib This package contains dynamic libraries shared between applications @@ -182,23 +177,13 @@ perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ %build -cat <<EOF -********************* -** -** WARNING: building with '--disable-zlib-vcheck' because Red Hat is unable -** to apply a simple security fix within 5 months. On failures or -** successful DOS attacks on your mailserver, please blame RH -** but not fedora.us. -** -** See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 -** and http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 -** for references -** -********************* -EOF - -sleep 10 - +## '--disable-zlib-vcheck' is used because every FC<=3 ships zlib-1.2.1* +## but clamav checks for zlib >= 1.2.2. This option can be removed for +## FC4 builds. +## +## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and +## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 +## also %configure --disable-clamav --with-dbdir=/var/lib/clamav \ --disable-zlib-vcheck \ %{!?_without_milter:--enable-milter} @@ -421,6 +406,10 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %endif # _without_milter %changelog +* Tue Feb 8 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.82-1 +- updated to 0.82 +- minor spec cleanups + * Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 - build the package with '--disable-zlib-vcheck' because RH is unable to apply a fix for a 5 month old and solved security issue. Please fill commit b77bb64a6a20ba072422bcfd7e45c5c310d67c82 Author: ensc <ensc(a)fedoraproject.org> Date: Thu Feb 3 08:40:44 2005 +0000 - build the package with '--disable-zlib-vcheck' because RH is unable to apply a fix for a 5 month old and solved security issue. Please fill your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 - added 'BuildRequires: bc' (should work without also, but ./configure gives out ugly warnings else) 0.81-0.fdr.1 - updated to 0.81 - do not ship the 'clamd.milter' daemon anymore; clamav-milter supports an internal mode now which is enabled by default - updated -milter %%description 0.80-0.fdr.2 - s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) 0.80-0.fdr.1 - updated to 0.80 - removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore - buildrequire 'curl-devel' - renamed clamav.conf to clamd.conf (upstream change) - updated -initoff patch 0.75.1-0.fdr.1 - updated to 0.75.1 - use %%configure, the problems with the architecture specification seem to have passed (probably because of an autoconf update) - set mode 0600 for the cron-script (required by vixie-cron) - made the cronjob a spambot and send mail about deactivated freshclam service to nearly everybody... (root, postmaster, webmaster) - other fixes in the notification cronjob 0.75-0.fdr.1 - updated to 0.75 0.74-0.fdr.2 - moved /usr/bin/clamav-config from main into -devel 0.74-0.fdr.1 - updated to 0.74 0.73-0.fdr.1 - updated to 0.73 - added pkgconfig file 0.72-0.fdr.3 - notify the user about a deactivated clamav-update service - added clamd-gen script which generates template spec-files for services using clamd - copied template configuration files to %pkgdatadir/template (needed for clamd-gen) - moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink will be provided for compatibility reasons - conditionalized building of the -milter subpackage ('--without milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) 0.72-0.fdr.2 - removed 'BuildRequires: dietlibc'; it was a leftover from the pre-use-signal era (before 0.70) (bug #1716) 0.72-0.fdr.1 - updated to 0.72 diff --git a/.cvsignore b/.cvsignore index 0196009..ff8c3c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,3 @@ -clamav-0.71.tar.gz +clamav-*.tar.gz* +clamav-0.81.tar.gz +clamav-0.81.tar.gz.sig diff --git a/clamav-0.70-initoff.patch b/clamav-0.70-initoff.patch deleted file mode 100644 index c1e1860..0000000 --- a/clamav-0.70-initoff.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 -+++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 -@@ -2,7 +2,7 @@ - # - # clamav-milter This script starts and stops the clamav-milter daemon - # --# chkconfig: 2345 91 30 -+# chkconfig: - 79 31 - # - # description: clamav-milter is a daemon which hooks into sendmail and routes - # email messages to clamav diff --git a/clamav-0.71.tar.gz.sig b/clamav-0.71.tar.gz.sig deleted file mode 100644 index 2d70446..0000000 Binary files a/clamav-0.71.tar.gz.sig and /dev/null differ diff --git a/clamav-0.80-initoff.patch b/clamav-0.80-initoff.patch new file mode 100644 index 0000000..7ef309e --- /dev/null +++ b/clamav-0.80-initoff.patch @@ -0,0 +1,11 @@ +--- clamav-0.70-rc/contrib/init/RedHat/clamav-milter.initoff 2004-02-10 23:44:49.000000000 +0100 ++++ clamav-0.70-rc/contrib/init/RedHat/clamav-milter 2004-02-10 23:45:28.000000000 +0100 +@@ -2,7 +2,7 @@ + # + # clamav-milter This script starts and stops the clamav-milter daemon + # +-# chkconfig: 2345 71 40 ++# chkconfig: - 71 40 + # + # description: clamav-milter is a daemon which hooks into sendmail and routes + # email messages to clamav diff --git a/clamav.spec b/clamav.spec index e264659..babe1b2 100644 --- a/clamav.spec +++ b/clamav.spec @@ -1,15 +1,24 @@ +## This package understands the following switches: +## --without milter ... deactivate the -milter subpackage + + +## Fedora Extras specific customization below... +%{!?release_func:%define release_func() %1} +## + + %define username clamav %define homedir %_var/lib/clamav %define freshclamlog %_var/log/freshclam.log %define milterlog %_var/log/clamd.milter %define milteruser clamilt %define milterstatedir %_var/run/clamav-milter -%define milterclamddir %_var/run/clamd.milter +%define pkgdatadir %_datadir/%name Summary: End-user tools for the Clam Antivirus scanner Name: clamav -Version: 0.71 -Release: 2 +Version: 0.81 +Release: %release_func 2 Epoch: 0 License: GPL Group: Applications/File @@ -25,11 +34,12 @@ Source7: clamd.SERVICE.init Source8: clamav-notify-servers Patch20: clamav-0.70-user.patch Patch21: clamav-0.70-path.patch -Patch22: clamav-0.70-initoff.patch +Patch22: clamav-0.80-initoff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: clamav-lib = %{epoch}:%{version}-%{release} Requires: data(clamav) -BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers +BuildRequires: zlib-devel bzip2-devel gmp-devel tcp_wrappers curl-devel +BuildRequires: bc %package lib Summary: Dynamic libraries for the Clam Antivirus scanner @@ -39,7 +49,9 @@ Requires: data(clamav) %package devel Summary: Headerfiles and libraries for the Clam Antivirus scanner Group: Development/Libraries +Source100: clamd-gen Requires: clamav-lib = %{epoch}:%{version}-%{release} +Requires(pre): %_libdir/pkgconfig %package data Summary: The virus-signatures for clamav @@ -68,7 +80,6 @@ Requires: init(clamav-server) Provides: init(clamav-server) Requires: data(clamav) Requires: clamav-lib = %{epoch}:%{version}-%{release} -BuildRequires: dietlibc Requires(pre): %_initrddir Requires(postun): %_initrddir @@ -79,9 +90,7 @@ Group: System Environment/Daemons ## and -minit subpackages Requires: init(clamav-milter) Provides: init(clamav-milter) -BuildRequires: sendmail-devel -Requires(preun): clamav-server = %{epoch}:%{version}-%{release} -Requires(postun): clamav-server = %{epoch}:%{version}-%{release} +%{!?_without_milter:BuildRequires: sendmail-devel} Requires: sendmail Requires(pre): %_initrddir Requires(postun): %_initrddir @@ -104,6 +113,16 @@ the virus database from OpenAntiVirus, but contains additional signatures (including signatures for popular polymorphic viruses, too) and is KEPT UP TO DATE. +WARNING: this package was built with '--disable-zlib-vcheck' because Red Hat + is unable to apply a simple security fix within 5 months. On + failures or successful DOS attacks on your mailserver, please + blame RH but not fedora.us. + + See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and + http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 + for references + + %description lib This package contains dynamic libraries shared between applications using the Clam Antivirus scanner. @@ -120,7 +139,7 @@ ships a corresponding cron-job. %description update This package contains programs which can be used to update the clamav anti-virus database automatically. It uses the freshclam(1) utility for -this task. To activate it, uncomment the entry in /etc/cron.d/clamav. +this task. To activate it, uncomment the entry in /etc/cron.d/clamav-update. %description server ATTENTION: most users do not need this package; the main package has @@ -138,7 +157,6 @@ This package contains files which are needed to run the clamav-milter. It can be activated by adding | INPUT_MAIL_FILTER(`clamav', `S=local:%milterstatedir/clamav.sock, F=, T=S:4m;R:4m')dnl -| define(`confINPUT_MAIL_FILTERS', `clamav')dnl to your sendmail.mc. @@ -157,23 +175,35 @@ perl -pi -e 's!^(#?LogFile ).*!\1/var/log/clamd.<SERVICE>!g; s!^#?(PidFile ).*!\1/var/run/clamd.<SERVICE>/clamd.pid!g; s!^#?(User ).*!\1<USER>!g; s! /usr/local/share/clamav,! %homedir,!g; - ' etc/clamav.conf + ' etc/clamd.conf perl -pi -e 's!^#(UpdateLogFile )!\1!g;' etc/freshclam.conf ## ------------------------------------------------------------ %build -#%%configure --disable-clamav --with-dbdir=/var/lib/clamav -## The %%configure macro can not be used since the script breaks on -## the old architecture specification +cat <<EOF +********************* +** +** WARNING: building with '--disable-zlib-vcheck' because Red Hat is unable +** to apply a simple security fix within 5 months. On failures or +** successful DOS attacks on your mailserver, please blame RH +** but not fedora.us. +** +** See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +** and http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797 +** for references +** +********************* +EOF -CFLAGS=$RPM_OPT_FLAGS; export CFLAGS -./configure --prefix=%{_prefix} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \ - --disable-clamav --with-dbdir=%{homedir} \ - --enable-milter +sleep 10 -## HACK: ./configure checks if freshclam.conf/clamav.conf are existing +%configure --disable-clamav --with-dbdir=/var/lib/clamav \ + --disable-zlib-vcheck \ + %{!?_without_milter:--enable-milter} + +## HACK: ./configure checks if freshclam.conf/clamd.conf are existing ## in current filesystem and skips its installation then. Was introduced ## by 0.66. perl -pi -e 's!^(s,\@INSTALL_(CLAMAV|FRESHCLAM)_CONF_TRUE\@),[^,]*,!\1,,!g; @@ -192,20 +222,34 @@ rm -rf "$RPM_BUILD_ROOT" _doc* %{__install} -d -m755 \ ${RPM_BUILD_ROOT}%{_sysconfdir}/{clamd.d,cron.d,logrotate.d,sysconfig} \ ${RPM_BUILD_ROOT}%{_var}/log \ - ${RPM_BUILD_ROOT}{%milterstatedir,%milterclamddir} \ + ${RPM_BUILD_ROOT}%milterstatedir \ + ${RPM_BUILD_ROOT}%pkgdatadir/template \ ${RPM_BUILD_ROOT}%{_initrddir} -rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/clamav.conf \ +rm -f ${RPM_BUILD_ROOT}%{_sysconfdir}/clamd.conf \ ${RPM_BUILD_ROOT}%{_libdir}/*.la +%{?_without_milter:rm -f $RPM_BUILD_ROOT%_mandir/*/*milter*} + ## prepare the server-files mkdir _doc_server -%{__install} -m644 -p %{SOURCE1} ${RPM_BUILD_ROOT}%{_initrddir}/clamd-wrapper %{__install} -m644 -p %{SOURCE2} _doc_server/clamd.sysconfig %{__install} -m644 -p %{SOURCE3} _doc_server/clamd.logrotate %{__install} -m755 -p %{SOURCE7} _doc_server/clamd.init %{__install} -m644 -p %{SOURCE5} _doc_server/README +%__install -m644 -p etc/clamd.conf _doc_server/clamd.conf + +%__install -m644 -p %SOURCE1 $RPM_BUILD_ROOT%pkgdatadir +%__install -m755 -p %SOURCE100 $RPM_BUILD_ROOT%pkgdatadir +cp -pa _doc_server/* $RPM_BUILD_ROOT%pkgdatadir/template +ln -s %pkgdatadir/clamd-wrapper $RPM_BUILD_ROOT%_initrddir/clamd-wrapper + +f=$RPM_BUILD_ROOT%pkgdatadir/clamd-wrapper +sed -e 's!/usr/share/clamav!%pkgdatadir!g' "$f" >"$f".tmp +cmp -s "$f" "$f".tmp || cat "$f".tmp >"$f" +rm -f "$f".tmp + ## prepare the update-files %{__install} -m644 -p %{SOURCE6} ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/clamav-update @@ -213,26 +257,28 @@ mkdir _doc_server touch ${RPM_BUILD_ROOT}%{freshclamlog} cat >${RPM_BUILD_ROOT}%{_sysconfdir}/cron.d/clamav-update <<"EOF" +## Adjust this line... +MAILTO=root,postmaster,webmaster,%username + ## It is ok to execute it as root; freshclam drops privileges and becomes ## user 'clamav' as soon as possible ## Note: replace 'MIN' and 'HOUR' with random values # MIN HOUR/3 * * * root %{_bindir}/freshclam --quiet && { test -x %{_sbindir}/clamav-notify-servers && exec %{_sbindir}/clamav-notify-servers || :; } -EOF +## Comment out or remove this line... +1 8 * * * %username /bin/sh -c 'echo "Please activate the clamav update in %_sysconfdir/cron.d/clamav-update" >&2' +EOF +%if 0%{!?_without_milter:1} #### The milter stuff function subst() { sed -e 's!<SERVICE>!milter!g;s!<USER>!%milteruser!g;'"$3" "$1" >"$RPM_BUILD_ROOT$2" } -subst %SOURCE3 /etc/logrotate.d/clamd.milter -subst %SOURCE7 %_initrddir/clamd.milter -subst etc/clamav.conf /etc/clamd.d/milter.conf \ +subst etc/clamd.conf /etc/clamd.d/milter.conf \ 's!^##*$\(LogFile\|LocalSocket\|PidFile\|User$\s\|$StreamSaveToDisk\|ScanMail$$\)!\1!;' -chmod 0755 $RPM_BUILD_ROOT%_initrddir/clamd.milter -ln -s ./clamd $RPM_BUILD_ROOT%_sbindir/clamd.milter cat <<EOF >$RPM_BUILD_ROOT%_sysconfdir/sysconfig/clamav-milter ## The '-blo' options might be usefully here -- especially for testing; see @@ -242,8 +288,9 @@ CLAMAV_USER='%milteruser' EOF %__install -p -m755 contrib/init/RedHat/clamav-milter $RPM_BUILD_ROOT%_initrddir/clamav-milter -touch $RPM_BUILD_ROOT%milterclamddir/{clamd.sock,clamd.pid,milter.sock} touch $RPM_BUILD_ROOT%milterstatedir/clamav.sock $RPM_BUILD_ROOT%milterlog +%endif # _without_milter + ## ------------------------------------------------------------ @@ -275,18 +322,14 @@ test "$1" != 0 || /usr/sbin/fedora-groupdel %{username} &>/dev/null || : %post milter /sbin/chkconfig --add clamav-milter -/sbin/chkconfig --add clamd.milter %preun milter test "$1" != 0 || %{_initrddir}/clamav-milter stop &>/dev/null || : -test "$1" != 0 || %{_initrddir}/clamd.milter stop &>/dev/null || : test "$1" != 0 || /sbin/chkconfig --del clamav-milter -test "$1" != 0 || /sbin/chkconfig --del clamd.milter %postun milter test "$1" != 0 || /usr/sbin/fedora-userdel %{milteruser} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{milteruser} &>/dev/null || : -test "$1" = 0 || %{_initrddir}/clamd.milter condrestart >/dev/null || : test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : @@ -298,15 +341,9 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %defattr(-,root,root,-) %doc AUTHORS BUGS COPYING ChangeLog FAQ NEWS TODO %doc docs/*.pdf -%doc docs/html docs/DMS docs/FreeBSD-HowTo -%lang(fr) %doc docs/French -%lang(ja) %doc docs/Japanese -%lang(pl) %doc docs/Polish -%lang(pt) %doc docs/Portugese -%lang(es) %doc docs/Spanish -%lang(tr) %doc docs/Turkish %doc %{_mandir}/man[15]/* %{_bindir}/* +%exclude %_bindir/clamav-config %exclude %_bindir/freshclam %exclude %_mandir/man1/freshclam* @@ -323,12 +360,20 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %{_includedir}/* %{_libdir}/*.*a %{_libdir}/*.so +%dir %pkgdatadir +%pkgdatadir/template +%pkgdatadir/clamd-gen +%_libdir/pkgconfig/* +%_bindir/clamav-config ## ----------------------- %files data %defattr(-,%{username},%{username},-) %dir %{homedir} +# use %%config to keep files which were updated by 'freshclam' +# already. Without this tag, they would be overridden with older +# versions whenever a new -data package is installed. %config %verify(not size md5 mtime) %{homedir}/*.cvd ## ----------------------- @@ -338,7 +383,7 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %_bindir/freshclam %_mandir/man1/freshclam* %config(noreplace) %verify(not mtime) %_sysconfdir/freshclam.conf -%config(noreplace) %verify(not mtime) %_sysconfdir/cron.d/* +%config(noreplace) %verify(not mtime) %attr(0600,root,root) %_sysconfdir/cron.d/* %config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/* %ghost %attr(0664,root,%{username}) %verify(not size md5 mtime) %{freshclamlog} @@ -348,12 +393,15 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %files server %defattr(-,root,root,-) %doc _doc_server/* -%doc etc/clamav.conf %doc %{_mandir}/man8/* %{_sbindir}/* -%config %{_initrddir}/clamd-wrapper +%_initrddir/clamd-wrapper +%dir %pkgdatadir %dir %{_sysconfdir}/clamd.d +%pkgdatadir/clamd-wrapper + +%if 0%{!?_without_milter:1} %exclude %_sbindir/*milter* %exclude %_mandir/man8/clamav-milter* @@ -364,18 +412,79 @@ test "$1" = 0 || %{_initrddir}/clamav-milter condrestart >/dev/null || : %doc clamav-milter/INSTALL %_sbindir/*milter* %_mandir/man8/clamav-milter* -%config %{_initrddir}/clamd.milter %config %{_initrddir}/clamav-milter %config(noreplace) %verify(not mtime) %{_sysconfdir}/clamd.d/milter.conf %config(noreplace) %verify(not mtime) %{_sysconfdir}/sysconfig/clamav-milter -%attr(0700,%milteruser,%milteruser) %dir %milterclamddir %attr(0700,%milteruser,%milteruser) %dir %milterstatedir -%ghost %milterclamddir/* %ghost %milterstatedir/* %ghost %attr(0620,root,%milteruser) %verify(not size md5 mtime) %milterlog - +%endif # _without_milter %changelog +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.2 +- build the package with '--disable-zlib-vcheck' because RH is unable to + apply a fix for a 5 month old and solved security issue. Please fill + your comments at https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 +- added 'BuildRequires: bc' (should work without also, but ./configure + gives out ugly warnings else) + +* Fri Jan 28 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.81-0.fdr.1 +- updated to 0.81 +- do not ship the 'clamd.milter' daemon anymore; clamav-milter supports + an internal mode now which is enabled by default +- updated -milter %%description + +* Thu Jan 20 2005 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.2 +- s!cron.d/clamav!cron.d/clamav-update! in the %%description of the -update + subpackage (https://bugzilla.fedora.us/show_bug.cgi?id=1715#c39) + +* Wed Nov 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.80-0.fdr.1 +- updated to 0.80 +- removed DMS, FreeBSD-HOWTO and localized docs as it is not shipped anymore +- buildrequire 'curl-devel' +- renamed clamav.conf to clamd.conf (upstream change) +- updated -initoff patch + +* Tue Sep 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75.1-0.fdr.1 +- updated to 0.75.1 +- use %%configure, the problems with the architecture specification + seem to have passed (probably because of an autoconf update) +- set mode 0600 for the cron-script (required by vixie-cron) +- made the cronjob a spambot and send mail about deactivated freshclam + service to nearly everybody... (root, postmaster, webmaster) +- other fixes in the notification cronjob + +* Fri Jul 23 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.75-0.fdr.1 +- updated to 0.75 + +* Thu Jul 15 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.2 +- moved /usr/bin/clamav-config from main into -devel + +* Wed Jun 30 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.74-0.fdr.1 +- updated to 0.74 + +* Mon Jun 14 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.73-0.fdr.1 +- updated to 0.73 +- added pkgconfig file + +* Fri Jun 11 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.3 +- notify the user about a deactivated clamav-update service +- added clamd-gen script which generates template spec-files for + services using clamd +- copied template configuration files to %pkgdatadir/template (needed + for clamd-gen) +- moved the clamd-wrapper from %_initrddir to %{pkgdatadir}; a symlink + will be provided for compatibility reasons +- conditionalized building of the -milter subpackage ('--without + milter' switch) to enable builds on RH73 (bug #1715, comment #5/#7) + +* Fri Jun 4 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.2 +- removed 'BuildRequires: dietlibc'; it was a leftover from the + pre-use-signal era (before 0.70) (bug #1716) + +* Thu Jun 3 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.72-0.fdr.1 +- updated to 0.72 + * Thu May 20 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> - 0:0.71-0.fdr.2 - removed the randomization in the cronjob; it seems to be impossible to use the mod-operator (%%) there. Instead of, the user has to diff --git a/clamd-README b/clamd-README index 7d8e676..d717d39 100644 --- a/clamd-README +++ b/clamd-README @@ -1,7 +1,7 @@ To create individual clamd-instance take the following files and modify/copy them in the suggested way: -clamav.conf: +clamd.conf: * set LogFile, PidFile, LocalSocket and User to suitable values * place this file into /etc/clamd.d with a unique service-name; e.g. as /etc/clamd.d/<SERVICE>.conf @@ -42,7 +42,7 @@ clamd.init: Additionally, a symlink must be set to clamd in a way like | # ln -s clamd /usr/sbin/clamd.<SERVICE> and the directory for the socket file must be created (see 'LocalSocket' -in clamav.conf) +in clamd.conf) | # mkdir -p /var/run/clamd.<SERVICE> diff --git a/clamd-gen b/clamd-gen new file mode 100755 index 0000000..cd4c61c --- /dev/null +++ b/clamd-gen @@ -0,0 +1,268 @@ +#! /bin/bash + +# Copyright (C) 2004 Enrico Scholz <enrico.scholz(a)informatik.tu-chemnitz.de> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; version 2 of the License. +# +# 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. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +function showHelp() +{ + echo \ +$"Usage: clamd-gen --service=<SERVICE> --version=<VERSION> --release=<RELEASE> + --license=<LICENSE> --username=>USERNAME> +" + exit 0 +} + +function rpm.generatePreamble() +{ + cat <<EOF +%{!?release_func:%define release_func() 0.fdr.%1} +# The name of the minit service +%define minitsvcdir %minitdir/services/%name +# The configuration file for the SysV initservice +%define conffile %_sysconfdir/clamd.d/%service.conf +# The directory, where the milter socket will be placed into; this +# socket will be named clamd.sock +%define rundir /var/run/clamd.%service +# The name of the logfile +%define logfile /var/log/clamd.%service +# The user under whose id, the clamd shall be running. This user must +# be able to read the files from the base-service and is usually +# created there. +%define username $USERNAME +# The packagename of the service +%define service $SERVICE +# The service name as used by the system's initscripts; usually this +# is %service +%define baseservice %service + +%define __chkconfig /sbin/chkconfig +%define minitdir %_sysconfdir/minit + + +EOF +} + +function rpm.generateHeader() +{ + cat <<EOF +Summary: Clamav server for '%service' +Name: clamd.%service +Version: $VERSION +Release: %release_func $RELEASE +Epoch: 0 +License: $LICENSE +Group: System Environment/Daemons +BuildRoot: %_tmppath/%name-%version-%release-root +BuildArch: noarch +Requires: init(%name) +Requires(pre): %service +Requires: clamav-server +BuildRequires: clamav-devel + +%package sysv +Summary: SysV initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = sysv +Conflicts: init(%name) < sysv +Conflicts: init(%name) > sysv +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp %__chkconfig +Requires(preun): %__chkconfig +Requires(pre): %_initrddir +Requires(postun): %_initrddir + +%package minit +Summary: minit initscripts for a %service clamav-server +Group: System Environment/Daemons +Provides: init(%name) = minit +Conflicts: init(%name) < minit +Conflicts: init(%name) > minit +Requires(post): %name = %epoch:%version-%release +Requires(post): diffutils mktemp +Requires(pre): minit-setup +Requires(postun): minit-setup +Requires(triggers): minit-tools + + +%description +Basic setup for a clamav server for '%service'. + + +%description sysv +Basic setup for a clamav server for '%service'. + +This package contains initscripts for SysV based systems. + + +%description minit +Basic setup for a clamav server for '%service'. + +This package contains initscripts for minit based systems. + +EOF +} + + +function rpm.genBody() +{ + cat <<"XEOFX" +%prep +%build + +%install +rm -rf $RPM_BUILD_ROOT +%__install -d -m755 $RPM_BUILD_ROOT{%minitsvcdir,%_sbindir,%rundir,/var/log} + +d=/usr/share/clamav/template + +function subst +{ + src=$d/$1 + dst=$RPM_BUILD_ROOT$2 + + %__install -d -m755 $(dirname "$dst") + sed -e 's!^$#?LogFile $.*!\1%logfile!g; + s!^#?$LocalSocket $.*!\1%rundir/clamd.sock!g; + s!^#?$PidFile $.*!\1%rundir/clamd.pid!g; + s!<SERVICE>!%service!g; + s!<USER>!%username!g;' "$src" >"$dst" + chmod --reference "$src" "$dst" +} + +subst clamd.conf %conffile +subst clamd.logrotate %_sysconfdir/logrotate.d/clamd.%service + +%if 0%{!?_without_sysv:1} +subst clamd.sysconfig %_sysconfdir/sysconfig/clamd.%service +subst clamd.init %_initrddir/clamd.%service +%endif + +ln -s clamd $RPM_BUILD_ROOT%_sbindir/clamd.%service + +touch $RPM_BUILD_ROOT%logfile +touch $RPM_BUILD_ROOT%rundir/clamd.sock + +%if 0%{!?_without_minit:1} +ln -s %_sbindir/clamd.%service $RPM_BUILD_ROOT%minitsvcdir/run +touch $RPM_BUILD_ROOT%minitsvcdir/respawn +cat <<EOF >$RPM_BUILD_ROOT%minitsvcdir/params +-c +%conffile +EOF +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + + +%triggerin minit -- %baseservice +minit-svc add services/clamd.%service services/%baseservice/ + +%triggerun minit -- %baseservice +test "$1" != 0 -a "$2" != 0 || \ + minit-svc del services/clamd.%service services/%baseservice/ + + +%post minit +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^#Foreground!Foreground!' "%conffile" >"$d" +grep -q '^Foreground' $d || echo 'Foreground' >>$d +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%post sysv +d=$(mktemp /tmp/clamd.%service.XXXXXX) +sed -e 's!^Foreground!#Foreground!' "%conffile" >"$d" +cmp -s "$d" %conffile || cat "$d" >"%conffile" +rm -f "$d" + +%__chkconfig --add %name + + +%preun sysv +test "$1" != 0 || %__chkconfig --del %name + +XEOFX +} + + +function rpm.genFiles +{ + cat <<"EOF" +%files +%defattr(-,root,root,-) +%doc +%config(noreplace) %verify(not size md5 mtime) %attr(0620,root,%username) %logfile +%config(noreplace) %verify(not mtime) %conffile +%config(noreplace) %verify(not mtime) %_sysconfdir/logrotate.d/clamd.%service +%_sbindir/clamd.%service +%dir %attr(0700,%username,root) %rundir +%ghost %rundir/clamd.sock + + +%if 0%{!?_without_sysv:1} +%files sysv +%defattr(-,root,root,-) +%config %verify(not mtime) %_initrddir/clamd.%service +%config(noreplace) %verify(not mtime) %_sysconfdir/sysconfig/clamd.%service +%endif + + +%if 0%{!?_without_minit:1} +%files minit +%defattr(-,root,root,-) +%dir %minitsvcdir +%config(noreplace) %verify(not mtime) %minitsvcdir/params +%config %minitsvcdir/run + %minitsvcdir/respawn +%endif +EOF +} + + +SERVICE= +VERSION= +RELEASE= +LICENSE= +USERNAME= +tmp=$(getopt -o '' --long service:,version:,release:,license:,username:,help -n "$0" -- "$@") || exit 1 +eval set -- "$tmp" + +while true; do + case "$1" in + (--help) showHelp $0;; + (--service) SERVICE=$2; shift;; + (--version) VERSION=$2; shift;; + (--release) RELEASE=$2; shift;; + (--license) LICENSE=$2; shift;; + (--username) USERNAME=$2; shift;; + (--) shift; break;; + esac + shift +done + +for i in SERVICE VERSION RELEASE LICENSE USERNAME; do + eval tmp=\$${i} + test "$tmp" || { + echo $"No value for $i specified; assuming @${i}@" >&2; + eval $i=@${i}@; + } +done + + +rpm.generatePreamble +rpm.generateHeader +rpm.genBody +rpm.genFiles diff --git a/clamd.SERVICE.init b/clamd.SERVICE.init index 5906b10..9681351 100644 --- a/clamd.SERVICE.init +++ b/clamd.SERVICE.init @@ -4,4 +4,4 @@ # description: The clamd server running for <SERVICE> CLAMD_SERVICE=<SERVICE> -. /etc/init.d/clamd-wrapper +. /usr/share/clamav/clamd-wrapper diff --git a/sources b/sources index 32295b7..c9f586e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -096cffd2633cbac5a14b7080b6f67a67 clamav-0.71.tar.gz +60081ddd9f29cbb8f0a2fe575e5a8afa clamav-0.81.tar.gz +b3c33479713c18794dfe83aa7397c604 clamav-0.81.tar.gz.sig commit 9b62e0af2851c28f6381b6b4626c4739d8573ac7 Author: Michael Schwendt <mschwendt(a)fedoraproject.org> Date: Fri Dec 10 22:03:01 2004 +0000 Bump release, strip off fedora.us prefix and dist tag. diff --git a/clamav.spec b/clamav.spec index d338b5d..e264659 100644 --- a/clamav.spec +++ b/clamav.spec @@ -9,7 +9,7 @@ Summary: End-user tools for the Clam Antivirus scanner Name: clamav Version: 0.71 -Release: 0.fdr.2.2 +Release: 2 Epoch: 0 License: GPL Group: Applications/File commit a0e1e1da964db851c8383047d93ac78320b42c3e Author: gafton <gafton(a)fedoraproject.org> Date: Wed Nov 24 03:10:01 2004 +0000 Fix braindead import typo artifact in the default generated Makefile. Oh well, the fedora extras commits list needs a workout anyway... diff --git a/Makefile b/Makefile index aefa629..21be25f 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common -test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 +test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common))

1 0

Architecture specific change in rpms/libvpx.git
by githook-noreply＠fedoraproject.org 26 Jan '18

26 Jan '18

The package rpms/libvpx.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/libvpx.git/commit/?id=e72342beec2de…. Change: +%ifarch aarch64 Thanks. Full change: ============ commit e72342beec2de5854e391b65af6030bafffce459 Author: Tom Callaway <spot(a)fedoraproject.org> Date: Fri Jan 26 15:10:09 2018 -0500 update to 1.7.0, ABI break results in somajor bump diff --git a/libvpx-1.7.0-leave-fortify-source-on.patch b/libvpx-1.7.0-leave-fortify-source-on.patch new file mode 100644 index 0000000..23099da --- /dev/null +++ b/libvpx-1.7.0-leave-fortify-source-on.patch @@ -0,0 +1,12 @@ +diff -up libvpx-1.7.0/build/make/configure.sh.leave-fs-on libvpx-1.7.0/build/make/configure.sh +--- libvpx-1.7.0/build/make/configure.sh.leave-fs-on 2018-01-26 15:02:18.767645332 -0500 ++++ libvpx-1.7.0/build/make/configure.sh 2018-01-26 15:02:28.594420775 -0500 +@@ -1440,7 +1440,7 @@ EOF + + # Work around longjmp interception on glibc >= 2.11, to improve binary + # compatibility. See http://code.google.com/p/webm/issues/detail?id=166 +- enabled linux && check_add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 ++ # enabled linux && check_add_cflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 + + # Check for strip utility variant + ${STRIP} -V 2>/dev/null | grep GNU >/dev/null && enable_feature gnu_strip diff --git a/libvpx.spec b/libvpx.spec index d2ebe8c..e9a6250 100644 --- a/libvpx.spec +++ b/libvpx.spec @@ -1,12 +1,12 @@ -%global somajor 4 +%global somajor 5 %global sominor 0 %global sotiny 0 %global soversion %{somajor}.%{sominor}.%{sotiny} Name: libvpx Summary: VP8/VP9 Video Codec SDK -Version: 1.6.1 -Release: 5%{?dist} +Version: 1.7.0 +Release: 1%{?dist} License: BSD Group: System Environment/Libraries #Source0: http://downloads.webmproject.org/releases/webm/%{name}-%{version}.tar.bz2 @@ -18,9 +18,8 @@ URL: http://www.webmproject.org/code/ BuildRequires: yasm %endif BuildRequires: doxygen, php-cli, perl(Getopt::Long) - -#Fix CVE-2017-13194 -Patch001: 0001-Fix-image-width-alignment.-Enable-ImageSizeSetting-t.patch +# Do not disable FORTIFY_SOURCE=2 +Patch0: libvpx-1.7.0-leave-fortify-source-on.patch %description libvpx provides the VP8/VP9 SDK, which allows you to integrate your applications @@ -47,7 +46,7 @@ and decoder. %prep %setup -q -n libvpx-%{version} -%patch001 -p1 -b .001 +%patch0 -p1 -b .leave-fs-on %build %ifarch %{ix86} @@ -59,10 +58,14 @@ and decoder. %ifarch armv7hl %global vpxtarget armv7-linux-gcc %else +%ifarch aarch64 +%global vpxtarget arm64-linux-gcc +%else %global vpxtarget generic-gnu %endif %endif %endif +%endif # History: The configure script used to reject the shared flag on the generic target. # This meant that we needed to fall back to manual shared lib creation. @@ -193,6 +196,9 @@ popd %{_bindir}/* %changelog +* Fri Jan 26 2018 Tom Callaway <spot(a)fedoraproject.org> - 1.7.0-1 +- update to 1.7.0 (ABI change) + * Wed Jan 17 2018 Wim Taymans <wtaymans(a)wredhat.com> - 1.6.1-5 - fix for CVE-2017-13194

1 0

Architecture specific change in rpms/nbdkit.git
by githook-noreply＠fedoraproject.org 26 Jan '18

26 Jan '18

The package rpms/nbdkit.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/nbdkit.git/commit/?id=e6d9cfe20186b…. Change: +%ifarch %{complete_test_arches} Thanks. Full change: ============ commit e6d9cfe20186b5a60c7ef41d707be4c6f996955c Author: Richard W.M. Jones <rjones(a)redhat.com> Date: Fri Jan 26 18:04:10 2018 +0000 Fix reversed %if statement in previous commit. diff --git a/nbdkit.spec b/nbdkit.spec index c45bf72..7d24b6a 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -437,7 +437,7 @@ make check -j1 || { exit 1 } -%ifnarch %{complete_test_arches} +%ifarch %{complete_test_arches} %if 0%{?have_libguestfs} %if 0%{?have_python3} pushd python3

1 0

Architecture specific change in rpms/nbdkit.git
by githook-noreply＠fedoraproject.org 26 Jan '18

26 Jan '18

The package rpms/nbdkit.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/nbdkit.git/commit/?id=f8754ffa2624f…. Change: +%ifnarch %{complete_test_arches} Thanks. Full change: ============ commit f8754ffa2624ff224ae480dd4e021019f76db7f6 Author: Richard W.M. Jones <rjones(a)redhat.com> Date: Fri Jan 26 17:49:22 2018 +0000 Run a simplified test suite on all arches. Note this change *enhances* test coverage. diff --git a/nbdkit.spec b/nbdkit.spec index ad9e793..c45bf72 100644 --- a/nbdkit.spec +++ b/nbdkit.spec @@ -4,6 +4,13 @@ %global have_libguestfs 1 %endif +# Architectures where the complete test suite must pass. +# +# On all other architectures, a simpler test suite must pass. This +# omits any tests that run full qemu, since running qemu under TCG is +# often broken on non-x86_64 arches. +%global complete_test_arches aarch64 x86_64 + # Currently everything has Python 2. RHEL 7 doesn't have Python 3. %if 0%{?rhel} != 7 %global have_python3 1 @@ -11,7 +18,7 @@ Name: nbdkit Version: 1.1.28 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NBD server License: BSD @@ -27,6 +34,9 @@ Source0: http://libguestfs.org/download/nbdkit/%{name}-%{version}.tar.gz ExclusiveArch: x86_64 %endif +%ifnarch %{complete_test_arches} +BuildRequires: autoconf, automake, libtool +%endif BuildRequires: /usr/bin/pod2man BuildRequires: gnutls-devel BuildRequires: libselinux-devel @@ -352,6 +362,12 @@ plugins for %{name}. %setup -q %autopatch -p1 +%ifnarch %{complete_test_arches} +# Simplify the test suite so it doesn't require qemu. +sed -i -e '/^if HAVE_LIBGUESTFS/,/^endif HAVE_LIBGUESTFS/d' tests/Makefile.am +autoreconf -i +%endif + %build # Force immediate binding for hardened build for plugins. @@ -416,18 +432,12 @@ mkdir -p $HOME/.cache/libvirt export LIBGUESTFS_DEBUG=1 export LIBGUESTFS_TRACE=1 -# Disabled on armv7 and ppc/power because we haven't currently spent -# any effort on making the tests work there. -# -# The tests rely on libguestfs which needs the kernel to work, and that -# usually doesn't work on i686, so it is disabled. -%ifnarch %{arm} %{ix86} ppc %{power64} - make check -j1 || { cat tests/test-suite.log exit 1 } +%ifnarch %{complete_test_arches} %if 0%{?have_libguestfs} %if 0%{?have_python3} pushd python3 @@ -438,7 +448,6 @@ make check -j1 TESTS=test-python || { popd %endif %endif - %endif @@ -604,6 +613,9 @@ popd %changelog +* Fri Jan 26 2018 Richard W.M. Jones <rjones(a)redhat.com> - 1.1.28-2 +- Run a simplified test suite on all arches. + * Mon Jan 22 2018 Richard W.M. Jones <rjones(a)redhat.com> - 1.1.28-1 - New upstream version 1.1.28. - Add two new filters to nbdkit-basic-filters.

1 0

Architecture specific change in rpms/opencv.git
by githook-noreply＠fedoraproject.org 26 Jan '18

26 Jan '18

The package rpms/opencv.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/opencv.git/commit/?id=4ea7e18b827d0…. Change: +%ifarch %{ix86} x86_64 Thanks. Full change: ============ commit 4ea7e18b827d008bdfcb438debe4c2c0feb0d42f Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Fri Jan 26 17:13:15 2018 +0000 Enable pylint Enable clp Enable va Provides and obsoletes for opencv-devel-docs BuildRequires perl-local do generate documentation without errors diff --git a/opencv.spec b/opencv.spec index 14858e8..bd3d100 100644 --- a/opencv.spec +++ b/opencv.spec @@ -21,11 +21,21 @@ %bcond_with cuda %bcond_with xine # Atlas need (missing: Atlas_CLAPACK_INCLUDE_DIR Atlas_CBLAS_LIBRARY Atlas_BLAS_LIBRARY Atlas_LAPACK_LIBRARY) +# LAPACK may use atlas or openblas since now it detect openblas, atlas is not used aanyway , more info please +# check OpenCVFindLAPACK.cmake %bcond_with atlas %bcond_without openblas %bcond_without gdcm #VTK support disabled. Incompatible combination: OpenCV + Qt5 and VTK ver.7.1.1 + Qt4 %bcond_with vtk +%ifarch %{ix86} x86_64 +#disabled for now, maybe for opencv 3.4 +%bcond_with mfx +%else +%bcond_with mfx +%endif +%bcond_without clp +%bcond_without va %global srcname opencv %global abiver 3.3 @@ -38,7 +48,7 @@ Name: opencv Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries # This is normal three clause BSD. @@ -56,6 +66,10 @@ Source1: %{name}_contrib-clean-%{version}.tar.gz Patch1: opencv-3.2.0-cmake_paths.patch Patch2: opencv-3.1-pillow.patch Patch3: opencv-3.2.0-test-file-fix.patch +# Backport patch, update OpenBLAS support +# https://github.com/opencv/opencv/pull/9955 +# https://github.com/opencv/opencv/commit/476c513447eb16784113e982f6bef0dcabb… +Patch50: 476c513447eb16784113e982f6bef0dcabb77732.diff BuildRequires: libtool BuildRequires: cmake >= 2.6.3 @@ -90,10 +104,12 @@ BuildRequires: tbb-devel BuildRequires: zlib-devel pkgconfig BuildRequires: python2-devel BuildRequires: python3-devel +BuildRequires: pylint BuildRequires: python2-numpy BuildRequires: python3-numpy BuildRequires: swig >= 1.3.24 -BuildRequires: python2-sphinx +# opencv now uses doxygen +#BuildRequires: python2-sphinx %{?with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9} %if 0%{?fedora} || 0%{?rhel} > 7 %{?with_gstreamer:BuildRequires: gstreamer1-devel gstreamer1-plugins-base-devel} @@ -109,11 +125,14 @@ BuildRequires: protobuf-devel BuildRequires: gdal-devel BuildRequires: glog-devel BuildRequires: doxygen +#for doc/doxygen/bib2xhtml.pl +BuildRequires: perl-open BuildRequires: gflags-devel BuildRequires: SFML-devel BuildRequires: libucil-devel BuildRequires: qt5-qtbase-devel -BuildRequires: mesa-libGL-devel mesa-libGLU-devel +BuildRequires: mesa-libGL-devel +BuildRequires: mesa-libGLU-devel BuildRequires: hdf5-devel %{?with_vtk:BuildRequires: vtk-devel} %{?with_atlas:BuildRequires: atlas-devel} @@ -132,9 +151,10 @@ BuildRequires: lapack-devel #BuildRequires: lapack64-devel #BuildRequires: torch-devel (retired) } -%{?with_gdcm: -BuildRequires: gdcm-devel -} +%{?with_gdcm:BuildRequires: gdcm-devel} +%{?with_mfx:BuildRequires: libmfx-devel} +%{?with_clp:BuildRequires: coin-or-Clp-devel} +%{?with_va:BuildRequires: libva-devel} Requires: opencv-core%{_isa} = %{version}-%{release} @@ -226,6 +246,7 @@ rm -r 3rdparty/ %patch1 -p1 -b .cmake_paths # missing dependecies for dnn module in Fedora (protobuf-cpp) rm -r modules/dnn/ +%patch50 -p1 -b .openblas pushd %{name}_contrib-%{version} # missing dependecies for dnn_modern module in Fedora (tiny-dnn) rm -r modules/dnn_modern/ @@ -254,33 +275,37 @@ pushd build -DWITH_UNICAP=ON \ -DCMAKE_SKIP_RPATH=ON \ -DWITH_CAROTENE=OFF \ - -DENABLE_PRECOMPILED_HEADERS:BOOL=OFF \ + -DENABLE_PRECOMPILED_HEADERS=OFF \ -DCMAKE_BUILD_TYPE=ReleaseWithDebInfo \ -DBUILD_opencv_java=OFF \ %{?with_tbb: -DWITH_TBB=ON } \ - %{!?with_gstreamer:-DWITH_GSTREAMER=OFF} \ - %{!?with_ffmpeg:-DWITH_FFMPEG=OFF} \ -%{?with_cuda: \ + %{!?with_gstreamer: -DWITH_GSTREAMER=OFF } \ + %{!?with_ffmpeg: -DWITH_FFMPEG=OFF } \ + %{?with_cuda: \ -DWITH_CUDA=ON \ -DCUDA_TOOLKIT_ROOT_DIR=%{?_cuda_topdir} \ -DCUDA_VERBOSE_BUILD=ON \ -DCUDA_PROPAGATE_HOST_FLAGS=OFF \ -} \ + } \ %{?with_openni: -DWITH_OPENNI=ON } \ - %{!?with_xine:-DWITH_XINE=OFF} \ + %{!?with_xine: -DWITH_XINE=OFF } \ -DBUILD_EXAMPLES=ON \ + -DBUILD_DOCS=ON \ -DINSTALL_C_EXAMPLES=ON \ -DINSTALL_PYTHON_EXAMPLES=ON \ + -DENABLE_PYLINT=ON \ -DOPENCL_INCLUDE_DIR=${_includedir}/CL \ -DOPENCV_EXTRA_MODULES_PATH=../opencv_contrib-%{version}/modules \ -DWITH_LIBV4L=ON \ - %{?with_gdcm:-DWITH_GDCM=ON} \ + -DWITH_OPENMP=ON \ + %{?with_gdcm: -DWITH_GDCM=ON } \ + %{?with_mfx: -DWITH_MFX=ON } \ + %{?with_clp: -DWITH_CLP=ON } \ + %{?with_va: -DWITH_VA=ON } \ .. %make_build VERBOSE=1 -make doxygen - popd @@ -391,6 +416,13 @@ popd %{_libdir}/libopencv_xphoto.so.%{abiver}* %changelog +* Fri Jan 26 2018 Sérgio Basto <sergio(a)serjux.com> - 3.3.1-4 +- Enable pylint +- Enable clp +- Enable va +- Provides and obsoletes for opencv-devel-docs +- BuildRequires perl-local do generate documentation without errors + * Thu Jan 25 2018 Sérgio Basto <sergio(a)serjux.com> - 3.3.1-3 - Rename sub-package opencv-python3 to python3-opencv and other minor fixes in python packaging commit 9db935fca20e48e368e986e24a213ec10980f50e Author: Sérgio M. Basto <sergio(a)serjux.com> Date: Fri Jan 26 03:09:43 2018 +0000 Provides and obsoletes for opencv-devel-docs diff --git a/opencv.spec b/opencv.spec index 2f37610..14858e8 100644 --- a/opencv.spec +++ b/opencv.spec @@ -171,6 +171,8 @@ Summary: docs files Group: Development/Libraries Requires: opencv-devel = %{version}-%{release} BuildArch: noarch +Provides: %{name}-devel-docs = %{version}-%{release} +Obsoletes: %{name}-devel-docs < %{version}-%{release} %description doc This package contains the OpenCV documentation, samples and examples programs.

1 0

[Report] Packages Restricting Arches
by root 26 Jan '18

26 Jan '18

New package excluding arches (3) ============================ - rust-cssparser-macros ExclusiveArch: %{rust_arches} - rust-difference ExclusiveArch: %{rust_arches} - rust-phf ExclusiveArch: %{rust_arches} List of packages currently excluding arches (2668) =========================================== - 0ad ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - GtkAda ExclusiveArch: %{GNAT_arches} - GtkAda3 ExclusiveArch: %{GPRbuild_arches} - LuxRender ExclusiveArch: x86_64 - OpenTK ExclusiveArch: %mono_arches - PragmARC ExclusiveArch: %{GNAT_arches} - R-DynDoc ExclusiveArch: armv7, ppc, go_arch - RdRand ExclusiveArch: %{ix86} x86_64 - SLOF ExclusiveArch: ppc64le - YafaRay ExclusiveArch: %{ix86} x86_64 - aboot ExclusiveArch: alpha - acpid ExclusiveArch: ia64 x86_64 %{ix86} %{arm} aarch64 - ahven ExclusiveArch: %{GNAT_arches} - alleyoop ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x %{arm} aarch64 - american-fuzzy-lop ExclusiveArch: %{ix86} x86_64 - anet ExclusiveArch: %{GNAT_arches} - apmd ExclusiveArch: %{ix86} - apmud ExclusiveArch: ppc - appstream-generator ExclusiveArch: x86_64 %{ix86} %{arm} - arduino ExclusiveArch: %{go_arches} - arduino-builder ExclusiveArch: %{go_arches} - arm-boot-config ExclusiveArch: %{arm} - arm-trusted-firmware ExclusiveArch: aarch64 - atomic ExclusiveArch: i386 i486 i586 i686 pentium3 pentium4 athlon geode x86_64 armv3l armv4b armv4l armv4tl armv5tel armv5tejl armv6l armv6hl armv7l armv7hl armv7hnl aarch64 ppc64le s390x mips mipsel mipsr6 mipsr6el mips64 mips64el mips64r6 mips64r6el ExclusiveArch: x86_64 ppc64le - aunit ExclusiveArch: %GPRbuild_arches - avgtime ExclusiveArch: %{ldc_arches} - aws ExclusiveArch: %GPRbuild_arches - banshee ExclusiveArch: %{mono_arches} - banshee-community-extensions ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 %{arm} sparcv9 alpha s390x - bareftp ExclusiveArch: %{mono_arches} - bcc ExclusiveArch: x86_64 %{power64} - bcm283x-firmware ExclusiveArch: %{arm} aarch64 - beignet ExclusiveArch: x86_64 %{ix86} - berusky2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{mips} - biosdevname ExclusiveArch: %{ix86} x86_64 ia64 - bless ExclusiveArch: %mono_arches - boo ExclusiveArch: %{mono_arches} - buildah ExclusiveArch: x86_64 aarch64 ppc64le s390x - bwa ExclusiveArch: x86_64 - caddy ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - cadvisor ExclusiveArch: %{ix86} x86_64 aarch64 ppc64le - calamares ExclusiveArch: %{ix86} x86_64 - cargo ExclusiveArch: %{rust_arches} - carto ExclusiveArch: %{nodejs_arches} noarch - ccdciel ExclusiveArch: %{fpc_arches} - cdcollect ExclusiveArch: %{mono_arches} - ceph ExclusiveArch: x86_64 aarch64 ppc64 ppc64le ExclusiveArch: x86_64 aarch64 ppc64le s390x - chromium ExclusiveArch: x86_64 i686 ExclusiveArch: x86_64 i686 aarch64 - cjdns ExclusiveArch: %{nodejs_arches} - cmospwd ExclusiveArch: %{ix86} x86_64 - cmrt ExclusiveArch: %{ix86} x86_64 ia64 - coffee-script ExclusiveArch: %{nodejs_arches} noarch - colorful ExclusiveArch: %{fpc_arches} - compat-gcc-296 ExclusiveArch: %{ix86} ia64 ppc - consul ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - containerd ExclusiveArch: %{go_arches} - corosync ExclusiveArch: i686 x86_64 - cpuid ExclusiveArch: %{ix86} x86_64 - cqrlog ExclusiveArch: %{fpc_arches} - crash ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - criu ExclusiveArch: x86_64 %{arm} ppc64le aarch64 ExclusiveArch: x86_64 %{arm} ppc64le aarch64 s390x - cryptlib ExclusiveArch: x86_64 %{ix86} aarch64 ppc64 ppc64le - cryptobone ExclusiveArch: x86_64 %{ix86} ppc64 ppc64le aarch64 - daq ExclusiveArch: x86_64 aarch64 - darktable ExclusiveArch: x86_64 aarch64 - dbus-sharp ExclusiveArch: %mono_arches - dbus-sharp-glib ExclusiveArch: %mono_arches - dbxtool ExclusiveArch: i386 x86_64 aarch64 - deepin-api ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - deepin-daemon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-dbus-generator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - deepin-gir-generator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - derelict ExclusiveArch: %{ldc_arches} - direnv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - dlm ExclusiveArch: i686 x86_64 - dmidecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - dmtcp ExclusiveArch: %ix86 x86_64 aarch64 - docco ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - docker ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - docker-anaconda-addon ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - docker-distribution ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - docker-latest ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - dolphin-emu ExclusiveArch: x86_64 armv7l aarch64 - douceur ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - dpdk ExclusiveArch: x86_64 i686 aarch64 ppc64le - dssi-vst ExclusiveArch: %{ix86} x86_64 - dustmite ExclusiveArch: %{ldc_arches} - dyninst ExclusiveArch: %{ix86} x86_64 ppc ppc64 - e3 ExclusiveArch: %{ix86} x86_64 - edac-utils ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} - edb ExclusiveArch: %{ix86} x86_64 - edk2 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: x86_64 aarch64 - efibootmgr ExclusiveArch: %{ix86} x86_64 aarch64 arm - efivar ExclusiveArch: %{ix86} x86_64 aarch64 - elasticdump ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - elk ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - embree ExclusiveArch: x86_64 - envytools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - etcd ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - exciting ExclusiveArch: x86_64 %{ix86} ExclusiveArch: x86_64 %{ix86} aarch64 %{arm} %{power64} - exercism ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - expresso ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - extlinux-bootloader ExclusiveArch: %{arm} aarch64 - fcitx-libpinyin ExclusiveArch: %{qt5_qtwebengine_arches} - fedora-developer-portal ExclusiveArch: ix86 x86_64 - fedora-dockerfiles ExclusiveArch: %{go_arches} - fedora-gnat-project-common ExclusiveArch: noarch %{GNAT_arches} - fence-virt ExclusiveArch: i686 x86_64 - fes ExclusiveArch: x86_64 - ffcall ExclusiveArch: %{ffcall_arches} - firmware-addon-dell ExclusiveArch: x86_64 ia64 %{ix86} - flannel ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - florist ExclusiveArch: %GPRbuild_arches - fluxcapacitor ExclusiveArch: %{ix86} x86_64 %{arm} - fpc ExclusiveArch: %{arm} %{ix86} x86_64 ppc ppc64 - freshmaker ExclusiveArch: %{ix86} x86_64 - frysk ExclusiveArch: %{ix86} x86_64 ppc64 - fst ExclusiveArch: i686 - fwts ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x %{power64} - fwupdate ExclusiveArch: x86_64 aarch64 - fzf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - ga ExclusiveArch: %{ix86} x86_64 - gbrainy ExclusiveArch: %mono_arches - gdata-sharp ExclusiveArch: %mono_arches - gdb-exploitable ExclusiveArch: x86_64 i386 ExclusiveArch: x86_64 noarch - gela-asis ExclusiveArch: %{GNAT_arches} - ghdl ExclusiveArch: %{GNAT_arches} - gio-sharp ExclusiveArch: %mono_arches - gir-to-d ExclusiveArch: %{ldc_arches} - git-lfs ExclusiveArch: %{go_arches} - git-octopus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - giver ExclusiveArch: %{mono_arches} - gkeyfile-sharp ExclusiveArch: %mono_arches - gl3n ExclusiveArch: %{ldc_arches} - glibc32 ExclusiveArch: x86_64 ppc64 s390x - glide ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gmqcc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - gnatcoll ExclusiveArch: %GPRbuild_arches - gnome-boxes ExclusiveArch: x86_64 - gnome-desktop-sharp ExclusiveArch: %mono_arches - gnome-do ExclusiveArch: %mono_arches - gnome-guitar ExclusiveArch: %{mono_arches} - gnome-keyring-sharp ExclusiveArch: %mono_arches - gnome-rdp ExclusiveArch: %{mono_arches} - gnome-sharp ExclusiveArch: %mono_arches - gnome-subtitles ExclusiveArch: %mono_arches - gnu-efi ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - gnu-smalltalk ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le - go-bindata ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - go-compilers ExclusiveArch: %{go_arches} - go-i18n ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - gocomplete ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - godep ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gofed ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - golang ExclusiveArch: %{golang_arches} - golang-bazil-fuse ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-bitbucket-kardianos-osext ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-bitbucket-ww-goautoneg ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-deepin-go-lib ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-10gen-openssl ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - golang-github-3rf-mongo-lint ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-AdRoll-goamz ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-AudriusButkevicius-cli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-AudriusButkevicius-go-nat-pmp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-AudriusButkevicius-kcp-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-AudriusButkevicius-pfilter ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-Azure-azure-sdk-for-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-freetype-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-graphics-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-toml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-BurntSushi-toml-test ExclusiveArch: %{go_arches} - golang-github-BurntSushi-xgb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-BurntSushi-xgbutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-DATA-DOG-go-sqlmock ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-DataDog-datadog-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Jeffail-gabs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-MakeNowJust-heredoc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Masterminds-semver ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Masterminds-vcs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-PuerkitoBio-goquery ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-PuerkitoBio-purell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-PuerkitoBio-urlesc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-RangelReale-osin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-RangelReale-osincli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-SAP-go-hdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-SeanDolphin-bqschema ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-SermoDigital-jose ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-Shopify-sarama ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Shopify-toxiproxy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Sirupsen-logrus ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-ThomsonReutersEikon-go-ntlm ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-Unknwon-goconfig ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-VividCortex-ewma ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-abbot-go-http-auth ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-agl-ed25519 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-akrennmair-gopcap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-alecthomas-assert ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-chroma ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-alecthomas-colour ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-kingpin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-repr ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-template ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-alecthomas-units ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-andybalholm-cascadia ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-appc-spec ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-armon-circbuf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-armon-go-metrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-armon-go-proxyproto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-armon-go-radix ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-armon-gomdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-asaskevich-govalidator ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-auth0-go-jwt-middleware ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-aws-aws-sdk-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-axgle-mahonia ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-beorn7-perks ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bep-gitmap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bep-inflect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bgentry-go-netrc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bgentry-speakeasy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-billziss-gh-cgofuse ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bitly-go-simplejson ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bkaradzic-go-lz4 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-blang-semver ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bmizerany-assert ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bmizerany-pat ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bmizerany-perks ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-boltdb-bolt ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-boombuler-barcode ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bradfitz-http2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-bugsnag-bugsnag-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-bugsnag-panicwrap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-calmh-du ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-calmh-luhn ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-calmh-xdr ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-ccding-go-stun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cenkalti-backoff ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-chaseadamsio-goorgeous ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cheggaaa-pb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-chmduquesne-rollinghash ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-chrismalek-oktasdk-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-chzyer-logex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-chzyer-test ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-circonus-labs-circonus-gometrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-circonus-labs-circonusllhist ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cloudfoundry-incubator-candiedyaml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cockroachdb-cmux ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cockroachdb-cockroach-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-codahale-aesnicheck ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-codegangsta-cli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-codegangsta-negroni ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-collectd-go-collectd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-coreos-gexpect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-coreos-go-etcd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-coreos-go-iptables ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-coreos-go-log ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-coreos-go-oidc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-coreos-go-semver ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-coreos-go-systemd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-coreos-pkg ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cpuguy83-go-md2man ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-cznic-b ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-fileutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-golex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-internal ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-lex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-lexer ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-lldb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-mathutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-ql ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-sortutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-strutil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-cznic-zappy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-d2g-dhcp4 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-d2g-dhcp4client ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-d4l3k-messagediff ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-danwakefield-fnmatch ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-davecgh-go-spew ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-daviddengcn-go-colortext ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-dchest-cssmin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dchest-siphash ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-denisenkom-go-mssqldb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-denverdino-aliyungo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-dgnorton-goback ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-dgrijalva-jwt-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-digitalocean-godo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-disintegration-imaging ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-dlclark-regexp2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-docker-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-go-connections ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-go-units ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-libcontainer ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-libkv ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-libtrust ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docker-spdystream ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-docopt-docopt-go ExclusiveArch: %{go_arches} - golang-github-duosecurity-duo_api_golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dustin-go-humanize ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-dvsekhvalnov-jose2go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-eapache-go-resiliency ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-eapache-queue ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-edsrzf-mmap-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-eknkc-amber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-elazarl-go-bindata-assetfs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-emicklei-go-restful ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-endophage-gotuf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-evanphx-json-patch ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fatih-color ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fatih-pool ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fatih-structs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-flynn-go-shlex ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-flynn-json5 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fortytw2-leaktest ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fsnotify-fsnotify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-fsouza-go-dockerclient ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-fullsailor-pkcs7 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-garyburd-redigo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gdamore-encoding ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gdamore-tcell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gengo-grpc-gateway ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-getsentry-raven-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-ghodss-yaml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-glacjay-goini ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-asn1-ber-asn1-ber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-errors-errors ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-fsnotify-fsnotify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-go-ini-ini ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-go-ldap-ldap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-macaron-inject ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-go-mgo-mgo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-sql-driver-mysql ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-go-tomb-tomb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gobwas-glob ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gocql-gocql ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-godbus-dbus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-appengine ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-glog ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-groupcache ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-golang-image ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-sync ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-sys ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-golang-time ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-blas ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-floats ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-graph ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-internal ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-lapack ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gonum-matrix ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-google-btree ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-google-go-cmp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-google-go-genproto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-google-go-github ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-google-go-querystring ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-google-gofuzz ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-goraft-raft ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-context ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-css ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-gorilla-handlers ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-mux ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-securecookie ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-sessions ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gorilla-websocket ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-gosexy-gettext ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-grpc-ecosystem-go-grpc-prometheus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-grpc-ecosystem-grpc-gateway ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-grpc-grpc-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hailocab-go-hostpool ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-consul-migrate ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-errwrap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-checkpoint ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-cleanhttp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-hclog ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-immutable-radix ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-memdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-msgpack ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-multierror ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-plugin ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-retryablehttp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-rootcerts ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-sockaddr ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-go-syslog ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-go-uuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-golang-lru ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-hcl ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-hil ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-hashicorp-logutils ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-mdns ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-memberlist ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-net-rpc-msgpackrpc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-raft ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-raft-boltdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-raft-mdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-scada-client ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-serf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hashicorp-yamux ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-hawkular-hawkular-client-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-howeyc-fsnotify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-howeyc-gopass ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-imdario-mergo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-inconshreveable-mousetrap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-inconshreveable-muxado ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-influxdb-hyperleveldb-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-influxdb-influxdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-influxdb-rocksdb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jackpal-gateway ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jacobsa-oglematchers ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jdkato-prose ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jdkato-syllables ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jefferai-jsonx ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jessevdk-go-flags ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jfrazelle-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jinzhu-gorm ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jlaffaye-ftp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jmespath-go-jmespath ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jmhodges-levigo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-jonboulle-clockwork ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-jtolds-gls ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-juju-ratelimit ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-julienschmidt-httprouter ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-karlseguin-ccache ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-karlseguin-expect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-kballard-go-shellquote ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-kdar-factorlog ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-keybase-go-crypto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-kimor79-gollectd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-klauspost-cpuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-klauspost-crc32 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-klauspost-reedsolomon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-knieriem-markdown ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-kr-fs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-kr-pretty ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-kr-pty ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-kr-text ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-kylelemons-godebug ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-kyokomi-emoji ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-lib-pq ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-linuxdeepin-go-x11-client ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-lpabon-godbc ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-lsegal-gucumber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-lucasb-eyer-go-colorful ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-magiconair-properties ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-markbates-inflect ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mattn-go-colorable ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mattn-go-isatty ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mattn-go-runewidth ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mattn-go-shellwords ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mattn-go-sqlite3 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-matttproud-golang_protobuf_extensions ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mesos-mesos-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mgutz-ansi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mgutz-logxi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-michaelklishin-rabbit-hole ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-miekg-dns ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-miekg-mmark ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-miekg-pkcs11 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-milochristiansen-axis2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-milochristiansen-lua ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-minio-sha256-simd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mistifyio-go-zfs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mitchellh-cli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-copystructure ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-go-homedir ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mitchellh-go-testing-interface ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-go-wordwrap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-goamz ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mitchellh-mapstructure ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mitchellh-reflectwalk ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-montanaflynn-stats ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-mreiferson-go-httpclient ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-msteinert-pam ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mvo5-goconfigparser ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mvo5-uboot-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-mxk-go-flowrate ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-ncw-dropbox-sdk-go-unofficial ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-ncw-go-acd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-ncw-swift ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-neurosnap-sentences ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-nfnt-resize ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-noahdesu-go-ceph ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-nsf-termbox-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-nwidger-jsoncolor ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-ojii-gettext.go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-olekukonko-tablewriter ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-olekukonko-ts ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-olivere-elastic ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-onsi-ginkgo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-onsi-gomega ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-opencontainers-runtime-spec ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-opencontainers-specs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-openshift-go-json-rest ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-openshift-go-systemd ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-openshift-openshift-sdn ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-oschwald-geoip2-golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-oschwald-maxminddb-golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-patrickmn-go-cache ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-pelletier-go-buffruneio ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-pelletier-go-toml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-petar-GoLLRB ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-peterh-liner ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-petermattis-goid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-pkg-errors ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-pkg-profile ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-pkg-sftp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-pmezard-go-difflib ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-pquerna-otp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-prometheus-client_golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-prometheus-client_model ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-prometheus-common ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-prometheus-procfs ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-prometheus-prometheus ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-racker-perigee ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rackspace-gophercloud ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-rakyll-globalconf ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rakyll-pb ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-rakyll-statik ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rcrowley-go-metrics ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-remyoudompheng-bigfft ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-rfjakob-eme ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-robertkrimen-otto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-russross-blackfriday ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-ryanuber-columnize ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-ryanuber-go-glob ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-samalba-dockerclient ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-samuel-go-zookeeper ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-sasha-s-go-deadlock ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-seccomp-libseccomp-golang ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-sergi-go-diff ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-sethgrid-pester ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shiena-ansicolor ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shogo82148-go-shuffle ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-shurcooL-sanitized_anchor_name ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-skarademir-naturalsort ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-skratchdot-open-golang ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-skynetservices-skydns ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-smartystreets-assertions ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-smartystreets-go-aws-auth ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-smartystreets-goconvey ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spacejam-loghisto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-spacemonkeygo-flagfile ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-spacemonkeygo-openssl ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm} ppc64le s390x} - golang-github-spacemonkeygo-spacelog ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-spf13-afero ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-cast ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-cobra ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-spf13-fsync ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-jWalterWeatherman ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-nitro ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-spf13-pflag ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-spf13-viper ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-sstarcher-go-okta ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stathat-go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-stevvooe-resumable ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-streadway-amqp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stretchr-objx ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-stretchr-testify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-syndtr-gocapability ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-syndtr-goleveldb ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-syndtr-gosnappy ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-templexxx-cpufeat ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-templexxx-reedsolomon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-templexxx-xor ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-tent-http-link-go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-thejerf-suture ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-tjfoc-gmsm ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-tonnerre-golang-pretty ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-ugorji-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-urfave-cli ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-vaughan0-go-ini ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-vbatts-tar-split ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-vishvananda-netlink ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} aarch64 x86_64 %{arm}} - golang-github-vishvananda-netns ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-vitrun-qart ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-vjeantet-asn1-ber ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-vmware-govcloudair ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-github-wsxiaoys-terminal ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xanzy-ssh-agent ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonpointer ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonreference ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xeipuuv-gojsonschema ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xiang90-probing ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-xtaci-kcp-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-xtaci-smux ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yosssi-ace ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yosssi-gohtml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yuin-gopher-lua ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-yvasiyarov-go-metrics ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-yvasiyarov-gorelic ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-yvasiyarov-newrelic_platform_go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-github-zillode-notify ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-zyedidia-clipboard ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-zyedidia-glob ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-zyedidia-poller ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-github-zyedidia-tcell ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-google-golangorg-cloud ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-gcfg ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-go-crypto ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-go-decimal-inf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-go-exp ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-googlecode-goauth2 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-gogoprotobuf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-gomock ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-google-api-client ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-goprotobuf ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-log4go ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-net ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-sqlite ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} ExclusiveArch: %{go_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - golang-googlecode-text ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-tools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-googlecode-uuid ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-check ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-go-check-check ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-gopkg-go-macaroon-macaroon ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - golang-gopkg-readline ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-retry-v1 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-sourcemap ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-gopkg-yaml ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-layeh-gopher-luar ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golang-torproject-pluggable-transports-goptlib ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - golint ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gomtree ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - gotags ExclusiveArch: %{go_arches} - gotun ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: x86_64 - gprbuild ExclusiveArch: %{GPRbuild_arches} %{bootstrap_arch} - gprolog ExclusiveArch: x86_64 %{ix86} ppc alpha - gsf-sharp ExclusiveArch: %mono_arches - gtk-sharp-beans ExclusiveArch: %mono_arches - gtk-sharp2 ExclusiveArch: %mono_arches - gtk-sharp3 ExclusiveArch: %{mono_arches} - gtkd ExclusiveArch: %{ldc_arches} - gudev-sharp ExclusiveArch: %mono_arches - hedgewars ExclusiveArch: %{fpc_arches} - heketi ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - hub ExclusiveArch: %{go_arches} - hugo ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - hyena ExclusiveArch: %{mono_arches} - hyperscan ExclusiveArch: x86_64 - hyperv-daemons ExclusiveArch: i686 x86_64 - icaro ExclusiveArch: %{ix86} %{arm} x86_64 noarch - ikarus ExclusiveArch: %{ix86} - imvirt ExclusiveArch: %{ix86} x86_64 ia64 - indistarter ExclusiveArch: %{fpc_arches} - infinipath-psm ExclusiveArch: x86_64 - intel-cmt-cat ExclusiveArch: x86_64 i686 i586 ExclusiveArch: x86_64 i686 i586 - ioport ExclusiveArch: %{ix86} x86_64 - ipw2100-firmware ExclusiveArch: noarch i386 x86_64 - ipw2200-firmware ExclusiveArch: noarch i386 x86_64 - ispc ExclusiveArch: %{arm} %{ix86} x86_64 - iucode-tool ExclusiveArch: %{ix86} x86_64 - iwyu ExclusiveArch: %{ix86} x86_64 - ixpdimm_sw ExclusiveArch: x86_64 - jake ExclusiveArch: %{nodejs_arches} noarch - jasmine-node ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - java-1.8.0-openjdk-aarch32 ExclusiveArch: %{arm} - julia ExclusiveArch: %{ix86} x86_64 - keepass ExclusiveArch: %{mono_arches} - kernel ExclusiveArch: %{all_x86} x86_64 ppc64 s390x %{arm} aarch64 ppc64le - kicad ExclusiveArch: %{ix86} x86_64 %{arm} ppc64 ppc64le aarch64 - knot-resolver ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - kompose ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 s390x - kosmtik ExclusiveArch: %{nodejs_arches} noarch - kubernetes ExclusiveArch: x86_64 aarch64 ppc64le s390x - latrace ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} - lazarus ExclusiveArch: %{fpc_arches} - ldc ExclusiveArch: %{ldc_arches} - libbsr ExclusiveArch: %{power64} - libclc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 %{power64} s390x - libcxl ExclusiveArch: %{power64} - libflatarray ExclusiveArch: %{ix86} x86_64 - libhfi1 ExclusiveArch: x86_64 - libica ExclusiveArch: s390 s390x - libinvm-cim ExclusiveArch: x86_64 - libinvm-cli ExclusiveArch: x86_64 - libinvm-i18n ExclusiveArch: x86_64 - libipt ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - libjingle ExclusiveArch: %{ix86} x86_64 %{arm} - libmfx ExclusiveArch: %{ix86} x86_64 - libpsm2 ExclusiveArch: x86_64 - librtas ExclusiveArch: ppc %{power64} - libseccomp ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 mipsel mips64el ppc64 ppc64le s390 s390x - libservicelog ExclusiveArch: ppc %{power64} - libsmbios ExclusiveArch: x86_64 ia64 %{ix86} - libunwind ExclusiveArch: %{arm} aarch64 hppa ia64 mips ppc %{power64} %{ix86} x86_64 - libva-intel-hybrid-driver ExclusiveArch: %{ix86} x86_64 ia64 - libvmi ExclusiveArch: x86_64 - libvpd ExclusiveArch: ppc %{power64} - libxsmm ExclusiveArch: x86_64 - libzfcphbaapi ExclusiveArch: s390 s390x - lldb ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - lodash ExclusiveArch: %{nodejs_arches} noarch - log4net ExclusiveArch: %mono_arches - lrmi ExclusiveArch: %{ix86} - lsvpd ExclusiveArch: ppc %{power64} - luajit ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mactel-boot ExclusiveArch: x86_64 - manifest-tool ExclusiveArch: x86_64 aarch64 ppc64le s390x - marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - matreshka ExclusiveArch: %GPRbuild_arches - maven-eclipse-plugin ExclusiveArch: %{ix86} x86_64 - maxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - mcelog ExclusiveArch: i686 x86_64 - mediaconch ExclusiveArch: %{qt5_qtwebengine_arches} - mellowplayer ExclusiveArch: %{qt5_qtwebengine_arches} - memkind ExclusiveArch: x86_64 - memtest86+ ExclusiveArch: %{ix86} x86_64 - mesos ExclusiveArch: x86_64 - micro ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - microcode_ctl ExclusiveArch: %{ix86} x86_64 - micropython ExclusiveArch: %{arm} %{ix86} x86_64 - mine_detector ExclusiveArch: %{GNAT_arches} - minetest ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - mingw-wine-gecko ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - mkbootdisk ExclusiveArch: %{ix86} sparc sparc64 x86_64 - mnemosyne ExclusiveArch: noarch %{qt5_qtwebengine_arches} - mocha ExclusiveArch: %{nodejs_arches} noarch - mod_mono ExclusiveArch: %mono_arches - module-build-service ExclusiveArch: %{ix86} x86_64 noarch - mokutil ExclusiveArch: %{ix86} x86_64 aarch64 - mongo-tools ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - mono ExclusiveArch: %mono_arches - mono-addins ExclusiveArch: %mono_arches - mono-basic ExclusiveArch: %{mono_arches} - mono-bouncycastle ExclusiveArch: %mono_arches - mono-cecil ExclusiveArch: %mono_arches - mono-cecil-flowanalysis ExclusiveArch: %mono_arches - mono-debugger ExclusiveArch: %ix86 x86_64 - mono-reflection ExclusiveArch: %mono_arches - mono-tools ExclusiveArch: %mono_arches - mono-zeroconf ExclusiveArch: %mono_arches - monobristol ExclusiveArch: %{mono_arches} - monodevelop ExclusiveArch: %mono_arches - monodevelop-debugger-gdb ExclusiveArch: %{mono_arches} - monosim ExclusiveArch: %mono_arches - mrrescue ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - msr-tools ExclusiveArch: %{ix86} x86_64 - mustache-d ExclusiveArch: %{ldc_arches} - mysql-connector-net ExclusiveArch: %{mono_arches} - nacl-arm-binutils ExclusiveArch: x86_64 - nacl-arm-gcc ExclusiveArch: x86_64 - nacl-arm-newlib ExclusiveArch: x86_64 - nacl-binutils ExclusiveArch: x86_64 - nacl-gcc ExclusiveArch: x86_64 - nacl-newlib ExclusiveArch: x86_64 - nant ExclusiveArch: %mono_arches - nbc ExclusiveArch: %{fpc_arches} - nbdkit ExclusiveArch: x86_64 - ndesk-dbus ExclusiveArch: %{mono_arches} - ndesk-dbus-glib ExclusiveArch: %{mono_arches} - newtonsoft-json ExclusiveArch: %{mono_arches} - nim ExclusiveArch: %{nim_arches} - nini ExclusiveArch: %{mono_arches} - node-gyp ExclusiveArch: %{nodejs_arches} noarch - nodejs ExclusiveArch: %{nodejs_arches} - nodejs-Base64 ExclusiveArch: %{nodejs_arches} noarch - nodejs-abbrev ExclusiveArch: %{nodejs_arches} noarch - nodejs-accepts ExclusiveArch: %{nodejs_arches} noarch - nodejs-acorn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-acorn-object-spread ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-after ExclusiveArch: %{nodejs_arches} noarch - nodejs-agent-base ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-agentkeepalive ExclusiveArch: %{nodejs_arches} noarch - nodejs-ain2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-align-text ExclusiveArch: %{nodejs_arches} noarch - nodejs-alter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblack ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgblue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgcyan ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bggreen ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgmagenta ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgred ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgwhite ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bgyellow ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-black ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-blue ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-bold ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-cyan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-dim ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-font ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-gray ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-green ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-grey ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-hidden ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-inverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-italic ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-magenta ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-red ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-reset ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-strikethrough ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-styles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-underline ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-white ExclusiveArch: %{nodejs_arches} noarch - nodejs-ansi-wrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansi-yellow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansicolors ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansidiff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ansistyles ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-any-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ap ExclusiveArch: %{nodejs_arches} noarch - nodejs-append-field ExclusiveArch: %{nodejs_arches} noarch - nodejs-append-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-aproba ExclusiveArch: %{nodejs_arches} noarch - nodejs-archiver ExclusiveArch: %{nodejs_arches} noarch - nodejs-archiver-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-archy ExclusiveArch: %{nodejs_arches} noarch - nodejs-are-we-there-yet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-argparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-argsparser ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-exclude ExclusiveArch: %{nodejs_arches} noarch - nodejs-arr-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arr-union ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-buffer-from-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-differ ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-find ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-find-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-flatten ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-foreach ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-ify ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-array-union ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-uniq ExclusiveArch: %{nodejs_arches} noarch - nodejs-array-unique ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-arraybuffer-dot-slice ExclusiveArch: %{nodejs_arches} noarch - nodejs-arraybuffer-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-arrify ExclusiveArch: %{nodejs_arches} noarch - nodejs-as-number ExclusiveArch: %{nodejs_arches} noarch - nodejs-asap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ascii-tree ExclusiveArch: %{nodejs_arches} noarch - nodejs-ascli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-asn1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-assert-plus ExclusiveArch: %{nodejs_arches} noarch - nodejs-assertion-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-assume ExclusiveArch: %{nodejs_arches} noarch - nodejs-ast-traverse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ast-types ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-astral ExclusiveArch: %{nodejs_arches} noarch - nodejs-astral-angular-annotate ExclusiveArch: %{nodejs_arches} noarch - nodejs-astral-pass ExclusiveArch: %{nodejs_arches} noarch - nodejs-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-array-reduce ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-async-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-limiter ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-queue ExclusiveArch: %{nodejs_arches} noarch - nodejs-async-some ExclusiveArch: %{nodejs_arches} noarch - nodejs-asynckit ExclusiveArch: %{nodejs_arches} noarch - nodejs-atob ExclusiveArch: %{nodejs_arches} noarch - nodejs-auto-bind ExclusiveArch: %{nodejs_arches} noarch - nodejs-autoresolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-ava-init ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-aws-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws-sign2 ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-aws4 ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-messages ExclusiveArch: %{nodejs_arches} noarch - nodejs-babel-runtime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-backbone ExclusiveArch: %{nodejs_arches} noarch - nodejs-backoff ExclusiveArch: %{nodejs_arches} noarch - nodejs-balanced-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-base ExclusiveArch: %{nodejs_arches} noarch - nodejs-base-option ExclusiveArch: %{nodejs_arches} noarch - nodejs-base-plugins ExclusiveArch: %{nodejs_arches} noarch - nodejs-base32-encode ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-arraybuffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-base64-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-base64-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-base64id ExclusiveArch: %{nodejs_arches} noarch - nodejs-bash-match ExclusiveArch: %{nodejs_arches} noarch - nodejs-basic-auth ExclusiveArch: %{nodejs_arches} noarch - nodejs-basic-auth-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-basic-auth-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-batch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bcrypt ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-bcryptjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-beeper ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-benchmark ExclusiveArch: %{nodejs_arches} noarch - nodejs-better-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-better-than-before ExclusiveArch: %{nodejs_arches} noarch - nodejs-bignumber-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-bind-obj-methods ExclusiveArch: %{nodejs_arches} noarch - nodejs-bindings ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bl ExclusiveArch: %{nodejs_arches} noarch - nodejs-blob ExclusiveArch: %{nodejs_arches} noarch - nodejs-block-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-bluebird ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-body-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-boolbase ExclusiveArch: %{nodejs_arches} noarch - nodejs-boom ExclusiveArch: %{nodejs_arches} noarch - nodejs-brace-expansion ExclusiveArch: %{nodejs_arches} noarch - nodejs-braces ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-breakable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-browser-request ExclusiveArch: %{nodejs_arches} noarch - nodejs-browser-stdout ExclusiveArch: %{nodejs_arches} noarch - nodejs-bson ExclusiveArch: %{nodejs_arches} noarch - nodejs-buble ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buf-compare ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-crc32 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-equal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-buffer-shims ExclusiveArch: %{nodejs_arches} noarch - nodejs-buffer-writer ExclusiveArch: %{nodejs_arches} noarch - nodejs-buffertools ExclusiveArch: %{nodejs_arches} - nodejs-bufferutil ExclusiveArch: %{nodejs_arches} - nodejs-builtin-modules ExclusiveArch: %{nodejs_arches} noarch - nodejs-builtins ExclusiveArch: %{nodejs_arches} noarch - nodejs-bundle-dependencies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bunker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-bunyan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-burrito ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-busboy ExclusiveArch: %{nodejs_arches} noarch - nodejs-byline ExclusiveArch: %{nodejs_arches} noarch - nodejs-bytes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cache-base ExclusiveArch: %{nodejs_arches} noarch - nodejs-caching-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-call-delayed ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-matcher ExclusiveArch: %{nodejs_arches} noarch - nodejs-call-signature ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-callback-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-caller-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsite ExclusiveArch: %{nodejs_arches} noarch - nodejs-callsites ExclusiveArch: %{nodejs_arches} noarch - nodejs-camel-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-camelcase-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-caniuse-db ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-capture-stack-trace ExclusiveArch: %{nodejs_arches} noarch - nodejs-carrier ExclusiveArch: %{nodejs_arches} noarch - nodejs-caseless ExclusiveArch: %{nodejs_arches} noarch - nodejs-center-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-connect-middleware ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-oauth2orize-grant ExclusiveArch: %{nodejs_arches} noarch - nodejs-chai-passport-strategy ExclusiveArch: %{nodejs_arches} noarch - nodejs-chainer ExclusiveArch: %{nodejs_arches} noarch - nodejs-chainsaw ExclusiveArch: %{nodejs_arches} noarch - nodejs-chalk ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-change-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-char-spinner ExclusiveArch: %{nodejs_arches} noarch - nodejs-character-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-charm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cheerio ExclusiveArch: %{nodejs_arches} noarch - nodejs-child-process-close ExclusiveArch: %{nodejs_arches} noarch - nodejs-chmodr ExclusiveArch: %{nodejs_arches} noarch - nodejs-chownr ExclusiveArch: %{nodejs_arches} noarch - nodejs-chroma-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-chrono ExclusiveArch: %{nodejs_arches} noarch - nodejs-circular-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-cjson ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-class-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-clean-css ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-clean-yaml-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-spinner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cli-table ExclusiveArch: %{nodejs_arches} noarch - nodejs-cliui ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-clone-stats ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-closure-compiler ExclusiveArch: %{nodejs_arches} noarch - nodejs-cls ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cmd-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-co ExclusiveArch: %{nodejs_arches} noarch - nodejs-co-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-co-with-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-coa ExclusiveArch: %{nodejs_arches} noarch - nodejs-code-point-at ExclusiveArch: %{nodejs_arches} noarch - nodejs-codemirror ExclusiveArch: %{nodejs_arches} noarch - nodejs-coffee-coverage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-collection-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-collections ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-color-support ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-colors ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-colour ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-columnify ExclusiveArch: %{nodejs_arches} noarch - nodejs-combined-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-commander ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-common-path-prefix ExclusiveArch: %{nodejs_arches} noarch - nodejs-commondir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-commoner ExclusiveArch: %{nodejs_arches} noarch - nodejs-commonmark ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-compare-func ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-emitter ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-component-inherit ExclusiveArch: %{nodejs_arches} noarch - nodejs-compress-commons ExclusiveArch: %{nodejs_arches} noarch - nodejs-compressible ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-compression ExclusiveArch: %{nodejs_arches} noarch - nodejs-concat-map ExclusiveArch: %{nodejs_arches} noarch - nodejs-concat-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-config-chain ExclusiveArch: %{nodejs_arches} noarch - nodejs-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-connect-livereload ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-connect-timeout ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-console-browserify ExclusiveArch: %{nodejs_arches} noarch - nodejs-console-dot-log ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-consolemd ExclusiveArch: %{nodejs_arches} noarch - nodejs-constant-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-constantinople ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-content-disposition ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-content-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-angular ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-changelog-writer ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-commits-filter ExclusiveArch: %{nodejs_arches} noarch - nodejs-conventional-commits-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-convert-hex ExclusiveArch: %{nodejs_arches} noarch - nodejs-convert-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie-jar ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookie-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookie-session ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookie-signature ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cookiejar ExclusiveArch: %{nodejs_arches} noarch - nodejs-cookies ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-copy-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-core-assert ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-core-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-core-util-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cors ExclusiveArch: %{nodejs_arches} noarch - nodejs-couch-login ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-coveralls ExclusiveArch: %{nodejs_arches} noarch - nodejs-crc ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-crc32-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-create-error-class ExclusiveArch: %{nodejs_arches} noarch - nodejs-cross-spawn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cross-spawn-async ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cryptiles ExclusiveArch: %{nodejs_arches} noarch - nodejs-csrf ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-select ExclusiveArch: %{nodejs_arches} noarch - nodejs-css-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-css-tree ExclusiveArch: %{nodejs_arches} noarch - nodejs-css-what ExclusiveArch: %{nodejs_arches} noarch - nodejs-csscomb-core ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csslint ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csso ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cssom ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csurf ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-generate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-spectrum ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-csv-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ctype ExclusiveArch: %{nodejs_arches} noarch - nodejs-currently-unhandled ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cycle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-cyclist ExclusiveArch: %{nodejs_arches} noarch - nodejs-d ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dargs ExclusiveArch: %{nodejs_arches} noarch - nodejs-dashdash ExclusiveArch: %{nodejs_arches} noarch - nodejs-data-uri-to-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-date-now ExclusiveArch: %{nodejs_arches} noarch - nodejs-dateformat ExclusiveArch: %{nodejs_arches} noarch - nodejs-death ExclusiveArch: %{nodejs_arches} noarch - nodejs-debug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-debug-fabulous ExclusiveArch: %{nodejs_arches} noarch - nodejs-debuglog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-decamelize ExclusiveArch: %{nodejs_arches} noarch - nodejs-decompress-response ExclusiveArch: %{nodejs_arches} noarch - nodejs-dedent ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-eql ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-equal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deep-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-deep-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-default-require-extensions ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-default-resolution ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-defaults ExclusiveArch: %{nodejs_arches} noarch - nodejs-defence ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-defence-cli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-deferred ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-properties ExclusiveArch: %{nodejs_arches} noarch - nodejs-define-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-defined ExclusiveArch: %{nodejs_arches} noarch - nodejs-defs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-degenerator ExclusiveArch: %{nodejs_arches} noarch - nodejs-del ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-delayed-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-delegates ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-delete ExclusiveArch: %{nodejs_arches} noarch - nodejs-dep-graph ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-depd ExclusiveArch: %{nodejs_arches} noarch - nodejs-dependency-lister ExclusiveArch: %{nodejs_arches} noarch - nodejs-deprecated ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-indent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-detect-newline ExclusiveArch: %{nodejs_arches} noarch - nodejs-detect-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-detective ExclusiveArch: %{nodejs_arches} noarch - nodejs-dezalgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-dicer ExclusiveArch: %{nodejs_arches} noarch - nodejs-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-difflet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-difflib ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-docopt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-doctrine ExclusiveArch: %{nodejs_arches} noarch - nodejs-dom-serializer ExclusiveArch: %{nodejs_arches} noarch - nodejs-domelementtype ExclusiveArch: %{nodejs_arches} noarch - nodejs-domhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-domutils ExclusiveArch: %{nodejs_arches} noarch - nodejs-dot-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-dot-prop ExclusiveArch: %{nodejs_arches} noarch - nodejs-dotfile-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dreamopt ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-dryice ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-dtree ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplex ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplexer ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplexer2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-duplexer3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-duplexify ExclusiveArch: %{nodejs_arches} noarch - nodejs-duration ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-each ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-each-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-ebnf-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-echomd ExclusiveArch: %{nodejs_arches} noarch - nodejs-ecstatic ExclusiveArch: %{nodejs_arches} noarch - nodejs-editor ExclusiveArch: %{nodejs_arches} noarch - nodejs-ee-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-ejs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-emojione ExclusiveArch: %{nodejs_arches} noarch - nodejs-empty-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-encodeurl ExclusiveArch: %{nodejs_arches} noarch - nodejs-encoding ExclusiveArch: %{nodejs_arches} noarch - nodejs-end-of-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io-client ExclusiveArch: %{nodejs_arches} noarch - nodejs-engine-dot-io-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-entities ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-ex ExclusiveArch: %{nodejs_arches} noarch - nodejs-error-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-errorhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-errs ExclusiveArch: %{nodejs_arches} noarch - nodejs-es-abstract ExclusiveArch: %{nodejs_arches} noarch - nodejs-es-to-primitive ExclusiveArch: %{nodejs_arches} noarch - nodejs-es5-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es5-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-iterator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-promisify ExclusiveArch: %{nodejs_arches} noarch - nodejs-es6-set ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-es6-weak-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escallmatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-escape-html ExclusiveArch: %{nodejs_arches} noarch - nodejs-escape-regexp-component ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-escape-string-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-escodegen ExclusiveArch: %{nodejs_arches} noarch - nodejs-escope ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espower ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espower-location-detector ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima-fb ExclusiveArch: %{nodejs_arches} noarch - nodejs-esprima-harmony-jscs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-espurify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-esrecurse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estraverse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-estraverse-fb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-esutils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-etag ExclusiveArch: %{nodejs_arches} noarch - nodejs-event-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-event-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-eventemitter2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-eventemitter3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-events ExclusiveArch: %{nodejs_arches} noarch - nodejs-events-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-everything-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-execa ExclusiveArch: %{nodejs_arches} noarch - nodejs-exit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-brackets ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expand-tilde ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-expect-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-express ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-express-session ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extend ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extend-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-extsprintf ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-eyes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fake ExclusiveArch: %{nodejs_arches} noarch - nodejs-fancy-log ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-far ExclusiveArch: %{nodejs_arches} noarch - nodejs-fast-levenshtein ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fastfall ExclusiveArch: %{nodejs_arches} noarch - nodejs-faucet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-faye-websocket ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fd ExclusiveArch: %{nodejs_arches} noarch - nodejs-fd-slicer ExclusiveArch: %{nodejs_arches} noarch - nodejs-fg-lodash ExclusiveArch: %{nodejs_arches} noarch - nodejs-figures ExclusiveArch: %{nodejs_arches} noarch - nodejs-file-entry-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-file-sync-cmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-file-uri-to-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-filed ExclusiveArch: %{nodejs_arches} noarch - nodejs-filelist ExclusiveArch: %{nodejs_arches} noarch - nodejs-filename-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fileset ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fill-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-fill-range ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-finalhandler ExclusiveArch: %{nodejs_arches} noarch - nodejs-find-cache-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-find-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-findup-sync ExclusiveArch: %{nodejs_arches} noarch - nodejs-first-chunk-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flagged-respawn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flat-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-flot ExclusiveArch: %{nodejs_arches} noarch - nodejs-flush-write-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fmix ExclusiveArch: %{nodejs_arches} noarch - nodejs-fn-dot-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-fn-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-follow ExclusiveArch: %{nodejs_arches} noarch - nodejs-follow-redirects ExclusiveArch: %{nodejs_arches} noarch - nodejs-for-in ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-for-own ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-foreach ExclusiveArch: %{nodejs_arches} noarch - nodejs-foreground-child ExclusiveArch: %{nodejs_arches} noarch - nodejs-forever-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-form-data ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-formatio ExclusiveArch: %{nodejs_arches} noarch - nodejs-formidable ExclusiveArch: %{nodejs_arches} noarch - nodejs-forwarded ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fragment-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-freetree ExclusiveArch: %{nodejs_arches} noarch - nodejs-fresh ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-from ExclusiveArch: %{nodejs_arches} noarch - nodejs-from2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-dot-notify ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-cached ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-exists-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-fs-ext ExclusiveArch: %{nodejs_arches} - nodejs-fs-extra ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-temp ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-vacuum ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs-write-stream-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-fs2 ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-ignore ExclusiveArch: %{nodejs_arches} noarch - nodejs-fstream-npm ExclusiveArch: %{nodejs_arches} noarch - nodejs-ftp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-function-bind ExclusiveArch: %{nodejs_arches} noarch - nodejs-function-loop ExclusiveArch: %{nodejs_arches} noarch - nodejs-gauge ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gaze ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gdal ExclusiveArch: %{nodejs_arches} - nodejs-generate-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-generate-object-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-generic-pool ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-get-pkg-repo ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-port ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-stdin ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-get-uri ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-get-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-getobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gettext-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-dummy-commit ExclusiveArch: %{nodejs_arches} noarch - nodejs-git-remote-origin-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-gitconfiglocal ExclusiveArch: %{nodejs_arches} noarch - nodejs-github-url-from-git ExclusiveArch: %{nodejs_arches} noarch - nodejs-github-url-from-username-repo ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-glob-base ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-expand ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-glob-parent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-global-modules ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-global-prefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globby ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-globule ExclusiveArch: %{nodejs_arches} noarch - nodejs-glogg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gnode ExclusiveArch: %{nodejs_arches} noarch - nodejs-gonzales-pe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-got ExclusiveArch: %{nodejs_arches} noarch - nodejs-graceful-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-graceful-readlink ExclusiveArch: %{nodejs_arches} noarch - nodejs-grip ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-growl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-angular-templates ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-banner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-cli ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-compare-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-clean ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-concat ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-connect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-copy ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-csslint ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-cssmin ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-htmlmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-internal ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-less ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-nodeunit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-requirejs ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-contrib-uglify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-contrib-watch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-git-authors ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-html-validation ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-init ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-known-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-log-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-legacy-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-lib-contrib ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-saucelabs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-sed ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-simple-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-grunt-svgmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-args ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-process ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-util-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-grunt-wrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-gulp-mocha ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gulp-util ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-gzip-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-handle-thing ExclusiveArch: %{nodejs_arches} noarch - nodejs-handlebars ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-har-validator ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-has ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-binary2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-cors ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-flag ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-gulplog ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-has-unicode ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-has-yarn ExclusiveArch: %{nodejs_arches} noarch - nodejs-hash_file ExclusiveArch: %{nodejs_arches} noarch - nodejs-hawk ExclusiveArch: %{nodejs_arches} noarch - nodejs-he ExclusiveArch: %{nodejs_arches} noarch - nodejs-heap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-hex-to-array-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-highlight-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-hock ExclusiveArch: %{nodejs_arches} noarch - nodejs-hoek ExclusiveArch: %{nodejs_arches} noarch - nodejs-homedir-polyfill ExclusiveArch: %{nodejs_arches} noarch - nodejs-hook-std ExclusiveArch: %{nodejs_arches} noarch - nodejs-hooker ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-hosted-git-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-hsluv ExclusiveArch: %{nodejs_arches} noarch - nodejs-html-minifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-htmlparser2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-deceiver ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-errors ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-http-proxy ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-http-server ExclusiveArch: %{nodejs_arches} noarch - nodejs-http-signature ExclusiveArch: %{nodejs_arches} noarch - nodejs-http2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-https-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-humanize-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-i ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-i18n-transform ExclusiveArch: %{nodejs_arches} noarch - nodejs-i2c ExclusiveArch: %{nodejs_arches} - nodejs-iconv ExclusiveArch: %{nodejs_arches} - nodejs-iconv-lite ExclusiveArch: %{nodejs_arches} noarch - nodejs-iferr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ignore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-imul ExclusiveArch: %{nodejs_arches} noarch - nodejs-imurmurhash ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-indent-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-indexof ExclusiveArch: %{nodejs_arches} noarch - nodejs-infinity-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-inflight ExclusiveArch: %{nodejs_arches} noarch - nodejs-info-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-inherit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-inherits ExclusiveArch: %{nodejs_arches} noarch - nodejs-inherits1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-ini ExclusiveArch: %{nodejs_arches} noarch - nodejs-init-package-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-inline-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-install ExclusiveArch: %{nodejs_arches} noarch - nodejs-int64-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-interpret ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-into-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-invert-kv ExclusiveArch: %{nodejs_arches} noarch - nodejs-ip ExclusiveArch: %{nodejs_arches} noarch - nodejs-ipaddr-dot-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-irc-colors ExclusiveArch: %{nodejs_arches} noarch - nodejs-irregular-plurals ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-absolute ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-accessor-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-arrayish ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-arrow-function ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-boolean-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-builtin-module ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-callable ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-data-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-date-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-descriptor ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-dotfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-equal-shallow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-extendable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-extglob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-finite ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-fullwidth-code-point ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-generator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-generator-function ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-lower-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-my-json-valid ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-negated-glob ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-number ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-number-object ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-in-cwd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-path-inside ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-plain-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-plain-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-primitive ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-property ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-redirect ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-regexp ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-registered ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-relative ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-retry-allowed ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-subset ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-text-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-typedarray ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-unc-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-upper-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-url ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-valid-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-is-valid-instance ExclusiveArch: %{nodejs_arches} noarch - nodejs-is-windows ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isarray ExclusiveArch: %{nodejs_arches} noarch - nodejs-isexe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-iso8601 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isobject ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isodate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-isstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-istanbul ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jade ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jasmine-growl-reporter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jasmine-reporters ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jison ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jison-lex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jju ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joose ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joosex-namespace-depended ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-joosex-simplerequest ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-base64 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-js-yaml ExclusiveArch: %{nodejs_arches} noarch - nodejs-jschardet ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jscoverage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jshint ExclusiveArch: %{nodejs_arches} noarch - nodejs-json-diff ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-localizer ExclusiveArch: %{nodejs_arches} noarch - nodejs-json-parse-helpfulerror ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stable-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-json-stringify-safe ExclusiveArch: %{nodejs_arches} noarch - nodejs-json3 ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jsonm ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonparse ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonpointer ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-jsonselect ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-jwt-simple ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-keep-alive-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-keygrip ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-keypress ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-kind-of ExclusiveArch: %{nodejs_arches} noarch - nodejs-klaw ExclusiveArch: %{nodejs_arches} noarch - nodejs-kuler2gpl ExclusiveArch: %{nodejs_arches} noarch - nodejs-langdetect ExclusiveArch: %{nodejs_arches} noarch - nodejs-latest-version ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lazy-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lazystream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lcid ExclusiveArch: %{nodejs_arches} noarch - nodejs-lcov-parse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-leaflet ExclusiveArch: %{nodejs_arches} noarch - nodejs-leaflet-formbuilder ExclusiveArch: %{nodejs_arches} noarch - nodejs-leaflet-hash ExclusiveArch: %{nodejs_arches} noarch - nodejs-leche ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-left-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-less ExclusiveArch: %{nodejs_arches} noarch - nodejs-levn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lex-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-libxmljs ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-line-numbers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-line-reader ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linefix ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-linkify-it ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-load-grunt-tasks ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-load-json-file ExclusiveArch: %{nodejs_arches} noarch - nodejs-locate-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-lockfile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-log-driver ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-ok ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-symbols ExclusiveArch: %{nodejs_arches} noarch - nodejs-log-utils ExclusiveArch: %{nodejs_arches} noarch - nodejs-lolex ExclusiveArch: %{nodejs_arches} noarch - nodejs-longest ExclusiveArch: %{nodejs_arches} noarch - nodejs-loud-rejection ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-lower-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-lower-case-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-lowercase-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-lru-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-lru-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ltx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-magic-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-make-arrow-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-generator-function ExclusiveArch: %{nodejs_arches} noarch - nodejs-make-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-makedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-makeerror ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-obj ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-map-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-mapnik ExclusiveArch: %{nodejs_arches} - nodejs-mapnik-pool ExclusiveArch: %{nodejs_arches} noarch - nodejs-mapnik-vector-tile ExclusiveArch: %{nodejs_arches} noarch - nodejs-markdown ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-markdown-it-testgen ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-marked ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-matched ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-max-timeout ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-maxmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-mbtiles ExclusiveArch: %{nodejs_arches} noarch - nodejs-md5-hex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-md5-o-matic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mdn-data ExclusiveArch: %{nodejs_arches} noarch - nodejs-mdurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-media-typer ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-memoizee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-memwatch-next ExclusiveArch: %{nodejs_arches} - nodejs-meow ExclusiveArch: %{nodejs_arches} noarch - nodejs-merge-descriptors ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-merge-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-metascript ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-method-override ExclusiveArch: %{nodejs_arches} noarch - nodejs-methods ExclusiveArch: %{nodejs_arches} noarch - nodejs-millstone ExclusiveArch: %{nodejs_arches} noarch - nodejs-mime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mime-db ExclusiveArch: %{nodejs_arches} noarch - nodejs-mime-types ExclusiveArch: %{nodejs_arches} noarch - nodejs-mimeparse ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-minimalistic-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-minimist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-minstache ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-deep ExclusiveArch: %{nodejs_arches} noarch - nodejs-mixin-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-mkdirp ExclusiveArch: %{nodejs_arches} noarch - nodejs-mkfiletree ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-bin ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-mock-git ExclusiveArch: %{nodejs_arches} noarch - nodejs-modify-values ExclusiveArch: %{nodejs_arches} noarch - nodejs-module-not-found-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-moment ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-moment-timezone ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb ExclusiveArch: %{nodejs_arches} noarch - nodejs-mongodb-core ExclusiveArch: %{nodejs_arches} noarch - nodejs-monocle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-morgan ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-muffin ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multiline ExclusiveArch: %{nodejs_arches} noarch - nodejs-multimatch ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multiparty ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-multipipe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-murmur-32 ExclusiveArch: %{nodejs_arches} noarch - nodejs-mustache ExclusiveArch: %{nodejs_arches} noarch - nodejs-mute-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-mv ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-mysql ExclusiveArch: %{nodejs_arches} noarch - nodejs-mz ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nan ExclusiveArch: %{nodejs_arches} noarch - nodejs-nan0 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nan1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-nano ExclusiveArch: %{nodejs_arches} noarch - nodejs-nanoseconds ExclusiveArch: %{nodejs_arches} noarch - nodejs-native-or-bluebird ExclusiveArch: %{nodejs_arches} noarch - nodejs-ncp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-needle ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-negotiator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nested-error-stacks ExclusiveArch: %{nodejs_arches} noarch - nodejs-net-browserify-alt ExclusiveArch: %{nodejs_arches} noarch - nodejs-netmask ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-next ExclusiveArch: %{nodejs_arches} noarch - nodejs-next-tick ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-node-expat ExclusiveArch: %{nodejs_arches} ExclusiveArch: %{ix86} x86_64 %{arm} - nodejs-node-int64 ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-markdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-print ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-static ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-status-codes ExclusiveArch: %{nodejs_arches} noarch - nodejs-node-stringprep ExclusiveArch: %{nodejs_arches} - nodejs-node-uuid ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-nomnom ExclusiveArch: %{nodejs_arches} noarch - nodejs-noncharacters ExclusiveArch: %{nodejs_arches} noarch - nodejs-nopt ExclusiveArch: %{nodejs_arches} noarch - nodejs-nopt-usage ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-noptify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-normalize-git-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-normalize-package-data ExclusiveArch: %{nodejs_arches} noarch - nodejs-normalize-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-cache-filename ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-install-checks ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-license ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-npm-package-arg ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-registry-client ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-npm-run-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-stats ExclusiveArch: %{nodejs_arches} noarch - nodejs-npm-user-validate ExclusiveArch: %{nodejs_arches} noarch - nodejs-npmlog ExclusiveArch: %{nodejs_arches} noarch - nodejs-nsp-api ExclusiveArch: %{nodejs_arches} noarch - nodejs-nsp-audit-shrinkwrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-nth-check ExclusiveArch: %{nodejs_arches} noarch - nodejs-number-is-nan ExclusiveArch: %{nodejs_arches} noarch - nodejs-numeral ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth-sign ExclusiveArch: %{nodejs_arches} noarch - nodejs-oauth2orize ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-assign ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-copy ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-dot-entries ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-dot-omit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-dot-pick ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-object-inspect ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-object-visit ExclusiveArch: %{nodejs_arches} noarch - nodejs-observable-to-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-obuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-finished ExclusiveArch: %{nodejs_arches} noarch - nodejs-on-headers ExclusiveArch: %{nodejs_arches} noarch - nodejs-once ExclusiveArch: %{nodejs_arches} noarch - nodejs-onetime ExclusiveArch: %{nodejs_arches} noarch - nodejs-only-shallow ExclusiveArch: %{nodejs_arches} noarch - nodejs-oop ExclusiveArch: %{nodejs_arches} noarch - nodejs-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-opener ExclusiveArch: %{nodejs_arches} noarch - nodejs-opn ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-option-cache ExclusiveArch: %{nodejs_arches} noarch - nodejs-option-chain ExclusiveArch: %{nodejs_arches} noarch - nodejs-optionator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-options ExclusiveArch: %{nodejs_arches} noarch - nodejs-optjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-opts ExclusiveArch: %{nodejs_arches} noarch - nodejs-orchestrator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ordered-read-streams ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-os-homedir ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-locale ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-os-tmpdir ExclusiveArch: %{nodejs_arches} noarch - nodejs-osenv ExclusiveArch: %{nodejs_arches} noarch - nodejs-output-file-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-own-or ExclusiveArch: %{nodejs_arches} noarch - nodejs-own-or-env ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-finally ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-is-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-limit ExclusiveArch: %{nodejs_arches} noarch - nodejs-p-locate ExclusiveArch: %{nodejs_arches} noarch - nodejs-pac-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pac-resolver ExclusiveArch: %{nodejs_arches} noarch - nodejs-package ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-package-info ExclusiveArch: %{nodejs_arches} noarch - nodejs-package-json ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-package-license ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-packaging ExclusiveArch: %{nodejs_arches} noarch - nodejs-packet-reader ExclusiveArch: %{nodejs_arches} noarch - nodejs-pad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pad-left ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-paperboy ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-param-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-github-repo-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parse-json ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-parse-passwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-parsejson ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseqs ExclusiveArch: %{nodejs_arches} noarch - nodejs-parserlib ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-parseuri ExclusiveArch: %{nodejs_arches} noarch - nodejs-parseurl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pascal-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-pascalcase ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-http-bearer ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth1 ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-oauth2-client-password ExclusiveArch: %{nodejs_arches} noarch - nodejs-passport-strategy ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-array ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-dirname ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-exists ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-extra ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-absolute ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-is-inside ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-key ExclusiveArch: %{nodejs_arches} noarch - nodejs-path-to-regexp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-path-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-path2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pathval ExclusiveArch: %{nodejs_arches} noarch - nodejs-pause ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pause-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-pbkdf2-password ExclusiveArch: %{nodejs_arches} noarch - nodejs-pedding ExclusiveArch: %{nodejs_arches} noarch - nodejs-pegjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-pem ExclusiveArch: %{nodejs_arches} noarch - nodejs-pend ExclusiveArch: %{nodejs_arches} noarch - nodejs-pff ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pg-connection-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-escape ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-int8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-pg-types ExclusiveArch: %{nodejs_arches} noarch - nodejs-pgpass ExclusiveArch: %{nodejs_arches} noarch - nodejs-pify ExclusiveArch: %{nodejs_arches} noarch - nodejs-pinkie ExclusiveArch: %{nodejs_arches} noarch - nodejs-pinkie-promise ExclusiveArch: %{nodejs_arches} noarch - nodejs-pkg-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pkg-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-pkginfo ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-platform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-plur ExclusiveArch: %{nodejs_arches} noarch - nodejs-portfinder ExclusiveArch: %{nodejs_arches} noarch - nodejs-portscanner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-posix-character-classes ExclusiveArch: %{nodejs_arches} noarch - nodejs-posix-getopt ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-bytea ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-date ExclusiveArch: %{nodejs_arches} noarch - nodejs-postgres-interval ExclusiveArch: %{nodejs_arches} noarch - nodejs-precond ExclusiveArch: %{nodejs_arches} noarch - nodejs-prelude-ls ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-prepend-http ExclusiveArch: %{nodejs_arches} noarch - nodejs-preserve ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-bytes ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-hrtime ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pretty-ms ExclusiveArch: %{nodejs_arches} noarch - nodejs-pretty-time ExclusiveArch: %{nodejs_arches} noarch - nodejs-private ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-process-nextick-args ExclusiveArch: %{nodejs_arches} noarch - nodejs-progress ExclusiveArch: %{nodejs_arches} noarch - nodejs-progress-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-promise ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-promises-aplus-tests ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-prompt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-promzard ExclusiveArch: %{nodejs_arches} noarch - nodejs-propagate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-proto-list ExclusiveArch: %{nodejs_arches} noarch - nodejs-proxy ExclusiveArch: %{nodejs_arches} noarch - nodejs-proxy-addr ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-proxyquire ExclusiveArch: %{nodejs_arches} noarch - nodejs-pruddy-error ExclusiveArch: %{nodejs_arches} noarch - nodejs-pseudomap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pubcontrol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-pump ExclusiveArch: %{nodejs_arches} noarch - nodejs-pumpify ExclusiveArch: %{nodejs_arches} noarch - nodejs-q ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-q-io ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-qs ExclusiveArch: %{nodejs_arches} noarch - nodejs-qtdatastream ExclusiveArch: %{nodejs_arches} noarch - nodejs-queue-async ExclusiveArch: %{nodejs_arches} noarch - nodejs-quick-lru ExclusiveArch: %{nodejs_arches} noarch - nodejs-qunit-extras ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-qunitjs ExclusiveArch: %{nodejs_arches} noarch - nodejs-rainbowsocks ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-random-bytes ExclusiveArch: %{nodejs_arches} noarch - nodejs-random-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-randomatic ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-range-parser ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-raw-body ExclusiveArch: %{nodejs_arches} noarch - nodejs-rc ExclusiveArch: %{nodejs_arches} noarch - nodejs-re-emitter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-all-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-cmd-shim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-dir-files ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-file ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-installed ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-json-sync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-package-json ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-package-tree ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-read-pkg ExclusiveArch: %{nodejs_arches} noarch - nodejs-read-pkg-up ExclusiveArch: %{nodejs_arches} noarch - nodejs-readable-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-readdir-scoped-modules ExclusiveArch: %{nodejs_arches} noarch - nodejs-readdirp ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-realize-package-specifier ExclusiveArch: %{nodejs_arches} noarch - nodejs-recast ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rechoir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-redent ExclusiveArch: %{nodejs_arches} noarch - nodejs-reduce-component ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regenerator ExclusiveArch: %{nodejs_arches} noarch - nodejs-regex-cache ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-regex-not ExclusiveArch: %{nodejs_arches} noarch - nodejs-registry-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-relateurl ExclusiveArch: %{nodejs_arches} noarch - nodejs-remove-trailing-separator ExclusiveArch: %{nodejs_arches} noarch - nodejs-repeat-element ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeat-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-repeating ExclusiveArch: %{nodejs_arches} noarch - nodejs-repl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-replace ExclusiveArch: %{nodejs_arches} noarch - nodejs-replace-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-replace-require-self ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-request ExclusiveArch: %{nodejs_arches} noarch - nodejs-requestretry ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-cs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-require-directory ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-inject ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-uncached ExclusiveArch: %{nodejs_arches} noarch - nodejs-require-yaml ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-requirejs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-requires-port ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-cwd ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-dir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-from ExclusiveArch: %{nodejs_arches} noarch - nodejs-resolve-pkg ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resolve-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-response-time ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-resumer ExclusiveArch: %{nodejs_arches} noarch - nodejs-retry ExclusiveArch: %{nodejs_arches} noarch - nodejs-reusify ExclusiveArch: %{nodejs_arches} noarch - nodejs-revalidator ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rewire ExclusiveArch: %{nodejs_arches} noarch - nodejs-rfile ExclusiveArch: %{nodejs_arches} noarch - nodejs-rhea ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-right-align ExclusiveArch: %{nodejs_arches} noarch - nodejs-rimraf ExclusiveArch: %{nodejs_arches} noarch - nodejs-rndm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-rollup ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ronn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-run-parallel-limit ExclusiveArch: %{nodejs_arches} noarch - nodejs-runforcover ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safe-buffer ExclusiveArch: %{nodejs_arches} noarch - nodejs-safe-json-stringify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-safecb ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-samsam ExclusiveArch: %{nodejs_arches} noarch - nodejs-sauce-tunnel ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-saucelabs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sax ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-scmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-secure-random ExclusiveArch: %{nodejs_arches} noarch - nodejs-seedrandom ExclusiveArch: %{nodejs_arches} noarch - nodejs-select-hose ExclusiveArch: %{nodejs_arches} noarch - nodejs-semver ExclusiveArch: %{nodejs_arches} noarch - nodejs-send ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sentence-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-sentiment ExclusiveArch: %{nodejs_arches} noarch - nodejs-seq ExclusiveArch: %{nodejs_arches} noarch - nodejs-sequencify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serialize-error ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serve-index ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-serve-static ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-server-destroy ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-blocking ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-getter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-set-immediate ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-immediate-shim ExclusiveArch: %{nodejs_arches} noarch - nodejs-set-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-setimmediate ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-setprototypeof ExclusiveArch: %{nodejs_arches} noarch - nodejs-sha ExclusiveArch: %{nodejs_arches} noarch - nodejs-shallow-clone ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-command ExclusiveArch: %{nodejs_arches} noarch - nodejs-shebang-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-shelljs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-shelljs-nodecli ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-should ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-should-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-format ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-http ExclusiveArch: %{nodejs_arches} noarch - nodejs-should-type ExclusiveArch: %{nodejs_arches} noarch - nodejs-showdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-sigmund ExclusiveArch: %{nodejs_arches} noarch - nodejs-signal-exit ExclusiveArch: %{nodejs_arches} noarch - nodejs-silent-npm-registry-client ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-assert ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-asyncify ExclusiveArch: %{nodejs_arches} noarch - nodejs-simple-fmt ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-is ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-simple-markdown ExclusiveArch: %{nodejs_arches} noarch - nodejs-single-line-log ExclusiveArch: %{nodejs_arches} noarch - nodejs-sinon ExclusiveArch: %{nodejs_arches} noarch - nodejs-sinon-restore ExclusiveArch: %{nodejs_arches} noarch - nodejs-slide ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-smart-buffer ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-snake-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-capture ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-capture-set ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-node ExclusiveArch: %{nodejs_arches} noarch - nodejs-snapdragon-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-snockets ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sntp ExclusiveArch: %{nodejs_arches} noarch - nodejs-socks-client ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-socks-proxy-agent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-sort-keys ExclusiveArch: %{nodejs_arches} noarch - nodejs-sorted-object ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-fixtures ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-resolve ExclusiveArch: %{nodejs_arches} noarch - nodejs-source-map-support ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-source-map-url ExclusiveArch: %{nodejs_arches} noarch - nodejs-sparkles ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-spawn-sync ExclusiveArch: %{nodejs_arches} noarch - nodejs-spawn-wrap ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-correct ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-exceptions ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-expression-parse ExclusiveArch: %{nodejs_arches} noarch - nodejs-spdx-license-ids ExclusiveArch: %{nodejs_arches} noarch - nodejs-spec ExclusiveArch: %{nodejs_arches} noarch - nodejs-speedometer ExclusiveArch: %{nodejs_arches} noarch - nodejs-split ExclusiveArch: %{nodejs_arches} noarch - nodejs-split-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-split2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf ExclusiveArch: %{nodejs_arches} noarch - nodejs-sprintf-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-sqlite3 ExclusiveArch: %{nodejs_arches} - nodejs-srs ExclusiveArch: %{nodejs_arches} noarch - nodejs-ssri ExclusiveArch: %{nodejs_arches} noarch - nodejs-st ExclusiveArch: %{nodejs_arches} noarch - nodejs-stable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-trace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stack-utils ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-static-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-static-favicon ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-statuses ExclusiveArch: %{nodejs_arches} noarch - nodejs-std-mocks ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-combiner ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-consume ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-counter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-each ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-equal ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-pair ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-reduce ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-replace ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stream-shift ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-spigot ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-to-array ExclusiveArch: %{nodejs_arches} noarch - nodejs-stream-transform ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-streamsearch ExclusiveArch: %{nodejs_arches} noarch - nodejs-streamsink ExclusiveArch: %{nodejs_arches} noarch - nodejs-streamtest ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-dot-prototype-dot-repeat ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-string-dot-prototype-dot-trim ExclusiveArch: %{nodejs_arches} noarch - nodejs-string-width ExclusiveArch: %{nodejs_arches} noarch - nodejs-string_decoder ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringmap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringscanner ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringset ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-stringstream ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-ansi ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-bom-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-bom-string ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-color ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-eof ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-indent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strip-json-comments ExclusiveArch: %{nodejs_arches} noarch - nodejs-strip-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-strong-log-transformer ExclusiveArch: %{nodejs_arches} noarch - nodejs-strscanner ExclusiveArch: %{nodejs_arches} noarch - nodejs-stylus ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-success-symbol ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-superagent ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-superagent-proxy ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-supertest ExclusiveArch: %{nodejs_arches} noarch - nodejs-supervisor ExclusiveArch: %{nodejs_arches} noarch - nodejs-supports-color ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-suspend ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgmin ExclusiveArch: %{nodejs_arches} noarch - nodejs-svgo ExclusiveArch: %{nodejs_arches} noarch - nodejs-swap-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-symbol-observable ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tad ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tap ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-mocha-reporter ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-out ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tap-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-tap-spec ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tape ExclusiveArch: %{nodejs_arches} noarch - nodejs-tapes ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar-pack ExclusiveArch: %{nodejs_arches} noarch - nodejs-tar-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-temp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-temp-write ExclusiveArch: %{nodejs_arches} noarch - nodejs-temporary ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern-cordovajs ExclusiveArch: %{nodejs_arches} noarch - nodejs-tern-liferay ExclusiveArch: %{nodejs_arches} noarch - nodejs-terst ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-test ExclusiveArch: %{ix86} x86_64 %{arm} noarch ExclusiveArch: %{nodejs_arches} noarch - nodejs-testdata-w3c-json-form ExclusiveArch: %{nodejs_arches} noarch - nodejs-testjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-testswarm ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-testutil ExclusiveArch: %{nodejs_arches} noarch - nodejs-text-extensions ExclusiveArch: %{nodejs_arches} noarch - nodejs-text-table ExclusiveArch: %{nodejs_arches} noarch - nodejs-thenify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thenify-all ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-through ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-through2 ExclusiveArch: %{nodejs_arches} noarch - nodejs-through2-filter ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-thunkify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tildify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tilejson ExclusiveArch: %{nodejs_arches} noarch - nodejs-tilelive ExclusiveArch: %{nodejs_arches} noarch - nodejs-tilelive-mapnik ExclusiveArch: %{nodejs_arches} noarch - nodejs-tiletype ExclusiveArch: %{nodejs_arches} noarch - nodejs-time-diff ExclusiveArch: %{nodejs_arches} noarch - nodejs-time-stamp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-timed-out ExclusiveArch: %{nodejs_arches} noarch - nodejs-timekeeper ExclusiveArch: %{nodejs_arches} noarch - nodejs-timers-ext ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tiny-lr-fork ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-title-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-tlds ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tmatch ExclusiveArch: %{nodejs_arches} noarch - nodejs-tmp ExclusiveArch: %{nodejs_arches} noarch - nodejs-tmpl ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-absolute-glob ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-to-object-path ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-to-regex ExclusiveArch: %{nodejs_arches} noarch - nodejs-to-regex-range ExclusiveArch: %{nodejs_arches} noarch - nodejs-tough-cookie ExclusiveArch: %{nodejs_arches} noarch - nodejs-tracejs ExclusiveArch: %{nodejs_arches} noarch - nodejs-transformers ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-traverse ExclusiveArch: %{nodejs_arches} noarch - nodejs-treeify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tressa ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-trim-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trim-off-newlines ExclusiveArch: %{nodejs_arches} noarch - nodejs-trivial-deferred ExclusiveArch: %{nodejs_arches} noarch - nodejs-try-open ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-try-thread-sleep ExclusiveArch: %{nodejs_arches} noarch - nodejs-tryor ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-tsame ExclusiveArch: %{nodejs_arches} noarch - nodejs-tsscmp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ttembed-js ExclusiveArch: %{nodejs_arches} noarch - nodejs-tunnel-agent ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-check ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-type-detect ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-is ExclusiveArch: %{nodejs_arches} noarch - nodejs-type-name ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-typeahead.js ExclusiveArch: %{nodejs_arches} noarch - nodejs-typedarray ExclusiveArch: %{nodejs_arches} noarch - nodejs-typescript ExclusiveArch: %{nodejs_arches} noarch - nodejs-uc-dot-micro ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uglify-to-browserify ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uid-number ExclusiveArch: %{nodejs_arches} noarch - nodejs-uid-safe ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-uid2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-ultron ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-umask ExclusiveArch: %{nodejs_arches} noarch - nodejs-unc-path-regex ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-underscore ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-underscore-dot-logger ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unicode-7.0.0 ExclusiveArch: %{nodejs_arches} noarch - nodejs-unicode-length ExclusiveArch: %{nodejs_arches} noarch - nodejs-union ExclusiveArch: %{nodejs_arches} noarch - nodejs-union-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-unique-filename ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-slug ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-stream ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-unique-temp-dir ExclusiveArch: %{nodejs_arches} noarch - nodejs-unpipe ExclusiveArch: %{nodejs_arches} noarch - nodejs-unset-value ExclusiveArch: %{nodejs_arches} noarch - nodejs-unzip-response ExclusiveArch: %{nodejs_arches} noarch - nodejs-upper-case ExclusiveArch: %{nodejs_arches} noarch - nodejs-upper-case-first ExclusiveArch: %{nodejs_arches} noarch - nodejs-uri-path ExclusiveArch: %{nodejs_arches} noarch - nodejs-urix ExclusiveArch: %{nodejs_arches} noarch - nodejs-url-join ExclusiveArch: %{nodejs_arches} noarch - nodejs-url-parse-lax ExclusiveArch: %{nodejs_arches} noarch - nodejs-url2 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-use ExclusiveArch: %{nodejs_arches} noarch - nodejs-user-home ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-utf8 ExclusiveArch: %{nodejs_arches} noarch - nodejs-utfx ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-util ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-deprecate ExclusiveArch: %{nodejs_arches} noarch - nodejs-util-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-utile ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-utilities ExclusiveArch: %{nodejs_arches} noarch - nodejs-utils-merge ExclusiveArch: %{nodejs_arches} noarch - nodejs-uuid ExclusiveArch: %{nodejs_arches} noarch - nodejs-vali-date ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-validate-npm-package-license ExclusiveArch: %{nodejs_arches} noarch - nodejs-validate-npm-package-name ExclusiveArch: %{nodejs_arches} noarch - nodejs-vary ExclusiveArch: %{nodejs_arches} noarch - nodejs-vasync ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-verror ExclusiveArch: %{nodejs_arches} noarch - nodejs-vhost ExclusiveArch: %{nodejs_arches} noarch - nodejs-vinyl ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vlq ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vow-fs ExclusiveArch: %{nodejs_arches} noarch - nodejs-vow-queue ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-vows ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-w3cjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-walkdir ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-walker ExclusiveArch: %{nodejs_arches} noarch - nodejs-ware ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-warning-symbol ExclusiveArch: %{nodejs_arches} noarch - nodejs-watchit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-watershed ExclusiveArch: %{nodejs_arches} noarch - nodejs-wbuf ExclusiveArch: %{nodejs_arches} noarch - nodejs-wcwidth ExclusiveArch: %{nodejs_arches} noarch - nodejs-weak-map ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-websocket-driver ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-when ExclusiveArch: %{nodejs_arches} noarch - nodejs-whet-dot-extend ExclusiveArch: %{nodejs_arches} noarch - nodejs-which ExclusiveArch: %{nodejs_arches} noarch - nodejs-win-spawn ExclusiveArch: %{nodejs_arches} noarch - nodejs-window-size ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-winston ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-with ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-woothee ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wordwrap ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrap-ansi ExclusiveArch: %{nodejs_arches} noarch - nodejs-wrap-fn ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-wrappy ExclusiveArch: %{nodejs_arches} noarch - nodejs-write ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-write-file-atomic ExclusiveArch: %{nodejs_arches} noarch - nodejs-write-json-file ExclusiveArch: %{nodejs_arches} noarch - nodejs-write-pkg ExclusiveArch: %{nodejs_arches} noarch - nodejs-ws ExclusiveArch: %{nodejs_arches} noarch - nodejs-xml2js ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlbuilder ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmldom ExclusiveArch: %{nodejs_arches} noarch - nodejs-xmlhttprequest-ssl ExclusiveArch: %{nodejs_arches} noarch - nodejs-xregexp ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-xtend ExclusiveArch: %{nodejs_arches} noarch - nodejs-y18n ExclusiveArch: %{nodejs_arches} noarch - nodejs-yallist ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yapool ExclusiveArch: %{nodejs_arches} noarch - nodejs-yargs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodejs-yargs-parser ExclusiveArch: %{nodejs_arches} noarch - nodejs-yauzl ExclusiveArch: %{nodejs_arches} noarch - nodejs-yeast ExclusiveArch: %{nodejs_arches} noarch - nodejs-zap ExclusiveArch: %{nodejs_arches} noarch - nodejs-zip-stream ExclusiveArch: %{nodejs_arches} noarch - nodejs-zipfile ExclusiveArch: %{nodejs_arches} - nodejs-zlib-browserify ExclusiveArch: %{nodejs_arches} noarch - nodejs-zlibjs ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - nodeunit ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - notify-sharp ExclusiveArch: %{mono_arches} - notify-sharp3 ExclusiveArch: %{mono_arches} - nuget ExclusiveArch: %{mono_arches} - numatop ExclusiveArch: %{ix86} x86_64 - nunit ExclusiveArch: %{mono_arches} - nunit2 ExclusiveArch: %{mono_arches} - nvml ExclusiveArch: x86_64 - nwchem ExclusiveArch: x86_64 %{ix86} - obfs4 ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-kvm-hook ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - oci-register-machine ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - oci-umount ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x %{mips} - ocitools ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - odcs ExclusiveArch: %{ix86} x86_64 - olpc-kbdshim ExclusiveArch: %{ix86} %{arm} - olpc-netutils ExclusiveArch: %{ix86} %{arm} - olpc-powerd ExclusiveArch: %{ix86} %{arm} - olpc-utils ExclusiveArch: %{ix86} %{arm} - onedrive ExclusiveArch: %{ldc_arches} - opal-prd ExclusiveArch: ppc64le - open-vm-tools ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 - openblas ExclusiveArch: %{openblas_arches} - openjfx ExclusiveArch: %{ix86} x86_64 - openlibm ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 %{power64} - openmx ExclusiveArch: x86_64 %{ix86} - openni ExclusiveArch: %{ix86} x86_64 %{arm} - openni-primesense ExclusiveArch: %{ix86} x86_64 %{arm} - openssl-ibmca ExclusiveArch: s390 s390x - origin ExclusiveArch: %{go_arches} ExclusiveArch: x86_64 aarch64 ppc64le s390x - orion ExclusiveArch: %{qt5_qtwebengine_arches} - orocos-bfl ExclusiveArch: %{ix86} x86_64 - orthorobot ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 ppc64 - paflib ExclusiveArch: ppc %{power64} - pcc ExclusiveArch: %{ix86} x86_64 - pcmciautils ExclusiveArch: %{ix86} x86_64 ia64 ppc ppc64 %{arm} - pdfmod ExclusiveArch: %mono_arches - perl-Dumbbench ExclusiveArch: %{ix86} x86_64 noarch - perl-Parse-DMIDecode ExclusiveArch: %{ix86} x86_64 ia64 aarch64 - pesign ExclusiveArch: %{ix86} x86_64 ia64 aarch64 arm - pesign-test-app ExclusiveArch: i686 x86_64 ia64 aarch64 - pinta ExclusiveArch: %mono_arches - pioneer ExclusiveArch: %{ix86} x86_64 - playonlinux ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - plv8 ExclusiveArch: %v8_arches - poppler-sharp ExclusiveArch: %mono_arches - popub ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - powerline-go ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - powerpc-utils ExclusiveArch: ppc %{power64} - ppc64-diag ExclusiveArch: ppc %{power64} - ppc64-utils ExclusiveArch: ppc %{power64} - publican-jboss ExclusiveArch: i686 x86_64 - pvs-sbcl ExclusiveArch: %{ix86} x86_64 ppc sparcv9 - python-afl ExclusiveArch: %{ix86} x86_64 - python-etcd ExclusiveArch: noarch %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - python-healpy ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-openoffice ExclusiveArch: noarch x86_64 - python-ovirt-register ExclusiveArch: %{ix86} x86_64 - python-pymoc ExclusiveArch: aarch64 ppc64 ppc64le x86_64 s390x - python-rpi-gpio ExclusiveArch: %{arm} aarch64 - q4wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - qcint ExclusiveArch: x86_64 - qclib ExclusiveArch: s390 s390x - qt4pas ExclusiveArch: %{fpc_arches} - qt5-qtwebengine ExclusiveArch: %{qt5_qtwebengine_arches} - quantum-espresso ExclusiveArch: x86_64 %{ix86} ExclusiveArch: %{openblas_arches} - rclone ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - rear ExclusiveArch: %ix86 x86_64 ppc ppc64 ppc64le ia64 - redhat-lsb ExclusiveArch: %{ix86} ia64 x86_64 ppc ppc64 s390 s390x %{arm} aarch64 ppc64le - reg ExclusiveArch: x86_64 - renderdoc ExclusiveArch: %{ix86} x86_64 - reptyr ExclusiveArch: %{ix86} x86_64 %{arm} - rescene ExclusiveArch: %{mono_arches} - restsharp ExclusiveArch: %{mono_arches} - rhythmbox-alternative-toolbar ExclusiveArch: %{ix86} %{arm} x86_64 ppc64 ppc64le - rkt ExclusiveArch: x86_64 aarch64 %{arm} %{ix86} - rssguard ExclusiveArch: %{qt5_qtwebengine_arches} - runc ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le %{mips} s390x - rust ExclusiveArch: %{rust_arches} - rust-addr2line ExclusiveArch: %{rust_arches} - rust-adler32 ExclusiveArch: %{rust_arches} - rust-aho-corasick ExclusiveArch: %{rust_arches} - rust-ansi_term ExclusiveArch: %{rust_arches} - rust-arrayref ExclusiveArch: %{rust_arches} - rust-arrayvec ExclusiveArch: %{rust_arches} - rust-atk-sys ExclusiveArch: %{rust_arches} - rust-atty ExclusiveArch: %{rust_arches} - rust-backtrace ExclusiveArch: %{rust_arches} - rust-backtrace-sys ExclusiveArch: %{rust_arches} - rust-base100 ExclusiveArch: %{rust_arches} - rust-base64 ExclusiveArch: %{rust_arches} - rust-bencher ExclusiveArch: %{rust_arches} - rust-bincode ExclusiveArch: %{rust_arches} - rust-bincode0.8 ExclusiveArch: %{rust_arches} - rust-bitflags ExclusiveArch: %{rust_arches} - rust-bitflags0.9 ExclusiveArch: %{rust_arches} - rust-brev ExclusiveArch: %{rust_arches} - rust-build_const ExclusiveArch: %{rust_arches} - rust-bytecount ExclusiveArch: %{rust_arches} - rust-byteorder ExclusiveArch: %{rust_arches} - rust-bytes ExclusiveArch: %{rust_arches} - rust-bytes0.3 ExclusiveArch: %{rust_arches} - rust-c_vec ExclusiveArch: %{rust_arches} - rust-cairo-rs ExclusiveArch: %{rust_arches} - rust-cairo-sys-rs ExclusiveArch: %{rust_arches} - rust-cbindgen ExclusiveArch: %{rust_arches} - rust-cc ExclusiveArch: %{rust_arches} - rust-cfg-if ExclusiveArch: %{rust_arches} - rust-chrono ExclusiveArch: %{rust_arches} - rust-clap ExclusiveArch: %{rust_arches} - rust-cmake ExclusiveArch: %{rust_arches} - rust-coco ExclusiveArch: %{rust_arches} - rust-cpp_demangle ExclusiveArch: %{rust_arches} - rust-crc ExclusiveArch: %{rust_arches} - rust-crc-core ExclusiveArch: %{rust_arches} - rust-crossbeam ExclusiveArch: %{rust_arches} - rust-crypto-hash ExclusiveArch: %{rust_arches} - rust-cryptovec ExclusiveArch: %{rust_arches} - rust-cssparser-macros ExclusiveArch: %{rust_arches} - rust-ctrlc ExclusiveArch: %{rust_arches} - rust-curl ExclusiveArch: %{rust_arches} - rust-curl-sys ExclusiveArch: %{rust_arches} - rust-custom_derive ExclusiveArch: %{rust_arches} - rust-data-encoding ExclusiveArch: %{rust_arches} - rust-datetime ExclusiveArch: %{rust_arches} - rust-dbus ExclusiveArch: %{rust_arches} - rust-deque ExclusiveArch: %{rust_arches} - rust-devicemapper ExclusiveArch: %{rust_arches} - rust-diff ExclusiveArch: %{rust_arches} - rust-difference ExclusiveArch: %{rust_arches} - rust-docopt ExclusiveArch: %{rust_arches} - rust-downcast-rs ExclusiveArch: %{rust_arches} - rust-dtoa ExclusiveArch: %{rust_arches} - rust-dtoa-short ExclusiveArch: %{rust_arches} - rust-edit-distance ExclusiveArch: %{rust_arches} - rust-either ExclusiveArch: %{rust_arches} - rust-encoding ExclusiveArch: %{rust_arches} - rust-encoding-index-japanese ExclusiveArch: %{rust_arches} - rust-encoding-index-korean ExclusiveArch: %{rust_arches} - rust-encoding-index-simpchinese ExclusiveArch: %{rust_arches} - rust-encoding-index-singlebyte ExclusiveArch: %{rust_arches} - rust-encoding-index-tradchinese ExclusiveArch: %{rust_arches} - rust-encoding_index_tests ExclusiveArch: %{rust_arches} - rust-encoding_rs ExclusiveArch: %{rust_arches} - rust-enum_primitive ExclusiveArch: %{rust_arches} - rust-env_logger ExclusiveArch: %{rust_arches} - rust-env_logger0.4 ExclusiveArch: %{rust_arches} - rust-errln ExclusiveArch: %{rust_arches} - rust-errno ExclusiveArch: %{rust_arches} - rust-error-chain ExclusiveArch: %{rust_arches} - rust-exa ExclusiveArch: %{rust_arches} - rust-extprim ExclusiveArch: %{rust_arches} - rust-extprim_literals_macros ExclusiveArch: %{rust_arches} - rust-failure ExclusiveArch: %{rust_arches} - rust-failure_derive ExclusiveArch: %{rust_arches} - rust-fallible-iterator ExclusiveArch: %{rust_arches} - rust-fd-find ExclusiveArch: %{rust_arches} - rust-filetime ExclusiveArch: %{rust_arches} - rust-fixedbitset ExclusiveArch: %{rust_arches} - rust-flame ExclusiveArch: %{rust_arches} - rust-flate2 ExclusiveArch: %{rust_arches} - rust-float-cmp ExclusiveArch: %{rust_arches} - rust-fnv ExclusiveArch: %{rust_arches} - rust-foreign-types ExclusiveArch: %{rust_arches} - rust-foreign-types-shared ExclusiveArch: %{rust_arches} - rust-fs2 ExclusiveArch: %{rust_arches} - rust-futures ExclusiveArch: %{rust_arches} - rust-futures-cpupool ExclusiveArch: %{rust_arches} - rust-gdk ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf ExclusiveArch: %{rust_arches} - rust-gdk-pixbuf-sys ExclusiveArch: %{rust_arches} - rust-gdk-sys ExclusiveArch: %{rust_arches} - rust-getopts ExclusiveArch: %{rust_arches} - rust-gimli ExclusiveArch: %{rust_arches} - rust-gio ExclusiveArch: %{rust_arches} - rust-gio-sys ExclusiveArch: %{rust_arches} - rust-git2 ExclusiveArch: %{rust_arches} - rust-glib ExclusiveArch: %{rust_arches} - rust-glib-sys ExclusiveArch: %{rust_arches} - rust-glob ExclusiveArch: %{rust_arches} - rust-globset ExclusiveArch: %{rust_arches} - rust-gobject-sys ExclusiveArch: %{rust_arches} - rust-goblin ExclusiveArch: %{rust_arches} - rust-grep ExclusiveArch: %{rust_arches} - rust-gtk ExclusiveArch: %{rust_arches} - rust-gtk-rs-lgpl-docs ExclusiveArch: %{rust_arches} - rust-gtk-source-sys ExclusiveArch: %{rust_arches} - rust-gtk-sys ExclusiveArch: %{rust_arches} - rust-gzip-header ExclusiveArch: %{rust_arches} - rust-hamcrest ExclusiveArch: %{rust_arches} - rust-handlebars ExclusiveArch: %{rust_arches} - rust-heapsize ExclusiveArch: %{rust_arches} - rust-hex ExclusiveArch: %{rust_arches} - rust-home ExclusiveArch: %{rust_arches} - rust-horrorshow ExclusiveArch: %{rust_arches} - rust-httparse ExclusiveArch: %{rust_arches} - rust-idna ExclusiveArch: %{rust_arches} - rust-ignore ExclusiveArch: %{rust_arches} - rust-intervaltree ExclusiveArch: %{rust_arches} - rust-iovec ExclusiveArch: %{rust_arches} - rust-iso8601 ExclusiveArch: %{rust_arches} - rust-itertools ExclusiveArch: %{rust_arches} - rust-itoa ExclusiveArch: %{rust_arches} - rust-jobserver ExclusiveArch: %{rust_arches} - rust-lazy_static ExclusiveArch: %{rust_arches} - rust-lazycell ExclusiveArch: %{rust_arches} - rust-libc ExclusiveArch: %{rust_arches} - rust-libdbus-sys ExclusiveArch: %{rust_arches} - rust-libgit2-sys ExclusiveArch: %{rust_arches} - rust-libloading ExclusiveArch: %{rust_arches} - rust-libssh2-sys ExclusiveArch: %{rust_arches} - rust-libudev ExclusiveArch: %{rust_arches} - rust-libudev-sys ExclusiveArch: %{rust_arches} - rust-libz-sys ExclusiveArch: %{rust_arches} - rust-linked-hash-map ExclusiveArch: %{rust_arches} - rust-lipsum ExclusiveArch: %{rust_arches} - rust-locale ExclusiveArch: %{rust_arches} - rust-log ExclusiveArch: %{rust_arches} - rust-log0.3 ExclusiveArch: %{rust_arches} - rust-loopdev ExclusiveArch: %{rust_arches} - rust-lzma-sys ExclusiveArch: %{rust_arches} - rust-macro-attr ExclusiveArch: %{rust_arches} - rust-maplit ExclusiveArch: %{rust_arches} - rust-matches ExclusiveArch: %{rust_arches} - rust-md5 ExclusiveArch: %{rust_arches} - rust-memchr ExclusiveArch: %{rust_arches} - rust-memmap ExclusiveArch: %{rust_arches} - rust-metadeps ExclusiveArch: %{rust_arches} - rust-mime ExclusiveArch: %{rust_arches} - rust-miniz-sys ExclusiveArch: %{rust_arches} - rust-miniz_oxide ExclusiveArch: %{rust_arches} - rust-miniz_oxide_c_api ExclusiveArch: %{rust_arches} - rust-mio ExclusiveArch: %{rust_arches} - rust-mio-uds ExclusiveArch: %{rust_arches} - rust-mnt ExclusiveArch: %{rust_arches} - rust-modifier ExclusiveArch: %{rust_arches} - rust-multimap ExclusiveArch: %{rust_arches} - rust-natord ExclusiveArch: %{rust_arches} - rust-net2 ExclusiveArch: %{rust_arches} - rust-newtype_derive ExclusiveArch: %{rust_arches} - rust-nix ExclusiveArch: %{rust_arches} - rust-nodrop ExclusiveArch: %{rust_arches} - rust-nom ExclusiveArch: %{rust_arches} - rust-num ExclusiveArch: %{rust_arches} - rust-num-bigint ExclusiveArch: %{rust_arches} - rust-num-complex ExclusiveArch: %{rust_arches} - rust-num-integer ExclusiveArch: %{rust_arches} - rust-num-iter ExclusiveArch: %{rust_arches} - rust-num-rational ExclusiveArch: %{rust_arches} - rust-num-traits ExclusiveArch: %{rust_arches} - rust-num_cpus ExclusiveArch: %{rust_arches} - rust-number_prefix ExclusiveArch: %{rust_arches} - rust-object ExclusiveArch: %{rust_arches} - rust-openssl ExclusiveArch: %{rust_arches} - rust-openssl-probe ExclusiveArch: %{rust_arches} - rust-openssl-sys ExclusiveArch: %{rust_arches} - rust-ordermap ExclusiveArch: %{rust_arches} - rust-owning_ref ExclusiveArch: %{rust_arches} - rust-packaging ExclusiveArch: %{rust_arches} noarch - rust-pad ExclusiveArch: %{rust_arches} - rust-pager ExclusiveArch: %{rust_arches} - rust-pango ExclusiveArch: %{rust_arches} - rust-pango-sys ExclusiveArch: %{rust_arches} - rust-peeking_take_while ExclusiveArch: %{rust_arches} - rust-percent-encoding ExclusiveArch: %{rust_arches} - rust-permutate ExclusiveArch: %{rust_arches} - rust-permutohedron ExclusiveArch: %{rust_arches} - rust-pest ExclusiveArch: %{rust_arches} - rust-pest0.3 ExclusiveArch: %{rust_arches} - rust-pest_derive ExclusiveArch: %{rust_arches} - rust-phf ExclusiveArch: %{rust_arches} - rust-phf_codegen ExclusiveArch: %{rust_arches} - rust-phf_generator ExclusiveArch: %{rust_arches} - rust-phf_shared ExclusiveArch: %{rust_arches} - rust-pkg-config ExclusiveArch: %{rust_arches} - rust-plain ExclusiveArch: %{rust_arches} - rust-pretty_env_logger ExclusiveArch: %{rust_arches} - rust-proc-macro2 ExclusiveArch: %{rust_arches} - rust-procedural-masquerade ExclusiveArch: %{rust_arches} - rust-pulldown-cmark ExclusiveArch: %{rust_arches} - rust-quick-error ExclusiveArch: %{rust_arches} - rust-quickcheck ExclusiveArch: %{rust_arches} - rust-quickersort ExclusiveArch: %{rust_arches} - rust-quote ExclusiveArch: %{rust_arches} - rust-rand ExclusiveArch: %{rust_arches} - rust-rayon ExclusiveArch: %{rust_arches} - rust-rayon-core ExclusiveArch: %{rust_arches} - rust-regex ExclusiveArch: %{rust_arches} - rust-regex-syntax ExclusiveArch: %{rust_arches} - rust-relay ExclusiveArch: %{rust_arches} - rust-ripgrep ExclusiveArch: %{rust_arches} - rust-rustc-demangle ExclusiveArch: %{rust_arches} - rust-rustc-serialize ExclusiveArch: %{rust_arches} - rust-rustc-test ExclusiveArch: %{rust_arches} - rust-rustc_version ExclusiveArch: %{rust_arches} - rust-rustdoc-stripper ExclusiveArch: %{rust_arches} - rust-rustfilt ExclusiveArch: %{rust_arches} - rust-rustfmt ExclusiveArch: %{rust_arches} - rust-safemem ExclusiveArch: %{rust_arches} - rust-same-file ExclusiveArch: %{rust_arches} - rust-scoped-tls ExclusiveArch: %{rust_arches} - rust-scoped_threadpool ExclusiveArch: %{rust_arches} - rust-scopeguard ExclusiveArch: %{rust_arches} - rust-scroll ExclusiveArch: %{rust_arches} - rust-scroll_derive ExclusiveArch: %{rust_arches} - rust-seahash ExclusiveArch: %{rust_arches} - rust-semver ExclusiveArch: %{rust_arches} - rust-semver-parser ExclusiveArch: %{rust_arches} - rust-serde ExclusiveArch: %{rust_arches} - rust-serde0.8 ExclusiveArch: %{rust_arches} - rust-serde_bytes ExclusiveArch: %{rust_arches} - rust-serde_cbor ExclusiveArch: %{rust_arches} - rust-serde_derive ExclusiveArch: %{rust_arches} - rust-serde_derive_internals ExclusiveArch: %{rust_arches} - rust-serde_ignored ExclusiveArch: %{rust_arches} - rust-serde_json ExclusiveArch: %{rust_arches} - rust-serde_json0.8 ExclusiveArch: %{rust_arches} - rust-serde_test ExclusiveArch: %{rust_arches} - rust-serde_urlencoded ExclusiveArch: %{rust_arches} - rust-serde_yaml ExclusiveArch: %{rust_arches} - rust-sha1 ExclusiveArch: %{rust_arches} - rust-shell-escape ExclusiveArch: %{rust_arches} - rust-shlex ExclusiveArch: %{rust_arches} - rust-siphasher ExclusiveArch: %{rust_arches} - rust-slab ExclusiveArch: %{rust_arches} - rust-slab0.3 ExclusiveArch: %{rust_arches} - rust-smallvec ExclusiveArch: %{rust_arches} - rust-socket2 ExclusiveArch: %{rust_arches} - rust-sourceview ExclusiveArch: %{rust_arches} - rust-spin ExclusiveArch: %{rust_arches} - rust-spmc ExclusiveArch: %{rust_arches} - rust-stable_deref_trait ExclusiveArch: %{rust_arches} - rust-strings ExclusiveArch: %{rust_arches} - rust-strsim ExclusiveArch: %{rust_arches} - rust-syn ExclusiveArch: %{rust_arches} - rust-synom ExclusiveArch: %{rust_arches} - rust-synstructure ExclusiveArch: %{rust_arches} - rust-syntex_errors ExclusiveArch: %{rust_arches} - rust-syntex_pos ExclusiveArch: %{rust_arches} - rust-syntex_syntax ExclusiveArch: %{rust_arches} - rust-sys-info ExclusiveArch: %{rust_arches} - rust-tar ExclusiveArch: %{rust_arches} - rust-tempdir ExclusiveArch: %{rust_arches} - rust-tempfile ExclusiveArch: %{rust_arches} - rust-term ExclusiveArch: %{rust_arches} - rust-term_grid ExclusiveArch: %{rust_arches} - rust-term_size ExclusiveArch: %{rust_arches} - rust-termcolor ExclusiveArch: %{rust_arches} - rust-termion ExclusiveArch: %{rust_arches} - rust-test-assembler ExclusiveArch: %{rust_arches} - rust-textwrap ExclusiveArch: %{rust_arches} - rust-thread-id ExclusiveArch: %{rust_arches} - rust-thread_local ExclusiveArch: %{rust_arches} - rust-time ExclusiveArch: %{rust_arches} - rust-tokei ExclusiveArch: %{rust_arches} - rust-tokio-core ExclusiveArch: %{rust_arches} - rust-tokio-io ExclusiveArch: %{rust_arches} - rust-tokio-process ExclusiveArch: %{rust_arches} - rust-tokio-signal ExclusiveArch: %{rust_arches} - rust-toml ExclusiveArch: %{rust_arches} - rust-traitobject ExclusiveArch: %{rust_arches} - rust-typed-arena ExclusiveArch: %{rust_arches} - rust-unicase ExclusiveArch: %{rust_arches} - rust-unicode-bidi ExclusiveArch: %{rust_arches} - rust-unicode-normalization ExclusiveArch: %{rust_arches} - rust-unicode-segmentation ExclusiveArch: %{rust_arches} - rust-unicode-width ExclusiveArch: %{rust_arches} - rust-unicode-xid ExclusiveArch: %{rust_arches} - rust-unindent ExclusiveArch: %{rust_arches} - rust-unreachable ExclusiveArch: %{rust_arches} - rust-unsafe-any ExclusiveArch: %{rust_arches} - rust-untrusted ExclusiveArch: %{rust_arches} - rust-url ExclusiveArch: %{rust_arches} - rust-users ExclusiveArch: %{rust_arches} - rust-utf8-ranges ExclusiveArch: %{rust_arches} - rust-uuid ExclusiveArch: %{rust_arches} - rust-vec_map ExclusiveArch: %{rust_arches} - rust-version-sync ExclusiveArch: %{rust_arches} - rust-version_check ExclusiveArch: %{rust_arches} - rust-void ExclusiveArch: %{rust_arches} - rust-wait-timeout ExclusiveArch: %{rust_arches} - rust-walkdir ExclusiveArch: %{rust_arches} - rust-which ExclusiveArch: %{rust_arches} - rust-xattr ExclusiveArch: %{rust_arches} - rust-xz2 ExclusiveArch: %{rust_arches} - rust-yaml-rust ExclusiveArch: %{rust_arches} - rust-yaml-rust0.3 ExclusiveArch: %{rust_arches} - rust-yes ExclusiveArch: %{rust_arches} - rust-yubibomb ExclusiveArch: %{rust_arches} - rust-zoneinfo_compiled ExclusiveArch: %{rust_arches} - s390utils ExclusiveArch: s390 s390x - sagemath ExclusiveArch: aarch64 %{arm} %{ix86} x86_64 ppc sparcv9 - sbcl ExclusiveArch: %{arm} %{ix86} x86_64 ppc sparcv9 aarch64 - sbd ExclusiveArch: i686 x86_64 s390x - seabios ExclusiveArch: x86_64 - seamonkey ExclusiveArch: %{ix86} x86_64 - servicelog ExclusiveArch: ppc %{power64} - sgabios ExclusiveArch: %{ix86} x86_64 - sharpfont ExclusiveArch: %mono_arches - sharpziplib ExclusiveArch: %{mono_arches} - shim ExclusiveArch: x86_64 - shim-signed ExclusiveArch: x86_64 aarch64 - shim-unsigned-aarch64 ExclusiveArch: aarch64 - shim-unsigned-x64 ExclusiveArch: x86_64 - sigul ExclusiveArch: x86_64 - skychart ExclusiveArch: %{fpc_arches} - slapi-nis ExclusiveArch: x86_64 %{ix86} - smuxi ExclusiveArch: %{ix86} x86_64 %{arm} ppc64le - snapd ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ppc64le s390x - source-to-image ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - sparkleshare ExclusiveArch: %{mono_arches} - spicctrl ExclusiveArch: %{ix86} x86_64 - spice ExclusiveArch: x86_64 ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - spice-xpi ExclusiveArch: i686 x86_64 armv6l armv7l armv7hl aarch64 - spring ExclusiveArch: %{ix86} x86_64 - springlobby ExclusiveArch: %{ix86} x86_64 - startdde ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 %{arm}} - statsd ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - stratis-cli ExclusiveArch: %{rust_arches} noarch - stratisd ExclusiveArch: %{rust_arches} - stripesnoop ExclusiveArch: %{ix86} x86_64 - supermin ExclusiveArch: x86_64 - syncthing ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} - sysbench ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} aarch64 - syslinux ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 ExclusiveArch: %{ix86} x86_64 - taglib-sharp ExclusiveArch: %{mono_arches} - tarantool ExclusiveArch: %{ix86} x86_64 armv7hl armv7hnl aarch64 - tboot ExclusiveArch: %{ix86} x86_64 - templates_parser ExclusiveArch: %GPRbuild_arches - ternimal ExclusiveArch: %{rust_arches} - themonospot-base ExclusiveArch: %mono_arches - themonospot-console ExclusiveArch: %mono_arches - themonospot-gui-gtk ExclusiveArch: %mono_arches - themonospot-plugin-avi ExclusiveArch: %mono_arches - themonospot-plugin-mkv ExclusiveArch: %mono_arches - thermald ExclusiveArch: %{ix86} x86_64 - thunderbird-enigmail ExclusiveArch: %{ix86} %{arm} ppc64 ppc64le s390x x86_64 noarch - tilix ExclusiveArch: %{ldc_arches} - tmux-top ExclusiveArch: %{go_arches} - tomboy ExclusiveArch: %{mono_arches} - tpm2-abrmd ExclusiveArch: %{ix86} x86_64 - tpm2-tools ExclusiveArch: %{ix86} x86_64 - tpm2-tss ExclusiveArch: %{ix86} x86_64 - tuned ExclusiveArch: %{ix86} x86_64 - uClibc ExclusiveArch: %{arm} %{ix86} x86_64 %{mips} - ucx ExclusiveArch: aarch64 ppc64le x86_64 - ugene ExclusiveArch: %{ix86} x86_64 - uglify-js ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - uglify-js1 ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{ix86} x86_64 %{arm} noarch - unetbootin ExclusiveArch: %{ix86} x86_64 - v8 ExclusiveArch: %{ix86} x86_64 %{arm} ppc mipsel mips64el - v8-314 ExclusiveArch: %{ix86} x86_64 %{arm} mips mipsel ppc ppc64 - valgrind ExclusiveArch: %{ix86} x86_64 ppc ppc64 ppc64le s390x armv7hl aarch64 - vboot-utils ExclusiveArch: %{arm} aarch64 %{ix86} x86_64 - vdsm ExclusiveArch: x86_64 %{power64} aarch64 - vim-go ExclusiveArch: %{?golang_arches}%{!?golang_arches:%{ix86} x86_64 %{arm}} - virtualplanet ExclusiveArch: %{fpc_arches} - vrq ExclusiveArch: %{ix86} x86_64 - warsow ExclusiveArch: %{ix86} x86_64 %{arm} - warsow-data ExclusiveArch: %{ix86} x86_64 %{arm} - webkit-sharp ExclusiveArch: %mono_arches - webkit2-sharp ExclusiveArch: %mono_arches - wine ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 ExclusiveArch: %{ix86} %{arm} - winetricks ExclusiveArch: %{ix86} x86_64 %{arm} aarch64 - wiredtiger ExclusiveArch: x86_64 aarch64 ppc64le - wraplinux ExclusiveArch: %{ix86} x86_64 - wxMaxima ExclusiveArch: %{arm} %{ix86} x86_64 aarch64 ppc sparcv9 - x2goclient ExclusiveArch: x86_64 - x86info ExclusiveArch: %{ix86} x86_64 - xen ExclusiveArch: %{ix86} x86_64 armv7hl aarch64 - xmlada ExclusiveArch: %{GPRbuild_arches} - xorg-x11-drv-armsoc ExclusiveArch: %{arm} aarch64 - xorg-x11-drv-geode ExclusiveArch: %{ix86} - xorg-x11-drv-intel ExclusiveArch: %{ix86} x86_64 ia64 - xorg-x11-drv-omap ExclusiveArch: %{arm} - xorg-x11-drv-openchrome ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-opentegra ExclusiveArch: %{arm} - xorg-x11-drv-vesa ExclusiveArch: %{ix86} x86_64 - xorg-x11-drv-vmware ExclusiveArch: %{ix86} x86_64 ia64 - xsp ExclusiveArch: %mono_arches - xsupplicant ExclusiveArch: %{ix86} x86_64 ppc %{power64} - ycssmin ExclusiveArch: %{nodejs_arches} noarch - zeromq-ada ExclusiveArch: %{GNAT_arches} - zlib-ada ExclusiveArch: %{GNAT_arches}

1 0

Architecture specific change in rpms/compiler-rt.git
by githook-noreply＠fedoraproject.org 26 Jan '18

26 Jan '18

The package rpms/compiler-rt.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/compiler-rt.git/commit/?id=d4ed69c9…. Change: +%ifarch aarch64 Thanks. Full change: ============ commit d4ed69c9f1973dcd22cb7b41d9602e8544cd1a15 Author: Tom Stellard <tstellar(a)redhat.com> Date: Fri Jan 26 00:04:58 2018 +0000 6.0.0-rc1 Release diff --git a/.gitignore b/.gitignore index 60cb005..3e93e02 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /compiler-rt-5.0.0.src.tar.xz /Fuzzer-5.0.1.tar.xz /compiler-rt-5.0.1.src.tar.xz +/compiler-rt-6.0.0rc1.src.tar.xz diff --git a/compiler-rt.spec b/compiler-rt.spec index c38446b..c82b5e8 100644 --- a/compiler-rt.spec +++ b/compiler-rt.spec @@ -3,22 +3,16 @@ %global debug_package %{nil} %endif +%global rc_ver 1 + Name: compiler-rt -Version: 5.0.1 -Release: 2%{?dist} +Version: 6.0.0 +Release: 0.1.rc%{rc_ver}%{?dist} Summary: LLVM "compiler-rt" runtime libraries License: NCSA or MIT URL: http://llvm.org -Source0: http://llvm.org/releases/%{version}/%{name}-%{version}.src.tar.xz -# Extract libFuzzer sources from the llvm tarball. We are packaging it as part -# of compiler-rt, because upstream moved the code into the compiler-rt project -# for LLVM 6.0.0. -# wget http://llvm.org/releases/5.0.1/llvm-5.0.1.src.tar.xz -# tar -xJf llvm-5.0.1.src.tar.xz -# cd llvm-5.0.1.src/lib/ -# tar -cJf Fuzzer-5.0.1.tar.xz Fuzzer/ -Source1: Fuzzer-5.0.1.tar.xz +Source0: http://llvm.org/releases/%{version}/%{name}-%{version}%{?rc_ver:rc%{rc_ver}… Patch1: 0001-Fix-AArch64-build-with-glibc-2.26.patch BuildRequires: cmake @@ -33,9 +27,7 @@ code generation, sanitizer runtimes and profiling library for code instrumentation, and Blocks C language extension. %prep -%setup -T -q -b 1 -n Fuzzer - -%autosetup -n %{name}-%{version}.src -p1 +%autosetup -n %{name}-%{version}%{?rc_ver:rc%{rc_ver}}.src -p1 %build mkdir -p _build @@ -53,24 +45,17 @@ cd _build make %{?_smp_mflags} -# Build Fuzzer with gcc -export CXX=g++ -pushd ../../Fuzzer -./build.sh -popd - %install cd _build make install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_libdir}/clang/%{version}/lib -pushd ../../Fuzzer -install -m0644 libFuzzer.a %{buildroot}%{_libdir}/clang/%{version}/lib -popd +%ifarch aarch64 +%global aarch64_blacklists hwasan_blacklist.txt +%endif -# move sanitizer lists to better place -for file in asan_blacklist.txt msan_blacklist.txt dfsan_blacklist.txt cfi_blacklist.txt dfsan_abilist.txt; do +for file in %{aarch64_blacklists} asan_blacklist.txt msan_blacklist.txt dfsan_blacklist.txt cfi_blacklist.txt dfsan_abilist.txt; do mv -v %{buildroot}%{_prefix}/${file} %{buildroot}%{_libdir}/clang/%{version}/ || : done @@ -91,6 +76,9 @@ cd _build %{_libdir}/clang/%{version} %changelog +* Thu Jan 25 2018 Tom Stellard <tstellar(a)redhat.com> - 6.0.0-0.1.rc1 +- 6.0.0-rc1 Release + * Wed Jan 17 2018 Tom Stellard <tstellar(a)redhat.com> - 5.0.1-2 - Build libFuzzer with gcc diff --git a/sources b/sources index 0cc7bfc..f8df75d 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (Fuzzer-5.0.1.tar.xz) = 397dbb8eda705288b8527f4e8f56175f49e65d364c2a1e0bcb6e90bac74a728eaa321f8ce5603811d1278b33d32223ed3640aec5cfb166659522e883cc1d9de2 -SHA512 (compiler-rt-5.0.1.src.tar.xz) = 61e23775db78bdeed3003a509b45ae609287db31302fed186f3210d481ecf062d1828571e63482215ab00ff732df8f3fa6c77334dfb677e4b76eb555d476b8c4 +SHA512 (compiler-rt-6.0.0rc1.src.tar.xz) = 2b223487154035bb4b83775f871e9017fcffb6078e704b6a33abc93ad5f0641742f41776c42526423a72805ed3226c2a48d71bbb9ce4f7d3de29d13f0dcd00d0

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Arch-excludes January 2018