From 715ed89a3b5c7dec486e2ac063d7fa32bd33b1c9 Mon Sep 17 00:00:00 2001 From: mef Date: Mon, 24 Nov 2014 05:23:17 +0000 Subject: [PATCH] Version 0.7, 2008/02/08 . Allow cookies without regular CGI POST/GET variables . Use GNU autotools for strndup() detection and shared library building Version 0.6, 2008/04/06 . Support for ';' as delimiter . Properly return NULL when no value was found . Support for multipart/form-data . Support for file upload . Added support for inclusion into C++ . Declare some arguments const (Neil Spring) . Decode variable names and data --- www/cgilib/Makefile | 15 ++++++--- www/cgilib/PLIST | 6 +++- www/cgilib/distinfo | 12 +++---- www/cgilib/patches/patch-aa | 17 ---------- www/cgilib/patches/patch-ab | 67 ------------------------------------- www/cgilib/patches/patch-ac | 21 ------------ www/cgilib/patches/patch-ad | 18 ---------- 7 files changed, 20 insertions(+), 136 deletions(-) delete mode 100644 www/cgilib/patches/patch-aa delete mode 100644 www/cgilib/patches/patch-ab delete mode 100644 www/cgilib/patches/patch-ac delete mode 100644 www/cgilib/patches/patch-ad diff --git a/www/cgilib/Makefile b/www/cgilib/Makefile index 26fa911999bf..5a05e59f69a8 100644 --- a/www/cgilib/Makefile +++ b/www/cgilib/Makefile @@ -1,17 +1,24 @@ -# $NetBSD: Makefile,v 1.18 2012/10/28 06:30:12 asau Exp $ +# $NetBSD: Makefile,v 1.19 2014/11/24 05:23:17 mef Exp $ # -DISTNAME= cgilib-0.5 -PKGREVISION= 3 +DISTNAME= cgilib-0.7 CATEGORIES= www MASTER_SITES= http://www.infodrom.org/projects/cgilib/download/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.infodrom.org/projects/cgilib/ COMMENT= Common gateway interface library +LICENSE= gnu-gpl-v2 INSTALLATION_DIRS= include lib ${PKGMANDIR}/man3 ${PKGMANDIR}/man5 USE_LIBTOOL= yes -MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR} +GNU_CONFIGURE= yes +CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} +CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec/cgi-bin +INSTALLATION_DIRS= ${PREFIX}/share/examples/cgilib + +post-install: + (cd ${WRKSRC}; \ + ${INSTALL_DATA} jumpto.c cgitest.c ${DESTDIR}${PREFIX}/share/examples/cgilib) .include "../../mk/bsd.pkg.mk" diff --git a/www/cgilib/PLIST b/www/cgilib/PLIST index f0c176bc6270..7c75762e2728 100644 --- a/www/cgilib/PLIST +++ b/www/cgilib/PLIST @@ -1,13 +1,17 @@ -@comment $NetBSD: PLIST,v 1.5 2009/06/14 22:00:19 joerg Exp $ +@comment $NetBSD: PLIST,v 1.6 2014/11/24 05:23:17 mef Exp $ +include/aux.h include/cgi.h lib/libcgi.la libexec/cgi-bin/cgitest libexec/cgi-bin/jumpto man/man3/cgiDebug.3 +man/man3/cgiEscape.3 man/man3/cgiFree.3 man/man3/cgiFreeList.3 man/man3/cgiGetCookie.3 man/man3/cgiGetCookies.3 +man/man3/cgiGetFile.3 +man/man3/cgiGetFiles.3 man/man3/cgiGetValue.3 man/man3/cgiGetVariables.3 man/man3/cgiHeader.3 diff --git a/www/cgilib/distinfo b/www/cgilib/distinfo index 9bc92e6df2b0..102e247a7e0e 100644 --- a/www/cgilib/distinfo +++ b/www/cgilib/distinfo @@ -1,9 +1,5 @@ -$NetBSD: distinfo,v 1.12 2009/02/16 19:16:57 joerg Exp $ +$NetBSD: distinfo,v 1.13 2014/11/24 05:23:17 mef Exp $ -SHA1 (cgilib-0.5.tar.gz) = 3ba65e9fac43b875427a126ebbaaa6155e9692df -RMD160 (cgilib-0.5.tar.gz) = 0188fc57aee277e772e32328b96aa836557c0c63 -Size (cgilib-0.5.tar.gz) = 13991 bytes -SHA1 (patch-aa) = 9b92cde49f84a22d53044b230b05798dc90085ef -SHA1 (patch-ab) = 4e38d2665e14d3271c3ac296f3853c2a100c7617 -SHA1 (patch-ac) = 3366b330d49ef8d61f26b06097c1e4e271f90728 -SHA1 (patch-ad) = 94b9179073afd4494258ac72fed2d275415fb67d +SHA1 (cgilib-0.7.tar.gz) = a3c9c92f38dca10ee4e30ed1fa030401aa3fcabf +RMD160 (cgilib-0.7.tar.gz) = eceb4f77bccd4736757ecbcb5181f95ee2469804 +Size (cgilib-0.7.tar.gz) = 268783 bytes diff --git a/www/cgilib/patches/patch-aa b/www/cgilib/patches/patch-aa deleted file mode 100644 index 4f7a915ba2ee..000000000000 --- a/www/cgilib/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2001/09/10 21:36:20 dmcmahill Exp $ - ---- cgitest.c.orig Tue Aug 17 09:21:20 1999 -+++ cgitest.c Mon Sep 10 16:08:57 2001 -@@ -24,4 +24,5 @@ - #include - #include -+#include - #include - -@@ -114,5 +115,5 @@ - printf ("\ncgilib\n\n\n"); - printf ("

cgilib

\n", URL); -- printf ("

Cookie "Library" set

\n"); -+ printf ("

Cookie \"Library\" set

\n"); - printf ("



Test

\n"); - printf ("



Redirect

\n"); diff --git a/www/cgilib/patches/patch-ab b/www/cgilib/patches/patch-ab deleted file mode 100644 index 23c00c533f96..000000000000 --- a/www/cgilib/patches/patch-ab +++ /dev/null @@ -1,67 +0,0 @@ -$NetBSD: patch-ab,v 1.10 2009/02/16 19:16:57 joerg Exp $ - ---- Makefile.orig 1999-08-20 23:14:07.000000000 +0200 -+++ Makefile 2006-11-12 02:49:34.000000000 +0100 -@@ -14,25 +14,31 @@ - # along with this program; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - --CFLAGS = -I. -Wall -O2 -g -+MANDIR?= ${PREFIX}/man -+ -+CFLAGS += -I. -Wall -O2 - LDFLAGS = -L. --LIBS = -lcgi -+LIBS = libcgi.la - - OBJS = cgi.o cookies.o - --libcgi.a: $(OBJS) -- ar rc $@ $^ -+all: libcgi.la cgitest jumpto -+ -+.SUFFIXES: .lo - --cgitest: cgitest.o libcgi.a -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -+.c.lo: -+ ${LIBTOOL} --mode=compile ${CC} ${CFLAGS} -o $@ -c $< - --jumpto: jumpto.o libcgi.a -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) -+libcgi.la: $(OBJS:.o=.lo) -+ ${LIBTOOL} --mode=link ${CC} -o $@ ${OBJS:.o=.lo} \ -+ -rpath ${PREFIX}/lib \ -+ -version-info 0:0 - --all: libcgi.a cgitest jumpto -+cgitest: cgitest.lo libcgi.la -+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ cgitest.lo $(LIBS) - --install: cgitest -- install -m 755 cgitest /usr/lib/cgi-bin -+jumpto: jumpto.lo libcgi.la -+ ${LIBTOOL} --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@ jumpto.lo $(LIBS) - - clean: - rm -f cgitest cgitest.o jumpto jumpto.o libcgi.a $(OBJS) *.[35].html -@@ -41,3 +47,19 @@ htmlman: - for f in *.[35]; do \ - man -l $$f|rman -f HTML --title $$f -r "%s.%s.html" > $$f.html; \ - done -+ -+install: -+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/libexec/cgi-bin -+ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/cgilib -+ ${BSD_INSTALL_DATA} cgitest.c ${DESTDIR}${PREFIX}/share/examples/cgilib -+ ${BSD_INSTALL_DATA} jumpto.c ${DESTDIR}${PREFIX}/share/examples/cgilib -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} libcgi.la ${DESTDIR}${PREFIX}/lib -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} cgitest ${DESTDIR}${PREFIX}/libexec/cgi-bin -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} jumpto ${DESTDIR}${PREFIX}/libexec/cgi-bin -+ ${BSD_INSTALL_DATA} cgi.h ${DESTDIR}${PREFIX}/include -+ for i in *.3; do \ -+ ${BSD_INSTALL_MAN} $$i ${DESTDIR}${MANDIR}/man3/; \ -+ done -+ for i in *.5; do \ -+ ${BSD_INSTALL_MAN} $$i ${DESTDIR}${MANDIR}/man5/; \ -+ done diff --git a/www/cgilib/patches/patch-ac b/www/cgilib/patches/patch-ac deleted file mode 100644 index 7fd7937e8301..000000000000 --- a/www/cgilib/patches/patch-ac +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2004/05/23 23:28:30 danw Exp $ - ---- cgi.c.orig Fri Aug 20 17:14:07 1999 -+++ cgi.c -@@ -31,7 +31,6 @@ - #include - #include - #include --#include - #include - - int cgiDebugLevel = 0; -@@ -380,7 +379,7 @@ char **cgiGetVariables (s_cgi *parms) - void cgiRedirect (const char *url) - { - if (url && strlen(url)) { -- printf ("Content-type: text/html\nContent-length: %d\n", 77+(strlen(url)*2)); -+ printf ("Content-type: text/html\nContent-length: %ld\n",(long)( 77+(strlen(url)*2))); - printf ("Status: 302 Temporal Relocation\n"); - printf ("Location: %s\n\n", url); - printf ("\n\nThe page has been moved to %s\n\n\n", url, url); diff --git a/www/cgilib/patches/patch-ad b/www/cgilib/patches/patch-ad deleted file mode 100644 index bbb6e63ce11f..000000000000 --- a/www/cgilib/patches/patch-ad +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2001/09/10 21:36:21 dmcmahill Exp $ - ---- jumpto.c.orig Fri Aug 20 17:14:07 1999 -+++ jumpto.c Mon Sep 10 16:18:39 2001 -@@ -42,5 +42,5 @@ - s_cgi *cgiArg; - --void main() -+int main() - { - char *url; -@@ -58,4 +58,6 @@ - } else - cgiRedirect(url); -+ -+ return 0; - } -