diff options
-rw-r--r-- | doc/CHANGES | 3 | ||||
-rw-r--r-- | www/Makefile | 3 | ||||
-rw-r--r-- | www/web500gw/DESCR | 9 | ||||
-rw-r--r-- | www/web500gw/Makefile | 16 | ||||
-rw-r--r-- | www/web500gw/PLIST | 17 | ||||
-rw-r--r-- | www/web500gw/distinfo | 7 | ||||
-rw-r--r-- | www/web500gw/patches/patch-aa | 69 | ||||
-rw-r--r-- | www/web500gw/patches/patch-ab | 57 | ||||
-rw-r--r-- | www/web500gw/patches/patch-ac | 100 |
9 files changed, 3 insertions, 278 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index a3ecbfbe15d..1c410211081 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.6725 2004/07/29 14:43:16 tv Exp $ +$NetBSD: CHANGES,v 1.6726 2004/07/29 15:28:21 xtraeme Exp $ Changes to the packages collection and infrastructure in 2004: @@ -3640,3 +3640,4 @@ Changes to the packages collection and infrastructure in 2004: Added xorg-dirs-1.0 [xtraeme 2004-07-29] Removed openldap1 [xtraeme 2004-07-29] Updated postfix to 2.1.4 [martti 2004-07-29] + Removed www500gw [xtraeme 2004-07-29] diff --git a/www/Makefile b/www/Makefile index 0c12964f2d3..b11349aec96 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.334 2004/07/20 21:45:58 jmmv Exp $ +# $NetBSD: Makefile,v 1.335 2004/07/29 15:28:21 xtraeme Exp $ # COMMENT= Packages related to the World Wide Web @@ -245,7 +245,6 @@ SUBDIR+= w3m-img SUBDIR+= wApua SUBDIR+= waplet SUBDIR+= wdg-validate -SUBDIR+= web500gw SUBDIR+= webalizer SUBDIR+= weblint SUBDIR+= webnew diff --git a/www/web500gw/DESCR b/www/web500gw/DESCR deleted file mode 100644 index 927560959da..00000000000 --- a/www/web500gw/DESCR +++ /dev/null @@ -1,9 +0,0 @@ -A gateway that connects WWW browsers to LDAP based directories. - -Web500gw expects HTTP requests from a WWW browser on a TCP port -(usually 8888). Depending on the requested URL web500gw performs -read/search/modify/add/delete requests to the Directory and sends HTML -pages back to the browser. Web500gw uses the LDAPv2 protocol to talk -to a Directory server. It is able to work with a Standalone LDAP -server (like UMich/OpenLDAP slapd or Netscape LDAP product) and with -an LDAP Frontend to an X.500 Directory System Agent. diff --git a/www/web500gw/Makefile b/www/web500gw/Makefile deleted file mode 100644 index 542514a74cf..00000000000 --- a/www/web500gw/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# $NetBSD: Makefile,v 1.13 2004/05/09 17:46:02 snj Exp $ - -DISTNAME= web500gw-2.1b3 -PKGREVISION= 1 -CATEGORIES= www databases -MASTER_SITES= ftp://ftp.tu-chemnitz.de/pub/Local/urz/web500gw/ - -MAINTAINER= tech-pkg@NetBSD.org -HOMEPAGE= http://www.tu-chemnitz.de/~fri/web500gw/ -COMMENT= WWW to ldap gateway - -USE_BUILDLINK3= YES - -.include "../../databases/openldap1/buildlink3.mk" -#.include "../../databases/openldap/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/www/web500gw/PLIST b/www/web500gw/PLIST deleted file mode 100644 index d5fce0ba4b2..00000000000 --- a/www/web500gw/PLIST +++ /dev/null @@ -1,17 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/11/01 02:19:04 zuntum Exp $ -man/man8/web500gw.8 -etc/web500/web500gw.conf -etc/web500/ldapfilter.conf -etc/web500/ldapfilter.conf.internal -etc/web500/ldaptemplates.conf -etc/web500/ldaptemplates.conf.internal -etc/web500/web500gw.help -etc/web500/web500gw.messages -etc/web500/web500gw.attr -etc/web500/ldapfriendly -etc/web500/web500gw.help.de -etc/web500/web500gw.messages.de -etc/web500/web500gw.attr.de -etc/web500/ldapfriendly.de -@dirrm etc/web500 -sbin/web500gw diff --git a/www/web500gw/distinfo b/www/web500gw/distinfo deleted file mode 100644 index 586860187d8..00000000000 --- a/www/web500gw/distinfo +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: distinfo,v 1.4 2002/06/24 18:38:36 kent Exp $ - -SHA1 (web500gw-2.1b3.tar.gz) = 417533e1bdecac8437119d49622c8e030937c6c0 -Size (web500gw-2.1b3.tar.gz) = 143463 bytes -SHA1 (patch-aa) = a6feaf33012a92cbf6839858922e5ac2fcf6c501 -SHA1 (patch-ab) = ef23806d3be7818f792a6ab750957b99a1c8e979 -SHA1 (patch-ac) = e8618b2e9c00f3ddce051a5a0ded48389284daee diff --git a/www/web500gw/patches/patch-aa b/www/web500gw/patches/patch-aa deleted file mode 100644 index 77272a2b650..00000000000 --- a/www/web500gw/patches/patch-aa +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2001/10/26 12:18:21 agc Exp $ - ---- Makefile.orig Wed Oct 28 15:21:57 1998 -+++ Makefile Fri Jan 8 14:05:39 1999 -@@ -3,14 +3,14 @@ - #----------------------------------------------------------------------------- - - # Where to install web500gw --INSTDIR = /usr/local/etc -+INSTDIR = ${PREFIX}/sbin - - # Where to install the manual web500gw.8 --MANDIR = /usr/local/man/man8 -+MANDIR = ${PREFIX}/man/man8 - - # Where to install web500gw's config/filter/template/help/message files - # It's recommended to use an own directory for it. --WEB500GWDIR = $(INSTDIR)/web500 -+WEB500GWDIR = ${PREFIX}/etc/web500 - - # What language dependent files should be installed? - # "" stands for english (default) versions -@@ -14,7 +14,7 @@ - - # What language dependent files should be installed? - # "" stands for english (default) versions --SUFFIX = "" de es fr -+SUFFIX = "" de - - - # DEFINES - Enable/disable some features -@@ -34,8 +34,8 @@ - ## If you use OpenLDAP 1.0 or U-Mich LDAP 3.3 package (recommended) - # If the LDAP include files and libraries installed in standard places - # (/usr/lib, /usr/include) use this: --LDAPINCL = --LDAPLIBS = -lldap -llber -+LDAPINCL = -I${PREFIX}/include -+LDAPLIBS = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -lldap -llber -lcompat - # set LDAPVERSION (32 for ldap-3.2, 33 for 3.3 etc) - LDAPVERSION = 33 - VERSION = 3.3 -@@ -51,7 +51,7 @@ - - # T.61 <-> ISO-8859-1 translation: This is built in from LDAP 3.2. - # If you didn't define this translation there comment out the following line: --STR_TRANSLATION = -DSTR_TRANSLATION -+# STR_TRANSLATION = -DSTR_TRANSLATION - # If you defined LDAP_DEBUG there and want to enable LDAP debugging - # uncomment the following line: - LDAP_DEBUG = -DLDAP_DEBUG -@@ -69,7 +69,7 @@ - - # platform specific: - # Linux --PLATFORMCFLAGS= -Dlinux -DSYSV -+# PLATFORMCFLAGS= -Dlinux -DSYSV - # Solaris 2 - # PLATFORMCFLAGS= -Dsunos5 - # PLATFORMLDFLAGS= -lsocket -lnsl -@@ -97,7 +97,7 @@ - $(LDAP_DEBUG) $(STR_TRANSLATION) - - # when using gcc: --CC = gcc -+CC = cc - #WARN = -Wall -Wno-implicit - #CFLAGS = -O4 $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings - CFLAGS = -g $(WARN) $(ALLDEFINES) -fpcc-struct-return -fwritable-strings diff --git a/www/web500gw/patches/patch-ab b/www/web500gw/patches/patch-ab deleted file mode 100644 index b0f33bb6265..00000000000 --- a/www/web500gw/patches/patch-ab +++ /dev/null @@ -1,57 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2002/06/24 18:38:36 kent Exp $ - ---- web500gw.h.orig Wed Oct 28 21:27:47 1998 -+++ web500gw.h -@@ -22,6 +22,28 @@ - - #include "lber.h" - #include "ldap.h" -+#if defined(LDAP_VENDOR_VERSION) && (LDAP_VENDOR_VERSION >= 20000) -+# ifdef LDAP_DEBUG -+# undef LDAP_DEBUG -+# endif -+# define NULLTMPLITEM ((struct ldap_tmplitem *)0) -+# define LD_MATCHED(R) "(No info)" -+# define SET_SIZELIMIT(LD,V) do { \ -+ int value = V; \ -+ ldap_set_option(LD, LDAP_OPT_SIZELIMIT, &value); \ -+} while (0) -+# define SET_DEREF(LD,V) do { \ -+ int value = V; \ -+ ldap_set_option(LD, LDAP_OPT_DEREF, &value); \ -+} while (0) -+#else -+# ifndef LDAP_VENDOR_VERSION -+# define LDAP_VENDOR_VERSION 10000 -+# endif -+# define LD_MATCHED(R) (R)->r_ld->ld_matched -+# define SET_SIZELIMIT(LD,V) (LD)->ld_sizelimit = V -+# define SET_DEREF(LD,V) (LD)->ld_deref = V -+#endif - #include "disptmpl.h" - #include <stdio.h> - #include <stdarg.h> -@@ -69,9 +91,9 @@ - #include <unistd.h> - #endif /* USE_SYSCONF */ - --/* #if defined (__NetBSD__) -+#if defined (__NetBSD__) - #include <unistd.h> --#endif */ -+#endif - - #include "messages.h" - extern char *msg[]; -@@ -456,7 +478,11 @@ - char *c_helpfile; /* name of helpfile */ - char *c_attrfile; /* name of helpfile for attributes */ - char *c_friendlyfile; /* name of friendlyfile */ -+#if LDAP_VENDOR_VERSION < 20000 - FriendlyMap *c_fm; -+#else -+ LDAPFriendlyMap *c_fm; -+#endif - char *c_messagefile; /* name of messagefile */ - char *c_msg[MSG_count + 1]; - char **c_errmsg; diff --git a/www/web500gw/patches/patch-ac b/www/web500gw/patches/patch-ac deleted file mode 100644 index 687db6c2876..00000000000 --- a/www/web500gw/patches/patch-ac +++ /dev/null @@ -1,100 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2002/06/24 18:38:36 kent Exp $ - ---- util.c.orig Tue Jun 25 01:16:57 2002 -+++ util.c -@@ -465,6 +465,7 @@ - char mydate[256]; - struct tm tm, *ntm; - time_t t; -+ int ds_off; /* date string offset */ - - #ifdef WEB500GW_DEBUG - Web500gw_debug(WEB500GW_DEBUG_UTIL, " format_date (%s, \"%s\")\n", -@@ -473,15 +474,22 @@ - if (!s) - return(NULL); - -- /* s should point to: YYMMDDHHmmSSZ */ -+ /* s should point to: YYMMDDHHmmSSZ (13 chars) */ - /* ... well 2 digits for year :-( */ -- -- tm.tm_year = 10*(s[0] - '0') + (s[1] - '0'); -- tm.tm_mon = 10*(s[2] - '0') + (s[3] - '0') - 1; -- tm.tm_mday = 10*(s[4] - '0') + (s[5] - '0'); -- tm.tm_hour = 10*(s[6] - '0') + (s[7] - '0'); -- tm.tm_min = 10*(s[8] - '0') + (s[9] - '0'); -- tm.tm_sec = 10*(s[10] - '0') + (s[11] - '0'); -+ /* or: YYYYMMDDHHmmSSZ (15 chars; 4-digit years) */ -+ if (strlen(s) == 13) { -+ tm.tm_year = 10*(s[0] - '0') + (s[1] - '0'); -+ ds_off = 2; -+ } else { -+ tm.tm_year = 1000*(s[0] - '0') + 100*(s[1] - '0') + -+ 10*(s[2] - '0') + (s[3] - '0'); -+ ds_off = 4; -+ } -+ tm.tm_mon = 10*(s[ds_off] - '0') + (s[ds_off+1] - '0') - 1; -+ tm.tm_mday = 10*(s[ds_off+2] - '0') + (s[ds_off+3] - '0'); -+ tm.tm_hour = 10*(s[ds_off+4] - '0') + (s[ds_off+5] - '0'); -+ tm.tm_min = 10*(s[ds_off+6] - '0') + (s[ds_off+7] - '0'); -+ tm.tm_sec = 10*(s[ds_off+8] - '0') + (s[ds_off+9] - '0'); - tm.tm_isdst = 0; - - #if ! (defined(__hpux) || defined(_AIX) || defined(sunos5) || defined(linux) || defined(unixware7)) -@@ -524,6 +532,7 @@ - char month_name[4]; - int year = 0, month = 0, day = 0, hour = 0, min = 0, sec = 0; - int i = 0; -+ int ds_off; /* date string offset */ - - #ifdef WEB500GW_DEBUG - Web500gw_debug(WEB500GW_DEBUG_UTIL, " cmp_dates (%s, %s)\n", -@@ -554,7 +563,8 @@ - &day, month_name, &year, &hour, &min, &sec); - if (year < 70) - year += 100; -- year += 1900; -+ if (year < 1900) -+ year += 1900; - } else { /* normal HTTP date (RFC 822/1123): dd Mmm yyyy hh:mm:ss */ - sscanf(http_date, "%d %s %d %d:%d:%d", - &day, month_name, &year, &hour, &min, &sec); -@@ -568,17 +578,31 @@ - day, month, year, 0); - Web500gw_debug(WEB500GW_DEBUG_UTIL, "%d:%d:%d\n", hour, min, sec, 0); - #endif -- if ((i = ((10*(ldap_date[0] - '0') + (ldap_date[1] - '0') + 1900) - year))) -- return i > 0; -- if ((i = ((10*(ldap_date[2] - '0') + (ldap_date[3] - '0')) - month))) -+ /* ldap_date should point to: YYMMDDHHmmSSZ (13 chars) */ -+ /* ... well 2 digits for year :-( */ -+ /* or: YYYYMMDDHHmmSSZ (15 chars; 4-digit years) */ -+ if (strlen(ldap_date) == 13) { -+ ds_off=2; -+ if ((i = ((10*(ldap_date[0] - '0') + (ldap_date[1] - '0') + 1900) - year))) -+ return i > 0; -+ } else { -+ ds_off=4; -+ if ((i = ((1000*(ldap_date[0] - '0') + -+ 100*(ldap_date[1] - '0') + -+ 10*(ldap_date[2] - '0') + -+ (ldap_date[3] - '0')) - year ))) -+ return i > 0; -+ } -+ -+ if ((i = ((10*(ldap_date[ds_off] - '0') + (ldap_date[ds_off+1] - '0')) - month))) - return i > 0; -- if ((i = ((10*(ldap_date[4] - '0') + (ldap_date[5] - '0')) - day))) -+ if ((i = ((10*(ldap_date[ds_off+2] - '0') + (ldap_date[ds_off+3] - '0')) - day))) - return i > 0; -- if ((i = ((10*(ldap_date[6] - '0') + (ldap_date[7] - '0')) - hour))) -+ if ((i = ((10*(ldap_date[ds_off+4] - '0') + (ldap_date[ds_off+5] - '0')) - hour))) - return i > 0; -- if ((i = ((10*(ldap_date[8] - '0') + (ldap_date[9] - '0')) - min))) -+ if ((i = ((10*(ldap_date[ds_off+6] - '0') + (ldap_date[ds_off+7] - '0')) - min))) - return i > 0; -- if ((i = ((10*(ldap_date[10] - '0') + (ldap_date[11] - '0')) - sec))) -+ if ((i = ((10*(ldap_date[ds_off+8] - '0') + (ldap_date[ds_off+9] - '0')) - sec))) - return i > 0; - - /* gone so far - dates are identical */ |