Remove expired leaf ports:

2006-12-01 www/p5-ldap-abook: Arbitrary command execution vulnerability in CGI script
2006-12-07 x11-wm/tpager: Unmaintained and disappears from MASTER_SITE on a regular basis

16 files changed, 2 insertions, 263 deletions

diff --git a/MOVED b/MOVED
index 9e254d8a5a8d..813aabeaca84 100644
--- a/MOVED
+++ b/MOVED
@@ -2560,3 +2560,5 @@ emulators/vmware2||2006-12-04|Has expired: Unfetchable
 finance/ccard||2006-12-04|Has expired: Project disappeared from the internet
 devel/autoconf26|devel/autoconf261|2006-12-07|Move to correct location
 www/mozilla-bonobo||2006-12-12|Has expired: "Does not build with new Mozilla"
+www/p5-ldap-abook||2006-12-12|Has expired: Arbitrary command execution vulnerability in CGI script
+x11-wm/tpager||2006-12-12|Has expired: Unmaintained and disappears from MASTER_SITE on a regular basis
diff --git a/www/Makefile b/www/Makefile
index 2bf7b1146a9c..25ddfed83666 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -858,7 +858,6 @@
     SUBDIR += p5-WebService-NoPaste
     SUBDIR += p5-WebService-Technorati
     SUBDIR += p5-Xango
-    SUBDIR += p5-ldap-abook
     SUBDIR += p5-libapreq
     SUBDIR += p5-libapreq-static
     SUBDIR += p5-libapreq2
diff --git a/www/p5-ldap-abook/Makefile b/www/p5-ldap-abook/Makefile
deleted file mode 100644
index d67dc5cb50df..000000000000
--- a/www/p5-ldap-abook/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# New ports collection makefile for:	p5-abook
-# Date created:				November 22, 2004
-# Whom:	      				Brian Somers <brian@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	ldap-abook
-PORTVERSION=	1.00
-PORTREVISION=	1
-CATEGORIES=	www perl5
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	vs@FreeBSD.org
-COMMENT=	Perl5 CGI script providing an LDAP addressbook web interface
-
-FORBIDDEN=	Arbitrary command execution vulnerability in CGI script
-DEPRECATED=	${FORBIDDEN}
-EXPIRATION_DATE=2006-12-01
-
-RUN_DEPENDS=	${SITE_PERL}/AddressBook.pm:${PORTSDIR}/net/p5-AddressBook \
-		${SITE_PERL}/CGI.pm:${PORTSDIR}/www/p5-CGI.pm \
-		${SITE_PERL}/Net/LDAP.pm:${PORTSDIR}/net/p5-perl-ldap
-
-ABOOK=		${PREFIX}/www/ldap-abook
-CONFIG=		${PREFIX}/etc/AddressBook.conf
-USE_PERL5_RUN=	yes
-NO_BUILD=	yes
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|(/etc/AddressBook.conf)|${PREFIX}$$1|g' \
-	   ${WRKSRC}/cgi-bin/abook.cgi
-
-do-install:
-	@ ${MKDIR} ${PREFIX}/www/ldap-abook
-	${TAR} -C ${WRKSRC} --exclude '*.orig' -cf - . | \
-	    ${TAR} -C ${PREFIX}/www/ldap-abook -xf -
-	${INSTALL_DATA} ${FILESDIR}/abook.ldif ${ABOOK}/examples/default
-	${INSTALL_DATA} ${ABOOK}/examples/default/AddressBook.conf \
-	    ${CONFIG}-dist
-	[ -f ${CONFIG} ] || \
-	    ${INSTALL} -o root -g www -m 640 ${CONFIG}-dist ${CONFIG}
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.mk>
diff --git a/www/p5-ldap-abook/distinfo b/www/p5-ldap-abook/distinfo
deleted file mode 100644
index 49e144fe0a97..000000000000
--- a/www/p5-ldap-abook/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (ldap-abook-1.00.tar.gz) = 456ba400d5f97b3757f0dc0a73093b2c
-SHA256 (ldap-abook-1.00.tar.gz) = 5d245a22027c2bb8d8f9872cc0316ceb0fc8d357d0d0ea8b8bb8dd1af6a5171f
-SIZE (ldap-abook-1.00.tar.gz) = 24116
diff --git a/www/p5-ldap-abook/files/abook.ldif b/www/p5-ldap-abook/files/abook.ldif
deleted file mode 100644
index d4378b020a47..000000000000
--- a/www/p5-ldap-abook/files/abook.ldif
+++ /dev/null
@@ -1,4 +0,0 @@
-dn:	ou=abook, dc=your_domain
-objectClass:	top
-objectClass:	organizationalUnit
-ou:	abook
diff --git a/www/p5-ldap-abook/files/patch-AddressBook.conf b/www/p5-ldap-abook/files/patch-AddressBook.conf
deleted file mode 100644
index a5fc4daa00a8..000000000000
--- a/www/p5-ldap-abook/files/patch-AddressBook.conf
+++ /dev/null
@@ -1,38 +0,0 @@
---- examples/default/AddressBook.conf.orig	Sun Jan 28 15:44:27 2001
-+++ examples/default/AddressBook.conf	Tue Nov 23 18:42:47 2004
-@@ -128,7 +128,7 @@
-       <db type="old_ldap-abook" name="homePage" />
-       <db type="LDIF" name="homePage" />
-     </field>
--    <field name="address" order="10" type="textbox">
-+    <field name="address" order="10" type="text">
-       <db type="abookentry" name="Street Address" />
-       <db type="Text" name="Street Address" />
-       <db type="LDAP" name="street" />
-@@ -137,7 +137,7 @@
-       <db type="PDB" name="Address" /> 
-     </field>
-     <field name="city" order="11" type="text">
--      <db type="abookentry" name="City" />
-+      <db type="abookentry" name="City/Town" />
-       <db type="Text" name="City" />
-       <db type="LDAP" name="l" />
-       <db type="old_ldap-abook" name="locality" />
-@@ -145,7 +145,7 @@
-       <db type="PDB" name="City" />
-     </field>
-     <field name="state" order="12" type="text">
--      <db type="abookentry" name="State" />
-+      <db type="abookentry" name="State/County" />
-       <db type="Text" name="State" />
-       <db type="LDAP" name="st" />
-       <db type="old_ldap-abook" name="st" />
-@@ -154,7 +154,7 @@
-     </field>
-     <field name="postalCode" order="13" type="text">
-       <db type="Text" name="Zip Code" />
--      <db type="abookentry" name="Zip Code" />
-+      <db type="abookentry" name="Zip/Post Code" />
-       <db type="LDAP" name="postalCode" />
-       <db type="old_ldap-abook" name="postalCode" />
-       <db type="LDIF" name="postalCode" />
diff --git a/www/p5-ldap-abook/files/patch-cgi-bin_abook.cgi b/www/p5-ldap-abook/files/patch-cgi-bin_abook.cgi
deleted file mode 100644
index 5e8b7a90f9c5..000000000000
--- a/www/p5-ldap-abook/files/patch-cgi-bin_abook.cgi
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- cgi-bin/abook.cgi.orig
-+++ cgi-bin/abook.cgi
-@@ -39,7 +39,7 @@
- 
- my $config_file='/usr/local/etc/AddressBook.conf';
- my $query = CGI::new();
--my $myURL=$query->url;
-+my $myURL=$query->url(-absolute=>1);
- my $op = $query->param(op);
- my $entry;
- my $error_msg = "";
diff --git a/www/p5-ldap-abook/pkg-descr b/www/p5-ldap-abook/pkg-descr
deleted file mode 100644
index c154ae4e13cc..000000000000
--- a/www/p5-ldap-abook/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-ldap-abook provides a web interface for adding, removing and modifying
-LDAP addressbook records.  These addressbook records can be used with
-mail clients such as Sylpheed, Microsoft Outlook and probably Netscape
-and Mozilla.
-
-Attributes such as address details, date of birth and phonelist membership
-are also possible, allowing other applications to feed off the same
-database.
-
-WWW: http://ldap-abook.sourceforge.net/
diff --git a/www/p5-ldap-abook/pkg-message b/www/p5-ldap-abook/pkg-message
deleted file mode 100644
index 2f1189d5233f..000000000000
--- a/www/p5-ldap-abook/pkg-message
+++ /dev/null
@@ -1,28 +0,0 @@
-========== Installing ldap-abook for the first time ==========
-Some assembly required! These instructions for creating the LDAP
-database do not work out of the box, please additionally read e.g.
-http://www.onlamp.com/pub/a/onlamp/2003/03/27/ldap_ab.html?page=1
-
-Tell the openldap server about the abook schema with the
-following line in $PREFIX/etc/openldap/slapd.conf:
-
-include $PREFIX/etc/openldap/schema/cosine.schema
-include $PREFIX/etc/openldap/schema/inetorgperson.schema
-include $PREFIX/www/ldap-abook/examples/default/abookperson.schema
-
-Create the initial ``abook'' ou using the following command:
-
-    cd $PREFIX/www/ldap-abook/examples/default
-    ldapadd -h host -W -D 'dc=your_domain' -f abook.ldif
-
-replacing host and your_domain as appropriate (abook.ldif must
-have "your_domain" changed too).
-
-Modify "your_domain" and "secret" (and possibly "Manager") in
-$PREFIX/etc/AddressBook.conf too.
-
-Link to abook.cgi from your web server's CGI directory:
-
-    cd /usr/local/www/cgi-bin
-    ln -s $PREFIX/www/ldap-abook/cgi-bin/abook.cgi
-==============================================================
diff --git a/www/p5-ldap-abook/pkg-plist b/www/p5-ldap-abook/pkg-plist
deleted file mode 100644
index 45e190386168..000000000000
--- a/www/p5-ldap-abook/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-www/ldap-abook/html/ball.gray.gif
-www/ldap-abook/html/getting_started
-www/ldap-abook/html/index.html
-www/ldap-abook/examples/default/AddressBook.conf
-www/ldap-abook/examples/default/README
-www/ldap-abook/examples/default/abookperson.schema
-www/ldap-abook/examples/default/slapd.conf.v2
-www/ldap-abook/examples/default/abookPerson.oc.conf
-www/ldap-abook/examples/default/setup.pm
-www/ldap-abook/examples/default/slapd.conf.v1
-www/ldap-abook/examples/default/abook.ldif
-www/ldap-abook/cgi-bin/abook.cgi
-www/ldap-abook/t/01-ldap_bind.t
-www/ldap-abook/t/02-abookentry.t
-www/ldap-abook/t/03-abooksearch.t
-www/ldap-abook/t/04-abooknew.t
-www/ldap-abook/t/05-base_check.t
-www/ldap-abook/INSTALL
-www/ldap-abook/ChangeLog
-www/ldap-abook/COPYING
-www/ldap-abook/Artistic
-www/ldap-abook/README
-www/ldap-abook/Makefile.PL
-www/ldap-abook/MANIFEST
-@unexec if cmp -s %D/etc/AddressBook.conf %D/etc/AddressBook.conf-dist; then rm -f %D/etc/AddressBook.conf; fi
-etc/AddressBook.conf-dist
-@exec [ -f %B/AddressBook.conf ] || cp %B/%f %B/AddressBook.conf
-@dirrm www/ldap-abook/html
-@dirrm www/ldap-abook/examples/default
-@dirrm www/ldap-abook/examples
-@dirrm www/ldap-abook/cgi-bin
-@dirrm www/ldap-abook/t
-@dirrm www/ldap-abook
diff --git a/x11-wm/Makefile b/x11-wm/Makefile
index 00b1171d9063..083c64f40132 100644
--- a/x11-wm/Makefile
+++ b/x11-wm/Makefile
@@ -95,7 +95,6 @@
     SUBDIR += skippy-xd
     SUBDIR += swm
     SUBDIR += tinywm
-    SUBDIR += tpager
     SUBDIR += transset-df
     SUBDIR += treewm
     SUBDIR += tvtwm
diff --git a/x11-wm/tpager/Makefile b/x11-wm/tpager/Makefile
deleted file mode 100644
index d30d8d2d6f8c..000000000000
--- a/x11-wm/tpager/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# New ports collection makefile for:	tpager
-# Date created:				Feb 12 2004
-# Whom:					Florent Thoumie <flz@xbsd.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	tpager
-PORTVERSION=	0.2
-CATEGORIES=	x11-wm
-MASTER_SITES=	http://s1x.homelinux.net/files/
-
-MAINTAINER=	flz@FreeBSD.org
-COMMENT=	Lightweight EMWH Compliant Pager
-
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
-USE_X_PREFIX=	yes
-USE_BZIP2=	yes
-
-PLIST_FILES=	bin/tpager
-
-DEPRECATED=	Unmaintained and disappears from MASTER_SITE on a regular basis
-EXPIRATION_DATE=2006-12-07
-
-post-patch:
-	@${REINPLACE_CMD} -e 's#/usr/X11R6#${X11BASE}#' ${WRKSRC}/Makefile
-
-.include <bsd.port.mk>
diff --git a/x11-wm/tpager/distinfo b/x11-wm/tpager/distinfo
deleted file mode 100644
index dceaa97f5d97..000000000000
--- a/x11-wm/tpager/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (tpager-0.2.tar.bz2) = aa7bd0eccf4ec6871e4e8523282382f1
-SHA256 (tpager-0.2.tar.bz2) = dcbb26c4a597110390f41772cbf6281de68520b650fab281a1dfcda5fc2e8c98
-SIZE (tpager-0.2.tar.bz2) = 11016
diff --git a/x11-wm/tpager/files/patch-Makefile b/x11-wm/tpager/files/patch-Makefile
deleted file mode 100644
index 2148776dd1c0..000000000000
--- a/x11-wm/tpager/files/patch-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- Makefile	Wed May  7 19:45:54 2003
-+++ Makefile.new	Thu Feb 12 00:47:45 2004
-@@ -1,10 +1,13 @@
--CC=gcc
--CFLAGS= -I/usr/X11R6/include
--LDFLAGS= -L/usr/X11R6/lib -lX11
-+CC?=gcc
-+CFLAGS+= -I/usr/X11R6/include
-+LDFLAGS+= -L/usr/X11R6/lib -lX11
-+PREFIX?=/usr/local
- PROGNAME=tpager
-+
-+all:	$(PROGNAME)
-+
- $(PROGNAME): Makefile tpager.c root_properties.c client_properties.c
- 	$(CC) $(CFLAGS) $(LDFLAGS) tpager.c root_properties.c client_properties.c -o $(PROGNAME)
--	strip $(PROGNAME)
- 
- install:
--	install $(PROGNAME) /usr/local/bin
-+	install $(PROGNAME) $(PREFIX)/bin
diff --git a/x11-wm/tpager/files/patch-tpager.c.diff b/x11-wm/tpager/files/patch-tpager.c.diff
deleted file mode 100644
index c12110b55e32..000000000000
--- a/x11-wm/tpager/files/patch-tpager.c.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- tpager.c.orig	Thu May  8 13:08:39 2003
-+++ tpager.c	Sat Feb 14 15:06:31 2004
-@@ -206,9 +206,9 @@
- 
- int main (int argc, char *argv[]) {
- 	int i, x, y, w, h, horz, b, n, s, set;
--	x = y = w = h = horz = b = n = s = set = -1;
- 	char *temp;
- 	XEvent event;
-+	x = y = w = h = horz = b = n = s = set = -1;
- 	for (i = 1; i < argc; i++) {
- 		if (strcmp(argv[i],"-x") == 0) {
- 			if ( i + 1 >= argc ) {
diff --git a/x11-wm/tpager/pkg-descr b/x11-wm/tpager/pkg-descr
deleted file mode 100644
index 0fb3c9f09ffb..000000000000
--- a/x11-wm/tpager/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-tpager or Tiny Pager is a very lightweight aplication designed to be fast
-and small. It shows your workspaces and allows you to change between them.
-
-There are numerous arguments that you can use to change the pager's layout.
-
-The program is developed using C and Xlib so there is no big dependencies
-needed.
-
-This pager is in compliance with EWMH, so it is supported on Gnome, Kde,
-Xfce4, Rox, Openbox and every other window manager or desktop system that
-support these standarts.
-
-WWW: http://s1x.homelinux.net/tpager.php
-
-- Florent Thoumie
-flz@xbsd.org