[PC-BSD Commits] r3357 - in pbibuild/modules/klamav: . overlay-dir overlay-dir/share
svn at pcbsd.org
svn at pcbsd.org
Wed Jan 28 11:34:38 PST 2009
Author: kris
Date: 2009-01-28 11:34:37 -0800 (Wed, 28 Jan 2009)
New Revision: 3357
Removed:
pbibuild/modules/klamav/overlay-dir/scripts/
pbibuild/modules/klamav/overlay-dir/share/applnk/
pbibuild/modules/klamav/overlay-dir/share/apps/
pbibuild/modules/klamav/overlay-dir/share/config.kcfg/
pbibuild/modules/klamav/overlay-dir/share/doc/
pbibuild/modules/klamav/overlay-dir/share/icons/
pbibuild/modules/klamav/overlay-dir/share/locale/
Modified:
pbibuild/modules/klamav/build.sh
pbibuild/modules/klamav/copy-files
pbibuild/modules/klamav/overlay-dir/PBI.FirstRun.sh
pbibuild/modules/klamav/overlay-dir/PBI.RemoveScript.sh
pbibuild/modules/klamav/overlay-dir/PBI.SetupScript.sh
pbibuild/modules/klamav/pbi.conf
Log:
Updated klamav, now 100% self-contained, and works properly! Users can virus scan via clamav, and use mail scanner if their mail app works with klammail
Modified: pbibuild/modules/klamav/build.sh
===================================================================
--- pbibuild/modules/klamav/build.sh 2009-01-28 18:04:26 UTC (rev 3356)
+++ pbibuild/modules/klamav/build.sh 2009-01-28 19:34:37 UTC (rev 3357)
@@ -8,21 +8,3 @@
# MODULEDIR = The location of the module directory for this PBI
# PORTVER = Version number of the port we used to build
##############################################################################
-
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,KlamAV${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
-
-# Get all the various language files and copy them to the PBI
-LANGFILE="klamav.mo"
-mkdir ${PBIDIR}/locale/
-cd /usr/local/share/locale
-for i in `ls`
-do
- if [ -e "/usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}" ]
- then
- mkdir ${PBIDIR}/locale/${i}
- cp /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE} ${PBIDIR}/locale/${i}/
- fi
-done
\ No newline at end of file
Modified: pbibuild/modules/klamav/copy-files
===================================================================
--- pbibuild/modules/klamav/copy-files 2009-01-28 18:04:26 UTC (rev 3356)
+++ pbibuild/modules/klamav/copy-files 2009-01-28 19:34:37 UTC (rev 3357)
@@ -2,17 +2,25 @@
/usr/local/bin/klamav bin/
/usr/local/bin/klamd bin/
/usr/local/bin/klammail bin/
+/usr/local/bin/*clam* bin/
+/usr/local/bin/sql* bin/
+/usr/local/sbin/clam* bin/
+/usr/local/sbin/clam* sbin/
/usr/local/bin/ScanWithKlamAV bin/
-/usr/local/share/applnk/Utilities/klamav.desktop share/applnk/Utilities/
-/usr/local/share/apps/klamav share/apps/
-/usr/local/share/apps/konqueror/servicemenus/klamav-dropdown.desktop share/apps/konqueror/servicemenus/
-/usr/local/share/config.kcfg/klamavconfig.kcfg share/config.kcfg/
/usr/local/share/doc/HTML/en/klamav02 share/doc/HTML/en/
-/usr/local/share/icons/hicolor/22x22/actions/klamav.png share/icons/hicolor/22x22/actions/
-/usr/local/share/icons/hicolor/32x32/actions/klamav.png share/icons/hicolor/32x32/actions/
-/usr/local/share/icons/hicolor/32x32/apps/klamav.png share/icons/hicolor/32x32/apps/
-/usr/local/share/icons/hicolor/48x48/apps/klamav.png share/icons/hicolor/48x48/apps/
-/usr/local/share/icons/locolor/16x16/actions/klamav.png share/icons/locolor/16x16/actions/
-/usr/local/share/icons/locolor/16x16/apps/klamav.png share/icons/locolor/16x16/apps/
-/usr/local/share/icons/locolor/32x32/actions/klamav.png share/icons/locolor/32x32/actions/
-/usr/local/share/icons/locolor/32x32/apps/klamav.png share/icons/locolor/32x32/apps/
+/usr/local/bin/kio* bin/
+/usr/local/bin/*dcop* bin/
+/usr/local/bin/*arts* bin/
+/usr/local/lib/*clam* autolibs/
+/usr/local/lib/libk* autolibs/
+/usr/local/lib/kde3/* autolibs/kde3/
+/usr/local/share/apps share/
+/usr/local/share/applnk share/
+/usr/local/share/config.kcfg share/
+/usr/local/share/config share/
+/usr/local/share/services share/
+/usr/local/share/servicetypes share/
+/usr/local/share/mime share/
+/usr/local/share/mimelnk share/
+/usr/local/share/icons share/
+/usr/local/libexec/gam* libexec/
Modified: pbibuild/modules/klamav/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/klamav/overlay-dir/PBI.FirstRun.sh 2009-01-28 18:04:26 UTC (rev 3356)
+++ pbibuild/modules/klamav/overlay-dir/PBI.FirstRun.sh 2009-01-28 19:34:37 UTC (rev 3357)
@@ -15,35 +15,3 @@
# echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-
-if [ -e "/usr/local/bin/klamav" ]
-then
- # Looks like FF is installed, ask if they want to remove the old one
- ls -al /usr/local/bin/klamav | grep Programs 2>/dev/null
- if [ "$?" = "0" ]
- then
- kdialog --yesno "KlamAV is already installed, do you wish to uninstall it?"
- if [ "$?" = "0" ]
- then
- FF="`ls -al /usr/local/bin/klamav | cut -d '>' -f 2 | cut -d "/" -f 3`"
- echo $FF | grep KlamAV 2>/dev/null
- if [ "$?" = "0" ]
- then
- PBIdelete -remove ${FF}
- else
- kdialog --sorry "KlamAV could not be automatically removed... Please remove it in Add / Remove Programs and try again."
- return 2
- fi
- else
- kdialog --sorry "KlamAV is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-
- else
- # Could not find a link to PBI folder
- kdialog --sorry "KlamAV is already installed, it must be uninstalled before loading this PBI"
- return 2
- fi
-fi
-
-
Modified: pbibuild/modules/klamav/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/klamav/overlay-dir/PBI.RemoveScript.sh 2009-01-28 18:04:26 UTC (rev 3356)
+++ pbibuild/modules/klamav/overlay-dir/PBI.RemoveScript.sh 2009-01-28 19:34:37 UTC (rev 3357)
@@ -6,34 +6,10 @@
# ${2} is the username of person performing the deletion.
# TIP: 'kdialog' should be used for user interaction.
#########################################
-rm -fR /usr/local/bin/klamarkollon
-rm -fR /usr/local/bin/klamav
-rm -fR /usr/local/bin/klamd
-rm -fR /usr/local/bin/klammail
-rm -fR /usr/local/bin/ScanWithKlamAV
-rm -fR /usr/local/share/applnk/Utilities/klamav.desktop
-rm -fR /usr/local/share/apps/klamav
-rm -fR /usr/local/share/apps/konqueror/servicemenus/klamav-dropdown.desktop
-rm -fR /usr/local/share/config.kcfg/klamavconfig.kcfg
-rm -fR /usr/local/share/doc/HTML/en/klamav02
-rm -fR /usr/local/share/icons/hicolor/22x22/actions/klamav.png
-rm -fR /usr/local/share/icons/hicolor/32x32/actions/klamav.png
-rm -fR /usr/local/share/icons/hicolor/32x32/apps/klamav.png
-rm -fR /usr/local/share/icons/hicolor/48x48/apps/klamav.png
-rm -fR /usr/local/share/icons/locolor/16x16/actions/klamav.png
-rm -fR /usr/local/share/icons/locolor/16x16/apps/klamav.png
-rm -fR /usr/local/share/icons/locolor/32x32/actions/klamav.png
-rm -fR /usr/local/share/icons/locolor/32x32/apps/klamav.png
-# Remove the old locale files since we are uninstalling
-LANGFILE="klamav.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
- rm /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
+rm /Programs/bin/klammail
+rm /Programs/bin/freshclam
-
if [ ! -z "$DISPLAY" ]
then
# Ask if we want to remove the user profiles
Modified: pbibuild/modules/klamav/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/klamav/overlay-dir/PBI.SetupScript.sh 2009-01-28 18:04:26 UTC (rev 3356)
+++ pbibuild/modules/klamav/overlay-dir/PBI.SetupScript.sh 2009-01-28 19:34:37 UTC (rev 3357)
@@ -15,32 +15,17 @@
# echo 'MSG: <text>' # Display this text above progress bar
#########################################
-ln -s /Programs/${PROGDIR}/.sbin/klamarkollon /usr/local/bin/klamarkollon
-ln -s /Programs/${PROGDIR}/.sbin/klamav /usr/local/bin/klamav
-ln -s /Programs/${PROGDIR}/.sbin/klamd /usr/local/bin/klamd
-ln -s /Programs/${PROGDIR}/.sbin/klammail /usr/local/bin/klammail
-ln -s /Programs/${PROGDIR}/.sbin/ScanWithKlamAV /usr/local/bin/ScanWithKlamAV
-ln -s /Programs/${PROGDIR}/share/applnk/Utilities/klamav.desktop /usr/local/share/applnk/Utilities/klamav.desktop
-ln -s /Programs/${PROGDIR}/share/apps/klamav /usr/local/share/apps/klamav
-ln -s /Programs/${PROGDIR}/share/apps/konqueror/servicemenus/klamav-dropdown.desktop /usr/local/share/apps/konqueror/servicemenus/klamav-dropdown.desktop
-ln -s /Programs/${PROGDIR}/share/config.kcfg/klamavconfig.kcfg /usr/local/share/config.kcfg/klamavconfig.kcfg
-ln -s /Programs/${PROGDIR}/share/doc/HTML/en/klamav02 /usr/local/share/doc/HTML/en/klamav02
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/22x22/actions/klamav.png /usr/local/share/icons/hicolor/22x22/actions/klamav.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/actions/klamav.png /usr/local/share/icons/hicolor/32x32/actions/klamav.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/32x32/apps/klamav.png /usr/local/share/icons/hicolor/32x32/apps/klamav.png
-ln -s /Programs/${PROGDIR}/share/icons/hicolor/48x48/apps/klamav.png /usr/local/share/icons/hicolor/48x48/apps/klamav.png
-ln -s /Programs/${PROGDIR}/share/icons/locolor/16x16/actions/klamav.png /usr/local/share/icons/locolor/16x16/actions/klamav.png
-ln -s /Programs/${PROGDIR}/share/icons/locolor/16x16/apps/klamav.png /usr/local/share/icons/locolor/16x16/apps/klamav.png
-ln -s /Programs/${PROGDIR}/share/icons/locolor/32x32/actions/klamav.png /usr/local/share/icons/locolor/32x32/actions/klamav.png
-ln -s /Programs/${PROGDIR}/share/icons/locolor/32x32/apps/klamav.png /usr/local/share/icons/locolor/32x32/apps/klamav.png
-# Copy over all the LANG files
-LANGFILE="klamav.mo"
-cd /Programs/${PROGDIR}/locale
-for i in `ls`
-do
- mkdir -p /usr/local/share/locale/${i}/LC_MESSAGES >/dev/null 2>/dev/null
- cp /Programs/${PROGDIR}/locale/${i}/${LANGFILE} /usr/local/share/locale/${i}/LC_MESSAGES/${LANGFILE}
-done
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+ ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+ ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
-echo "LAUNCHCLOSE: /usr/local/bin/klamav"
+# we need to link freshclam, and klammail to /Programs/bin
+ln -s /Programs/${PROGDIR}/bin/freshclam /Programs/bin/freshclam
+ln -s /Programs/${PROGDIR}/.sbin/klammail /Programs/bin/klammail
+
+echo "LAUNCHCLOSE: /Programs/bin/klamav"
Modified: pbibuild/modules/klamav/pbi.conf
===================================================================
--- pbibuild/modules/klamav/pbi.conf 2009-01-28 18:04:26 UTC (rev 3356)
+++ pbibuild/modules/klamav/pbi.conf 2009-01-28 19:34:37 UTC (rev 3357)
@@ -32,11 +32,11 @@
# Build Key - Change this to anything else to trigger a rebuild
# - The rebuild will take place even if port is still the same ver
-BUILDKEY="11"
+BUILDKEY="01"
# Set this to YES to mark a port / module as broken
-PORTBROKE="YES" ; export PORTBROKE
+#PORTBROKE="YES" ; export PORTBROKE
export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY
More information about the Commits
mailing list