From root@cnpm.embrapa.br Fri Apr 7 17:40:06 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 18BDE16A403 for ; Fri, 7 Apr 2006 17:40:06 +0000 (UTC) (envelope-from root@cnpm.embrapa.br) Received: from inga.cnpm.embrapa.br (inga.cnpm.embrapa.br [200.136.111.23]) by mx1.FreeBSD.org (Postfix) with ESMTP id 193FA43D58 for ; Fri, 7 Apr 2006 17:40:00 +0000 (GMT) (envelope-from root@cnpm.embrapa.br) Received: from caraiba.cnpm.embrapa.br (caraiba.cnpm.embrapa.br [200.136.111.98]) by inga.cnpm.embrapa.br (Postfix) with ESMTP id E49858A023 for ; Fri, 7 Apr 2006 14:39:54 -0300 (BRT) Received: from localhost (localhost [127.0.0.1]) by caraiba.cnpm.embrapa.br (Postfix) with ESMTP id 4D6DB16A40A for ; Fri, 7 Apr 2006 14:40:08 -0300 (BRT) Received: from mogno.local.cnpm.embrapa.br (mogno.local.cnpm.embrapa.br [10.0.0.241]) by caraiba.cnpm.embrapa.br (Postfix) with ESMTP id 103D616A411 for ; Fri, 7 Apr 2006 14:40:07 -0300 (BRT) Received: by mogno.local.cnpm.embrapa.br (Postfix, from userid 0) id 3CBC217043; Fri, 7 Apr 2006 14:39:17 -0300 (BRT) Message-Id: <20060407173917.3CBC217043@mogno.local.cnpm.embrapa.br> Date: Fri, 7 Apr 2006 14:39:17 -0300 (BRT) From: Anderson S. Ferreira Reply-To: Anderson S. Ferreira To: FreeBSD-gnats-submit@freebsd.org Cc: Subject: [maintainer-update] security/klamav: Upgrade from 0.32 to 0.35.1 X-Send-Pr-Version: 3.113 X-GNATS-Notify: >Number: 95485 >Category: ports >Synopsis: [maintainer-update] security/klamav: Upgrade from 0.32 to 0.35.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: itetcu >State: closed >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Fri Apr 07 17:40:20 GMT 2006 >Closed-Date: Mon Jun 05 10:31:22 GMT 2006 >Last-Modified: Mon Jun 05 10:31:22 GMT 2006 >Originator: Anderson S. Ferreira >Release: FreeBSD 6.1-PRERELEASE amd64 >Organization: Embrapa Monitoramento por Satélite >Environment: System: FreeBSD mogno.local.cnpm.embrapa.br 6.1-PRERELEASE FreeBSD 6.1-PRERELEASE #1: Thu Apr 6 09:33:04 BRT 2006 anderson@mogno.local.cnpm.embrapa.br:/usr/src/sys/amd64/compile/MOGNO amd64 >Description: Upgrade klamav from 0.32 to 0.35.1 >How-To-Repeat: >Fix: --- klamav.patch begins here --- diff -uNr klamav.old/Makefile klamav/Makefile --- klamav.old/Makefile Thu Feb 23 07:38:57 2006 +++ klamav/Makefile Fri Mar 10 14:07:06 2006 @@ -6,7 +6,7 @@ # PORTNAME= klamav -PORTVERSION= 0.32 +PORTVERSION= 0.35.1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= klamav @@ -16,19 +16,25 @@ MAINTAINER= anderson@cnpm.embrapa.br COMMENT= A KDE 3 front-end to Clam Anti-Virus -LIB_DEPENDS= clamav:${PORTSDIR}/security/clamav +LIB_DEPENDS= clamav:${PORTSDIR}/security/clamav \ + sqlite3:${PORTSDIR}/databases/sqlite3 -USE_KDELIBS_VER=3 PREFIX= ${KDE_PREFIX} -WRKSRC= ${WRKDIR}/${DISTNAME}/${DISTNAME} - USE_BZIP2= yes USE_GMAKE= yes USE_AUTOTOOLS= libtool:15 -CONFIGURE_ENV+= LDFLAGS=${PTHREAD_LIBS} -CONFIGURE_ARGS+= --with-qt-dir=${X11BASE} +CONFIGURE_ENV= LDFLAGS=${PTHREAD_LIBS} +CONFIGURE_ARGS+= --with-qt-dir=${X11BASE} \ + --without-included-sqlite + +USE_KDELIBS_VER=3 .include + +.if ${OSVERSION} < 500000 +IGNORE= "Klamav doesn't compile on FreeBSD 4.X" +.endif + diff -uNr klamav.old/distinfo klamav/distinfo --- klamav.old/distinfo Tue Dec 20 18:48:31 2005 +++ klamav/distinfo Wed Mar 8 15:38:23 2006 @@ -1,3 +1,3 @@ -SIZE (klamav-0.32.tar.bz2) = 867227 -MD5 (klamav-0.32.tar.bz2) = f0226c6b2f64f2e9d2c4099b1812fdb6 -SHA256 (klamav-0.32.tar.bz2) = dd27cba3f433c9930efee21972c40c4179c629f8cd8997638be1c2e05878c962 +MD5 (klamav-0.35.1.tar.bz2) = acbd1f0367a43bb0440c50a6caeb3a34 +SHA256 (klamav-0.35.1.tar.bz2) = a1d07b6c0fd98aed9928e9d7c1f4ae35d529d2f0ae10d4e376693e7ac890f6a8 +size (klamav-0.35.1.tar.bz2) = 1117310 diff -uNr klamav.old/files/patch-configure klamav/files/patch-configure --- klamav.old/files/patch-configure Wed Dec 31 21:00:00 1969 +++ klamav/files/patch-configure Thu Mar 9 08:16:36 2006 @@ -0,0 +1,11 @@ +--- configure Thu Mar 9 08:15:40 2006 ++++ configure Thu Mar 9 08:16:11 2006 +@@ -9,6 +9,8 @@ + ## M4sh Initialization. ## + ## --------------------- ## + ++PKGCONFIGFOUND=yes ++ + # Be Bourne compatible + if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh diff -uNr klamav.old/files/patch-klamav klamav/files/patch-klamav --- klamav.old/files/patch-klamav Tue Dec 20 18:48:31 2005 +++ klamav/files/patch-klamav Wed Dec 31 21:00:00 1969 @@ -1,71 +0,0 @@ ---- src/klamav.cpp Mon Nov 21 17:21:59 2005 -+++ src/klamav.cpp Thu Dec 15 09:30:42 2005 -@@ -47,24 +47,33 @@ - connect(_tray,SIGNAL(quitSelected()),SLOT(shuttingDown())); - - KPopupMenu *conf_menu = _tray->contextMenu(); -+ -+/* -- - EnableKlamd = new KAction(i18n("&Enable Auto-Scan"), "klamav", 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable"); - DisableKlamd = new KAction(i18n("&Disable Auto-Scan"),"klamavbw", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable"); -- -+*/ -+ - EnableFreshklam = new KAction(i18n("&Enable Auto-Updates"), "klamavbwdl", 0,this, SLOT(contextEnableFK()),actionCollection(),"fk_enable"); - DisableFreshklam = new KAction(i18n("&Disable Auto-Updates"),"klamavbw", 0,this, SLOT(contextDisableFK()),actionCollection(),"fk_disable"); - - EnableFreshklam->plug(conf_menu); - DisableFreshklam->plug(conf_menu); -+ -+/* -- - EnableKlamd->plug(conf_menu); - DisableKlamd->plug(conf_menu); -- -+*/ -+ - QToolTip::add( _tray, "KlamAV - Virus Protection for KDE" ); - _tray->show(); - - DisableFreshklam->setEnabled(FALSE); - EnableFreshklam->setEnabled(TRUE); -+ -+/* -- - DisableKlamd->setEnabled(FALSE); - EnableKlamd->setEnabled(TRUE); -+*/ - - KConfig* config = KGlobal::config(); - config->setGroup("Freshklam"); -@@ -81,10 +90,15 @@ - tab->addTab(klamscan, i18n("&Scan")); - - klamd = new Klamd(this); -+ -+ klamd->hide(); -+ -+/* -- - tab->addTab(klamd, i18n("&Auto-Scan")); - - connect(klamd->search_button,SIGNAL(clicked()),SLOT(contextEnable())); - connect(klamd->cancel_button,SIGNAL(clicked()),SLOT(contextDisable())); -+*/ - - freshklam = new Freshklam(this); - tab->addTab(freshklam, i18n("&Update")); -@@ -105,8 +119,6 @@ - aboutklamav = new Aboutklamav(this); - tab->addTab(aboutklamav, i18n("Abou&t")); - -- -- - - top->addWidget(tab); - -@@ -149,6 +161,7 @@ - void Klamav::shuttingDown(){ - - this->topLevelWidget()->hide(); -+ this->contextDisableFK(); - - } - diff -uNr klamav.old/files/patch-klamd klamav/files/patch-klamd --- klamav.old/files/patch-klamd Wed Dec 31 21:00:00 1969 +++ klamav/files/patch-klamd Wed Mar 8 15:50:03 2006 @@ -0,0 +1,29 @@ +--- src/klamd.cpp Wed Mar 8 15:47:12 2006 ++++ src/klamd.cpp Wed Mar 8 15:49:18 2006 +@@ -699,7 +699,7 @@ + + + dazukoLoaded = FALSE; +- QString lsmodCommand="lsmod"; ++ QString lsmodCommand="kldstat"; + lsmodproc = new KProcIO(); + QString curpath = (QString) getenv("PATH"); + lsmodproc->setEnvironment("PATH",curpath + ":/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin"); +@@ -730,7 +730,7 @@ + { + if (!(dazukoLoaded)){ + int result; +- result = KMessageBox::warningContinueCancel(this, i18n( "I need to load a module called 'dazuko' first. This module will allow KlamAV to gain real-time access to files. If you don't want this message to appear in future, put the following command in your initialization scripts: 'modprobe dazuko.o'. You will next be asked for the root password."), ++ result = KMessageBox::warningContinueCancel(this, i18n( "I need to load a module called 'dazuko' first. This module will allow KlamAV to gain real-time access to files. If you don't want this message to appear in future, put the following command in your initialization scripts: 'kldload dazuko.ko'. You will next be asked for the root password."), + i18n( "Load Module" ), + i18n( "Load Module" ), + i18n( "Delete2" )); +@@ -803,7 +803,7 @@ + // + // //kdDebug() << release << endl; + // QString insmodCommand="insmod /lib/modules/" + release + "/dazuko.o"; +- QString insmodCommand="modprobe dazuko"; ++ QString insmodCommand="kldload /usr/local/modules/dazuko.ko"; + //QString insmodCommand="insmod /opt/kde/bin/dazuko.o"; + KProcIO *insmodproc = new KProcIO(); + diff -uNr klamav.old/files/patch-po klamav/files/patch-po --- klamav.old/files/patch-po Wed Dec 31 21:00:00 1969 +++ klamav/files/patch-po Wed Mar 8 09:54:36 2006 @@ -0,0 +1,110 @@ +--- po/cs.po Wed Mar 8 09:45:07 2006 ++++ po/cs.po Wed Mar 8 09:46:00 2006 +@@ -610,10 +610,10 @@ + "I need to load a module called 'dazuko' first. This module will allow KlamAV " + "to gain real-time access to files. If you don't want this message to appear " + "in future, put the following command in your initialization scripts: " +-"'modprobe dazuko.o'. You will next be asked for the root password." ++"'kldload dazuko.ko'. You will next be asked for the root password." + msgstr "" + "KlamAV potÅ™ebuje nejprve zavést modul 'dazuko'. Tento modul KlamAVu umožní přístup k souborům v reálném Äase. Pokud nechcete, aby se tato zpráva v budoucnu zobrazovala, pÅ™idejte následující řádek do vaÅ¡eho init skriptu: " +-"'modprobe dazuko.o'. Nyní budete požádáni o heslo roota." ++"'kldload dazuko.ko'. Nyní budete požádáni o heslo roota." + + #: klamd.cpp:733 klamd.cpp:734 + msgid "Load Module" +--- po/de.po Wed Mar 8 09:45:07 2006 ++++ po/de.po Wed Mar 8 09:46:35 2006 +@@ -625,7 +625,7 @@ + "I need to load a module called 'dazuko' first. This module will allow KlamAV " + "to gain real-time access to files. If you don't want this message to appear " + "in future, put the following command in your initialization scripts: " +-"'modprobe dazuko.o'. You will next be asked for the root password." ++"'kldload dazuko.ko'. You will next be asked for the root password." + msgstr "" + "Es muß das Modul mit dem Namen \"dazuko\" geladen werden. Dies ermöglicht " + "einen verbesserten Zugriffn auf die Datein. Wenn sie nicht möchten, dass " +--- po/es.po Wed Mar 8 09:45:07 2006 ++++ po/es.po Wed Mar 8 09:46:42 2006 +@@ -623,12 +623,12 @@ + "I need to load a module called 'dazuko' first. This module will allow KlamAV " + "to gain real-time access to files. If you don't want this message to appear " + "in future, put the following command in your initialization scripts: " +-"'modprobe dazuko.o'. You will next be asked for the root password." ++"'kldload dazuko.ko'. You will next be asked for the root password." + msgstr "" + "Se necesita cargar un módulo llamado 'dazuko' primero. Este módulo le " + "permite a KlamAV acceso en tiempo real a los ficheros. Si no quiere que este " + "mensaje aparezca en el futuro, ponga lo siguiente en los scripts de " +-"inicialización: 'modprobe dazuko.o'. Necesita la clave de administrador." ++"inicialización: 'kldload dazuko.ko'. Necesita la clave de administrador." + + #: klamd.cpp:718 klamd.cpp:719 + msgid "Load Module" +--- po/hu.po Wed Mar 8 09:45:07 2006 ++++ po/hu.po Wed Mar 8 09:46:49 2006 +@@ -626,12 +626,12 @@ + "I need to load a module called 'dazuko' first. This module will allow KlamAV " + "to gain real-time access to files. If you don't want this message to appear " + "in future, put the following command in your initialization scripts: " +-"'modprobe dazuko.o'. You will next be asked for the root password." ++"'kldload dazuko.ko'. You will next be asked for the root password." + msgstr "" + "ElÅ‘ször be kell tölteni a 'dazuko' nevű modult. Ez a modul teszi lehetÅ‘vé a KlamAV számára " + "a fájlok valós idejű elérését. Ha azt szeretné, hogy ez az üzenet " + "ne jelenjen meg a jövÅ‘ben, írja be a következÅ‘ parancsot a rendszerinicializálási szkriptbe: " +-"'modprobe dazuko.o'. A rendszergazdai jelszót meg kell adni." ++"'kldload dazuko.ko'. A rendszergazdai jelszót meg kell adni." + + #: klamd.cpp:718 klamd.cpp:719 + msgid "Load Module" +--- po/it.po Wed Mar 8 09:45:07 2006 ++++ po/it.po Wed Mar 8 09:46:57 2006 +@@ -618,7 +618,7 @@ + "I need to load a module called 'dazuko' first. This module will allow KlamAV " + "to gain real-time access to files. If you don't want this message to appear " + "in future, put the following command in your initialization scripts: " +-"'modprobe dazuko.o'. You will next be asked for the root password." ++"'kldload dazuko.ko'. You will next be asked for the root password." + msgstr "" + + #: klamd.cpp:718 klamd.cpp:719 +--- po/pl.po Wed Mar 8 09:45:07 2006 ++++ po/pl.po Wed Mar 8 09:47:02 2006 +@@ -545,7 +545,7 @@ + "I need to load a module called 'dazuko' first. This module will allow KlamAV " + "to gain real-time access to files. If you don't want this message to appear " + "in future, put the following command in your initialization scripts: " +-"'modprobe dazuko.o'. You will next be asked for the root password." ++"'kldload dazuko.ko'. You will next be asked for the root password." + msgstr "Konieczne jest zaÅ‚adowanie najpier moduÅ‚u Dazuko. ModuÅ‚ ten pozwoli programowi KlamAV uzyskać dostÄ™p do skanowania plików w czasie rzeczywistym. Jeżeli nie chcesz, aby ta informacja pojawiaÅ‚a siÄ™ w przyszÅ‚oÅ›ci, wklej nastÄ™pujÄ…cÄ… komendÄ™ w skrypcie inicjalizacyjnym: 'modeprobe dazuko.o'. Za chwilÄ™ pojawi siÄ™ pytanie o hasÅ‚o administratora." + + #: klamd.cpp:773 klamd.cpp:774 +--- po/pt_BR.po Wed Mar 8 09:45:07 2006 ++++ po/pt_BR.po Wed Mar 8 09:47:30 2006 +@@ -880,12 +880,12 @@ + "I need to load a module called 'dazuko' first. This module will allow KlamAV " + "to gain real-time access to files. If you don't want this message to appear " + "in future, put the following command in your initialization scripts: " +-"'modprobe dazuko.o'. You will next be asked for the root password." ++"'kldload dazuko.ko'. You will next be asked for the root password." + msgstr "" + "Preciso carregar um módulo chamado 'dazuko' antes. Este módulo permitirá ao " + "KlamAV obter acesso em tempo real a arquivos. Se não desejar que esta " + "mensagem continue a aparecer, insire o seguinte comando nos seus scripts de " +-"inicialização: 'modprobe dazuko.o.' É necessário ser root para executar a " ++"inicialização: 'kldload dazuko.ko.' É necessário ser root para executar a " + "função." + + #: klamd.cpp:718 klamd.cpp:719 +--- po/ru.po Wed Mar 8 09:45:07 2006 ++++ po/ru.po Wed Mar 8 09:47:45 2006 +@@ -628,7 +628,7 @@ + "I need to load a module called 'dazuko' first. This module will allow KlamAV " + "to gain real-time access to files. If you don't want this message to appear " + "in future, put the following command in your initialization scripts: " +-"'modprobe dazuko.o'. You will next be asked for the root password." ++"'kldload dazuko.ko'. You will next be asked for the root password." + msgstr "" + "Ðеобходимо запуÑтить модуль, называемый dazuko. Этот модуль разрешит KlamAV " + "получать доÑтуп в реальном времени к файлам. Далее Ð’Ð°Ñ Ð¿Ð¾Ð¿Ñ€Ð¾ÑÑÑ‚ ввеÑти " diff -uNr klamav.old/files/patch-src klamav/files/patch-src --- klamav.old/files/patch-src Wed Dec 31 21:00:00 1969 +++ klamav/files/patch-src Fri Mar 10 11:04:59 2006 @@ -0,0 +1,11 @@ +--- src/freshklam.cpp Fri Mar 10 11:03:46 2006 ++++ src/freshklam.cpp Fri Mar 10 11:04:15 2006 +@@ -165,7 +165,7 @@ + + + +- ++ software_group->hide(); + + + //Virus Database Directory diff -uNr klamav.old/pkg-plist klamav/pkg-plist --- klamav.old/pkg-plist Sun Jan 22 00:50:21 2006 +++ klamav/pkg-plist Fri Mar 10 14:44:05 2006 @@ -1,12 +1,13 @@ -bin/ScanWithKlamAV.sh bin/klammail bin/klamd bin/klamarkollon +bin/ScanWithKlamAV share/doc/HTML/en/klamav02/index.docbook share/doc/HTML/en/klamav02/index.cache.bz2 share/doc/HTML/en/klamav02/common share/locale/de/LC_MESSAGES/klamav.mo share/locale/cs/LC_MESSAGES/klamav.mo +share/locale/hu/LC_MESSAGES/klamav.mo share/locale/es/LC_MESSAGES/klamav.mo share/locale/it/LC_MESSAGES/klamav.mo share/locale/pl/LC_MESSAGES/klamav.mo @@ -17,6 +18,7 @@ share/applnk/Utilities/klamav.desktop share/apps/konqueror/servicemenus/klamav-dropdown.desktop share/apps/klamav/klamavui.rc +share/config.kcfg/klamavconfig.kcfg share/icons/locolor/32x32/apps/klamav.png share/icons/locolor/32x32/actions/klamav.png share/icons/locolor/16x16/apps/klamav.png @@ -44,6 +46,7 @@ share/apps/klamav/icons/locolor/16x16/actions/klamav.png share/apps/klamav/about/main.html share/apps/klamav/about/wait.html +share/apps/klamav/about/nodb.html share/apps/klamav/about/aboutklamav.html share/apps/klamav/about/klam.png share/apps/klamav/about/tshirt.png @@ -76,3 +79,4 @@ @dirrmtry share/apps/klamav/icons @dirrmtry share/apps/klamav/about @dirrmtry share/apps/klamav +@dirrmtry share/config.kcfg --- klamav.patch ends here --- >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->itetcu Responsible-Changed-By: itetcu Responsible-Changed-When: Tue May 9 12:59:25 UTC 2006 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=95485 State-Changed-From-To: open->feedback State-Changed-By: itetcu State-Changed-When: Tue May 9 18:18:49 UTC 2006 State-Changed-Why: Ask for maintainer approval. http://www.freebsd.org/cgi/query-pr.cgi?pr=95485 From: Ion-Mihai "IOnut" Tetcu To: "Anderson S. Ferreira" Cc: FreeBSD-gnats-submit@FreeBSD.org Subject: Re: ports/95485: [maintainer-update] security/klamav: Upgrade from 0.32 to 0.35.1 Date: Tue, 9 May 2006 21:17:45 +0300 --Sig_KqO2Te7KoPIPnShonjn.d2n Content-Type: multipart/mixed; boundary="MP_2HnHm+9X4/gJbW4lH.aVIu3" --MP_2HnHm+9X4/gJbW4lH.aVIu3 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Are you sure all those @dirrmtry are correct ? At least for DOCSDIR and share/apps/klamav/icons/ maybe we can use @rmdir ? Please run portlint -A _just_before_you send the PR. I'm attaching a diff, based on your PR that helps silencing portlint, do you approve it ? --=20 IOnut - Un^d^dregistered ;) FreeBSD "user" "Intellectual Property" is nowhere near as valuable as "Intellect" Ferengi Rule of Acquisition #31: Never make fun of a Ferengi's mother.1 -- ST:DS9, "The Siege" --MP_2HnHm+9X4/gJbW4lH.aVIu3 Content-Type: text/x-patch; name=klamav.diff Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=klamav.diff ? 95485 ? pr-patch ? files/patch-configure ? files/patch-klamd ? files/patch-po ? files/patch-src Index: Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/security/klamav/Makefile,v retrieving revision 1.3 diff -u -r1.3 Makefile --- Makefile 23 Feb 2006 10:38:57 -0000 1.3 +++ Makefile 9 May 2006 18:16:58 -0000 @@ -6,29 +6,36 @@ # =20 PORTNAME=3D klamav -PORTVERSION=3D 0.32 +PORTVERSION=3D 0.35.1 CATEGORIES=3D security MASTER_SITES=3D ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=3D klamav DISTNAME=3D ${PORTNAME}-${PORTVERSION} -EXTRACT_SUFX=3D .tar.bz2 =20 MAINTAINER=3D anderson@cnpm.embrapa.br COMMENT=3D A KDE 3 front-end to Clam Anti-Virus =20 -LIB_DEPENDS=3D clamav:${PORTSDIR}/security/clamav +LIB_DEPENDS=3D clamav:${PORTSDIR}/security/clamav \ + sqlite3:${PORTSDIR}/databases/sqlite3 =20 -USE_KDELIBS_VER=3D3 -PREFIX=3D ${KDE_PREFIX} +PREFIX=3D ${KDE_PREFIX} +DOCSDIR=3D ${PREFIX}/share/doc/HTML/en/klamav02 =20 -WRKSRC=3D ${WRKDIR}/${DISTNAME}/${DISTNAME} - -USE_BZIP2=3D yes -USE_GMAKE=3D yes +USE_BZIP2=3D yes +USE_GMAKE=3D yes =20 USE_AUTOTOOLS=3D libtool:15 =20 -CONFIGURE_ENV+=3D LDFLAGS=3D${PTHREAD_LIBS} -CONFIGURE_ARGS+=3D --with-qt-dir=3D${X11BASE} +CONFIGURE_ENV=3D LDFLAGS=3D${PTHREAD_LIBS} +CONFIGURE_ARGS+=3D--with-qt-dir=3D${X11BASE} \ + --without-included-sqlite + +USE_KDELIBS_VER=3D 3 + +.include + +.if ${OSVERSION} < 500000 +IGNORE=3D klamav doesn't compile on FreeBSD 4.X +.endif =20 -.include +.include Index: distinfo =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/security/klamav/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- distinfo 20 Dec 2005 20:48:31 -0000 1.2 +++ distinfo 9 May 2006 18:16:58 -0000 @@ -1,3 +1,3 @@ -SIZE (klamav-0.32.tar.bz2) =3D 867227 -MD5 (klamav-0.32.tar.bz2) =3D f0226c6b2f64f2e9d2c4099b1812fdb6 -SHA256 (klamav-0.32.tar.bz2) =3D dd27cba3f433c9930efee21972c40c4179c629f8c= d8997638be1c2e05878c962 +MD5 (klamav-0.35.1.tar.bz2) =3D acbd1f0367a43bb0440c50a6caeb3a34 +SHA256 (klamav-0.35.1.tar.bz2) =3D a1d07b6c0fd98aed9928e9d7c1f4ae35d529d2f= 0ae10d4e376693e7ac890f6a8 +size (klamav-0.35.1.tar.bz2) =3D 1117310 Index: pkg-plist =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /home/pcvs/ports/security/klamav/pkg-plist,v retrieving revision 1.3 diff -u -r1.3 pkg-plist --- pkg-plist 22 Jan 2006 02:50:21 -0000 1.3 +++ pkg-plist 9 May 2006 18:16:58 -0000 @@ -1,12 +1,13 @@ -bin/ScanWithKlamAV.sh bin/klammail bin/klamd bin/klamarkollon -share/doc/HTML/en/klamav02/index.docbook -share/doc/HTML/en/klamav02/index.cache.bz2 -share/doc/HTML/en/klamav02/common +bin/ScanWithKlamAV +%%DOCSDIR%%/index.docbook +%%DOCSDIR%%/index.cache.bz2 +%%DOCSDIR%%/common share/locale/de/LC_MESSAGES/klamav.mo share/locale/cs/LC_MESSAGES/klamav.mo +share/locale/hu/LC_MESSAGES/klamav.mo share/locale/es/LC_MESSAGES/klamav.mo share/locale/it/LC_MESSAGES/klamav.mo share/locale/pl/LC_MESSAGES/klamav.mo @@ -17,6 +18,7 @@ share/applnk/Utilities/klamav.desktop share/apps/konqueror/servicemenus/klamav-dropdown.desktop share/apps/klamav/klamavui.rc +share/config.kcfg/klamavconfig.kcfg share/icons/locolor/32x32/apps/klamav.png share/icons/locolor/32x32/actions/klamav.png share/icons/locolor/16x16/apps/klamav.png @@ -44,11 +46,12 @@ share/apps/klamav/icons/locolor/16x16/actions/klamav.png share/apps/klamav/about/main.html share/apps/klamav/about/wait.html +share/apps/klamav/about/nodb.html share/apps/klamav/about/aboutklamav.html share/apps/klamav/about/klam.png share/apps/klamav/about/tshirt.png @dirrmtry share/applnk/Utilities -@dirrmtry share/doc/HTML/en/klamav02 +%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrmtry share/apps/konqueror/servicemenus @dirrmtry share/icons/locolor/32x32/apps @dirrmtry share/icons/locolor/32x32/actions @@ -76,3 +79,4 @@ @dirrmtry share/apps/klamav/icons @dirrmtry share/apps/klamav/about @dirrmtry share/apps/klamav +@dirrmtry share/config.kcfg Index: files/patch-klamav =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: files/patch-klamav diff -N files/patch-klamav --- files/patch-klamav 20 Dec 2005 20:48:31 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,71 +0,0 @@ ---- src/klamav.cpp Mon Nov 21 17:21:59 2005 -+++ src/klamav.cpp Thu Dec 15 09:30:42 2005 -@@ -47,24 +47,33 @@ - connect(_tray,SIGNAL(quitSelected()),SLOT(shuttingDown())); - =09 - KPopupMenu *conf_menu =3D _tray->contextMenu(); -+ -+/* --=20 - EnableKlamd =3D new KAction(i18n("&Enable Auto-Scan"), "klamav", = 0,this, SLOT(contextEnable()),actionCollection(),"klamd_enable"); - DisableKlamd =3D new KAction(i18n("&Disable Auto-Scan"),"klamavbw= ", 0,this, SLOT(contextDisable()),actionCollection(),"klamd_disable"); -- =20 -+*/ =20 -+ - EnableFreshklam =3D new KAction(i18n("&Enable Auto-Updates"), "klamavbwd= l", 0,this, SLOT(contextEnableFK()),actionCollection(),"fk_enable"); - DisableFreshklam =3D new KAction(i18n("&Disable Auto-Updates"),"k= lamavbw", 0,this, SLOT(contextDisableFK()),actionCollection(),"fk_disable"); -=20 - EnableFreshklam->plug(conf_menu); - DisableFreshklam->plug(conf_menu); -+ -+/* -- - EnableKlamd->plug(conf_menu); - DisableKlamd->plug(conf_menu); --=09 -+*/ -+ - QToolTip::add( _tray, "KlamAV - Virus Protection for KDE" ); - _tray->show(); - =09 - DisableFreshklam->setEnabled(FALSE); - EnableFreshklam->setEnabled(TRUE); -+ -+/* -- - DisableKlamd->setEnabled(FALSE); - EnableKlamd->setEnabled(TRUE); -+*/ -=20 - KConfig* config =3D KGlobal::config(); - config->setGroup("Freshklam"); -@@ -81,10 +90,15 @@ - tab->addTab(klamscan, i18n("&Scan")); -=20 - klamd =3D new Klamd(this); -+=09 -+ klamd->hide(); -+ -+/* -- - tab->addTab(klamd, i18n("&Auto-Scan")); -=20 - connect(klamd->search_button,SIGNAL(clicked()),SLOT(contextEnable())); - connect(klamd->cancel_button,SIGNAL(clicked()),SLOT(contextDisable())); -+*/ - =09 - freshklam =3D new Freshklam(this); - tab->addTab(freshklam, i18n("&Update")); -@@ -105,8 +119,6 @@ - aboutklamav =3D new Aboutklamav(this); - tab->addTab(aboutklamav, i18n("Abou&t")); - =09 -- =20 -- -=20 - top->addWidget(tab); - =09 -@@ -149,6 +161,7 @@ - void Klamav::shuttingDown(){ -=20 - this->topLevelWidget()->hide(); -+ this->contextDisableFK(); -=20 - } -=20 --MP_2HnHm+9X4/gJbW4lH.aVIu3-- --Sig_KqO2Te7KoPIPnShonjn.d2n Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.3 (FreeBSD) iD8DBQFEYNzJBX6fi0k6KXsRAtFqAJ4v1ZsafscVpmkM/SCS9X0dMC4A0ACfQHrR 13mfRxiVF2oPejTsf6snZ0A= =E7ls -----END PGP SIGNATURE----- --Sig_KqO2Te7KoPIPnShonjn.d2n-- From: Ion-Mihai Tetcu To: Ion-Mihai "IOnut" Tetcu Cc: "Anderson S. Ferreira" , FreeBSD-gnats-submit@FreeBSD.org Subject: Re: ports/95485: [maintainer-update] security/klamav: Upgrade from 0.32 to 0.35.1 Date: Tue, 9 May 2006 23:26:00 +0300 On Tue, 9 May 2006 21:17:45 +0300 Ion-Mihai "IOnut" Tetcu wrote: > Are you sure all those @dirrmtry are correct ? > At least for DOCSDIR and share/apps/klamav/icons/ maybe we can use > @rmdir ? > > Please run portlint -A _just_before_you send the PR. > > I'm attaching a diff, based on your PR that helps silencing portlint, > do you approve it ? Err, see what I modified in Makefile and plist and see if you agree. Please try to submit cvs diff's as they are much easier to handle. Im' still confused about what I it's new and what is not ;-) just: cvs -z 3 -d :pserver:anoncvs:anoncvs@anoncvs.at.FreeBSD.org:/home/ncvs klamav cd klamav .... do your work make ..... portlint -A ....... if you add a file do before cvs diff: cvs add path/to/file if you remove one: rm path/to/file cvs rm path/to/file cvs diff -uN > ~/klamav.diff Thanks. -- IOnut - Un^d^dregistered ;) FreeBSD "user" "Intellectual Property" is nowhere near as valuable as "Intellect" "Life and death are seldom logical." "But attaining a desired goal always is." -- McCoy and Spock, "The Galileo Seven", stardate State-Changed-From-To: feedback->open State-Changed-By: itetcu State-Changed-When: Tue May 23 04:39:03 UTC 2006 State-Changed-Why: feedback received http://www.freebsd.org/cgi/query-pr.cgi?pr=95485 State-Changed-From-To: open->closed State-Changed-By: itetcu State-Changed-When: Mon Jun 5 10:31:18 UTC 2006 State-Changed-Why: Committed, with minor changes. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=95485 >Unformatted: