aboutsummaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/barnyard-sguil/Makefile18
-rw-r--r--security/barnyard-sguil/files/patch-barnyard.conf150
-rw-r--r--security/barnyard-sguil/files/patch-configure.in63
-rw-r--r--security/barnyard-sguil/files/patch-op-sguil.c1873
-rw-r--r--security/barnyard-sguil/files/patch-op_plugbase.c20
-rw-r--r--security/barnyard-sguil/files/patch-op_sguil.h26
-rw-r--r--security/clamassassin/Makefile1
-rw-r--r--security/clamav/Makefile32
-rw-r--r--security/clamav/distinfo6
-rw-r--r--security/clamav/files/pkg-install.in16
-rw-r--r--security/clamav/pkg-plist10
-rw-r--r--security/clamcour/Makefile4
-rw-r--r--security/fwbuilder-devel/Makefile53
-rw-r--r--security/fwbuilder-devel/distinfo3
-rw-r--r--security/fwbuilder-devel/files/patch-aa15
-rw-r--r--security/fwbuilder-devel/files/patch-src-gui-ipfAdvancedDialog.cpp11
-rw-r--r--security/fwbuilder-devel/files/patch-src-gui-ipfadvanceddialog_q.ui72
-rw-r--r--security/fwbuilder-devel/files/patch-src-pflib-NATCompiler_ipf.cpp44
-rw-r--r--security/fwbuilder-devel/files/patch-src-pflib-NATCompiler_ipf.h11
-rw-r--r--security/fwbuilder-devel/pkg-descr18
-rw-r--r--security/fwbuilder-devel/pkg-plist69
-rw-r--r--security/fwbuilder2/Makefile53
-rw-r--r--security/fwbuilder2/distinfo3
-rw-r--r--security/fwbuilder2/files/patch-aa15
-rw-r--r--security/fwbuilder2/files/patch-src-gui-ipfAdvancedDialog.cpp11
-rw-r--r--security/fwbuilder2/files/patch-src-gui-ipfadvanceddialog_q.ui72
-rw-r--r--security/fwbuilder2/files/patch-src-pflib-NATCompiler_ipf.cpp44
-rw-r--r--security/fwbuilder2/files/patch-src-pflib-NATCompiler_ipf.h11
-rw-r--r--security/fwbuilder2/pkg-descr18
-rw-r--r--security/fwbuilder2/pkg-plist69
-rw-r--r--security/kgpg-kde4/Makefile51
-rw-r--r--security/kgpg-kde4/distinfo3
-rw-r--r--security/kgpg-kde4/files/patch-kdelirc_irkick-klircclient.cpp20
-rw-r--r--security/kgpg-kde4/files/patch-ksim_monitors_filesystem-filesystemstats.cpp46
-rw-r--r--security/kgpg-kde4/pkg-descr1
-rw-r--r--security/kgpg-kde4/pkg-plist572
-rw-r--r--security/klamav/Makefile2
-rw-r--r--security/klamav/files/patch-src__klamd__scanner.c11
-rw-r--r--security/klamav/files/patch-src__klamd__scanner.h9
-rw-r--r--security/krb5-16/Makefile143
-rw-r--r--security/krb5-16/distinfo3
-rw-r--r--security/krb5-16/files/README.FreeBSD32
-rw-r--r--security/krb5-16/files/patch-ac13
-rw-r--r--security/krb5-16/files/patch-ad13
-rw-r--r--security/krb5-16/files/patch-ae13
-rw-r--r--security/krb5-16/files/patch-af13
-rw-r--r--security/krb5-16/files/patch-ai28
-rw-r--r--security/krb5-16/files/patch-aj19
-rw-r--r--security/krb5-16/files/patch-appl::bsd::Makefile.in12
-rw-r--r--security/krb5-16/files/patch-appl::bsd::klogind.M35
-rw-r--r--security/krb5-16/files/patch-appl::gssftp::ftp::ftp_var.h23
-rw-r--r--security/krb5-16/files/patch-appl::telnet::telnetd::Makefile.in11
-rw-r--r--security/krb5-16/files/patch-appl::telnet::telnetd::telnetd.822
-rw-r--r--security/krb5-16/files/patch-appl::telnet::telnetd::utility.c38
-rw-r--r--security/krb5-16/files/patch-as195
-rw-r--r--security/krb5-16/files/patch-at14
-rw-r--r--security/krb5-16/files/patch-av15
-rw-r--r--security/krb5-16/files/patch-ax13
-rw-r--r--security/krb5-16/files/patch-ay50
-rw-r--r--security/krb5-16/files/patch-ba77
-rw-r--r--security/krb5-16/files/patch-bb10
-rw-r--r--security/krb5-16/files/patch-config::pre.in11
-rw-r--r--security/krb5-16/files/patch-config::shlib.conf30
-rw-r--r--security/krb5-16/files/patch-lib-krb5-os-localaddr.c75
-rw-r--r--security/krb5-16/files/patch-lib::gssapi::krb5::import_name.c14
-rw-r--r--security/krb5-16/files/patch-plugins-preauth-pkinit-Makefile.in11
-rw-r--r--security/krb5-16/pkg-descr24
-rw-r--r--security/krb5-16/pkg-plist113
-rw-r--r--security/krb5-17/Makefile143
-rw-r--r--security/krb5-17/distinfo3
-rw-r--r--security/krb5-17/files/README.FreeBSD32
-rw-r--r--security/krb5-17/files/patch-ac13
-rw-r--r--security/krb5-17/files/patch-ad13
-rw-r--r--security/krb5-17/files/patch-ae13
-rw-r--r--security/krb5-17/files/patch-af13
-rw-r--r--security/krb5-17/files/patch-ai28
-rw-r--r--security/krb5-17/files/patch-aj19
-rw-r--r--security/krb5-17/files/patch-appl::bsd::Makefile.in12
-rw-r--r--security/krb5-17/files/patch-appl::bsd::klogind.M35
-rw-r--r--security/krb5-17/files/patch-appl::gssftp::ftp::ftp_var.h23
-rw-r--r--security/krb5-17/files/patch-appl::telnet::telnetd::Makefile.in11
-rw-r--r--security/krb5-17/files/patch-appl::telnet::telnetd::telnetd.822
-rw-r--r--security/krb5-17/files/patch-appl::telnet::telnetd::utility.c38
-rw-r--r--security/krb5-17/files/patch-as195
-rw-r--r--security/krb5-17/files/patch-at14
-rw-r--r--security/krb5-17/files/patch-av15
-rw-r--r--security/krb5-17/files/patch-ax13
-rw-r--r--security/krb5-17/files/patch-ay50
-rw-r--r--security/krb5-17/files/patch-ba77
-rw-r--r--security/krb5-17/files/patch-bb10
-rw-r--r--security/krb5-17/files/patch-config::pre.in11
-rw-r--r--security/krb5-17/files/patch-config::shlib.conf30
-rw-r--r--security/krb5-17/files/patch-lib-krb5-os-localaddr.c75
-rw-r--r--security/krb5-17/files/patch-lib::gssapi::krb5::import_name.c14
-rw-r--r--security/krb5-17/files/patch-plugins-preauth-pkinit-Makefile.in11
-rw-r--r--security/krb5-17/pkg-descr24
-rw-r--r--security/krb5-17/pkg-plist113
-rw-r--r--security/krb5-appl/Makefile143
-rw-r--r--security/krb5-appl/distinfo3
-rw-r--r--security/krb5-appl/files/README.FreeBSD32
-rw-r--r--security/krb5-appl/files/patch-ac13
-rw-r--r--security/krb5-appl/files/patch-ad13
-rw-r--r--security/krb5-appl/files/patch-ae13
-rw-r--r--security/krb5-appl/files/patch-af13
-rw-r--r--security/krb5-appl/files/patch-ai28
-rw-r--r--security/krb5-appl/files/patch-aj19
-rw-r--r--security/krb5-appl/files/patch-appl::bsd::Makefile.in12
-rw-r--r--security/krb5-appl/files/patch-appl::bsd::klogind.M35
-rw-r--r--security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h23
-rw-r--r--security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in11
-rw-r--r--security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.822
-rw-r--r--security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c38
-rw-r--r--security/krb5-appl/files/patch-as195
-rw-r--r--security/krb5-appl/files/patch-at14
-rw-r--r--security/krb5-appl/files/patch-av15
-rw-r--r--security/krb5-appl/files/patch-ax13
-rw-r--r--security/krb5-appl/files/patch-ay50
-rw-r--r--security/krb5-appl/files/patch-ba77
-rw-r--r--security/krb5-appl/files/patch-bb10
-rw-r--r--security/krb5-appl/files/patch-config::pre.in11
-rw-r--r--security/krb5-appl/files/patch-config::shlib.conf30
-rw-r--r--security/krb5-appl/files/patch-lib-krb5-os-localaddr.c75
-rw-r--r--security/krb5-appl/files/patch-lib::gssapi::krb5::import_name.c14
-rw-r--r--security/krb5-appl/files/patch-plugins-preauth-pkinit-Makefile.in11
-rw-r--r--security/krb5-appl/pkg-descr24
-rw-r--r--security/krb5-appl/pkg-plist113
-rw-r--r--security/kwallet/Makefile51
-rw-r--r--security/kwallet/distinfo3
-rw-r--r--security/kwallet/files/patch-kdelirc_irkick-klircclient.cpp20
-rw-r--r--security/kwallet/files/patch-ksim_monitors_filesystem-filesystemstats.cpp46
-rw-r--r--security/kwallet/pkg-descr1
-rw-r--r--security/kwallet/pkg-plist572
-rw-r--r--security/libfwbuilder-devel/Makefile43
-rw-r--r--security/libfwbuilder-devel/distinfo3
-rw-r--r--security/libfwbuilder-devel/files/patch-IPAddress.h10
-rw-r--r--security/libfwbuilder-devel/files/patch-aa15
-rw-r--r--security/libfwbuilder-devel/files/patch-dns.h10
-rw-r--r--security/libfwbuilder-devel/pkg-descr7
-rw-r--r--security/libfwbuilder-devel/pkg-plist135
-rw-r--r--security/libfwbuilder2/Makefile43
-rw-r--r--security/libfwbuilder2/distinfo3
-rw-r--r--security/libfwbuilder2/files/patch-IPAddress.h10
-rw-r--r--security/libfwbuilder2/files/patch-aa15
-rw-r--r--security/libfwbuilder2/files/patch-dns.h10
-rw-r--r--security/libfwbuilder2/pkg-descr7
-rw-r--r--security/libfwbuilder2/pkg-plist135
-rw-r--r--security/linux-f10-openssl/Makefile21
-rw-r--r--security/linux-f10-openssl/distinfo.i3866
-rw-r--r--security/linux-f10-openssl/pkg-plist78
-rw-r--r--security/linux-f8-openssl/Makefile21
-rw-r--r--security/linux-f8-openssl/distinfo.i3866
-rw-r--r--security/linux-f8-openssl/pkg-plist78
-rw-r--r--security/nettle2/Makefile47
-rw-r--r--security/nettle2/distinfo3
-rw-r--r--security/nettle2/files/patch-Makefile.in10
-rw-r--r--security/nettle2/files/patch-configure11
-rw-r--r--security/nettle2/files/patch-examples_nettle-openssl.c13
-rw-r--r--security/nettle2/pkg-descr6
-rw-r--r--security/nettle2/pkg-plist62
-rw-r--r--security/opensaml2/Makefile37
-rw-r--r--security/opensaml2/distinfo3
-rw-r--r--security/opensaml2/files/patch-configure17
-rw-r--r--security/opensaml2/pkg-descr4
-rw-r--r--security/opensaml2/pkg-plist29
-rw-r--r--security/openvpn20/Makefile91
-rw-r--r--security/openvpn20/distinfo3
-rw-r--r--security/openvpn20/files/openvpn.sh.in131
-rw-r--r--security/openvpn20/files/pkg-message.in20
-rw-r--r--security/openvpn20/files/pkg-req.in29
-rw-r--r--security/openvpn20/pkg-descr10
-rw-r--r--security/openvpn20/pkg-plist75
-rw-r--r--security/p5-File-Scan-ClamAV/Makefile2
-rw-r--r--security/php-Auth_OpenID2/Makefile58
-rw-r--r--security/php-Auth_OpenID2/distinfo3
-rw-r--r--security/php-Auth_OpenID2/pkg-descr5
-rw-r--r--security/php-Auth_OpenID2/pkg-plist62
-rw-r--r--security/py-clamav/Makefile4
-rw-r--r--security/shibboleth2-sp/Makefile48
-rw-r--r--security/shibboleth2-sp/distinfo3
-rw-r--r--security/shibboleth2-sp/files/patch-shib-target_shib-handlers.cpp16
-rw-r--r--security/shibboleth2-sp/files/shibboleth-sp.in20
-rw-r--r--security/shibboleth2-sp/pkg-descr13
-rw-r--r--security/shibboleth2-sp/pkg-plist103
-rw-r--r--security/squidclam/Makefile2
-rw-r--r--security/stunnel/files/stunnel.in41
-rw-r--r--security/sudosh2/Makefile37
-rw-r--r--security/sudosh2/distinfo3
-rw-r--r--security/sudosh2/files/patch-src-parse.c12
-rw-r--r--security/sudosh2/files/patch-src::Makefile.in11
-rw-r--r--security/sudosh2/files/patch-src::sudosh.c129
-rw-r--r--security/sudosh2/pkg-descr7
-rw-r--r--security/sudosh2/pkg-plist5
-rw-r--r--security/sudosh3/Makefile37
-rw-r--r--security/sudosh3/distinfo3
-rw-r--r--security/sudosh3/files/patch-src-parse.c12
-rw-r--r--security/sudosh3/files/patch-src::Makefile.in11
-rw-r--r--security/sudosh3/files/patch-src::sudosh.c129
-rw-r--r--security/sudosh3/pkg-descr7
-rw-r--r--security/sudosh3/pkg-plist5
-rw-r--r--security/tripwire/files/patch-install::install.cfg52
-rw-r--r--security/vuxml/vuln.xml1312
-rw-r--r--security/zenmap/Makefile16
202 files changed, 1364 insertions, 9490 deletions
diff --git a/security/barnyard-sguil/Makefile b/security/barnyard-sguil/Makefile
deleted file mode 100644
index a3e01c102350..000000000000
--- a/security/barnyard-sguil/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# New ports collection makefile for: barnyard-sguil6
-# Date created: 23 Jan 2006
-# Whom: pauls
-#
-# $FreeBSD$
-#
-
-PKGNAMESUFFIX= -sguil6
-COMMENT= An output system for Snort (patched for sguil6)
-
-LIB_DEPENDS+= tcl84.1:${PORTSDIR}/lang/tcl84
-
-MASTERDIR= ${.CURDIR}/../barnyard
-PATCHDIR= ${.CURDIR}/files
-
-CONFIGURE_ARGS+= --enable-tcl --with-tcl=${PREFIX}/lib/tcl8.4
-
-.include "${MASTERDIR}/Makefile"
diff --git a/security/barnyard-sguil/files/patch-barnyard.conf b/security/barnyard-sguil/files/patch-barnyard.conf
deleted file mode 100644
index cd1038bdd608..000000000000
--- a/security/barnyard-sguil/files/patch-barnyard.conf
+++ /dev/null
@@ -1,150 +0,0 @@
---- etc/barnyard.conf.orig Sat May 1 11:43:29 2004
-+++ etc/barnyard.conf Mon Jan 15 15:16:57 2007
-@@ -1,139 +1,22 @@
- #-------------------------------------------------------------
--# http://www.snort.org Barnyard 0.1.0 configuration file
-+# http://www.snort.org Barnyard 0.2.0 configuration file
- # Contact: snort-barnyard@lists.sourceforge.net
- #-------------------------------------------------------------
- # $Id: barnyard.conf,v 1.9 2004/05/01 16:43:29 andrewbaker Exp $
- ########################################################
--# Currently you want to do two things in here: turn on
--# available data processors and turn on output plugins.
--# The data processors (dp's) and output plugin's (op's)
--# automatically associate with each other by type and
--# are automatically selected at run time depending on
--# the type of file you try to load.
-+# This config is to be used ONLY for barnyard-sguil6 and
-+# will not work for other uses of barnyard such as base
-+# because it is missing many of the configuration options
-+# that are required for other uses. The requirements for
-+# barnyard use with sguil 0.6.0 and above are minimal.
- ########################################################
-
- # Step 1: configuration declarations
--# To keep from having a commandline that uses every letter in the alphabet
--# most configuration options are set here
--
--# enable daemon mode
--# config daemon
--
- # use localtime instead of UTC (*not* recommended because of timewarps)
--#config localtime
--
--# set the hostname (currently only used for the acid db output plugin)
--config hostname: snorthost
--
--# set the interface name (currently only used for the acid db output plugin)
--config interface: fxp0
--
--# set the filter (currently only used for the acid db output plugin)
--config filter: not port 22
--
--# Step 2: setup the output plugins
--
--# alert_fast
--#-----------------------------
--# Converts data from the dp_alert plugin into an approximation of Snort's
--# "fast alert" mode. Argument: <filename>
--
--output alert_fast
--
--# log_dump
--#-----------------------------
--# Converts data from the dp_log plugin into an approximation of Snort's
--# "ASCII packet dump" mode. Argument: <filename>
--
--output log_dump
--
--# alert_csv (experimental)
--#---------------------------
--# Creates a CSV output file of alerts (optionally using a user specified format)
--# Arguments: filepath [format]
--#
--# The format is a comma-seperated list of fields to output (no spaces allowed)
--# The available fields are:
--# sig_gen - signature generator
--# sig_id - signature id
--# sig_rev - signatrue revision
--# sid - SID triplet
--# class - class id
--# classname - textual name of class
--# priority - priority id
--# event_id - event id
--# event_reference - event reference
--# ref_tv_sec - reference seconds
--# ref_tv_usec - reference microseconds
--# tv_sec - event seconds
--# tv_usec - event microseconds
--# timestamp - prettified timestamp (2001-01-01 01:02:03) in UTC
--# src - src address as a u_int32_t
--# srcip - src address as a dotted quad
--# dst - dst address as a u_int32_t
--# dstip - dst address as a dotted quad
--# sport_itype - source port or ICMP type (or 0)
--# sport - source port (if UDP or TCP)
--# itype - ICMP type (if ICMP)
--# dport_icode - dest port or ICMP code (or 0)
--# dport - dest port
--# icode - ICMP code (if ICMP)
--# proto - protocol number
--# protoname - protocol name
--# flags - flags from UnifiedAlertRecord
--# msg - message text
--# hostname - hostname (from barnyard.conf)
--# interface - interface (from barnyard.conf)
--#
--# Examples:
--# output alert_csv: /var/log/snort/csv.out
--# output alert_csv: /var/log/snort/csv.out timestamp,msg,srcip,sport,dstip,dport,protoname,itype,icode
--# output alert_csv: csv.out timestamp,msg,srcip,sport,dstip,dport,protoname,itype,icode
--
--
--# alert_syslog
--#-----------------------------
--# Converts data from the alert stream into an approximation of Snort's
--# syslog alert output plugin. Same arguments as the output plugin in snort.
--
--#output alert_syslog
--
--# alert_syslog2
--#-------------------------------
--# Generates a syslog alert. This supports considerably more features than
--# the original syslog output plugin.
--#
--# output alert_syslog2
-+# config localtime
-
--# log_pcap
--#-----------------------------
--# Converts data from the dp_log plugin into standard pcap format
--# Argument: <filename>
--
--#output log_pcap
--
--# acid_db
--#-------------------------------
--# Available as both a log and alert output plugin. Used to output data into
--# the db schema used by ACID
--# Arguments:
--# $db_flavor - what flavor of database (ie, mysql)
--# sensor_id $sensor_id - integer sensor id to insert data as
--# database $database - name of the database
--# server $server - server the database is located on
--# user $user - username to connect to the database as
--# password $password - password for database authentication
--# output alert_acid_db: mysql, sensor_id 1, database snort, server localhost, user root
--# output log_acid_db: mysql, database snort, server localhost, user root, detail full
--
- # sguil
--#----
- # This output plug-in is used to generate output for use with the SGUIL user
- # interface. To learn more about SGUIL, go to http://sguil.sourceforge.net
- #
--#output sguil: mysql, sensor_id 0, database sguildb, server syn, user root,\
--# password dbpasswd, sguild_host syn, sguild_port 7736
--
--
--
--
-+output sguil
diff --git a/security/barnyard-sguil/files/patch-configure.in b/security/barnyard-sguil/files/patch-configure.in
deleted file mode 100644
index aad901a05648..000000000000
--- a/security/barnyard-sguil/files/patch-configure.in
+++ /dev/null
@@ -1,63 +0,0 @@
---- configure.in.orig Sat May 1 11:43:29 2004
-+++ configure.in Mon Jan 23 14:32:54 2006
-@@ -1,4 +1,4 @@
--# $Id: configure.in,v 1.17 2004/05/01 16:43:29 andrewbaker Exp $
-+# $Id: configure.in,v 1.2 2005/03/08 20:37:40 bamm Exp $
- AC_INIT(src/barnyard.c)
- AM_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE(barnyard,0.2.0)
-@@ -281,13 +281,53 @@
-
- dnl check for the header
- LDFLAGS="${LDFLAGS} -L${MYSQL_LIB_DIR}"
-- LIBS="${LIBS} -lz -lssl -lmysqlclient"
-+ LIBS="${LIBS} -lmysqlclient -lcrypto"
- AC_CHECK_LIB(mysqlclient, mysql_real_connect, FOUND=yes, FOUND=no)
-
- if test "$FOUND" = "no"; then
- FAIL_MESSAGE("mysqlclient library", "$MYSQL_LIB_DIR")
- fi
-
-+fi
-+
-+AC_ARG_ENABLE(tcl,
-+ [ --enable-tcl Enable Tcl language support.],,
-+ [enable_tcl="no"])
-+dnl AC_MSG_RESULT($enable_tcl)
-+
-+if test "yes" = "$enable_tcl"; then
-+
-+ dnl let tclsh tell us where it was
-+ dnl installed (prefer new tcl versions).
-+ AC_CHECK_PROGS(TCLSH, tclsh8.4 tclsh8.3 tclsh8.2 tclsh8.1 tclsh8.0 tclsh)
-+ if test "$TCLSH" != ""; then
-+ tclpath=`echo 'puts [[lindex $tcl_pkgPath 0]]' | $TCLSH`
-+ fi
-+
-+ dnl let the user overwrite the installation
-+ dnl directory which was just found.
-+ AC_ARG_WITH(tcl,
-+ [ --with-tcl=PATH Location of tclConfig.sh],
-+ tclpath="$withval")
-+
-+ dnl check, if tclConfig.sh can be found in
-+ dnl tclsh's installation directory.
-+ if test ! -r $tclpath/tclConfig.sh; then
-+ AC_MSG_RESULT(
-+ [
-+ Can't find Tcl libraries. Use --with-tcl to specify
-+ the directory containing tclConfig.sh on your system.
-+ Continuing build without Tcl support.])
-+ else
-+ dnl source tclsh's configuration file
-+ dnl and tell the user about the version.
-+ . $tclpath/tclConfig.sh
-+ AC_MSG_CHECKING([for the tcl version number])
-+ AC_MSG_RESULT([$TCL_VERSION, patchlevel $TCL_PATCH_LEVEL])
-+ LIBS="$LIBS $TCL_LIBS $TCL_LIB_SPEC"
-+ TCL_INCLUDE="$TCL_PREFIX/include/tcl$TCL_VERSION"
-+ CPPFLAGS="$CPPFLAGS -I$TCL_INCLUDE -DENABLE_TCL";
-+ fi
- fi
-
-
diff --git a/security/barnyard-sguil/files/patch-op-sguil.c b/security/barnyard-sguil/files/patch-op-sguil.c
deleted file mode 100644
index 563af968217b..000000000000
--- a/security/barnyard-sguil/files/patch-op-sguil.c
+++ /dev/null
@@ -1,1873 +0,0 @@
---- src/output-plugins/op_sguil.c.orig Sat Apr 3 13:57:33 2004
-+++ src/output-plugins/op_sguil.c Mon Jan 23 18:22:09 2006
-@@ -1,8 +1,9 @@
--/* $Id: op_sguil.c,v 1.5 2004/04/03 19:57:33 andrewbaker Exp $ */
-+/* $Id: op_sguil.c,v 1.16 2005/09/01 15:17:56 bamm Exp $ */
-+
- /*
--** Copyright (C) 2001-2002 Andrew R. Baker <andrewb@snort.org>
-+** Copyright (C) 2002-2005 Robert (Bamm) Visscher <bamm@sguil.net>
- **
--** This program is distributed under the terms of version 1.0 of the
-+** This program is distributed under the terms of version 1.0 of the
- ** Q Public License. See LICENSE.QPL for further details.
- **
- ** This program is distributed in the hope that it will be useful,
-@@ -11,21 +12,16 @@
- **
- */
-
--/* op_sguil is a modified op_acid_db plugin configured to work with
-- * sguil (Snort GUI for Lamerz). Sguil and ACIDs DB schemas differ.
-- * Sguil combines the event and iphdr tables along with moving the
-- * src and dst port columns into event. I've also added SguilSendEvent
-- * which opens a network socket and sends RT events to sguild.
-- *
-- * Andrew, sorry about mangling your code but it works so well :)
-- *
-- * Bammkkkk
-+/*
-+** op_sguil is the sguil output plugin for barnyard (http://barnyard.sf.net).
-+** For more information about sguil see http://www.sguil.net
- */
-
--/* I N C L U D E S *****************************************************/
--
--#ifdef ENABLE_MYSQL /* Wrap the whole thing in an ENABLE_MYSQL block */
-+/*********************************************************************
-+* I N C L U D E S *
-+*********************************************************************/
-
-+/* Std includes */
- #include <stdio.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -48,52 +44,13 @@
- #include "op_decode.h"
- #include "event.h"
-
--/* Needed for network socket */
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <netdb.h>
-
--#ifdef ENABLE_MYSQL
--#include <mysql.h>
--#include <errmsg.h>
--#endif /* ENABLE_MYSQL */
--
--/* D A T A S T R U C T U R E S **************************************/
--typedef struct _OpSguil_Data
--{
-- u_int8_t flavor; /* what flavor of db? MySQL, postgres, ... */
-- u_int16_t unused;
-- char *server;
-- char *database;
-- char *user;
-- char *password;
-- int sensor_id;
-- int options;
-- char *sguild_host;
-- int sguild_sock;
-- int sguild_port;
-- int nospin;
-- u_int32_t event_id;
-- /* db handles go here */
--#ifdef ENABLE_MYSQL
-- MYSQL *mysql;
--#endif /* ENABLE_MYSQL */
--} OpSguil_Data;
--
--
--#define MAX_QUERY_SIZE 8192
--#define SYSLOG_BUF 1024
--
--/* database flavor defines */
--#define FLAVOR_MYSQL 1
--#define FLAVOR_POSTGRES 2
--
--static char *sgdb_flavours[] = {NULL, "mysql", "postgres"};
--
--/* Network socket defines */
--#define MAX_MSG_LEN 100
--
-+/* Yeah TCL! */
-+#include <tcl.h>
-
- /* Output plug-in API functions */
- static int OpSguil_Setup(OutputPlugin *, char *args);
-@@ -103,56 +60,39 @@
- static int OpSguil_Log(void *, void *);
- static int OpSguil_LogConfig(OutputPlugin *outputPlugin);
-
--/* Internal functions */
--int SguildConnect(OpSguil_Data *);
--int SguilSendEvent(OpSguil_Data *data, char *eventMsg);
--int read_line();
--OpSguil_Data *OpSguil_ParseArgs(char *);
--int sgDbClose(OpSguil_Data *data);
--int sgDbConnect(OpSguil_Data *data);
--u_int32_t SguilGetNextCid(OpSguil_Data *data);
--u_int32_t SguilGetSensorId(OpSguil_Data *data);
--int SguilCheckSchemaVersion(OpSguil_Data *data);
--int InsertIPData(OpSguil_Data *data, Packet *p);
--int sgInsertICMPData(OpSguil_Data *data, Packet *p);
--int sgInsertUDPData(OpSguil_Data *data, Packet *p);
--int sgInsertTCPData(OpSguil_Data *data, Packet *p);
--int sgInsertPayloadData(OpSguil_Data *data, Packet *p);
--
--int sgSelectAsUInt(OpSguil_Data *data, char *sql, unsigned int *result);
--int sgInsert(OpSguil_Data *data, char *sql, unsigned int *row_id);
--int sgBeginTransaction(OpSguil_Data *);
--int sgEndTransaction(OpSguil_Data *);
--int sgAbortTransaction(OpSguil_Data *);
--
--#ifdef ENABLE_MYSQL
--int sgMysqlConnect(OpSguil_Data *);
--int sgMysqlClose(MYSQL *mysql);
--int sgMysqlSelectAsUInt(MYSQL *mysql, char *sql, unsigned int *result);
--int sgMysqlInsert(MYSQL *mysql, char *sql, unsigned int *row_id);
--#endif
-+typedef struct _OpSguil_Data
-+{
-+ char *sensor_name;
-+ char *tag_path;
-+ char *passwd;
-+ u_int16_t sensor_id;
-+ u_int32_t event_id;
-+ u_int16_t agent_port;
-+ int agent_sock;
-+} OpSguil_Data;
-
--/* Global variables */
--static char sql_buffer[MAX_QUERY_SIZE];
-+#define MAX_MSG_LEN 2048
-+#define STD_BUFFER 128
-
--/*
-- * Rather than using an incremental connection id (cid), this uses the
-- * current time in milliseconds. BY is fast, but will we get dups in the
-- * same millisecond?
-- * Okay, lets wait on doing this.
--long GetMilliseconds()
--{
-- struct timeval tv;
-- gettimeofday(&tv, NULL);
-+int OpSguil_AppendIPHdrData(Tcl_DString *list, Packet *p);
-+int OpSguil_AppendICMPData(Tcl_DString *list, Packet *p);
-+int OpSguil_AppendTCPData(Tcl_DString *list, Packet *p);
-+int OpSguil_AppendUDPData(Tcl_DString *list, Packet *p);
-+int OpSguil_AppendPayloadData(Tcl_DString *list, Packet *p);
-+int OpSguil_SensorAgentConnect(OpSguil_Data *);
-+//int OpSguil_SensorAgentAuth(OpSguil_Data *);
-+int OpSguil_SensorAgentInit(OpSguil_Data *);
-+int OpSguil_RTEventMsg(OpSguil_Data *data, char *msg);
-+int OpSguil_SendAgentMsg(OpSguil_Data *data, char *msg);
-+int OpSguil_RecvAgentMsg();
-+OpSguil_Data *OpSguil_ParseArgs(char *);
-
-- return (long)(tv.tv_sec * 1000 + tv.tv_usec / 1000);
--}*/
-
- /* init routine makes this processor available for dataprocessor directives */
- void OpSguil_Init()
- {
- OutputPlugin *outputPlugin;
--
-+
- outputPlugin = RegisterOutputPlugin("sguil", "log");
- outputPlugin->setupFunc = OpSguil_Setup;
- outputPlugin->exitFunc = OpSguil_Exit;
-@@ -160,25 +100,9 @@
- outputPlugin->stopFunc = OpSguil_Stop;
- outputPlugin->outputFunc = OpSguil_Log;
- outputPlugin->logConfigFunc = OpSguil_LogConfig;
--
-+
- }
-
--int OpSguil_LogConfig(OutputPlugin *outputPlugin)
--{
-- OpSguil_Data *data = NULL;
--
-- if(!outputPlugin || !outputPlugin->data)
-- return -1;
--
-- data = (OpSguil_Data *)outputPlugin->data;
--
-- LogMessage("OpSguil configured\n");
-- /* XXX We need to print the configuration details here */
-- return 0;
--}
--
--
--
- /* Setup the output plugin, process any arguments, link the functions to
- * the output functional node
- */
-@@ -186,11 +110,11 @@
- {
- /* setup the run time context for this output plugin */
- outputPlugin->data = OpSguil_ParseArgs(args);
--
-+
- return 0;
- }
--
--/* Inverse of the setup function, free memory allocated in Setup
-+
-+/* Inverse of the setup function, free memory allocated in Setup
- * can't free the outputPlugin since it is also the list node itself
- */
- int OpSguil_Exit(OutputPlugin *outputPlugin)
-@@ -198,478 +122,353 @@
- return 0;
- }
-
--/*
-+/*
- * this function gets called at start time, you should open any output files
- * or establish DB connections, etc, here
- */
- int OpSguil_Start(OutputPlugin *outputPlugin, void *spool_header)
- {
-- char tmpMsg [256];
- OpSguil_Data *data = (OpSguil_Data *)outputPlugin->data;
-- LogMessage("OpSguil_Start\n");
-
- if(data == NULL)
- FatalError("ERROR: Unable to find context for Sguil startup!\n");
-+
-+ if(pv.verbose)
-+ OpSguil_LogConfig(outputPlugin);
-+
-+ /* Figure out out sensor_name */
-+ if(data->sensor_name == NULL)
-+ {
-+ /* See if the user used the ProgVar config hostname: */
-+ if(pv.hostname != NULL)
-+ {
-+ data->sensor_name = pv.hostname;
-+ }
-+ else
-+ {
-+ FatalError("ERROR: Unable to determine hostname.");
-+ }
-+ }
-+
-+ /* Connect to sensor_agent */
-+ OpSguil_SensorAgentConnect(data);
-+
-+ /* Initialize - get sid and next cid */
-+ if(pv.verbose)
-+ LogMessage("Waiting for sid and cid from sensor_agent.\n");
-+ OpSguil_SensorAgentInit(data);
-
-- /* Connect to sguild */
-- if(SguildConnect(data))
-- FatalError("OpSguil_: Failed to connect to sguild: %s:%i\n",
-- data->sguild_host, data->sguild_port);
--
-- /* Write a system-info message*/
-- sprintf(tmpMsg, "RTEvent |||system-info|%s||Barnyard started.||||||||\n", pv.hostname);
-- SguilSendEvent(data, tmpMsg);
--
-- /* Connect to the database */
-- if(sgDbConnect(data))
-- FatalError("OpSguil_: Failed to connect to database: %s:%s@%s/%s\n",
-- data->user, data->password, data->server, data->database);
--
-- /* check the db schema */
-- /*if(SguilCheckSchemaVersion(data))
-- FatalError("OpSguil_: database schema mismatch\n");*/
--
-- /* if sensor id == 0, then we attempt attempt to determine it dynamically */
-- if(data->sensor_id == 0)
-- {
-- data->sensor_id = SguilGetSensorId(data);
-- /* XXX: Error checking */
-- }
-- /* Get the next cid from the database */
-- data->event_id = SguilGetNextCid(data);
- if(pv.verbose)
- {
-- LogMessage("OpAcidDB configuration details\n");
-- LogMessage("Database Flavour: %s\n", sgdb_flavours[data->flavor]);
-- LogMessage("Database Server: %s\n", data->server);
-- LogMessage("Database User: %s\n", data->user);
-- LogMessage("SensorID: %i\n", data->sensor_id);
-- LogMessage("Sguild Host: %s\n", data->sguild_host);
-- LogMessage("Sguild Port: %i\n", data->sguild_port);
-- }
-- if((data->nospin) == NULL)
-- {
-- if(pv.verbose)
-- {
-- LogMessage("Barnyard will sleep(15) if unable to connect to sguild.\n");
-- }
-- data->nospin = 0;
-- }
-- else
-- {
-- if(pv.verbose)
-- {
-- LogMessage("Spinning disabled.\n");
-- }
-+
-+ LogMessage("Sensor Name: %s\n", data->sensor_name);
-+ LogMessage("Agent Port: %u\n", data->agent_port);
-+
- }
-
-- sprintf(tmpMsg, "RTEvent |||system-info|%s||Database Server: %s.||||||||\n",
-- pv.hostname, data->server);
-- SguilSendEvent(data, tmpMsg);
--
-- sprintf(tmpMsg, "RTEvent |||system-info|%s||Database Next CID: %i.||||||||\n",
-- pv.hostname, data->event_id);
-- SguilSendEvent(data, tmpMsg);
-+/*
-+** if(SensorAgentAuth(data))
-+** FatalError("OpSguil: Authentication failed.\n");
-+**
-+** if(pv.verbose)
-+** LogMessage("OpSguil: Authentication successful.);
-+*/
-+
- return 0;
- }
-
- int OpSguil_Stop(OutputPlugin *outputPlugin)
- {
- OpSguil_Data *data = (OpSguil_Data *)outputPlugin->data;
--
-+
- if(data == NULL)
- FatalError("ERROR: Unable to find context for Sguil startup!\n");
-+
-+ return 0;
-+}
-+
-+int OpSguil_LogConfig(OutputPlugin *outputPlugin)
-+{
-+
-+ OpSguil_Data *data = NULL;
-+
-+ if(!outputPlugin || !outputPlugin->data)
-+ return -1;
-+
-+ data = (OpSguil_Data *)outputPlugin->data;
-+
-+ LogMessage("OpSguil configured\n");
-+
-+ /* XXX We need to print the configuration details here */
-
-- /* close database connection */
-- sgDbClose(data);
--
- return 0;
- }
-
--/* sguil only uses log */
--int OpSguil_Log(void *context, void *data)
-+
-+int OpSguil_Log(void *context, void *ul_data)
- {
-+
- char timestamp[TIMEBUF_SIZE];
-- char syslogMessage[SYSLOG_BUF];
-- char eventInfo[SYSLOG_BUF];
-- //int MAX_INSERT_LEN = 1024;
-- char insertColumns[MAX_QUERY_SIZE];
-- char insertValues[MAX_QUERY_SIZE];
-- char valuesTemp[MAX_QUERY_SIZE];
-- char ipInfo[38];
-- char portInfo[16];
-- char *esc_message;
- Sid *sid = NULL;
- ClassType *class_type;
-- UnifiedLogRecord *record = (UnifiedLogRecord *)data;
-- OpSguil_Data *op_data = (OpSguil_Data *)context;
-+ UnifiedLogRecord *record = (UnifiedLogRecord *)ul_data;
-+ OpSguil_Data *data = (OpSguil_Data *)context;
- Packet p;
-+ char buffer[STD_BUFFER];
-+ Tcl_DString list;
-
-- bzero(syslogMessage, SYSLOG_BUF);
-- bzero(insertColumns, MAX_QUERY_SIZE);
-- bzero(insertValues, MAX_QUERY_SIZE);
--
--#if 0 /* this is broken */
-- /* skip tagged packets, since the db does not have a mechanism to
-- * deal with them properly
-- */
-- if(record->log.event.event_reference)
-- {
-- LogMessage("Skipping tagged packet %i\n", record->log.event.event_reference);
-- return 0;
-- }
--#endif
-+ bzero(buffer, STD_BUFFER);
-
-+ //LogMessage("Event id ==> %u\n", record->log.event.event_id);
-+ //LogMessage("Ref time ==> %lu\n", record->log.event.ref_time.tv_sec);
-
-- RenderTimestamp(record->log.pkth.ts.tv_sec, timestamp, TIMEBUF_SIZE);
-- //fprintf(stdout, "Timestamp: %lu\n", GetMilliseconds());
-- //fflush(stdout);
-+ /* Sig info */
- sid = GetSid(record->log.event.sig_generator, record->log.event.sig_id);
- if(sid == NULL)
- sid = FakeSid(record->log.event.sig_generator, record->log.event.sig_id);
-+ sid->rev = record->log.event.sig_rev;
-+
- class_type = GetClassType(record->log.event.classification);
-+
-+ /* Here we build our RT event to send to sguild. The event is built with a
-+ ** proper tcl list format.
-+ ** RT FORMAT:
-+ **
-+ ** 0 1 2 3 4 5 6 7
-+ ** {RTEVENT} {0} {sid} {cid} {sensor name} {snort event_id} {snort event_ref} {snort ref_time}
-+ **
-+ ** 8 9 10 11 12 13 14
-+ ** {sig_gen} {sig id} {rev} {message} {timestamp} {priority} {class_type}
-+ **
-+ ** 15 16 17 18 19 20 21
-+ ** {sip (dec)} {sip (string)} {dip (dec)} {dip (string)} {ip proto} {ip ver} {ip hlen}
-+ **
-+ ** 22 23 24 25 26 27 28
-+ ** {ip tos} {ip len} {ip id} {ip flags} {ip off} {ip ttl} {ip csum}
-+ **
-+ ** 29 30 31 32 33
-+ ** {icmp type} {icmp code} {icmp csum} {icmp id} {icmp seq}
-+ **
-+ ** 34 35
-+ ** {src port} {dst port}
-+ **
-+ ** 36 37 38 39 40 41 42 43
-+ ** {tcp seq} {tcp ack} {tcp off} {tcp res} {tcp flags} {tcp win} {tcp csum} {tcp urp}
-+ **
-+ ** 44 45
-+ ** {udp len} {udp csum}
-+ **
-+ ** 46
-+ ** {data payload}
-+ */
-+
-+ Tcl_DStringInit(&list);
-+
-+ /* RTEVENT */
-+ Tcl_DStringAppendElement(&list, "RTEVENT");
-+
-+ /* Status - 0 */
-+ Tcl_DStringAppendElement(&list, "0");
-+
-+ /* Sensor ID (sid) */
-+ sprintf(buffer, "%u", data->sensor_id);
-+ Tcl_DStringAppendElement(&list, buffer);
-+
-+ /* Event ID (cid) */
-+ sprintf(buffer, "%u", data->event_id);
-+ Tcl_DStringAppendElement(&list, buffer);
-+
-+ /* Sensor Name */
-+ Tcl_DStringAppendElement(&list, data->sensor_name);
-+
-+ /* Snort Event ID */
-+ sprintf(buffer, "%u", record->log.event.event_id);
-+ Tcl_DStringAppendElement(&list, buffer);
-+
-+ /* Snort Event Ref */
-+ sprintf(buffer, "%u", record->log.event.event_reference);
-+ Tcl_DStringAppendElement(&list, buffer);
-+
-+ /* Snort Event Ref Time */
-+ if(record->log.event.ref_time.tv_sec == 0)
-+ {
-+ Tcl_DStringAppendElement(&list, "");
-+ }
-+ else
-+ {
-+ RenderTimestamp(record->log.event.ref_time.tv_sec, timestamp, TIMEBUF_SIZE);
-+ Tcl_DStringAppendElement(&list, timestamp);
-+ }
-+
-+ /* Generator ID */
-+ sprintf(buffer, "%d", sid->gen);
-+ Tcl_DStringAppendElement(&list, buffer);
-+
-+ /* Signature ID */
-+ sprintf(buffer, "%d", sid->sid);
-+ Tcl_DStringAppendElement(&list, buffer);
-+
-+ /* Signature Revision */
-+ sprintf(buffer, "%d", sid->rev);
-+ Tcl_DStringAppendElement(&list, buffer);
-+
-+ /* Signature Msg */
-+ Tcl_DStringAppendElement(&list, sid->msg);
-+
-+ /* Packet Timestamp */
-+ RenderTimestamp(record->log.pkth.ts.tv_sec, timestamp, TIMEBUF_SIZE);
-+ Tcl_DStringAppendElement(&list, timestamp);
-+
-+ /* Alert Priority */
-+ sprintf(buffer, "%u", record->log.event.priority);
-+ Tcl_DStringAppendElement(&list, buffer);
-
-- //sgBeginTransaction(op_data); /* XXX: Error checking */
-- /* Build the event insert. */
-- snprintf(insertColumns, MAX_QUERY_SIZE,
-- "INSERT INTO event (status, sid, cid, signature_id, signature_rev, signature, timestamp, priority, class");
--
-- esc_message = malloc(strlen(sid->msg)*2+1);
-- mysql_real_escape_string(op_data->mysql, esc_message, sid->msg, strlen(sid->msg));
--
-- if(class_type == NULL)
-- {
-- snprintf(valuesTemp, MAX_QUERY_SIZE,
-- "VALUES ('0', '%u', '%u', '%d', '%d', '%s', '%s', '%u', 'unknown'",
-- op_data->sensor_id, op_data->event_id, sid->sid, sid->rev, esc_message, timestamp,
-- record->log.event.priority);
-- snprintf(eventInfo, SYSLOG_BUF, "RTEvent |0|%u|unknown|%s|%s|%u|%u|%s",
-- record->log.event.priority,
-- pv.hostname, timestamp, op_data->sensor_id, op_data->event_id,
-- sid->msg);
-+ /* Alert Classification */
-+ if (class_type == NULL)
-+ {
-+ Tcl_DStringAppendElement(&list, "unknown");
- }
- else
- {
-- snprintf(valuesTemp, MAX_QUERY_SIZE,
-- "VALUES ('0', '%u', '%u', '%d', '%d', '%s', '%s', '%u', '%s'",
-- op_data->sensor_id, op_data->event_id, sid->sid, sid->rev, esc_message, timestamp,
-- record->log.event.priority, class_type->type);
-- snprintf(eventInfo, SYSLOG_BUF, "RTEvent |0|%u|%s|%s|%s|%u|%u|%s",
-- record->log.event.priority, class_type->type,
-- pv.hostname, timestamp, op_data->sensor_id, op_data->event_id,
-- sid->msg);
-- }
--
-- free(esc_message);
--
-- insertValues[0] = '\0';
-- strcat(insertValues, valuesTemp);
--
-- syslogMessage[0] = '\0';
-- strcat(syslogMessage, eventInfo);
-- /* decode the packet */
-+ Tcl_DStringAppendElement(&list, class_type->type);
-+ }
-+
-+ /* Pull decoded info from the packet */
- if(DecodePacket(&p, &record->log.pkth, record->pkt + 2) == 0)
- {
--
- if(p.iph)
- {
-- /* Insert ip header information */
-- //InsertIPData(op_data, &p);
-- strcat(insertColumns,
-- ",src_ip, dst_ip, ip_proto, ip_ver, ip_hlen, ip_tos, ip_len, ip_id, ip_flags, ip_off, ip_ttl, ip_csum");
-- snprintf(valuesTemp, MAX_QUERY_SIZE,
-- ",'%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u', '%u'",
-- ntohl(p.iph->ip_src.s_addr), ntohl(p.iph->ip_dst.s_addr), p.iph->ip_proto, IP_VER(p.iph),
-- IP_HLEN(p.iph), p.iph->ip_tos, ntohs(p.iph->ip_len), ntohs(p.iph->ip_id),
--#if defined(WORDS_BIGENDIAN)
-- ((p.iph->ip_off & 0xE000) >> 13),
-- htons(p.iph->ip_off & 0x1FFF),
--#else
-- ((p.iph->ip_off & 0x00E0) >> 5),
-- htons(p.iph->ip_off & 0xFF1F),
--#endif
-- p.iph->ip_ttl,
-- htons(p.iph->ip_csum) < MAX_QUERY_SIZE);
--
-- strcat(insertValues, valuesTemp);
--
-+ int i;
-
-- /* SYSLOG - Changed to SguilSendEvent*/
-- snprintf(ipInfo, 38, "|%u.%u.%u.%u|%u.%u.%u.%u|%u",
--#if defined(WORDS_BIGENDIAN)
-- (p.iph->ip_src.s_addr & 0xff000000) >> 24,
-- (p.iph->ip_src.s_addr & 0x00ff0000) >> 16,
-- (p.iph->ip_src.s_addr & 0x0000ff00) >> 8,
-- (p.iph->ip_src.s_addr & 0x000000ff),
-- (p.iph->ip_dst.s_addr & 0xff000000) >> 24,
-- (p.iph->ip_dst.s_addr & 0x00ff0000) >> 16,
-- (p.iph->ip_dst.s_addr & 0x0000ff00) >> 8,
-- (p.iph->ip_dst.s_addr & 0x000000ff),
--#else
-- (p.iph->ip_src.s_addr & 0x000000ff),
-- (p.iph->ip_src.s_addr & 0x0000ff00) >> 8,
-- (p.iph->ip_src.s_addr & 0x00ff0000) >> 16,
-- (p.iph->ip_src.s_addr & 0xff000000) >> 24,
-- (p.iph->ip_dst.s_addr & 0x000000ff),
-- (p.iph->ip_dst.s_addr & 0x0000ff00) >> 8,
-- (p.iph->ip_dst.s_addr & 0x00ff0000) >> 16,
-- (p.iph->ip_dst.s_addr & 0xff000000) >> 24,
--#endif
-- p.iph->ip_proto);
-- strcat(syslogMessage, ipInfo);
-+ /* Add IP header */
-+ OpSguil_AppendIPHdrData(&list, &p);
-
-- /* store layer 4 data for non fragmented packets */
-+ /* Add icmp || udp || tcp data */
- if(!(p.pkt_flags & PKT_FRAG_FLAG))
- {
-+
- switch(p.iph->ip_proto)
- {
- case IPPROTO_ICMP:
-- snprintf(portInfo, 16, "|||");
-- if(!p.icmph)
-- break;
-- strcat(insertColumns,
-- ", icmp_type, icmp_code)");
-- snprintf(valuesTemp, MAX_QUERY_SIZE,
-- ", '%u', '%u')", p.icmph->icmp_type,
-- p.icmph->icmp_code);
-- strcat(insertValues, valuesTemp);
-- strcat(insertColumns, insertValues);
-- sgInsert(op_data, insertColumns, NULL);
-- sgInsertICMPData(op_data, &p);
-+ OpSguil_AppendICMPData(&list, &p);
- break;
-+
- case IPPROTO_TCP:
-- strcat(insertColumns,
-- ", src_port, dst_port)");
-- snprintf(valuesTemp, MAX_QUERY_SIZE,
-- ", '%u', '%u')", p.sp, p.dp);
-- strcat(insertValues, valuesTemp);
-- strcat(insertColumns, insertValues);
-- sgInsert(op_data, insertColumns, NULL);
-- sgInsertTCPData(op_data, &p);
-- snprintf(portInfo, 16, "|%u|%u|",
-- p.sp, p.dp);
-+ OpSguil_AppendTCPData(&list, &p);
- break;
-+
- case IPPROTO_UDP:
-- strcat(insertColumns,
-- ", src_port, dst_port)");
-- snprintf(valuesTemp, MAX_QUERY_SIZE,
-- ", '%u', '%u')", p.sp, p.dp);
-- strcat(insertValues, valuesTemp);
-- strcat(insertColumns, insertValues);
-- sgInsert(op_data, insertColumns, NULL);
-- sgInsertUDPData(op_data, &p);
-- snprintf(portInfo, 16, "|%u|%u|",
-- p.sp, p.dp);
-+ OpSguil_AppendUDPData(&list, &p);
-+ break;
-+
-+ default:
-+ for(i = 0; i < 17; ++i)
-+ {
-+ Tcl_DStringAppendElement(&list, "");
-+ }
- break;
- }
-- strcat(syslogMessage, portInfo);
-+
- }
- else
- {
-- strcat(syslogMessage, "|||");
-+ /* Null out TCP/UDP/ICMP fields */
-+ for(i = 0; i < 17; ++i)
-+ {
-+ Tcl_DStringAppendElement(&list, "");
-+ }
- }
--
--
-- /* Insert payload data */
-- sgInsertPayloadData(op_data, &p);
- }
- else
- {
-- strcat(syslogMessage, "||||||");
-+
-+ /* No IP Header. */
-+ int i;
-+ for(i = 0; i < 31; ++i)
-+ {
-+ Tcl_DStringAppendElement(&list, "");
-+ }
- }
-- }
-
-- //sgEndTransaction(op_data); /* XXX: Error Checking */
-- ++op_data->event_id;
-- /* Append the sig id and rev to the RT event */
-- snprintf(eventInfo, SYSLOG_BUF, "%u|%u|\n", sid->sid, sid->rev);
-- strcat(syslogMessage, eventInfo);
-- /* Write to the network socket */
-- SguilSendEvent(op_data, syslogMessage);
-- return 0;
--}
-+ /* Add payload data */
-+ OpSguil_AppendPayloadData(&list, &p);
-
--int sgInsertUDPData(OpSguil_Data *op_data, Packet *p)
--{
-- if(!p->udph)
-- return 0;
-- if(snprintf(sql_buffer, MAX_QUERY_SIZE,
-- "INSERT INTO udphdr(sid, cid, udp_len, udp_csum)"
-- "VALUES ('%u', '%u', '%u', '%u')",
-- op_data->sensor_id, op_data->event_id,
-- ntohs(p->udph->uh_len),
-- ntohs(p->udph->uh_chk)) < MAX_QUERY_SIZE)
-+ }
-+ else
-+ {
-+ /* ack! an event without a packet. Append 32 fillers */
-+ int i;
-+ for(i = 0; i < 32; ++i)
- {
-- sgInsert(op_data, sql_buffer, NULL); /* XXX: Error Checking */
-+ Tcl_DStringAppendElement(&list, "");
- }
-- return 0;
--}
-+ }
-
--int sgInsertTCPData(OpSguil_Data *op_data, Packet *p)
--{
-- if(!p->tcph)
-- return 0;
-+ /* Send msg to sensor_agent */
-+ if (OpSguil_RTEventMsg(data, Tcl_DStringValue(&list)))
-+ FatalError("Unable to send RT Events to sensor agent.\n");
-
-- /* insert data into the tcp header table */
-- if(snprintf(sql_buffer, MAX_QUERY_SIZE,
-- "INSERT INTO tcphdr(sid, cid, tcp_seq, "
-- "tcp_ack, tcp_off, tcp_res, tcp_flags, tcp_win, tcp_csum, "
-- "tcp_urp) VALUES('%u', '%u', '%u', '%u', '%u', "
-- "'%u', '%u', '%u', '%u', '%u')",
-- op_data->sensor_id, op_data->event_id,
-- ntohl(p->tcph->th_seq), ntohl(p->tcph->th_ack),
-- TCP_OFFSET(p->tcph), TCP_X2(p->tcph), p->tcph->th_flags,
-- ntohs(p->tcph->th_win), ntohs(p->tcph->th_sum),
-- ntohs(p->tcph->th_urp)) < MAX_QUERY_SIZE)
-- {
-- sgInsert(op_data, sql_buffer, NULL); /* XXX: Error checking */
-- }
-- /* XXX: TCP Options not handled */
-- return 0;
--}
-+ /* Free! */
-+ Tcl_DStringFree(&list);
-+
-+ /* bump the event id */
-+ ++data->event_id;
-
--int sgInsertICMPData(OpSguil_Data *op_data, Packet *p)
--{
-- if(!p->icmph)
-- return 0;
-- if(p->icmph->icmp_type == 0 || p->icmph->icmp_type == 8 ||
-- p->icmph->icmp_type == 13 || p->icmph->icmp_type == 14 ||
-- p->icmph->icmp_type == 15 || p->icmph->icmp_type == 16)
-- {
-- if(snprintf(sql_buffer, MAX_QUERY_SIZE,
-- "INSERT INTO icmphdr(sid, cid, "
-- "icmp_csum, icmp_id, icmp_seq) "
-- "VALUES('%u', '%u', '%u', '%u', '%u')",
-- op_data->sensor_id, op_data->event_id,
-- ntohs(p->icmph->icmp_csum),
-- htons(p->icmph->icmp_hun.ih_idseq.icd_id),
-- htons(p->icmph->icmp_hun.ih_idseq.icd_seq))
-- < MAX_QUERY_SIZE)
-- {
-- sgInsert(op_data, sql_buffer, NULL); /* XXX: Error checking */
-- }
-- }
-- else
-- {
-- if(snprintf(sql_buffer, MAX_QUERY_SIZE,
-- "INSERT INTO icmphdr(sid, cid, "
-- "icmp_csum) VALUES('%u', '%u', '%u')",
-- op_data->sensor_id, op_data->event_id,
-- ntohs(p->icmph->icmp_csum))
-- < MAX_QUERY_SIZE)
-- {
-- sgInsert(op_data, sql_buffer, NULL); /* XXX: Error Checking */
-- }
-- }
- return 0;
- }
-
--int sgInsertPayloadData(OpSguil_Data *op_data, Packet *p)
-+int OpSguil_RTEventMsg(OpSguil_Data *data, char *msg)
- {
-- char *hex_payload;
-- if(p->dsize)
-- {
-- hex_payload = fasthex(p->data, p->dsize);
-- if(snprintf(sql_buffer, MAX_QUERY_SIZE,
-- "INSERT INTO data(sid, cid, data_payload) "
-- "VALUES('%u', '%u', '%s')", op_data->sensor_id,
-- op_data->event_id, hex_payload) < MAX_QUERY_SIZE)
-- {
-- sgInsert(op_data, sql_buffer, NULL); /* XXX: Error Checking */
-- }
-- free(hex_payload);
-- }
-- return 0;
--}
-
-+ char tmpRecvMsg[MAX_MSG_LEN];
-
--/* Attempts to retrieve the sensor id
-- */
--unsigned int SguilGetSensorId(OpSguil_Data *op_data)
--{
-- unsigned int sensor_id = 0;
-- /* XXX: This should be moved to global setup */
-- if(pv.hostname == NULL)
-- {
-- /* query the hostname */
-- /* the DB schema allows for a hostname of up to 2^16-1 characters, i am limiting
-- * this to 255 (+1 for the NULL)
-- */
-- pv.hostname = (char *)malloc(256);
-- if(gethostname(pv.hostname, 256))
-- {
-- FatalError("Error querying hostname: %s\n", strerror(errno));
-- }
-- }
-+ /* Send Msg */
-+ OpSguil_SendAgentMsg(data, msg);
-
-- /* XXX: need to escape strings */
-- if(snprintf(sql_buffer, MAX_QUERY_SIZE,
-- "SELECT sid FROM sensor WHERE hostname='%s'"
-- , pv.hostname) < MAX_QUERY_SIZE)
-+ /* Get confirmation */
-+ memset(tmpRecvMsg,0x0,MAX_MSG_LEN);
-+ if(OpSguil_RecvAgentMsg(data, tmpRecvMsg) == 1 )
- {
-- if(sgSelectAsUInt(op_data, sql_buffer, &sensor_id) == -1)
-- {
-- FatalError("Database Error\n");
-- }
-- if(sensor_id == 0)
-- {
-
-- /* insert sensor information */
-+ if(pv.verbose)
-+ LogMessage("Retrying\n");
-+
-+ OpSguil_RTEventMsg(data, msg);
-
-- if(snprintf(sql_buffer, MAX_QUERY_SIZE, "INSERT INTO sensor (hostname) "
-- "VALUES ('%s')", pv.hostname) < MAX_QUERY_SIZE)
-- {
-- sgInsert(op_data, sql_buffer, &sensor_id);
-- /* XXX: Error checking */
-- }
-- else
-- {
-- FatalError("Error building SQL Query\n");
-- }
-- }
-- if(pv.verbose >= 2)
-- LogMessage("sensor_id == %u\n", sensor_id);
- }
- else
- {
-- FatalError("Error building SQL Query\n");
-- }
-- return sensor_id;
--}
-
--/* Retrieves the next acid_cid to use for inserting into the database for this
-- * sensor
-- */
--unsigned int SguilGetNextCid(OpSguil_Data *data)
--{
-- unsigned int cid = 0;
-- if(snprintf(sql_buffer, MAX_QUERY_SIZE,
-- "SELECT max(cid) FROM event WHERE sid='%u'", data->sensor_id)
-- < MAX_QUERY_SIZE)
-- {
-- if(sgSelectAsUInt(data, sql_buffer, &cid) == -1)
-+ char **toks;
-+ int num_toks;
-+
-+ if(pv.verbose)
-+ LogMessage("Received: %s", tmpRecvMsg);
-+
-+ /* Parse the response */
-+ toks = mSplit(tmpRecvMsg, " ", 2, &num_toks, 0);
-+ if(strcasecmp("Confirm", toks[0]) != 0 || atoi(toks[1]) != data->event_id )
- {
-- FatalError("Database Error\n");
-+
-+ FatalError("Expected Confirm %u and got: %s\n", data->event_id, tmpRecvMsg);
-+
- }
--#ifdef DEBUG
-- LogMessage("cid == %u\n", cid); fflush(stdout);
--#endif
-+
-+ FreeToks(toks, num_toks);
-+
- }
-- else
-- {
-- FatalError("Database Error\n");
-- }
-- return ++cid;
-+
-+ return 0;
-+
- }
-
- OpSguil_Data *OpSguil_ParseArgs(char *args)
- {
-- OpSguil_Data *op_data;
-
-+ OpSguil_Data *op_data;
-+
- op_data = (OpSguil_Data *)SafeAlloc(sizeof(OpSguil_Data));
--
-- op_data->options = 0;
--
-+
- if(args != NULL)
- {
- char **toks;
-@@ -685,77 +484,38 @@
- while(isspace((int)*index))
- ++index;
- stoks = mSplit(index, " ", 2, &num_stoks, 0);
-- if(strcasecmp("database", stoks[0]) == 0)
-- {
-- if(num_stoks > 1 && op_data->database == NULL)
-- op_data->database = strdup(stoks[1]);
-- else
-- LogMessage("Argument Error in %s(%i): %s\n", file_name,
-- file_line, index);
-- }
-- else if(strcasecmp("server", stoks[0]) == 0)
-- {
-- if(num_stoks > 1 && op_data->server == NULL)
-- op_data->server = strdup(stoks[1]);
-- else
-- LogMessage("Argument Error in %s(%i): %s\n", file_name,
-- file_line, index);
-- }
-- else if(strcasecmp("user", stoks[0]) == 0)
-+ if(strcasecmp("agent_port", stoks[0]) == 0)
- {
-- if(num_stoks > 1 && op_data->user == NULL)
-- op_data->user = strdup(stoks[1]);
-+ if(num_stoks > 1)
-+ op_data->agent_port = atoi(stoks[1]);
- else
-- LogMessage("Argument Error in %s(%i): %s\n", file_name,
-+ LogMessage("Argument Error in %s(%i): %s\n", file_name,
- file_line, index);
- }
-- else if(strcasecmp("password", stoks[0]) == 0)
-+ else if(strcasecmp("tag_path", stoks[0]) == 0)
- {
-- if(num_stoks > 1 && op_data->password == NULL)
-- op_data->password = strdup(stoks[1]);
-+ if(num_stoks > 1 && op_data->tag_path == NULL)
-+ op_data->tag_path = strdup(stoks[1]);
- else
-- LogMessage("Argument Error in %s(%i): %s\n", file_name,
-+ LogMessage("Argument Error in %s(%i): %s\n", file_name,
- file_line, index);
- }
-- else if(strcasecmp("sensor_id", stoks[0]) == 0)
-+ else if(strcasecmp("sensor_name", stoks[0]) == 0)
- {
-- if(num_stoks > 1 && op_data->sensor_id == 0)
-- op_data->sensor_id = atoi(stoks[1]);
-+ if(num_stoks > 1 && op_data->sensor_name == NULL)
-+ op_data->sensor_name = strdup(stoks[1]);
- else
-- LogMessage("Argument Error in %s(%i): %s\n", file_name,
-+ LogMessage("Argument Error in %s(%i): %s\n", file_name,
- file_line, index);
- }
-- else if(strcasecmp("sguild_host", stoks[0]) == 0)
-- {
-- if(num_stoks > 1 && op_data->sguild_host == 0)
-- op_data->sguild_host = strdup(stoks[1]);
-- else
-- LogMessage("Argument Error in %s(%i): %s\n", file_name,
-- file_line, index);
-- }
-- else if(strcasecmp("nospin", stoks[0]) == 0)
-- {
-- op_data->nospin = 1;
-- }
-- else if(strcasecmp("sguild_port", stoks[0]) == 0)
-+ else if(strcasecmp("passwd", stoks[0]) == 0)
- {
-- if(num_stoks > 1 && op_data->sguild_port == 0)
-- op_data->sguild_port = atoi(stoks[1]);
-- else
-- LogMessage("Argument Error in %s(%i): %s\n", file_name,
-- file_line, index);
-- }
--
--#ifdef ENABLE_MYSQL
-- else if(strcasecmp("mysql", stoks[0]) == 0)
-- {
-- if(op_data->flavor == 0)
-- op_data->flavor = FLAVOR_MYSQL;
-+ if(num_stoks > 1 && op_data->passwd == NULL)
-+ op_data->passwd = strdup(stoks[1]);
- else
-- LogMessage("Argument Error in %s(%i): %s\n", file_name,
-+ LogMessage("Argument Error in %s(%i): %s\n", file_name,
- file_line, index);
- }
--#endif /* ENABLE_MYSQL */
- else
- {
- fprintf(stderr, "WARNING %s (%d) => Unrecognized argument for "
-@@ -765,378 +525,544 @@
- }
- /* free your mSplit tokens */
- FreeToks(toks, num_toks);
-- }
-- if(op_data->flavor == 0)
-- FatalError("You must specify a database flavor\n");
-
-- if (op_data->sguild_host == NULL)
-- {
-- FatalError("You must specify a sguild host.\n");
- }
-
-- if (!op_data->sguild_port)
-+ if (op_data->agent_port == 0)
- {
-- FatalError("You must specify a sguild port.\n");
-+ op_data->agent_port = 7735;
- }
-+
- return op_data;
--}
-
-+}
-
--int sgDbConnect(OpSguil_Data *op_data)
-+int OpSguil_AppendIPHdrData(Tcl_DString *list, Packet *p)
- {
-- switch(op_data->flavor)
-- {
--#ifdef ENABLE_MYSQL
-- case FLAVOR_MYSQL:
-- return sgMysqlConnect(op_data);
-+ char buffer[STD_BUFFER];
-+
-+ bzero(buffer, STD_BUFFER);
-+
-+ sprintf(buffer, "%u", ntohl(p->iph->ip_src.s_addr));
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u.%u.%u.%u",
-+#if defined(WORDS_BIGENDIAN)
-+ (p->iph->ip_src.s_addr & 0xff000000) >> 24,
-+ (p->iph->ip_src.s_addr & 0x00ff0000) >> 16,
-+ (p->iph->ip_src.s_addr & 0x0000ff00) >> 8,
-+ (p->iph->ip_src.s_addr & 0x000000ff));
-+#else
-+ (p->iph->ip_src.s_addr & 0x000000ff),
-+ (p->iph->ip_src.s_addr & 0x0000ff00) >> 8,
-+ (p->iph->ip_src.s_addr & 0x00ff0000) >> 16,
-+ (p->iph->ip_src.s_addr & 0xff000000) >> 24);
- #endif
-- default:
-- FatalError("Database flavor not supported\n");
-- return 1;
-- }
--// return 1;
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u", ntohl(p->iph->ip_dst.s_addr));
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u.%u.%u.%u",
-+#if defined(WORDS_BIGENDIAN)
-+ (p->iph->ip_dst.s_addr & 0xff000000) >> 24,
-+ (p->iph->ip_dst.s_addr & 0x00ff0000) >> 16,
-+ (p->iph->ip_dst.s_addr & 0x0000ff00) >> 8,
-+ (p->iph->ip_dst.s_addr & 0x000000ff));
-+#else
-+ (p->iph->ip_dst.s_addr & 0x000000ff),
-+ (p->iph->ip_dst.s_addr & 0x0000ff00) >> 8,
-+ (p->iph->ip_dst.s_addr & 0x00ff0000) >> 16,
-+ (p->iph->ip_dst.s_addr & 0xff000000) >> 24);
-+#endif
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u", p->iph->ip_proto);
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u", IP_VER(p->iph));
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u", IP_HLEN(p->iph));
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u", p->iph->ip_tos);
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u", ntohs(p->iph->ip_len));
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u", ntohs(p->iph->ip_id));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+#if defined(WORDS_BIGENDIAN)
-+
-+ sprintf(buffer, "%u", ((p->iph->ip_off & 0xE000) >> 13));
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u", htons(p->iph->ip_off & 0x1FFF));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+#else
-+
-+ sprintf(buffer, "%u", ((p->iph->ip_off & 0x00E0) >> 5));
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u", htons(p->iph->ip_off & 0xFF1F));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+#endif
-+
-+ sprintf(buffer, "%u", p->iph->ip_ttl);
-+ Tcl_DStringAppendElement(list, buffer);
-+ sprintf(buffer, "%u", htons(p->iph->ip_csum));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ return 0;
- }
-
--int sgDbClose(OpSguil_Data *op_data)
-+int OpSguil_AppendICMPData(Tcl_DString *list, Packet *p)
- {
-- switch(op_data->flavor)
-+
-+ int i;
-+ char buffer[STD_BUFFER];
-+
-+ bzero(buffer, STD_BUFFER);
-+
-+ if(!p->icmph)
- {
--#ifdef ENABLE_MYSQL
-- case FLAVOR_MYSQL:
-- return sgMysqlClose(op_data->mysql);
--#endif
-- default:
-- FatalError("Database flavor not supported\n");
-- return 1;
-- }
--}
-
-+ /* Null out ICMP fields */
-+ for(i=0; i < 5; i++)
-+ Tcl_DStringAppendElement(list, "");
-
--int sgSelectAsUInt(OpSguil_Data *op_data, char *sql, unsigned int *result)
--{
-- switch(op_data->flavor)
-+ }
-+ else
- {
--#ifdef ENABLE_MYSQL
-- case FLAVOR_MYSQL:
-- return sgMysqlSelectAsUInt(op_data->mysql, sql, result);
--#endif
-- default:
-- FatalError("Database flavor not supported\n");
-- return 1;
-+
-+ /* ICMP type */
-+ sprintf(buffer, "%u", p->icmph->icmp_type);
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ /* ICMP code */
-+ sprintf(buffer, "%u", p->icmph->icmp_code);
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ /* ICMP CSUM */
-+ sprintf(buffer, "%u", ntohs(p->icmph->icmp_csum));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ /* Append other ICMP data if we have it */
-+ if(p->icmph->icmp_type == ICMP_ECHOREPLY ||
-+ p->icmph->icmp_type == ICMP_ECHO ||
-+ p->icmph->icmp_type == ICMP_TIMESTAMP ||
-+ p->icmph->icmp_type == ICMP_TIMESTAMPREPLY ||
-+ p->icmph->icmp_type == ICMP_INFO_REQUEST ||
-+ p->icmph->icmp_type == ICMP_INFO_REPLY)
-+ {
-+
-+ /* ICMP ID */
-+ sprintf(buffer, "%u", htons(p->icmph->icmp_hun.ih_idseq.icd_id));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ /* ICMP Seq */
-+ sprintf(buffer, "%u", htons(p->icmph->icmp_hun.ih_idseq.icd_seq));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ }
-+ else
-+ {
-+
-+ /* Add two empty elements */
-+ for(i=0; i < 2; i++)
-+ Tcl_DStringAppendElement(list, "");
-+
-+ }
-+
- }
-+
-+ /* blank out 12 elements */
-+ for(i = 0; i < 12; i++)
-+ Tcl_DStringAppendElement(list, "");
-+
-+ return 0;
-+
- }
-
--int sgInsert(OpSguil_Data *op_data, char *sql, unsigned int *row_id)
-+int OpSguil_AppendTCPData(Tcl_DString *list, Packet *p)
- {
-- switch(op_data->flavor)
-+
-+ /*
-+ ** 33 34 35 36 37 38 39 40
-+ ** {tcp seq} {tcp ack} {tcp off} {tcp res} {tcp flags} {tcp win} {tcp csum} {tcp urp}
-+ **
-+ */
-+
-+ int i;
-+ char buffer[STD_BUFFER];
-+
-+ bzero(buffer, STD_BUFFER);
-+
-+ /* empty elements for icmp data */
-+ for(i=0; i < 5; i++)
-+ Tcl_DStringAppendElement(list, "");
-+
-+ if(!p->tcph)
- {
--#ifdef ENABLE_MYSQL
-- case FLAVOR_MYSQL:
-- return sgMysqlInsert(op_data->mysql, sql, row_id);
--#endif
-- default:
-- FatalError("Database flavor not supported\n");
-- return 1;
-- }
--}
-
--int sgBeginTransaction(OpSguil_Data *op_data)
--{
-- switch(op_data->flavor)
-+ /* Null out TCP fields */
-+ for(i=0; i < 10; i++)
-+ Tcl_DStringAppendElement(list, "");
-+
-+ }
-+ else
- {
--#ifdef ENABLE_MYSQL
-- case FLAVOR_MYSQL:
-- return sgMysqlInsert(op_data->mysql, "BEGIN", NULL);
--#endif
-- default:
-- FatalError("Database flavor not supported\n");
-- return 1;
-+
-+ sprintf(buffer, "%u", p->sp);
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ sprintf(buffer, "%u", p->dp);
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ sprintf(buffer, "%u", ntohl(p->tcph->th_seq));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ sprintf(buffer, "%u", ntohl(p->tcph->th_ack));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ sprintf(buffer, "%u", TCP_OFFSET(p->tcph));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ sprintf(buffer, "%u", TCP_X2(p->tcph));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ sprintf(buffer, "%u", p->tcph->th_flags);
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ sprintf(buffer, "%u", ntohs(p->tcph->th_win));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ sprintf(buffer, "%u", ntohs(p->tcph->th_sum));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ sprintf(buffer, "%u", ntohs(p->tcph->th_urp));
-+ Tcl_DStringAppendElement(list, buffer);
-+
- }
-+
-+ /* empty elements for UDP data */
-+ for(i=0; i < 2; i++)
-+ Tcl_DStringAppendElement(list, "");
-+
-+ return 0;
-+
- }
-
--int sgEndTransaction(OpSguil_Data *op_data)
-+int OpSguil_AppendUDPData(Tcl_DString *list, Packet *p)
- {
-- switch(op_data->flavor)
-+
-+ int i;
-+ char buffer[STD_BUFFER];
-+
-+ bzero(buffer, STD_BUFFER);
-+
-+ /* empty elements for icmp data */
-+ for(i=0; i < 5; i++)
-+ Tcl_DStringAppendElement(list, "");
-+
-+ if(!p->udph)
- {
--#ifdef ENABLE_MYSQL
-- case FLAVOR_MYSQL:
-- return sgMysqlInsert(op_data->mysql, "COMMIT", NULL);
--#endif
-- default:
-- FatalError("Database flavor not supported\n");
-- return 1;
-+
-+ /* Null out port info */
-+ for(i=0; i < 2; i++)
-+ Tcl_DStringAppendElement(list, "");
-+
- }
--}
--
--int sgAbortTransaction(OpSguil_Data *op_data)
--{
-- switch(op_data->flavor)
-+ else
- {
--#ifdef ENABLE_MYSQL
-- case FLAVOR_MYSQL:
-- return sgMysqlInsert(op_data->mysql, "ROLLBACK", NULL);
--#endif
-- default:
-- FatalError("Database flavor not supported\n");
-- return 1;
-+
-+ /* source and dst port */
-+ sprintf(buffer, "%u", p->sp);
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ sprintf(buffer, "%u", p->dp);
-+ Tcl_DStringAppendElement(list, buffer);
-+
- }
--}
-
-+ /* empty elements for tcp data */
-+ for(i=0; i < 8; i++)
-+ Tcl_DStringAppendElement(list, "");
-+
-+ if(!p->udph)
-+ {
-+
-+ /* Null out UDP info */
-+ for(i=0; i < 2; i++)
-+ Tcl_DStringAppendElement(list, "");
-+
-+ }
-+ else
-+ {
-+
-+ sprintf(buffer, "%u", ntohs(p->udph->uh_len));
-+ Tcl_DStringAppendElement(list, buffer);
-+
-+ sprintf(buffer, "%u", ntohs(p->udph->uh_chk));
-+ Tcl_DStringAppendElement(list, buffer);
-
--#ifdef ENABLE_MYSQL
--int sgMysqlConnect(OpSguil_Data *op_data)
--{
-- op_data->mysql = mysql_init(NULL);
-- if(!mysql_real_connect(op_data->mysql, op_data->server, op_data->user,
-- op_data->password, op_data->database, 0, NULL, 0))
-- {
-- FatalError("Failed to connect to database %s:%s@%s/%s: %s\n",
-- op_data->user, op_data->password, op_data->server,
-- op_data->database, mysql_error(op_data->mysql));
- }
-+
- return 0;
-+
- }
-
--int sgMysqlClose(MYSQL *mysql)
-+int OpSguil_AppendPayloadData(Tcl_DString *list, Packet *p)
- {
-- mysql_close(mysql);
-+
-+ char *hex_payload;
-+
-+ if(p->dsize)
-+ {
-+ hex_payload = fasthex(p->data, p->dsize);
-+ Tcl_DStringAppendElement(list, hex_payload);
-+ free(hex_payload);
-+ } else {
-+ Tcl_DStringAppendElement(list, "");
-+ }
-+
- return 0;
-+
- }
-
--int sgMysqlExecuteQuery(MYSQL *mysql, char *sql)
-+
-+int OpSguil_SensorAgentConnect(OpSguil_Data *data)
- {
-- int mysqlErrno;
-- int result;
-- while((result = mysql_query(mysql, sql) != 0))
-+
-+ int sockfd;
-+ struct sockaddr_in my_addr;
-+
-+ while(1)
- {
-- mysqlErrno = mysql_errno(mysql);
-- if(mysqlErrno < CR_MIN_ERROR)
-+
-+ if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
- {
-- if(pv.verbose)
-- LogMessage("MySQL ERROR(%i): %s. Aborting Query\n",
-- mysql_errno(mysql), mysql_error(mysql));
-- return result;
-+ FatalError("Cannot open a local socket.\n");
-+ return 1;
- }
-- if((mysqlErrno == CR_SERVER_LOST)
-- || (mysqlErrno == CR_SERVER_GONE_ERROR))
-+
-+ my_addr.sin_family = AF_INET;
-+ my_addr.sin_port = htons(data->agent_port);
-+ my_addr.sin_addr.s_addr = inet_addr("127.0.0.1");
-+ memset(&(my_addr.sin_zero), '\0', 8);
-+
-+
-+ if (connect(sockfd, (struct sockaddr *)&my_addr, sizeof(struct sockaddr)) < 0)
- {
-- LogMessage("Lost connection to MySQL server. Reconnecting\n");
-- while(mysql_ping(mysql) != 0)
-+ LogMessage("Cannot connect to localhost on TCP port %u.\n",
-+ data->agent_port);
-+ close(sockfd);
-+ LogMessage("Waiting 15 secs to try again.\n");
-+ if (BarnyardSleep(15))
- {
-- if(BarnyardSleep(15))
-- return result;
-+ LogMessage("Received Kill Signal...");
-+ CleanExit(0);
- }
-- LogMessage("Reconnected to MySQL server.\n");
-+
- }
- else
- {
-- /* XXX we could spin here, but we do not */
-- LogMessage("MySQL Error(%i): %s\n", mysqlErrno, mysql_error(mysql));
-+
-+ data->agent_sock = sockfd;
-+ LogMessage("Connected to localhost on %u.\n",
-+ data->agent_port);
-+ return 0;
-+
- }
-+
- }
-- return result;
--}
-
-+}
-
--int sgMysqlSelectAsUInt(MYSQL *mysql, char *sql, unsigned int *result)
-+/*
-+int OpSguil_SensorAgentAuth(OpSguil_Data *data)
- {
-- int rval = 0;
-- MYSQL_RES *mysql_res;
-- MYSQL_ROW tuple;
--
-- if(sgMysqlExecuteQuery(mysql, sql) != 0)
-- {
-- /* XXX: should really just return up the chain */
-- FatalError("Error (%s) executing query: %s\n", mysql_error(mysql), sql);
-- return -1;
-- }
-
-- mysql_res = mysql_store_result(mysql);
-- if((tuple = mysql_fetch_row(mysql_res)))
-- {
-- if(tuple[0] == NULL)
-- *result = 0;
-- else
-- *result = atoi(tuple[0]);
-- rval = 1;
-- }
-- mysql_free_result(mysql_res);
-- return rval;
-+ Tcl_DString auth_cmd;
-+
-+ Tcl_DStringInit(&auth_cmd);
-+ Tcl_DStringAppendElement(auth_cmd, "AUTH");
-+ Tcl_DStringAppendElement(auth_cmd, data->passwd);
-+
-+
- }
-+*/
-
--int sgMysqlInsert(MYSQL *mysql, char *sql, unsigned int *row_id)
-+/* Request sensor ID (sid) and next cid from sensor_agent */
-+int OpSguil_SensorAgentInit(OpSguil_Data *data)
- {
-- if(sgMysqlExecuteQuery(mysql, sql) != 0)
-+
-+ char tmpSendMsg[MAX_MSG_LEN];
-+ char tmpRecvMsg[MAX_MSG_LEN];
-+
-+ /* Send our Request */
-+ snprintf(tmpSendMsg, MAX_MSG_LEN, "SidCidRequest %s", data->sensor_name);
-+ OpSguil_SendAgentMsg(data, tmpSendMsg);
-+
-+ /* Get the Results */
-+ memset(tmpRecvMsg,0x0,MAX_MSG_LEN);
-+ if(OpSguil_RecvAgentMsg(data, tmpRecvMsg) == 1 )
- {
-- /* XXX: should really just return up the chain */
-- FatalError("Error (%s) executing query: %s\n", mysql_error(mysql), sql);
-- return -1;
-+
-+ OpSguil_SensorAgentInit(data);
-+
- }
-+ else
-+ {
-
-- if(row_id != NULL)
-- *row_id = mysql_insert_id(mysql);
-- return 0;
--}
--#endif
-+ char **toks;
-+ int num_toks;
-
--/* SguildConnect() opens a network socket to sguild for sending
-- * RT event messages. Bammkkkk
--*/
--int SguildConnect(OpSguil_Data *op_data)
--{
-- int sockfd;
-- struct hostent *he;
-- struct sockaddr_in server_addr;
-+ if(pv.verbose)
-+ LogMessage("Received: %s", tmpRecvMsg);
-
-- if ((he=gethostbyname(op_data->sguild_host)) == NULL)
-+ /* Parse the response */
-+ toks = mSplit(tmpRecvMsg, " ", 3, &num_toks, 0);
-+ if(strcasecmp("SidCidResponse", toks[0]) == 0)
- {
-- FatalError("Cannot resolve hostname: %s\n", op_data->sguild_host);
-- return 1;
-+
-+ data->sensor_id = atoi(toks[1]);
-+ data->event_id = atoi(toks[2]);
-+
- }
--
-- if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-+ else
- {
--
-- FatalError("Cannot open a local socket.\n");
-- return 1;
--
-+
-+ FatalError("Expected SidCidResponse and got: %s\n", tmpRecvMsg);
-+
- }
-
-- server_addr.sin_family = AF_INET;
-- server_addr.sin_port = htons(op_data->sguild_port);
-- server_addr.sin_addr = *((struct in_addr *)he->h_addr);
-- memset(&(server_addr.sin_zero), '\0', 8);
-+ FreeToks(toks, num_toks);
-
-- if (connect(sockfd, (struct sockaddr *)&server_addr, sizeof(struct sockaddr)) < 0)
-- {
--
-- LogMessage("Cannot connect to %s on TCP port %u.\n",
-- op_data->sguild_host, op_data->sguild_port);
-- close(sockfd);
-- return 1;
-+ if(pv.verbose)
-+ LogMessage("Sensor ID: %u\nLast cid: %u\n", data->sensor_id, data->event_id);
-+
-+ /* Use the next event_id */
-+ ++data->event_id;
-+
-+ }
-+
-+ return 0;
-+
-+}
-+
-+int OpSguil_SendAgentMsg(OpSguil_Data *data, char *msg)
-+{
-+
-+ int schars;
-+ size_t len;
-+ char *tmpMsg;
-+
-+ len = strlen(msg)+2;
-
-- }
-+ tmpMsg = SafeAlloc(len);
-
-- op_data->sguild_sock = sockfd;
-- return 0;
-+ snprintf(tmpMsg, len, "%s\n", msg);
-+
-+ if((schars = send(data->agent_sock, tmpMsg, sizeof(char)*strlen(tmpMsg), 0)) < 0)
-+ {
-+
-+ if(pv.verbose)
-+ LogMessage("Lost connection to sensor_agent.\n");
-+
-+ /* Resend our msg */
-+ OpSguil_SendAgentMsg(data, msg);
-+
-+ }
-+
-+ if(pv.verbose)
-+ LogMessage("Sent: %s", tmpMsg);
-+
-+ free(tmpMsg);
-+
-+ return 0;
-
- }
-+
- /* I love google. http://pont.net/socket/prog/tcpServer.c */
--int read_line(int newSd, char *line_to_return) {
--
-+int OpSguil_RecvAgentMsg(OpSguil_Data *data, char *line_to_return) {
-+
- static int rcv_ptr=0;
- static char rcv_msg[MAX_MSG_LEN];
- static int n;
-+ struct timeval tv;
-+ fd_set read_fds;
- int offset;
--
-+
- offset=0;
-+ /* wait 15 secs for our response */
-+ tv.tv_sec = 15;
-+ tv.tv_usec = 0;
-+
-+ FD_ZERO(&read_fds);
-+ FD_SET(data->agent_sock, &read_fds);
-
- while(1) {
-- if(rcv_ptr==0) {
-
-- memset(rcv_msg,0x0,MAX_MSG_LEN);
-- n = recv(newSd, rcv_msg, MAX_MSG_LEN, 0);
-- if (n<0) {
-- LogMessage("ERROR: Unable to read data.\n");
-- return 1;
-- } else if (n==0) {
-- LogMessage("ERROR: Connecton closed by client\n");
-- close(newSd);
-- return 1;
-- }
-+ /* Wait for response from sguild */
-+ select(data->agent_sock+1, &read_fds, NULL, NULL, &tv);
-+
-+ if (!(FD_ISSET(data->agent_sock, &read_fds)))
-+ {
-+ /* timed out */
-+ if(pv.verbose)
-+ LogMessage("Timed out waiting for response.\n");
-+
-+ return 1;
- }
-+ else
-+ {
-+ if(rcv_ptr==0) {
-+
-+ memset(rcv_msg,0x0,MAX_MSG_LEN);
-+ n = recv(data->agent_sock, rcv_msg, MAX_MSG_LEN, 0);
-+ if (n<0) {
-+ LogMessage("ERROR: Unable to read data.\n");
-+ /* Reconnect to sensor_agent */
-+ OpSguil_SensorAgentConnect(data);
-+ } else if (n==0) {
-+ LogMessage("ERROR: Connecton closed by client\n");
-+ close(data->agent_sock);
-+ /* Reconnect to sensor_agent */
-+ OpSguil_SensorAgentConnect(data);
-+ }
-+ }
-+
-+ /* if new data read on socket */
-+ /* OR */
-+ /* if another line is still in buffer */
-+
-+ /* copy line into 'line_to_return' */
-+ while(*(rcv_msg+rcv_ptr)!=0x0A && rcv_ptr<n) {
-+ memcpy(line_to_return+offset,rcv_msg+rcv_ptr,1);
-+ offset++;
-+ rcv_ptr++;
-+ }
-+
-+ /* end of line + end of buffer => return line */
-+ if(rcv_ptr==n-1) {
-+ /* set last byte to END_LINE */
-+ *(line_to_return+offset)=0x0A;
-+ rcv_ptr=0;
-+ return ++offset;
-+ }
-+
-+ /* end of line but still some data in buffer => return line */
-+ if(rcv_ptr <n-1) {
-+ /* set last byte to END_LINE */
-+ *(line_to_return+offset)=0x0A;
-+ rcv_ptr++;
-+ return ++offset;
-+ }
-
-- /* if new data read on socket */
-- /* OR */
-- /* if another line is still in buffer */
--
-- /* copy line into 'line_to_return' */
-- while(*(rcv_msg+rcv_ptr)!=0x0A && rcv_ptr<n) {
-- memcpy(line_to_return+offset,rcv_msg+rcv_ptr,1);
-- offset++;
-- rcv_ptr++;
-- }
--
-- /* end of line + end of buffer => return line */
-- if(rcv_ptr==n-1) {
-- /* set last byte to END_LINE */
-- *(line_to_return+offset)=0x0A;
-- rcv_ptr=0;
-- return ++offset;
-- }
--
-- /* end of line but still some data in buffer => return line */
-- if(rcv_ptr <n-1) {
-- /* set last byte to END_LINE */
-- *(line_to_return+offset)=0x0A;
-- rcv_ptr++;
-- return ++offset;
-+ /* end of buffer but line is not ended => */
-+ /* wait for more data to arrive on socket */
-+ if(rcv_ptr == n) {
-+ rcv_ptr = 0;
-+ }
-+
- }
-
-- /* end of buffer but line is not ended => */
-- /* wait for more data to arrive on socket */
-- if(rcv_ptr == n) {
-- rcv_ptr = 0;
-- }
--
- }
--}
-
--/* SguilSendEvent() sends the event via the open network socket.
-- * Bammkkkk
--*/
--int SguilSendEvent(OpSguil_Data *op_data, char *eventMsg)
--{
--
-- int schars;
-- char line[100];
--
--
-- if((schars = send(op_data->sguild_sock, eventMsg, strlen(eventMsg), 0)) < 0)
-- {
-- LogMessage("ERROR! Couldn't send msg.\n");
--
-- /* ReConnect to sguild */
-- while(SguildConnect(op_data) == 1)
-- {
-- if(op_data->nospin) return 0;
-- LogMessage("ERROR: Couldn't reconnect. Will try again in 15 secs.\n");
-- if (BarnyardSleep(15)) break;
-- }
-- LogMessage("Connected to %s.\n", op_data->sguild_host);
-- SguilSendEvent(op_data, eventMsg);
--
-- } else {
--
-- //LogMessage("Msg sent: %s", eventMsg);
-- //LogMessage("Chars sent: %i\n", schars);
--
-- memset(line, 0x0, 100);
-- if(read_line(op_data->sguild_sock, line) == 1)
-- {
--
-- if (op_data->nospin == 0)
-- {
--
--
-- LogMessage("ERROR! Didn't receive confirmation. Trying to reconnect.\n");
--
-- /* ReConnect to sguild */
-- while(SguildConnect(op_data) == 1)
-- {
-- LogMessage("ERROR: Couldn't reconnect. Will try again in 15 secs.\n");
-- if (BarnyardSleep(15)) break;
-- }
--
-- LogMessage("Connected to %s.\n", op_data->sguild_host);
-- SguilSendEvent(op_data, eventMsg);
--
-- }
--
-- }
-- }
-- return 0;
--
- }
-
--#endif
diff --git a/security/barnyard-sguil/files/patch-op_plugbase.c b/security/barnyard-sguil/files/patch-op_plugbase.c
deleted file mode 100644
index 5ea119214df1..000000000000
--- a/security/barnyard-sguil/files/patch-op_plugbase.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/output-plugins/op_plugbase.c.orig Sun Mar 28 18:14:19 2004
-+++ src/output-plugins/op_plugbase.c Sun Jan 15 22:33:35 2006
-@@ -27,7 +27,7 @@
- #if defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRES)
- #include "op_acid_db.h"
- #endif
--#ifdef ENABLE_MYSQL
-+#ifdef ENABLE_TCL
- #include "op_sguil.h"
- #endif
- #include "op_alert_csv.h"
-@@ -47,7 +47,7 @@
- #if defined(ENABLE_MYSQL) || defined(ENABLE_POSTGRES)
- OpAcidDb_Init();
- #endif
--#ifdef ENABLE_MYSQL
-+#ifdef ENABLE_TCL
- OpSguil_Init();
- #endif
- OpAlertCSV_Init();
diff --git a/security/barnyard-sguil/files/patch-op_sguil.h b/security/barnyard-sguil/files/patch-op_sguil.h
deleted file mode 100644
index de89409bf74d..000000000000
--- a/security/barnyard-sguil/files/patch-op_sguil.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/output-plugins/op_sguil.h.orig Mon Mar 15 22:18:20 2004
-+++ src/output-plugins/op_sguil.h Sun Jan 15 22:32:07 2006
-@@ -1,8 +1,9 @@
--/* $Id: op_sguil.h,v 1.2 2004/03/16 04:18:20 andrewbaker Exp $ */
-+/* $Id: op_sguil.h,v 1.2 2005/03/03 21:07:44 bamm Exp $ */
-+
- /*
--** Copyright (C) 2001 Andrew R. Baker <andrewb@snort.org>
-+** Copyright (C) 2002-2004 Robert (Bamm) Visscher <bamm@sguil.net>
- **
--** This program is distributed under the terms of version 1.0 of the
-+** This program is distributed under the terms of version 1.0 of the
- ** Q Public License. See LICENSE.QPL for further details.
- **
- ** This program is distributed in the hope that it will be useful,
-@@ -11,10 +12,4 @@
- **
- */
-
--#ifndef __OP_SGUIL_H__
--#define __OP_SGUIL_H__
--
- void OpSguil_Init();
--
--#endif /* __OP_SGUIL_H__ */
--
diff --git a/security/clamassassin/Makefile b/security/clamassassin/Makefile
index 0b06e4e5f514..65bb6a23ff37 100644
--- a/security/clamassassin/Makefile
+++ b/security/clamassassin/Makefile
@@ -7,6 +7,7 @@
PORTNAME= clamassassin
PORTVERSION= 1.2.4
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://jameslick.com/clamassassin/ \
http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 19e71119c304..48169cfecdb3 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= clamav
-PORTVERSION= 0.91.2
+PORTVERSION= 0.92.1
PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF
@@ -19,8 +19,11 @@ LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
OPTIONS= ARC "Enable arch archives support" On \
ARJ "Enable arj archives support" On \
LHA "Enable lha archives support" On \
+ UNZOO "Enable zoo archives support" On \
+ UNRAR "Enable rar archives support" On \
MILTER "Compile the milter interface" Off \
LDAP "libmilter was built with LDAP" Off \
+ ICONV "Enable ICONV support" Off \
STDERR "Print logs to stderr instead of stdout" Off \
EXPERIMENTAL "Build experimental code" Off
@@ -105,17 +108,34 @@ CONFIGURE_ARGS+= --enable-gethostbyname_r
# force to use -lthr until it's not fixed.
.if ${OSVERSION} >= 601000
PTHREAD_LIBS= -lthr
+.else
+PTHREAD_LIBS= -lpthread
.endif
-.if !defined(WITHOUT_ARC)
+.if defined(WITH_ARC)
RUN_DEPENDS+= arc:${PORTSDIR}/archivers/arc
.endif
-.if !defined(WITHOUT_ARJ)
+.if defined(WITH_ARJ)
RUN_DEPENDS+= arj:${PORTSDIR}/archivers/arj
.endif
-.if !defined(WITHOUT_LHA)
+.if defined(WITH_LHA)
RUN_DEPENDS+= lha:${PORTSDIR}/archivers/lha
.endif
+.if defined(WITH_UNZOO)
+RUN_DEPENDS+= unzoo:${PORTSDIR}/archivers/unzoo
+.endif
+.if defined(WITH_UNRAR)
+PLIST_SUB+= UNRAR=""
+.else
+PLIST_SUB+= UNRAR="@comment "
+CONFIGURE_ARGS+= --disable-unrar
+.endif
+.if defined(WITH_ICONV)
+CONFIGURE_ARGS+=--with-iconv
+USE_ICONV= yes
+.else
+CONFIGURE_ARGS+=--without-iconv
+.endif
.if defined(WITH_MILTER)
USE_RC_SUBR+= clamav-milter
@@ -148,11 +168,11 @@ post-patch:
${WRKSRC}/${CONFIGURE_SCRIPT}
@${REINPLACE_CMD} -E 's,^(pkgconfigdir = ).*$$,\1$$(prefix)/libdata/pkgconfig,g' \
${WRKSRC}/Makefile.in
- @${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
- ${WRKSRC}/libclamav/unrar/unrar.c
@${REINPLACE_CMD} ${SED_CONF} \
${WRKSRC}/etc/clamd.conf \
${WRKSRC}/etc/freshclam.conf
+ @${REINPLACE_CMD} -e 's|0x100000000|0x100000000ULL|g' \
+ ${WRKSRC}/libclamunrar/unrar.c
pre-install:
@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
diff --git a/security/clamav/distinfo b/security/clamav/distinfo
index 780c2bb6351a..47c9cdf725cc 100644
--- a/security/clamav/distinfo
+++ b/security/clamav/distinfo
@@ -1,3 +1,3 @@
-MD5 (clamav-0.91.2.tar.gz) = 2a7265d17cfa80c32858978f16a3f47b
-SHA256 (clamav-0.91.2.tar.gz) = dac9de86dff5ef4c9a6e4962da24988e1aa74948a21b7fb7b7fed17867ddf2a0
-SIZE (clamav-0.91.2.tar.gz) = 13394538
+MD5 (clamav-0.92.1.tar.gz) = c16e60f569b6ec575d8de494e788f9d2
+SHA256 (clamav-0.92.1.tar.gz) = e08a63adb3eda3dfc190d7a8b3fa55c881b1632583fbdf67327d3767d6966581
+SIZE (clamav-0.92.1.tar.gz) = 15284752
diff --git a/security/clamav/files/pkg-install.in b/security/clamav/files/pkg-install.in
index b6280ecf8df8..d83287ec16aa 100644
--- a/security/clamav/files/pkg-install.in
+++ b/security/clamav/files/pkg-install.in
@@ -1,5 +1,5 @@
#!/bin/sh
-# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/pkg-install.in,v 1.4 2007-02-18 16:12:37 garga Exp $
+# $FreeBSD: /tmp/pcvs/ports/security/clamav/files/pkg-install.in,v 1.5 2008-02-21 13:19:50 garga Exp $
PREFIX=${PKG_PREFIX:-%%PREFIX%%}
@@ -14,7 +14,7 @@ RUNDIR=%%RUNDIR%%
PW="pw"
CHOWN="chown"
-MKDIR="mkdir -p"
+INSTALL_DIR="install -d -o ${CLAMAVUSER} -g ${CLAMAVGROUP} -m 0755"
if [ "$2" = "PRE-INSTALL" ]; then
@@ -41,16 +41,8 @@ if [ "$2" = "PRE-INSTALL" ]; then
fi
elif [ "$2" = "POST-INSTALL" ]; then
-
- [ ! -d "${DBDIR}" ] && (${MKDIR} ${DBDIR} || exit 1)
- ${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DBDIR} || exit 1
-
- [ ! -d "${LOGDIR}" ] && (${MKDIR} ${LOGDIR} || exit 1)
- ${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${LOGDIR} || exit 1
-
- [ ! -d "${RUNDIR}" ] && (${MKDIR} ${RUNDIR} || exit 1)
- ${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${RUNDIR} || exit 1
-
+ ${INSTALL_DIR} ${DBDIR} ${LOGDIR} ${RUNDIR}
+ ${CHOWN} -R ${CLAMAVUSER}:${CLAMAVGROUP} ${DBDIR} ${LOGDIR} ${RUNDIR}
fi
exit 0
diff --git a/security/clamav/pkg-plist b/security/clamav/pkg-plist
index cce136a30848..c2c36a05035b 100644
--- a/security/clamav/pkg-plist
+++ b/security/clamav/pkg-plist
@@ -9,10 +9,18 @@ bin/sigtool
sbin/clamd
include/clamav.h
include/clamav-config.h
-lib/libclamav.so.2
+lib/libclamav.so.3
lib/libclamav.so
lib/libclamav.a
lib/libclamav.la
+%%UNRAR%%lib/libclamunrar.so.3
+%%UNRAR%%lib/libclamunrar.so
+%%UNRAR%%lib/libclamunrar.la
+%%UNRAR%%lib/libclamunrar.a
+%%UNRAR%%lib/libclamunrar_iface.so.3
+%%UNRAR%%lib/libclamunrar_iface.so
+%%UNRAR%%lib/libclamunrar_iface.la
+%%UNRAR%%lib/libclamunrar_iface.a
libdata/pkgconfig/libclamav.pc
@unexec if cmp -s %D/etc/clamd.conf %D/etc/clamd.conf.default; then rm -f %D/etc/clamd.conf; fi
etc/clamd.conf.default
diff --git a/security/clamcour/Makefile b/security/clamcour/Makefile
index a4a6023be698..31e2cedf2073 100644
--- a/security/clamcour/Makefile
+++ b/security/clamcour/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clamcour
PORTVERSION= 0.3.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security mail
MASTER_SITES= http://www.becrux.com/pages/projects/clamcour/
@@ -15,7 +15,7 @@ MAINTAINER= bsd@dino.sk
COMMENT= ClamAV courier filter
BUILD_DEPENDS= courier-config:${PORTSDIR}/mail/courier
-LIB_DEPENDS= clamav.2:${PORTSDIR}/security/clamav
+LIB_DEPENDS= clamav.3:${PORTSDIR}/security/clamav
GNU_CONFIGURE= yes
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/security/fwbuilder-devel/Makefile b/security/fwbuilder-devel/Makefile
deleted file mode 100644
index b6b6d5362d5e..000000000000
--- a/security/fwbuilder-devel/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# New ports collection makefile for: fwbuilder
-# Date Created: 3 Feb 2001
-# Whom: Roman Shterenzon <roman@xpert.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= fwbuilder
-PORTVERSION= 2.1.14
-PORTREVISION= 2
-CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}/fwbuilder/
-MASTER_SITE_SUBDIR= fwbuilder
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= Firewall Builder GUI and policy compilers
-
-BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS= fwbuilder.7:${PORTSDIR}/security/libfwbuilder
-
-BUILD_VERSION= 21
-PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
-USE_QT_VER= 3
-
-QTDIR?= ${QT_PREFIX}
-
-USE_OPENSSL= yes
-USE_GETOPT_LONG= yes
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-CONFIGURE_ARGS+= --with-docdir=${DOCSDIR} --with-qtdir=${QTDIR}
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAKE_ARGS+= QTDIR="${QTDIR}" \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-USE_LDCONFIG= yes
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-
-MAN1= fwbuilder.1 \
- fwblookup.1 \
- fwbedit.1 \
- fwb_ipt.1 \
- fwb_ipf.1 \
- fwb_ipfw.1 \
- fwb_pf.1
-
-.if !defined(NOPORTDOCS)
-PORTDOCS= *
-.endif
-
-.include <bsd.port.mk>
diff --git a/security/fwbuilder-devel/distinfo b/security/fwbuilder-devel/distinfo
deleted file mode 100644
index 4df51915481a..000000000000
--- a/security/fwbuilder-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (fwbuilder-2.1.14.tar.gz) = b0e41962b8deda7d0fdcaa632098199b
-SHA256 (fwbuilder-2.1.14.tar.gz) = a99d847699ed522b9a64124bf5dd3519a132613da72990ae9fb6ed2fa673d2e7
-SIZE (fwbuilder-2.1.14.tar.gz) = 1708015
diff --git a/security/fwbuilder-devel/files/patch-aa b/security/fwbuilder-devel/files/patch-aa
deleted file mode 100644
index 5a52a1a5bd17..000000000000
--- a/security/fwbuilder-devel/files/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
---- qmake.inc.in.linux 2006-06-22 08:36:05.000000000 -0700
-+++ qmake.inc.in 2006-06-22 08:36:27.000000000 -0700
-@@ -34,10 +34,8 @@
-
- PKGLOCALEDIR = $$res.path/locale
-
-- QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
-- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
-- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
-- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
-+ QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@
-+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
- }
- }
-
diff --git a/security/fwbuilder-devel/files/patch-src-gui-ipfAdvancedDialog.cpp b/security/fwbuilder-devel/files/patch-src-gui-ipfAdvancedDialog.cpp
deleted file mode 100644
index c53c042a7cb8..000000000000
--- a/security/fwbuilder-devel/files/patch-src-gui-ipfAdvancedDialog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/ipfAdvancedDialog.cpp.orig 2007-01-06 14:03:25.000000000 -0800
-+++ src/gui/ipfAdvancedDialog.cpp 2007-09-19 11:29:47.000000000 -0700
-@@ -88,6 +88,8 @@
- data.registerOption( ipf_nat_irc_proxy ,fwopt, "ipf_nat_irc_proxy");
- data.registerOption( ipf_nat_ftp_proxy ,fwopt, "ipf_nat_ftp_proxy");
- data.registerOption( ipf_nat_rcmd_proxy ,fwopt, "ipf_nat_rcmd_proxy");
-+ data.registerOption( ipf_nat_krcmd_proxy ,fwopt, "ipf_nat_krcmd_proxy");
-+ data.registerOption( ipf_nat_ekshell_proxy ,fwopt, "ipf_nat_ekshell_proxy");
- data.registerOption( ipf_fw_dir ,fwopt, "firewall_dir" );
- data.registerOption( ipf_user ,fwopt, "admUser" );
- data.registerOption( altAddress ,fwopt, "altAddress" );
diff --git a/security/fwbuilder-devel/files/patch-src-gui-ipfadvanceddialog_q.ui b/security/fwbuilder-devel/files/patch-src-gui-ipfadvanceddialog_q.ui
deleted file mode 100644
index 2accf5daca84..000000000000
--- a/security/fwbuilder-devel/files/patch-src-gui-ipfadvanceddialog_q.ui
+++ /dev/null
@@ -1,72 +0,0 @@
---- src/gui/ipfadvanceddialog_q.ui.orig 2006-10-23 21:05:57.000000000 -0700
-+++ src/gui/ipfadvanceddialog_q.ui 2007-09-20 14:53:03.000000000 -0700
-@@ -118,7 +118,7 @@
- </size>
- </property>
- </spacer>
-- <widget class="QCheckBox" row="4" column="1">
-+ <widget class="QCheckBox" row="6" column="1">
- <property name="name">
- <cstring>ipf_nat_raudio_proxy</cstring>
- </property>
-@@ -126,7 +126,7 @@
- <string>Use raudio proxy in NAT rules</string>
- </property>
- </widget>
-- <widget class="QCheckBox" row="5" column="1">
-+ <widget class="QCheckBox" row="7" column="1">
- <property name="name">
- <cstring>ipf_nat_h323_proxy</cstring>
- </property>
-@@ -134,7 +134,7 @@
- <string>Use h323 proxy in NAT rules</string>
- </property>
- </widget>
-- <widget class="QCheckBox" row="6" column="1">
-+ <widget class="QCheckBox" row="8" column="1">
- <property name="name">
- <cstring>ipf_nat_ipsec_proxy</cstring>
- </property>
-@@ -175,7 +175,23 @@
- <string>Use rcmd proxy in NAT rules</string>
- </property>
- </widget>
-- <spacer row="9" column="1">
-+ <widget class="QCheckBox" row="4" column="1">
-+ <property name="name">
-+ <cstring>ipf_nat_krcmd_proxy</cstring>
-+ </property>
-+ <property name="text">
-+ <string>Use Kerberos rcmd proxy in NAT rules</string>
-+ </property>
-+ </widget>
-+ <widget class="QCheckBox" row="5" column="1">
-+ <property name="name">
-+ <cstring>ipf_nat_ekshell_proxy</cstring>
-+ </property>
-+ <property name="text">
-+ <string>Use Kerberos ekshell proxy in NAT rules</string>
-+ </property>
-+ </widget>
-+ <spacer row="11" column="1">
- <property name="name">
- <cstring>spacer36</cstring>
- </property>
-@@ -192,7 +208,7 @@
- </size>
- </property>
- </spacer>
-- <widget class="QCheckBox" row="7" column="1">
-+ <widget class="QCheckBox" row="9" column="1">
- <property name="name">
- <cstring>ipf_nat_pptp_proxy</cstring>
- </property>
-@@ -200,7 +216,7 @@
- <string>Use PPTP proxy in NAT rules</string>
- </property>
- </widget>
-- <widget class="QCheckBox" row="8" column="1">
-+ <widget class="QCheckBox" row="10" column="1">
- <property name="name">
- <cstring>ipf_nat_irc_proxy</cstring>
- </property>
diff --git a/security/fwbuilder-devel/files/patch-src-pflib-NATCompiler_ipf.cpp b/security/fwbuilder-devel/files/patch-src-pflib-NATCompiler_ipf.cpp
deleted file mode 100644
index c219847d030f..000000000000
--- a/security/fwbuilder-devel/files/patch-src-pflib-NATCompiler_ipf.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/pflib/NATCompiler_ipf.cpp.orig 2006-09-10 17:41:09.000000000 -0700
-+++ src/pflib/NATCompiler_ipf.cpp 2007-09-19 11:39:40.000000000 -0700
-@@ -398,6 +398,8 @@
-
- bool ftp_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_ftp_proxy");
- bool rcmd_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_rcmd_proxy");
-+ bool krcmd_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_krcmd_proxy");
-+ bool ekshell_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_ekshell_proxy");
- bool raudio_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_raudio_proxy");
- bool h323_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_h323_proxy");
- bool ipsec_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_ipsec_proxy");
-@@ -407,6 +409,8 @@
- char ipsec_proxy_str[64];
- char ftp_proxy_str[64];
- char rcmd_proxy_str[64];
-+ char krcmd_proxy_str[64];
-+ char ekshell_proxy_str[64];
- char raudio_proxy_str[64];
- char h323_proxy_str[64];
- char pptp_proxy_str[64];
-@@ -415,6 +419,8 @@
- sprintf(ipsec_proxy_str, "proxy port %d ipsec/udp ", ISAKMP_PORT);
- sprintf(ftp_proxy_str, "proxy port %d ftp/tcp ", FTP_PORT);
- sprintf(rcmd_proxy_str, "proxy port %d rcmd/tcp ", RCMD_PORT);
-+ sprintf(krcmd_proxy_str, "proxy port %d rcmd/tcp ", KRCMD_PORT);
-+ sprintf(ekshell_proxy_str,"proxy port %d rcmd/tcp ", EKSHELL_PORT);
- sprintf(raudio_proxy_str, "proxy port %d raudio/tcp ", RAUDIO_PORT);
- sprintf(h323_proxy_str, "proxy port %d h323/tcp ", H323_PORT);
- sprintf(pptp_proxy_str, "proxy port %d pptp/tcp ", PPTP_PORT);
-@@ -445,6 +451,14 @@
- s->getInt("dst_range_start")==RCMD_PORT && s->getInt("dst_range_end")==RCMD_PORT )
- rule->setStr("nat_rule_proxy",rcmd_proxy_str);
-
-+ if (krcmd_proxy &&
-+ s->getInt("dst_range_start")==KRCMD_PORT && s->getInt("dst_range_end")==KRCMD_PORT )
-+ rule->setStr("nat_rule_proxy",krcmd_proxy_str);
-+
-+ if (ekshell_proxy &&
-+ s->getInt("dst_range_start")==EKSHELL_PORT && s->getInt("dst_range_end")==EKSHELL_PORT )
-+ rule->setStr("nat_rule_proxy",ekshell_proxy_str);
-+
- if (raudio_proxy &&
- s->getInt("dst_range_start")==RAUDIO_PORT && s->getInt("dst_range_end")==RAUDIO_PORT )
- rule->setStr("nat_rule_proxy",raudio_proxy_str);
diff --git a/security/fwbuilder-devel/files/patch-src-pflib-NATCompiler_ipf.h b/security/fwbuilder-devel/files/patch-src-pflib-NATCompiler_ipf.h
deleted file mode 100644
index 2706197dd5d3..000000000000
--- a/security/fwbuilder-devel/files/patch-src-pflib-NATCompiler_ipf.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pflib/NATCompiler_ipf.h.orig 2006-05-16 16:00:17.000000000 -0700
-+++ src/pflib/NATCompiler_ipf.h 2007-09-19 10:33:40.000000000 -0700
-@@ -33,6 +33,8 @@
-
- #define FTP_PORT 21
- #define RCMD_PORT 514
-+#define KRCMD_PORT 544
-+#define EKSHELL_PORT 2106
- #define H323_PORT 1720
- #define RAUDIO_PORT 5050
- #define ISAKMP_PORT 500
diff --git a/security/fwbuilder-devel/pkg-descr b/security/fwbuilder-devel/pkg-descr
deleted file mode 100644
index 630225955878..000000000000
--- a/security/fwbuilder-devel/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-Firewall Builder consists of object-oriented GUI and set of policy compilers
-for various firewall platforms. In Firewall Builder, firewall policy is a set
-of rules, each rule consists of abstract objects which represent real network
-objects and services (hosts, routers, firewalls, networks, protocols).
-Firewall Builder helps user maintain database of objects and allows policy
-editing using simple drag-and-drop operations.
-
-Preferences and objects databases are stored in XML format.
-GUI and policy compilers are completely independent. Support for a new firewall
-platform can be added to GUI without any changes done to the program, although
-new policy compiler must be written. This provides for consistent abstract
-model and the same GUI for different firewall platforms. Currently three most
-popular free firewalls are supported: ipchains, iptables and ipfilter.
-Because of this, Firewall Builder can be used to manage firewalls built on
-variety of platforms including, but not limited to, Linux running ipchains or
-iptables and FreeBSD or Solaris running ipfilter.
-
-WWW: http://www.fwbuilder.org/
diff --git a/security/fwbuilder-devel/pkg-plist b/security/fwbuilder-devel/pkg-plist
deleted file mode 100644
index 6edbaf55394e..000000000000
--- a/security/fwbuilder-devel/pkg-plist
+++ /dev/null
@@ -1,69 +0,0 @@
-bin/fwb_ipf
-bin/fwb_ipfw
-bin/fwb_ipt
-bin/fwb_pf
-bin/fwbedit
-bin/fwblookup
-bin/fwbuilder
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/Credits
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/README.floppyfw
-%%DOCSDIR%%/README.iosacl
-%%DOCSDIR%%/README.ipf
-%%DOCSDIR%%/README.ipfw
-%%DOCSDIR%%/README.ipt
-%%DOCSDIR%%/README.pf
-%%DOCSDIR%%/README.policy_import
-%%DOCSDIR%%/README.routing
-%%DOCSDIR%%/FWBuilder-Routing-LICENSE.txt
-%%DOCSDIR%%/PatchAcceptancePolicy.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.7.html
-%%DOCSDIR%%/ReleaseNotes_2.1.7.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.8.html
-%%DOCSDIR%%/ReleaseNotes_2.1.8.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.9.html
-%%DOCSDIR%%/ReleaseNotes_2.1.9.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.10.html
-%%DOCSDIR%%/ReleaseNotes_2.1.10.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.11.html
-%%DOCSDIR%%/ReleaseNotes_2.1.11.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.12.html
-%%DOCSDIR%%/ReleaseNotes_2.1.12.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.13.html
-%%DOCSDIR%%/ReleaseNotes_2.1.13.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.14.html
-%%DOCSDIR%%/ReleaseNotes_2.1.14.txt
-share/fwbuilder%%BUILD_VERSION%%/objects_init.xml
-share/fwbuilder%%BUILD_VERSION%%/templates.xml
-share/fwbuilder%%BUILD_VERSION%%/resources.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/iosacl.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/iptables.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/ipf.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/pf.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/ipfw.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/fwsm.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/pix.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/unknown.xml
-share/fwbuilder%%BUILD_VERSION%%/os/ios.xml
-share/fwbuilder%%BUILD_VERSION%%/os/linux24.xml
-share/fwbuilder%%BUILD_VERSION%%/os/linksys.xml
-share/fwbuilder%%BUILD_VERSION%%/os/macosx.xml
-share/fwbuilder%%BUILD_VERSION%%/os/freebsd.xml
-share/fwbuilder%%BUILD_VERSION%%/os/openbsd.xml
-share/fwbuilder%%BUILD_VERSION%%/os/solaris.xml
-share/fwbuilder%%BUILD_VERSION%%/os/pix_os.xml
-share/fwbuilder%%BUILD_VERSION%%/os/fwsm_os.xml
-share/fwbuilder%%BUILD_VERSION%%/os/unknown_os.xml
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_de.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_es.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_fr.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_ja.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_ru.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_sv.qm
-@dirrm %%DOCSDIR%%
-@dirrm share/fwbuilder%%BUILD_VERSION%%/platform
-@dirrm share/fwbuilder%%BUILD_VERSION%%/os
-@dirrm share/fwbuilder%%BUILD_VERSION%%/locale
-@dirrm share/fwbuilder%%BUILD_VERSION%%
diff --git a/security/fwbuilder2/Makefile b/security/fwbuilder2/Makefile
deleted file mode 100644
index b6b6d5362d5e..000000000000
--- a/security/fwbuilder2/Makefile
+++ /dev/null
@@ -1,53 +0,0 @@
-# New ports collection makefile for: fwbuilder
-# Date Created: 3 Feb 2001
-# Whom: Roman Shterenzon <roman@xpert.com>
-#
-# $FreeBSD$
-#
-
-PORTNAME= fwbuilder
-PORTVERSION= 2.1.14
-PORTREVISION= 2
-CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}/fwbuilder/
-MASTER_SITE_SUBDIR= fwbuilder
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= Firewall Builder GUI and policy compilers
-
-BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS= fwbuilder.7:${PORTSDIR}/security/libfwbuilder
-
-BUILD_VERSION= 21
-PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
-USE_QT_VER= 3
-
-QTDIR?= ${QT_PREFIX}
-
-USE_OPENSSL= yes
-USE_GETOPT_LONG= yes
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-CONFIGURE_ARGS+= --with-docdir=${DOCSDIR} --with-qtdir=${QTDIR}
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAKE_ARGS+= QTDIR="${QTDIR}" \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-USE_LDCONFIG= yes
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-
-MAN1= fwbuilder.1 \
- fwblookup.1 \
- fwbedit.1 \
- fwb_ipt.1 \
- fwb_ipf.1 \
- fwb_ipfw.1 \
- fwb_pf.1
-
-.if !defined(NOPORTDOCS)
-PORTDOCS= *
-.endif
-
-.include <bsd.port.mk>
diff --git a/security/fwbuilder2/distinfo b/security/fwbuilder2/distinfo
deleted file mode 100644
index 4df51915481a..000000000000
--- a/security/fwbuilder2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (fwbuilder-2.1.14.tar.gz) = b0e41962b8deda7d0fdcaa632098199b
-SHA256 (fwbuilder-2.1.14.tar.gz) = a99d847699ed522b9a64124bf5dd3519a132613da72990ae9fb6ed2fa673d2e7
-SIZE (fwbuilder-2.1.14.tar.gz) = 1708015
diff --git a/security/fwbuilder2/files/patch-aa b/security/fwbuilder2/files/patch-aa
deleted file mode 100644
index 5a52a1a5bd17..000000000000
--- a/security/fwbuilder2/files/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
---- qmake.inc.in.linux 2006-06-22 08:36:05.000000000 -0700
-+++ qmake.inc.in 2006-06-22 08:36:27.000000000 -0700
-@@ -34,10 +34,8 @@
-
- PKGLOCALEDIR = $$res.path/locale
-
-- QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
-- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
-- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
-- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
-+ QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@
-+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
- }
- }
-
diff --git a/security/fwbuilder2/files/patch-src-gui-ipfAdvancedDialog.cpp b/security/fwbuilder2/files/patch-src-gui-ipfAdvancedDialog.cpp
deleted file mode 100644
index c53c042a7cb8..000000000000
--- a/security/fwbuilder2/files/patch-src-gui-ipfAdvancedDialog.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/ipfAdvancedDialog.cpp.orig 2007-01-06 14:03:25.000000000 -0800
-+++ src/gui/ipfAdvancedDialog.cpp 2007-09-19 11:29:47.000000000 -0700
-@@ -88,6 +88,8 @@
- data.registerOption( ipf_nat_irc_proxy ,fwopt, "ipf_nat_irc_proxy");
- data.registerOption( ipf_nat_ftp_proxy ,fwopt, "ipf_nat_ftp_proxy");
- data.registerOption( ipf_nat_rcmd_proxy ,fwopt, "ipf_nat_rcmd_proxy");
-+ data.registerOption( ipf_nat_krcmd_proxy ,fwopt, "ipf_nat_krcmd_proxy");
-+ data.registerOption( ipf_nat_ekshell_proxy ,fwopt, "ipf_nat_ekshell_proxy");
- data.registerOption( ipf_fw_dir ,fwopt, "firewall_dir" );
- data.registerOption( ipf_user ,fwopt, "admUser" );
- data.registerOption( altAddress ,fwopt, "altAddress" );
diff --git a/security/fwbuilder2/files/patch-src-gui-ipfadvanceddialog_q.ui b/security/fwbuilder2/files/patch-src-gui-ipfadvanceddialog_q.ui
deleted file mode 100644
index 2accf5daca84..000000000000
--- a/security/fwbuilder2/files/patch-src-gui-ipfadvanceddialog_q.ui
+++ /dev/null
@@ -1,72 +0,0 @@
---- src/gui/ipfadvanceddialog_q.ui.orig 2006-10-23 21:05:57.000000000 -0700
-+++ src/gui/ipfadvanceddialog_q.ui 2007-09-20 14:53:03.000000000 -0700
-@@ -118,7 +118,7 @@
- </size>
- </property>
- </spacer>
-- <widget class="QCheckBox" row="4" column="1">
-+ <widget class="QCheckBox" row="6" column="1">
- <property name="name">
- <cstring>ipf_nat_raudio_proxy</cstring>
- </property>
-@@ -126,7 +126,7 @@
- <string>Use raudio proxy in NAT rules</string>
- </property>
- </widget>
-- <widget class="QCheckBox" row="5" column="1">
-+ <widget class="QCheckBox" row="7" column="1">
- <property name="name">
- <cstring>ipf_nat_h323_proxy</cstring>
- </property>
-@@ -134,7 +134,7 @@
- <string>Use h323 proxy in NAT rules</string>
- </property>
- </widget>
-- <widget class="QCheckBox" row="6" column="1">
-+ <widget class="QCheckBox" row="8" column="1">
- <property name="name">
- <cstring>ipf_nat_ipsec_proxy</cstring>
- </property>
-@@ -175,7 +175,23 @@
- <string>Use rcmd proxy in NAT rules</string>
- </property>
- </widget>
-- <spacer row="9" column="1">
-+ <widget class="QCheckBox" row="4" column="1">
-+ <property name="name">
-+ <cstring>ipf_nat_krcmd_proxy</cstring>
-+ </property>
-+ <property name="text">
-+ <string>Use Kerberos rcmd proxy in NAT rules</string>
-+ </property>
-+ </widget>
-+ <widget class="QCheckBox" row="5" column="1">
-+ <property name="name">
-+ <cstring>ipf_nat_ekshell_proxy</cstring>
-+ </property>
-+ <property name="text">
-+ <string>Use Kerberos ekshell proxy in NAT rules</string>
-+ </property>
-+ </widget>
-+ <spacer row="11" column="1">
- <property name="name">
- <cstring>spacer36</cstring>
- </property>
-@@ -192,7 +208,7 @@
- </size>
- </property>
- </spacer>
-- <widget class="QCheckBox" row="7" column="1">
-+ <widget class="QCheckBox" row="9" column="1">
- <property name="name">
- <cstring>ipf_nat_pptp_proxy</cstring>
- </property>
-@@ -200,7 +216,7 @@
- <string>Use PPTP proxy in NAT rules</string>
- </property>
- </widget>
-- <widget class="QCheckBox" row="8" column="1">
-+ <widget class="QCheckBox" row="10" column="1">
- <property name="name">
- <cstring>ipf_nat_irc_proxy</cstring>
- </property>
diff --git a/security/fwbuilder2/files/patch-src-pflib-NATCompiler_ipf.cpp b/security/fwbuilder2/files/patch-src-pflib-NATCompiler_ipf.cpp
deleted file mode 100644
index c219847d030f..000000000000
--- a/security/fwbuilder2/files/patch-src-pflib-NATCompiler_ipf.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/pflib/NATCompiler_ipf.cpp.orig 2006-09-10 17:41:09.000000000 -0700
-+++ src/pflib/NATCompiler_ipf.cpp 2007-09-19 11:39:40.000000000 -0700
-@@ -398,6 +398,8 @@
-
- bool ftp_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_ftp_proxy");
- bool rcmd_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_rcmd_proxy");
-+ bool krcmd_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_krcmd_proxy");
-+ bool ekshell_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_ekshell_proxy");
- bool raudio_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_raudio_proxy");
- bool h323_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_h323_proxy");
- bool ipsec_proxy = compiler->getCachedFwOpt()->getBool("ipf_nat_ipsec_proxy");
-@@ -407,6 +409,8 @@
- char ipsec_proxy_str[64];
- char ftp_proxy_str[64];
- char rcmd_proxy_str[64];
-+ char krcmd_proxy_str[64];
-+ char ekshell_proxy_str[64];
- char raudio_proxy_str[64];
- char h323_proxy_str[64];
- char pptp_proxy_str[64];
-@@ -415,6 +419,8 @@
- sprintf(ipsec_proxy_str, "proxy port %d ipsec/udp ", ISAKMP_PORT);
- sprintf(ftp_proxy_str, "proxy port %d ftp/tcp ", FTP_PORT);
- sprintf(rcmd_proxy_str, "proxy port %d rcmd/tcp ", RCMD_PORT);
-+ sprintf(krcmd_proxy_str, "proxy port %d rcmd/tcp ", KRCMD_PORT);
-+ sprintf(ekshell_proxy_str,"proxy port %d rcmd/tcp ", EKSHELL_PORT);
- sprintf(raudio_proxy_str, "proxy port %d raudio/tcp ", RAUDIO_PORT);
- sprintf(h323_proxy_str, "proxy port %d h323/tcp ", H323_PORT);
- sprintf(pptp_proxy_str, "proxy port %d pptp/tcp ", PPTP_PORT);
-@@ -445,6 +451,14 @@
- s->getInt("dst_range_start")==RCMD_PORT && s->getInt("dst_range_end")==RCMD_PORT )
- rule->setStr("nat_rule_proxy",rcmd_proxy_str);
-
-+ if (krcmd_proxy &&
-+ s->getInt("dst_range_start")==KRCMD_PORT && s->getInt("dst_range_end")==KRCMD_PORT )
-+ rule->setStr("nat_rule_proxy",krcmd_proxy_str);
-+
-+ if (ekshell_proxy &&
-+ s->getInt("dst_range_start")==EKSHELL_PORT && s->getInt("dst_range_end")==EKSHELL_PORT )
-+ rule->setStr("nat_rule_proxy",ekshell_proxy_str);
-+
- if (raudio_proxy &&
- s->getInt("dst_range_start")==RAUDIO_PORT && s->getInt("dst_range_end")==RAUDIO_PORT )
- rule->setStr("nat_rule_proxy",raudio_proxy_str);
diff --git a/security/fwbuilder2/files/patch-src-pflib-NATCompiler_ipf.h b/security/fwbuilder2/files/patch-src-pflib-NATCompiler_ipf.h
deleted file mode 100644
index 2706197dd5d3..000000000000
--- a/security/fwbuilder2/files/patch-src-pflib-NATCompiler_ipf.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pflib/NATCompiler_ipf.h.orig 2006-05-16 16:00:17.000000000 -0700
-+++ src/pflib/NATCompiler_ipf.h 2007-09-19 10:33:40.000000000 -0700
-@@ -33,6 +33,8 @@
-
- #define FTP_PORT 21
- #define RCMD_PORT 514
-+#define KRCMD_PORT 544
-+#define EKSHELL_PORT 2106
- #define H323_PORT 1720
- #define RAUDIO_PORT 5050
- #define ISAKMP_PORT 500
diff --git a/security/fwbuilder2/pkg-descr b/security/fwbuilder2/pkg-descr
deleted file mode 100644
index 630225955878..000000000000
--- a/security/fwbuilder2/pkg-descr
+++ /dev/null
@@ -1,18 +0,0 @@
-Firewall Builder consists of object-oriented GUI and set of policy compilers
-for various firewall platforms. In Firewall Builder, firewall policy is a set
-of rules, each rule consists of abstract objects which represent real network
-objects and services (hosts, routers, firewalls, networks, protocols).
-Firewall Builder helps user maintain database of objects and allows policy
-editing using simple drag-and-drop operations.
-
-Preferences and objects databases are stored in XML format.
-GUI and policy compilers are completely independent. Support for a new firewall
-platform can be added to GUI without any changes done to the program, although
-new policy compiler must be written. This provides for consistent abstract
-model and the same GUI for different firewall platforms. Currently three most
-popular free firewalls are supported: ipchains, iptables and ipfilter.
-Because of this, Firewall Builder can be used to manage firewalls built on
-variety of platforms including, but not limited to, Linux running ipchains or
-iptables and FreeBSD or Solaris running ipfilter.
-
-WWW: http://www.fwbuilder.org/
diff --git a/security/fwbuilder2/pkg-plist b/security/fwbuilder2/pkg-plist
deleted file mode 100644
index 6edbaf55394e..000000000000
--- a/security/fwbuilder2/pkg-plist
+++ /dev/null
@@ -1,69 +0,0 @@
-bin/fwb_ipf
-bin/fwb_ipfw
-bin/fwb_ipt
-bin/fwb_pf
-bin/fwbedit
-bin/fwblookup
-bin/fwbuilder
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/Credits
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/README.floppyfw
-%%DOCSDIR%%/README.iosacl
-%%DOCSDIR%%/README.ipf
-%%DOCSDIR%%/README.ipfw
-%%DOCSDIR%%/README.ipt
-%%DOCSDIR%%/README.pf
-%%DOCSDIR%%/README.policy_import
-%%DOCSDIR%%/README.routing
-%%DOCSDIR%%/FWBuilder-Routing-LICENSE.txt
-%%DOCSDIR%%/PatchAcceptancePolicy.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.7.html
-%%DOCSDIR%%/ReleaseNotes_2.1.7.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.8.html
-%%DOCSDIR%%/ReleaseNotes_2.1.8.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.9.html
-%%DOCSDIR%%/ReleaseNotes_2.1.9.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.10.html
-%%DOCSDIR%%/ReleaseNotes_2.1.10.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.11.html
-%%DOCSDIR%%/ReleaseNotes_2.1.11.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.12.html
-%%DOCSDIR%%/ReleaseNotes_2.1.12.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.13.html
-%%DOCSDIR%%/ReleaseNotes_2.1.13.txt
-%%DOCSDIR%%/ReleaseNotes_2.1.14.html
-%%DOCSDIR%%/ReleaseNotes_2.1.14.txt
-share/fwbuilder%%BUILD_VERSION%%/objects_init.xml
-share/fwbuilder%%BUILD_VERSION%%/templates.xml
-share/fwbuilder%%BUILD_VERSION%%/resources.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/iosacl.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/iptables.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/ipf.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/pf.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/ipfw.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/fwsm.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/pix.xml
-share/fwbuilder%%BUILD_VERSION%%/platform/unknown.xml
-share/fwbuilder%%BUILD_VERSION%%/os/ios.xml
-share/fwbuilder%%BUILD_VERSION%%/os/linux24.xml
-share/fwbuilder%%BUILD_VERSION%%/os/linksys.xml
-share/fwbuilder%%BUILD_VERSION%%/os/macosx.xml
-share/fwbuilder%%BUILD_VERSION%%/os/freebsd.xml
-share/fwbuilder%%BUILD_VERSION%%/os/openbsd.xml
-share/fwbuilder%%BUILD_VERSION%%/os/solaris.xml
-share/fwbuilder%%BUILD_VERSION%%/os/pix_os.xml
-share/fwbuilder%%BUILD_VERSION%%/os/fwsm_os.xml
-share/fwbuilder%%BUILD_VERSION%%/os/unknown_os.xml
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_de.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_es.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_fr.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_ja.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_ru.qm
-share/fwbuilder%%BUILD_VERSION%%/locale/fwbuilder_sv.qm
-@dirrm %%DOCSDIR%%
-@dirrm share/fwbuilder%%BUILD_VERSION%%/platform
-@dirrm share/fwbuilder%%BUILD_VERSION%%/os
-@dirrm share/fwbuilder%%BUILD_VERSION%%/locale
-@dirrm share/fwbuilder%%BUILD_VERSION%%
diff --git a/security/kgpg-kde4/Makefile b/security/kgpg-kde4/Makefile
deleted file mode 100644
index d2a8b1c1613f..000000000000
--- a/security/kgpg-kde4/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# New ports collection makefile for: kdeutils3
-# Date created: 3 November 2001
-# Whom: will@cvs.kde.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= kdeutils
-PORTVERSION= ${KDE_VERSION}
-CATEGORIES?= misc kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
-DIST_SUBDIR= KDE
-
-MAINTAINER?= kde@FreeBSD.org
-COMMENT= Utilities for the KDE integrated X11 desktop
-
-LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \
- netsnmp:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
-
-CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]*
-
-USE_KDELIBS_VER=3
-USE_KDEBASE_VER=3
-PREFIX= ${KDE_PREFIX}
-
-USE_PYTHON= yes
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_GETOPT_LONG=yes
-USE_AUTOTOOLS= libtool:15
-DO_NOT_COMPILE+=klaptopdaemon kmilo
-CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE}
-
-USE_LDCONFIG= yes
-LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 501102
-. if ${OSVERSION} > 600021
-RUN_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar
-. endif
-post-patch:
- ${REINPLACE_CMD} -e 's|>tar<|>gtar<|g' ${WRKSRC}/ark/ark.kcfg
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo
deleted file mode 100644
index 5c3d382e1973..000000000000
--- a/security/kgpg-kde4/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (KDE/kdeutils-3.5.8.tar.bz2) = d1a0fcc83f35428a76cf7523a04ba19c
-SHA256 (KDE/kdeutils-3.5.8.tar.bz2) = 7dcbe3361cc53f9dac4c1bf6f45952d3d2518bec56cd8c07b8e07b4c4f12d0ac
-SIZE (KDE/kdeutils-3.5.8.tar.bz2) = 3059172
diff --git a/security/kgpg-kde4/files/patch-kdelirc_irkick-klircclient.cpp b/security/kgpg-kde4/files/patch-kdelirc_irkick-klircclient.cpp
deleted file mode 100644
index 76174cb1ed0d..000000000000
--- a/security/kgpg-kde4/files/patch-kdelirc_irkick-klircclient.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdelirc/irkick/klircclient.cpp.orig Sat Sep 10 10:21:34 2005
-+++ kdelirc/irkick/klircclient.cpp Mon Jun 5 16:16:51 2006
-@@ -55,15 +55,10 @@
-
- sockaddr_un addr;
- addr.sun_family = AF_UNIX;
-- strcpy(addr.sun_path, "/dev/lircd");
-+ strcpy(addr.sun_path, "/var/run/lirc/lircd");
- if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
- { ::close(sock);
-- // in case of mandrake...
-- strcpy(addr.sun_path, "/tmp/.lircd");
-- if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
-- { ::close(sock);
-- return false;
-- }
-+ return false;
- }
-
- theSocket = new QSocket;
diff --git a/security/kgpg-kde4/files/patch-ksim_monitors_filesystem-filesystemstats.cpp b/security/kgpg-kde4/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
deleted file mode 100644
index 7a29e570a1b7..000000000000
--- a/security/kgpg-kde4/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- ksim/monitors/filesystem/filesystemstats.cpp.orig 2007-10-08 11:49:45.000000000 +0200
-+++ ksim/monitors/filesystem/filesystemstats.cpp 2007-10-26 19:32:09.000000000 +0200
-@@ -30,7 +30,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
-
--#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__)
-+#ifdef HAVE_SYS_STATVFS_H
- #include <sys/statvfs.h>
- #elif defined( HAVE_SYS_STATFS_H )
- #include <sys/statfs.h>
-@@ -59,12 +59,10 @@
- #include <stdio.h>
- #include <unistd.h>
-
--#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
-+#ifdef HAVE_STATVFS
- typedef struct statvfs ksim_statfs;
--#define ksim_getfsstat getvfsstat
- #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
- typedef struct statfs ksim_statfs;
--#define ksim_getfsstat getfsstat
- #else
- typedef struct // fall back for (possibly) non-supported systems
- {
-@@ -75,7 +73,7 @@
-
- int fsystemStats( const char * file, ksim_statfs & stats )
- {
--#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
-+#ifdef HAVE_STATVFS
- return statvfs( file, &stats );
- #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
- return statfs( file, &stats );
-@@ -164,9 +162,9 @@
- #endif
-
- #ifdef USE_FSSTAT
-- ksim_statfs sfs[32];
-+ struct statfs sfs[32];
- int fs_count;
-- if ( ( fs_count = ksim_getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
-+ if ( ( fs_count = getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
- {
- for ( int i = 0; i < fs_count; i++ )
- {
diff --git a/security/kgpg-kde4/pkg-descr b/security/kgpg-kde4/pkg-descr
deleted file mode 100644
index 90ae45773bea..000000000000
--- a/security/kgpg-kde4/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-KDE provides an integrated X11 based environment, much like CDE.
diff --git a/security/kgpg-kde4/pkg-plist b/security/kgpg-kde4/pkg-plist
deleted file mode 100644
index 782d19b830c1..000000000000
--- a/security/kgpg-kde4/pkg-plist
+++ /dev/null
@@ -1,572 +0,0 @@
-bin/ark
-bin/irkick
-bin/kcalc
-bin/kcharselect
-bin/kdessh
-bin/kdf
-bin/kedit
-bin/kfloppy
-bin/kgpg
-bin/khexedit
-bin/kjots
-bin/kregexpeditor
-bin/ktimer
-bin/kwalletmanager
-bin/kwikdisk
-bin/superkaramba
-include/kmultiformlistbox.h
-include/kmultiformlistboxentry.h
-include/kmultiformlistboxfactory.h
-include/ksim/chart.h
-include/ksim/common.h
-include/ksim/ksimconfig.h
-include/ksim/label.h
-include/ksim/led.h
-include/ksim/pluginglobal.h
-include/ksim/pluginloader.h
-include/ksim/pluginmodule.h
-include/ksim/progress.h
-include/ksim/themeloader.h
-include/ksim/themetypes.h
-include/kwidgetstreamer.h
-lib/kde3/ark.a
-lib/kde3/ark.la
-lib/kde3/ark.so
-lib/kde3/irkick.a
-lib/kde3/irkick.la
-lib/kde3/irkick.so
-lib/kde3/kcalc.a
-lib/kde3/kcalc.la
-lib/kde3/kcalc.so
-lib/kde3/kcharselect_panelapplet.a
-lib/kde3/kcharselect_panelapplet.la
-lib/kde3/kcharselect_panelapplet.so
-lib/kde3/kcm_kcmlirc.a
-lib/kde3/kcm_kcmlirc.la
-lib/kde3/kcm_kcmlirc.so
-lib/kde3/kcm_kdf.a
-lib/kde3/kcm_kdf.la
-lib/kde3/kcm_kdf.so
-lib/kde3/kcm_kwallet.a
-lib/kde3/kcm_kwallet.la
-lib/kde3/kcm_kwallet.so
-lib/kde3/kedit.a
-lib/kde3/kedit.la
-lib/kde3/kedit.so
-lib/kde3/ksim_cpu.a
-lib/kde3/ksim_cpu.la
-lib/kde3/ksim_cpu.so
-lib/kde3/ksim_disk.a
-lib/kde3/ksim_disk.la
-lib/kde3/ksim_disk.so
-lib/kde3/ksim_filesystem.a
-lib/kde3/ksim_filesystem.la
-lib/kde3/ksim_filesystem.so
-lib/kde3/ksim_net.a
-lib/kde3/ksim_net.la
-lib/kde3/ksim_net.so
-lib/kde3/ksim_panelextension.a
-lib/kde3/ksim_panelextension.la
-lib/kde3/ksim_panelextension.so
-lib/kde3/ksim_sensors.a
-lib/kde3/ksim_sensors.la
-lib/kde3/ksim_sensors.so
-lib/kde3/ksim_snmp.a
-lib/kde3/ksim_snmp.la
-lib/kde3/ksim_snmp.so
-lib/kde3/libarkpart.a
-lib/kde3/libarkpart.la
-lib/kde3/libarkpart.so
-lib/kde3/libkbyteseditwidget.a
-lib/kde3/libkbyteseditwidget.la
-lib/kde3/libkbyteseditwidget.so
-lib/kde3/libkhexedit2part.a
-lib/kde3/libkhexedit2part.la
-lib/kde3/libkhexedit2part.so
-lib/kde3/libkregexpeditorgui.a
-lib/kde3/libkregexpeditorgui.la
-lib/kde3/libkregexpeditorgui.so
-lib/libkdeinit_ark.a
-lib/libkdeinit_ark.la
-lib/libkdeinit_ark.so
-lib/libkdeinit_irkick.a
-lib/libkdeinit_irkick.la
-lib/libkdeinit_irkick.so
-lib/libkdeinit_kcalc.a
-lib/libkdeinit_kcalc.la
-lib/libkdeinit_kcalc.so
-lib/libkdeinit_kedit.a
-lib/libkdeinit_kedit.la
-lib/libkdeinit_kedit.so
-lib/libkhexeditcommon.a
-lib/libkhexeditcommon.la
-lib/libkhexeditcommon.so
-lib/libkhexeditcommon.so.0
-lib/libkregexpeditorcommon.a
-lib/libkregexpeditorcommon.la
-lib/libkregexpeditorcommon.so
-lib/libkregexpeditorcommon.so.1
-lib/libksimcore.a
-lib/libksimcore.la
-lib/libksimcore.so
-lib/libksimcore.so.1
-share/applications/kde/KCharSelect.desktop
-share/applications/kde/KEdit.desktop
-share/applications/kde/KFloppy.desktop
-share/applications/kde/Kjots.desktop
-share/applications/kde/ark.desktop
-share/applications/kde/irkick.desktop
-share/applications/kde/kcalc.desktop
-share/applications/kde/kcmdf.desktop
-share/applications/kde/kcmlirc.desktop
-share/applications/kde/kdf.desktop
-share/applications/kde/kgpg.desktop
-share/applications/kde/khexedit.desktop
-share/applications/kde/kregexpeditor.desktop
-share/applications/kde/ktimer.desktop
-share/applications/kde/kwalletconfig.desktop
-share/applications/kde/kwalletmanager-kwalletd.desktop
-share/applications/kde/kwalletmanager.desktop
-share/applications/kde/kwikdisk.desktop
-share/applnk/Utilities/superkaramba.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/ark_part_readonly.rc
-share/apps/ark/arkui.rc
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_adddir.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_addfile.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_delete.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_extract.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_adddir.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_addfile.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_delete.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_extract.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_view.png
-share/apps/irkick/icons/hicolor/16x16/actions/irkick.png
-share/apps/irkick/icons/hicolor/16x16/actions/irkickflash.png
-share/apps/irkick/icons/hicolor/16x16/actions/irkickoff.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledblue.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledgreen.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledlightblue.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledlightgreen.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledorange.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledpurple.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledred.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledyellow.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledblue.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledgreen.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledlightblue.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledlightgreen.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledorange.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledred.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png
-share/apps/kcalc/kcalcui.rc
-share/apps/kcharselect/kcharselectui.rc
-share/apps/kconf_update/kcalcrc.upd
-share/apps/kconf_update/kcharselect.upd
-share/apps/kdf/kdfui.rc
-share/apps/kdf/pics/delete.png
-share/apps/kdf/pics/tick.png
-share/apps/kedit/keditui.rc
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key1.png
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key2.png
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key3.png
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key4.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_edit.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_export.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_gen.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_identity.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_import.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_info.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_photo.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_show.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_sign.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_term.png
-share/apps/kgpg/kgpg.rc
-share/apps/kgpg/listkeys.rc
-share/apps/kgpg/pics/kgpg_anim.gif
-share/apps/kgpg/pics/kgpg_blank.png
-share/apps/kgpg/pics/kgpg_docked.gif
-share/apps/kgpg/pics/kgpg_docked.png
-share/apps/kgpg/pics/kgpg_fill.png
-share/apps/kgpg/tips
-share/apps/khexedit/khexeditui.rc
-share/apps/khexedit/pics/hexdrag.png
-share/apps/khexedit/pics/hexmask.png
-share/apps/khexedit/pics/hexwrite.png
-share/apps/khexedit2part/khexedit2partui.rc
-share/apps/kicker/applets/kcharselectapplet.desktop
-share/apps/kicker/extensions/ksim.desktop
-share/apps/kjots/kjotsui.rc
-share/apps/kjots/pics/filedel.png
-share/apps/konqueror/servicemenus/encryptfile.desktop
-share/apps/konqueror/servicemenus/encryptfolder.desktop
-share/apps/konqueror/servicemenus/floppy_format.desktop
-share/apps/kregexpeditor/pics/altn.png
-share/apps/kregexpeditor/pics/anychar.png
-share/apps/kregexpeditor/pics/autoverify.png
-share/apps/kregexpeditor/pics/begline.png
-share/apps/kregexpeditor/pics/characters.png
-share/apps/kregexpeditor/pics/compound.png
-share/apps/kregexpeditor/pics/endline.png
-share/apps/kregexpeditor/pics/error.png
-share/apps/kregexpeditor/pics/neglookahead.png
-share/apps/kregexpeditor/pics/nonwordboundary.png
-share/apps/kregexpeditor/pics/poslookahead.png
-share/apps/kregexpeditor/pics/repeat.png
-share/apps/kregexpeditor/pics/select.png
-share/apps/kregexpeditor/pics/text.png
-share/apps/kregexpeditor/pics/verify.png
-share/apps/kregexpeditor/pics/wordboundary.png
-share/apps/kregexpeditor/predefined/general/anything.regexp
-share/apps/kregexpeditor/predefined/general/spaces.regexp
-share/apps/ksim/monitors/DFree.desktop
-share/apps/ksim/monitors/Lm_sensors.desktop
-share/apps/ksim/monitors/Net.desktop
-share/apps/ksim/monitors/Snmp.desktop
-share/apps/ksim/monitors/cpu.desktop
-share/apps/ksim/monitors/disk.desktop
-share/apps/ksim/pics/clock.png
-share/apps/ksim/pics/uptime.png
-share/apps/ksim/themes/ksim/bg_chart.png
-share/apps/ksim/themes/ksim/bg_grid.png
-share/apps/ksim/themes/ksim/bg_meter.png
-share/apps/ksim/themes/ksim/bg_panel.png
-share/apps/ksim/themes/ksim/frame_bottom.png
-share/apps/ksim/themes/ksim/frame_left.png
-share/apps/ksim/themes/ksim/frame_right.png
-share/apps/ksim/themes/ksim/frame_top.png
-share/apps/ksim/themes/ksim/gkrellmrc
-share/apps/ksim/themes/ksim/gkrellmrc_ksim
-share/apps/ksim/themes/ksim/host/bg_meter.png
-share/apps/ksim/themes/ksim/krell_meter.png
-share/apps/ksim/themes/ksim/krell_panel.png
-share/apps/ksim/themes/ksim/krell_slider.png
-share/apps/ksim/themes/ksim/mail/decal_mail.png
-share/apps/ksim/themes/ksim/mail/krell_mail.png
-share/apps/ksim/themes/ksim/mail/krell_mail_daemon.png
-share/apps/ksim/themes/ksim/net/decal_net_leds.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png
-share/apps/kwalletmanager/kwalleteditor.rc
-share/apps/kwalletmanager/kwalletmanager.rc
-share/apps/profiles/klauncher.profile.xml
-share/apps/profiles/konqueror.profile.xml
-share/apps/profiles/noatun.profile.xml
-share/apps/profiles/profile.dtd
-share/apps/remotes/RM-0010.remote.xml
-share/apps/remotes/cimr100.remote.xml
-share/apps/remotes/hauppauge.remote.xml
-share/apps/remotes/remote.dtd
-share/apps/remotes/sherwood.remote.xml
-share/apps/remotes/sonytv.remote.xml
-share/apps/superkaramba/superkarambaui.rc
-share/autostart/irkick.desktop
-share/autostart/kgpg.desktop
-share/config.kcfg/ark.kcfg
-share/config.kcfg/kcalc.kcfg
-share/config.kcfg/kedit.kcfg
-share/config.kcfg/kgpg.kcfg
-share/config.kcfg/kjots.kcfg
-share/config/ksim_panelextensionrc
-share/doc/HTML/en/KRegExpEditor/altn.png
-share/doc/HTML/en/KRegExpEditor/altntool.png
-share/doc/HTML/en/KRegExpEditor/anychar.png
-share/doc/HTML/en/KRegExpEditor/anychartool.png
-share/doc/HTML/en/KRegExpEditor/begline.png
-share/doc/HTML/en/KRegExpEditor/boundarytools.png
-share/doc/HTML/en/KRegExpEditor/characters.png
-share/doc/HTML/en/KRegExpEditor/charactertool.png
-share/doc/HTML/en/KRegExpEditor/common
-share/doc/HTML/en/KRegExpEditor/compound.png
-share/doc/HTML/en/KRegExpEditor/compoundtool.png
-share/doc/HTML/en/KRegExpEditor/endline.png
-share/doc/HTML/en/KRegExpEditor/index.cache.bz2
-share/doc/HTML/en/KRegExpEditor/index.docbook
-share/doc/HTML/en/KRegExpEditor/linestartendtool.png
-share/doc/HTML/en/KRegExpEditor/lookaheadtools.png
-share/doc/HTML/en/KRegExpEditor/neglookahead.png
-share/doc/HTML/en/KRegExpEditor/nonwordboundary.png
-share/doc/HTML/en/KRegExpEditor/poslookahead.png
-share/doc/HTML/en/KRegExpEditor/repeat.png
-share/doc/HTML/en/KRegExpEditor/repeattool.png
-share/doc/HTML/en/KRegExpEditor/select.png
-share/doc/HTML/en/KRegExpEditor/text.png
-share/doc/HTML/en/KRegExpEditor/texttool.png
-share/doc/HTML/en/KRegExpEditor/theEditor.png
-share/doc/HTML/en/KRegExpEditor/wordboundary.png
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/ark/man-ark.1.docbook
-share/doc/HTML/en/irkick/common
-share/doc/HTML/en/irkick/index.cache.bz2
-share/doc/HTML/en/irkick/index.docbook
-share/doc/HTML/en/kcalc/commands.docbook
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
-share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kcharselect/common
-share/doc/HTML/en/kcharselect/index.cache.bz2
-share/doc/HTML/en/kcharselect/index.docbook
-share/doc/HTML/en/kcmlirc/common
-share/doc/HTML/en/kcmlirc/index.cache.bz2
-share/doc/HTML/en/kcmlirc/index.docbook
-share/doc/HTML/en/kcontrol/kcmlowbatcrit/common
-share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
-share/doc/HTML/en/kcontrol/kcmlowbatwarn/common
-share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.docbook
-share/doc/HTML/en/kcontrol/laptop/common
-share/doc/HTML/en/kcontrol/laptop/index.cache.bz2
-share/doc/HTML/en/kcontrol/laptop/index.docbook
-share/doc/HTML/en/kcontrol/powerctrl/common
-share/doc/HTML/en/kcontrol/powerctrl/index.cache.bz2
-share/doc/HTML/en/kcontrol/powerctrl/index.docbook
-share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/index.cache.bz2
-share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/kdf.png
-share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kedit/common
-share/doc/HTML/en/kedit/index.cache.bz2
-share/doc/HTML/en/kedit/index.docbook
-share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/index.cache.bz2
-share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/kgpg/common
-share/doc/HTML/en/kgpg/editor.png
-share/doc/HTML/en/kgpg/index.cache.bz2
-share/doc/HTML/en/kgpg/index.docbook
-share/doc/HTML/en/kgpg/keygen.png
-share/doc/HTML/en/kgpg/keymanage.png
-share/doc/HTML/en/kgpg/keys.png
-share/doc/HTML/en/kgpg/kicker.png
-share/doc/HTML/en/kgpg/options.png
-share/doc/HTML/en/khexedit/common
-share/doc/HTML/en/khexedit/index.cache.bz2
-share/doc/HTML/en/khexedit/index.docbook
-share/doc/HTML/en/khexedit/khexedit1.png
-share/doc/HTML/en/kinfocenter/blockdevices/common
-share/doc/HTML/en/kinfocenter/blockdevices/index.cache.bz2
-share/doc/HTML/en/kinfocenter/blockdevices/index.docbook
-share/doc/HTML/en/kjots/common
-share/doc/HTML/en/kjots/index.cache.bz2
-share/doc/HTML/en/kjots/index.docbook
-share/doc/HTML/en/ksim/common
-share/doc/HTML/en/ksim/index.cache.bz2
-share/doc/HTML/en/ksim/index.docbook
-share/doc/HTML/en/ktimer/common
-share/doc/HTML/en/ktimer/index.cache.bz2
-share/doc/HTML/en/ktimer/index.docbook
-share/doc/HTML/en/kwallet/common
-share/doc/HTML/en/kwallet/cr22-action-wallet_closed.png
-share/doc/HTML/en/kwallet/cr22-action-wallet_open.png
-share/doc/HTML/en/kwallet/edit1.png
-share/doc/HTML/en/kwallet/edit2.png
-share/doc/HTML/en/kwallet/edit3.png
-share/doc/HTML/en/kwallet/index.cache.bz2
-share/doc/HTML/en/kwallet/index.docbook
-share/doc/HTML/en/kwallet/kwalletmanager.png
-share/doc/HTML/en/kwallet/password1.png
-share/doc/HTML/en/kwallet/password2.png
-share/doc/HTML/en/superkaramba/common
-share/doc/HTML/en/superkaramba/index.cache.bz2
-share/doc/HTML/en/superkaramba/index.docbook
-share/icons/crystalsvg/128x128/apps/superkaramba.png
-share/icons/crystalsvg/128x128/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/16x16/apps/kcmdf.png
-share/icons/crystalsvg/16x16/apps/ksim.png
-share/icons/crystalsvg/16x16/apps/superkaramba.png
-share/icons/crystalsvg/16x16/devices/ksim_cpu.png
-share/icons/crystalsvg/16x16/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/22x22/apps/kcmdf.png
-share/icons/crystalsvg/22x22/apps/superkaramba.png
-share/icons/crystalsvg/22x22/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/32x32/apps/kcmdf.png
-share/icons/crystalsvg/32x32/apps/ksim.png
-share/icons/crystalsvg/32x32/apps/superkaramba.png
-share/icons/crystalsvg/32x32/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/48x48/apps/ksim.png
-share/icons/crystalsvg/48x48/apps/superkaramba.png
-share/icons/crystalsvg/48x48/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/64x64/apps/superkaramba.png
-share/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/scalable/apps/superkaramba.svgz
-share/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
-share/icons/hicolor/128x128/apps/ark.png
-share/icons/hicolor/128x128/apps/kdf.png
-share/icons/hicolor/128x128/apps/kfloppy.png
-share/icons/hicolor/128x128/apps/kregexpeditor.png
-share/icons/hicolor/128x128/apps/ktimer.png
-share/icons/hicolor/128x128/apps/kwalletmanager.png
-share/icons/hicolor/128x128/apps/kwikdisk.png
-share/icons/hicolor/16x16/apps/ark.png
-share/icons/hicolor/16x16/apps/irkick.png
-share/icons/hicolor/16x16/apps/kcalc.png
-share/icons/hicolor/16x16/apps/kcharselect.png
-share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kedit.png
-share/icons/hicolor/16x16/apps/kfloppy.png
-share/icons/hicolor/16x16/apps/kgpg.png
-share/icons/hicolor/16x16/apps/khexedit.png
-share/icons/hicolor/16x16/apps/kjots.png
-share/icons/hicolor/16x16/apps/kregexpeditor.png
-share/icons/hicolor/16x16/apps/ktimer.png
-share/icons/hicolor/16x16/apps/kwalletmanager.png
-share/icons/hicolor/16x16/apps/kwikdisk.png
-share/icons/hicolor/22x22/apps/ark.png
-share/icons/hicolor/22x22/apps/irkick.png
-share/icons/hicolor/22x22/apps/kcalc.png
-share/icons/hicolor/22x22/apps/kdf.png
-share/icons/hicolor/22x22/apps/kedit.png
-share/icons/hicolor/22x22/apps/kfloppy.png
-share/icons/hicolor/22x22/apps/kgpg.png
-share/icons/hicolor/22x22/apps/kjots.png
-share/icons/hicolor/22x22/apps/kregexpeditor.png
-share/icons/hicolor/22x22/apps/kwalletmanager.png
-share/icons/hicolor/22x22/apps/kwikdisk.png
-share/icons/hicolor/32x32/apps/ark.png
-share/icons/hicolor/32x32/apps/irkick.png
-share/icons/hicolor/32x32/apps/kcalc.png
-share/icons/hicolor/32x32/apps/kcharselect.png
-share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kedit.png
-share/icons/hicolor/32x32/apps/kfloppy.png
-share/icons/hicolor/32x32/apps/kgpg.png
-share/icons/hicolor/32x32/apps/khexedit.png
-share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/kregexpeditor.png
-share/icons/hicolor/32x32/apps/ktimer.png
-share/icons/hicolor/32x32/apps/kwalletmanager.png
-share/icons/hicolor/32x32/apps/kwikdisk.png
-share/icons/hicolor/48x48/apps/ark.png
-share/icons/hicolor/48x48/apps/kcalc.png
-share/icons/hicolor/48x48/apps/kcharselect.png
-share/icons/hicolor/48x48/apps/kdf.png
-share/icons/hicolor/48x48/apps/kedit.png
-share/icons/hicolor/48x48/apps/kfloppy.png
-share/icons/hicolor/48x48/apps/kgpg.png
-share/icons/hicolor/48x48/apps/khexedit.png
-share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/kregexpeditor.png
-share/icons/hicolor/48x48/apps/ktimer.png
-share/icons/hicolor/48x48/apps/kwalletmanager.png
-share/icons/hicolor/48x48/apps/kwikdisk.png
-share/icons/hicolor/64x64/apps/ark.png
-share/icons/hicolor/64x64/apps/kcalc.png
-share/icons/hicolor/64x64/apps/kdf.png
-share/icons/hicolor/64x64/apps/kedit.png
-share/icons/hicolor/64x64/apps/kfloppy.png
-share/icons/hicolor/64x64/apps/kjots.png
-share/icons/hicolor/64x64/apps/kregexpeditor.png
-share/icons/hicolor/64x64/apps/kwalletmanager.png
-share/icons/hicolor/64x64/apps/kwikdisk.png
-share/icons/hicolor/scalable/apps/ark.svgz
-share/icons/hicolor/scalable/apps/kcalc.svgz
-share/icons/locolor/16x16/apps/irkick.png
-share/icons/locolor/32x32/apps/irkick.png
-share/mimelnk/application/x-superkaramba.desktop
-share/services/ark_part.desktop
-share/services/kbyteseditwidget.desktop
-share/services/khexedit2part.desktop
-share/services/kregexpeditorgui.desktop
-share/services/kwallet_config.desktop
-share/services/kwalletmanager_show.desktop
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
-@dirrm share/doc/HTML/en/superkaramba
-@dirrm share/doc/HTML/en/kwallet
-@dirrm share/doc/HTML/en/ktimer
-@dirrm share/doc/HTML/en/ksim
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/kinfocenter/blockdevices
-@dirrm share/doc/HTML/en/khexedit
-@dirrm share/doc/HTML/en/kgpg
-@dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kedit
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
-@dirrm share/doc/HTML/en/kdeutils-apidocs/superkaramba
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc
-@dirrm share/doc/HTML/en/kdeutils-apidocs
-@dirrm share/doc/HTML/en/kcontrol/powerctrl
-@dirrm share/doc/HTML/en/kcontrol/laptop
-@dirrm share/doc/HTML/en/kcontrol/kcmlowbatwarn
-@dirrm share/doc/HTML/en/kcontrol/kcmlowbatcrit
-@dirrm share/doc/HTML/en/kcmlirc
-@dirrm share/doc/HTML/en/kcharselect
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/irkick
-@dirrm share/doc/HTML/en/ark
-@dirrm share/doc/HTML/en/KRegExpEditor
-@dirrm share/apps/superkaramba
-@dirrm share/apps/remotes
-@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22
-@dirrm share/apps/kwalletmanager/icons/crystalsvg
-@dirrm share/apps/kwalletmanager/icons
-@dirrm share/apps/kwalletmanager
-@dirrm share/apps/ksim/themes/ksim/net
-@dirrm share/apps/ksim/themes/ksim/mail
-@dirrm share/apps/ksim/themes/ksim/host
-@dirrm share/apps/ksim/themes/ksim
-@dirrm share/apps/ksim/themes
-@dirrm share/apps/ksim/pics
-@dirrm share/apps/ksim/monitors
-@dirrm share/apps/ksim
-@dirrm share/apps/kregexpeditor/predefined/general
-@dirrm share/apps/kregexpeditor/predefined
-@dirrm share/apps/kregexpeditor/pics
-@dirrm share/apps/kregexpeditor
-@dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
-@dirrm share/apps/khexedit2part
-@dirrm share/apps/khexedit/pics
-@dirrm share/apps/khexedit
-@dirrm share/apps/kgpg/pics
-@dirrm share/apps/kgpg/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kgpg/icons/crystalsvg/22x22
-@dirrm share/apps/kgpg/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kgpg/icons/crystalsvg/16x16
-@dirrm share/apps/kgpg/icons/crystalsvg
-@dirrm share/apps/kgpg/icons
-@dirrm share/apps/kgpg
-@dirrm share/apps/kedit
-@dirrm share/apps/kdf/pics
-@dirrm share/apps/kdf
-@dirrm share/apps/kcharselect
-@dirrm share/apps/kcalc
-@dirrm share/apps/irkick/icons/hicolor/32x32/actions
-@dirrm share/apps/irkick/icons/hicolor/32x32
-@dirrm share/apps/irkick/icons/hicolor/16x16/actions
-@dirrm share/apps/irkick/icons/hicolor/16x16
-@dirrm share/apps/irkick/icons/hicolor
-@dirrm share/apps/irkick/icons
-@dirrm share/apps/irkick
-@dirrm share/apps/ark/icons/crystalsvg/32x32/actions
-@dirrm share/apps/ark/icons/crystalsvg/32x32
-@dirrm share/apps/ark/icons/crystalsvg/22x22/actions
-@dirrm share/apps/ark/icons/crystalsvg/22x22
-@dirrm share/apps/ark/icons/crystalsvg
-@dirrm share/apps/ark/icons
-@dirrm share/apps/ark
-@dirrm include/ksim
diff --git a/security/klamav/Makefile b/security/klamav/Makefile
index bbff033cdf96..fe44f76f0bf7 100644
--- a/security/klamav/Makefile
+++ b/security/klamav/Makefile
@@ -7,7 +7,7 @@
PORTNAME= klamav
PORTVERSION= 0.41
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= klamav
diff --git a/security/klamav/files/patch-src__klamd__scanner.c b/security/klamav/files/patch-src__klamd__scanner.c
new file mode 100644
index 000000000000..24c1360951cb
--- /dev/null
+++ b/security/klamav/files/patch-src__klamd__scanner.c
@@ -0,0 +1,11 @@
+--- src/klamd/scanner.c.orig 2007-12-19 08:33:50.000000000 -0200
++++ src/klamd/scanner.c 2007-12-19 08:36:04.000000000 -0200
+@@ -396,7 +396,7 @@
+
+ logg("*Accepted connection on port %d, fd %d\n", port, acceptd);
+
+- if ((tmpname = cli_gentempdesc(NULL, &tmpd)) == NULL) {
++ if (cli_gentempfd(NULL, &tmpname, &tmpd) ) {
+ shutdown(sockfd, 2);
+ close(sockfd);
+ close(acceptd);
diff --git a/security/klamav/files/patch-src__klamd__scanner.h b/security/klamav/files/patch-src__klamd__scanner.h
new file mode 100644
index 000000000000..18572cd1d383
--- /dev/null
+++ b/security/klamav/files/patch-src__klamd__scanner.h
@@ -0,0 +1,9 @@
+--- src/klamd/scanner.h.orig 2007-12-19 08:34:32.000000000 -0200
++++ src/klamd/scanner.h 2007-12-19 08:34:52.000000000 -0200
+@@ -33,4 +33,6 @@
+
+ int checksymlink(const char *path);
+
++extern int cli_gentempfd(const char *dir, char **name, int *fd);
++
+ #endif
diff --git a/security/krb5-16/Makefile b/security/krb5-16/Makefile
deleted file mode 100644
index cfa3cb616930..000000000000
--- a/security/krb5-16/Makefile
+++ /dev/null
@@ -1,143 +0,0 @@
-# Ports collection Makefile for: MIT Kerberos V
-# Date created: 6/5/1998
-# Whom: nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= krb5
-PORTVERSION= 1.6.3
-PORTREVISION= 3
-CATEGORIES= security
-MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-signed
-EXTRACT_SUFX= .tar
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= An authentication system developed at MIT, successor to Kerberos IV
-
-BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-
-BROKEN= fails to install
-
-CONFLICTS= krb4-[0-9]* heimdal-[0-9]* srp-[0-9]*
-
-LATEST_LINK= ${PORTNAME}
-KERBEROSV_URL= http://web.mit.edu/kerberos/
-USE_OPENSSL= yes
-USE_GMAKE= yes
-USE_PERL5_BUILD= yes
-USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
-CONFIGURE_ARGS?= --enable-shared
-# CONFIGURE_ARGS+= --disable-thread-support
-CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
- CFLAGS="${CFLAGS}"
-MAKE_ARGS= INSTALL="${INSTALL}"
-KRB5_KRB4_COMPAT?= NO
-KRB5_DOC?= YES
-
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES"
-BUILD_DEPENDS+= texi2dvi:${PORTSDIR}/print/texinfo \
- dvips:${PORTSDIR}/print/dvipsk-tetex
-INFO= krb425 krb5-admin krb5-install krb5-user
-.endif
-
-.if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO"
-CONFIGURE_ARGS+= --without-krb4
-PLIST_SUB+= KRB4="@comment "
-.else
-PLIST_SUB+= KRB4=""
-.endif
-
-.if defined(KRB5_HOME)
-PREFIX= ${KRB5_HOME}
-.endif
-
-MAN1= krb5-send-pr.1 krb5-config.1 kpasswd.1 klist.1 \
- kinit.1 kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 \
- rlogin.1 ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.1
-.if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
-MAN1+= krb524init.1 v4rcp.1
-.endif
-MAN5= kdc.conf.5 krb5.conf.5 .k5login.5
-MAN8= krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
- ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
- kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8 \
- k5srvutil.8
-.if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
-MAN8+= krb524d.8
-.endif
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-
-WANT_HTML?= YES
-HTML_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc
-HTML_DOCS= ftp.html kdestroy.html kinit.html klist.html \
- kpasswd.html krb425.html krb5-admin.html \
- krb5-install.html krb5-user.html ksu.html \
- rcp.html rlogin.html rsh.html telnet.html
-
-.include <bsd.port.pre.mk>
-
-.if defined(OPENSSL_INSTALLED)
-CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}"
-.endif
-
-post-extract:
- @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
- @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc
-.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
- @if [ `id -u` = 0 ]; then \
- ${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
- ${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
- fi
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e '1s,^#!\/usr\/athena/bin/perl,#!${PERL5},' \
- ${WRKSRC}/../doc/man2html
-
-pre-build:
-.if !defined(KRB5_KRB4_COMPAT)
- @${ECHO} "------------------------------------------------------"
- @${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build "
- @${ECHO} "the KerberosIV compatibility libraries. "
- @${ECHO} "------------------------------------------------------"
-.endif
-
-post-build:
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES"
- @cd ${WRKSRC}/../doc && \
- ${MAKE} all
-.endif
-
-post-install:
- @${MKDIR} ${PREFIX}/share/doc/krb5
-# html documentation
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES" && defined(WANT_HTML) && ${WANT_HTML} == "YES"
- for html in ${HTML_DOC_DIR}/*.html; do \
- ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \
- ${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \
- done
-.endif
- ${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
-# handle info files
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES"
-.for info in ${INFO}
- ${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info
-.endfor
-.endif
-
- @${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD
- @${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
- @${ECHO} "------------------------------------------------------"
- @${ECHO} "This port of MIT Kerberos 5 includes remote login "
- @${ECHO} "daemons (telnetd and klogind). These daemons default "
- @${ECHO} "to using the system login program (/usr/bin/login). "
- @${ECHO} "Please see the file "
- @${ECHO} "${PREFIX}/share/doc/krb5/README.FreeBSD"
- @${ECHO} "for more information. "
- @${ECHO} "------------------------------------------------------"
-
-.include <bsd.port.post.mk>
diff --git a/security/krb5-16/distinfo b/security/krb5-16/distinfo
deleted file mode 100644
index f9332216ac64..000000000000
--- a/security/krb5-16/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (krb5-1.6.3-signed.tar) = 2dc1307686eb1c2bf1ab08ea805dad46
-SHA256 (krb5-1.6.3-signed.tar) = 7a1bd7d4bd326828c8ee382ed2b69ccd6c58762601df897d6a32169d84583d2a
-SIZE (krb5-1.6.3-signed.tar) = 11909120
diff --git a/security/krb5-16/files/README.FreeBSD b/security/krb5-16/files/README.FreeBSD
deleted file mode 100644
index e888e689eb04..000000000000
--- a/security/krb5-16/files/README.FreeBSD
+++ /dev/null
@@ -1,32 +0,0 @@
-The MIT KRB5 port provides its own login program at
-${PREFIX}/sbin/login.krb5. However, login.krb5 does not make use of
-the FreeBSD login.conf and login.access files that provide a means of
-setting up and controlling sessions under FreeBSD. To overcome this,
-the MIT KRB5 port uses the FreeBSD /usr/bin/login program to provide
-interactive login password authentication instead of the login.krb5
-program provided by MIT KRB5. The FreeBSD /usr/bin/login program does
-not have support for Kerberos V password authentication,
-e.g. authentication at the console. The pam_krb5 port must be used to
-provide Kerberos V password authentication.
-
-For more information about pam_krb5, please see pam(8) and pam_krb5(8).
-
-If you wish to use login.krb5 that is provided by the MIT KRB5 port,
-the arguments "-L ${PREFIX}/sbin/login.krb5" must be
-specified as arguments to klogind and KRB5 telnetd, e.g.
-
-klogin stream tcp nowait root ${PREFIX}/sbin/klogind klogind -k -c -L ${PREFIX}/sbin/login.krb5
-eklogin stream tcp nowait root ${PREFIX}/sbin/klogind klogind -k -c -e -L ${PREFIX}/sbin/login.krb5
-telnet stream tcp nowait root ${PREFIX}/sbin/telnetd telnetd -a none -L ${PREFIX}/sbin/login.krb5
-
-Additionally, if you wish to use the MIT KRB5 provided login.krb5 instead
-of the FreeBSD provided /usr/bin/login for local tty logins,
-"lo=${PREFIX}/sbin/login.krb5" must be specified in /etc/gettytab, e.g.,
-
-default:\
- :cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\
- :if=/etc/issue:\
- :lo=${PREFIX}/sbin/login.krb5:
-
-It is recommended that the FreeBSD /usr/bin/login be used with the
-pam_krb5 port instead of the MIT KRB5 provided login.krb5.
diff --git a/security/krb5-16/files/patch-ac b/security/krb5-16/files/patch-ac
deleted file mode 100644
index 8bca5437d964..000000000000
--- a/security/krb5-16/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/admin.texinfo Fri Feb 6 21:40:56 1998
-+++ admin.texinfo Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-admin.info
- @settitle Kerberos V5 System Administrator's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Admin Guide: (krb5-admin). Kerberos V5 System Admin's Guide
-+@end direntry
- @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-16/files/patch-ad b/security/krb5-16/files/patch-ad
deleted file mode 100644
index c8b6d3e99e91..000000000000
--- a/security/krb5-16/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/user-guide.texinfo Fri Feb 6 21:40:58 1998
-+++ user-guide.texinfo Fri Jun 19 15:13:45 1998
-@@ -3,6 +3,10 @@
- @c guide
- @setfilename krb5-user.info
- @settitle Kerberos V5 UNIX User's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* User's Guide: (krb5-user). Kerberos V5 UNIX User's Guide
-+@end direntry
- @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-16/files/patch-ae b/security/krb5-16/files/patch-ae
deleted file mode 100644
index f5643b5aa04f..000000000000
--- a/security/krb5-16/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/install.texinfo Fri Feb 6 21:40:56 1998
-+++ install.texinfo Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-install.info
- @settitle Kerberos V5 Installation Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Installation Guide: (krb5-install). Kerberos V5 Installation Guide
-+@end direntry
- @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-16/files/patch-af b/security/krb5-16/files/patch-af
deleted file mode 100644
index 49425d6efceb..000000000000
--- a/security/krb5-16/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/krb425.texinfo Fri Feb 6 21:40:57 1998
-+++ krb425.texinfo Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb425.info
- @settitle Upgrading to Kerberos V5 from Kerberos V4
-+@dircategory Kerberos V5
-+@direntry
-+* Upgrading from V4 to V5: (krb425). Upgrading from Kerberos V4 to V5
-+@end direntry
- @c @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-16/files/patch-ai b/security/krb5-16/files/patch-ai
deleted file mode 100644
index f5b733194344..000000000000
--- a/security/krb5-16/files/patch-ai
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/gssftp/ftpd/ftpd.c.orig Wed Jan 9 14:26:51 2002
-+++ appl/gssftp/ftpd/ftpd.c Thu Jan 10 19:00:13 2002
-@@ -487,7 +487,13 @@
- #ifndef LOG_DAEMON
- #define LOG_DAEMON 0
- #endif
-- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON);
-+
-+#ifndef LOG_FTP
-+#define FACILITY LOG_DAEMON
-+#else
-+#define FACILITY LOG_FTP
-+#endif
-+ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY);
-
- addrlen = sizeof (his_addr);
- if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
-@@ -2312,6 +2318,10 @@
- if ((length = krb_mk_safe((u_char *)&cksum, out_buf, sizeof(cksum),
- &kdata.session,&ctrl_addr, &his_addr)) == -1) {
- secure_error("ADAT: krb_mk_safe failed");
-+ return(0);
-+ }
-+ if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
-+ secure_error("ADAT: reply too long");
- return(0);
- }
- if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
diff --git a/security/krb5-16/files/patch-aj b/security/krb5-16/files/patch-aj
deleted file mode 100644
index c3bb8dfd6960..000000000000
--- a/security/krb5-16/files/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-*** appl/gssftp/ftpd/logwtmp.c.ORIG Fri Feb 6 19:41:25 1998
---- appl/gssftp/ftpd/logwtmp.c Tue Jun 30 19:46:01 1998
-***************
-*** 66,72 ****
- struct stat buf;
- time_t time();
-
-! if (fd < 0 && (fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0)
- return;
- if (fstat(fd, &buf) == 0) {
- (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
---- 66,72 ----
- struct stat buf;
- time_t time();
-
-! if (fd < 0 && (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0)
- return;
- if (fstat(fd, &buf) == 0) {
- (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
diff --git a/security/krb5-16/files/patch-appl::bsd::Makefile.in b/security/krb5-16/files/patch-appl::bsd::Makefile.in
deleted file mode 100644
index 581048933264..000000000000
--- a/security/krb5-16/files/patch-appl::bsd::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- appl/bsd/Makefile.in.orig Wed Feb 28 14:06:43 2001
-+++ appl/bsd/Makefile.in Mon Dec 31 21:52:45 2001
-@@ -31,8 +31,8 @@
- -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\"
-
- DEFINES = $(RSH) $(BSD) $(RPROGS) -DKERBEROS \
-- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \
-+ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \
- -DHEIMDAL_FRIENDLY
-
- all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP)
-
diff --git a/security/krb5-16/files/patch-appl::bsd::klogind.M b/security/krb5-16/files/patch-appl::bsd::klogind.M
deleted file mode 100644
index 9cddd5fc222d..000000000000
--- a/security/krb5-16/files/patch-appl::bsd::klogind.M
+++ /dev/null
@@ -1,35 +0,0 @@
---- appl/bsd/klogind.M.orig Wed Feb 28 14:06:43 2001
-+++ appl/bsd/klogind.M Mon Dec 31 21:22:27 2001
-@@ -14,7 +14,7 @@
- .B \-kr54cpPef
- ]
- [[ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP ]] ]
--[ \fB\-D\fP \fIport\fP ]
-+[ \fB\-D\fP \fIport\fP ] [\fB\-L\fP \fIloginpath\fP]
- .SH DESCRIPTION
- .I Klogind
- is the server for the
-@@ -107,6 +108,10 @@
- Beta5 (May 1995)--present bogus checksums that prevent Kerberos
- authentication from succeeding in the default mode.
-
-+.IP \fB\-L\ loginpath\fP
-+Specify pathname to an alternative login program. Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
-+
-
- .PP
- If the
-@@ -157,12 +162,6 @@
-
- .IP \fB\-M\ realm\fP
- Set the Kerberos realm to use.
--
--.IP \fB\-L\ login\fP
--Set the login program to use. This option only has an effect if
--DO_NOT_USE_K_LOGIN was not defined when
--.I klogind
--was compiled.
-
- .IP \fB\-D\ port\fP
- Run in standalone mode, listening on \fBport\fP. The daemon will exit
diff --git a/security/krb5-16/files/patch-appl::gssftp::ftp::ftp_var.h b/security/krb5-16/files/patch-appl::gssftp::ftp::ftp_var.h
deleted file mode 100644
index 256e929aa68f..000000000000
--- a/security/krb5-16/files/patch-appl::gssftp::ftp::ftp_var.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- appl/gssftp/ftp/ftp_var.h.orig Tue Jun 17 02:37:40 2003
-+++ appl/gssftp/ftp/ftp_var.h Sat Aug 30 05:30:44 2003
-@@ -33,6 +33,10 @@
- * @(#)ftp_var.h 5.9 (Berkeley) 6/1/90
- */
-
-+#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version > 500000
-+#undef __BSD_VISIBLE
-+#endif
-+
- #ifdef _WIN32
- #include <windows.h>
- #include <winsock2.h>
-@@ -57,9 +61,7 @@
- typedef void (*sig_t)(int);
- typedef void sigtype;
- #else
--#define sig_t my_sig_t
- #define sigtype krb5_sigtype
--typedef sigtype (*sig_t)();
- #endif
-
- /*
diff --git a/security/krb5-16/files/patch-appl::telnet::telnetd::Makefile.in b/security/krb5-16/files/patch-appl::telnet::telnetd::Makefile.in
deleted file mode 100644
index cb5a0e26d49d..000000000000
--- a/security/krb5-16/files/patch-appl::telnet::telnetd::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- appl/telnet/telnetd/Makefile.in.orig Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/Makefile.in Mon Dec 31 21:51:19 2001
-@@ -24,7 +24,7 @@
- # @(#)Makefile.generic 5.5 (Berkeley) 3/1/91
- #
-
--AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
-+AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"/usr/bin/login\"
- OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
- LOCALINCLUDES=-I.. -I$(srcdir)/..
- DEFINES = $(AUTH_DEF) $(OTHERDEFS)
diff --git a/security/krb5-16/files/patch-appl::telnet::telnetd::telnetd.8 b/security/krb5-16/files/patch-appl::telnet::telnetd::telnetd.8
deleted file mode 100644
index 951ee0d5692a..000000000000
--- a/security/krb5-16/files/patch-appl::telnet::telnetd::telnetd.8
+++ /dev/null
@@ -1,22 +0,0 @@
---- appl/telnet/telnetd/telnetd.8.orig Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/telnetd.8 Mon Dec 31 21:16:55 2001
-@@ -43,7 +43,7 @@
- [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
- [\fB\-S\fP \fItos\fP] [\fB\-U\fP] [\fB\-X\fP \fIauthtype\fP]
- [\fB\-w\fP [\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]]]
--[\fB\-debug\fP [\fIport\fP]]
-+[\fB\-debug\fP] [\fB\-L\fP \fIloginpath\fP] [\fIport\fP]
- .SH DESCRIPTION
- The
- .B telnetd
-@@ -221,6 +221,10 @@
- in response to a
- .SM DO TIMING-MARK)
- for kludge linemode support.
-+.TP
-+\fB\-L\fP \fIloginpath\fP
-+Specify pathname to an alternative login program. Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
- .TP
- .B \-l
- Specifies line mode. Tries to force clients to use line-at-a-time
diff --git a/security/krb5-16/files/patch-appl::telnet::telnetd::utility.c b/security/krb5-16/files/patch-appl::telnet::telnetd::utility.c
deleted file mode 100644
index 8bb656dc0673..000000000000
--- a/security/krb5-16/files/patch-appl::telnet::telnetd::utility.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- appl/telnet/telnetd/utility.c.orig Wed Jan 9 14:26:59 2002
-+++ appl/telnet/telnetd/utility.c Fri Jan 11 13:10:33 2002
-@@ -408,18 +408,25 @@
- int
- netwrite(const char *buf, size_t len)
- {
-- size_t remain;
-+ int remaining, copied;
-+
-+ remaining = BUFSIZ - (nfrontp - netobuf);
-+ while (len > 0) {
-+ /* Free up enough space if the room is too low*/
-+ if ((len > BUFSIZ ? BUFSIZ : len) > remaining) {
-+ netflush();
-+ remaining = BUFSIZ - (nfrontp - netobuf);
-+ }
-
-- remain = sizeof(netobuf) - (nfrontp - netobuf);
-- if (remain < len) {
-- netflush();
-- remain = sizeof(netobuf) - (nfrontp - netobuf);
-+ /* Copy out as much as will fit */
-+ copied = remaining > len ? len : remaining;
-+ memmove(nfrontp, buf, copied);
-+ nfrontp += copied;
-+ len -= copied;
-+ remaining -= copied;
-+ buf += copied;
- }
-- if (remain < len)
-- return 0;
-- memcpy(nfrontp, buf, len);
-- nfrontp += len;
-- return len;
-+ return copied;
- }
-
- /*
diff --git a/security/krb5-16/files/patch-as b/security/krb5-16/files/patch-as
deleted file mode 100644
index de19886eac08..000000000000
--- a/security/krb5-16/files/patch-as
+++ /dev/null
@@ -1,195 +0,0 @@
---- clients/ksu/main.c.orig Wed Aug 14 12:14:49 2002
-+++ clients/ksu/main.c Tue Jul 29 18:46:00 2003
-@@ -32,6 +32,10 @@
- #include <signal.h>
- #include <grp.h>
-
-+#ifdef LOGIN_CAP
-+#include <login_cap.h>
-+#endif
-+
- /* globals */
- char * prog_name;
- int auth_debug =0;
-@@ -61,7 +65,7 @@
- ill specified arguments to commands */
-
- void usage (){
-- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
-+ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
- }
-
- /* for Ultrix and friends ... */
-@@ -77,6 +81,7 @@
- int argc;
- char ** argv;
- {
-+ int asme = 0;
- int hp =0;
- int some_rest_copy = 0;
- int all_rest_copy = 0;
-@@ -91,6 +96,7 @@
- char * cc_target_tag = NULL;
- char * target_user = NULL;
- char * source_user;
-+ char * source_shell;
-
- krb5_ccache cc_source = NULL;
- const char * cc_source_tag = NULL;
-@@ -117,6 +123,11 @@
- krb5_principal kdc_server;
- krb5_boolean zero_password;
- char * dir_of_cc_target;
-+
-+#ifdef LOGIN_CAP
-+ login_cap_t *lc;
-+ int setwhat;
-+#endif
-
- options.opt = KRB5_DEFAULT_OPTIONS;
- options.lifetime = KRB5_DEFAULT_TKT_LIFE;
-@@ -181,7 +192,7 @@
- com_err (prog_name, errno, "while setting euid to source user");
- exit (1);
- }
-- while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkql:e:")) != -1)){
-+ while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkmql:e:")) != -1)){
- switch (option) {
- case 'r':
- options.opt |= KDC_OPT_RENEWABLE;
-@@ -227,6 +238,9 @@
- errflg++;
- }
- break;
-+ case 'm':
-+ asme = 1;
-+ break;
- case 'n':
- if ((retval = krb5_parse_name(ksu_context, optarg, &client))){
- com_err(prog_name, retval, "when parsing name %s", optarg);
-@@ -341,6 +355,7 @@
-
- /* allocate space and copy the usernamane there */
- source_user = xstrdup(pwd->pw_name);
-+ source_shell = xstrdup(pwd->pw_shell);
- source_uid = pwd->pw_uid;
- source_gid = pwd->pw_gid;
-
-@@ -672,43 +687,64 @@
- /* get the shell of the user, this will be the shell used by su */
- target_pwd = getpwnam(target_user);
-
-- if (target_pwd->pw_shell)
-- shell = xstrdup(target_pwd->pw_shell);
-- else {
-- shell = _DEF_CSH; /* default is cshell */
-+ if (asme) {
-+ if (source_shell && *source_shell) {
-+ shell = strdup(source_shell);
-+ } else {
-+ shell = _DEF_CSH;
-+ }
-+ } else {
-+ if (target_pwd->pw_shell)
-+ shell = strdup(target_pwd->pw_shell);
-+ else {
-+ shell = _DEF_CSH; /* default is cshell */
-+ }
- }
-
- #ifdef HAVE_GETUSERSHELL
-
- /* insist that the target login uses a standard shell (root is omited) */
-
-- if (!standard_shell(target_pwd->pw_shell) && source_uid) {
-- fprintf(stderr, "ksu: permission denied (shell).\n");
-- sweep_up(ksu_context, cc_target);
-- exit(1);
-+ if (asme) {
-+ if (!standard_shell(pwd->pw_shell) && source_uid) {
-+ fprintf(stderr, "ksu: permission denied (shell).\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
-+ } else {
-+ if (!standard_shell(target_pwd->pw_shell) && source_uid) {
-+ fprintf(stderr, "ksu: permission denied (shell).\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
- }
- #endif /* HAVE_GETUSERSHELL */
-
-- if (target_pwd->pw_uid){
--
-- if(set_env_var("USER", target_pwd->pw_name)){
-+ if (!asme) {
-+ if (target_pwd->pw_uid){
-+ if (set_env_var("USER", target_pwd->pw_name)){
-+ fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
-+ }
-+
-+ if (set_env_var( "HOME", target_pwd->pw_dir)){
- fprintf(stderr,"ksu: couldn't set environment variable USER\n");
- sweep_up(ksu_context, cc_target);
- exit(1);
-- }
-- }
--
-- if(set_env_var( "HOME", target_pwd->pw_dir)){
-- fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-- sweep_up(ksu_context, cc_target);
-- exit(1);
-- }
-+ }
-
-- if(set_env_var( "SHELL", shell)){
-- fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-- sweep_up(ksu_context, cc_target);
-- exit(1);
-- }
-+ if (set_env_var( "SHELL", shell)){
-+ fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
-+ }
-+
-+#ifdef LOGIN_CAP
-+ lc = login_getpwclass(pwd);
-+#endif
-
- /* set the cc env name to target */
-
-@@ -718,7 +754,19 @@
- sweep_up(ksu_context, cc_target);
- exit(1);
- }
--
-+
-+#ifdef LOGIN_CAP
-+ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY;
-+ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV;
-+ /*
-+ * Don't touch resource/priority settings if -m has been
-+ * used or -l and -c hasn't, and we're not su'ing to root.
-+ */
-+ if (target_pwd->pw_uid)
-+ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES);
-+ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0)
-+ err(1, "setusercontext");
-+#else
- /* set permissions */
- if (setgid(target_pwd->pw_gid) < 0) {
- perror("ksu: setgid");
-@@ -759,6 +807,7 @@
- sweep_up(ksu_context, cc_target);
- exit(1);
- }
-+#endif
-
- if (access( cc_target_tag_tmp, R_OK | W_OK )){
- com_err(prog_name, errno,
diff --git a/security/krb5-16/files/patch-at b/security/krb5-16/files/patch-at
deleted file mode 100644
index 060207ec644a..000000000000
--- a/security/krb5-16/files/patch-at
+++ /dev/null
@@ -1,14 +0,0 @@
-*** include/syslog.h.ORIG Fri Feb 6 19:42:12 1998
---- include/syslog.h Tue Jun 30 19:46:02 1998
-***************
-*** 34,39 ****
---- 34,42 ----
- #define LOG_LPR (6<<3) /* line printer subsystem */
- #define LOG_NEWS (7<<3) /* network news subsystem */
- #define LOG_UUCP (8<<3) /* UUCP subsystem */
-+ #if (defined(BSD) && (BSD >= 199306))
-+ #define LOG_FTP (11<<3) /* ftp daemon */
-+ #endif
- /* other codes through 15 reserved for system use */
- #define LOG_LOCAL0 (16<<3) /* reserved for local use */
- #define LOG_LOCAL1 (17<<3) /* reserved for local use */
diff --git a/security/krb5-16/files/patch-av b/security/krb5-16/files/patch-av
deleted file mode 100644
index 8363b8bb1e2d..000000000000
--- a/security/krb5-16/files/patch-av
+++ /dev/null
@@ -1,15 +0,0 @@
-*** clients/ksu/Makefile.in.ORIG Sun Aug 2 16:51:18 1998
---- clients/ksu/Makefile.in Sun Aug 2 16:53:48 1998
-***************
-*** 3,7 ****
- mydir=ksu
- BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
- CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-
---- 3,7 ----
- mydir=ksu
- BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"'
- CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-
diff --git a/security/krb5-16/files/patch-ax b/security/krb5-16/files/patch-ax
deleted file mode 100644
index 6cbb8289f93e..000000000000
--- a/security/krb5-16/files/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/Makefile.orig 2007-09-17 20:36:09.000000000 -0700
-+++ ../doc/Makefile 2007-10-25 14:04:48.000000000 -0700
-@@ -1,8 +1,8 @@
- SRCDIR=../src
--DVI=texi2dvi4a2ps # texi2dvi
-+DVI=texi2dvi # texi2dvi
- DVIPS=dvips -o "$@"
- PSPDF=ps2pdf
--INFO=makeinfo
-+INFO=makeinfo --no-validate --no-split
- HTML=makeinfo --html --no-split
- RM=rm -f
- TAR=tar -chvf
diff --git a/security/krb5-16/files/patch-ay b/security/krb5-16/files/patch-ay
deleted file mode 100644
index a6cb9ebbfd13..000000000000
--- a/security/krb5-16/files/patch-ay
+++ /dev/null
@@ -1,50 +0,0 @@
---- appl/libpty/getpty.c.orig Wed Jan 9 14:28:37 2002
-+++ appl/libpty/getpty.c Thu Jan 10 21:30:40 2002
-@@ -24,13 +24,26 @@
- #include "libpty.h"
- #include "pty-int.h"
-
-+#ifdef __FreeBSD__
-+#define PTYCHARS1 "pqrsPQRS"
-+#define PTYCHARS2 "0123456789abcdefghijklmnopqrstuv"
-+#endif
-+
-+#ifndef PTYCHARS1
-+#define PTYCHARS1 "pqrstuvwxyzPQRST"
-+#endif
-+
-+#ifndef PTYCHARS2
-+#define PTYCHARS2 "0123456789abcdef"
-+#endif
-+
- long
- ptyint_getpty_ext(int *fd, char *slave, int slavelength, int do_grantpt)
- {
-+ int ptynum;
-+ char *cp1, *cp2;
- #if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY)
-- char *cp;
- char *p;
-- int i,ptynum;
- struct stat stb;
- char slavebuf[1024];
- #endif
-@@ -115,14 +128,14 @@
- strncpy(slave, slavebuf, slavelength);
- return 0;
- } else {
-- for (cp = "pqrstuvwxyzPQRST";*cp; cp++) {
-+ for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) {
- sprintf(slavebuf,"/dev/ptyXX");
-- slavebuf[sizeof("/dev/pty") - 1] = *cp;
-+ slavebuf[sizeof("/dev/pty") - 1] = *cp1;
- slavebuf[sizeof("/dev/ptyp") - 1] = '0';
- if (stat(slavebuf, &stb) < 0)
- break;
-- for (i = 0; i < 16; i++) {
-- slavebuf[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i];
-+ for (cp2 = PTYCHARS2; *cp2 != '\0'; cp2++) {
-+ slavebuf[sizeof("/dev/ptyp") - 1] = *cp2;
- *fd = open(slavebuf, O_RDWR);
- if (*fd < 0) continue;
-
diff --git a/security/krb5-16/files/patch-ba b/security/krb5-16/files/patch-ba
deleted file mode 100644
index dd0c760df7d2..000000000000
--- a/security/krb5-16/files/patch-ba
+++ /dev/null
@@ -1,77 +0,0 @@
---- appl/bsd/login.c.orig Tue May 27 21:06:25 2003
-+++ appl/bsd/login.c Tue Jul 29 20:52:25 2003
-@@ -1342,19 +1342,6 @@
- setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
- }
-
-- /* Policy: If local password is good, user is good.
-- We really can't trust the Kerberos password,
-- because somebody on the net could spoof the
-- Kerberos server (not easy, but possible).
-- Some sites might want to use it anyways, in
-- which case they should change this line
-- to:
-- if (kpass_ok)
-- */
--
-- if (lpass_ok)
-- break;
--
- if (got_v5_tickets) {
- retval = krb5_verify_init_creds(kcontext, &my_creds, NULL,
- NULL, &xtra_creds,
-@@ -1378,6 +1365,9 @@
- }
- #endif /* KRB4_GET_TICKETS */
-
-+ if (lpass_ok)
-+ break;
-+
- bad_login:
- setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
-
-@@ -1667,21 +1657,23 @@
- /* set up credential cache -- obeying KRB5_ENV_CCNAME
- set earlier */
- /* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */
-- if ((retval = krb5_cc_default(kcontext, &ccache))) {
-+ if ((retval = krb5_cc_default(kcontext, &ccache)))
- com_err(argv[0], retval, "while getting default ccache");
-- } else if ((retval = krb5_cc_initialize(kcontext, ccache, me))) {
-- com_err(argv[0], retval, "when initializing cache");
-- } else if ((retval = krb5_cc_store_cred(kcontext, ccache,
-- &my_creds))) {
-- com_err(argv[0], retval, "while storing credentials");
-- } else if (xtra_creds &&
-- (retval = krb5_cc_copy_creds(kcontext, xtra_creds,
-- ccache))) {
-- com_err(argv[0], retval, "while storing credentials");
-+ else {
-+ if (retval = krb5_cc_initialize(kcontext, ccache, me))
-+ com_err(argv[0], retval, "when initializing cache");
-+ else {
-+ if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds))
-+ com_err(argv[0], retval, "while storing credentials");
-+ else {
-+ if (xtra_creds &&
-+ (retval = krb5_cc_copy_creds(kcontext, xtra_creds, ccache))) {
-+ com_err(argv[0], retval, "while storing credentials");
-+ krb5_cc_destroy(kcontext, xtra_creds);
-+ }
-+ }
-+ }
- }
--
-- if (xtra_creds)
-- krb5_cc_destroy(kcontext, xtra_creds);
- } else if (forwarded_v5_tickets && rewrite_ccache) {
- if ((retval = krb5_cc_initialize (kcontext, ccache, me))) {
- syslog(LOG_ERR,
-@@ -1762,6 +1754,7 @@
-
- if (ccname)
- setenv("KRB5CCNAME", ccname, 1);
-+ krb5_cc_set_default_name(kcontext, ccname);
-
- setenv("HOME", pwd->pw_dir, 1);
- setenv("PATH", LPATH, 1);
diff --git a/security/krb5-16/files/patch-bb b/security/krb5-16/files/patch-bb
deleted file mode 100644
index 6545ae682c53..000000000000
--- a/security/krb5-16/files/patch-bb
+++ /dev/null
@@ -1,10 +0,0 @@
---- appl/telnet/telnet/Makefile.in.orig Sat Dec 18 10:47:05 1999
-+++ appl/telnet/telnet/Makefile.in Sat Dec 18 10:47:13 1999
-@@ -58,7 +58,6 @@
- $(INSTALL_DATA) $(srcdir)/$$f.1 \
- ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
- done
-- $(INSTALL_DATA) $(srcdir)/tmac.doc ${DESTDIR}$(CLIENT_MANDIR)/tmac.doc
-
- authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
- commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
diff --git a/security/krb5-16/files/patch-config::pre.in b/security/krb5-16/files/patch-config::pre.in
deleted file mode 100644
index bdd183e98ad4..000000000000
--- a/security/krb5-16/files/patch-config::pre.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/pre.in.orig Fri Nov 19 13:47:51 2004
-+++ config/pre.in Thu Jan 27 17:43:12 2005
-@@ -177,7 +177,7 @@
- INSTALL=@INSTALL@
- INSTALL_STRIP=
- INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
--INSTALL_SCRIPT=@INSTALL_PROGRAM@
-+INSTALL_SCRIPT=@INSTALL_SCRIPT@
- INSTALL_DATA=@INSTALL_DATA@
- INSTALL_SHLIB=@INSTALL_SHLIB@
- INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
diff --git a/security/krb5-16/files/patch-config::shlib.conf b/security/krb5-16/files/patch-config::shlib.conf
deleted file mode 100644
index 18f91fffc6d5..000000000000
--- a/security/krb5-16/files/patch-config::shlib.conf
+++ /dev/null
@@ -1,30 +0,0 @@
---- config/shlib.conf.orig Mon Oct 23 05:20:11 2006
-+++ config/shlib.conf Wed Mar 28 17:17:55 2007
-@@ -258,22 +258,15 @@
- ;;
-
- *-*-freebsd*)
-- if test -x /usr/bin/objformat ; then
-- objformat=`/usr/bin/objformat`
-- else
-- objformat="aout"
-- fi
-- PICFLAGS=-fpic
-- if test "x$objformat" = "xelf" ; then
-+ case $krb5_cv_host in
-+ sparc64-*) PICFLAGS=-fPIC;;
-+ *) PICFLAGS=-fpic;;
-+ esac
- SHLIBVEXT='.so.$(LIBMAJOR)'
-+ LDCOMBINE="libtool --mode=link cc -shared"
- RPATH_FLAG='-Wl,-rpath -Wl,'
-- else
-- RPATH_FLAG=-R
-- SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
-- fi
- CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)'
- SHLIBEXT=.so
-- LDCOMBINE='ld -Bshareable'
- SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
- CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
- RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5-16/files/patch-lib-krb5-os-localaddr.c b/security/krb5-16/files/patch-lib-krb5-os-localaddr.c
deleted file mode 100644
index 9e701ba97985..000000000000
--- a/security/krb5-16/files/patch-lib-krb5-os-localaddr.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- lib/krb5/os/localaddr.c.orig Wed Apr 13 09:55:43 2005
-+++ lib/krb5/os/localaddr.c Sun Jul 16 09:29:05 2006
-@@ -436,12 +436,14 @@
- #endif
- if ((ifp->ifa_flags & IFF_UP) == 0)
- continue;
-+#if 0
- if (ifp->ifa_flags & IFF_LOOPBACK) {
- /* Pretend it's not up, so the second pass will skip
- it. */
- ifp->ifa_flags &= ~IFF_UP;
- continue;
- }
-+#endif
- if (ifp->ifa_addr == NULL) {
- /* Can't use an interface without an address. Linux
- apparently does this sometimes. [RT ticket 1770 from
-@@ -459,8 +461,10 @@
- for (ifp2 = ifp_head; ifp2 && ifp2 != ifp; ifp2 = ifp2->ifa_next) {
- if ((ifp2->ifa_flags & IFF_UP) == 0)
- continue;
-+#if 0
- if (ifp2->ifa_flags & IFF_LOOPBACK)
- continue;
-+#endif
- if (addr_eq (ifp->ifa_addr, ifp2->ifa_addr)) {
- match = 1;
- ifp->ifa_flags &= ~IFF_UP;
-@@ -583,6 +587,7 @@
- }
- /*@=moduncon@*/
-
-+#if 0
- #ifdef IFF_LOOPBACK
- /* None of the current callers want loopback addresses. */
- if (lifreq.lifr_flags & IFF_LOOPBACK) {
-@@ -590,6 +595,7 @@
- goto skip;
- }
- #endif
-+#endif
- /* Ignore interfaces that are down. */
- if ((lifreq.lifr_flags & IFF_UP) == 0) {
- Tprintf ((" down\n"));
-@@ -755,6 +761,7 @@
- }
- /*@=moduncon@*/
-
-+#if 0
- #ifdef IFF_LOOPBACK
- /* None of the current callers want loopback addresses. */
- if (lifreq.iflr_flags & IFF_LOOPBACK) {
-@@ -762,6 +769,7 @@
- goto skip;
- }
- #endif
-+#endif
- /* Ignore interfaces that are down. */
- if ((lifreq.iflr_flags & IFF_UP) == 0) {
- Tprintf ((" down\n"));
-@@ -971,12 +979,14 @@
- }
- /*@=moduncon@*/
-
-+#if 0
- #ifdef IFF_LOOPBACK
- /* None of the current callers want loopback addresses. */
- if (ifreq.ifr_flags & IFF_LOOPBACK) {
- Tprintf ((" loopback\n"));
- goto skip;
- }
-+#endif
- #endif
- /* Ignore interfaces that are down. */
- if ((ifreq.ifr_flags & IFF_UP) == 0) {
diff --git a/security/krb5-16/files/patch-lib::gssapi::krb5::import_name.c b/security/krb5-16/files/patch-lib::gssapi::krb5::import_name.c
deleted file mode 100644
index 40f116af2196..000000000000
--- a/security/krb5-16/files/patch-lib::gssapi::krb5::import_name.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005
-+++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005
-@@ -33,6 +33,11 @@
- #endif
- #endif
-
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500100
-+#include <stdio.h>
-+#endif
-+
- #ifdef HAVE_STRING_H
- #include <string.h>
- #else
diff --git a/security/krb5-16/files/patch-plugins-preauth-pkinit-Makefile.in b/security/krb5-16/files/patch-plugins-preauth-pkinit-Makefile.in
deleted file mode 100644
index cb464470b1cf..000000000000
--- a/security/krb5-16/files/patch-plugins-preauth-pkinit-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/preauth/pkinit/Makefile.in.orig 2007-09-28 18:02:10.000000000 -0700
-+++ plugins/preauth/pkinit/Makefile.in 2007-10-29 07:03:24.000000000 -0700
-@@ -21,7 +21,7 @@
- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- $(TOPLIBD)/libkrb5$(SHLIBEXT)
- LIBS+= -lcrypto
--SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto -ldl $(SUPPORT_LIB) $(LIBS)
-+SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
-
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
diff --git a/security/krb5-16/pkg-descr b/security/krb5-16/pkg-descr
deleted file mode 100644
index d11e2e6d1c15..000000000000
--- a/security/krb5-16/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-Kerberos V5 is an authentication system developed at MIT.
-WWW: http://web.mit.edu/kerberos/
-
-Abridged from the User Guide:
- Under Kerberos, a client sends a request for a ticket to the
- Key Distribution Center (KDC). The KDC creates a ticket-granting
- ticket (TGT) for the client, encrypts it using the client's
- password as the key, and sends the encrypted TGT back to the
- client. The client then attempts to decrypt the TGT, using
- its password. If the client successfully decrypts the TGT, it
- keeps the decrypted TGT, which indicates proof of the client's
- identity. The TGT permits the client to obtain additional tickets,
- which give permission for specific services.
- Since Kerberos negotiates authenticated, and optionally encrypted,
- communications between two points anywhere on the internet, it
- provides a layer of security that is not dependent on which side of a
- firewall either client is on.
- The Kerberos V5 package is designed to be easy to use. Most of the
- commands are nearly identical to UNIX network programs you are already
- used to. Kerberos V5 is a single-sign-on system, which means that you
- have to type your password only once per session, and Kerberos does
- the authenticating and encrypting transparently.
-
-Jacques Vidrine <n@nectar.com>
diff --git a/security/krb5-16/pkg-plist b/security/krb5-16/pkg-plist
deleted file mode 100644
index a58155f40b9b..000000000000
--- a/security/krb5-16/pkg-plist
+++ /dev/null
@@ -1,113 +0,0 @@
-bin/compile_et
-bin/ftp
-bin/gss-client
-bin/kdestroy
-bin/kinit
-bin/klist
-bin/kpasswd
-bin/krb5-config
-%%KRB4%%bin/krb524init
-bin/ksu
-bin/kvno
-bin/rcp
-bin/rlogin
-bin/rsh
-bin/sclient
-bin/sim_client
-bin/telnet
-bin/uuclient
-%%KRB4%%bin/v4rcp
-include/com_err.h
-include/gssapi.h
-include/gssapi/gssapi.h
-include/gssapi/gssapi_generic.h
-include/gssapi/gssapi_krb5.h
-include/gssapi/mechglue.h
-include/gssrpc/auth.h
-include/gssrpc/auth_gss.h
-include/gssrpc/auth_gssapi.h
-include/gssrpc/auth_unix.h
-include/gssrpc/clnt.h
-include/gssrpc/netdb.h
-include/gssrpc/pmap_clnt.h
-include/gssrpc/pmap_prot.h
-include/gssrpc/pmap_rmt.h
-include/gssrpc/rename.h
-include/gssrpc/rpc.h
-include/gssrpc/rpc_msg.h
-include/gssrpc/svc.h
-include/gssrpc/svc_auth.h
-include/gssrpc/types.h
-include/gssrpc/xdr.h
-%%KRB4%%include/kerberosIV/des.h
-%%KRB4%%include/kerberosIV/kadm_err.h
-%%KRB4%%include/kerberosIV/krb.h
-%%KRB4%%include/kerberosIV/krb_err.h
-%%KRB4%%include/kerberosIV/mit-copyright.h
-include/krb5.h
-include/krb5/krb5.h
-include/krb5/locate_plugin.h
-include/profile.h
-lib/libcom_err.so
-lib/libcom_err.so.3
-lib/libdes425.so
-lib/libdes425.so.3
-lib/libgssapi_krb5.so
-lib/libgssapi_krb5.so.2
-lib/libgssrpc.so
-lib/libgssrpc.so.4
-lib/libk5crypto.so
-lib/libk5crypto.so.3
-lib/libkadm5clnt.so
-lib/libkadm5clnt.so.5
-lib/libkadm5srv.so
-lib/libkadm5srv.so.5
-lib/libkdb5.so
-lib/libkdb5.so.4
-%%KRB4%%lib/libkrb4.so
-%%KRB4%%lib/libkrb4.so.2
-lib/libkrb5.so
-lib/libkrb5.so.3
-lib/libkrb5support.so
-lib/libkrb5support.so.0
-lib/krb5/plugins/kdb/db2.so
-lib/krb5/plugins/preauth/pkinit.so
-sbin/ftpd
-sbin/gss-server
-sbin/k5srvutil
-sbin/kadmin
-sbin/kadmin.local
-sbin/kadmind
-sbin/kdb5_util
-sbin/klogind
-sbin/kprop
-sbin/kpropd
-sbin/krb5-send-pr
-%%KRB4%%sbin/krb524d
-sbin/krb5kdc
-sbin/kshd
-sbin/ktutil
-sbin/login.krb5
-sbin/sim_server
-sbin/sserver
-sbin/telnetd
-sbin/uuserver
-share/doc/krb5/README.FreeBSD
-share/et/et_c.awk
-share/et/et_h.awk
-share/examples/krb5/kdc.conf
-share/examples/krb5/krb5.conf
-share/examples/krb5/services.append
-share/gnats/mit
-@dirrm lib/krb5/plugins/preauth
-@dirrm lib/krb5/plugins/libkrb5
-@dirrm lib/krb5/plugins/kdb
-@dirrm lib/krb5/plugins
-@dirrm lib/krb5
-@dirrm include/gssapi
-@dirrm include/gssrpc
-@dirrm include/kerberosIV
-@dirrm include/krb5
-@dirrm share/et
-@dirrmtry share/gnats
-@dirrm share/examples/krb5
diff --git a/security/krb5-17/Makefile b/security/krb5-17/Makefile
deleted file mode 100644
index cfa3cb616930..000000000000
--- a/security/krb5-17/Makefile
+++ /dev/null
@@ -1,143 +0,0 @@
-# Ports collection Makefile for: MIT Kerberos V
-# Date created: 6/5/1998
-# Whom: nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= krb5
-PORTVERSION= 1.6.3
-PORTREVISION= 3
-CATEGORIES= security
-MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-signed
-EXTRACT_SUFX= .tar
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= An authentication system developed at MIT, successor to Kerberos IV
-
-BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-
-BROKEN= fails to install
-
-CONFLICTS= krb4-[0-9]* heimdal-[0-9]* srp-[0-9]*
-
-LATEST_LINK= ${PORTNAME}
-KERBEROSV_URL= http://web.mit.edu/kerberos/
-USE_OPENSSL= yes
-USE_GMAKE= yes
-USE_PERL5_BUILD= yes
-USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
-CONFIGURE_ARGS?= --enable-shared
-# CONFIGURE_ARGS+= --disable-thread-support
-CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
- CFLAGS="${CFLAGS}"
-MAKE_ARGS= INSTALL="${INSTALL}"
-KRB5_KRB4_COMPAT?= NO
-KRB5_DOC?= YES
-
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES"
-BUILD_DEPENDS+= texi2dvi:${PORTSDIR}/print/texinfo \
- dvips:${PORTSDIR}/print/dvipsk-tetex
-INFO= krb425 krb5-admin krb5-install krb5-user
-.endif
-
-.if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO"
-CONFIGURE_ARGS+= --without-krb4
-PLIST_SUB+= KRB4="@comment "
-.else
-PLIST_SUB+= KRB4=""
-.endif
-
-.if defined(KRB5_HOME)
-PREFIX= ${KRB5_HOME}
-.endif
-
-MAN1= krb5-send-pr.1 krb5-config.1 kpasswd.1 klist.1 \
- kinit.1 kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 \
- rlogin.1 ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.1
-.if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
-MAN1+= krb524init.1 v4rcp.1
-.endif
-MAN5= kdc.conf.5 krb5.conf.5 .k5login.5
-MAN8= krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
- ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
- kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8 \
- k5srvutil.8
-.if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
-MAN8+= krb524d.8
-.endif
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-
-WANT_HTML?= YES
-HTML_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc
-HTML_DOCS= ftp.html kdestroy.html kinit.html klist.html \
- kpasswd.html krb425.html krb5-admin.html \
- krb5-install.html krb5-user.html ksu.html \
- rcp.html rlogin.html rsh.html telnet.html
-
-.include <bsd.port.pre.mk>
-
-.if defined(OPENSSL_INSTALLED)
-CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}"
-.endif
-
-post-extract:
- @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
- @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc
-.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
- @if [ `id -u` = 0 ]; then \
- ${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
- ${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
- fi
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e '1s,^#!\/usr\/athena/bin/perl,#!${PERL5},' \
- ${WRKSRC}/../doc/man2html
-
-pre-build:
-.if !defined(KRB5_KRB4_COMPAT)
- @${ECHO} "------------------------------------------------------"
- @${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build "
- @${ECHO} "the KerberosIV compatibility libraries. "
- @${ECHO} "------------------------------------------------------"
-.endif
-
-post-build:
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES"
- @cd ${WRKSRC}/../doc && \
- ${MAKE} all
-.endif
-
-post-install:
- @${MKDIR} ${PREFIX}/share/doc/krb5
-# html documentation
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES" && defined(WANT_HTML) && ${WANT_HTML} == "YES"
- for html in ${HTML_DOC_DIR}/*.html; do \
- ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \
- ${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \
- done
-.endif
- ${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
-# handle info files
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES"
-.for info in ${INFO}
- ${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info
-.endfor
-.endif
-
- @${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD
- @${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
- @${ECHO} "------------------------------------------------------"
- @${ECHO} "This port of MIT Kerberos 5 includes remote login "
- @${ECHO} "daemons (telnetd and klogind). These daemons default "
- @${ECHO} "to using the system login program (/usr/bin/login). "
- @${ECHO} "Please see the file "
- @${ECHO} "${PREFIX}/share/doc/krb5/README.FreeBSD"
- @${ECHO} "for more information. "
- @${ECHO} "------------------------------------------------------"
-
-.include <bsd.port.post.mk>
diff --git a/security/krb5-17/distinfo b/security/krb5-17/distinfo
deleted file mode 100644
index f9332216ac64..000000000000
--- a/security/krb5-17/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (krb5-1.6.3-signed.tar) = 2dc1307686eb1c2bf1ab08ea805dad46
-SHA256 (krb5-1.6.3-signed.tar) = 7a1bd7d4bd326828c8ee382ed2b69ccd6c58762601df897d6a32169d84583d2a
-SIZE (krb5-1.6.3-signed.tar) = 11909120
diff --git a/security/krb5-17/files/README.FreeBSD b/security/krb5-17/files/README.FreeBSD
deleted file mode 100644
index e888e689eb04..000000000000
--- a/security/krb5-17/files/README.FreeBSD
+++ /dev/null
@@ -1,32 +0,0 @@
-The MIT KRB5 port provides its own login program at
-${PREFIX}/sbin/login.krb5. However, login.krb5 does not make use of
-the FreeBSD login.conf and login.access files that provide a means of
-setting up and controlling sessions under FreeBSD. To overcome this,
-the MIT KRB5 port uses the FreeBSD /usr/bin/login program to provide
-interactive login password authentication instead of the login.krb5
-program provided by MIT KRB5. The FreeBSD /usr/bin/login program does
-not have support for Kerberos V password authentication,
-e.g. authentication at the console. The pam_krb5 port must be used to
-provide Kerberos V password authentication.
-
-For more information about pam_krb5, please see pam(8) and pam_krb5(8).
-
-If you wish to use login.krb5 that is provided by the MIT KRB5 port,
-the arguments "-L ${PREFIX}/sbin/login.krb5" must be
-specified as arguments to klogind and KRB5 telnetd, e.g.
-
-klogin stream tcp nowait root ${PREFIX}/sbin/klogind klogind -k -c -L ${PREFIX}/sbin/login.krb5
-eklogin stream tcp nowait root ${PREFIX}/sbin/klogind klogind -k -c -e -L ${PREFIX}/sbin/login.krb5
-telnet stream tcp nowait root ${PREFIX}/sbin/telnetd telnetd -a none -L ${PREFIX}/sbin/login.krb5
-
-Additionally, if you wish to use the MIT KRB5 provided login.krb5 instead
-of the FreeBSD provided /usr/bin/login for local tty logins,
-"lo=${PREFIX}/sbin/login.krb5" must be specified in /etc/gettytab, e.g.,
-
-default:\
- :cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\
- :if=/etc/issue:\
- :lo=${PREFIX}/sbin/login.krb5:
-
-It is recommended that the FreeBSD /usr/bin/login be used with the
-pam_krb5 port instead of the MIT KRB5 provided login.krb5.
diff --git a/security/krb5-17/files/patch-ac b/security/krb5-17/files/patch-ac
deleted file mode 100644
index 8bca5437d964..000000000000
--- a/security/krb5-17/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/admin.texinfo Fri Feb 6 21:40:56 1998
-+++ admin.texinfo Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-admin.info
- @settitle Kerberos V5 System Administrator's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Admin Guide: (krb5-admin). Kerberos V5 System Admin's Guide
-+@end direntry
- @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-17/files/patch-ad b/security/krb5-17/files/patch-ad
deleted file mode 100644
index c8b6d3e99e91..000000000000
--- a/security/krb5-17/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/user-guide.texinfo Fri Feb 6 21:40:58 1998
-+++ user-guide.texinfo Fri Jun 19 15:13:45 1998
-@@ -3,6 +3,10 @@
- @c guide
- @setfilename krb5-user.info
- @settitle Kerberos V5 UNIX User's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* User's Guide: (krb5-user). Kerberos V5 UNIX User's Guide
-+@end direntry
- @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-17/files/patch-ae b/security/krb5-17/files/patch-ae
deleted file mode 100644
index f5643b5aa04f..000000000000
--- a/security/krb5-17/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/install.texinfo Fri Feb 6 21:40:56 1998
-+++ install.texinfo Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-install.info
- @settitle Kerberos V5 Installation Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Installation Guide: (krb5-install). Kerberos V5 Installation Guide
-+@end direntry
- @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-17/files/patch-af b/security/krb5-17/files/patch-af
deleted file mode 100644
index 49425d6efceb..000000000000
--- a/security/krb5-17/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/krb425.texinfo Fri Feb 6 21:40:57 1998
-+++ krb425.texinfo Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb425.info
- @settitle Upgrading to Kerberos V5 from Kerberos V4
-+@dircategory Kerberos V5
-+@direntry
-+* Upgrading from V4 to V5: (krb425). Upgrading from Kerberos V4 to V5
-+@end direntry
- @c @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-17/files/patch-ai b/security/krb5-17/files/patch-ai
deleted file mode 100644
index f5b733194344..000000000000
--- a/security/krb5-17/files/patch-ai
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/gssftp/ftpd/ftpd.c.orig Wed Jan 9 14:26:51 2002
-+++ appl/gssftp/ftpd/ftpd.c Thu Jan 10 19:00:13 2002
-@@ -487,7 +487,13 @@
- #ifndef LOG_DAEMON
- #define LOG_DAEMON 0
- #endif
-- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON);
-+
-+#ifndef LOG_FTP
-+#define FACILITY LOG_DAEMON
-+#else
-+#define FACILITY LOG_FTP
-+#endif
-+ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY);
-
- addrlen = sizeof (his_addr);
- if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
-@@ -2312,6 +2318,10 @@
- if ((length = krb_mk_safe((u_char *)&cksum, out_buf, sizeof(cksum),
- &kdata.session,&ctrl_addr, &his_addr)) == -1) {
- secure_error("ADAT: krb_mk_safe failed");
-+ return(0);
-+ }
-+ if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
-+ secure_error("ADAT: reply too long");
- return(0);
- }
- if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
diff --git a/security/krb5-17/files/patch-aj b/security/krb5-17/files/patch-aj
deleted file mode 100644
index c3bb8dfd6960..000000000000
--- a/security/krb5-17/files/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-*** appl/gssftp/ftpd/logwtmp.c.ORIG Fri Feb 6 19:41:25 1998
---- appl/gssftp/ftpd/logwtmp.c Tue Jun 30 19:46:01 1998
-***************
-*** 66,72 ****
- struct stat buf;
- time_t time();
-
-! if (fd < 0 && (fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0)
- return;
- if (fstat(fd, &buf) == 0) {
- (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
---- 66,72 ----
- struct stat buf;
- time_t time();
-
-! if (fd < 0 && (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0)
- return;
- if (fstat(fd, &buf) == 0) {
- (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
diff --git a/security/krb5-17/files/patch-appl::bsd::Makefile.in b/security/krb5-17/files/patch-appl::bsd::Makefile.in
deleted file mode 100644
index 581048933264..000000000000
--- a/security/krb5-17/files/patch-appl::bsd::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- appl/bsd/Makefile.in.orig Wed Feb 28 14:06:43 2001
-+++ appl/bsd/Makefile.in Mon Dec 31 21:52:45 2001
-@@ -31,8 +31,8 @@
- -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\"
-
- DEFINES = $(RSH) $(BSD) $(RPROGS) -DKERBEROS \
-- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \
-+ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \
- -DHEIMDAL_FRIENDLY
-
- all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP)
-
diff --git a/security/krb5-17/files/patch-appl::bsd::klogind.M b/security/krb5-17/files/patch-appl::bsd::klogind.M
deleted file mode 100644
index 9cddd5fc222d..000000000000
--- a/security/krb5-17/files/patch-appl::bsd::klogind.M
+++ /dev/null
@@ -1,35 +0,0 @@
---- appl/bsd/klogind.M.orig Wed Feb 28 14:06:43 2001
-+++ appl/bsd/klogind.M Mon Dec 31 21:22:27 2001
-@@ -14,7 +14,7 @@
- .B \-kr54cpPef
- ]
- [[ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP ]] ]
--[ \fB\-D\fP \fIport\fP ]
-+[ \fB\-D\fP \fIport\fP ] [\fB\-L\fP \fIloginpath\fP]
- .SH DESCRIPTION
- .I Klogind
- is the server for the
-@@ -107,6 +108,10 @@
- Beta5 (May 1995)--present bogus checksums that prevent Kerberos
- authentication from succeeding in the default mode.
-
-+.IP \fB\-L\ loginpath\fP
-+Specify pathname to an alternative login program. Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
-+
-
- .PP
- If the
-@@ -157,12 +162,6 @@
-
- .IP \fB\-M\ realm\fP
- Set the Kerberos realm to use.
--
--.IP \fB\-L\ login\fP
--Set the login program to use. This option only has an effect if
--DO_NOT_USE_K_LOGIN was not defined when
--.I klogind
--was compiled.
-
- .IP \fB\-D\ port\fP
- Run in standalone mode, listening on \fBport\fP. The daemon will exit
diff --git a/security/krb5-17/files/patch-appl::gssftp::ftp::ftp_var.h b/security/krb5-17/files/patch-appl::gssftp::ftp::ftp_var.h
deleted file mode 100644
index 256e929aa68f..000000000000
--- a/security/krb5-17/files/patch-appl::gssftp::ftp::ftp_var.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- appl/gssftp/ftp/ftp_var.h.orig Tue Jun 17 02:37:40 2003
-+++ appl/gssftp/ftp/ftp_var.h Sat Aug 30 05:30:44 2003
-@@ -33,6 +33,10 @@
- * @(#)ftp_var.h 5.9 (Berkeley) 6/1/90
- */
-
-+#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version > 500000
-+#undef __BSD_VISIBLE
-+#endif
-+
- #ifdef _WIN32
- #include <windows.h>
- #include <winsock2.h>
-@@ -57,9 +61,7 @@
- typedef void (*sig_t)(int);
- typedef void sigtype;
- #else
--#define sig_t my_sig_t
- #define sigtype krb5_sigtype
--typedef sigtype (*sig_t)();
- #endif
-
- /*
diff --git a/security/krb5-17/files/patch-appl::telnet::telnetd::Makefile.in b/security/krb5-17/files/patch-appl::telnet::telnetd::Makefile.in
deleted file mode 100644
index cb5a0e26d49d..000000000000
--- a/security/krb5-17/files/patch-appl::telnet::telnetd::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- appl/telnet/telnetd/Makefile.in.orig Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/Makefile.in Mon Dec 31 21:51:19 2001
-@@ -24,7 +24,7 @@
- # @(#)Makefile.generic 5.5 (Berkeley) 3/1/91
- #
-
--AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
-+AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"/usr/bin/login\"
- OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
- LOCALINCLUDES=-I.. -I$(srcdir)/..
- DEFINES = $(AUTH_DEF) $(OTHERDEFS)
diff --git a/security/krb5-17/files/patch-appl::telnet::telnetd::telnetd.8 b/security/krb5-17/files/patch-appl::telnet::telnetd::telnetd.8
deleted file mode 100644
index 951ee0d5692a..000000000000
--- a/security/krb5-17/files/patch-appl::telnet::telnetd::telnetd.8
+++ /dev/null
@@ -1,22 +0,0 @@
---- appl/telnet/telnetd/telnetd.8.orig Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/telnetd.8 Mon Dec 31 21:16:55 2001
-@@ -43,7 +43,7 @@
- [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
- [\fB\-S\fP \fItos\fP] [\fB\-U\fP] [\fB\-X\fP \fIauthtype\fP]
- [\fB\-w\fP [\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]]]
--[\fB\-debug\fP [\fIport\fP]]
-+[\fB\-debug\fP] [\fB\-L\fP \fIloginpath\fP] [\fIport\fP]
- .SH DESCRIPTION
- The
- .B telnetd
-@@ -221,6 +221,10 @@
- in response to a
- .SM DO TIMING-MARK)
- for kludge linemode support.
-+.TP
-+\fB\-L\fP \fIloginpath\fP
-+Specify pathname to an alternative login program. Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
- .TP
- .B \-l
- Specifies line mode. Tries to force clients to use line-at-a-time
diff --git a/security/krb5-17/files/patch-appl::telnet::telnetd::utility.c b/security/krb5-17/files/patch-appl::telnet::telnetd::utility.c
deleted file mode 100644
index 8bb656dc0673..000000000000
--- a/security/krb5-17/files/patch-appl::telnet::telnetd::utility.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- appl/telnet/telnetd/utility.c.orig Wed Jan 9 14:26:59 2002
-+++ appl/telnet/telnetd/utility.c Fri Jan 11 13:10:33 2002
-@@ -408,18 +408,25 @@
- int
- netwrite(const char *buf, size_t len)
- {
-- size_t remain;
-+ int remaining, copied;
-+
-+ remaining = BUFSIZ - (nfrontp - netobuf);
-+ while (len > 0) {
-+ /* Free up enough space if the room is too low*/
-+ if ((len > BUFSIZ ? BUFSIZ : len) > remaining) {
-+ netflush();
-+ remaining = BUFSIZ - (nfrontp - netobuf);
-+ }
-
-- remain = sizeof(netobuf) - (nfrontp - netobuf);
-- if (remain < len) {
-- netflush();
-- remain = sizeof(netobuf) - (nfrontp - netobuf);
-+ /* Copy out as much as will fit */
-+ copied = remaining > len ? len : remaining;
-+ memmove(nfrontp, buf, copied);
-+ nfrontp += copied;
-+ len -= copied;
-+ remaining -= copied;
-+ buf += copied;
- }
-- if (remain < len)
-- return 0;
-- memcpy(nfrontp, buf, len);
-- nfrontp += len;
-- return len;
-+ return copied;
- }
-
- /*
diff --git a/security/krb5-17/files/patch-as b/security/krb5-17/files/patch-as
deleted file mode 100644
index de19886eac08..000000000000
--- a/security/krb5-17/files/patch-as
+++ /dev/null
@@ -1,195 +0,0 @@
---- clients/ksu/main.c.orig Wed Aug 14 12:14:49 2002
-+++ clients/ksu/main.c Tue Jul 29 18:46:00 2003
-@@ -32,6 +32,10 @@
- #include <signal.h>
- #include <grp.h>
-
-+#ifdef LOGIN_CAP
-+#include <login_cap.h>
-+#endif
-+
- /* globals */
- char * prog_name;
- int auth_debug =0;
-@@ -61,7 +65,7 @@
- ill specified arguments to commands */
-
- void usage (){
-- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
-+ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
- }
-
- /* for Ultrix and friends ... */
-@@ -77,6 +81,7 @@
- int argc;
- char ** argv;
- {
-+ int asme = 0;
- int hp =0;
- int some_rest_copy = 0;
- int all_rest_copy = 0;
-@@ -91,6 +96,7 @@
- char * cc_target_tag = NULL;
- char * target_user = NULL;
- char * source_user;
-+ char * source_shell;
-
- krb5_ccache cc_source = NULL;
- const char * cc_source_tag = NULL;
-@@ -117,6 +123,11 @@
- krb5_principal kdc_server;
- krb5_boolean zero_password;
- char * dir_of_cc_target;
-+
-+#ifdef LOGIN_CAP
-+ login_cap_t *lc;
-+ int setwhat;
-+#endif
-
- options.opt = KRB5_DEFAULT_OPTIONS;
- options.lifetime = KRB5_DEFAULT_TKT_LIFE;
-@@ -181,7 +192,7 @@
- com_err (prog_name, errno, "while setting euid to source user");
- exit (1);
- }
-- while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkql:e:")) != -1)){
-+ while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkmql:e:")) != -1)){
- switch (option) {
- case 'r':
- options.opt |= KDC_OPT_RENEWABLE;
-@@ -227,6 +238,9 @@
- errflg++;
- }
- break;
-+ case 'm':
-+ asme = 1;
-+ break;
- case 'n':
- if ((retval = krb5_parse_name(ksu_context, optarg, &client))){
- com_err(prog_name, retval, "when parsing name %s", optarg);
-@@ -341,6 +355,7 @@
-
- /* allocate space and copy the usernamane there */
- source_user = xstrdup(pwd->pw_name);
-+ source_shell = xstrdup(pwd->pw_shell);
- source_uid = pwd->pw_uid;
- source_gid = pwd->pw_gid;
-
-@@ -672,43 +687,64 @@
- /* get the shell of the user, this will be the shell used by su */
- target_pwd = getpwnam(target_user);
-
-- if (target_pwd->pw_shell)
-- shell = xstrdup(target_pwd->pw_shell);
-- else {
-- shell = _DEF_CSH; /* default is cshell */
-+ if (asme) {
-+ if (source_shell && *source_shell) {
-+ shell = strdup(source_shell);
-+ } else {
-+ shell = _DEF_CSH;
-+ }
-+ } else {
-+ if (target_pwd->pw_shell)
-+ shell = strdup(target_pwd->pw_shell);
-+ else {
-+ shell = _DEF_CSH; /* default is cshell */
-+ }
- }
-
- #ifdef HAVE_GETUSERSHELL
-
- /* insist that the target login uses a standard shell (root is omited) */
-
-- if (!standard_shell(target_pwd->pw_shell) && source_uid) {
-- fprintf(stderr, "ksu: permission denied (shell).\n");
-- sweep_up(ksu_context, cc_target);
-- exit(1);
-+ if (asme) {
-+ if (!standard_shell(pwd->pw_shell) && source_uid) {
-+ fprintf(stderr, "ksu: permission denied (shell).\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
-+ } else {
-+ if (!standard_shell(target_pwd->pw_shell) && source_uid) {
-+ fprintf(stderr, "ksu: permission denied (shell).\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
- }
- #endif /* HAVE_GETUSERSHELL */
-
-- if (target_pwd->pw_uid){
--
-- if(set_env_var("USER", target_pwd->pw_name)){
-+ if (!asme) {
-+ if (target_pwd->pw_uid){
-+ if (set_env_var("USER", target_pwd->pw_name)){
-+ fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
-+ }
-+
-+ if (set_env_var( "HOME", target_pwd->pw_dir)){
- fprintf(stderr,"ksu: couldn't set environment variable USER\n");
- sweep_up(ksu_context, cc_target);
- exit(1);
-- }
-- }
--
-- if(set_env_var( "HOME", target_pwd->pw_dir)){
-- fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-- sweep_up(ksu_context, cc_target);
-- exit(1);
-- }
-+ }
-
-- if(set_env_var( "SHELL", shell)){
-- fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-- sweep_up(ksu_context, cc_target);
-- exit(1);
-- }
-+ if (set_env_var( "SHELL", shell)){
-+ fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
-+ }
-+
-+#ifdef LOGIN_CAP
-+ lc = login_getpwclass(pwd);
-+#endif
-
- /* set the cc env name to target */
-
-@@ -718,7 +754,19 @@
- sweep_up(ksu_context, cc_target);
- exit(1);
- }
--
-+
-+#ifdef LOGIN_CAP
-+ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY;
-+ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV;
-+ /*
-+ * Don't touch resource/priority settings if -m has been
-+ * used or -l and -c hasn't, and we're not su'ing to root.
-+ */
-+ if (target_pwd->pw_uid)
-+ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES);
-+ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0)
-+ err(1, "setusercontext");
-+#else
- /* set permissions */
- if (setgid(target_pwd->pw_gid) < 0) {
- perror("ksu: setgid");
-@@ -759,6 +807,7 @@
- sweep_up(ksu_context, cc_target);
- exit(1);
- }
-+#endif
-
- if (access( cc_target_tag_tmp, R_OK | W_OK )){
- com_err(prog_name, errno,
diff --git a/security/krb5-17/files/patch-at b/security/krb5-17/files/patch-at
deleted file mode 100644
index 060207ec644a..000000000000
--- a/security/krb5-17/files/patch-at
+++ /dev/null
@@ -1,14 +0,0 @@
-*** include/syslog.h.ORIG Fri Feb 6 19:42:12 1998
---- include/syslog.h Tue Jun 30 19:46:02 1998
-***************
-*** 34,39 ****
---- 34,42 ----
- #define LOG_LPR (6<<3) /* line printer subsystem */
- #define LOG_NEWS (7<<3) /* network news subsystem */
- #define LOG_UUCP (8<<3) /* UUCP subsystem */
-+ #if (defined(BSD) && (BSD >= 199306))
-+ #define LOG_FTP (11<<3) /* ftp daemon */
-+ #endif
- /* other codes through 15 reserved for system use */
- #define LOG_LOCAL0 (16<<3) /* reserved for local use */
- #define LOG_LOCAL1 (17<<3) /* reserved for local use */
diff --git a/security/krb5-17/files/patch-av b/security/krb5-17/files/patch-av
deleted file mode 100644
index 8363b8bb1e2d..000000000000
--- a/security/krb5-17/files/patch-av
+++ /dev/null
@@ -1,15 +0,0 @@
-*** clients/ksu/Makefile.in.ORIG Sun Aug 2 16:51:18 1998
---- clients/ksu/Makefile.in Sun Aug 2 16:53:48 1998
-***************
-*** 3,7 ****
- mydir=ksu
- BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
- CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-
---- 3,7 ----
- mydir=ksu
- BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"'
- CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-
diff --git a/security/krb5-17/files/patch-ax b/security/krb5-17/files/patch-ax
deleted file mode 100644
index 6cbb8289f93e..000000000000
--- a/security/krb5-17/files/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/Makefile.orig 2007-09-17 20:36:09.000000000 -0700
-+++ ../doc/Makefile 2007-10-25 14:04:48.000000000 -0700
-@@ -1,8 +1,8 @@
- SRCDIR=../src
--DVI=texi2dvi4a2ps # texi2dvi
-+DVI=texi2dvi # texi2dvi
- DVIPS=dvips -o "$@"
- PSPDF=ps2pdf
--INFO=makeinfo
-+INFO=makeinfo --no-validate --no-split
- HTML=makeinfo --html --no-split
- RM=rm -f
- TAR=tar -chvf
diff --git a/security/krb5-17/files/patch-ay b/security/krb5-17/files/patch-ay
deleted file mode 100644
index a6cb9ebbfd13..000000000000
--- a/security/krb5-17/files/patch-ay
+++ /dev/null
@@ -1,50 +0,0 @@
---- appl/libpty/getpty.c.orig Wed Jan 9 14:28:37 2002
-+++ appl/libpty/getpty.c Thu Jan 10 21:30:40 2002
-@@ -24,13 +24,26 @@
- #include "libpty.h"
- #include "pty-int.h"
-
-+#ifdef __FreeBSD__
-+#define PTYCHARS1 "pqrsPQRS"
-+#define PTYCHARS2 "0123456789abcdefghijklmnopqrstuv"
-+#endif
-+
-+#ifndef PTYCHARS1
-+#define PTYCHARS1 "pqrstuvwxyzPQRST"
-+#endif
-+
-+#ifndef PTYCHARS2
-+#define PTYCHARS2 "0123456789abcdef"
-+#endif
-+
- long
- ptyint_getpty_ext(int *fd, char *slave, int slavelength, int do_grantpt)
- {
-+ int ptynum;
-+ char *cp1, *cp2;
- #if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY)
-- char *cp;
- char *p;
-- int i,ptynum;
- struct stat stb;
- char slavebuf[1024];
- #endif
-@@ -115,14 +128,14 @@
- strncpy(slave, slavebuf, slavelength);
- return 0;
- } else {
-- for (cp = "pqrstuvwxyzPQRST";*cp; cp++) {
-+ for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) {
- sprintf(slavebuf,"/dev/ptyXX");
-- slavebuf[sizeof("/dev/pty") - 1] = *cp;
-+ slavebuf[sizeof("/dev/pty") - 1] = *cp1;
- slavebuf[sizeof("/dev/ptyp") - 1] = '0';
- if (stat(slavebuf, &stb) < 0)
- break;
-- for (i = 0; i < 16; i++) {
-- slavebuf[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i];
-+ for (cp2 = PTYCHARS2; *cp2 != '\0'; cp2++) {
-+ slavebuf[sizeof("/dev/ptyp") - 1] = *cp2;
- *fd = open(slavebuf, O_RDWR);
- if (*fd < 0) continue;
-
diff --git a/security/krb5-17/files/patch-ba b/security/krb5-17/files/patch-ba
deleted file mode 100644
index dd0c760df7d2..000000000000
--- a/security/krb5-17/files/patch-ba
+++ /dev/null
@@ -1,77 +0,0 @@
---- appl/bsd/login.c.orig Tue May 27 21:06:25 2003
-+++ appl/bsd/login.c Tue Jul 29 20:52:25 2003
-@@ -1342,19 +1342,6 @@
- setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
- }
-
-- /* Policy: If local password is good, user is good.
-- We really can't trust the Kerberos password,
-- because somebody on the net could spoof the
-- Kerberos server (not easy, but possible).
-- Some sites might want to use it anyways, in
-- which case they should change this line
-- to:
-- if (kpass_ok)
-- */
--
-- if (lpass_ok)
-- break;
--
- if (got_v5_tickets) {
- retval = krb5_verify_init_creds(kcontext, &my_creds, NULL,
- NULL, &xtra_creds,
-@@ -1378,6 +1365,9 @@
- }
- #endif /* KRB4_GET_TICKETS */
-
-+ if (lpass_ok)
-+ break;
-+
- bad_login:
- setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
-
-@@ -1667,21 +1657,23 @@
- /* set up credential cache -- obeying KRB5_ENV_CCNAME
- set earlier */
- /* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */
-- if ((retval = krb5_cc_default(kcontext, &ccache))) {
-+ if ((retval = krb5_cc_default(kcontext, &ccache)))
- com_err(argv[0], retval, "while getting default ccache");
-- } else if ((retval = krb5_cc_initialize(kcontext, ccache, me))) {
-- com_err(argv[0], retval, "when initializing cache");
-- } else if ((retval = krb5_cc_store_cred(kcontext, ccache,
-- &my_creds))) {
-- com_err(argv[0], retval, "while storing credentials");
-- } else if (xtra_creds &&
-- (retval = krb5_cc_copy_creds(kcontext, xtra_creds,
-- ccache))) {
-- com_err(argv[0], retval, "while storing credentials");
-+ else {
-+ if (retval = krb5_cc_initialize(kcontext, ccache, me))
-+ com_err(argv[0], retval, "when initializing cache");
-+ else {
-+ if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds))
-+ com_err(argv[0], retval, "while storing credentials");
-+ else {
-+ if (xtra_creds &&
-+ (retval = krb5_cc_copy_creds(kcontext, xtra_creds, ccache))) {
-+ com_err(argv[0], retval, "while storing credentials");
-+ krb5_cc_destroy(kcontext, xtra_creds);
-+ }
-+ }
-+ }
- }
--
-- if (xtra_creds)
-- krb5_cc_destroy(kcontext, xtra_creds);
- } else if (forwarded_v5_tickets && rewrite_ccache) {
- if ((retval = krb5_cc_initialize (kcontext, ccache, me))) {
- syslog(LOG_ERR,
-@@ -1762,6 +1754,7 @@
-
- if (ccname)
- setenv("KRB5CCNAME", ccname, 1);
-+ krb5_cc_set_default_name(kcontext, ccname);
-
- setenv("HOME", pwd->pw_dir, 1);
- setenv("PATH", LPATH, 1);
diff --git a/security/krb5-17/files/patch-bb b/security/krb5-17/files/patch-bb
deleted file mode 100644
index 6545ae682c53..000000000000
--- a/security/krb5-17/files/patch-bb
+++ /dev/null
@@ -1,10 +0,0 @@
---- appl/telnet/telnet/Makefile.in.orig Sat Dec 18 10:47:05 1999
-+++ appl/telnet/telnet/Makefile.in Sat Dec 18 10:47:13 1999
-@@ -58,7 +58,6 @@
- $(INSTALL_DATA) $(srcdir)/$$f.1 \
- ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
- done
-- $(INSTALL_DATA) $(srcdir)/tmac.doc ${DESTDIR}$(CLIENT_MANDIR)/tmac.doc
-
- authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
- commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
diff --git a/security/krb5-17/files/patch-config::pre.in b/security/krb5-17/files/patch-config::pre.in
deleted file mode 100644
index bdd183e98ad4..000000000000
--- a/security/krb5-17/files/patch-config::pre.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/pre.in.orig Fri Nov 19 13:47:51 2004
-+++ config/pre.in Thu Jan 27 17:43:12 2005
-@@ -177,7 +177,7 @@
- INSTALL=@INSTALL@
- INSTALL_STRIP=
- INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
--INSTALL_SCRIPT=@INSTALL_PROGRAM@
-+INSTALL_SCRIPT=@INSTALL_SCRIPT@
- INSTALL_DATA=@INSTALL_DATA@
- INSTALL_SHLIB=@INSTALL_SHLIB@
- INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
diff --git a/security/krb5-17/files/patch-config::shlib.conf b/security/krb5-17/files/patch-config::shlib.conf
deleted file mode 100644
index 18f91fffc6d5..000000000000
--- a/security/krb5-17/files/patch-config::shlib.conf
+++ /dev/null
@@ -1,30 +0,0 @@
---- config/shlib.conf.orig Mon Oct 23 05:20:11 2006
-+++ config/shlib.conf Wed Mar 28 17:17:55 2007
-@@ -258,22 +258,15 @@
- ;;
-
- *-*-freebsd*)
-- if test -x /usr/bin/objformat ; then
-- objformat=`/usr/bin/objformat`
-- else
-- objformat="aout"
-- fi
-- PICFLAGS=-fpic
-- if test "x$objformat" = "xelf" ; then
-+ case $krb5_cv_host in
-+ sparc64-*) PICFLAGS=-fPIC;;
-+ *) PICFLAGS=-fpic;;
-+ esac
- SHLIBVEXT='.so.$(LIBMAJOR)'
-+ LDCOMBINE="libtool --mode=link cc -shared"
- RPATH_FLAG='-Wl,-rpath -Wl,'
-- else
-- RPATH_FLAG=-R
-- SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
-- fi
- CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)'
- SHLIBEXT=.so
-- LDCOMBINE='ld -Bshareable'
- SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
- CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
- RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5-17/files/patch-lib-krb5-os-localaddr.c b/security/krb5-17/files/patch-lib-krb5-os-localaddr.c
deleted file mode 100644
index 9e701ba97985..000000000000
--- a/security/krb5-17/files/patch-lib-krb5-os-localaddr.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- lib/krb5/os/localaddr.c.orig Wed Apr 13 09:55:43 2005
-+++ lib/krb5/os/localaddr.c Sun Jul 16 09:29:05 2006
-@@ -436,12 +436,14 @@
- #endif
- if ((ifp->ifa_flags & IFF_UP) == 0)
- continue;
-+#if 0
- if (ifp->ifa_flags & IFF_LOOPBACK) {
- /* Pretend it's not up, so the second pass will skip
- it. */
- ifp->ifa_flags &= ~IFF_UP;
- continue;
- }
-+#endif
- if (ifp->ifa_addr == NULL) {
- /* Can't use an interface without an address. Linux
- apparently does this sometimes. [RT ticket 1770 from
-@@ -459,8 +461,10 @@
- for (ifp2 = ifp_head; ifp2 && ifp2 != ifp; ifp2 = ifp2->ifa_next) {
- if ((ifp2->ifa_flags & IFF_UP) == 0)
- continue;
-+#if 0
- if (ifp2->ifa_flags & IFF_LOOPBACK)
- continue;
-+#endif
- if (addr_eq (ifp->ifa_addr, ifp2->ifa_addr)) {
- match = 1;
- ifp->ifa_flags &= ~IFF_UP;
-@@ -583,6 +587,7 @@
- }
- /*@=moduncon@*/
-
-+#if 0
- #ifdef IFF_LOOPBACK
- /* None of the current callers want loopback addresses. */
- if (lifreq.lifr_flags & IFF_LOOPBACK) {
-@@ -590,6 +595,7 @@
- goto skip;
- }
- #endif
-+#endif
- /* Ignore interfaces that are down. */
- if ((lifreq.lifr_flags & IFF_UP) == 0) {
- Tprintf ((" down\n"));
-@@ -755,6 +761,7 @@
- }
- /*@=moduncon@*/
-
-+#if 0
- #ifdef IFF_LOOPBACK
- /* None of the current callers want loopback addresses. */
- if (lifreq.iflr_flags & IFF_LOOPBACK) {
-@@ -762,6 +769,7 @@
- goto skip;
- }
- #endif
-+#endif
- /* Ignore interfaces that are down. */
- if ((lifreq.iflr_flags & IFF_UP) == 0) {
- Tprintf ((" down\n"));
-@@ -971,12 +979,14 @@
- }
- /*@=moduncon@*/
-
-+#if 0
- #ifdef IFF_LOOPBACK
- /* None of the current callers want loopback addresses. */
- if (ifreq.ifr_flags & IFF_LOOPBACK) {
- Tprintf ((" loopback\n"));
- goto skip;
- }
-+#endif
- #endif
- /* Ignore interfaces that are down. */
- if ((ifreq.ifr_flags & IFF_UP) == 0) {
diff --git a/security/krb5-17/files/patch-lib::gssapi::krb5::import_name.c b/security/krb5-17/files/patch-lib::gssapi::krb5::import_name.c
deleted file mode 100644
index 40f116af2196..000000000000
--- a/security/krb5-17/files/patch-lib::gssapi::krb5::import_name.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005
-+++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005
-@@ -33,6 +33,11 @@
- #endif
- #endif
-
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500100
-+#include <stdio.h>
-+#endif
-+
- #ifdef HAVE_STRING_H
- #include <string.h>
- #else
diff --git a/security/krb5-17/files/patch-plugins-preauth-pkinit-Makefile.in b/security/krb5-17/files/patch-plugins-preauth-pkinit-Makefile.in
deleted file mode 100644
index cb464470b1cf..000000000000
--- a/security/krb5-17/files/patch-plugins-preauth-pkinit-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/preauth/pkinit/Makefile.in.orig 2007-09-28 18:02:10.000000000 -0700
-+++ plugins/preauth/pkinit/Makefile.in 2007-10-29 07:03:24.000000000 -0700
-@@ -21,7 +21,7 @@
- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- $(TOPLIBD)/libkrb5$(SHLIBEXT)
- LIBS+= -lcrypto
--SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto -ldl $(SUPPORT_LIB) $(LIBS)
-+SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
-
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
diff --git a/security/krb5-17/pkg-descr b/security/krb5-17/pkg-descr
deleted file mode 100644
index d11e2e6d1c15..000000000000
--- a/security/krb5-17/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-Kerberos V5 is an authentication system developed at MIT.
-WWW: http://web.mit.edu/kerberos/
-
-Abridged from the User Guide:
- Under Kerberos, a client sends a request for a ticket to the
- Key Distribution Center (KDC). The KDC creates a ticket-granting
- ticket (TGT) for the client, encrypts it using the client's
- password as the key, and sends the encrypted TGT back to the
- client. The client then attempts to decrypt the TGT, using
- its password. If the client successfully decrypts the TGT, it
- keeps the decrypted TGT, which indicates proof of the client's
- identity. The TGT permits the client to obtain additional tickets,
- which give permission for specific services.
- Since Kerberos negotiates authenticated, and optionally encrypted,
- communications between two points anywhere on the internet, it
- provides a layer of security that is not dependent on which side of a
- firewall either client is on.
- The Kerberos V5 package is designed to be easy to use. Most of the
- commands are nearly identical to UNIX network programs you are already
- used to. Kerberos V5 is a single-sign-on system, which means that you
- have to type your password only once per session, and Kerberos does
- the authenticating and encrypting transparently.
-
-Jacques Vidrine <n@nectar.com>
diff --git a/security/krb5-17/pkg-plist b/security/krb5-17/pkg-plist
deleted file mode 100644
index a58155f40b9b..000000000000
--- a/security/krb5-17/pkg-plist
+++ /dev/null
@@ -1,113 +0,0 @@
-bin/compile_et
-bin/ftp
-bin/gss-client
-bin/kdestroy
-bin/kinit
-bin/klist
-bin/kpasswd
-bin/krb5-config
-%%KRB4%%bin/krb524init
-bin/ksu
-bin/kvno
-bin/rcp
-bin/rlogin
-bin/rsh
-bin/sclient
-bin/sim_client
-bin/telnet
-bin/uuclient
-%%KRB4%%bin/v4rcp
-include/com_err.h
-include/gssapi.h
-include/gssapi/gssapi.h
-include/gssapi/gssapi_generic.h
-include/gssapi/gssapi_krb5.h
-include/gssapi/mechglue.h
-include/gssrpc/auth.h
-include/gssrpc/auth_gss.h
-include/gssrpc/auth_gssapi.h
-include/gssrpc/auth_unix.h
-include/gssrpc/clnt.h
-include/gssrpc/netdb.h
-include/gssrpc/pmap_clnt.h
-include/gssrpc/pmap_prot.h
-include/gssrpc/pmap_rmt.h
-include/gssrpc/rename.h
-include/gssrpc/rpc.h
-include/gssrpc/rpc_msg.h
-include/gssrpc/svc.h
-include/gssrpc/svc_auth.h
-include/gssrpc/types.h
-include/gssrpc/xdr.h
-%%KRB4%%include/kerberosIV/des.h
-%%KRB4%%include/kerberosIV/kadm_err.h
-%%KRB4%%include/kerberosIV/krb.h
-%%KRB4%%include/kerberosIV/krb_err.h
-%%KRB4%%include/kerberosIV/mit-copyright.h
-include/krb5.h
-include/krb5/krb5.h
-include/krb5/locate_plugin.h
-include/profile.h
-lib/libcom_err.so
-lib/libcom_err.so.3
-lib/libdes425.so
-lib/libdes425.so.3
-lib/libgssapi_krb5.so
-lib/libgssapi_krb5.so.2
-lib/libgssrpc.so
-lib/libgssrpc.so.4
-lib/libk5crypto.so
-lib/libk5crypto.so.3
-lib/libkadm5clnt.so
-lib/libkadm5clnt.so.5
-lib/libkadm5srv.so
-lib/libkadm5srv.so.5
-lib/libkdb5.so
-lib/libkdb5.so.4
-%%KRB4%%lib/libkrb4.so
-%%KRB4%%lib/libkrb4.so.2
-lib/libkrb5.so
-lib/libkrb5.so.3
-lib/libkrb5support.so
-lib/libkrb5support.so.0
-lib/krb5/plugins/kdb/db2.so
-lib/krb5/plugins/preauth/pkinit.so
-sbin/ftpd
-sbin/gss-server
-sbin/k5srvutil
-sbin/kadmin
-sbin/kadmin.local
-sbin/kadmind
-sbin/kdb5_util
-sbin/klogind
-sbin/kprop
-sbin/kpropd
-sbin/krb5-send-pr
-%%KRB4%%sbin/krb524d
-sbin/krb5kdc
-sbin/kshd
-sbin/ktutil
-sbin/login.krb5
-sbin/sim_server
-sbin/sserver
-sbin/telnetd
-sbin/uuserver
-share/doc/krb5/README.FreeBSD
-share/et/et_c.awk
-share/et/et_h.awk
-share/examples/krb5/kdc.conf
-share/examples/krb5/krb5.conf
-share/examples/krb5/services.append
-share/gnats/mit
-@dirrm lib/krb5/plugins/preauth
-@dirrm lib/krb5/plugins/libkrb5
-@dirrm lib/krb5/plugins/kdb
-@dirrm lib/krb5/plugins
-@dirrm lib/krb5
-@dirrm include/gssapi
-@dirrm include/gssrpc
-@dirrm include/kerberosIV
-@dirrm include/krb5
-@dirrm share/et
-@dirrmtry share/gnats
-@dirrm share/examples/krb5
diff --git a/security/krb5-appl/Makefile b/security/krb5-appl/Makefile
deleted file mode 100644
index cfa3cb616930..000000000000
--- a/security/krb5-appl/Makefile
+++ /dev/null
@@ -1,143 +0,0 @@
-# Ports collection Makefile for: MIT Kerberos V
-# Date created: 6/5/1998
-# Whom: nectar@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= krb5
-PORTVERSION= 1.6.3
-PORTREVISION= 3
-CATEGORIES= security
-MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-signed
-EXTRACT_SUFX= .tar
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= An authentication system developed at MIT, successor to Kerberos IV
-
-BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-
-BROKEN= fails to install
-
-CONFLICTS= krb4-[0-9]* heimdal-[0-9]* srp-[0-9]*
-
-LATEST_LINK= ${PORTNAME}
-KERBEROSV_URL= http://web.mit.edu/kerberos/
-USE_OPENSSL= yes
-USE_GMAKE= yes
-USE_PERL5_BUILD= yes
-USE_LDCONFIG= yes
-USE_AUTOTOOLS= libtool:15
-CONFIGURE_ARGS?= --enable-shared
-# CONFIGURE_ARGS+= --disable-thread-support
-CONFIGURE_ENV= INSTALL="${INSTALL}" YACC=/usr/bin/yacc \
- CFLAGS="${CFLAGS}"
-MAKE_ARGS= INSTALL="${INSTALL}"
-KRB5_KRB4_COMPAT?= NO
-KRB5_DOC?= YES
-
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES"
-BUILD_DEPENDS+= texi2dvi:${PORTSDIR}/print/texinfo \
- dvips:${PORTSDIR}/print/dvipsk-tetex
-INFO= krb425 krb5-admin krb5-install krb5-user
-.endif
-
-.if !defined(KRB5_KRB4_COMPAT) || ${KRB5_KRB4_COMPAT} == "NO"
-CONFIGURE_ARGS+= --without-krb4
-PLIST_SUB+= KRB4="@comment "
-.else
-PLIST_SUB+= KRB4=""
-.endif
-
-.if defined(KRB5_HOME)
-PREFIX= ${KRB5_HOME}
-.endif
-
-MAN1= krb5-send-pr.1 krb5-config.1 kpasswd.1 klist.1 \
- kinit.1 kdestroy.1 ksu.1 sclient.1 rsh.1 rcp.1 \
- rlogin.1 ftp.1 telnet.1 kerberos.1 kvno.1 compile_et.1
-.if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
-MAN1+= krb524init.1 v4rcp.1
-.endif
-MAN5= kdc.conf.5 krb5.conf.5 .k5login.5
-MAN8= krb5kdc.8 kadmin.8 kadmin.local.8 kdb5_util.8 \
- ktutil.8 kadmind.8 kprop.8 kpropd.8 sserver.8 \
- kshd.8 klogind.8 login.krb5.8 ftpd.8 telnetd.8 \
- k5srvutil.8
-.if defined(KRB5_KRB4_COMPAT) && ${KRB5_KRB4_COMPAT} != "NO"
-MAN8+= krb524d.8
-.endif
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
-
-WANT_HTML?= YES
-HTML_DOC_DIR= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc
-HTML_DOCS= ftp.html kdestroy.html kinit.html klist.html \
- kpasswd.html krb425.html krb5-admin.html \
- krb5-install.html krb5-user.html ksu.html \
- rcp.html rlogin.html rsh.html telnet.html
-
-.include <bsd.port.pre.mk>
-
-.if defined(OPENSSL_INSTALLED)
-CONFIGURE_ARGS+= CPPFLAGS="-I${OPENSSLINC} -L${OPENSSLLIB}"
-.endif
-
-post-extract:
- @${TAR} -C ${WRKDIR} -xzf ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz
- @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz ${WRKDIR}/${PORTNAME}-${PORTVERSION}.tar.gz.asc
-.if !defined(EXTRACT_PRESERVE_OWNERSHIP)
- @if [ `id -u` = 0 ]; then \
- ${CHMOD} -R ug-s,go-w ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
- ${CHOWN} -R 0:0 ${WRKDIR}/${PORTNAME}-${PORTVERSION}; \
- fi
-.endif
-
-post-patch:
- @${REINPLACE_CMD} -e '1s,^#!\/usr\/athena/bin/perl,#!${PERL5},' \
- ${WRKSRC}/../doc/man2html
-
-pre-build:
-.if !defined(KRB5_KRB4_COMPAT)
- @${ECHO} "------------------------------------------------------"
- @${ECHO} "Set KRB5_KRB4_COMPAT=NO if you do not want to build "
- @${ECHO} "the KerberosIV compatibility libraries. "
- @${ECHO} "------------------------------------------------------"
-.endif
-
-post-build:
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES"
- @cd ${WRKSRC}/../doc && \
- ${MAKE} all
-.endif
-
-post-install:
- @${MKDIR} ${PREFIX}/share/doc/krb5
-# html documentation
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES" && defined(WANT_HTML) && ${WANT_HTML} == "YES"
- for html in ${HTML_DOC_DIR}/*.html; do \
- ${INSTALL_MAN} $${html} ${PREFIX}/share/doc/krb5; \
- ${ECHO_CMD} share/doc/krb5/`${BASENAME} $${html}` >> ${TMPPLIST}; \
- done
-.endif
- ${ECHO_CMD} @dirrm share/doc/krb5 >> ${TMPPLIST}
-# handle info files
-.if defined(KRB5_DOC) && ${KRB5_DOC} == "YES"
-.for info in ${INFO}
- ${INSTALL_MAN} ${WRKSRC}/../doc/${info}.info ${PREFIX}/info/${info}.info
-.endfor
-.endif
-
- @${SED} "s%\${PREFIX}%${PREFIX}%" ${FILESDIR}/README.FreeBSD > ${PREFIX}/share/doc/krb5/README.FreeBSD
- @${CHMOD} 444 ${PREFIX}/share/doc/krb5/README.FreeBSD
- @${ECHO} "------------------------------------------------------"
- @${ECHO} "This port of MIT Kerberos 5 includes remote login "
- @${ECHO} "daemons (telnetd and klogind). These daemons default "
- @${ECHO} "to using the system login program (/usr/bin/login). "
- @${ECHO} "Please see the file "
- @${ECHO} "${PREFIX}/share/doc/krb5/README.FreeBSD"
- @${ECHO} "for more information. "
- @${ECHO} "------------------------------------------------------"
-
-.include <bsd.port.post.mk>
diff --git a/security/krb5-appl/distinfo b/security/krb5-appl/distinfo
deleted file mode 100644
index f9332216ac64..000000000000
--- a/security/krb5-appl/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (krb5-1.6.3-signed.tar) = 2dc1307686eb1c2bf1ab08ea805dad46
-SHA256 (krb5-1.6.3-signed.tar) = 7a1bd7d4bd326828c8ee382ed2b69ccd6c58762601df897d6a32169d84583d2a
-SIZE (krb5-1.6.3-signed.tar) = 11909120
diff --git a/security/krb5-appl/files/README.FreeBSD b/security/krb5-appl/files/README.FreeBSD
deleted file mode 100644
index e888e689eb04..000000000000
--- a/security/krb5-appl/files/README.FreeBSD
+++ /dev/null
@@ -1,32 +0,0 @@
-The MIT KRB5 port provides its own login program at
-${PREFIX}/sbin/login.krb5. However, login.krb5 does not make use of
-the FreeBSD login.conf and login.access files that provide a means of
-setting up and controlling sessions under FreeBSD. To overcome this,
-the MIT KRB5 port uses the FreeBSD /usr/bin/login program to provide
-interactive login password authentication instead of the login.krb5
-program provided by MIT KRB5. The FreeBSD /usr/bin/login program does
-not have support for Kerberos V password authentication,
-e.g. authentication at the console. The pam_krb5 port must be used to
-provide Kerberos V password authentication.
-
-For more information about pam_krb5, please see pam(8) and pam_krb5(8).
-
-If you wish to use login.krb5 that is provided by the MIT KRB5 port,
-the arguments "-L ${PREFIX}/sbin/login.krb5" must be
-specified as arguments to klogind and KRB5 telnetd, e.g.
-
-klogin stream tcp nowait root ${PREFIX}/sbin/klogind klogind -k -c -L ${PREFIX}/sbin/login.krb5
-eklogin stream tcp nowait root ${PREFIX}/sbin/klogind klogind -k -c -e -L ${PREFIX}/sbin/login.krb5
-telnet stream tcp nowait root ${PREFIX}/sbin/telnetd telnetd -a none -L ${PREFIX}/sbin/login.krb5
-
-Additionally, if you wish to use the MIT KRB5 provided login.krb5 instead
-of the FreeBSD provided /usr/bin/login for local tty logins,
-"lo=${PREFIX}/sbin/login.krb5" must be specified in /etc/gettytab, e.g.,
-
-default:\
- :cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\
- :if=/etc/issue:\
- :lo=${PREFIX}/sbin/login.krb5:
-
-It is recommended that the FreeBSD /usr/bin/login be used with the
-pam_krb5 port instead of the MIT KRB5 provided login.krb5.
diff --git a/security/krb5-appl/files/patch-ac b/security/krb5-appl/files/patch-ac
deleted file mode 100644
index 8bca5437d964..000000000000
--- a/security/krb5-appl/files/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/admin.texinfo Fri Feb 6 21:40:56 1998
-+++ admin.texinfo Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-admin.info
- @settitle Kerberos V5 System Administrator's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Admin Guide: (krb5-admin). Kerberos V5 System Admin's Guide
-+@end direntry
- @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-appl/files/patch-ad b/security/krb5-appl/files/patch-ad
deleted file mode 100644
index c8b6d3e99e91..000000000000
--- a/security/krb5-appl/files/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/user-guide.texinfo Fri Feb 6 21:40:58 1998
-+++ user-guide.texinfo Fri Jun 19 15:13:45 1998
-@@ -3,6 +3,10 @@
- @c guide
- @setfilename krb5-user.info
- @settitle Kerberos V5 UNIX User's Guide
-+@dircategory Kerberos V5
-+@direntry
-+* User's Guide: (krb5-user). Kerberos V5 UNIX User's Guide
-+@end direntry
- @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-appl/files/patch-ae b/security/krb5-appl/files/patch-ae
deleted file mode 100644
index f5643b5aa04f..000000000000
--- a/security/krb5-appl/files/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/install.texinfo Fri Feb 6 21:40:56 1998
-+++ install.texinfo Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb5-install.info
- @settitle Kerberos V5 Installation Guide
-+@dircategory Kerberos V5
-+@direntry
-+* Installation Guide: (krb5-install). Kerberos V5 Installation Guide
-+@end direntry
- @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-appl/files/patch-af b/security/krb5-appl/files/patch-af
deleted file mode 100644
index 49425d6efceb..000000000000
--- a/security/krb5-appl/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/krb425.texinfo Fri Feb 6 21:40:57 1998
-+++ krb425.texinfo Fri Jun 19 15:13:45 1998
-@@ -5,6 +5,10 @@
- @c guide
- @setfilename krb425.info
- @settitle Upgrading to Kerberos V5 from Kerberos V4
-+@dircategory Kerberos V5
-+@direntry
-+* Upgrading from V4 to V5: (krb425). Upgrading from Kerberos V4 to V5
-+@end direntry
- @c @setchapternewpage odd @c chapter begins on next odd page
- @c @setchapternewpage on @c chapter begins on next page
- @c @smallbook @c Format for 7" X 9.25" paper
diff --git a/security/krb5-appl/files/patch-ai b/security/krb5-appl/files/patch-ai
deleted file mode 100644
index f5b733194344..000000000000
--- a/security/krb5-appl/files/patch-ai
+++ /dev/null
@@ -1,28 +0,0 @@
---- appl/gssftp/ftpd/ftpd.c.orig Wed Jan 9 14:26:51 2002
-+++ appl/gssftp/ftpd/ftpd.c Thu Jan 10 19:00:13 2002
-@@ -487,7 +487,13 @@
- #ifndef LOG_DAEMON
- #define LOG_DAEMON 0
- #endif
-- openlog("ftpd", LOG_PID | LOG_NDELAY, LOG_DAEMON);
-+
-+#ifndef LOG_FTP
-+#define FACILITY LOG_DAEMON
-+#else
-+#define FACILITY LOG_FTP
-+#endif
-+ openlog("ftpd", LOG_PID | LOG_NDELAY, FACILITY);
-
- addrlen = sizeof (his_addr);
- if (getpeername(0, (struct sockaddr *)&his_addr, &addrlen) < 0) {
-@@ -2312,6 +2318,10 @@
- if ((length = krb_mk_safe((u_char *)&cksum, out_buf, sizeof(cksum),
- &kdata.session,&ctrl_addr, &his_addr)) == -1) {
- secure_error("ADAT: krb_mk_safe failed");
-+ return(0);
-+ }
-+ if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
-+ secure_error("ADAT: reply too long");
- return(0);
- }
- if (length >= (FTP_BUFSIZ - sizeof("ADAT=")) / 4 * 3) {
diff --git a/security/krb5-appl/files/patch-aj b/security/krb5-appl/files/patch-aj
deleted file mode 100644
index c3bb8dfd6960..000000000000
--- a/security/krb5-appl/files/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-*** appl/gssftp/ftpd/logwtmp.c.ORIG Fri Feb 6 19:41:25 1998
---- appl/gssftp/ftpd/logwtmp.c Tue Jun 30 19:46:01 1998
-***************
-*** 66,72 ****
- struct stat buf;
- time_t time();
-
-! if (fd < 0 && (fd = open(WTMPFILE, O_WRONLY|O_APPEND, 0)) < 0)
- return;
- if (fstat(fd, &buf) == 0) {
- (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
---- 66,72 ----
- struct stat buf;
- time_t time();
-
-! if (fd < 0 && (fd = open(WTMP_FILE, O_WRONLY|O_APPEND, 0)) < 0)
- return;
- if (fstat(fd, &buf) == 0) {
- (void)strncpy(ut.ut_line, line, sizeof(ut.ut_line));
diff --git a/security/krb5-appl/files/patch-appl::bsd::Makefile.in b/security/krb5-appl/files/patch-appl::bsd::Makefile.in
deleted file mode 100644
index 581048933264..000000000000
--- a/security/krb5-appl/files/patch-appl::bsd::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- appl/bsd/Makefile.in.orig Wed Feb 28 14:06:43 2001
-+++ appl/bsd/Makefile.in Mon Dec 31 21:52:45 2001
-@@ -31,8 +31,8 @@
- -DUCB_RSH=\"$(UCB_RSH)\" -DUCB_RCP=\"$(UCB_RCP)\"
-
- DEFINES = $(RSH) $(BSD) $(RPROGS) -DKERBEROS \
-- -DLOGIN_PROGRAM=\"$(SERVER_BINDIR)/login.krb5\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \
-+ -DLOGIN_PROGRAM=\"/usr/bin/login\" -DKPROGDIR=\"$(CLIENT_BINDIR)\" \
- -DHEIMDAL_FRIENDLY
-
- all:: rsh rcp rlogin kshd klogind login.krb5 $(V4RCP)
-
diff --git a/security/krb5-appl/files/patch-appl::bsd::klogind.M b/security/krb5-appl/files/patch-appl::bsd::klogind.M
deleted file mode 100644
index 9cddd5fc222d..000000000000
--- a/security/krb5-appl/files/patch-appl::bsd::klogind.M
+++ /dev/null
@@ -1,35 +0,0 @@
---- appl/bsd/klogind.M.orig Wed Feb 28 14:06:43 2001
-+++ appl/bsd/klogind.M Mon Dec 31 21:22:27 2001
-@@ -14,7 +14,7 @@
- .B \-kr54cpPef
- ]
- [[ \fB\-w\fP[\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP ]] ]
--[ \fB\-D\fP \fIport\fP ]
-+[ \fB\-D\fP \fIport\fP ] [\fB\-L\fP \fIloginpath\fP]
- .SH DESCRIPTION
- .I Klogind
- is the server for the
-@@ -107,6 +108,10 @@
- Beta5 (May 1995)--present bogus checksums that prevent Kerberos
- authentication from succeeding in the default mode.
-
-+.IP \fB\-L\ loginpath\fP
-+Specify pathname to an alternative login program. Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
-+
-
- .PP
- If the
-@@ -157,12 +162,6 @@
-
- .IP \fB\-M\ realm\fP
- Set the Kerberos realm to use.
--
--.IP \fB\-L\ login\fP
--Set the login program to use. This option only has an effect if
--DO_NOT_USE_K_LOGIN was not defined when
--.I klogind
--was compiled.
-
- .IP \fB\-D\ port\fP
- Run in standalone mode, listening on \fBport\fP. The daemon will exit
diff --git a/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h b/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h
deleted file mode 100644
index 256e929aa68f..000000000000
--- a/security/krb5-appl/files/patch-appl::gssftp::ftp::ftp_var.h
+++ /dev/null
@@ -1,23 +0,0 @@
---- appl/gssftp/ftp/ftp_var.h.orig Tue Jun 17 02:37:40 2003
-+++ appl/gssftp/ftp/ftp_var.h Sat Aug 30 05:30:44 2003
-@@ -33,6 +33,10 @@
- * @(#)ftp_var.h 5.9 (Berkeley) 6/1/90
- */
-
-+#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version > 500000
-+#undef __BSD_VISIBLE
-+#endif
-+
- #ifdef _WIN32
- #include <windows.h>
- #include <winsock2.h>
-@@ -57,9 +61,7 @@
- typedef void (*sig_t)(int);
- typedef void sigtype;
- #else
--#define sig_t my_sig_t
- #define sigtype krb5_sigtype
--typedef sigtype (*sig_t)();
- #endif
-
- /*
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in b/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in
deleted file mode 100644
index cb5a0e26d49d..000000000000
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- appl/telnet/telnetd/Makefile.in.orig Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/Makefile.in Mon Dec 31 21:51:19 2001
-@@ -24,7 +24,7 @@
- # @(#)Makefile.generic 5.5 (Berkeley) 3/1/91
- #
-
--AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=KRB5_PATH_LOGIN
-+AUTH_DEF=-DAUTHENTICATION -DENCRYPTION -DKRB5 -DFORWARD -UNO_LOGIN_F -ULOGIN_CAP_F -DLOGIN_PROGRAM=\"/usr/bin/login\"
- OTHERDEFS=-DKLUDGELINEMODE -DDIAGNOSTICS -DENV_HACK -DOLD_ENVIRON
- LOCALINCLUDES=-I.. -I$(srcdir)/..
- DEFINES = $(AUTH_DEF) $(OTHERDEFS)
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8 b/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8
deleted file mode 100644
index 951ee0d5692a..000000000000
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::telnetd.8
+++ /dev/null
@@ -1,22 +0,0 @@
---- appl/telnet/telnetd/telnetd.8.orig Wed Feb 28 14:06:51 2001
-+++ appl/telnet/telnetd/telnetd.8 Mon Dec 31 21:16:55 2001
-@@ -43,7 +43,7 @@
- [\fB\-k\fP] [\fB\-n\fP] [\fB\-r\fP\fIlowpty-highpty\fP] [\fB\-s\fP]
- [\fB\-S\fP \fItos\fP] [\fB\-U\fP] [\fB\-X\fP \fIauthtype\fP]
- [\fB\-w\fP [\fBip\fP|\fImaxhostlen\fP[\fB,\fP[\fBno\fP]\fBstriplocal\fP]]]
--[\fB\-debug\fP [\fIport\fP]]
-+[\fB\-debug\fP] [\fB\-L\fP \fIloginpath\fP] [\fIport\fP]
- .SH DESCRIPTION
- The
- .B telnetd
-@@ -221,6 +221,10 @@
- in response to a
- .SM DO TIMING-MARK)
- for kludge linemode support.
-+.TP
-+\fB\-L\fP \fIloginpath\fP
-+Specify pathname to an alternative login program. Default: /usr/bin/login.
-+KRB5_HOME/sbin/login.krb5 may be specified.
- .TP
- .B \-l
- Specifies line mode. Tries to force clients to use line-at-a-time
diff --git a/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c b/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
deleted file mode 100644
index 8bb656dc0673..000000000000
--- a/security/krb5-appl/files/patch-appl::telnet::telnetd::utility.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- appl/telnet/telnetd/utility.c.orig Wed Jan 9 14:26:59 2002
-+++ appl/telnet/telnetd/utility.c Fri Jan 11 13:10:33 2002
-@@ -408,18 +408,25 @@
- int
- netwrite(const char *buf, size_t len)
- {
-- size_t remain;
-+ int remaining, copied;
-+
-+ remaining = BUFSIZ - (nfrontp - netobuf);
-+ while (len > 0) {
-+ /* Free up enough space if the room is too low*/
-+ if ((len > BUFSIZ ? BUFSIZ : len) > remaining) {
-+ netflush();
-+ remaining = BUFSIZ - (nfrontp - netobuf);
-+ }
-
-- remain = sizeof(netobuf) - (nfrontp - netobuf);
-- if (remain < len) {
-- netflush();
-- remain = sizeof(netobuf) - (nfrontp - netobuf);
-+ /* Copy out as much as will fit */
-+ copied = remaining > len ? len : remaining;
-+ memmove(nfrontp, buf, copied);
-+ nfrontp += copied;
-+ len -= copied;
-+ remaining -= copied;
-+ buf += copied;
- }
-- if (remain < len)
-- return 0;
-- memcpy(nfrontp, buf, len);
-- nfrontp += len;
-- return len;
-+ return copied;
- }
-
- /*
diff --git a/security/krb5-appl/files/patch-as b/security/krb5-appl/files/patch-as
deleted file mode 100644
index de19886eac08..000000000000
--- a/security/krb5-appl/files/patch-as
+++ /dev/null
@@ -1,195 +0,0 @@
---- clients/ksu/main.c.orig Wed Aug 14 12:14:49 2002
-+++ clients/ksu/main.c Tue Jul 29 18:46:00 2003
-@@ -32,6 +32,10 @@
- #include <signal.h>
- #include <grp.h>
-
-+#ifdef LOGIN_CAP
-+#include <login_cap.h>
-+#endif
-+
- /* globals */
- char * prog_name;
- int auth_debug =0;
-@@ -61,7 +65,7 @@
- ill specified arguments to commands */
-
- void usage (){
-- fprintf(stderr, "Usage: %s [target user] [-n principal] [-c source cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
-+ fprintf(stderr, "Usage: %s [target user] [-m] [-n principal] [-c source cachename] [-C target cachename] [-k] [-D] [-r time] [-pf] [-l lifetime] [-zZ] [-q] [-e command [args... ] ] [-a [args... ] ]\n", prog_name);
- }
-
- /* for Ultrix and friends ... */
-@@ -77,6 +81,7 @@
- int argc;
- char ** argv;
- {
-+ int asme = 0;
- int hp =0;
- int some_rest_copy = 0;
- int all_rest_copy = 0;
-@@ -91,6 +96,7 @@
- char * cc_target_tag = NULL;
- char * target_user = NULL;
- char * source_user;
-+ char * source_shell;
-
- krb5_ccache cc_source = NULL;
- const char * cc_source_tag = NULL;
-@@ -117,6 +123,11 @@
- krb5_principal kdc_server;
- krb5_boolean zero_password;
- char * dir_of_cc_target;
-+
-+#ifdef LOGIN_CAP
-+ login_cap_t *lc;
-+ int setwhat;
-+#endif
-
- options.opt = KRB5_DEFAULT_OPTIONS;
- options.lifetime = KRB5_DEFAULT_TKT_LIFE;
-@@ -181,7 +192,7 @@
- com_err (prog_name, errno, "while setting euid to source user");
- exit (1);
- }
-- while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkql:e:")) != -1)){
-+ while(!done && ((option = getopt(pargc, pargv,"n:c:r:a:zZDfpkmql:e:")) != -1)){
- switch (option) {
- case 'r':
- options.opt |= KDC_OPT_RENEWABLE;
-@@ -227,6 +238,9 @@
- errflg++;
- }
- break;
-+ case 'm':
-+ asme = 1;
-+ break;
- case 'n':
- if ((retval = krb5_parse_name(ksu_context, optarg, &client))){
- com_err(prog_name, retval, "when parsing name %s", optarg);
-@@ -341,6 +355,7 @@
-
- /* allocate space and copy the usernamane there */
- source_user = xstrdup(pwd->pw_name);
-+ source_shell = xstrdup(pwd->pw_shell);
- source_uid = pwd->pw_uid;
- source_gid = pwd->pw_gid;
-
-@@ -672,43 +687,64 @@
- /* get the shell of the user, this will be the shell used by su */
- target_pwd = getpwnam(target_user);
-
-- if (target_pwd->pw_shell)
-- shell = xstrdup(target_pwd->pw_shell);
-- else {
-- shell = _DEF_CSH; /* default is cshell */
-+ if (asme) {
-+ if (source_shell && *source_shell) {
-+ shell = strdup(source_shell);
-+ } else {
-+ shell = _DEF_CSH;
-+ }
-+ } else {
-+ if (target_pwd->pw_shell)
-+ shell = strdup(target_pwd->pw_shell);
-+ else {
-+ shell = _DEF_CSH; /* default is cshell */
-+ }
- }
-
- #ifdef HAVE_GETUSERSHELL
-
- /* insist that the target login uses a standard shell (root is omited) */
-
-- if (!standard_shell(target_pwd->pw_shell) && source_uid) {
-- fprintf(stderr, "ksu: permission denied (shell).\n");
-- sweep_up(ksu_context, cc_target);
-- exit(1);
-+ if (asme) {
-+ if (!standard_shell(pwd->pw_shell) && source_uid) {
-+ fprintf(stderr, "ksu: permission denied (shell).\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
-+ } else {
-+ if (!standard_shell(target_pwd->pw_shell) && source_uid) {
-+ fprintf(stderr, "ksu: permission denied (shell).\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
- }
- #endif /* HAVE_GETUSERSHELL */
-
-- if (target_pwd->pw_uid){
--
-- if(set_env_var("USER", target_pwd->pw_name)){
-+ if (!asme) {
-+ if (target_pwd->pw_uid){
-+ if (set_env_var("USER", target_pwd->pw_name)){
-+ fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
-+ }
-+
-+ if (set_env_var( "HOME", target_pwd->pw_dir)){
- fprintf(stderr,"ksu: couldn't set environment variable USER\n");
- sweep_up(ksu_context, cc_target);
- exit(1);
-- }
-- }
--
-- if(set_env_var( "HOME", target_pwd->pw_dir)){
-- fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-- sweep_up(ksu_context, cc_target);
-- exit(1);
-- }
-+ }
-
-- if(set_env_var( "SHELL", shell)){
-- fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-- sweep_up(ksu_context, cc_target);
-- exit(1);
-- }
-+ if (set_env_var( "SHELL", shell)){
-+ fprintf(stderr,"ksu: couldn't set environment variable USER\n");
-+ sweep_up(ksu_context, cc_target);
-+ exit(1);
-+ }
-+ }
-+
-+#ifdef LOGIN_CAP
-+ lc = login_getpwclass(pwd);
-+#endif
-
- /* set the cc env name to target */
-
-@@ -718,7 +754,19 @@
- sweep_up(ksu_context, cc_target);
- exit(1);
- }
--
-+
-+#ifdef LOGIN_CAP
-+ setwhat = LOGIN_SETUSER|LOGIN_SETGROUP|LOGIN_SETRESOURCES|LOGIN_SETPRIORITY;
-+ setwhat |= LOGIN_SETPATH|LOGIN_SETUMASK|LOGIN_SETENV;
-+ /*
-+ * Don't touch resource/priority settings if -m has been
-+ * used or -l and -c hasn't, and we're not su'ing to root.
-+ */
-+ if (target_pwd->pw_uid)
-+ setwhat &= ~(LOGIN_SETPRIORITY|LOGIN_SETRESOURCES);
-+ if (setusercontext(lc, target_pwd, target_pwd->pw_uid, setwhat) < 0)
-+ err(1, "setusercontext");
-+#else
- /* set permissions */
- if (setgid(target_pwd->pw_gid) < 0) {
- perror("ksu: setgid");
-@@ -759,6 +807,7 @@
- sweep_up(ksu_context, cc_target);
- exit(1);
- }
-+#endif
-
- if (access( cc_target_tag_tmp, R_OK | W_OK )){
- com_err(prog_name, errno,
diff --git a/security/krb5-appl/files/patch-at b/security/krb5-appl/files/patch-at
deleted file mode 100644
index 060207ec644a..000000000000
--- a/security/krb5-appl/files/patch-at
+++ /dev/null
@@ -1,14 +0,0 @@
-*** include/syslog.h.ORIG Fri Feb 6 19:42:12 1998
---- include/syslog.h Tue Jun 30 19:46:02 1998
-***************
-*** 34,39 ****
---- 34,42 ----
- #define LOG_LPR (6<<3) /* line printer subsystem */
- #define LOG_NEWS (7<<3) /* network news subsystem */
- #define LOG_UUCP (8<<3) /* UUCP subsystem */
-+ #if (defined(BSD) && (BSD >= 199306))
-+ #define LOG_FTP (11<<3) /* ftp daemon */
-+ #endif
- /* other codes through 15 reserved for system use */
- #define LOG_LOCAL0 (16<<3) /* reserved for local use */
- #define LOG_LOCAL1 (17<<3) /* reserved for local use */
diff --git a/security/krb5-appl/files/patch-av b/security/krb5-appl/files/patch-av
deleted file mode 100644
index 8363b8bb1e2d..000000000000
--- a/security/krb5-appl/files/patch-av
+++ /dev/null
@@ -1,15 +0,0 @@
-*** clients/ksu/Makefile.in.ORIG Sun Aug 2 16:51:18 1998
---- clients/ksu/Makefile.in Sun Aug 2 16:53:48 1998
-***************
-*** 3,7 ****
- mydir=ksu
- BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/bin /local/bin"'
- CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-
---- 3,7 ----
- mydir=ksu
- BUILDTOP=$(REL)$(U)$(S)$(U)
-! DEFINES = -DGET_TGT_VIA_PASSWD -DPRINC_LOOK_AHEAD -DCMD_PATH='"/usr/bin /bin /usr/sbin /sbin"'
- CFLAGS = $(CCOPTS) $(DEFINES) $(DEFS) $(LOCALINCLUDE)
-
diff --git a/security/krb5-appl/files/patch-ax b/security/krb5-appl/files/patch-ax
deleted file mode 100644
index 6cbb8289f93e..000000000000
--- a/security/krb5-appl/files/patch-ax
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../doc/Makefile.orig 2007-09-17 20:36:09.000000000 -0700
-+++ ../doc/Makefile 2007-10-25 14:04:48.000000000 -0700
-@@ -1,8 +1,8 @@
- SRCDIR=../src
--DVI=texi2dvi4a2ps # texi2dvi
-+DVI=texi2dvi # texi2dvi
- DVIPS=dvips -o "$@"
- PSPDF=ps2pdf
--INFO=makeinfo
-+INFO=makeinfo --no-validate --no-split
- HTML=makeinfo --html --no-split
- RM=rm -f
- TAR=tar -chvf
diff --git a/security/krb5-appl/files/patch-ay b/security/krb5-appl/files/patch-ay
deleted file mode 100644
index a6cb9ebbfd13..000000000000
--- a/security/krb5-appl/files/patch-ay
+++ /dev/null
@@ -1,50 +0,0 @@
---- appl/libpty/getpty.c.orig Wed Jan 9 14:28:37 2002
-+++ appl/libpty/getpty.c Thu Jan 10 21:30:40 2002
-@@ -24,13 +24,26 @@
- #include "libpty.h"
- #include "pty-int.h"
-
-+#ifdef __FreeBSD__
-+#define PTYCHARS1 "pqrsPQRS"
-+#define PTYCHARS2 "0123456789abcdefghijklmnopqrstuv"
-+#endif
-+
-+#ifndef PTYCHARS1
-+#define PTYCHARS1 "pqrstuvwxyzPQRST"
-+#endif
-+
-+#ifndef PTYCHARS2
-+#define PTYCHARS2 "0123456789abcdef"
-+#endif
-+
- long
- ptyint_getpty_ext(int *fd, char *slave, int slavelength, int do_grantpt)
- {
-+ int ptynum;
-+ char *cp1, *cp2;
- #if !defined(HAVE__GETPTY) && !defined(HAVE_OPENPTY)
-- char *cp;
- char *p;
-- int i,ptynum;
- struct stat stb;
- char slavebuf[1024];
- #endif
-@@ -115,14 +128,14 @@
- strncpy(slave, slavebuf, slavelength);
- return 0;
- } else {
-- for (cp = "pqrstuvwxyzPQRST";*cp; cp++) {
-+ for (cp1 = PTYCHARS1; *cp1 != '\0'; cp1++) {
- sprintf(slavebuf,"/dev/ptyXX");
-- slavebuf[sizeof("/dev/pty") - 1] = *cp;
-+ slavebuf[sizeof("/dev/pty") - 1] = *cp1;
- slavebuf[sizeof("/dev/ptyp") - 1] = '0';
- if (stat(slavebuf, &stb) < 0)
- break;
-- for (i = 0; i < 16; i++) {
-- slavebuf[sizeof("/dev/ptyp") - 1] = "0123456789abcdef"[i];
-+ for (cp2 = PTYCHARS2; *cp2 != '\0'; cp2++) {
-+ slavebuf[sizeof("/dev/ptyp") - 1] = *cp2;
- *fd = open(slavebuf, O_RDWR);
- if (*fd < 0) continue;
-
diff --git a/security/krb5-appl/files/patch-ba b/security/krb5-appl/files/patch-ba
deleted file mode 100644
index dd0c760df7d2..000000000000
--- a/security/krb5-appl/files/patch-ba
+++ /dev/null
@@ -1,77 +0,0 @@
---- appl/bsd/login.c.orig Tue May 27 21:06:25 2003
-+++ appl/bsd/login.c Tue Jul 29 20:52:25 2003
-@@ -1342,19 +1342,6 @@
- setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
- }
-
-- /* Policy: If local password is good, user is good.
-- We really can't trust the Kerberos password,
-- because somebody on the net could spoof the
-- Kerberos server (not easy, but possible).
-- Some sites might want to use it anyways, in
-- which case they should change this line
-- to:
-- if (kpass_ok)
-- */
--
-- if (lpass_ok)
-- break;
--
- if (got_v5_tickets) {
- retval = krb5_verify_init_creds(kcontext, &my_creds, NULL,
- NULL, &xtra_creds,
-@@ -1378,6 +1365,9 @@
- }
- #endif /* KRB4_GET_TICKETS */
-
-+ if (lpass_ok)
-+ break;
-+
- bad_login:
- setpriority(PRIO_PROCESS, 0, 0 + PRIO_OFFSET);
-
-@@ -1667,21 +1657,23 @@
- /* set up credential cache -- obeying KRB5_ENV_CCNAME
- set earlier */
- /* (KRB5_ENV_CCNAME == "KRB5CCNAME" via osconf.h) */
-- if ((retval = krb5_cc_default(kcontext, &ccache))) {
-+ if ((retval = krb5_cc_default(kcontext, &ccache)))
- com_err(argv[0], retval, "while getting default ccache");
-- } else if ((retval = krb5_cc_initialize(kcontext, ccache, me))) {
-- com_err(argv[0], retval, "when initializing cache");
-- } else if ((retval = krb5_cc_store_cred(kcontext, ccache,
-- &my_creds))) {
-- com_err(argv[0], retval, "while storing credentials");
-- } else if (xtra_creds &&
-- (retval = krb5_cc_copy_creds(kcontext, xtra_creds,
-- ccache))) {
-- com_err(argv[0], retval, "while storing credentials");
-+ else {
-+ if (retval = krb5_cc_initialize(kcontext, ccache, me))
-+ com_err(argv[0], retval, "when initializing cache");
-+ else {
-+ if (retval = krb5_cc_store_cred(kcontext, ccache, &my_creds))
-+ com_err(argv[0], retval, "while storing credentials");
-+ else {
-+ if (xtra_creds &&
-+ (retval = krb5_cc_copy_creds(kcontext, xtra_creds, ccache))) {
-+ com_err(argv[0], retval, "while storing credentials");
-+ krb5_cc_destroy(kcontext, xtra_creds);
-+ }
-+ }
-+ }
- }
--
-- if (xtra_creds)
-- krb5_cc_destroy(kcontext, xtra_creds);
- } else if (forwarded_v5_tickets && rewrite_ccache) {
- if ((retval = krb5_cc_initialize (kcontext, ccache, me))) {
- syslog(LOG_ERR,
-@@ -1762,6 +1754,7 @@
-
- if (ccname)
- setenv("KRB5CCNAME", ccname, 1);
-+ krb5_cc_set_default_name(kcontext, ccname);
-
- setenv("HOME", pwd->pw_dir, 1);
- setenv("PATH", LPATH, 1);
diff --git a/security/krb5-appl/files/patch-bb b/security/krb5-appl/files/patch-bb
deleted file mode 100644
index 6545ae682c53..000000000000
--- a/security/krb5-appl/files/patch-bb
+++ /dev/null
@@ -1,10 +0,0 @@
---- appl/telnet/telnet/Makefile.in.orig Sat Dec 18 10:47:05 1999
-+++ appl/telnet/telnet/Makefile.in Sat Dec 18 10:47:13 1999
-@@ -58,7 +58,6 @@
- $(INSTALL_DATA) $(srcdir)/$$f.1 \
- ${DESTDIR}$(CLIENT_MANDIR)/`echo $$f|sed '$(transform)'`.1; \
- done
-- $(INSTALL_DATA) $(srcdir)/tmac.doc ${DESTDIR}$(CLIENT_MANDIR)/tmac.doc
-
- authenc.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
- commands.o: defines.h externs.h general.h ring.h types.h $(ARPA_TELNET)
diff --git a/security/krb5-appl/files/patch-config::pre.in b/security/krb5-appl/files/patch-config::pre.in
deleted file mode 100644
index bdd183e98ad4..000000000000
--- a/security/krb5-appl/files/patch-config::pre.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- config/pre.in.orig Fri Nov 19 13:47:51 2004
-+++ config/pre.in Thu Jan 27 17:43:12 2005
-@@ -177,7 +177,7 @@
- INSTALL=@INSTALL@
- INSTALL_STRIP=
- INSTALL_PROGRAM=@INSTALL_PROGRAM@ $(INSTALL_STRIP)
--INSTALL_SCRIPT=@INSTALL_PROGRAM@
-+INSTALL_SCRIPT=@INSTALL_SCRIPT@
- INSTALL_DATA=@INSTALL_DATA@
- INSTALL_SHLIB=@INSTALL_SHLIB@
- INSTALL_SETUID=$(INSTALL) $(INSTALL_STRIP) -m 4755 -o root
diff --git a/security/krb5-appl/files/patch-config::shlib.conf b/security/krb5-appl/files/patch-config::shlib.conf
deleted file mode 100644
index 18f91fffc6d5..000000000000
--- a/security/krb5-appl/files/patch-config::shlib.conf
+++ /dev/null
@@ -1,30 +0,0 @@
---- config/shlib.conf.orig Mon Oct 23 05:20:11 2006
-+++ config/shlib.conf Wed Mar 28 17:17:55 2007
-@@ -258,22 +258,15 @@
- ;;
-
- *-*-freebsd*)
-- if test -x /usr/bin/objformat ; then
-- objformat=`/usr/bin/objformat`
-- else
-- objformat="aout"
-- fi
-- PICFLAGS=-fpic
-- if test "x$objformat" = "xelf" ; then
-+ case $krb5_cv_host in
-+ sparc64-*) PICFLAGS=-fPIC;;
-+ *) PICFLAGS=-fpic;;
-+ esac
- SHLIBVEXT='.so.$(LIBMAJOR)'
-+ LDCOMBINE="libtool --mode=link cc -shared"
- RPATH_FLAG='-Wl,-rpath -Wl,'
-- else
-- RPATH_FLAG=-R
-- SHLIBVEXT='.so.$(LIBMAJOR).$(LIBMINOR)'
-- fi
- CC_LINK_SHARED='$(CC) $(PROG_LIBPATH) $(RPATH_FLAG)$(PROG_RPATH) $(CFLAGS) $(LDFLAGS)'
- SHLIBEXT=.so
-- LDCOMBINE='ld -Bshareable'
- SHLIB_EXPFLAGS='-R$(SHLIB_RDIRS) $(SHLIB_DIRS) $(SHLIB_EXPLIBS)'
- CC_LINK_STATIC='$(CC) $(PROG_LIBPATH) $(CFLAGS) $(LDFLAGS)'
- RUN_ENV='LD_LIBRARY_PATH=`echo $(PROG_LIBPATH) | sed -e "s/-L//g" -e "s/ /:/g"`; export LD_LIBRARY_PATH;'
diff --git a/security/krb5-appl/files/patch-lib-krb5-os-localaddr.c b/security/krb5-appl/files/patch-lib-krb5-os-localaddr.c
deleted file mode 100644
index 9e701ba97985..000000000000
--- a/security/krb5-appl/files/patch-lib-krb5-os-localaddr.c
+++ /dev/null
@@ -1,75 +0,0 @@
---- lib/krb5/os/localaddr.c.orig Wed Apr 13 09:55:43 2005
-+++ lib/krb5/os/localaddr.c Sun Jul 16 09:29:05 2006
-@@ -436,12 +436,14 @@
- #endif
- if ((ifp->ifa_flags & IFF_UP) == 0)
- continue;
-+#if 0
- if (ifp->ifa_flags & IFF_LOOPBACK) {
- /* Pretend it's not up, so the second pass will skip
- it. */
- ifp->ifa_flags &= ~IFF_UP;
- continue;
- }
-+#endif
- if (ifp->ifa_addr == NULL) {
- /* Can't use an interface without an address. Linux
- apparently does this sometimes. [RT ticket 1770 from
-@@ -459,8 +461,10 @@
- for (ifp2 = ifp_head; ifp2 && ifp2 != ifp; ifp2 = ifp2->ifa_next) {
- if ((ifp2->ifa_flags & IFF_UP) == 0)
- continue;
-+#if 0
- if (ifp2->ifa_flags & IFF_LOOPBACK)
- continue;
-+#endif
- if (addr_eq (ifp->ifa_addr, ifp2->ifa_addr)) {
- match = 1;
- ifp->ifa_flags &= ~IFF_UP;
-@@ -583,6 +587,7 @@
- }
- /*@=moduncon@*/
-
-+#if 0
- #ifdef IFF_LOOPBACK
- /* None of the current callers want loopback addresses. */
- if (lifreq.lifr_flags & IFF_LOOPBACK) {
-@@ -590,6 +595,7 @@
- goto skip;
- }
- #endif
-+#endif
- /* Ignore interfaces that are down. */
- if ((lifreq.lifr_flags & IFF_UP) == 0) {
- Tprintf ((" down\n"));
-@@ -755,6 +761,7 @@
- }
- /*@=moduncon@*/
-
-+#if 0
- #ifdef IFF_LOOPBACK
- /* None of the current callers want loopback addresses. */
- if (lifreq.iflr_flags & IFF_LOOPBACK) {
-@@ -762,6 +769,7 @@
- goto skip;
- }
- #endif
-+#endif
- /* Ignore interfaces that are down. */
- if ((lifreq.iflr_flags & IFF_UP) == 0) {
- Tprintf ((" down\n"));
-@@ -971,12 +979,14 @@
- }
- /*@=moduncon@*/
-
-+#if 0
- #ifdef IFF_LOOPBACK
- /* None of the current callers want loopback addresses. */
- if (ifreq.ifr_flags & IFF_LOOPBACK) {
- Tprintf ((" loopback\n"));
- goto skip;
- }
-+#endif
- #endif
- /* Ignore interfaces that are down. */
- if ((ifreq.ifr_flags & IFF_UP) == 0) {
diff --git a/security/krb5-appl/files/patch-lib::gssapi::krb5::import_name.c b/security/krb5-appl/files/patch-lib::gssapi::krb5::import_name.c
deleted file mode 100644
index 40f116af2196..000000000000
--- a/security/krb5-appl/files/patch-lib::gssapi::krb5::import_name.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- lib/gssapi/krb5/import_name.c.orig Mon Jul 18 15:12:42 2005
-+++ lib/gssapi/krb5/import_name.c Tue Nov 8 09:53:58 2005
-@@ -33,6 +33,11 @@
- #endif
- #endif
-
-+#include <sys/param.h>
-+#if __FreeBSD_version < 500100
-+#include <stdio.h>
-+#endif
-+
- #ifdef HAVE_STRING_H
- #include <string.h>
- #else
diff --git a/security/krb5-appl/files/patch-plugins-preauth-pkinit-Makefile.in b/security/krb5-appl/files/patch-plugins-preauth-pkinit-Makefile.in
deleted file mode 100644
index cb464470b1cf..000000000000
--- a/security/krb5-appl/files/patch-plugins-preauth-pkinit-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/preauth/pkinit/Makefile.in.orig 2007-09-28 18:02:10.000000000 -0700
-+++ plugins/preauth/pkinit/Makefile.in 2007-10-29 07:03:24.000000000 -0700
-@@ -21,7 +21,7 @@
- $(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- $(TOPLIBD)/libkrb5$(SHLIBEXT)
- LIBS+= -lcrypto
--SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto -ldl $(SUPPORT_LIB) $(LIBS)
-+SHLIB_EXPLIBS= -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(LIBS)
-
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
diff --git a/security/krb5-appl/pkg-descr b/security/krb5-appl/pkg-descr
deleted file mode 100644
index d11e2e6d1c15..000000000000
--- a/security/krb5-appl/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-Kerberos V5 is an authentication system developed at MIT.
-WWW: http://web.mit.edu/kerberos/
-
-Abridged from the User Guide:
- Under Kerberos, a client sends a request for a ticket to the
- Key Distribution Center (KDC). The KDC creates a ticket-granting
- ticket (TGT) for the client, encrypts it using the client's
- password as the key, and sends the encrypted TGT back to the
- client. The client then attempts to decrypt the TGT, using
- its password. If the client successfully decrypts the TGT, it
- keeps the decrypted TGT, which indicates proof of the client's
- identity. The TGT permits the client to obtain additional tickets,
- which give permission for specific services.
- Since Kerberos negotiates authenticated, and optionally encrypted,
- communications between two points anywhere on the internet, it
- provides a layer of security that is not dependent on which side of a
- firewall either client is on.
- The Kerberos V5 package is designed to be easy to use. Most of the
- commands are nearly identical to UNIX network programs you are already
- used to. Kerberos V5 is a single-sign-on system, which means that you
- have to type your password only once per session, and Kerberos does
- the authenticating and encrypting transparently.
-
-Jacques Vidrine <n@nectar.com>
diff --git a/security/krb5-appl/pkg-plist b/security/krb5-appl/pkg-plist
deleted file mode 100644
index a58155f40b9b..000000000000
--- a/security/krb5-appl/pkg-plist
+++ /dev/null
@@ -1,113 +0,0 @@
-bin/compile_et
-bin/ftp
-bin/gss-client
-bin/kdestroy
-bin/kinit
-bin/klist
-bin/kpasswd
-bin/krb5-config
-%%KRB4%%bin/krb524init
-bin/ksu
-bin/kvno
-bin/rcp
-bin/rlogin
-bin/rsh
-bin/sclient
-bin/sim_client
-bin/telnet
-bin/uuclient
-%%KRB4%%bin/v4rcp
-include/com_err.h
-include/gssapi.h
-include/gssapi/gssapi.h
-include/gssapi/gssapi_generic.h
-include/gssapi/gssapi_krb5.h
-include/gssapi/mechglue.h
-include/gssrpc/auth.h
-include/gssrpc/auth_gss.h
-include/gssrpc/auth_gssapi.h
-include/gssrpc/auth_unix.h
-include/gssrpc/clnt.h
-include/gssrpc/netdb.h
-include/gssrpc/pmap_clnt.h
-include/gssrpc/pmap_prot.h
-include/gssrpc/pmap_rmt.h
-include/gssrpc/rename.h
-include/gssrpc/rpc.h
-include/gssrpc/rpc_msg.h
-include/gssrpc/svc.h
-include/gssrpc/svc_auth.h
-include/gssrpc/types.h
-include/gssrpc/xdr.h
-%%KRB4%%include/kerberosIV/des.h
-%%KRB4%%include/kerberosIV/kadm_err.h
-%%KRB4%%include/kerberosIV/krb.h
-%%KRB4%%include/kerberosIV/krb_err.h
-%%KRB4%%include/kerberosIV/mit-copyright.h
-include/krb5.h
-include/krb5/krb5.h
-include/krb5/locate_plugin.h
-include/profile.h
-lib/libcom_err.so
-lib/libcom_err.so.3
-lib/libdes425.so
-lib/libdes425.so.3
-lib/libgssapi_krb5.so
-lib/libgssapi_krb5.so.2
-lib/libgssrpc.so
-lib/libgssrpc.so.4
-lib/libk5crypto.so
-lib/libk5crypto.so.3
-lib/libkadm5clnt.so
-lib/libkadm5clnt.so.5
-lib/libkadm5srv.so
-lib/libkadm5srv.so.5
-lib/libkdb5.so
-lib/libkdb5.so.4
-%%KRB4%%lib/libkrb4.so
-%%KRB4%%lib/libkrb4.so.2
-lib/libkrb5.so
-lib/libkrb5.so.3
-lib/libkrb5support.so
-lib/libkrb5support.so.0
-lib/krb5/plugins/kdb/db2.so
-lib/krb5/plugins/preauth/pkinit.so
-sbin/ftpd
-sbin/gss-server
-sbin/k5srvutil
-sbin/kadmin
-sbin/kadmin.local
-sbin/kadmind
-sbin/kdb5_util
-sbin/klogind
-sbin/kprop
-sbin/kpropd
-sbin/krb5-send-pr
-%%KRB4%%sbin/krb524d
-sbin/krb5kdc
-sbin/kshd
-sbin/ktutil
-sbin/login.krb5
-sbin/sim_server
-sbin/sserver
-sbin/telnetd
-sbin/uuserver
-share/doc/krb5/README.FreeBSD
-share/et/et_c.awk
-share/et/et_h.awk
-share/examples/krb5/kdc.conf
-share/examples/krb5/krb5.conf
-share/examples/krb5/services.append
-share/gnats/mit
-@dirrm lib/krb5/plugins/preauth
-@dirrm lib/krb5/plugins/libkrb5
-@dirrm lib/krb5/plugins/kdb
-@dirrm lib/krb5/plugins
-@dirrm lib/krb5
-@dirrm include/gssapi
-@dirrm include/gssrpc
-@dirrm include/kerberosIV
-@dirrm include/krb5
-@dirrm share/et
-@dirrmtry share/gnats
-@dirrm share/examples/krb5
diff --git a/security/kwallet/Makefile b/security/kwallet/Makefile
deleted file mode 100644
index d2a8b1c1613f..000000000000
--- a/security/kwallet/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-# New ports collection makefile for: kdeutils3
-# Date created: 3 November 2001
-# Whom: will@cvs.kde.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= kdeutils
-PORTVERSION= ${KDE_VERSION}
-CATEGORIES?= misc kde
-MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
-DIST_SUBDIR= KDE
-
-MAINTAINER?= kde@FreeBSD.org
-COMMENT= Utilities for the KDE integrated X11 desktop
-
-LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4 \
- netsnmp:${PORTSDIR}/net-mgmt/net-snmp
-RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg
-
-CONFLICTS= kgpg-[0-9]* superkaramba-[0-9]*
-
-USE_KDELIBS_VER=3
-USE_KDEBASE_VER=3
-PREFIX= ${KDE_PREFIX}
-
-USE_PYTHON= yes
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_GETOPT_LONG=yes
-USE_AUTOTOOLS= libtool:15
-DO_NOT_COMPILE+=klaptopdaemon kmilo
-CONFIGURE_ENV+= DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-CONFIGURE_ARGS+=--with-pythondir=${LOCALBASE}
-
-USE_LDCONFIG= yes
-LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
-
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} > 501102
-. if ${OSVERSION} > 600021
-RUN_DEPENDS+= gtar:${PORTSDIR}/archivers/gtar
-. endif
-post-patch:
- ${REINPLACE_CMD} -e 's|>tar<|>gtar<|g' ${WRKSRC}/ark/ark.kcfg
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
deleted file mode 100644
index 5c3d382e1973..000000000000
--- a/security/kwallet/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (KDE/kdeutils-3.5.8.tar.bz2) = d1a0fcc83f35428a76cf7523a04ba19c
-SHA256 (KDE/kdeutils-3.5.8.tar.bz2) = 7dcbe3361cc53f9dac4c1bf6f45952d3d2518bec56cd8c07b8e07b4c4f12d0ac
-SIZE (KDE/kdeutils-3.5.8.tar.bz2) = 3059172
diff --git a/security/kwallet/files/patch-kdelirc_irkick-klircclient.cpp b/security/kwallet/files/patch-kdelirc_irkick-klircclient.cpp
deleted file mode 100644
index 76174cb1ed0d..000000000000
--- a/security/kwallet/files/patch-kdelirc_irkick-klircclient.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- kdelirc/irkick/klircclient.cpp.orig Sat Sep 10 10:21:34 2005
-+++ kdelirc/irkick/klircclient.cpp Mon Jun 5 16:16:51 2006
-@@ -55,15 +55,10 @@
-
- sockaddr_un addr;
- addr.sun_family = AF_UNIX;
-- strcpy(addr.sun_path, "/dev/lircd");
-+ strcpy(addr.sun_path, "/var/run/lirc/lircd");
- if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
- { ::close(sock);
-- // in case of mandrake...
-- strcpy(addr.sun_path, "/tmp/.lircd");
-- if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
-- { ::close(sock);
-- return false;
-- }
-+ return false;
- }
-
- theSocket = new QSocket;
diff --git a/security/kwallet/files/patch-ksim_monitors_filesystem-filesystemstats.cpp b/security/kwallet/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
deleted file mode 100644
index 7a29e570a1b7..000000000000
--- a/security/kwallet/files/patch-ksim_monitors_filesystem-filesystemstats.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
---- ksim/monitors/filesystem/filesystemstats.cpp.orig 2007-10-08 11:49:45.000000000 +0200
-+++ ksim/monitors/filesystem/filesystemstats.cpp 2007-10-26 19:32:09.000000000 +0200
-@@ -30,7 +30,7 @@
- #include <sys/types.h>
- #include <sys/param.h>
-
--#if defined(HAVE_SYS_STATVFS_H) && !defined(__DragonFly__)
-+#ifdef HAVE_SYS_STATVFS_H
- #include <sys/statvfs.h>
- #elif defined( HAVE_SYS_STATFS_H )
- #include <sys/statfs.h>
-@@ -59,12 +59,10 @@
- #include <stdio.h>
- #include <unistd.h>
-
--#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
-+#ifdef HAVE_STATVFS
- typedef struct statvfs ksim_statfs;
--#define ksim_getfsstat getvfsstat
- #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
- typedef struct statfs ksim_statfs;
--#define ksim_getfsstat getfsstat
- #else
- typedef struct // fall back for (possibly) non-supported systems
- {
-@@ -75,7 +73,7 @@
-
- int fsystemStats( const char * file, ksim_statfs & stats )
- {
--#if defined(HAVE_STATVFS) && !defined(__DragonFly__)
-+#ifdef HAVE_STATVFS
- return statvfs( file, &stats );
- #elif defined( HAVE_STATFS ) || defined( Q_OS_FREEBSD )
- return statfs( file, &stats );
-@@ -164,9 +162,9 @@
- #endif
-
- #ifdef USE_FSSTAT
-- ksim_statfs sfs[32];
-+ struct statfs sfs[32];
- int fs_count;
-- if ( ( fs_count = ksim_getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
-+ if ( ( fs_count = getfsstat( sfs, sizeof( sfs ), 0 ) ) != -1 )
- {
- for ( int i = 0; i < fs_count; i++ )
- {
diff --git a/security/kwallet/pkg-descr b/security/kwallet/pkg-descr
deleted file mode 100644
index 90ae45773bea..000000000000
--- a/security/kwallet/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-KDE provides an integrated X11 based environment, much like CDE.
diff --git a/security/kwallet/pkg-plist b/security/kwallet/pkg-plist
deleted file mode 100644
index 782d19b830c1..000000000000
--- a/security/kwallet/pkg-plist
+++ /dev/null
@@ -1,572 +0,0 @@
-bin/ark
-bin/irkick
-bin/kcalc
-bin/kcharselect
-bin/kdessh
-bin/kdf
-bin/kedit
-bin/kfloppy
-bin/kgpg
-bin/khexedit
-bin/kjots
-bin/kregexpeditor
-bin/ktimer
-bin/kwalletmanager
-bin/kwikdisk
-bin/superkaramba
-include/kmultiformlistbox.h
-include/kmultiformlistboxentry.h
-include/kmultiformlistboxfactory.h
-include/ksim/chart.h
-include/ksim/common.h
-include/ksim/ksimconfig.h
-include/ksim/label.h
-include/ksim/led.h
-include/ksim/pluginglobal.h
-include/ksim/pluginloader.h
-include/ksim/pluginmodule.h
-include/ksim/progress.h
-include/ksim/themeloader.h
-include/ksim/themetypes.h
-include/kwidgetstreamer.h
-lib/kde3/ark.a
-lib/kde3/ark.la
-lib/kde3/ark.so
-lib/kde3/irkick.a
-lib/kde3/irkick.la
-lib/kde3/irkick.so
-lib/kde3/kcalc.a
-lib/kde3/kcalc.la
-lib/kde3/kcalc.so
-lib/kde3/kcharselect_panelapplet.a
-lib/kde3/kcharselect_panelapplet.la
-lib/kde3/kcharselect_panelapplet.so
-lib/kde3/kcm_kcmlirc.a
-lib/kde3/kcm_kcmlirc.la
-lib/kde3/kcm_kcmlirc.so
-lib/kde3/kcm_kdf.a
-lib/kde3/kcm_kdf.la
-lib/kde3/kcm_kdf.so
-lib/kde3/kcm_kwallet.a
-lib/kde3/kcm_kwallet.la
-lib/kde3/kcm_kwallet.so
-lib/kde3/kedit.a
-lib/kde3/kedit.la
-lib/kde3/kedit.so
-lib/kde3/ksim_cpu.a
-lib/kde3/ksim_cpu.la
-lib/kde3/ksim_cpu.so
-lib/kde3/ksim_disk.a
-lib/kde3/ksim_disk.la
-lib/kde3/ksim_disk.so
-lib/kde3/ksim_filesystem.a
-lib/kde3/ksim_filesystem.la
-lib/kde3/ksim_filesystem.so
-lib/kde3/ksim_net.a
-lib/kde3/ksim_net.la
-lib/kde3/ksim_net.so
-lib/kde3/ksim_panelextension.a
-lib/kde3/ksim_panelextension.la
-lib/kde3/ksim_panelextension.so
-lib/kde3/ksim_sensors.a
-lib/kde3/ksim_sensors.la
-lib/kde3/ksim_sensors.so
-lib/kde3/ksim_snmp.a
-lib/kde3/ksim_snmp.la
-lib/kde3/ksim_snmp.so
-lib/kde3/libarkpart.a
-lib/kde3/libarkpart.la
-lib/kde3/libarkpart.so
-lib/kde3/libkbyteseditwidget.a
-lib/kde3/libkbyteseditwidget.la
-lib/kde3/libkbyteseditwidget.so
-lib/kde3/libkhexedit2part.a
-lib/kde3/libkhexedit2part.la
-lib/kde3/libkhexedit2part.so
-lib/kde3/libkregexpeditorgui.a
-lib/kde3/libkregexpeditorgui.la
-lib/kde3/libkregexpeditorgui.so
-lib/libkdeinit_ark.a
-lib/libkdeinit_ark.la
-lib/libkdeinit_ark.so
-lib/libkdeinit_irkick.a
-lib/libkdeinit_irkick.la
-lib/libkdeinit_irkick.so
-lib/libkdeinit_kcalc.a
-lib/libkdeinit_kcalc.la
-lib/libkdeinit_kcalc.so
-lib/libkdeinit_kedit.a
-lib/libkdeinit_kedit.la
-lib/libkdeinit_kedit.so
-lib/libkhexeditcommon.a
-lib/libkhexeditcommon.la
-lib/libkhexeditcommon.so
-lib/libkhexeditcommon.so.0
-lib/libkregexpeditorcommon.a
-lib/libkregexpeditorcommon.la
-lib/libkregexpeditorcommon.so
-lib/libkregexpeditorcommon.so.1
-lib/libksimcore.a
-lib/libksimcore.la
-lib/libksimcore.so
-lib/libksimcore.so.1
-share/applications/kde/KCharSelect.desktop
-share/applications/kde/KEdit.desktop
-share/applications/kde/KFloppy.desktop
-share/applications/kde/Kjots.desktop
-share/applications/kde/ark.desktop
-share/applications/kde/irkick.desktop
-share/applications/kde/kcalc.desktop
-share/applications/kde/kcmdf.desktop
-share/applications/kde/kcmlirc.desktop
-share/applications/kde/kdf.desktop
-share/applications/kde/kgpg.desktop
-share/applications/kde/khexedit.desktop
-share/applications/kde/kregexpeditor.desktop
-share/applications/kde/ktimer.desktop
-share/applications/kde/kwalletconfig.desktop
-share/applications/kde/kwalletmanager-kwalletd.desktop
-share/applications/kde/kwalletmanager.desktop
-share/applications/kde/kwikdisk.desktop
-share/applnk/Utilities/superkaramba.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/ark_part_readonly.rc
-share/apps/ark/arkui.rc
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_adddir.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_addfile.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_delete.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_extract.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_selectall.png
-share/apps/ark/icons/crystalsvg/22x22/actions/ark_view.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_adddir.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_addfile.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_delete.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_extract.png
-share/apps/ark/icons/crystalsvg/32x32/actions/ark_view.png
-share/apps/irkick/icons/hicolor/16x16/actions/irkick.png
-share/apps/irkick/icons/hicolor/16x16/actions/irkickflash.png
-share/apps/irkick/icons/hicolor/16x16/actions/irkickoff.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledblue.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledgreen.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledlightblue.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledlightgreen.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledorange.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledpurple.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledred.png
-share/apps/irkick/icons/hicolor/16x16/actions/ledyellow.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledblue.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledgreen.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledlightblue.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledlightgreen.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledorange.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledpurple.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledred.png
-share/apps/irkick/icons/hicolor/32x32/actions/ledyellow.png
-share/apps/kcalc/kcalcui.rc
-share/apps/kcharselect/kcharselectui.rc
-share/apps/kconf_update/kcalcrc.upd
-share/apps/kconf_update/kcharselect.upd
-share/apps/kdf/kdfui.rc
-share/apps/kdf/pics/delete.png
-share/apps/kdf/pics/tick.png
-share/apps/kedit/keditui.rc
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key1.png
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key2.png
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key3.png
-share/apps/kgpg/icons/crystalsvg/16x16/actions/kgpg_key4.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_edit.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_export.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_gen.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_identity.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_import.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_info.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_photo.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_show.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_sign.png
-share/apps/kgpg/icons/crystalsvg/22x22/actions/kgpg_term.png
-share/apps/kgpg/kgpg.rc
-share/apps/kgpg/listkeys.rc
-share/apps/kgpg/pics/kgpg_anim.gif
-share/apps/kgpg/pics/kgpg_blank.png
-share/apps/kgpg/pics/kgpg_docked.gif
-share/apps/kgpg/pics/kgpg_docked.png
-share/apps/kgpg/pics/kgpg_fill.png
-share/apps/kgpg/tips
-share/apps/khexedit/khexeditui.rc
-share/apps/khexedit/pics/hexdrag.png
-share/apps/khexedit/pics/hexmask.png
-share/apps/khexedit/pics/hexwrite.png
-share/apps/khexedit2part/khexedit2partui.rc
-share/apps/kicker/applets/kcharselectapplet.desktop
-share/apps/kicker/extensions/ksim.desktop
-share/apps/kjots/kjotsui.rc
-share/apps/kjots/pics/filedel.png
-share/apps/konqueror/servicemenus/encryptfile.desktop
-share/apps/konqueror/servicemenus/encryptfolder.desktop
-share/apps/konqueror/servicemenus/floppy_format.desktop
-share/apps/kregexpeditor/pics/altn.png
-share/apps/kregexpeditor/pics/anychar.png
-share/apps/kregexpeditor/pics/autoverify.png
-share/apps/kregexpeditor/pics/begline.png
-share/apps/kregexpeditor/pics/characters.png
-share/apps/kregexpeditor/pics/compound.png
-share/apps/kregexpeditor/pics/endline.png
-share/apps/kregexpeditor/pics/error.png
-share/apps/kregexpeditor/pics/neglookahead.png
-share/apps/kregexpeditor/pics/nonwordboundary.png
-share/apps/kregexpeditor/pics/poslookahead.png
-share/apps/kregexpeditor/pics/repeat.png
-share/apps/kregexpeditor/pics/select.png
-share/apps/kregexpeditor/pics/text.png
-share/apps/kregexpeditor/pics/verify.png
-share/apps/kregexpeditor/pics/wordboundary.png
-share/apps/kregexpeditor/predefined/general/anything.regexp
-share/apps/kregexpeditor/predefined/general/spaces.regexp
-share/apps/ksim/monitors/DFree.desktop
-share/apps/ksim/monitors/Lm_sensors.desktop
-share/apps/ksim/monitors/Net.desktop
-share/apps/ksim/monitors/Snmp.desktop
-share/apps/ksim/monitors/cpu.desktop
-share/apps/ksim/monitors/disk.desktop
-share/apps/ksim/pics/clock.png
-share/apps/ksim/pics/uptime.png
-share/apps/ksim/themes/ksim/bg_chart.png
-share/apps/ksim/themes/ksim/bg_grid.png
-share/apps/ksim/themes/ksim/bg_meter.png
-share/apps/ksim/themes/ksim/bg_panel.png
-share/apps/ksim/themes/ksim/frame_bottom.png
-share/apps/ksim/themes/ksim/frame_left.png
-share/apps/ksim/themes/ksim/frame_right.png
-share/apps/ksim/themes/ksim/frame_top.png
-share/apps/ksim/themes/ksim/gkrellmrc
-share/apps/ksim/themes/ksim/gkrellmrc_ksim
-share/apps/ksim/themes/ksim/host/bg_meter.png
-share/apps/ksim/themes/ksim/krell_meter.png
-share/apps/ksim/themes/ksim/krell_panel.png
-share/apps/ksim/themes/ksim/krell_slider.png
-share/apps/ksim/themes/ksim/mail/decal_mail.png
-share/apps/ksim/themes/ksim/mail/krell_mail.png
-share/apps/ksim/themes/ksim/mail/krell_mail_daemon.png
-share/apps/ksim/themes/ksim/net/decal_net_leds.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_closed.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/folder_open.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_closed.png
-share/apps/kwalletmanager/icons/crystalsvg/22x22/actions/wallet_open.png
-share/apps/kwalletmanager/kwalleteditor.rc
-share/apps/kwalletmanager/kwalletmanager.rc
-share/apps/profiles/klauncher.profile.xml
-share/apps/profiles/konqueror.profile.xml
-share/apps/profiles/noatun.profile.xml
-share/apps/profiles/profile.dtd
-share/apps/remotes/RM-0010.remote.xml
-share/apps/remotes/cimr100.remote.xml
-share/apps/remotes/hauppauge.remote.xml
-share/apps/remotes/remote.dtd
-share/apps/remotes/sherwood.remote.xml
-share/apps/remotes/sonytv.remote.xml
-share/apps/superkaramba/superkarambaui.rc
-share/autostart/irkick.desktop
-share/autostart/kgpg.desktop
-share/config.kcfg/ark.kcfg
-share/config.kcfg/kcalc.kcfg
-share/config.kcfg/kedit.kcfg
-share/config.kcfg/kgpg.kcfg
-share/config.kcfg/kjots.kcfg
-share/config/ksim_panelextensionrc
-share/doc/HTML/en/KRegExpEditor/altn.png
-share/doc/HTML/en/KRegExpEditor/altntool.png
-share/doc/HTML/en/KRegExpEditor/anychar.png
-share/doc/HTML/en/KRegExpEditor/anychartool.png
-share/doc/HTML/en/KRegExpEditor/begline.png
-share/doc/HTML/en/KRegExpEditor/boundarytools.png
-share/doc/HTML/en/KRegExpEditor/characters.png
-share/doc/HTML/en/KRegExpEditor/charactertool.png
-share/doc/HTML/en/KRegExpEditor/common
-share/doc/HTML/en/KRegExpEditor/compound.png
-share/doc/HTML/en/KRegExpEditor/compoundtool.png
-share/doc/HTML/en/KRegExpEditor/endline.png
-share/doc/HTML/en/KRegExpEditor/index.cache.bz2
-share/doc/HTML/en/KRegExpEditor/index.docbook
-share/doc/HTML/en/KRegExpEditor/linestartendtool.png
-share/doc/HTML/en/KRegExpEditor/lookaheadtools.png
-share/doc/HTML/en/KRegExpEditor/neglookahead.png
-share/doc/HTML/en/KRegExpEditor/nonwordboundary.png
-share/doc/HTML/en/KRegExpEditor/poslookahead.png
-share/doc/HTML/en/KRegExpEditor/repeat.png
-share/doc/HTML/en/KRegExpEditor/repeattool.png
-share/doc/HTML/en/KRegExpEditor/select.png
-share/doc/HTML/en/KRegExpEditor/text.png
-share/doc/HTML/en/KRegExpEditor/texttool.png
-share/doc/HTML/en/KRegExpEditor/theEditor.png
-share/doc/HTML/en/KRegExpEditor/wordboundary.png
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/ark/man-ark.1.docbook
-share/doc/HTML/en/irkick/common
-share/doc/HTML/en/irkick/index.cache.bz2
-share/doc/HTML/en/irkick/index.docbook
-share/doc/HTML/en/kcalc/commands.docbook
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcalc/kcalc_on_Aix.txt
-share/doc/HTML/en/kcalc/kcalc_on_OSF.txt
-share/doc/HTML/en/kcharselect/common
-share/doc/HTML/en/kcharselect/index.cache.bz2
-share/doc/HTML/en/kcharselect/index.docbook
-share/doc/HTML/en/kcmlirc/common
-share/doc/HTML/en/kcmlirc/index.cache.bz2
-share/doc/HTML/en/kcmlirc/index.docbook
-share/doc/HTML/en/kcontrol/kcmlowbatcrit/common
-share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmlowbatcrit/index.docbook
-share/doc/HTML/en/kcontrol/kcmlowbatwarn/common
-share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.cache.bz2
-share/doc/HTML/en/kcontrol/kcmlowbatwarn/index.docbook
-share/doc/HTML/en/kcontrol/laptop/common
-share/doc/HTML/en/kcontrol/laptop/index.cache.bz2
-share/doc/HTML/en/kcontrol/laptop/index.docbook
-share/doc/HTML/en/kcontrol/powerctrl/common
-share/doc/HTML/en/kcontrol/powerctrl/index.cache.bz2
-share/doc/HTML/en/kcontrol/powerctrl/index.docbook
-share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/index.cache.bz2
-share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/kdf.png
-share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kedit/common
-share/doc/HTML/en/kedit/index.cache.bz2
-share/doc/HTML/en/kedit/index.docbook
-share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/index.cache.bz2
-share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/kgpg/common
-share/doc/HTML/en/kgpg/editor.png
-share/doc/HTML/en/kgpg/index.cache.bz2
-share/doc/HTML/en/kgpg/index.docbook
-share/doc/HTML/en/kgpg/keygen.png
-share/doc/HTML/en/kgpg/keymanage.png
-share/doc/HTML/en/kgpg/keys.png
-share/doc/HTML/en/kgpg/kicker.png
-share/doc/HTML/en/kgpg/options.png
-share/doc/HTML/en/khexedit/common
-share/doc/HTML/en/khexedit/index.cache.bz2
-share/doc/HTML/en/khexedit/index.docbook
-share/doc/HTML/en/khexedit/khexedit1.png
-share/doc/HTML/en/kinfocenter/blockdevices/common
-share/doc/HTML/en/kinfocenter/blockdevices/index.cache.bz2
-share/doc/HTML/en/kinfocenter/blockdevices/index.docbook
-share/doc/HTML/en/kjots/common
-share/doc/HTML/en/kjots/index.cache.bz2
-share/doc/HTML/en/kjots/index.docbook
-share/doc/HTML/en/ksim/common
-share/doc/HTML/en/ksim/index.cache.bz2
-share/doc/HTML/en/ksim/index.docbook
-share/doc/HTML/en/ktimer/common
-share/doc/HTML/en/ktimer/index.cache.bz2
-share/doc/HTML/en/ktimer/index.docbook
-share/doc/HTML/en/kwallet/common
-share/doc/HTML/en/kwallet/cr22-action-wallet_closed.png
-share/doc/HTML/en/kwallet/cr22-action-wallet_open.png
-share/doc/HTML/en/kwallet/edit1.png
-share/doc/HTML/en/kwallet/edit2.png
-share/doc/HTML/en/kwallet/edit3.png
-share/doc/HTML/en/kwallet/index.cache.bz2
-share/doc/HTML/en/kwallet/index.docbook
-share/doc/HTML/en/kwallet/kwalletmanager.png
-share/doc/HTML/en/kwallet/password1.png
-share/doc/HTML/en/kwallet/password2.png
-share/doc/HTML/en/superkaramba/common
-share/doc/HTML/en/superkaramba/index.cache.bz2
-share/doc/HTML/en/superkaramba/index.docbook
-share/icons/crystalsvg/128x128/apps/superkaramba.png
-share/icons/crystalsvg/128x128/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/16x16/apps/kcmdf.png
-share/icons/crystalsvg/16x16/apps/ksim.png
-share/icons/crystalsvg/16x16/apps/superkaramba.png
-share/icons/crystalsvg/16x16/devices/ksim_cpu.png
-share/icons/crystalsvg/16x16/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/22x22/apps/kcmdf.png
-share/icons/crystalsvg/22x22/apps/superkaramba.png
-share/icons/crystalsvg/22x22/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/32x32/apps/kcmdf.png
-share/icons/crystalsvg/32x32/apps/ksim.png
-share/icons/crystalsvg/32x32/apps/superkaramba.png
-share/icons/crystalsvg/32x32/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/48x48/apps/ksim.png
-share/icons/crystalsvg/48x48/apps/superkaramba.png
-share/icons/crystalsvg/48x48/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/64x64/apps/superkaramba.png
-share/icons/crystalsvg/64x64/mimetypes/superkaramba_theme.png
-share/icons/crystalsvg/scalable/apps/superkaramba.svgz
-share/icons/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
-share/icons/hicolor/128x128/apps/ark.png
-share/icons/hicolor/128x128/apps/kdf.png
-share/icons/hicolor/128x128/apps/kfloppy.png
-share/icons/hicolor/128x128/apps/kregexpeditor.png
-share/icons/hicolor/128x128/apps/ktimer.png
-share/icons/hicolor/128x128/apps/kwalletmanager.png
-share/icons/hicolor/128x128/apps/kwikdisk.png
-share/icons/hicolor/16x16/apps/ark.png
-share/icons/hicolor/16x16/apps/irkick.png
-share/icons/hicolor/16x16/apps/kcalc.png
-share/icons/hicolor/16x16/apps/kcharselect.png
-share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kedit.png
-share/icons/hicolor/16x16/apps/kfloppy.png
-share/icons/hicolor/16x16/apps/kgpg.png
-share/icons/hicolor/16x16/apps/khexedit.png
-share/icons/hicolor/16x16/apps/kjots.png
-share/icons/hicolor/16x16/apps/kregexpeditor.png
-share/icons/hicolor/16x16/apps/ktimer.png
-share/icons/hicolor/16x16/apps/kwalletmanager.png
-share/icons/hicolor/16x16/apps/kwikdisk.png
-share/icons/hicolor/22x22/apps/ark.png
-share/icons/hicolor/22x22/apps/irkick.png
-share/icons/hicolor/22x22/apps/kcalc.png
-share/icons/hicolor/22x22/apps/kdf.png
-share/icons/hicolor/22x22/apps/kedit.png
-share/icons/hicolor/22x22/apps/kfloppy.png
-share/icons/hicolor/22x22/apps/kgpg.png
-share/icons/hicolor/22x22/apps/kjots.png
-share/icons/hicolor/22x22/apps/kregexpeditor.png
-share/icons/hicolor/22x22/apps/kwalletmanager.png
-share/icons/hicolor/22x22/apps/kwikdisk.png
-share/icons/hicolor/32x32/apps/ark.png
-share/icons/hicolor/32x32/apps/irkick.png
-share/icons/hicolor/32x32/apps/kcalc.png
-share/icons/hicolor/32x32/apps/kcharselect.png
-share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kedit.png
-share/icons/hicolor/32x32/apps/kfloppy.png
-share/icons/hicolor/32x32/apps/kgpg.png
-share/icons/hicolor/32x32/apps/khexedit.png
-share/icons/hicolor/32x32/apps/kjots.png
-share/icons/hicolor/32x32/apps/kregexpeditor.png
-share/icons/hicolor/32x32/apps/ktimer.png
-share/icons/hicolor/32x32/apps/kwalletmanager.png
-share/icons/hicolor/32x32/apps/kwikdisk.png
-share/icons/hicolor/48x48/apps/ark.png
-share/icons/hicolor/48x48/apps/kcalc.png
-share/icons/hicolor/48x48/apps/kcharselect.png
-share/icons/hicolor/48x48/apps/kdf.png
-share/icons/hicolor/48x48/apps/kedit.png
-share/icons/hicolor/48x48/apps/kfloppy.png
-share/icons/hicolor/48x48/apps/kgpg.png
-share/icons/hicolor/48x48/apps/khexedit.png
-share/icons/hicolor/48x48/apps/kjots.png
-share/icons/hicolor/48x48/apps/kregexpeditor.png
-share/icons/hicolor/48x48/apps/ktimer.png
-share/icons/hicolor/48x48/apps/kwalletmanager.png
-share/icons/hicolor/48x48/apps/kwikdisk.png
-share/icons/hicolor/64x64/apps/ark.png
-share/icons/hicolor/64x64/apps/kcalc.png
-share/icons/hicolor/64x64/apps/kdf.png
-share/icons/hicolor/64x64/apps/kedit.png
-share/icons/hicolor/64x64/apps/kfloppy.png
-share/icons/hicolor/64x64/apps/kjots.png
-share/icons/hicolor/64x64/apps/kregexpeditor.png
-share/icons/hicolor/64x64/apps/kwalletmanager.png
-share/icons/hicolor/64x64/apps/kwikdisk.png
-share/icons/hicolor/scalable/apps/ark.svgz
-share/icons/hicolor/scalable/apps/kcalc.svgz
-share/icons/locolor/16x16/apps/irkick.png
-share/icons/locolor/32x32/apps/irkick.png
-share/mimelnk/application/x-superkaramba.desktop
-share/services/ark_part.desktop
-share/services/kbyteseditwidget.desktop
-share/services/khexedit2part.desktop
-share/services/kregexpeditorgui.desktop
-share/services/kwallet_config.desktop
-share/services/kwalletmanager_show.desktop
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
-@dirrm share/doc/HTML/en/superkaramba
-@dirrm share/doc/HTML/en/kwallet
-@dirrm share/doc/HTML/en/ktimer
-@dirrm share/doc/HTML/en/ksim
-@dirrm share/doc/HTML/en/kjots
-@dirrm share/doc/HTML/en/kinfocenter/blockdevices
-@dirrm share/doc/HTML/en/khexedit
-@dirrm share/doc/HTML/en/kgpg
-@dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kedit
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kdeutils-apidocs/superkaramba/html
-@dirrm share/doc/HTML/en/kdeutils-apidocs/superkaramba
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber/html
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc/knumber
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc/html
-@dirrm share/doc/HTML/en/kdeutils-apidocs/kcalc
-@dirrm share/doc/HTML/en/kdeutils-apidocs
-@dirrm share/doc/HTML/en/kcontrol/powerctrl
-@dirrm share/doc/HTML/en/kcontrol/laptop
-@dirrm share/doc/HTML/en/kcontrol/kcmlowbatwarn
-@dirrm share/doc/HTML/en/kcontrol/kcmlowbatcrit
-@dirrm share/doc/HTML/en/kcmlirc
-@dirrm share/doc/HTML/en/kcharselect
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/irkick
-@dirrm share/doc/HTML/en/ark
-@dirrm share/doc/HTML/en/KRegExpEditor
-@dirrm share/apps/superkaramba
-@dirrm share/apps/remotes
-@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kwalletmanager/icons/crystalsvg/22x22
-@dirrm share/apps/kwalletmanager/icons/crystalsvg
-@dirrm share/apps/kwalletmanager/icons
-@dirrm share/apps/kwalletmanager
-@dirrm share/apps/ksim/themes/ksim/net
-@dirrm share/apps/ksim/themes/ksim/mail
-@dirrm share/apps/ksim/themes/ksim/host
-@dirrm share/apps/ksim/themes/ksim
-@dirrm share/apps/ksim/themes
-@dirrm share/apps/ksim/pics
-@dirrm share/apps/ksim/monitors
-@dirrm share/apps/ksim
-@dirrm share/apps/kregexpeditor/predefined/general
-@dirrm share/apps/kregexpeditor/predefined
-@dirrm share/apps/kregexpeditor/pics
-@dirrm share/apps/kregexpeditor
-@dirrm share/apps/kjots/pics
-@dirrm share/apps/kjots
-@dirrm share/apps/khexedit2part
-@dirrm share/apps/khexedit/pics
-@dirrm share/apps/khexedit
-@dirrm share/apps/kgpg/pics
-@dirrm share/apps/kgpg/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kgpg/icons/crystalsvg/22x22
-@dirrm share/apps/kgpg/icons/crystalsvg/16x16/actions
-@dirrm share/apps/kgpg/icons/crystalsvg/16x16
-@dirrm share/apps/kgpg/icons/crystalsvg
-@dirrm share/apps/kgpg/icons
-@dirrm share/apps/kgpg
-@dirrm share/apps/kedit
-@dirrm share/apps/kdf/pics
-@dirrm share/apps/kdf
-@dirrm share/apps/kcharselect
-@dirrm share/apps/kcalc
-@dirrm share/apps/irkick/icons/hicolor/32x32/actions
-@dirrm share/apps/irkick/icons/hicolor/32x32
-@dirrm share/apps/irkick/icons/hicolor/16x16/actions
-@dirrm share/apps/irkick/icons/hicolor/16x16
-@dirrm share/apps/irkick/icons/hicolor
-@dirrm share/apps/irkick/icons
-@dirrm share/apps/irkick
-@dirrm share/apps/ark/icons/crystalsvg/32x32/actions
-@dirrm share/apps/ark/icons/crystalsvg/32x32
-@dirrm share/apps/ark/icons/crystalsvg/22x22/actions
-@dirrm share/apps/ark/icons/crystalsvg/22x22
-@dirrm share/apps/ark/icons/crystalsvg
-@dirrm share/apps/ark/icons
-@dirrm share/apps/ark
-@dirrm include/ksim
diff --git a/security/libfwbuilder-devel/Makefile b/security/libfwbuilder-devel/Makefile
deleted file mode 100644
index 1a9900fe4719..000000000000
--- a/security/libfwbuilder-devel/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# New ports collection makefile for: libfwbuilder
-# Date Created: 27 May 2002
-# Whom: Sergey Lyubka <devnull@asitatech.ie>
-#
-# $FreeBSD$
-
-PORTNAME= libfwbuilder
-PORTVERSION= 2.1.14
-CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fwbuilder
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= Firewall Builder API
-
-BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt \
- netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp
-
-BUILD_VERSION= 21
-PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
-USE_QT_VER= 3
-
-QTDIR?= ${QT_PREFIX}
-
-USE_OPENSSL= yes
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-CONFIGURE_ARGS+= --with-docdir=${DOCSDIR}
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAKE_ARGS+= QTDIR="${QTDIR}" \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-USE_LDCONFIG= yes
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-
-post-install:
- ${RM} ${PREFIX}/lib/libfwbuilder.so.7.3
- ${RM} ${PREFIX}/lib/libfwcompiler.so.7.3
-
-.include <bsd.port.mk>
diff --git a/security/libfwbuilder-devel/distinfo b/security/libfwbuilder-devel/distinfo
deleted file mode 100644
index d06eb9c5bc22..000000000000
--- a/security/libfwbuilder-devel/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (libfwbuilder-2.1.14.tar.gz) = 1920128ef8c1cfcd73fbd3f10bd72482
-SHA256 (libfwbuilder-2.1.14.tar.gz) = 342624afcfce4b9ef7cd481c170a075e43cd20c980b243c73ad9694a356fbdb2
-SIZE (libfwbuilder-2.1.14.tar.gz) = 315648
diff --git a/security/libfwbuilder-devel/files/patch-IPAddress.h b/security/libfwbuilder-devel/files/patch-IPAddress.h
deleted file mode 100644
index a35a8fabe9c8..000000000000
--- a/security/libfwbuilder-devel/files/patch-IPAddress.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/fwbuilder/IPAddress.h~ 2006-08-18 05:59:32.000000000 +0200
-+++ src/fwbuilder/IPAddress.h 2007-07-14 17:09:06.406044356 +0200
-@@ -47,6 +47,7 @@
- {
-
- class Netmask;
-+ Netmask operator~(const Netmask &nm);
-
- class IPAddress
- {
diff --git a/security/libfwbuilder-devel/files/patch-aa b/security/libfwbuilder-devel/files/patch-aa
deleted file mode 100644
index dc543e5b2a9d..000000000000
--- a/security/libfwbuilder-devel/files/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
---- qmake.inc.in.linux 2006-06-22 08:34:48.000000000 -0700
-+++ qmake.inc.in 2006-06-22 08:35:03.000000000 -0700
-@@ -28,10 +28,8 @@
- doc.path =$(DDIR)@DOCDIR@
-
- CONFIG += warn_on debug
-- QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
-- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
-- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
-- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
-+ QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@
-+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
- }
- }
-
diff --git a/security/libfwbuilder-devel/files/patch-dns.h b/security/libfwbuilder-devel/files/patch-dns.h
deleted file mode 100644
index cdedada79507..000000000000
--- a/security/libfwbuilder-devel/files/patch-dns.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/fwbuilder/dns.h~ 2007-07-14 16:58:54.973991313 +0200
-+++ src/fwbuilder/dns.h 2007-07-14 17:08:29.365424298 +0200
-@@ -69,6 +69,7 @@
- {
-
- void init_dns() throw(FWException);
-+ void *DNS_bulkBackResolve_Thread(void *);
-
-
- class HostEnt
diff --git a/security/libfwbuilder-devel/pkg-descr b/security/libfwbuilder-devel/pkg-descr
deleted file mode 100644
index 9a2e7ce64dd5..000000000000
--- a/security/libfwbuilder-devel/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This is Firewall Builder API library.
-Firewall Builder consists of object-oriented GUI and set of policy compilers
-for various firewall platforms.
-
-WWW: http://www.fwbuilder.org/
-
-Sergey Lyubka <ioannvelikiy@yahoo.com>
diff --git a/security/libfwbuilder-devel/pkg-plist b/security/libfwbuilder-devel/pkg-plist
deleted file mode 100644
index 33366b7e1308..000000000000
--- a/security/libfwbuilder-devel/pkg-plist
+++ /dev/null
@@ -1,135 +0,0 @@
-bin/libfwbuilder-config-2.1
-include/fwb-2.1/fwcompiler/Compiler.h
-include/fwb-2.1/fwcompiler/NATCompiler.h
-include/fwb-2.1/fwcompiler/OSConfigurator.h
-include/fwb-2.1/fwcompiler/PolicyCompiler.h
-include/fwb-2.1/fwcompiler/Preprocessor.h
-include/fwb-2.1/fwcompiler/RoutingCompiler.h
-include/fwb-2.1/fwcompiler/RuleProcessor.h
-include/fwb-2.1/fwbuilder/Address.h
-include/fwb-2.1/fwbuilder/AddressRange.h
-include/fwb-2.1/fwbuilder/AddressTable.h
-include/fwb-2.1/fwbuilder/BackgroundOp.h
-include/fwb-2.1/fwbuilder/Constants.h
-include/fwb-2.1/fwbuilder/CustomService.h
-include/fwb-2.1/fwbuilder/DNSName.h
-include/fwb-2.1/fwbuilder/FWException.h
-include/fwb-2.1/fwbuilder/FWIntervalReference.h
-include/fwb-2.1/fwbuilder/FWObject.h
-include/fwb-2.1/fwbuilder/FWObjectDatabase.h
-include/fwb-2.1/fwbuilder/FWObjectReference.h
-include/fwb-2.1/fwbuilder/FWOptions.h
-include/fwb-2.1/fwbuilder/FWReference.h
-include/fwb-2.1/fwbuilder/FWServiceReference.h
-include/fwb-2.1/fwbuilder/Firewall.h
-include/fwb-2.1/fwbuilder/Group.h
-include/fwb-2.1/fwbuilder/Host.h
-include/fwb-2.1/fwbuilder/HostsFile.h
-include/fwb-2.1/fwbuilder/ICMPService.h
-include/fwb-2.1/fwbuilder/IPAddress.h
-include/fwb-2.1/fwbuilder/IPService.h
-include/fwb-2.1/fwbuilder/IPv4.h
-include/fwb-2.1/fwbuilder/Interface.h
-include/fwb-2.1/fwbuilder/InterfacePolicy.h
-include/fwb-2.1/fwbuilder/Interval.h
-include/fwb-2.1/fwbuilder/IntervalGroup.h
-include/fwb-2.1/fwbuilder/Library.h
-include/fwb-2.1/fwbuilder/Logger.h
-include/fwb-2.1/fwbuilder/Management.h
-include/fwb-2.1/fwbuilder/MultiAddress.h
-include/fwb-2.1/fwbuilder/NAT.h
-include/fwb-2.1/fwbuilder/Network.h
-include/fwb-2.1/fwbuilder/ObjectGroup.h
-include/fwb-2.1/fwbuilder/Policy.h
-include/fwb-2.1/fwbuilder/Pool.h
-include/fwb-2.1/fwbuilder/Resources.h
-include/fwb-2.1/fwbuilder/Routing.h
-include/fwb-2.1/fwbuilder/Rule.h
-include/fwb-2.1/fwbuilder/RuleElement.h
-include/fwb-2.1/fwbuilder/RuleSet.h
-include/fwb-2.1/fwbuilder/Service.h
-include/fwb-2.1/fwbuilder/ServiceGroup.h
-include/fwb-2.1/fwbuilder/SyncQueue.h
-include/fwb-2.1/fwbuilder/TCPService.h
-include/fwb-2.1/fwbuilder/TagService.h
-include/fwb-2.1/fwbuilder/ThreadTools.h
-include/fwb-2.1/fwbuilder/Tools.h
-include/fwb-2.1/fwbuilder/UDPService.h
-include/fwb-2.1/fwbuilder/XMLTools.h
-include/fwb-2.1/fwbuilder/dns.h
-include/fwb-2.1/fwbuilder/libfwbuilder-config.h
-include/fwb-2.1/fwbuilder/libfwbuilder-version.h
-include/fwb-2.1/fwbuilder/physAddress.h
-include/fwb-2.1/fwbuilder/snmp.h
-lib/libfwcompiler.so.7.3.0
-lib/libfwcompiler.so.7
-lib/libfwcompiler.so
-lib/libfwbuilder.so.7.3.0
-lib/libfwbuilder.so.7
-lib/libfwbuilder.so
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/Credits
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/PatchAcceptancePolicy.txt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.5.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.4.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.3.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.2.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.1.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.0.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.8.7.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.14.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.13.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.12.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.11.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.10.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.9.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.8.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.7.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.6.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.5.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.4.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.3.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.2.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.1.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.0.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.0.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.1.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.2.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.0.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.1.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.2.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.3.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.4.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.5.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.6.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.7.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.8.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.9.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.10.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.11.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.12.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.99.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.0.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.1.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.2.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.3.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.4.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.5.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.6.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.7.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.8.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.9.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.10.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.11.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.12.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.13.xslt
-share/libfwbuilder%%BUILD_VERSION%%/fwbuilder.dtd
-@dirrm share/libfwbuilder%%BUILD_VERSION%%/migration
-@dirrm share/libfwbuilder%%BUILD_VERSION%%
-@dirrm %%DOCSDIR%%
-@dirrm include/fwb-2.1/fwcompiler
-@dirrm include/fwb-2.1/fwbuilder
-@dirrm include/fwb-2.1
diff --git a/security/libfwbuilder2/Makefile b/security/libfwbuilder2/Makefile
deleted file mode 100644
index 1a9900fe4719..000000000000
--- a/security/libfwbuilder2/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# New ports collection makefile for: libfwbuilder
-# Date Created: 27 May 2002
-# Whom: Sergey Lyubka <devnull@asitatech.ie>
-#
-# $FreeBSD$
-
-PORTNAME= libfwbuilder
-PORTVERSION= 2.1.14
-CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR= fwbuilder
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= Firewall Builder API
-
-BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
-LIB_DEPENDS= xslt.2:${PORTSDIR}/textproc/libxslt \
- netsnmp.10:${PORTSDIR}/net-mgmt/net-snmp
-
-BUILD_VERSION= 21
-PLIST_SUB= BUILD_VERSION=${BUILD_VERSION}
-USE_QT_VER= 3
-
-QTDIR?= ${QT_PREFIX}
-
-USE_OPENSSL= yes
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-CONFIGURE_ARGS+= --with-docdir=${DOCSDIR}
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-MAKE_ARGS+= QTDIR="${QTDIR}" \
- QMAKESPEC=${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-USE_LDCONFIG= yes
-PLIST_SUB+= PORTVERSION="${PORTVERSION}"
-
-post-install:
- ${RM} ${PREFIX}/lib/libfwbuilder.so.7.3
- ${RM} ${PREFIX}/lib/libfwcompiler.so.7.3
-
-.include <bsd.port.mk>
diff --git a/security/libfwbuilder2/distinfo b/security/libfwbuilder2/distinfo
deleted file mode 100644
index d06eb9c5bc22..000000000000
--- a/security/libfwbuilder2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (libfwbuilder-2.1.14.tar.gz) = 1920128ef8c1cfcd73fbd3f10bd72482
-SHA256 (libfwbuilder-2.1.14.tar.gz) = 342624afcfce4b9ef7cd481c170a075e43cd20c980b243c73ad9694a356fbdb2
-SIZE (libfwbuilder-2.1.14.tar.gz) = 315648
diff --git a/security/libfwbuilder2/files/patch-IPAddress.h b/security/libfwbuilder2/files/patch-IPAddress.h
deleted file mode 100644
index a35a8fabe9c8..000000000000
--- a/security/libfwbuilder2/files/patch-IPAddress.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/fwbuilder/IPAddress.h~ 2006-08-18 05:59:32.000000000 +0200
-+++ src/fwbuilder/IPAddress.h 2007-07-14 17:09:06.406044356 +0200
-@@ -47,6 +47,7 @@
- {
-
- class Netmask;
-+ Netmask operator~(const Netmask &nm);
-
- class IPAddress
- {
diff --git a/security/libfwbuilder2/files/patch-aa b/security/libfwbuilder2/files/patch-aa
deleted file mode 100644
index dc543e5b2a9d..000000000000
--- a/security/libfwbuilder2/files/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
---- qmake.inc.in.linux 2006-06-22 08:34:48.000000000 -0700
-+++ qmake.inc.in 2006-06-22 08:35:03.000000000 -0700
-@@ -28,10 +28,8 @@
- doc.path =$(DDIR)@DOCDIR@
-
- CONFIG += warn_on debug
-- QMAKE_CFLAGS_DEBUG += -Wno-unused-parameter
-- QMAKE_CFLAGS_RELEASE += -Wno-unused-parameter
-- QMAKE_CXXFLAGS_DEBUG += -Wno-unused-parameter @CXXFLAGS@
-- QMAKE_CXXFLAGS_RELEASE += -Wno-unused-parameter @CXXFLAGS@
-+ QMAKE_CXXFLAGS_DEBUG += @CXXFLAGS@
-+ QMAKE_CXXFLAGS_RELEASE += @CXXFLAGS@
- }
- }
-
diff --git a/security/libfwbuilder2/files/patch-dns.h b/security/libfwbuilder2/files/patch-dns.h
deleted file mode 100644
index cdedada79507..000000000000
--- a/security/libfwbuilder2/files/patch-dns.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/fwbuilder/dns.h~ 2007-07-14 16:58:54.973991313 +0200
-+++ src/fwbuilder/dns.h 2007-07-14 17:08:29.365424298 +0200
-@@ -69,6 +69,7 @@
- {
-
- void init_dns() throw(FWException);
-+ void *DNS_bulkBackResolve_Thread(void *);
-
-
- class HostEnt
diff --git a/security/libfwbuilder2/pkg-descr b/security/libfwbuilder2/pkg-descr
deleted file mode 100644
index 9a2e7ce64dd5..000000000000
--- a/security/libfwbuilder2/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-This is Firewall Builder API library.
-Firewall Builder consists of object-oriented GUI and set of policy compilers
-for various firewall platforms.
-
-WWW: http://www.fwbuilder.org/
-
-Sergey Lyubka <ioannvelikiy@yahoo.com>
diff --git a/security/libfwbuilder2/pkg-plist b/security/libfwbuilder2/pkg-plist
deleted file mode 100644
index 33366b7e1308..000000000000
--- a/security/libfwbuilder2/pkg-plist
+++ /dev/null
@@ -1,135 +0,0 @@
-bin/libfwbuilder-config-2.1
-include/fwb-2.1/fwcompiler/Compiler.h
-include/fwb-2.1/fwcompiler/NATCompiler.h
-include/fwb-2.1/fwcompiler/OSConfigurator.h
-include/fwb-2.1/fwcompiler/PolicyCompiler.h
-include/fwb-2.1/fwcompiler/Preprocessor.h
-include/fwb-2.1/fwcompiler/RoutingCompiler.h
-include/fwb-2.1/fwcompiler/RuleProcessor.h
-include/fwb-2.1/fwbuilder/Address.h
-include/fwb-2.1/fwbuilder/AddressRange.h
-include/fwb-2.1/fwbuilder/AddressTable.h
-include/fwb-2.1/fwbuilder/BackgroundOp.h
-include/fwb-2.1/fwbuilder/Constants.h
-include/fwb-2.1/fwbuilder/CustomService.h
-include/fwb-2.1/fwbuilder/DNSName.h
-include/fwb-2.1/fwbuilder/FWException.h
-include/fwb-2.1/fwbuilder/FWIntervalReference.h
-include/fwb-2.1/fwbuilder/FWObject.h
-include/fwb-2.1/fwbuilder/FWObjectDatabase.h
-include/fwb-2.1/fwbuilder/FWObjectReference.h
-include/fwb-2.1/fwbuilder/FWOptions.h
-include/fwb-2.1/fwbuilder/FWReference.h
-include/fwb-2.1/fwbuilder/FWServiceReference.h
-include/fwb-2.1/fwbuilder/Firewall.h
-include/fwb-2.1/fwbuilder/Group.h
-include/fwb-2.1/fwbuilder/Host.h
-include/fwb-2.1/fwbuilder/HostsFile.h
-include/fwb-2.1/fwbuilder/ICMPService.h
-include/fwb-2.1/fwbuilder/IPAddress.h
-include/fwb-2.1/fwbuilder/IPService.h
-include/fwb-2.1/fwbuilder/IPv4.h
-include/fwb-2.1/fwbuilder/Interface.h
-include/fwb-2.1/fwbuilder/InterfacePolicy.h
-include/fwb-2.1/fwbuilder/Interval.h
-include/fwb-2.1/fwbuilder/IntervalGroup.h
-include/fwb-2.1/fwbuilder/Library.h
-include/fwb-2.1/fwbuilder/Logger.h
-include/fwb-2.1/fwbuilder/Management.h
-include/fwb-2.1/fwbuilder/MultiAddress.h
-include/fwb-2.1/fwbuilder/NAT.h
-include/fwb-2.1/fwbuilder/Network.h
-include/fwb-2.1/fwbuilder/ObjectGroup.h
-include/fwb-2.1/fwbuilder/Policy.h
-include/fwb-2.1/fwbuilder/Pool.h
-include/fwb-2.1/fwbuilder/Resources.h
-include/fwb-2.1/fwbuilder/Routing.h
-include/fwb-2.1/fwbuilder/Rule.h
-include/fwb-2.1/fwbuilder/RuleElement.h
-include/fwb-2.1/fwbuilder/RuleSet.h
-include/fwb-2.1/fwbuilder/Service.h
-include/fwb-2.1/fwbuilder/ServiceGroup.h
-include/fwb-2.1/fwbuilder/SyncQueue.h
-include/fwb-2.1/fwbuilder/TCPService.h
-include/fwb-2.1/fwbuilder/TagService.h
-include/fwb-2.1/fwbuilder/ThreadTools.h
-include/fwb-2.1/fwbuilder/Tools.h
-include/fwb-2.1/fwbuilder/UDPService.h
-include/fwb-2.1/fwbuilder/XMLTools.h
-include/fwb-2.1/fwbuilder/dns.h
-include/fwb-2.1/fwbuilder/libfwbuilder-config.h
-include/fwb-2.1/fwbuilder/libfwbuilder-version.h
-include/fwb-2.1/fwbuilder/physAddress.h
-include/fwb-2.1/fwbuilder/snmp.h
-lib/libfwcompiler.so.7.3.0
-lib/libfwcompiler.so.7
-lib/libfwcompiler.so
-lib/libfwbuilder.so.7.3.0
-lib/libfwbuilder.so.7
-lib/libfwbuilder.so
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/Credits
-%%DOCSDIR%%/ChangeLog
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/AUTHORS
-%%DOCSDIR%%/PatchAcceptancePolicy.txt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.5.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.4.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.3.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.2.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.1.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.9.0.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.8.7.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.14.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.13.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.12.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.11.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.10.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.9.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.8.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.7.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.6.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.5.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.4.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.3.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.2.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.1.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_0.10.0.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.0.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.1.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_1.0.2.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.0.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.1.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.2.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.3.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.4.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.5.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.6.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.7.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.8.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.9.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.10.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.11.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.12.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.0.99.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.0.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.1.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.2.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.3.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.4.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.5.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.6.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.7.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.8.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.9.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.10.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.11.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.12.xslt
-share/libfwbuilder%%BUILD_VERSION%%/migration/FWObjectDatabase_2.1.13.xslt
-share/libfwbuilder%%BUILD_VERSION%%/fwbuilder.dtd
-@dirrm share/libfwbuilder%%BUILD_VERSION%%/migration
-@dirrm share/libfwbuilder%%BUILD_VERSION%%
-@dirrm %%DOCSDIR%%
-@dirrm include/fwb-2.1/fwcompiler
-@dirrm include/fwb-2.1/fwbuilder
-@dirrm include/fwb-2.1
diff --git a/security/linux-f10-openssl/Makefile b/security/linux-f10-openssl/Makefile
deleted file mode 100644
index 22cd2d9370d9..000000000000
--- a/security/linux-f10-openssl/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for: linux-openssl
-# Date created: 2006-08-04
-# Whom: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= openssl
-PORTVERSION= 0.9.7f
-CATEGORIES= security linux
-DISTNAME= ${PORTNAME}-${PORTVERSION}-7.10
-
-MAINTAINER= acm@FreeBSD.org
-COMMENT= SSL and crypto library (Linux Version)
-
-USE_LINUX_RPM= yes
-LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
-.include <bsd.port.mk>
diff --git a/security/linux-f10-openssl/distinfo.i386 b/security/linux-f10-openssl/distinfo.i386
deleted file mode 100644
index 749347d51ac1..000000000000
--- a/security/linux-f10-openssl/distinfo.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.i386.rpm) = 10b0af84502fa18f9894e9e759cecd64
-SHA256 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.i386.rpm) = 34db0416f11692b5fc5b8885149cf4487420e0435fcb09ca65ce77d30dda5e81
-SIZE (rpm/i386/fedora/4/openssl-0.9.7f-7.10.i386.rpm) = 1280954
-MD5 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.src.rpm) = 7a208caac25c849bea298129a50cd07b
-SHA256 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.src.rpm) = 2e931c0b46d8378ae1e625a0cb8ae7d769701cbd3d4b9fbf1b266b18404e0b9a
-SIZE (rpm/i386/fedora/4/openssl-0.9.7f-7.10.src.rpm) = 3056780
diff --git a/security/linux-f10-openssl/pkg-plist b/security/linux-f10-openssl/pkg-plist
deleted file mode 100644
index 87387228902b..000000000000
--- a/security/linux-f10-openssl/pkg-plist
+++ /dev/null
@@ -1,78 +0,0 @@
-etc/pki/tls/certs/Makefile
-etc/pki/tls/certs/ca-bundle.crt
-etc/pki/tls/certs/make-dummy-cert
-etc/pki/tls/misc/CA
-etc/pki/tls/misc/c_hash
-etc/pki/tls/misc/c_info
-etc/pki/tls/misc/c_issuer
-etc/pki/tls/misc/c_name
-etc/pki/tls/cert.pem
-etc/pki/tls/openssl.cnf
-lib/libcrypto.so.0.9.7f
-lib/libcrypto.so.5
-lib/libssl.so.0.9.7f
-lib/libssl.so.5
-usr/bin/openssl
-usr/share/doc/openssl-0.9.7f/CHANGES
-usr/share/doc/openssl-0.9.7f/FAQ
-usr/share/doc/openssl-0.9.7f/INSTALL
-usr/share/doc/openssl-0.9.7f/LICENSE
-usr/share/doc/openssl-0.9.7f/NEWS
-usr/share/doc/openssl-0.9.7f/README
-usr/share/doc/openssl-0.9.7f/c-indentation.el
-usr/share/doc/openssl-0.9.7f/openssl.txt
-usr/share/doc/openssl-0.9.7f/openssl_button.gif
-usr/share/doc/openssl-0.9.7f/openssl_button.html
-usr/share/doc/openssl-0.9.7f/ssleay.txt
-usr/share/man/man1/asn1parse.1ssl.gz
-usr/share/man/man1/ca.1ssl.gz
-usr/share/man/man1/ciphers.1ssl.gz
-usr/share/man/man1/crl.1ssl.gz
-usr/share/man/man1/crl2pkcs7.1ssl.gz
-usr/share/man/man1/dgst.1ssl.gz
-usr/share/man/man1/dhparam.1ssl.gz
-usr/share/man/man1/dsa.1ssl.gz
-usr/share/man/man1/dsaparam.1ssl.gz
-usr/share/man/man1/enc.1ssl.gz
-usr/share/man/man1/errstr.1ssl.gz
-usr/share/man/man1/gendsa.1ssl.gz
-usr/share/man/man1/genrsa.1ssl.gz
-usr/share/man/man1/md2.1ssl.gz
-usr/share/man/man1/md4.1ssl.gz
-usr/share/man/man1/md5.1ssl.gz
-usr/share/man/man1/mdc2.1ssl.gz
-usr/share/man/man1/nseq.1ssl.gz
-usr/share/man/man1/ocsp.1ssl.gz
-usr/share/man/man1/openssl.1ssl.gz
-usr/share/man/man1/pkcs12.1ssl.gz
-usr/share/man/man1/pkcs7.1ssl.gz
-usr/share/man/man1/pkcs8.1ssl.gz
-usr/share/man/man1/req.1ssl.gz
-usr/share/man/man1/ripemd160.1ssl.gz
-usr/share/man/man1/rsa.1ssl.gz
-usr/share/man/man1/rsautl.1ssl.gz
-usr/share/man/man1/s_client.1ssl.gz
-usr/share/man/man1/s_server.1ssl.gz
-usr/share/man/man1/s_time.1ssl.gz
-usr/share/man/man1/sess_id.1ssl.gz
-usr/share/man/man1/sha.1ssl.gz
-usr/share/man/man1/sha1.1ssl.gz
-usr/share/man/man1/smime.1ssl.gz
-usr/share/man/man1/speed.1ssl.gz
-usr/share/man/man1/spkac.1ssl.gz
-usr/share/man/man1/sslpasswd.1ssl.gz
-usr/share/man/man1/sslrand.1ssl.gz
-usr/share/man/man1/verify.1ssl.gz
-usr/share/man/man1/version.1ssl.gz
-usr/share/man/man1/x509.1ssl.gz
-usr/share/man/man5/config.5ssl.gz
-usr/share/man/man7/Modes_of_DES.7ssl.gz
-usr/share/man/man7/des_modes.7ssl.gz
-@dirrm usr/share/doc/openssl-0.9.7f
-@dirrmtry etc/pki/tls/private
-@dirrmtry etc/pki/tls/misc
-@dirrmtry etc/pki/tls/certs
-@dirrmtry etc/pki/tls
-@dirrmtry etc/pki/CA/private
-@dirrmtry etc/pki/CA
-@dirrmtry etc/pki
diff --git a/security/linux-f8-openssl/Makefile b/security/linux-f8-openssl/Makefile
deleted file mode 100644
index 22cd2d9370d9..000000000000
--- a/security/linux-f8-openssl/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# New ports collection makefile for: linux-openssl
-# Date created: 2006-08-04
-# Whom: Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= openssl
-PORTVERSION= 0.9.7f
-CATEGORIES= security linux
-DISTNAME= ${PORTNAME}-${PORTVERSION}-7.10
-
-MAINTAINER= acm@FreeBSD.org
-COMMENT= SSL and crypto library (Linux Version)
-
-USE_LINUX_RPM= yes
-LINUX_DIST_VER= 4
-INSTALLS_SHLIB= yes
-DESCR= ${.CURDIR}/../${PORTNAME}/pkg-descr
-
-.include <bsd.port.mk>
diff --git a/security/linux-f8-openssl/distinfo.i386 b/security/linux-f8-openssl/distinfo.i386
deleted file mode 100644
index 749347d51ac1..000000000000
--- a/security/linux-f8-openssl/distinfo.i386
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.i386.rpm) = 10b0af84502fa18f9894e9e759cecd64
-SHA256 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.i386.rpm) = 34db0416f11692b5fc5b8885149cf4487420e0435fcb09ca65ce77d30dda5e81
-SIZE (rpm/i386/fedora/4/openssl-0.9.7f-7.10.i386.rpm) = 1280954
-MD5 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.src.rpm) = 7a208caac25c849bea298129a50cd07b
-SHA256 (rpm/i386/fedora/4/openssl-0.9.7f-7.10.src.rpm) = 2e931c0b46d8378ae1e625a0cb8ae7d769701cbd3d4b9fbf1b266b18404e0b9a
-SIZE (rpm/i386/fedora/4/openssl-0.9.7f-7.10.src.rpm) = 3056780
diff --git a/security/linux-f8-openssl/pkg-plist b/security/linux-f8-openssl/pkg-plist
deleted file mode 100644
index 87387228902b..000000000000
--- a/security/linux-f8-openssl/pkg-plist
+++ /dev/null
@@ -1,78 +0,0 @@
-etc/pki/tls/certs/Makefile
-etc/pki/tls/certs/ca-bundle.crt
-etc/pki/tls/certs/make-dummy-cert
-etc/pki/tls/misc/CA
-etc/pki/tls/misc/c_hash
-etc/pki/tls/misc/c_info
-etc/pki/tls/misc/c_issuer
-etc/pki/tls/misc/c_name
-etc/pki/tls/cert.pem
-etc/pki/tls/openssl.cnf
-lib/libcrypto.so.0.9.7f
-lib/libcrypto.so.5
-lib/libssl.so.0.9.7f
-lib/libssl.so.5
-usr/bin/openssl
-usr/share/doc/openssl-0.9.7f/CHANGES
-usr/share/doc/openssl-0.9.7f/FAQ
-usr/share/doc/openssl-0.9.7f/INSTALL
-usr/share/doc/openssl-0.9.7f/LICENSE
-usr/share/doc/openssl-0.9.7f/NEWS
-usr/share/doc/openssl-0.9.7f/README
-usr/share/doc/openssl-0.9.7f/c-indentation.el
-usr/share/doc/openssl-0.9.7f/openssl.txt
-usr/share/doc/openssl-0.9.7f/openssl_button.gif
-usr/share/doc/openssl-0.9.7f/openssl_button.html
-usr/share/doc/openssl-0.9.7f/ssleay.txt
-usr/share/man/man1/asn1parse.1ssl.gz
-usr/share/man/man1/ca.1ssl.gz
-usr/share/man/man1/ciphers.1ssl.gz
-usr/share/man/man1/crl.1ssl.gz
-usr/share/man/man1/crl2pkcs7.1ssl.gz
-usr/share/man/man1/dgst.1ssl.gz
-usr/share/man/man1/dhparam.1ssl.gz
-usr/share/man/man1/dsa.1ssl.gz
-usr/share/man/man1/dsaparam.1ssl.gz
-usr/share/man/man1/enc.1ssl.gz
-usr/share/man/man1/errstr.1ssl.gz
-usr/share/man/man1/gendsa.1ssl.gz
-usr/share/man/man1/genrsa.1ssl.gz
-usr/share/man/man1/md2.1ssl.gz
-usr/share/man/man1/md4.1ssl.gz
-usr/share/man/man1/md5.1ssl.gz
-usr/share/man/man1/mdc2.1ssl.gz
-usr/share/man/man1/nseq.1ssl.gz
-usr/share/man/man1/ocsp.1ssl.gz
-usr/share/man/man1/openssl.1ssl.gz
-usr/share/man/man1/pkcs12.1ssl.gz
-usr/share/man/man1/pkcs7.1ssl.gz
-usr/share/man/man1/pkcs8.1ssl.gz
-usr/share/man/man1/req.1ssl.gz
-usr/share/man/man1/ripemd160.1ssl.gz
-usr/share/man/man1/rsa.1ssl.gz
-usr/share/man/man1/rsautl.1ssl.gz
-usr/share/man/man1/s_client.1ssl.gz
-usr/share/man/man1/s_server.1ssl.gz
-usr/share/man/man1/s_time.1ssl.gz
-usr/share/man/man1/sess_id.1ssl.gz
-usr/share/man/man1/sha.1ssl.gz
-usr/share/man/man1/sha1.1ssl.gz
-usr/share/man/man1/smime.1ssl.gz
-usr/share/man/man1/speed.1ssl.gz
-usr/share/man/man1/spkac.1ssl.gz
-usr/share/man/man1/sslpasswd.1ssl.gz
-usr/share/man/man1/sslrand.1ssl.gz
-usr/share/man/man1/verify.1ssl.gz
-usr/share/man/man1/version.1ssl.gz
-usr/share/man/man1/x509.1ssl.gz
-usr/share/man/man5/config.5ssl.gz
-usr/share/man/man7/Modes_of_DES.7ssl.gz
-usr/share/man/man7/des_modes.7ssl.gz
-@dirrm usr/share/doc/openssl-0.9.7f
-@dirrmtry etc/pki/tls/private
-@dirrmtry etc/pki/tls/misc
-@dirrmtry etc/pki/tls/certs
-@dirrmtry etc/pki/tls
-@dirrmtry etc/pki/CA/private
-@dirrmtry etc/pki/CA
-@dirrmtry etc/pki
diff --git a/security/nettle2/Makefile b/security/nettle2/Makefile
deleted file mode 100644
index 483f8a392f42..000000000000
--- a/security/nettle2/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-# ex:ts=8
-# New ports collection makefile for: nettle
-# Date created: Dec 6, 2001
-# Whom: ijliao
-#
-# $FreeBSD$
-#
-
-PORTNAME= nettle
-PORTVERSION= 1.15
-PORTREVISION= 1
-CATEGORIES= security
-MASTER_SITES= http://www.lysator.liu.se/~nisse/archive/ \
- ftp://ftp.lysator.liu.se/pub/security/lsh/
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= A low-level cryptographic library
-
-LIB_DEPENDS= gmp.7:${PORTSDIR}/math/libgmp4
-
-USE_GMAKE= yes
-USE_OPENSSL= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include"
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --enable-shared
-LDFLAGS+= -L${LOCALBASE}/lib
-USE_LDCONFIG= yes
-USE_GETOPT_LONG= yes
-
-DOCS= NEWS README TODO nettle.html
-EXAMPLES= examples/*.c examples/*.h
-
-INFO= nettle
-
-post-extract:
- @${RM} -f ${WRKSRC}/nettle.info*
-
-post-install:
- @${MKDIR} ${EXAMPLESDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
-.endif
-
-.include <bsd.port.mk>
diff --git a/security/nettle2/distinfo b/security/nettle2/distinfo
deleted file mode 100644
index f67158cfbbd7..000000000000
--- a/security/nettle2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (nettle-1.15.tar.gz) = 6b0fd004359660b65ff3eca77b3d5fa6
-SHA256 (nettle-1.15.tar.gz) = d6e540bf4acc857a3b09580e7f61822d352ee83c119579bf7333f0a785f7d9ac
-SIZE (nettle-1.15.tar.gz) = 829862
diff --git a/security/nettle2/files/patch-Makefile.in b/security/nettle2/files/patch-Makefile.in
deleted file mode 100644
index a46bc2fb063b..000000000000
--- a/security/nettle2/files/patch-Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig Tue Nov 1 09:34:09 2005
-+++ Makefile.in Tue Nov 1 09:34:24 2005
-@@ -221,7 +221,6 @@
- $(INSTALL_PROGRAM) $(SHLIBFORLINK) $(DESTDIR)$(libdir)/$(SHLIBFILE)
- [ -z "$(SHLIBSONAME)" ] \
- || (cd $(DESTDIR)$(libdir) \
-- && ln -sf $(SHLIBFILE) $(SHLIBSONAME) \
- && ln -sf $(SHLIBFILE) $(SHLIBFORLINK) )
-
- install-info: nettle.info
diff --git a/security/nettle2/files/patch-configure b/security/nettle2/files/patch-configure
deleted file mode 100644
index dceae170135b..000000000000
--- a/security/nettle2/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig Tue Nov 1 09:35:20 2005
-+++ configure Tue Nov 1 09:36:28 2005
-@@ -2990,7 +2990,7 @@
- *)
- SHLIBFORLINK=libnettle.so
- SHLIBSONAME='$(SHLIBFORLINK).$(SHLIBMAJOR)'
-- SHLIBFILE='$(SHLIBSONAME).$(SHLIBMINOR)'
-+ SHLIBFILE='$(SHLIBSONAME)'
- SHLIBLINK='$(CC) $(LDFLAGS) -shared -Wl,-soname=$(SHLIBSONAME)'
- # FIXME: It might make some sense to link with -lgmp
- SHLIBLIBS=''
diff --git a/security/nettle2/files/patch-examples_nettle-openssl.c b/security/nettle2/files/patch-examples_nettle-openssl.c
deleted file mode 100644
index 985dabbf146c..000000000000
--- a/security/nettle2/files/patch-examples_nettle-openssl.c
+++ /dev/null
@@ -1,13 +0,0 @@
-
-$FreeBSD$
-
---- examples/nettle-openssl.c.orig
-+++ examples/nettle-openssl.c
-@@ -35,6 +35,7 @@
- #define NCOMPAT
- #define OPENSSL_DISABLE_OLD_DES_SUPPORT
-
-+#include <sys/types.h>
- #include <assert.h>
-
- #include <openssl/aes.h>
diff --git a/security/nettle2/pkg-descr b/security/nettle2/pkg-descr
deleted file mode 100644
index e9e262fcac2d..000000000000
--- a/security/nettle2/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Nettle is a cryptographic library that is designed to fit easily in more or
-less any context: In crypto toolkits for object-oriented languages (C++,
-Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel
-space.
-
-WWW: http://www.lysator.liu.se/~nisse/nettle/
diff --git a/security/nettle2/pkg-plist b/security/nettle2/pkg-plist
deleted file mode 100644
index af66fcaaa691..000000000000
--- a/security/nettle2/pkg-plist
+++ /dev/null
@@ -1,62 +0,0 @@
-bin/nettle-lfib-stream
-bin/pkcs1-conv
-bin/sexp-conv
-include/nettle/aes.h
-include/nettle/arcfour.h
-include/nettle/arctwo.h
-include/nettle/asn1.h
-include/nettle/base16.h
-include/nettle/base64.h
-include/nettle/bignum.h
-include/nettle/blowfish.h
-include/nettle/buffer.h
-include/nettle/cast128.h
-include/nettle/cbc.h
-include/nettle/ctr.h
-include/nettle/des-compat.h
-include/nettle/des.h
-include/nettle/dsa.h
-include/nettle/hmac.h
-include/nettle/knuth-lfib.h
-include/nettle/macros.h
-include/nettle/md2.h
-include/nettle/md4.h
-include/nettle/md5-compat.h
-include/nettle/md5.h
-include/nettle/memxor.h
-include/nettle/nettle-meta.h
-include/nettle/nettle-stdint.h
-include/nettle/nettle-types.h
-include/nettle/pgp.h
-include/nettle/pkcs1.h
-include/nettle/realloc.h
-include/nettle/rsa-compat.h
-include/nettle/rsa.h
-include/nettle/serpent.h
-include/nettle/sexp.h
-include/nettle/sha.h
-include/nettle/twofish.h
-include/nettle/yarrow.h
-@dirrm include/nettle
-lib/libnettle.a
-lib/libnettle.so
-lib/libnettle.so.2
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%%%DOCSDIR%%/nettle.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/getopt.c
-%%EXAMPLESDIR%%/getopt.h
-%%EXAMPLESDIR%%/getopt1.c
-%%EXAMPLESDIR%%/io.c
-%%EXAMPLESDIR%%/io.h
-%%EXAMPLESDIR%%/nettle-benchmark.c
-%%EXAMPLESDIR%%/nettle-openssl.c
-%%EXAMPLESDIR%%/rsa-decrypt.c
-%%EXAMPLESDIR%%/rsa-encrypt.c
-%%EXAMPLESDIR%%/rsa-keygen.c
-%%EXAMPLESDIR%%/rsa-session.h
-%%EXAMPLESDIR%%/rsa-sign.c
-%%EXAMPLESDIR%%/rsa-verify.c
-@dirrm %%EXAMPLESDIR%%
diff --git a/security/opensaml2/Makefile b/security/opensaml2/Makefile
deleted file mode 100644
index 8cd929b23217..000000000000
--- a/security/opensaml2/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# New ports collection makefile for: opensaml
-# Date created: 06 Febuary 2007
-# Whom: Tony Maher
-#
-# $FreeBSD$
-#
-
-PORTNAME= opensaml
-DISTVERSION= 1.1b
-CATEGORIES= security
-MASTER_SITES= http://shibboleth.internet2.edu/downloads/
-
-MAINTAINER= tonymaher@optusnet.com.au
-COMMENT= Open source implentation of SAML
-
-LIB_DEPENDS= curl.4:${PORTSDIR}/ftp/curl \
- log4cpp.4:${PORTSDIR}/devel/log4cpp \
- xerces-c.27:${PORTSDIR}/textproc/xerces-c2 \
- xml-security-c.13:${PORTSDIR}/security/apache-xml-security-c
-
-GNU_CONFIGURE= yes
-USE_AUTOTOOLS= libtool:15
-USE_GMAKE= yes
-USE_LDCONFIG= yes
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-1.1
-
-.include <bsd.port.pre.mk>
-
-post-patch:
- @${REINPLACE_CMD} -e 's,^pkgdocdir.*=.*,pkgdocdir = ${DOCSDIR},' \
- ${WRKSRC}/doc/Makefile.in
-.if defined(NOPORTDOCS)
- @${REINPLACE_CMD} -e '/^SUBDIRS/s,doc ,,' ${WRKSRC}/Makefile.in
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/security/opensaml2/distinfo b/security/opensaml2/distinfo
deleted file mode 100644
index da7f26075c93..000000000000
--- a/security/opensaml2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (opensaml-1.1b.tar.gz) = e1f2ecea59244a3d34f1abdedff18956
-SHA256 (opensaml-1.1b.tar.gz) = 24bd44c80659b062c76f1b6d6510b3fcd6d04e9b460e22cc037e0c45286ec110
-SIZE (opensaml-1.1b.tar.gz) = 467027
diff --git a/security/opensaml2/files/patch-configure b/security/opensaml2/files/patch-configure
deleted file mode 100644
index bcfb1d6a0e39..000000000000
--- a/security/opensaml2/files/patch-configure
+++ /dev/null
@@ -1,17 +0,0 @@
---- configure.orig Mon Feb 12 12:13:21 2007
-+++ configure Mon Feb 12 12:13:27 2007
-@@ -20574,8 +20574,12 @@
- fi;
- SSLLIBS="$SSLLIBS -lssl -lcrypto"
- else
-- SSLLIBS="`$PKG_CONFIG --libs openssl`"
-- SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
-+ if `$PKG_CONFIG --libs openssl >> /dev/null 2>&1`; then
-+ SSLLIBS="`$PKG_CONFIG --libs openssl`"
-+ SSLFLAGS="`$PKG_CONFIG --cflags openssl`"
-+ else
-+ SSLLIBS="$SSLLIBS -lssl -lcrypto"
-+ fi
- fi
- echo "$as_me:$LINENO: checking for OpenSSL libraries" >&5
- echo $ECHO_N "checking for OpenSSL libraries... $ECHO_C" >&6
diff --git a/security/opensaml2/pkg-descr b/security/opensaml2/pkg-descr
deleted file mode 100644
index a116fd2012fe..000000000000
--- a/security/opensaml2/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-OpenSAML is an implementation of SAML 1.0 and 1.1 providing java and C++
-APIs. This is the C++ version.
-
-WWW: https://spaces.internet2.edu/display/SHIB/OpenSAML
diff --git a/security/opensaml2/pkg-plist b/security/opensaml2/pkg-plist
deleted file mode 100644
index 5af54f11ccaa..000000000000
--- a/security/opensaml2/pkg-plist
+++ /dev/null
@@ -1,29 +0,0 @@
-bin/signtest
-include/saml/SAMLDateTime.h
-include/saml/config_pub.h
-include/saml/hresult.h
-include/saml/saml.h
-include/saml/version.h
-lib/libsaml.a
-lib/libsaml.so
-lib/libsaml.so.5
-%%PORTDOCS%%%%DOCSDIR%%/CURL.LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL-WIN32.txt
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
-%%PORTDOCS%%%%DOCSDIR%%/LOG4CPP.LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/NEWS.txt
-%%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
-%%PORTDOCS%%%%DOCSDIR%%/OPENSSL.LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
-share/xml/opensaml/cs-sstc-schema-assertion-01.xsd
-share/xml/opensaml/cs-sstc-schema-assertion-1.1.xsd
-share/xml/opensaml/cs-sstc-schema-protocol-01.xsd
-share/xml/opensaml/cs-sstc-schema-protocol-1.1.xsd
-share/xml/opensaml/soap-envelope.xsd
-share/xml/opensaml/xml.xsd
-share/xml/opensaml/xmldsig-core-schema.xsd
-@dirrm include/saml
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm share/xml/opensaml
diff --git a/security/openvpn20/Makefile b/security/openvpn20/Makefile
deleted file mode 100644
index c8d8572b19f4..000000000000
--- a/security/openvpn20/Makefile
+++ /dev/null
@@ -1,91 +0,0 @@
-# New ports collection makefile for: openvpn
-# Date created: 2002-06-23
-# Whom: Matthias Andree <matthias.andree@gmx.de>
-#
-# $FreeBSD$
-#
-
-PORTNAME= openvpn
-# -----------------------------------------------------
-# DO NOT BOTHER TO SEND NOTICES ABOUT OPENVPN 2.0.9
-# AS IT FIXES WINDOWS-ONLY BUGS THAT DON'T AFFECT *BSD
-# AND THUS DOES NOT WARRANT A PORT UPGRADE!
-# UPGRADE REQUESTS WILL BE DROPPED UNLESS BSD-RELATED.
-# -----------------------------------------------------
-PORTVERSION= 2.0.6
-PORTREVISION= 7
-CATEGORIES= security net
-# MASTER_SITES points to hosts in distinct data centers,
-# so just one MASTER_SITES entry should be OK.
-MASTER_SITES= http://openvpn.net/release/
-
-MAINTAINER= matthias.andree@gmx.de
-COMMENT= Secure IP/Ethernet tunnel daemon
-
-CONFLICTS= openvpn-devel-[0-9]*
-
-GNU_CONFIGURE= yes
-USE_OPENSSL= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-CONFIGURE_ARGS= --with-lzo-lib=${LOCALBASE}/lib \
- --with-lzo-headers=${LOCALBASE}/include
-
-MAN8= openvpn.8
-
-OPTIONS= PW_SAVE "Interactive passwords may be read from a file" off
-
-USE_RC_SUBR= openvpn.sh
-USE_LDCONFIG= ${PREFIX}/lib
-
-SUB_FILES= pkg-message pkg-req
-SUB_LIST+= OSVERSION=${OSVERSION}
-
-.include <bsd.port.pre.mk>
-
-SUB_LIST+= RCSFX=${RC_SUBR_SUFFIX}
-
-# NOTE: there is no way to explicitly specify the LZO version to OpenVPN,
-# if LZO2 and LZO1 are installed, OpenVPN will pick LZO2.
-# So depend on LZO1 only if it's already there and LZO2 isn't.
-# PACKAGE_BUILDING will also force LZO2.
-.if exists(${LOCALBASE}/lib/liblzo2.so.2) || !exists(${LOCALBASE}/lib/liblzo.so.1) || defined(PACKAGE_BUILDING)
-LIB_DEPENDS+= lzo2.2:${PORTSDIR}/archivers/lzo2
-.else
-LIB_DEPENDS+= lzo.1:${PORTSDIR}/archivers/lzo
-.endif
-
-.if defined(WITH_PW_SAVE)
-CONFIGURE_ARGS+= --enable-password-save
-.endif
-
-post-build:
- cd ${WRKSRC}/plugin/down-root && ${MAKE}
- cd ${WRKSRC}/plugin/auth-pam && ${CC} ${CPPFLAGS} -I../.. -DDLOPEN_PAM=0 ${CFLAGS} -fPIC -shared -Wl,-soname,openvpn-auth-pam.so -o openvpn-auth-pam.so auth-pam.c pamdl.c -lc -lpam
- @# self-tests here
-.if !defined(WITHOUT_CHECK)
- cd ${WRKSRC} && ${MAKE} check
-.endif
-
-pre-install:
- PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
-
-post-install:
- ${MKDIR} ${PREFIX}/lib
- ${INSTALL_PROGRAM} ${WRKSRC}/plugin/down-root/openvpn-down-root.so ${PREFIX}/lib
- ${INSTALL_PROGRAM} ${WRKSRC}/plugin/auth-pam/openvpn-auth-pam.so ${PREFIX}/lib
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/plugin/down-root/README ${DOCSDIR}/README.openvpn-down-root
- ${INSTALL_DATA} ${WRKSRC}/plugin/auth-pam/README ${DOCSDIR}/README.openvpn-auth-pam
-.for docs in AUTHORS COPYING COPYRIGHT.GPL ChangeLog INSTALL NEWS \
- PORTS README
- ${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
-.endfor
- ( cd ${WRKSRC} \
- && ${FIND} easy-rsa sample-config-files sample-scripts -depth \
- | ${GREP} -v easy-rsa/Windows \
- | ${CPIO} -pdmu ${DOCSDIR} )
-.endif
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/security/openvpn20/distinfo b/security/openvpn20/distinfo
deleted file mode 100644
index e36e6e490d74..000000000000
--- a/security/openvpn20/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (openvpn-2.0.6.tar.gz) = 8d2f95fa825e58363a676b25d4815aa7
-SHA256 (openvpn-2.0.6.tar.gz) = 1074c9fb5a7881e6d4ff0b125cf1e44a9fb650beef187f061785698522453003
-SIZE (openvpn-2.0.6.tar.gz) = 664816
diff --git a/security/openvpn20/files/openvpn.sh.in b/security/openvpn20/files/openvpn.sh.in
deleted file mode 100644
index ee9853a121d8..000000000000
--- a/security/openvpn20/files/openvpn.sh.in
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/sh
-#
-# openvpn.sh - load tun/tap driver and start OpenVPN daemon
-#
-# (C) Copyright 2005 - 2007 by Matthias Andree
-# based on suggestions by Matthias Grimm and Dirk Gouders
-# with multi-instance contribution from Denis Shaposhnikov, Gleb Kozyrev
-# and Vasil Dimov
-#
-# $FreeBSD$
-#
-# 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; either version 2 of the License, or (at your option) any later
-# version.
-#
-# 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., 51 Franklin
-# Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# PROVIDE: openvpn
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-# -----------------------------------------------------------------------------
-#
-# This script supports running multiple instances of openvpn.
-# To run additional instance link this script to something like
-# % ln -s openvpn openvpn_foo
-# and define additional openvpn_foo_* variables in one of
-# /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/openvpn_foo
-#
-# Below NAME should be substituted with the name of this script. By default
-# it is openvpn, so read as openvpn_enable. If you linked the script to
-# openvpn_foo, then read as openvpn_foo_enable etc.
-#
-# The following variables are supported (defaults are shown).
-# You can place them in any of
-# /etc/rc.conf, /etc/rc.conf.local or /etc/rc.conf.d/NAME
-#
-# NAME_enable="NO" # set to YES to enable openvpn
-# NAME_if="" # driver(s) to load, set to "tun", "tap" or "tun tap"
-#
-# # optional:
-# NAME_flags="" # additional command line arguments
-# NAME_configfile="%%PREFIX%%/etc/openvpn/NAME.conf" # --config file
-# NAME_dir="%%PREFIX%%/etc/openvpn" # --cd directory
-#
-# You also need to set NAME_configfile and NAME_dir, if the configuration
-# file and directory where keys and certificates reside differ from the above
-# settings.
-#
-# Note that we deliberately refrain from unloading drivers.
-#
-# For further documentation, please see openvpn(8).
-#
-
-. %%RC_SUBR%%
-
-case "$0" in
-/etc/rc*)
- # during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown),
- # so get the name of the script from $_file
- name=$(basename "$_file" .sh)
- ;;
-*)
- name=$(basename "$0" .sh)
- ;;
-esac
-
-rcvar=$(set_rcvar)
-
-prefix="%%PREFIX%%"
-
-openvpn_precmd()
-{
- for i in $interfaces ; do
- # FreeBSD <= 5.4 does not know kldstat's -m option
- # FreeBSD >= 6.0 does not add debug.* sysctl information
- # in the default build - we check both to keep things simple
- if ! sysctl debug.if_${i}_debug >/dev/null 2>&1 \
- && ! kldstat -m if_${i} >/dev/null 2>&1 ; then
- if ! kldload if_${i} ; then
- warn "Could not load $i module."
- return 1
- fi
- fi
- done
- return 0
-}
-
-stop_postcmd()
-{
- rm -f "$pidfile" || warn "Could not remove $pidfile."
-}
-
-# support SIGHUP to reparse configuration file
-extra_commands="reload"
-
-# pidfile
-pidfile="/var/run/${name}.pid"
-
-# command and arguments
-command="%%PREFIX%%/sbin/openvpn"
-
-# run this first
-start_precmd="openvpn_precmd"
-# and this last
-stop_postcmd="stop_postcmd"
-
-load_rc_config ${name}
-
-eval ": \${${name}_enable:=\"NO\"}"
-eval ": \${${name}_flags:=\"\"}"
-eval ": \${${name}_if:=\"\"}"
-eval ": \${${name}_configfile:=\"${prefix}/etc/openvpn/${name}.conf\"}"
-eval ": \${${name}_dir:=\"${prefix}/etc/openvpn\"}"
-
-configfile="$(eval echo \${${name}_configfile})"
-dir="$(eval echo \${${name}_dir})"
-interfaces="$(eval echo \${${name}_if})"
-
-required_files=${configfile}
-command_args="--cd ${dir} --daemon --config ${configfile} --writepid ${pidfile}"
-
-run_rc_command "$1"
diff --git a/security/openvpn20/files/pkg-message.in b/security/openvpn20/files/pkg-message.in
deleted file mode 100644
index 64494e4d6a85..000000000000
--- a/security/openvpn20/files/pkg-message.in
+++ /dev/null
@@ -1,20 +0,0 @@
-### ------------------------------------------------------------------------
-### The OpenVPN FreeBSD port, since v2.0.1, uses rcNG to start OpenVPN.
-### Edit /etc/rc.conf to start OpenVPN automatically at system startup.
-### See %%PREFIX%%/etc/rc.d/openvpn%%RCSFX%% for details.
-### ------------------------------------------------------------------------
-### To get OpenVPN 1.X to talk with the new 2.0 version, you may need to
-### edit the 1.X configuration file by adding these lines:
-### tun-mtu 1500
-### tun-mtu-extra 32
-### mssfix 1450
-### key-method 2 <- this key-method line only for TLS setups
-### - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-### WARNING: THE DEFAULT PORT HAS CHANGED AND IS NOW 1194!
-### OpenVPN 1.6 and older used 5000 rather than 1194 as their default
-### port, so add the proper port options to your configuration file!
-### - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-### For further compatibility, see <http://openvpn.net/relnotes.html>
-### ------------------------------------------------------------------------
-### If you want to donate to OpenVPN: <http://openvpn.net/donate.html>
-### ------------------------------------------------------------------------
diff --git a/security/openvpn20/files/pkg-req.in b/security/openvpn20/files/pkg-req.in
deleted file mode 100644
index 15c8242d8724..000000000000
--- a/security/openvpn20/files/pkg-req.in
+++ /dev/null
@@ -1,29 +0,0 @@
-set -e
-
-rcvers() {
- # determine if we have "old" or "new" (rcorder integration) scheme
- # for %%PREFIX%%/etc/rc.d/* files
- if test $1 -ge 700007 || test $1 -lt 700000 -a $1 -ge 600101 ; then
- echo 2
- else
- echo 1
- fi
-}
-
-if [ "$2" = INSTALL ] ; then
- # check if the base system is new enough for us,
- # which should only matter for package installs.
- buildrc=$(rcvers %%OSVERSION%%)
- execrc=$(rcvers $(sysctl -n kern.osreldate) )
- if test $buildrc -gt $execrc ; then
- cat <<EOF
-
-Error: this package, $1, was compiled for a newer FreeBSD
-====== version that uses different boot scripts.
- Therefore, the rc.d script WILL NOT WORK.
- Please update your ports tree and install security/openvpn from there.
-
-EOF
- exit 1
- fi
-fi
diff --git a/security/openvpn20/pkg-descr b/security/openvpn20/pkg-descr
deleted file mode 100644
index b527fa8fa75e..000000000000
--- a/security/openvpn20/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-OpenVPN is a robust, scalable and highly configurable VPN (Virtual Private
-Network) daemon which can be used to securely link two or more private networks
-using an encrypted tunnel over the internet. It can operate over UDP or TCP,
-can use SSL or a pre-shared secret to authenticate peers, and in SSL mode, one
-server can handle many clients.
-
-WWW: http://openvpn.net/
-
-- Matthias Andree
-matthias.andree@gmx.de
diff --git a/security/openvpn20/pkg-plist b/security/openvpn20/pkg-plist
deleted file mode 100644
index 4df2203dbd05..000000000000
--- a/security/openvpn20/pkg-plist
+++ /dev/null
@@ -1,75 +0,0 @@
-sbin/openvpn
-lib/openvpn-auth-pam.so
-lib/openvpn-down-root.so
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT.GPL
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/PORTS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.openvpn-auth-pam
-%%PORTDOCS%%%%DOCSDIR%%/README.openvpn-down-root
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/README
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-ca
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-dh
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-inter
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key-pass
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key-pkcs12
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-key-server
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-req
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/build-req-pass
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/clean-all
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/list-crl
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/make-crl
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/openssl.cnf
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/revoke-crt
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/revoke-full
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/sign-req
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/vars
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/README
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-ca
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-dh
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-inter
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key-pass
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key-pkcs12
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-key-server
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-req
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/build-req-pass
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/clean-all
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/inherit-inter
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/list-crl
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/openssl.cnf
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/pkitool
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/revoke-full
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/sign-req
-%%PORTDOCS%%%%DOCSDIR%%/easy-rsa/2.0/vars
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/README
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/client.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/firewall.sh
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/home.up
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/loopback-client
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/loopback-server
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/office.up
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/openvpn-shutdown.sh
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/openvpn-startup.sh
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/server.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/static-home.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/static-office.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/tls-home.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/tls-office.conf
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/xinetd-client-config
-%%PORTDOCS%%%%DOCSDIR%%/sample-config-files/xinetd-server-config
-%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/auth-pam.pl
-%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-start
-%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/bridge-stop
-%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/openvpn.init
-%%PORTDOCS%%%%DOCSDIR%%/sample-scripts/verify-cn
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/sample-scripts
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/sample-config-files
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/easy-rsa/2.0
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/easy-rsa
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/security/p5-File-Scan-ClamAV/Makefile b/security/p5-File-Scan-ClamAV/Makefile
index 0737b0a78c58..c9ab8b88ad47 100644
--- a/security/p5-File-Scan-ClamAV/Makefile
+++ b/security/p5-File-Scan-ClamAV/Makefile
@@ -7,7 +7,7 @@
PORTNAME= File-Scan-ClamAV
PORTVERSION= 1.8
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= File
diff --git a/security/php-Auth_OpenID2/Makefile b/security/php-Auth_OpenID2/Makefile
deleted file mode 100644
index 61c6995c17d6..000000000000
--- a/security/php-Auth_OpenID2/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# New ports collection makefile for: php-Auth_OpenID
-# Date created: 2007-04-24
-# Whom: Gea-Suan Lin <gslin@gslin.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME= Auth_OpenID
-PORTVERSION= 1.2.2
-CATEGORIES= security www pear
-MASTER_SITES= http://www.openidenabled.com/resources/downloads/php-openid/pear/
-PKGNAMEPREFIX= php-
-EXTRACT_SUFX= .tgz
-
-MAINTAINER= gslin@gslin.org
-COMMENT= PHP OpenID library
-
-RUN_DEPENDS= pear:${PORTSDIR}/devel/pear
-BUILD_DEPENDS= ${RUN_DEPENDS}
-
-NO_BUILD= yes
-OPTIONS= BCMATH "Use bcmath instead of libgmp" off \
- MYSQL "Use mysql" off \
- PGSQL "Use pgsql" off \
- SQLITE "Use sqlite" off
-
-USE_PHP= curl
-
-.include <bsd.port.pre.mk>
-
-.ifdef(WITH_BCMATH)
-USE_PHP+= bcmath
-.else
-USE_PHP+= gmp
-.endif
-
-.ifdef(WITH_MYSQL)
-USE_PHP+= mysql
-.endif
-
-.ifdef(WITH_PGSQL)
-USE_PHP+= pgsql
-.endif
-
-.ifdef(WITH_SQLITE)
-USE_PHP+= sqlite
-.endif
-
-do-install:
- ${MKDIR} ${PREFIX}/share/pear/Auth/OpenID
- ${CP} ${WRKSRC}/Auth/OpenID.php ${PREFIX}/share/pear/Auth
- ${CP} ${WRKSRC}/Auth/OpenID/* ${PREFIX}/share/pear/Auth/OpenID
- ${MKDIR} ${PREFIX}/share/pear/Services/Yadis
- ${CP} ${WRKSRC}/Services/Yadis/* ${PREFIX}/share/pear/Services/Yadis
- ${MKDIR} ${EXAMPLESDIR}
- ${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
-
-.include <bsd.port.post.mk>
diff --git a/security/php-Auth_OpenID2/distinfo b/security/php-Auth_OpenID2/distinfo
deleted file mode 100644
index 211ee4b93349..000000000000
--- a/security/php-Auth_OpenID2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (Auth_OpenID-1.2.2.tgz) = b8b95892245f39454ac630262993db52
-SHA256 (Auth_OpenID-1.2.2.tgz) = 7ef563e878ee447176bc87ad160a93114610bdc3454beb06bb48176b9701c6bd
-SIZE (Auth_OpenID-1.2.2.tgz) = 87304
diff --git a/security/php-Auth_OpenID2/pkg-descr b/security/php-Auth_OpenID2/pkg-descr
deleted file mode 100644
index 50787d6f0e3c..000000000000
--- a/security/php-Auth_OpenID2/pkg-descr
+++ /dev/null
@@ -1,5 +0,0 @@
-The PHP OpenID library lets you enable OpenID authentication on sites
-built using PHP. It features the OpenID consumer, Store
-implementations, and an OpenID server.
-
-WWW: http://www.openidenabled.com/openid/libraries/php/
diff --git a/security/php-Auth_OpenID2/pkg-plist b/security/php-Auth_OpenID2/pkg-plist
deleted file mode 100644
index 805c02e9e1d3..000000000000
--- a/security/php-Auth_OpenID2/pkg-plist
+++ /dev/null
@@ -1,62 +0,0 @@
-@comment $FreeBSD$
-%%EXAMPLESDIR%%/README
-%%EXAMPLESDIR%%/consumer/common.php
-%%EXAMPLESDIR%%/consumer/finish_auth.php
-%%EXAMPLESDIR%%/consumer/index.php
-%%EXAMPLESDIR%%/consumer/try_auth.php
-%%EXAMPLESDIR%%/detect.php
-%%EXAMPLESDIR%%/server/index.php
-%%EXAMPLESDIR%%/server/lib/actions.php
-%%EXAMPLESDIR%%/server/lib/common.php
-%%EXAMPLESDIR%%/server/lib/render.php
-%%EXAMPLESDIR%%/server/lib/render/about.php
-%%EXAMPLESDIR%%/server/lib/render/login.php
-%%EXAMPLESDIR%%/server/lib/render/sites.php
-%%EXAMPLESDIR%%/server/lib/render/trust.php
-%%EXAMPLESDIR%%/server/lib/session.php
-%%EXAMPLESDIR%%/server/openid-server.css
-%%EXAMPLESDIR%%/server/server.php
-%%EXAMPLESDIR%%/server/setup.php
-share/pear/Auth/OpenID.php
-share/pear/Auth/OpenID/Association.php
-share/pear/Auth/OpenID/BigMath.php
-share/pear/Auth/OpenID/Consumer.php
-share/pear/Auth/OpenID/CryptUtil.php
-share/pear/Auth/OpenID/DatabaseConnection.php
-share/pear/Auth/OpenID/DiffieHellman.php
-share/pear/Auth/OpenID/Discover.php
-share/pear/Auth/OpenID/DumbStore.php
-share/pear/Auth/OpenID/FileStore.php
-share/pear/Auth/OpenID/HMACSHA1.php
-share/pear/Auth/OpenID/Interface.php
-share/pear/Auth/OpenID/KVForm.php
-share/pear/Auth/OpenID/MySQLStore.php
-share/pear/Auth/OpenID/Parse.php
-share/pear/Auth/OpenID/PostgreSQLStore.php
-share/pear/Auth/OpenID/SQLStore.php
-share/pear/Auth/OpenID/SQLiteStore.php
-share/pear/Auth/OpenID/Server.php
-share/pear/Auth/OpenID/ServerRequest.php
-share/pear/Auth/OpenID/TrustRoot.php
-share/pear/Auth/OpenID/URINorm.php
-share/pear/Services/Yadis/HTTPFetcher.php
-share/pear/Services/Yadis/Manager.php
-share/pear/Services/Yadis/Misc.php
-share/pear/Services/Yadis/ParanoidHTTPFetcher.php
-share/pear/Services/Yadis/ParseHTML.php
-share/pear/Services/Yadis/PlainHTTPFetcher.php
-share/pear/Services/Yadis/XML.php
-share/pear/Services/Yadis/XRDS.php
-share/pear/Services/Yadis/XRI.php
-share/pear/Services/Yadis/XRIRes.php
-share/pear/Services/Yadis/Yadis.php
-@dirrmtry share/pear/Services/Yadis
-@dirrmtry share/pear/Services
-@dirrmtry share/pear/Auth/OpenID
-@dirrmtry share/pear/Auth
-@dirrmtry share/pear
-@dirrmtry %%EXAMPLESDIR%%/server/lib/render
-@dirrmtry %%EXAMPLESDIR%%/server/lib
-@dirrmtry %%EXAMPLESDIR%%/server
-@dirrmtry %%EXAMPLESDIR%%/consumer
-@dirrmtry %%EXAMPLESDIR%%
diff --git a/security/py-clamav/Makefile b/security/py-clamav/Makefile
index d4db878ce5ae..25158f8b5d1f 100644
--- a/security/py-clamav/Makefile
+++ b/security/py-clamav/Makefile
@@ -7,7 +7,7 @@
PORTNAME= clamav
PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security python
MASTER_SITES= http://xael.org/norman/python/pyclamav/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ DISTNAME= py${PORTNAME}-${PORTVERSION}
MAINTAINER= mnag@FreeBSD.org
COMMENT= A python binding to libclamav written in C
-LIB_DEPENDS= clamav.2:${PORTSDIR}/security/clamav
+LIB_DEPENDS= clamav.3:${PORTSDIR}/security/clamav
DIST_SUBDIR= python
USE_PYTHON= yes
diff --git a/security/shibboleth2-sp/Makefile b/security/shibboleth2-sp/Makefile
deleted file mode 100644
index 8ba441551a7a..000000000000
--- a/security/shibboleth2-sp/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-# New ports collection makefile for: security/shibboleth-sp
-# Date created: 2007-07-17
-# Whom: Janos Mohacsi <janos.mohacsi@bsd.hu>
-#
-# $FreeBSD$
-#
-
-PORTNAME= shibboleth-sp
-PORTVERSION= 1.3f
-CATEGORIES= security www
-MASTER_SITES= http://shibboleth.internet2.edu/downloads/
-
-MAINTAINER= janos.mohacsi@bsd.hu
-COMMENT= C++ Shibboleth Service Provider (Internet2) for Apache
-
-LIB_DEPENDS= saml.5:${PORTSDIR}/security/opensaml
-
-OPTIONS= APACHE22 "Use Apache version 2.2 instead of version 2.0" on
-
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-USE_RC_SUBR= shibboleth-sp
-WRKSRC= ${WRKDIR}/shibboleth-1.3
-
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_APACHE22)
-USE_APACHE= 22
-CONFIGURE_ARGS= --enable-apache-22 --with-apxs22=${APXS}
-.else
-USE_APACHE= 20
-CONFIGURE_ARGS= --enable-apache-20 --with-apxs2=${APXS}
-.endif
-CONFIGURE_ARGS+= --localstatedir=/var
-
-post-patch:
- @${REINPLACE_CMD} -e 's|/run|/run/shibboleth|' ${WRKSRC}/configs/Makefile.in
- @${REINPLACE_CMD} -e 's|/doc/|/share/doc/|' ${WRKSRC}/doc/Makefile.in
-
-.if ${OSVERSION} >= 700042
-BROKEN= Does not compile with GCC 4.2
-.endif
-.if ${ARCH} == "amd64" || ${ARCH} == "sparc64"
-BROKEN= Does not compile; author is investigating
-.endif
-
-.include <bsd.port.post.mk>
diff --git a/security/shibboleth2-sp/distinfo b/security/shibboleth2-sp/distinfo
deleted file mode 100644
index ee5be32b33ab..000000000000
--- a/security/shibboleth2-sp/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (shibboleth-sp-1.3f.tar.gz) = cd28dedcbb9fe56e32e287506bf4fed6
-SHA256 (shibboleth-sp-1.3f.tar.gz) = e72a8935c0df038233cabb24a1aada2790b5bc76b5cf4f8108b3a9d9e4fa7e7a
-SIZE (shibboleth-sp-1.3f.tar.gz) = 846077
diff --git a/security/shibboleth2-sp/files/patch-shib-target_shib-handlers.cpp b/security/shibboleth2-sp/files/patch-shib-target_shib-handlers.cpp
deleted file mode 100644
index 70aeb1660820..000000000000
--- a/security/shibboleth2-sp/files/patch-shib-target_shib-handlers.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- shib-target/shib-handlers.cpp.orig
-+++ shib-target/shib-handlers.cpp
-@@ -544,8 +544,8 @@
- for (; *s; s++) {
- if (strchr(badchars,*s) || *s<=0x20 || *s>=0x7F) {
- ret+='%';
-- ret+=hexchar(*s >> 4);
-- ret+=hexchar(*s & 0x0F);
-+ ret+=hexchar((unsigned char)*s >> 4);
-+ ret+=hexchar((unsigned char)*s & 0x0F);
- }
- else
- ret+=*s;
diff --git a/security/shibboleth2-sp/files/shibboleth-sp.in b/security/shibboleth2-sp/files/shibboleth-sp.in
deleted file mode 100644
index 245ae80004d4..000000000000
--- a/security/shibboleth2-sp/files/shibboleth-sp.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# PROVIDE: shibboleth_sp
-# REQUIRE: DAEMON
-#
-
-. %%RC_SUBR%%
-
-name="shibboleth_sp"
-rcvar=${name}_enable
-
-[ -z "$shibboleth_sp_enable" ] && shibboleth_sp_enable="NO"
-pidfile="/var/run/${name}.pid"
-command="%%PREFIX%%/sbin/shibd"
-start_cmd="${command} -f -p ${pidfile} &"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/security/shibboleth2-sp/pkg-descr b/security/shibboleth2-sp/pkg-descr
deleted file mode 100644
index 5790a0232bf3..000000000000
--- a/security/shibboleth2-sp/pkg-descr
+++ /dev/null
@@ -1,13 +0,0 @@
-Shibboleth is standards-based, open source middleware software which
-provides Web Single SignOn (SSO) across or within organizational
-boundaries. It allows sites to make informed authorization decisions
-for individual access of protected online resources in a
-privacy-preserving manner.
-
-This software is a C++ implementation of the Service Provider
-component of the Shibboleth can be used in Apache Web servers. The
-service provider manages secured resources. User access to resources
-is based on assertions received by the service provider (SP) from
-an identity provider.
-
-WWW: http://shibboleth.internet2.edu/
diff --git a/security/shibboleth2-sp/pkg-plist b/security/shibboleth2-sp/pkg-plist
deleted file mode 100644
index 8d26fe7b482e..000000000000
--- a/security/shibboleth2-sp/pkg-plist
+++ /dev/null
@@ -1,103 +0,0 @@
-@comment $FreeBSD$
-bin/test-client
-bin/shibtest
-bin/posttest
-etc/shibboleth/shibboleth.xml
-etc/shibboleth/shibboleth.xml.dist
-etc/shibboleth/native.logger
-etc/shibboleth/native.logger.dist
-etc/shibboleth/shibd.logger
-etc/shibboleth/shibd.logger.dist
-etc/shibboleth/AAP.xml
-etc/shibboleth/AAP.xml.dist
-etc/shibboleth/IQ-metadata.xml
-etc/shibboleth/IQ-metadata.xml.dist
-etc/shibboleth/example-metadata.xml
-etc/shibboleth/example-metadata.xml.dist
-etc/shibboleth/shibboleth.logger
-etc/shibboleth/shibboleth.logger.dist
-etc/shibboleth/accessError.html
-etc/shibboleth/accessError.html.dist
-etc/shibboleth/rmError.html
-etc/shibboleth/sslError.html
-etc/shibboleth/rmError.html.dist
-etc/shibboleth/sessionError.html
-etc/shibboleth/sessionError.html.dist
-etc/shibboleth/metadataError.html
-etc/shibboleth/metadataError.html.dist
-etc/shibboleth/sslError.html.dist
-etc/shibboleth/sp-example.key
-etc/shibboleth/sp-example.key.dist
-etc/shibboleth/sp-example.crt
-etc/shibboleth/sp-example.crt.dist
-etc/shibboleth/shibd
-etc/shibboleth/apache.config
-etc/shibboleth/apache2.config
-etc/shibboleth/apache22.config
-etc/shibboleth/inqueue.pem
-include/shib/shib.h
-include/shib/shib-threads.h
-include/shib/hresult.h
-include/shib-target/shib-target.h
-include/shib-target/shibrpc.h
-include/shib-target/shib-paths.h
-include/shib-target/hresult.h
-lib/liboncrpc.so.2
-lib/liboncrpc.so
-lib/libshib.so.6
-lib/libshib.so
-lib/libshib-target.so.5
-lib/libshib-target.so
-libexec/xmlproviders.so
-libexec/xmlproviders.la
-libexec/adfs.so
-libexec/adfs.la
-libexec/mod_shib_22.so
-libexec/mod_shib_22.la
-sbin/shibd
-sbin/siterefresh
-share/xml/shibboleth/credentials.xsd
-share/xml/shibboleth/cs-sstc-schema-assertion-01.xsd
-share/xml/shibboleth/cs-sstc-schema-protocol-01.xsd
-share/xml/shibboleth/cs-sstc-schema-assertion-1.1.xsd
-share/xml/shibboleth/cs-sstc-schema-protocol-1.1.xsd
-share/xml/shibboleth/soap-envelope.xsd
-share/xml/shibboleth/xmldsig-core-schema.xsd
-share/xml/shibboleth/xenc-schema.xsd
-share/xml/shibboleth/xml.xsd
-share/xml/shibboleth/shibboleth.xsd
-share/xml/shibboleth/shibboleth-trust-1.0.xsd
-share/xml/shibboleth/shibboleth-metadata-1.0.xsd
-share/xml/shibboleth/shibboleth-targetconfig-1.0.xsd
-share/xml/shibboleth/saml-schema-assertion-2.0.xsd
-share/xml/shibboleth/WS-Trust.xsd
-share/xml/shibboleth/saml-schema-metadata-2.0.xsd
-share/xml/shibboleth/metadata_v12_to_v11.xsl
-share/xml/shibboleth/metadata_v12_to_v13.xsl
-share/xml/shibboleth/metadata_v13_to_v12.xsl
-share/xml/shibboleth/trust_v12_to_v11.xsl
-share/xml/shibboleth/trust_v13_to_v12.xsl
-share/doc/shibboleth/CREDITS.txt
-share/doc/shibboleth/INSTALL.txt
-share/doc/shibboleth/INSTALL-WIN32.txt
-share/doc/shibboleth/LICENSE.txt
-share/doc/shibboleth/NEWS.txt
-share/doc/shibboleth/NOTICE.txt
-share/doc/shibboleth/README.txt
-share/doc/shibboleth/OPENSSL.LICENSE
-share/doc/shibboleth/LOG4CPP.LICENSE
-share/doc/shibboleth/CURL.LICENSE
-share/doc/shibboleth/mysql-4.0.12.diff
-share/doc/shibboleth/main.css
-share/doc/shibboleth/logo.jpg
-@exec mkdir -p %D/data
-@exec mkdir -p /var/log/shibboleth
-@exec mkdir -p /var/run/shibboleth
-@exec chmod -R ug=rwx,o= /var/run/shibboleth
-@unexec rm -rf /var/run/shibboleth 2>&1 >/dev/null || true
-@dirrmtry share/xml/shibboleth
-@dirrmtry include/shib-target
-@dirrmtry include/shib
-@dirrmtry etc/shibboleth
-@dirrm share/doc/shibboleth
-@dirrmtry data
diff --git a/security/squidclam/Makefile b/security/squidclam/Makefile
index 9fa9e4806ea0..a6e69d96b314 100644
--- a/security/squidclam/Makefile
+++ b/security/squidclam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= squidclam
PORTVERSION= 0.11
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/security/stunnel/files/stunnel.in b/security/stunnel/files/stunnel.in
deleted file mode 100644
index 3ab996452b19..000000000000
--- a/security/stunnel/files/stunnel.in
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-# PROVIDE: stunnel
-# REQUIRE: NETWORKING SERVERS
-# BEFORE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add some of the following variables to /etc/rc.conf to configure stunnel:
-# stunnel_enable (bool): Set to "NO" by default.
-# Set it to "YES" to enable stunnel.
-# stunnel_config (str): Default "!!PREFIX!!/etc/stunnel/stunnel.conf"
-# Set it to the full path to the config file
-# that stunnel will use during the automated
-# start-up.
-# stunnel_pidfile (str): Default "!!PREFIX!!/var/stunnel/stunnel.pid"
-# Set it to the value of 'pid' in
-# the stunnel.conf file.
-#
-
-. !!RC_SUBR!!
-
-name="stunnel"
-rcvar=`set_rcvar`
-stunnel_config="!!PREFIX!!/etc/stunnel/${name}.conf"
-stunnel_pidfile="/var/run/${name}.pid"
-command="!!PREFIX!!/bin/stunnel"
-
-[ -z "$stunnel_enable" ] && stunnel_enable="NO"
-
-load_rc_config $name
-
-command_args=${stunnel_config}
-pidfile=${stunnel_pidfile}
-
-required_files="${stunnel_config}"
-
-run_rc_command "$1"
diff --git a/security/sudosh2/Makefile b/security/sudosh2/Makefile
deleted file mode 100644
index e63bfdd9f01e..000000000000
--- a/security/sudosh2/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Ports collection Makefile for: sudosh
-# Date created: 10/28/2004
-# Whom: cy@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= sudosh
-PORTVERSION= 1.8.2
-PORTREVISION= 5
-CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
-DISTNAME= ${PORTNAME}-${PORTVERSION}
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= A sudo shell
-
-RUN_DEPENDS= sudo:${PORTSDIR}/security/sudo
-
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS= --bindir="${PREFIX}/bin"
-CONFIGURE_ARGS+= --sysconfdir="${PREFIX}/etc"
-CONFIGURE_ARGS+= --program-transform-name=''
-.if defined(SUDOSH_LOGDIR)
-CONFIGURE_ARGS+= --with-logdir="${SUDOSH_LOGDIR}"
-.else
-CONFIGURE_ARGS+= --with-logdir=/var/log/sudosh
-.endif
-CONFIGURE_ENV= LDFLAGS="-lutil"
-
-MAN1= sudosh.1
-MAN5= sudosh.conf.5
-MAN8= sudosh-replay.8
-
-.include <bsd.port.mk>
diff --git a/security/sudosh2/distinfo b/security/sudosh2/distinfo
deleted file mode 100644
index b06d0cbec022..000000000000
--- a/security/sudosh2/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (sudosh-1.8.2.tar.gz) = 7121efdac817e4a27111869f27fabea0
-SHA256 (sudosh-1.8.2.tar.gz) = 0a536d970accf1d4366bcb49441ef6773711df7d48501f72ca6cc451ca3e87fd
-SIZE (sudosh-1.8.2.tar.gz) = 135757
diff --git a/security/sudosh2/files/patch-src-parse.c b/security/sudosh2/files/patch-src-parse.c
deleted file mode 100644
index 646cb65d3235..000000000000
--- a/security/sudosh2/files/patch-src-parse.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/parse.c.orig Sun Jun 12 16:22:42 2005
-+++ src/parse.c Fri Jan 5 17:54:55 2007
-@@ -19,7 +19,8 @@
- void parse(option * o, const char *file)
- {
- FILE *f = fopen(file, "r");
-- unsigned int line_number, i;
-+ unsigned int line_number;
-+ int i;
- char line[BUFSIZ];
- char *arg, *cmt, *opt;
- config *scan;
diff --git a/security/sudosh2/files/patch-src::Makefile.in b/security/sudosh2/files/patch-src::Makefile.in
deleted file mode 100644
index 81fcafdbceb1..000000000000
--- a/security/sudosh2/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig Sun Jun 12 19:33:29 2005
-+++ src/Makefile.in Wed Oct 26 06:59:17 2005
-@@ -427,7 +427,8 @@
-
- install-sudosh.conf:
- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
- test -f $(sysconfdir)/sudosh.conf || $(INSTALL) -o 0 -g 0 -m 0444 '$(srcdir)/sudosh.conf' '$(sysconfdir)/sudosh.conf'
-+ $(INSTALL) -o 0 -g 0 -m 0444 '$(srcdir)/sudosh.conf' '$(sysconfdir)/sudosh.conf.sample'
-
- install: install-am install-sudosh.conf
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/security/sudosh2/files/patch-src::sudosh.c b/security/sudosh2/files/patch-src::sudosh.c
deleted file mode 100644
index 0c79a345cfc4..000000000000
--- a/security/sudosh2/files/patch-src::sudosh.c
+++ /dev/null
@@ -1,129 +0,0 @@
---- src/sudosh.c.orig Sun Jun 12 19:35:07 2005
-+++ src/sudosh.c Fri Jan 5 14:14:05 2007
-@@ -28,6 +28,13 @@
-
- #define WRITE(a, b, c) do_write(a, b, c, __FILE__, __LINE__)
-
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <libutil.h>
-+#include <sys/param.h>
-+#endif
-+
- static struct termios termorig;
- static struct winsize winorig;
-
-@@ -545,19 +552,43 @@
- {
- char *sname;
-
-+#ifdef __FreeBSD__
-+#define PTYLEN 16
-+ char sname_area[PTYLEN];
-+ struct termios tt;
-+ struct winsize win;
-+
-+ sname = sname_area;
-+ if (tcgetattr(STDIN_FILENO, &tt) == -1)
-+ {
-+ perror ("tcgetattr");
-+ return -1;
-+ }
-+ if (ioctl(STDIN_FILENO, TIOCGWINSZ, &win) == -1)
-+ {
-+ perror ("ioctl");
-+ return -1;
-+ }
-+ if (openpty(&p->mfd, &p->sfd, sname, &tt, &win) == -1) {
-+#else
- if ((p->mfd = open ("/dev/ptmx", O_RDWR)) == -1)
- {
- if ((p->mfd = open ("/dev/ptc", O_RDWR)) == -1)
- {
-+#endif
- perror ("Cannot open cloning master pty");
- return -1;
-+#ifndef __FreeBSD__
- }
-+#endif
- }
-
-+#if !defined(__FreeBSD_version) || (defined(__FreeBSD_version) && __FreeBSD_version >= 500000)
- (void) unlockpt (p->mfd);
- (void) grantpt (p->mfd);
-
- sname = (char *) ptsname (p->mfd);
-+#endif
-
- if ((p->sfd = open (sname, O_RDWR)) == -1)
- {
-@@ -619,9 +650,14 @@
- for (i = 3; i < 100; ++i)
- close (i);
-
-+#ifdef __FreeBSD__
-+ (void) tcsetattr(0, TCSADRAIN, &termorig);
-+ (void) login_tty(pst->sfd);
-+#else
- #ifdef TCSETS
- (void) ioctl (0, TCSETS, &termorig);
- #endif
-+#endif
- (void) ioctl (0, TIOCSWINSZ, &winorig);
-
- setuid (getuid ());
-@@ -663,6 +699,13 @@
- {
- static struct termios termnew;
-
-+#ifdef __FreeBSD__
-+ if (tcgetattr(ttyfd, &termorig) == -1)
-+ {
-+ perror ("tcgetattr failed");
-+ exit (EXIT_FAILURE);
-+ }
-+#else
- #ifdef TCGETS
- if (ioctl (ttyfd, TCGETS, &termorig) == -1)
- {
-@@ -670,6 +713,7 @@
- exit (EXIT_FAILURE);
- }
- #endif
-+#endif
-
- if (ioctl (ttyfd, TIOCGWINSZ, &winorig) == -1)
- {
-@@ -677,6 +721,11 @@
- exit (EXIT_FAILURE);
- }
-
-+#ifdef __FreeBSD__
-+ (void) cfmakeraw(&termnew);
-+ termnew.c_lflag &= ~ECHO;
-+ (void) tcsetattr(ttyfd, TCSAFLUSH, &termnew);
-+#else
- termnew.c_cc[VEOF] = 1;
- termnew.c_iflag = BRKINT | ISTRIP | IXON | IXANY;
- termnew.c_oflag = 0;
-@@ -686,13 +735,19 @@
- #ifdef TCSETS
- (void) ioctl (ttyfd, TCSETS, &termnew);
- #endif
-+#endif
- }
-
- static void
- bye (int signum)
- {
-+
-+#ifdef __FreeBSD__
-+ (void) tcsetattr(0, TCSADRAIN, &termorig);
-+#else
- #ifdef TCSETS
- (void) ioctl (0, TCSETS, &termorig);
-+#endif
- #endif
-
- close (timing.fd);
diff --git a/security/sudosh2/pkg-descr b/security/sudosh2/pkg-descr
deleted file mode 100644
index 3e764176e983..000000000000
--- a/security/sudosh2/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-sudosh is a sudo shell. Sudosh provides a logged root shell that can
-be used for auditing. It works just like a VCR, records the root shell
-session and offers real-time playback. Sudosh is designed to be used
-with sudo in an enterprise environment.
-
-WWW: http://sourceforge.net/projects/sudosh/
- http://freshmeat.net/projects/sudosh/
diff --git a/security/sudosh2/pkg-plist b/security/sudosh2/pkg-plist
deleted file mode 100644
index 43d308b7d677..000000000000
--- a/security/sudosh2/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-@unexec test -f %D/etc/sudosh.conf && cmp %D/etc/sudosh.conf.sample %D/etc/sudosh.conf > /dev/null 2>&1 && rm %D/etc/sudosh.conf && echo %D/etc/sudosh.conf has been removed; test -f %D/etc/sudosh.conf && echo %D/etc/sudosh.conf has not been removed; true
-bin/sudosh
-bin/sudosh-replay
-etc/sudosh.conf.sample
-@exec test -f %D/etc/sudosh.conf || cp %D/etc/sudosh.conf.sample %D/etc/sudosh.conf
diff --git a/security/sudosh3/Makefile b/security/sudosh3/Makefile
deleted file mode 100644
index e63bfdd9f01e..000000000000
--- a/security/sudosh3/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Ports collection Makefile for: sudosh
-# Date created: 10/28/2004
-# Whom: cy@FreeBSD.org
-#
-# $FreeBSD$
-#
-
-PORTNAME= sudosh
-PORTVERSION= 1.8.2
-PORTREVISION= 5
-CATEGORIES= security
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED}
-MASTER_SITE_SUBDIR= ${PORTNAME:S/_/-/}
-DISTNAME= ${PORTNAME}-${PORTVERSION}
-
-MAINTAINER= cy@FreeBSD.org
-COMMENT= A sudo shell
-
-RUN_DEPENDS= sudo:${PORTSDIR}/security/sudo
-
-GNU_CONFIGURE= yes
-
-CONFIGURE_ARGS= --bindir="${PREFIX}/bin"
-CONFIGURE_ARGS+= --sysconfdir="${PREFIX}/etc"
-CONFIGURE_ARGS+= --program-transform-name=''
-.if defined(SUDOSH_LOGDIR)
-CONFIGURE_ARGS+= --with-logdir="${SUDOSH_LOGDIR}"
-.else
-CONFIGURE_ARGS+= --with-logdir=/var/log/sudosh
-.endif
-CONFIGURE_ENV= LDFLAGS="-lutil"
-
-MAN1= sudosh.1
-MAN5= sudosh.conf.5
-MAN8= sudosh-replay.8
-
-.include <bsd.port.mk>
diff --git a/security/sudosh3/distinfo b/security/sudosh3/distinfo
deleted file mode 100644
index b06d0cbec022..000000000000
--- a/security/sudosh3/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (sudosh-1.8.2.tar.gz) = 7121efdac817e4a27111869f27fabea0
-SHA256 (sudosh-1.8.2.tar.gz) = 0a536d970accf1d4366bcb49441ef6773711df7d48501f72ca6cc451ca3e87fd
-SIZE (sudosh-1.8.2.tar.gz) = 135757
diff --git a/security/sudosh3/files/patch-src-parse.c b/security/sudosh3/files/patch-src-parse.c
deleted file mode 100644
index 646cb65d3235..000000000000
--- a/security/sudosh3/files/patch-src-parse.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/parse.c.orig Sun Jun 12 16:22:42 2005
-+++ src/parse.c Fri Jan 5 17:54:55 2007
-@@ -19,7 +19,8 @@
- void parse(option * o, const char *file)
- {
- FILE *f = fopen(file, "r");
-- unsigned int line_number, i;
-+ unsigned int line_number;
-+ int i;
- char line[BUFSIZ];
- char *arg, *cmt, *opt;
- config *scan;
diff --git a/security/sudosh3/files/patch-src::Makefile.in b/security/sudosh3/files/patch-src::Makefile.in
deleted file mode 100644
index 81fcafdbceb1..000000000000
--- a/security/sudosh3/files/patch-src::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig Sun Jun 12 19:33:29 2005
-+++ src/Makefile.in Wed Oct 26 06:59:17 2005
-@@ -427,7 +427,8 @@
-
- install-sudosh.conf:
- test -z "$(sysconfdir)" || $(mkdir_p) "$(DESTDIR)$(sysconfdir)"
- test -f $(sysconfdir)/sudosh.conf || $(INSTALL) -o 0 -g 0 -m 0444 '$(srcdir)/sudosh.conf' '$(sysconfdir)/sudosh.conf'
-+ $(INSTALL) -o 0 -g 0 -m 0444 '$(srcdir)/sudosh.conf' '$(sysconfdir)/sudosh.conf.sample'
-
- install: install-am install-sudosh.conf
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/security/sudosh3/files/patch-src::sudosh.c b/security/sudosh3/files/patch-src::sudosh.c
deleted file mode 100644
index 0c79a345cfc4..000000000000
--- a/security/sudosh3/files/patch-src::sudosh.c
+++ /dev/null
@@ -1,129 +0,0 @@
---- src/sudosh.c.orig Sun Jun 12 19:35:07 2005
-+++ src/sudosh.c Fri Jan 5 14:14:05 2007
-@@ -28,6 +28,13 @@
-
- #define WRITE(a, b, c) do_write(a, b, c, __FILE__, __LINE__)
-
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/ioctl.h>
-+#include <libutil.h>
-+#include <sys/param.h>
-+#endif
-+
- static struct termios termorig;
- static struct winsize winorig;
-
-@@ -545,19 +552,43 @@
- {
- char *sname;
-
-+#ifdef __FreeBSD__
-+#define PTYLEN 16
-+ char sname_area[PTYLEN];
-+ struct termios tt;
-+ struct winsize win;
-+
-+ sname = sname_area;
-+ if (tcgetattr(STDIN_FILENO, &tt) == -1)
-+ {
-+ perror ("tcgetattr");
-+ return -1;
-+ }
-+ if (ioctl(STDIN_FILENO, TIOCGWINSZ, &win) == -1)
-+ {
-+ perror ("ioctl");
-+ return -1;
-+ }
-+ if (openpty(&p->mfd, &p->sfd, sname, &tt, &win) == -1) {
-+#else
- if ((p->mfd = open ("/dev/ptmx", O_RDWR)) == -1)
- {
- if ((p->mfd = open ("/dev/ptc", O_RDWR)) == -1)
- {
-+#endif
- perror ("Cannot open cloning master pty");
- return -1;
-+#ifndef __FreeBSD__
- }
-+#endif
- }
-
-+#if !defined(__FreeBSD_version) || (defined(__FreeBSD_version) && __FreeBSD_version >= 500000)
- (void) unlockpt (p->mfd);
- (void) grantpt (p->mfd);
-
- sname = (char *) ptsname (p->mfd);
-+#endif
-
- if ((p->sfd = open (sname, O_RDWR)) == -1)
- {
-@@ -619,9 +650,14 @@
- for (i = 3; i < 100; ++i)
- close (i);
-
-+#ifdef __FreeBSD__
-+ (void) tcsetattr(0, TCSADRAIN, &termorig);
-+ (void) login_tty(pst->sfd);
-+#else
- #ifdef TCSETS
- (void) ioctl (0, TCSETS, &termorig);
- #endif
-+#endif
- (void) ioctl (0, TIOCSWINSZ, &winorig);
-
- setuid (getuid ());
-@@ -663,6 +699,13 @@
- {
- static struct termios termnew;
-
-+#ifdef __FreeBSD__
-+ if (tcgetattr(ttyfd, &termorig) == -1)
-+ {
-+ perror ("tcgetattr failed");
-+ exit (EXIT_FAILURE);
-+ }
-+#else
- #ifdef TCGETS
- if (ioctl (ttyfd, TCGETS, &termorig) == -1)
- {
-@@ -670,6 +713,7 @@
- exit (EXIT_FAILURE);
- }
- #endif
-+#endif
-
- if (ioctl (ttyfd, TIOCGWINSZ, &winorig) == -1)
- {
-@@ -677,6 +721,11 @@
- exit (EXIT_FAILURE);
- }
-
-+#ifdef __FreeBSD__
-+ (void) cfmakeraw(&termnew);
-+ termnew.c_lflag &= ~ECHO;
-+ (void) tcsetattr(ttyfd, TCSAFLUSH, &termnew);
-+#else
- termnew.c_cc[VEOF] = 1;
- termnew.c_iflag = BRKINT | ISTRIP | IXON | IXANY;
- termnew.c_oflag = 0;
-@@ -686,13 +735,19 @@
- #ifdef TCSETS
- (void) ioctl (ttyfd, TCSETS, &termnew);
- #endif
-+#endif
- }
-
- static void
- bye (int signum)
- {
-+
-+#ifdef __FreeBSD__
-+ (void) tcsetattr(0, TCSADRAIN, &termorig);
-+#else
- #ifdef TCSETS
- (void) ioctl (0, TCSETS, &termorig);
-+#endif
- #endif
-
- close (timing.fd);
diff --git a/security/sudosh3/pkg-descr b/security/sudosh3/pkg-descr
deleted file mode 100644
index 3e764176e983..000000000000
--- a/security/sudosh3/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-sudosh is a sudo shell. Sudosh provides a logged root shell that can
-be used for auditing. It works just like a VCR, records the root shell
-session and offers real-time playback. Sudosh is designed to be used
-with sudo in an enterprise environment.
-
-WWW: http://sourceforge.net/projects/sudosh/
- http://freshmeat.net/projects/sudosh/
diff --git a/security/sudosh3/pkg-plist b/security/sudosh3/pkg-plist
deleted file mode 100644
index 43d308b7d677..000000000000
--- a/security/sudosh3/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-@unexec test -f %D/etc/sudosh.conf && cmp %D/etc/sudosh.conf.sample %D/etc/sudosh.conf > /dev/null 2>&1 && rm %D/etc/sudosh.conf && echo %D/etc/sudosh.conf has been removed; test -f %D/etc/sudosh.conf && echo %D/etc/sudosh.conf has not been removed; true
-bin/sudosh
-bin/sudosh-replay
-etc/sudosh.conf.sample
-@exec test -f %D/etc/sudosh.conf || cp %D/etc/sudosh.conf.sample %D/etc/sudosh.conf
diff --git a/security/tripwire/files/patch-install::install.cfg b/security/tripwire/files/patch-install::install.cfg
deleted file mode 100644
index 041e36270b7a..000000000000
--- a/security/tripwire/files/patch-install::install.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
---- contrib/install.cfg.orig Thu Sep 15 20:12:39 2005
-+++ contrib/install.cfg Mon Feb 13 07:28:17 2006
-@@ -24,31 +24,31 @@
- CLOBBER=false
-
- # Tripwire binaries are stored in TWBIN.
--TWBIN="${prefix}/sbin"
-+TWBIN="${PREFIX}/sbin"
-
- # Tripwire policy files are stored in TWPOLICY.
--TWPOLICY="${sysconfdir}"
-+TWPOLICY="${TWPOLICY}" # Set in the FreeBSD port Makefile
-
- # Tripwire manual pages are stored in TWMAN.
--TWMAN="${prefix}/man"
-+TWMAN="${PREFIX}/man"
-
- # Tripwire database files are stored in TWDB.
--TWDB="${prefix}/lib/tripwire"
-+TWDB="${TWDB}" # Set in the FreeBSD port Makefile
-
- # Tripwire documents directory
--TWDOCS="${prefix}/doc/tripwire"
-+TWDOCS="${PREFIX}/share/doc/tripwire"
-
- # The Tripwire site key files are stored in TWSITEKEYDIR.
--TWSITEKEYDIR="${TWPOLICY}"
-+# TWSITEKEYDIR="${TWPOLICY}"
-
- # The Tripwire local key files are stored in TWLOCALKEYDIR.
--TWLOCALKEYDIR="${TWPOLICY}"
-+# TWLOCALKEYDIR="${TWPOLICY}"
-
- # Tripwire report files are stored in TWREPORT.
--TWREPORT="${TWDB}/report"
-+# TWREPORT="${TWREPORT}" # Set in the FreeBSD port Makefile
-
- # This sets the default text editor for Tripwire.
--TWEDITOR="${path_to_vi}"
-+# TWEDITOR="${path_to_vi}"
-
- # TWLATEPROMTING controls the point when tripwire asks for a password.
- TWLATEPROMPTING=false
-@@ -85,7 +85,7 @@
- #####################################
-
- TWMAILMETHOD=SENDMAIL
--TWMAILPROGRAM="${path_to_sendmail} -oi -t"
-+TWMAILPROGRAM="/usr/sbin/sendmail -oi -t"
-
- #####################################
- # SMTP options
diff --git a/security/vuxml/vuln.xml b/security/vuxml/vuln.xml
index 69b309f2a415..a80fdd21ae96 100644
--- a/security/vuxml/vuln.xml
+++ b/security/vuxml/vuln.xml
@@ -34,6 +34,1262 @@ Note: Please add new entries to the beginning of this file.
-->
<vuxml xmlns="http://www.vuxml.org/apps/vuxml-1">
+ <vuln vid="30c560ff-e0df-11dc-891a-02061b08fc24">
+ <topic>opera -- multiple vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>opera</name>
+ <name>opera-devel</name>
+ <name>linux-opera</name>
+ <range><lt>9.26</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Opera Software ASA reports about multiple security
+ fixes:</p>
+ <blockquote cite="http://www.opera.com/docs/changelogs/freebsd/925/">
+ <ul>
+ <li>Fixed an issue where simulated text inputs could trick
+ users into uploading arbitrary files, as reported by
+ Mozilla.</li>
+ <li>Image properties can no longer be used to execute
+ scripts, as reported by Max Leonov.</li>
+ <li>Fixed an issue where the representation of DOM
+ attribute values could allow cross site scripting, as
+ reported by Arnaud.lb.</li>
+ </ul>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>http://www.opera.com/docs/changelogs/freebsd/926/</url>
+ <url>http://www.opera.com/support/search/view/877/</url>
+ <url>http://www.opera.com/support/search/view/879/</url>
+ <url>http://www.opera.com/support/search/view/880/</url>
+ </references>
+ <dates>
+ <discovery>2008-02-20</discovery>
+ <entry>2008-02-22</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="810a5197-e0d9-11dc-891a-02061b08fc24">
+ <topic>mozilla -- multiple vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>firefox</name>
+ <range><lt>2.0.0.12,1</lt></range>
+ </package>
+ <package>
+ <name>linux-firefox</name>
+ <range><lt>2.0.0.12</lt></range>
+ </package>
+ <package>
+ <name>seamonkey</name>
+ <name>linux-seamonkey</name>
+ <range><lt>1.1.8</lt></range>
+ </package>
+ <package>
+ <name>flock</name>
+ <name>linux-flock</name>
+ <range><lt>1.0.9</lt></range>
+ </package>
+ <package>
+ <name>linux-firefox-devel</name>
+ <name>linux-seamonkey-devel</name>
+ <range><gt>0</gt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The Mozilla Foundation reports of multiple security issues
+ in Firefox, Seamonkey, and Thunderbird. Several of these
+ issues can probably be used to run arbitrary code with the
+ privilege of the user running the program.</p>
+ <blockquote cite="http://www.mozilla.org/projects/security/known-vulnerabilities.html">
+ <ul>
+ <li>Web forgery overwrite with div overlay</li>
+ <li>URL token stealing via stylesheet redirect</li>
+ <li>Mishandling of locally-saved plain text files</li>
+ <li>File action dialog tampering</li>
+ <li>Possible information disclosure in BMP decoder</li>
+ <li>Web browsing history and forward navigation stealing</li>
+ <li>Directory traversal via chrome: URI</li>
+ <li>Stored password corruption</li>
+ <li>Privilege escalation, XSS, Remote Code Execution</li>
+ <li>Multiple file input focus stealing vulnerabilities</li>
+ <li>Crashes with evidence of memory corruption (rv:1.8.1.12)</li>
+ </ul>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2008-0412</cvename>
+ <cvename>CVE-2008-0413</cvename>
+ <cvename>CVE-2008-0414</cvename>
+ <cvename>CVE-2008-0415</cvename>
+ <cvename>CVE-2008-0417</cvename>
+ <cvename>CVE-2008-0418</cvename>
+ <cvename>CVE-2008-0419</cvename>
+ <cvename>CVE-2008-0420</cvename>
+ <cvename>CVE-2008-0591</cvename>
+ <cvename>CVE-2008-0592</cvename>
+ <cvename>CVE-2008-0593</cvename>
+ <cvename>CVE-2008-0594</cvename>
+ <url>http://www.mozilla.org/projects/security/known-vulnerabilities.html</url>
+ <url>http://www.mozilla.org/security/announce/2008/mfsa2008-01.html</url>
+ <url>http://www.mozilla.org/security/announce/2008/mfsa2008-02.html</url>
+ <url>http://www.mozilla.org/security/announce/2008/mfsa2008-03.html</url>
+ <url>http://www.mozilla.org/security/announce/2008/mfsa2008-04.html</url>
+ <url>http://www.mozilla.org/security/announce/2008/mfsa2008-05.html</url>
+ <url>http://www.mozilla.org/security/announce/2008/mfsa2008-06.html</url>
+ <url>http://www.mozilla.org/security/announce/2008/mfsa2008-07.html</url>
+ <url>http://www.mozilla.org/security/announce/2008/mfsa2008-08.html</url>
+ <url>http://www.mozilla.org/security/announce/2008/mfsa2008-09.html</url>
+ <url>http://www.mozilla.org/security/announce/2008/mfsa2008-10.html</url>
+ <url>http://www.mozilla.org/security/announce/2008/mfsa2008-11.html</url>
+ </references>
+ <dates>
+ <discovery>2008-02-07</discovery>
+ <entry>2008-02-22</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="e5d29309-e0db-11dc-97b2-001c2514716c">
+ <topic>openldap -- modrdn Denial of Service vulnerability</topic>
+ <affects>
+ <package>
+ <name>openldap-server</name>
+ <range><lt>2.3.41</lt></range>
+ <range><gt>2.4.0</gt><lt>2.4.8</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Secunia Advisory reports:</p>
+ <blockquote cite="http://secunia.com/advisories/28926/">
+ <p>A vulnerability has been reported in OpenLDAP, which can
+ be exploited by malicious users to cause a DoS (Denial of
+ Service).</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <bid>27778</bid>
+ <cvename>CVE-2008-0658</cvename>
+ </references>
+ <dates>
+ <discovery>2008-02-13</discovery>
+ <entry>2008-02-22</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="be4b0529-dbaf-11dc-9791-000ea6702141">
+ <topic>clamav -- ClamAV libclamav PE File Integer Overflow Vulnerability</topic>
+ <affects>
+ <package>
+ <name>clamav</name>
+ <range><ge>0.92</ge><lt>0.92.1</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>iDefense Security Advisory 02.12.08:</p>
+ <blockquote cite="http://labs.idefense.com/intelligence/vulnerabilities/display.php?id=658">
+ <p>Remote exploitation of an integer overflow vulnerability
+ in Clam AntiVirus' ClamAV, as included in various vendors'
+ operating system distributions, allows attackers to execute
+ arbitrary code with the privileges of the affected process.</p>
+ <p>The vulnerability exists within the code responsible
+ for parsing and scanning PE files. While iterating through
+ all sections contained in the PE file, several attacker
+ controlled values are extracted from the file. On each iteration,
+ arithmetic operations are performed without taking into
+ consideration 32-bit integer wrap.</p>
+ <p>Since insufficient integer overflow checks are present,
+ an attacker can cause a heap overflow by causing a specially
+ crafted Petite packed PE binary to be scanned. This results
+ in an exploitable memory corruption condition.</p>
+ <p>Exploitation of this vulnerability results in the
+ execution of arbitrary code with the privileges of the process
+ using libclamav. In the case of the clamd program, this will
+ result in code execution with the privileges of the clamav user.
+ Unsuccessful exploitation results in the clamd process crashing.</p>
+ </blockquote>
+ <h1>Workaround</h1>
+ <p>Disabling the scanning of PE files will prevent exploitation.</p>
+ <p>If using clamscan, this can be done by running clamscan with the
+ '--no-pe' option.</p>
+ <p>If using clamdscan, set the 'ScanPE' option in the clamd.conf
+ file to 'no'.</p>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2008-0318</cvename>
+ <url>http://labs.idefense.com/intelligence/vulnerabilities/display.php?id=658</url>
+ <url>http://svn.clamav.net/svn/clamav-devel/trunk/ChangeLog</url>
+ </references>
+ <dates>
+ <discovery>2008-01-07</discovery>
+ <entry>2008-02-15</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="dea7df85-d96c-11dc-9bfc-000e0c092e7a">
+ <topic>cacti -- Multiple security vulnerabilities have been discovered</topic>
+ <affects>
+ <package>
+ <name>cacti</name>
+ <range><lt>0.8.7b</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The cacti development team reports:</p>
+ <blockquote cite="http://forums.cacti.net/about25749.html">
+ <p>Multiple security vulnerabilities have been discovered in
+ Cacti's web interface:</p>
+ <ul>
+ <li>XSS vulnerabilities</li>
+ <li>Path disclosure vulnerabilities</li>
+ <li>SQL injection vulnerabilities</li>
+ <li>HTTP response splitting vulnerabilities</li>
+ </ul>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>http://forums.cacti.net/about25749.html</url>
+ </references>
+ <dates>
+ <discovery>2008-02-12</discovery>
+ <entry>2008-02-12</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="739329c8-d8f0-11dc-ac2f-0016d325a0ed">
+ <topic>ikiwiki -- javascript insertion via uris</topic>
+ <affects>
+ <package>
+ <name>ikiwiki</name>
+ <range><lt>2.32.3</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The ikiwiki development team reports:</p>
+ <blockquote cite="http://ikiwiki.info/security/#index30h2">
+ <p>The htmlscrubber did not block javascript in uris. This was
+ fixed by adding a whitelist of valid uri types, which does not
+ include javascript. Some urls specifyable by the meta plugin
+ could also theoretically have been used to inject javascript; this
+ was also blocked.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>http://ikiwiki.info/security/#index30h2</url>
+ </references>
+ <dates>
+ <discovery>2008-02-10</discovery>
+ <entry>2008-02-11</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="1a818749-d646-11dc-8959-000bcdc1757a">
+ <topic>zenphoto -- XSS vulnerability</topic>
+ <affects>
+ <package>
+ <name>zenphoto</name>
+ <range><lt>1.1.4</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>zenphoto project reports:</p>
+ <blockquote cite="http://www.zenphoto.org/2008/02/">
+ <p>A new zenphoto version is now available. This release contains
+ security fixes for HTML, XSS, and SQL injection vulnerabilities.
+ </p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2007-6666</cvename>
+ <url>http://www.securityfocus.com/bid/27084</url>
+ <url>http://secunia.com/advisories/28281</url>
+ </references>
+ <dates>
+ <discovery>2008-01-03</discovery>
+ <entry>2008-02-09</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="0832ee18-cf77-11dc-8c6a-00304881ac9a">
+ <topic>jetty -- multiple vulnerability</topic>
+ <affects>
+ <package>
+ <name>jetty</name>
+ <range><lt>6.1.7</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Greg Wilkins reports:</p>
+ <blockquote cite="http://jira.codehaus.org/browse/JETTY-386#action_117699">
+ <p>jetty allows remote attackers to bypass protection mechanisms and
+ read the source of files via multiple '/' characters in the URI.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <bid>27117</bid>
+ <cvename>CVE-2007-6672</cvename>
+ <url>http://jira.codehaus.org/browse/JETTY-386#action_117699</url>
+ </references>
+ <dates>
+ <discovery>2007-12-22</discovery>
+ <entry>2008-02-04</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="6ecd0b42-ce77-11dc-89b1-000e35248ad7">
+ <topic>libxine -- buffer overflow vulnerability</topic>
+ <affects>
+ <package>
+ <name>libxine</name>
+ <range><lt>1.1.10</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>xine project reports:</p>
+ <blockquote cite="http://xinehq.de/index.php/news">
+ <p>A new xine-lib version is now available. This release contains
+ a security fix (remotely-expoitable buffer overflow, CVE-2006-1664).
+ (This is not the first time that that bug has been fixed...)
+ It also fixes a few more recent bugs, such as the audio output
+ problems in 1.1.9.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2006-1664</cvename>
+ <url>http://secunia.com/advisories/19853/</url>
+ </references>
+ <dates>
+ <discovery>2008-01-23</discovery>
+ <entry>2008-01-29</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="fe2b6597-c9a4-11dc-8da8-0008a18a9961">
+ <topic>xorg -- multiple vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>xorg-server</name>
+ <range><lt>1.4_4,1</lt></range>
+ </package>
+ <package>
+ <name>libXfont</name>
+ <range><lt>1.3.1_2,1</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Matthieu Herrb of X.Org reports:</p>
+ <blockquote cite="http://lists.freedesktop.org/archives/xorg/2008-January/031918.html">
+ <p>Several vulnerabilities have been identified in server code
+ of the X window system caused by lack of proper input validation
+ on user controlled data in various parts of the software,
+ causing various kinds of overflows.</p>
+ <p>Exploiting these overflows will crash the X server or,
+ under certain circumstances allow the execution of arbitray
+ machine code.</p>
+ <p>When the X server is running with root privileges (which is the
+ case for the Xorg server and for most kdrive based servers),
+ these vulnerabilities can thus also be used to raise
+ privileges.</p>
+ <p>All these vulnerabilities, to be exploited succesfully, require
+ either an already established connection to a running X server
+ (and normally running X servers are only accepting authenticated
+ connections), or a shell access with a valid user on the machine
+ where the vulnerable server is installed.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2007-5760</cvename>
+ <cvename>CVE-2007-5958</cvename>
+ <cvename>CVE-2007-6427</cvename>
+ <cvename>CVE-2007-6428</cvename>
+ <cvename>CVE-2007-6429</cvename>
+ <cvename>CVE-2008-0006</cvename>
+ <url>http://lists.freedesktop.org/archives/xorg/2008-January/031918.html</url>
+ <url>http://lists.freedesktop.org/archives/xorg/2008-January/032099.html</url>
+ <url>http://secunia.com/advisories/28532/</url>
+ </references>
+ <dates>
+ <discovery>2008-01-18</discovery>
+ <entry>2008-01-23</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="024edd06-c933-11dc-810c-0016179b2dd5">
+ <topic>xfce -- multiple vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>xfce4-panel</name>
+ <name>libxfce4gui</name>
+ <range><lt>4.4.2</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Gentoo reports:</p>
+ <blockquote cite="http://www.gentoo.org/security/en/glsa/glsa-200801-06.xml">
+ <p>A remote attacker could entice a user to install a specially
+ crafted "rc" file to execute arbitrary code via long strings
+ in the "Name" and "Comment" fields or via unspecified vectors
+ involving the second vulnerability.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2007-6531</cvename>
+ <cvename>CVE-2007-6532</cvename>
+ <url>http://www.xfce.org/documentation/changelogs/4.4.2</url>
+ <url>http://www.gentoo.org/security/en/glsa/glsa-200801-06.xml</url>
+ </references>
+ <dates>
+ <discovery>2008-01-09</discovery>
+ <entry>2008-01-22</entry>
+ <modified>2008-02-13</modified>
+ </dates>
+ </vuln>
+
+ <vuln vid="a59afa47-c930-11dc-810c-0016179b2dd5">
+ <topic>claws-mail -- insecure temporary file creation</topic>
+ <affects>
+ <package>
+ <name>claws-mail</name>
+ <range><lt>3.1.0</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Nico Golde reports:</p>
+ <blockquote cite="http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=454089">
+ <p>A local attacker could exploit this vulnerability to conduct symlink
+ attacks to overwrite files with the privileges of the user running
+ Claws Mail.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <bid>26676</bid>
+ <cvename>CVE-2007-6208</cvename>
+ <url>http://www.gentoo.org/security/en/glsa/glsa-200801-03.xml</url>
+ <url>http://security.gentoo.org/glsa/glsa-200801-03.xml</url>
+ <url>http://secunia.com/advisories/27897</url>
+ </references>
+ <dates>
+ <discovery>2007-12-03</discovery>
+ <entry>2008-01-22</entry>
+ <modified>2008-02-12</modified>
+ </dates>
+ </vuln>
+
+ <vuln vid="e5a9de5f-c6bc-11dc-b9f1-00a0cce0781e">
+ <topic>IRC Services-- Denial of Service Vulnerability</topic>
+ <affects>
+ <package>
+ <name>ircservices</name>
+ <range><lt>5.0.63</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Secunia reports:</p>
+ <blockquote cite="http://secunia.com/advisories/27761">
+ <p>A vulnerability has been reported in IRC Services,
+ which can be exploited by malicious people to cause
+ a Denial of Service. The vulnerability is caused due
+ to the improper handling of overly long passwords within
+ the "default_encrypt()" function in encrypt.c and can be
+ exploited to crash an affected server.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2007-6122</cvename>
+ <url>http://secunia.com/advisories/27761</url>
+ <url>http://ircservices.za.net/Changes.txt</url>
+ </references>
+ <dates>
+ <discovery>2007-11-21</discovery>
+ <entry>2008-01-19</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="02eedd3c-c6b5-11dc-93b6-000e35248ad7">
+ <topic>libxine -- buffer overflow vulnerability</topic>
+ <affects>
+ <package>
+ <name>libxine</name>
+ <range><lt>1.1.9.1</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>xine project reports:</p>
+ <blockquote cite="http://xinehq.de/index.php/news">
+ <p>A new xine-lib version is now available. This release contains
+ a security fix (remotely-expoitable buffer overflow, CVE-2008-0225).
+ It also contains a read-past-end fix for an internal library
+ function which is only used if the OS does not supply it and a
+ rendering fix for Darwin/PPC.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2008-0225</cvename>
+ <url>http://aluigi.altervista.org/adv/xinermffhof-adv.txt</url>
+ <url>http://secunia.com/advisories/28384</url>
+ </references>
+ <dates>
+ <discovery>2008-01-08</discovery>
+ <entry>2008-01-19</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="60e1792b-c380-11dc-821a-000bcdc1757a">
+ <topic>geeklog xss vulnerability</topic>
+ <affects>
+ <package>
+ <name>geeklog</name>
+ <range><lt>1.4.1</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Geeklog reports:</p>
+ <blockquote cite="http://www.geeklog.net/article.php/geeklog-1.4.0sr6">
+ <p>MustLive pointed out a possible XSS in the form to email an
+ article to a friend that we're fixing with this release.</p>
+ <p>Please note that this problem only exists in Geeklog 1.4.0
+ - neither Geeklog 1.4.1 nor any older versions (1.3.x series)
+ have that problem.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2006-3756</cvename>
+ <url>http://www.geeklog.net/article.php/geeklog-1.4.0sr6</url>
+ </references>
+ <dates>
+ <discovery>2008-01-08</discovery>
+ <entry>2008-01-15</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="4451a4c9-c05e-11dc-982e-001372fd0af2">
+ <topic>drupal -- cross site request forgery</topic>
+ <affects>
+ <package>
+ <name>drupal5</name>
+ <range><lt>5.6</lt></range>
+ </package>
+ <package>
+ <name>drupal4</name>
+ <range><lt>4.7.11</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The Drupal Project reports:</p>
+ <blockquote cite="http://drupal.org/node/208562">
+ <p>The aggregator module fetches items from RSS feeds and makes
+ them available on the site. The module provides an option to
+ remove items from a particular feed. This has been implemented
+ as a simple GET request and is therefore vulnerable to cross
+ site request forgeries. For example: Should a privileged user
+ view a page containing an &lt;img&gt; tag with a specially
+ constructed src pointing to a remove items URL, the items would
+ be removed.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>http://drupal.org/node/208562</url>
+ <url>http://secunia.com/advisories/28422/</url>
+ </references>
+ <dates>
+ <discovery>2008-01-10</discovery>
+ <entry>2008-01-11</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="6f736456-c060-11dc-982e-001372fd0af2">
+ <topic>drupal -- cross site scripting (utf8)</topic>
+ <affects>
+ <package>
+ <name>drupal5</name>
+ <range><lt>5.6</lt></range>
+ </package>
+ <package>
+ <name>drupal4</name>
+ <range><lt>4.7.11</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The Drupal Project reports:</p>
+ <blockquote cite="http://drupal.org/node/208564">
+ <p>When outputting plaintext Drupal strips potentially dangerous
+ HTML tags and attributes from HTML, and escapes characters which
+ have a special meaning in HTML. This output filtering secures
+ the site against cross site scripting attacks via user input.</p>
+ <p>Certain byte sequences that are invalid in the UTF8
+ specification are not handled properly by Internet Explorer 6
+ and may lead it to see a multibyte start character where none is
+ present. Internet Explorer 6 then consumes a number of
+ subsequent UTF-8 characters. This may lead to unsafe attributes
+ that were outside a tag for the filter to appear inside a tag
+ for Internet Explorer 6. This behaviour can then be used to
+ insert and execute javascript in the context of the website.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>http://drupal.org/node/208564</url>
+ <url>http://secunia.com/advisories/28422/</url>
+ </references>
+ <dates>
+ <discovery>2008-01-10</discovery>
+ <entry>2008-01-11</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="f0fa19dd-c060-11dc-982e-001372fd0af2">
+ <topic>drupal -- cross site scripting (register_globals)</topic>
+ <affects>
+ <package>
+ <name>drupal5</name>
+ <range><lt>5.6</lt></range>
+ </package>
+ <package>
+ <name>drupal4</name>
+ <range><lt>4.7.11</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The Drupal Project reports:</p>
+ <blockquote cite="http://drupal.org/node/208565">
+ <p>When theme .tpl.php files are accessible via the web and the PHP
+ setting register_globals is set to enabled, anonymous users are
+ able to execute cross site scripting attacks via specially
+ crafted links.</p>
+ <p>Drupal's .htaccess attempts to set register_globals to disabled
+ and also prevents access to .tpl.php files. Only when both these
+ measures are not effective and your PHP interpreter is
+ configured with register_globals set to enabled, will this issue
+ affect you.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>http://drupal.org/node/208565</url>
+ <url>http://secunia.com/advisories/28422/</url>
+ </references>
+ <dates>
+ <discovery>2008-01-10</discovery>
+ <entry>2008-01-11</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="f358de71-bf64-11dc-928b-0016179b2dd5">
+ <topic>maradns -- CNAME record resource rotation denial of service</topic>
+ <affects>
+ <package>
+ <name>maradns</name>
+ <range><lt>1.2.12.08</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Secunia reports:</p>
+ <blockquote cite="http://secunia.com/advisories/28329">
+ <p>A vulnerability has been reported in MaraDNS, which can be exploited
+ by malicious people to cause a Denial of Service.</p>
+ <p>The vulnerability is caused due to an error within the handling of
+ certain DNS packets. This can be exploited to cause a resource rotation
+ by sending specially crafted DNS packets, which cause an authoritative
+ CNAME record to not resolve, resulting in a Denial of Sevices.
+ </p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2008-0061</cvename>
+ <url>http://maradns.blogspot.com/2007/08/maradns-update-all-versions.html</url>
+ <url>http://secunia.com/advisories/28329</url>
+ </references>
+ <dates>
+ <discovery>2008-01-04</discovery>
+ <entry>2008-01-10</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="f762ccbb-baed-11dc-a302-000102cc8983">
+ <topic>linux-realplayer -- multiple vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>linux-realplayer</name>
+ <range><ge>10.0.5</ge><lt>10.0.9.809.20070726</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Secunia reports:</p>
+ <blockquote cite="http://secunia.com/advisories/27361">
+ <p>Multiple vulnerabilities have been reported in
+ RealPlayer/RealOne/HelixPlayer, which can be exploited by malicious
+ people to compromise a user's system.</p>
+ <p>An input validation error when processing .RA/.RAM files can be
+ exploited to cause a heap corruption via a specially crafted
+ .RA/.RAM file with an overly large size field in the header.</p>
+ <p>An error in the processing of .PLS files can be exploited to cause
+ a memory corruption and execute arbitrary code via a specially
+ crafted .PLS file.</p>
+ <p>An input validation error when parsing .SWF files can be exploited
+ to cause a buffer overflow via a specially crafted .SWF file with
+ malformed record headers.</p>
+ <p>A boundary error when processing rm files can be exploited to
+ cause a buffer overflow.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2007-5081</cvename>
+ <cvename>CVE-2007-3410</cvename>
+ <cvename>CVE-2007-2263</cvename>
+ <cvename>CVE-2007-2264</cvename>
+ <url>http://secunia.com/advisories/27361</url>
+ <url>http://service.real.com/realplayer/security/10252007_player/en/</url>
+ <url>http://www.zerodayinitiative.com/advisories/ZDI-07-063.html</url>
+ <url>http://www.zerodayinitiative.com/advisories/ZDI-07-062.html</url>
+ <url>http://www.zerodayinitiative.com/advisories/ZDI-07-061.html</url>
+ <url>http://secunia.com/advisories/25819/</url>
+ <certvu>759385</certvu>
+ </references>
+ <dates>
+ <discovery>2007-10-25</discovery>
+ <entry>2008-01-04</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="562cf6c4-b9f1-11dc-a302-000102cc8983">
+ <topic>linux-flashplugin -- multiple vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>linux-flashplugin</name>
+ <range><ge>9.0</ge><lt>9.0r115</lt></range>
+ <range><ge>7.0</ge><lt>7.0r73</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Adobe Security bulletin:</p>
+ <blockquote cite="http://www.adobe.com/support/security/bulletins/apsb07-20.html">
+ <p>Critical vulnerabilities have been identified in Adobe Flash
+ Player that could allow an attacker who successfully exploits these
+ potential vulnerabilities to take control of the affected system. A
+ malicious SWF must be loaded in Flash Player by the user for an
+ attacker to exploit these potential vulnerabilities. Users are
+ recommended to update to the most current version of Flash Player
+ available for their platform.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2007-6242</cvename>
+ <cvename>CVE-2007-4768</cvename>
+ <cvename>CVE-2007-5275</cvename>
+ <cvename>CVE-2007-6243</cvename>
+ <cvename>CVE-2007-6244</cvename>
+ <cvename>CVE-2007-6245</cvename>
+ <cvename>CVE-2007-4324</cvename>
+ <cvename>CVE-2007-6246</cvename>
+ <cvename>CVE-2007-5476</cvename>
+ <url>http://www.adobe.com/support/security/bulletins/apsb07-20.html</url>
+ <url>http://secunia.com/advisories/28161/</url>
+ </references>
+ <dates>
+ <discovery>2007-12-18</discovery>
+ <entry>2008-01-03</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="cf484358-b5d6-11dc-8de0-001c2514716c">
+ <topic>dovecot -- Specific LDAP + auth cache configuration may mix up user logins</topic>
+ <affects>
+ <package>
+ <name>dovecot</name>
+ <range><lt>1.0.10</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Dovecot reports:</p>
+ <blockquote cite="http://www.dovecot.org/list/dovecot-news/2007-December/000057.html">
+ <p>If two users with the same password and same pass_filter
+ variables log in within auth_cache_ttl seconds (1h by default),
+ the second user may get logged in with the first user's cached
+ pass_attrs. For example if pass_attrs contained the user's
+ home/mail directory, this would mean that the second user will
+ be accessing the first user's mails.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>http://www.dovecot.org/list/dovecot-news/2007-December/000057.html</url>
+ </references>
+ <dates>
+ <discovery>2007-12-21</discovery>
+ <entry>2007-12-29</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="4aab7bcd-b294-11dc-a6f0-00a0cce0781e">
+ <topic>gallery2 -- multiple vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>gallery2</name>
+ <range><lt>2.2.4</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The Gallery team reports:</p>
+ <blockquote cite="http://gallery.menalto.com/gallery_2.2.4_released">
+ <p>Gallery 2.2.4 addresses the following security
+ vulnerabilities:</p>
+ <ul>
+ <li>Publish XP module - Fixed unauthorized album creation
+ and file uploads.</li>
+ <li>URL rewrite module - Fixed local file inclusion
+ vulnerability in unsecured admin controller and
+ information disclosure in hotlink protection.</li>
+ <li>Core / add-item modules - Fixed Cross Site Scripting
+ (XSS) vulnerabilities through malicious file names.</li>
+ <li>Installation (Gallery application) - Update
+ web-accessibility protection of the storage folder for
+ Apache 2.2.</li>
+ <li>Core (Gallery application) / MIME module - Fixed
+ vulnerability in checks for disallowed file extensions
+ in file uploads.</li>
+ <li>Gallery Remote module - Added missing permissions
+ checks for some GR commands.</li>
+ <li>WebDAV module - Fixed Cross Site Scripting (XSS)
+ vulnerability through HTTP PROPPATCH.</li>
+ <li>WebDAV module - Fixed information (item data)
+ disclosure in a WebDAV view.</li>
+ <li>Comment module - Fixed information (item data)
+ disclosure in comment views.</li>
+ <li>Core module (Gallery application) - Improved
+ resilience against item information disclosure
+ attacks.</li>
+ <li>Slideshow module - Fixed information (item data)
+ disclosure in the slideshow.</li>
+ <li>Print modules - Fixed information (item data)
+ disclosure in several print modules.</li>
+ <li>Core / print modules - Fixed arbitrary URL redirection
+ (phishing attacks) in the core module and several print
+ modules.</li>
+ <li>WebCam module - Fixed proxied request weakness.</li>
+ </ul>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>http://gallery.menalto.com/gallery_2.2.4_released</url>
+ </references>
+ <dates>
+ <discovery>2007-12-24</discovery>
+ <entry>2007-12-25</entry>
+ <modified>2007-12-29</modified>
+ </dates>
+ </vuln>
+
+ <vuln vid="299e3f81-aee7-11dc-b781-0016179b2dd5">
+ <topic>e2fsprogs -- heap buffer overflow</topic>
+ <affects>
+ <package>
+ <name>e2fsprogs</name>
+ <range><lt>1.40.3</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Theodore Y. Ts'o reports:</p>
+ <blockquote cite="http://sourceforge.net/project/shownotes.php?group_id=2406&amp;release_id=560230">
+ <p>Fix a potential security vulnerability where an untrusted
+ filesystem can be corrupted in such a way that a program using
+ libext2fs will allocate a buffer which is far too small. This
+ can lead to either a crash or potentially a heap-based buffer
+ overflow crash. No known exploits exist, but main concern is
+ where an untrusted user who possesses privileged access in a
+ guest Xen environment could corrupt a filesystem which is then
+ accessed by thus allowing the untrusted user to gain privileged
+ access in the host OS. Thanks to the McAfee AVERT Research group
+ for reporting this issue.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <bid>26772</bid>
+ <cvename>CVE-2007-5497</cvename>
+ <url>http://secunia.com/advisories/27889/</url>
+ <url>http://sourceforge.net/project/shownotes.php?group_id=2406&amp;release_id=560230</url>
+ </references>
+ <dates>
+ <discovery>2007-12-07</discovery>
+ <entry>2007-12-20</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="8a835235-ae84-11dc-a5f9-001a4d49522b">
+ <topic>wireshark -- multiple vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>wireshark</name>
+ <name>wireshark-lite</name>
+ <name>ethereal</name>
+ <name>ethereal-lite</name>
+ <name>tethereal</name>
+ <name>tethereal-lite</name>
+ <range><ge>0.8.16</ge><lt>0.99.7</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The Wireshark team reports of multiple vulnerabilities:</p>
+ <blockquote cite="http://www.wireshark.org/security/wnpa-sec-2007-03.html">
+ <ul>
+ <li>Wireshark could crash when reading an MP3 file.</li>
+ <li>Beyond Security discovered that Wireshark could loop
+ excessively while reading a malformed DNP packet.</li>
+ <li>Stefan Esser discovered a buffer overflow in the SSL
+ dissector.</li>
+ <li>The ANSI MAP dissector could be susceptible to a
+ buffer overflow on some platforms.</li>
+ <li>The Firebird/Interbase dissector could go into an
+ infinite loop or crash.</li>
+ <li>The NCP dissector could cause a crash.</li>
+ <li>The HTTP dissector could crash on some systems while
+ decoding chunked messages.</li>
+ <li>The MEGACO dissector could enter a large loop and
+ consume system resources.</li>
+ <li>The DCP ETSI dissector could enter a large loop and
+ consume system resources.</li>
+ <li>Fabiodds discovered a buffer overflow in the iSeries
+ (OS/400) Communication trace file parser.</li>
+ <li>The PPP dissector could overflow a buffer.</li>
+ <li>The Bluetooth SDP dissector could go into an infinite
+ loop.</li>
+ <li>A malformed RPC Portmap packet could cause a
+ crash.</li>
+ <li>The IPv6 dissector could loop excessively.</li>
+ <li>The USB dissector could loop excessively or crash.</li>
+ <li>The SMB dissector could crash.</li>
+ <li>The RPL dissector could go into an infinite loop.</li>
+ <li>The WiMAX dissector could crash due to unaligned
+ access on some platforms.</li>
+ <li>The CIP dissector could attempt to allocate a huge
+ amount of memory and crash.</li>
+ </ul>
+
+ <h2>Impact</h2>
+
+ <p>It may be possible to make Wireshark or Ethereal crash or
+ use up available memory by injecting a purposefully
+ malformed packet onto the wire or by convincing someone to
+ read a malformed packet trace file.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2007-6112</cvename>
+ <cvename>CVE-2007-6113</cvename>
+ <cvename>CVE-2007-6114</cvename>
+ <cvename>CVE-2007-6115</cvename>
+ <cvename>CVE-2007-6117</cvename>
+ <cvename>CVE-2007-6118</cvename>
+ <cvename>CVE-2007-6120</cvename>
+ <cvename>CVE-2007-6121</cvename>
+ <cvename>CVE-2007-6438</cvename>
+ <cvename>CVE-2007-6439</cvename>
+ <cvename>CVE-2007-6441</cvename>
+ <cvename>CVE-2007-6450</cvename>
+ <cvename>CVE-2007-6451</cvename>
+ <url>http://www.wireshark.org/security/wnpa-sec-2007-03.html</url>
+ </references>
+ <dates>
+ <discovery>2007-12-19</discovery>
+ <entry>2007-12-19</entry>
+ <modified>2007-12-22</modified>
+ </dates>
+ </vuln>
+
+ <vuln vid="31b045e7-ae75-11dc-a5f9-001a4d49522b">
+ <topic>opera -- multiple vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>opera</name>
+ <name>opera-devel</name>
+ <name>linux-opera</name>
+ <range><lt>9.25</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Opera Software ASA reports about multiple security
+ fixes:</p>
+ <blockquote cite="http://www.opera.com/docs/changelogs/freebsd/925/">
+ <ul>
+ <li>Fixed an issue where plug-ins could be used to allow
+ cross domain scripting, as reported by David
+ Bloom. Details will be disclosed at a later date.</li>
+ <li>Fixed an issue with TLS certificates that could be
+ used to execute arbitrary code, as reported by Alexander
+ Klink (Cynops GmbH). Details will be disclosed at a
+ later date.</li>
+ <li>Rich text editing can no longer be used to allow cross
+ domain scripting, as reported by David Bloom. See our
+ advisory.</li>
+ <li>Prevented bitmaps from revealing random data from
+ memory, as reported by Gynvael Coldwind. Details will be
+ disclosed at a later date.</li>
+ </ul>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2007-6520</cvename>
+ <cvename>CVE-2007-6521</cvename>
+ <cvename>CVE-2007-6522</cvename>
+ <cvename>CVE-2007-6524</cvename>
+ <url>http://www.opera.com/docs/changelogs/freebsd/925/</url>
+ <url>http://www.opera.com/support/search/view/875/</url>
+ </references>
+ <dates>
+ <discovery>2007-12-19</discovery>
+ <entry>2007-12-19</entry>
+ <modified>2007-12-29</modified>
+ </dates>
+ </vuln>
+
+ <vuln vid="31435fbc-ae73-11dc-a5f9-001a4d49522b">
+ <topic>peercast -- buffer overflow vulnerability</topic>
+ <affects>
+ <package>
+ <name>peercast</name>
+ <range><lt>0.1218</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Luigi Auriemma reports that peercast is vulnerable to a
+ buffer overflow which could lead to a DoS or potentially
+ remote code execution:</p>
+ <blockquote cite="http://aluigi.altervista.org/adv/peercasthof-adv.txt">
+ <p>The handshakeHTTP function which handles all the requests
+ received by the other clients is vulnerable to a heap
+ overflow which allows an attacker to fill the
+ loginPassword and loginMount buffers located in the
+ Servent class with how much data he wants.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>http://aluigi.altervista.org/adv/peercasthof-adv.txt</url>
+ <url>http://secunia.com/advisories/28120/</url>
+ </references>
+ <dates>
+ <discovery>2007-12-17</discovery>
+ <entry>2007-12-19</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="fee7e059-acec-11dc-807f-001b246e4fdf">
+ <topic>ganglia-webfrontend -- XSS vulnerabilities</topic>
+ <affects>
+ <package>
+ <name>ganglia-webfrontend</name>
+ <range><lt>3.0.6</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The Ganglia project reports:</p>
+ <blockquote cite="http://ganglia.info/?p=60">
+ <p>The Ganglia development team is pleased to release Ganglia
+ 3.0.6 (Foss) which is available[...]. This release includes a
+ security fix for web frontend cross-scripting vulnerability.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <url>http://sourceforge.net/mailarchive/message.php?msg_name=d4c731da0712101044l7245cba9l34974008879f47a3%40mail.gmail.com</url>
+ <url>http://sourceforge.net/mailarchive/forum.php?thread_name=d4c731da0712101044l7245cba9l34974008879f47a3%40mail.gmail.com&amp;forum_name=ganglia-developers</url>
+ </references>
+ <dates>
+ <discovery>2007-12-10</discovery>
+ <entry>2007-12-17</entry>
+ <modified>2007-12-18</modified>
+ </dates>
+ </vuln>
+
+ <vuln vid="30f5ca1d-a90b-11dc-bf13-0211060005df">
+ <topic>qemu -- Translation Block Local Denial of Service Vulnerability</topic>
+ <affects>
+ <package>
+ <name>qemu</name>
+ <name>qemu-devel</name>
+ <range><lt>0.9.0_4</lt></range>
+ <range><ge>0.9.0s.20070101*</ge><lt>0.9.0s.20070802_1</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>SecurityFocus reports:</p>
+ <blockquote cite="http://www.securityfocus.com/bid/26666/discuss">
+ <p>QEMU is prone to a local denial-of-service vulnerability
+ because it fails to perform adequate boundary checks when
+ handling user-supplied input.</p>
+ <p>Attackers can exploit this issue to cause denial-of-service
+ conditions. Given the nature of the issue, attackers may also be
+ able to execute arbitrary code, but this has not been confirmed.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <bid>26666</bid>
+ <cvename>CVE-2007-6227</cvename>
+ <url>http://www.securityfocus.com/archive/1/484429</url>
+ </references>
+ <dates>
+ <discovery>2007-11-30</discovery>
+ <entry>2007-12-12</entry>
+ <modified>2007-12-14</modified>
+ </dates>
+ </vuln>
+
+ <vuln vid="fa708908-a8c7-11dc-b41d-000fb5066b20">
+ <topic>drupal -- SQL injection vulnerability</topic>
+ <affects>
+ <package>
+ <name>drupal5</name>
+ <range><lt>5.4</lt></range>
+ </package>
+ <package>
+ <name>drupal4</name>
+ <range><lt>4.7.9</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>The Drupal Project reports:</p>
+ <blockquote cite="http://drupal.org/node/198162">
+ <p>The function taxonomy_select_nodes() directly injects variables
+ into SQL queries instead of using placeholders. While taxonomy
+ module itself validates the input passed to
+ taxonomy_select_nodes(), this is a weakness in Drupal core.
+ Several contributed modules, such as taxonomy_menu, ajaxLoader,
+ and ubrowser, directly pass user input to taxonomy_select_nodes(),
+ enabling SQL injection attacks by anonymous users.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2007-6299</cvename>
+ <url>http://drupal.org/node/198162</url>
+ <url>http://secunia.com/advisories/27932/</url>
+ </references>
+ <dates>
+ <discovery>2007-12-05</discovery>
+ <entry>2007-12-12</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="ffcbd42d-a8c5-11dc-bec2-02e0185f8d72">
+ <topic>samba -- buffer overflow vulnerability</topic>
+ <affects>
+ <package>
+ <name>samba</name>
+ <name>samba3</name>
+ <name>ja-samba</name>
+ <range><lt>3.0.28,1</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Secuna Research reports:</p>
+ <blockquote cite="http://secunia.com/advisories/27760/">
+ <p>Secunia Research has discovered a vulnerability in Samba, which
+ can be exploited by malicious people to compromise a vulnerable
+ system. The vulnerability is caused due to a boundary error within
+ the "send_mailslot()" function. This can be exploited to cause a
+ stack-based buffer overflow with zero bytes via a specially crafted
+ "SAMLOGON" domain logon packet containing a username string placed
+ at an odd offset followed by an overly long GETDC string.
+ Successful exploitation allows execution of arbitrary code, but
+ requires that the "domain logons" option is enabled.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2007-6015</cvename>
+ <url>http://secunia.com/advisories/27760/</url>
+ </references>
+ <dates>
+ <discovery>2007-12-10</discovery>
+ <entry>2007-12-12</entry>
+ </dates>
+ </vuln>
+
+ <vuln vid="b2571f88-a867-11dc-a6f0-00a0cce0781e">
+ <topic>smbftpd -- format string vulnerability </topic>
+ <affects>
+ <package>
+ <name>smbftpd</name>
+ <range><lt>0.96</lt></range>
+ </package>
+ </affects>
+ <description>
+ <body xmlns="http://www.w3.org/1999/xhtml">
+ <p>Secunia reports:</p>
+ <blockquote cite="http://secunia.com/advisories/27014/">
+ <p>Format string vulnerability in the SMBDirList function in dirlist.c
+ in SmbFTPD 0.96 allows remote attackers to execute arbitrary code via
+ format string specifiers in a directory name.</p>
+ </blockquote>
+ </body>
+ </description>
+ <references>
+ <cvename>CVE-2007-5184</cvename>
+ <url>http://secunia.com/advisories/27014/</url>
+ <url>http://sourceforge.net/project/shownotes.php?release_id=543077</url>
+ </references>
+ <dates>
+ <discovery>2007-10-01</discovery>
+ <entry>2007-12-12</entry>
+ </dates>
+ </vuln>
+
<vuln vid="6ae7cef2-a6ae-11dc-95e6-000c29c5647f">
<topic>jetty -- multiple vulnerabilities</topic>
<affects>
@@ -280,6 +1536,19 @@ Note: Please add new entries to the beginning of this file.
<name>linux-seamonkey</name>
<range><lt>1.1.7</lt></range>
</package>
+ <package>
+ <name>flock</name>
+ <name>linux-flock</name>
+ <range><lt>1.0.2</lt></range>
+ </package>
+ <package>
+ <name>linux-firefox-devel</name>
+ <range><lt>3.0.a2007.12.12</lt></range>
+ </package>
+ <package>
+ <name>linux-seamonkey-devel</name>
+ <range><lt>2.0.a2007.12.12</lt></range>
+ </package>
</affects>
<description>
<body xmlns="http://www.w3.org/1999/xhtml">
@@ -300,6 +1569,7 @@ Note: Please add new entries to the beginning of this file.
<dates>
<discovery>2007-11-26</discovery>
<entry>2007-11-27</entry>
+ <modified>2007-12-14</modified>
</dates>
</vuln>
@@ -890,14 +2160,14 @@ Note: Please add new entries to the beginning of this file.
</vuln>
<vuln vid="a1ef3fc0-8ad0-11dc-9490-0016179b2dd5">
- <topic>dirproxy -- remote denial of service</topic>
+ <topic>dircproxy -- remote denial of service</topic>
<affects>
<package>
- <name>dirproxy</name>
+ <name>dircproxy</name>
<range><lt>1.0.5_1</lt></range>
</package>
<package>
- <name>dirproxy-devel</name>
+ <name>dircproxy-devel</name>
<range><lt>1.2.0.b2_1</lt></range>
</package>
</affects>
@@ -920,7 +2190,7 @@ Note: Please add new entries to the beginning of this file.
<dates>
<discovery>2006-09-06</discovery>
<entry>2007-11-04</entry>
- <modified>2007-11-05</modified>
+ <modified>2008-01-31</modified>
</dates>
</vuln>
@@ -1516,12 +2786,14 @@ Note: Please add new entries to the beginning of this file.
<package>
<name>tcl</name>
<name>tcl-threads</name>
- <range><lt>8.4.16,1</lt></range>
+ <range><lt>8.4.16</lt></range>
+ <range><gt>8.4.*,1</gt><lt>8.4.16,1</lt></range>
</package>
<package>
<name>tk</name>
<name>tk-threads</name>
- <range><lt>8.4.16,2</lt></range>
+ <range><lt>8.4.16</lt></range>
+ <range><gt>8.4.*,2</gt><lt>8.4.16,2</lt></range>
</package>
</affects>
<description>
@@ -1540,6 +2812,7 @@ Note: Please add new entries to the beginning of this file.
<dates>
<discovery>2007-09-27</discovery>
<entry>2007-10-05</entry>
+ <modified>2007-12-31</modified>
</dates>
</vuln>
@@ -1548,7 +2821,8 @@ Note: Please add new entries to the beginning of this file.
<affects>
<package>
<name>firebird-server</name>
- <range><lt>2.0.3</lt></range>
+ <range><ge>1.*</ge><lt>1.5.5</lt></range>
+ <range><ge>2.0.*</ge><lt>2.0.3</lt></range>
</package>
</affects>
<description>
@@ -1996,11 +3270,11 @@ Note: Please add new entries to the beginning of this file.
</package>
<package>
<name>linux-firefox-devel</name>
- <range><gt>0</gt></range>
+ <range><lt>3.0.a2007.12.12</lt></range>
</package>
<package>
<name>linux-seamonkey-devel</name>
- <range><gt>0</gt></range>
+ <range><lt>2.0.a2007.12.12</lt></range>
</package>
<!-- Deprecated/old names -->
<package>
@@ -2031,7 +3305,7 @@ Note: Please add new entries to the beginning of this file.
<dates>
<discovery>2007-09-18</discovery>
<entry>2007-09-19</entry>
- <modified>2007-10-31</modified>
+ <modified>2007-12-14</modified>
</dates>
</vuln>
@@ -2044,7 +3318,7 @@ Note: Please add new entries to the beginning of this file.
</package>
<package>
<name>php4</name>
- <range><gt>0</gt></range>
+ <range><lt>4.4.8</lt></range>
</package>
</affects>
<description>
@@ -2102,13 +3376,14 @@ Note: Please add new entries to the beginning of this file.
<cvename>CVE-2007-4662</cvename>
<cvename>CVE-2007-4663</cvename>
<cvename>CVE-2007-4670</cvename>
+ <url>http://www.php.net/releases/4_4_8.php</url>
<url>http://www.php.net/releases/5_2_4.php</url>
<url>http://secunia.com/advisories/26642</url>
</references>
<dates>
<discovery>2007-08-30</discovery>
<entry>2007-09-11</entry>
- <modified>2007-09-22</modified>
+ <modified>2008-01-14</modified>
</dates>
</vuln>
@@ -2228,7 +3503,7 @@ Note: Please add new entries to the beginning of this file.
<affects>
<package>
<name>lsh</name>
- <range><ge>0</ge></range>
+ <range><lt>2.0.1</lt></range>
</package>
</affects>
<description>
@@ -2249,7 +3524,7 @@ Note: Please add new entries to the beginning of this file.
<dates>
<discovery>2005-03-17</discovery>
<entry>2007-09-05</entry>
- <modified>2007-09-11</modified>
+ <modified>2008-01-07</modified>
</dates>
</vuln>
@@ -3106,11 +4381,11 @@ Note: Please add new entries to the beginning of this file.
</package>
<package>
<name>linux-firefox-devel</name>
- <range><gt>0</gt></range>
+ <range><lt>3.0.a2007.12.12</lt></range>
</package>
<package>
<name>linux-seamonkey-devel</name>
- <range><gt>0</gt></range>
+ <range><lt>2.0.a2007.12.12</lt></range>
</package>
<!-- Deprecated/old names -->
<package>
@@ -3158,7 +4433,7 @@ Note: Please add new entries to the beginning of this file.
<dates>
<discovery>2007-07-17</discovery>
<entry>2007-07-19</entry>
- <modified>2007-07-31</modified>
+ <modified>2007-12-14</modified>
</dates>
</vuln>
@@ -21276,7 +22551,7 @@ Note: Please add new entries to the beginning of this file.
</package>
<package>
<name>freeradius-devel</name>
- <range><gt>0</gt></range>
+ <range><le>1.0.2</le></range>
</package>
</affects>
<description>
@@ -21298,6 +22573,7 @@ Note: Please add new entries to the beginning of this file.
<dates>
<discovery>2005-05-17</discovery>
<entry>2005-05-22</entry>
+ <modified>2008-01-20</modified>
</dates>
</vuln>
diff --git a/security/zenmap/Makefile b/security/zenmap/Makefile
deleted file mode 100644
index a40ac0b21021..000000000000
--- a/security/zenmap/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# Ports collection makefile for: nmap
-# Date created: Tue Aug 04, 1998
-# Whom: David O'Brien (obrien@NUXI.com)
-#
-# $FreeBSD$
-#
-
-PORTNAME= nmapfe
-
-COMMENT= GUI frontend for the nmap scanning utility
-
-MASTERDIR= ${.CURDIR}/../nmap
-
-BUILD_NMAPFE= yes
-
-.include "${MASTERDIR}/Makefile"