cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unhook games/sudoku-solver and www/clearsilver; clearsilver being abandoned

Browse Source 
upstream and Marc Balmer (original auther) agrees with removing the only
dependent port, sudoku-solver.

ok many and sthen@
This commit is contained in:
okan 2017-03-24 15:21:46 +00:00
parent 951bd53769
commit 0582c6dd1b
39 changed files with 7 additions and 739 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/quirks/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.456 2017/03/24 14:57:59 okan Exp $
# $OpenBSD: Makefile,v 1.457 2017/03/24 15:21:46 okan Exp $
COMMENT = exceptions to pkg_add rules
CATEGORIES = devel databases
DISTFILES =
# API.rev
PKGNAME = quirks-2.301
PKGNAME = quirks-2.302
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

4
devel/quirks/files/Quirks.pm
View File

@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
# $OpenBSD: Quirks.pm,v 1.468 2017/03/24 14:57:59 okan Exp $
# $OpenBSD: Quirks.pm,v 1.469 2017/03/24 15:21:46 okan Exp $
#
# Copyright (c) 2009 Marc Espie <espie@openbsd.org>
#
@ -853,6 +853,8 @@ my $obsolete_reason = {
"ocaml-camomile" => 5,
"elinks" => 2,
"wyrd" => 3,
"sudoku-solver" => 3,
"clearsilver" => 3,
# KDE3 removals
'amarok' => 2,

3
games/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.342 2017/01/10 11:02:37 kirby Exp $
# $OpenBSD: Makefile,v 1.343 2017/03/24 15:21:46 okan Exp $
SUBDIR =
SUBDIR += 0ad
@ -233,7 +233,6 @@
SUBDIR += stone-soup,no_x11
SUBDIR += sudognu
SUBDIR += sudoku
SUBDIR += sudoku-solver
SUBDIR += sumwars
SUBDIR += supertux
SUBDIR += supertuxkart

29
games/sudoku-solver/Makefile
View File

@ -1,29 +0,0 @@
# $OpenBSD: Makefile,v 1.22 2016/05/05 19:52:28 naddy Exp $
COMMENT= sudoku puzzle solver with cli, gui, and web ui
DISTNAME= sudoku-solver-1.0.1
REVISION= 9
CATEGORIES= games www x11
# BSD
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= Xt c crypto m pthread z fcgi Xm
MASTER_SITES= https://spacehopper.org/mirrors/
EXTRACT_SUFX= .tgz
MODULES= devel/gettext
BUILD_DEPENDS= www/clearsilver
LIB_DEPENDS= www/fcgi \
x11/motif
MAKE_ENV= LDADD=-lm
MAKE_ENV+=MOTIFLIB='-L${LOCALBASE}/lib -lXm'
NO_TEST= Yes
.include <bsd.port.mk>

2
games/sudoku-solver/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (sudoku-solver-1.0.1.tgz) = J6Q/FPI8zRdIW/vK0Pexk1QllBGovCoT3R3FHr4jvAs=
SIZE (sudoku-solver-1.0.1.tgz) = 11043

14
games/sudoku-solver/patches/patch-Makefile
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-Makefile,v 1.1 2011/06/23 22:50:27 naddy Exp $
--- Makefile.orig Sun Jul 22 10:22:45 2007
+++ Makefile Tue Jun 21 07:13:31 2011
@@ -10,8 +10,8 @@ CFLAGS+= -Wall
MAN= sudoku-solver.6
-BINDIR= /usr/local/bin
-MANDIR= /usr/local/man/cat
+BINDIR= ${TRUEPREFIX}/bin
+MANDIR= ${TRUEPREFIX}/man/man
VERSION= 1.0.1
PUBDIR= /var/www/ftp/pub/sources/sudoku

13
games/sudoku-solver/patches/patch-motif_Makefile
View File

@ -1,13 +0,0 @@
$OpenBSD: patch-motif_Makefile,v 1.1 2011/06/23 22:50:27 naddy Exp $
--- motif/Makefile.orig Tue Jun 21 07:15:48 2011
+++ motif/Makefile Tue Jun 21 07:16:13 2011
@@ -8,7 +8,7 @@ CFLAGS+= -Wall -I/usr/X11R6/include -I/usr/local/inclu
LDADD+= -L/usr/X11R6/lib -L/usr/local/lib -lXm -lXt
-BINDIR= /usr/local/bin
-MANDIR= /usr/local/man/cat
+BINDIR= ${TRUEPREFIX}/bin
+MANDIR= ${TRUEPREFIX}/man/man
.include <bsd.prog.mk>

11
games/sudoku-solver/patches/patch-motif_xsudoku_1
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-motif_xsudoku_1,v 1.1 2010/04/03 20:07:06 naddy Exp $
--- motif/xsudoku.1.orig Sat Apr 3 21:57:56 2010
+++ motif/xsudoku.1 Sat Apr 3 21:58:22 2010
@@ -27,7 +27,6 @@
.Nm
solves sudoku puzzles for you - so you have more time to hack on
.Ox .
-
.Pp
The input file is a simple text file containing the numbers of the
puzzle to solve and space characters for the empty fields, one row

12
games/sudoku-solver/patches/patch-sudoku-solver_6
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-sudoku-solver_6,v 1.1 2010/04/03 20:07:06 naddy Exp $
--- sudoku-solver.6.orig Sat Apr 3 21:54:22 2010
+++ sudoku-solver.6 Sat Apr 3 21:57:22 2010
@@ -30,7 +30,7 @@ solves sudoku puzzles for you - so you have more time
.Ox .
.Pp
The command line options are as follows:
-.Bl -tag -ohang -witdh Fl
+.Bl -tag -width Ds
.It Fl v
Be verbose, show on the terminal what is going on.
.El

21
games/sudoku-solver/patches/patch-webui_Makefile
View File

@ -1,21 +0,0 @@
$OpenBSD: patch-webui_Makefile,v 1.2 2015/07/31 20:49:54 naddy Exp $
--- webui/Makefile.orig Sat May 26 02:38:57 2007
+++ webui/Makefile Thu Jul 30 19:26:16 2015
@@ -6,14 +6,15 @@ SRCS= sudoku-handler.c solver.c
SUBDIR+= templates
VPATH+= ..
-CFLAGS+= -pthread -Wall -fpic -static -I/usr/local/include \
+CFLAGS+= -pthread -Wall -I/usr/local/include \
-I/usr/local/include/ClearSilver -I.. -DDEBUG \
-DNO_FCGI_DEFINES
LDADD+= -L/usr/local/lib -lneo_cgi -lneo_utl -lneo_cs -lpthread \
-lintl -liconv -lcrypto -lz -lc -lfcgi
+LDSTATIC= ${STATIC}
-BINDIR= /usr/local/libexec
+BINDIR= ${TRUEPREFIX}/libexec
NOMAN= 1
.include <bsd.prog.mk>

3
games/sudoku-solver/pkg/DESCR
View File

@ -1,3 +0,0 @@
A sudoku puzzle solver with a command line interface (sudoku-solver), a
web-interface using Neotonic ClearSilver and FastCGI (sudoku-handler), and
a X11 user interface using the Motif toolkit (xsudoku).

10
games/sudoku-solver/pkg/PLIST
View File

@ -1,10 +0,0 @@
@comment $OpenBSD: PLIST,v 1.3 2011/06/23 22:50:27 naddy Exp $
@bin bin/sudoku-solver
@bin bin/xsudoku
@bin libexec/sudoku-handler
@man man/man1/xsudoku.1
@man man/man6/sudoku-solver.6
share/sudoku/
share/sudoku/input.cs
share/sudoku/output.cs
share/sudoku/table.cs

3
www/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.817 2017/03/17 17:46:22 edd Exp $
# $OpenBSD: Makefile,v 1.818 2017/03/24 15:21:46 okan Exp $
SUBDIR =
SUBDIR += ajaxterm
@ -26,7 +26,6 @@
SUBDIR += cgit
SUBDIR += chive
SUBDIR += chromium
SUBDIR += clearsilver
SUBDIR += cntlm
SUBDIR += composer
SUBDIR += conkeror

59
www/clearsilver/Makefile
View File

@ -1,59 +0,0 @@
# $OpenBSD: Makefile,v 1.33 2017/02/06 20:28:32 sthen Exp $
COMMENT-main= fast, powerful, and language-neutral HTML template system
COMMENT-perl= perl bindings for clearsilver
COMMENT-python= python bindings for clearsilver
V= 0.10.4
DISTNAME= clearsilver-${V}
EPOCH= 0
REVISION= 12
REVISION-perl= 13
PKGNAME-main= ${DISTNAME}
PKGNAME-perl= clearsilver-perl-${V}
PKGNAME-python= clearsilver-python-${V}
CATEGORIES= www net
HOMEPAGE= http://www.clearsilver.net/
MASTER_SITES= ${HOMEPAGE}/downloads/
# Apache 1
PERMIT_PACKAGE_CDROM= Yes
MULTI_PACKAGES= -main -perl -python
MODULES= lang/python
WANTLIB-main= c pthread z
RUN_DEPENDS-main=
WANTLIB-perl= pthread z perl # uses perl ABI
RUN_DEPENDS-perl= ${PKGPATH}
WANTLIB-python= ${MODPY_WANTLIB} pthread z
RUN_DEPENDS-python= ${MODPY_RUN_DEPENDS} ${PKGPATH}
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= --disable-csharp \
--disable-java \
--disable-ruby \
--disable-apache \
--with-python=${MODPY_BIN} \
LDFLAGS="-L${LOCALBASE}/lib"
pre-configure:
@perl -pi -e 's|%%WRKSRC%%|${WRKSRC}|g' ${WRKSRC}/python/setup.py
do-test:
@cd ${WRKSRC}/perl && ${MAKE_PROGRAM} test
# can remove the /*/ line and -f after perl 5.24 update.
post-install:
rm -f ${PREFIX}/libdata/perl5/${MACHINE_ARCH}-openbsd/perllocal.pod \
${PREFIX}/libdata/perl5/${MACHINE_ARCH}-openbsd/*/perllocal.pod
find -d ${PREFIX}/libdata/perl5/${MACHINE_ARCH}-openbsd -type d | xargs rmdir
.include <bsd.port.mk>

2
www/clearsilver/distinfo
View File

@ -1,2 +0,0 @@
SHA256 (clearsilver-0.10.4.tar.gz) = fY5K3bNHj8quxirIdOAiUC1vk7iZsQsUOUFwrEQ+tCs=
SIZE (clearsilver-0.10.4.tar.gz) = 655730

11
www/clearsilver/patches/patch-cgi_Makefile
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-cgi_Makefile,v 1.2 2006/05/15 17:08:43 fkr Exp $
--- cgi/Makefile.orig Wed Feb 1 03:53:23 2006
+++ cgi/Makefile Mon May 8 16:54:19 2006
@@ -6,6 +6,7 @@ endif
include $(NEOTONIC_ROOT)/rules.mk
+CFLAGS += -fPIC
CGI_LIB = $(LIB_DIR)libneo_cgi.a
CGI_SRC = cgiwrap.c cgi.c html.c date.c rfc2388.c
CGI_OBJ = $(CGI_SRC:%.c=%.o)

34
www/clearsilver/patches/patch-cgi_cgi_c
View File

@ -1,34 +0,0 @@
--- cgi/cgi.c.orig Mon Nov 6 23:32:16 2006
+++ cgi/cgi.c Thu Apr 28 16:33:48 2016
@@ -503,7 +503,7 @@ static void _launch_debugger (CGI *cgi, char *display)
if (!pid)
{
- sprintf(buffer, debugger, display, Argv0, myPid);
+ snprintf(buffer, sizeof(buffer), debugger, display, Argv0, myPid);
execl("/bin/sh", "sh", "-c", buffer, NULL);
}
else
@@ -1205,11 +1205,11 @@ NEOERR *cgi_output (CGI *cgi, STRING *str)
{
if (use_gzip)
{
- /* I'm using sprintf instead of cgiwrap_writef since
+ /* I'm using snprintf instead of cgiwrap_writef since
* the wrapper writef might not handle values with
* embedded NULLs... though I should fix the python one
* now as well */
- sprintf(gz_buf, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
+ snprintf(gz_buf, sizeof(gz_buf), "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1],
Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/,
OS_CODE);
err = cgiwrap_write(gz_buf, 10);
@@ -1221,7 +1221,7 @@ NEOERR *cgi_output (CGI *cgi, STRING *str)
if (use_gzip)
{
/* write crc and len in network order */
- sprintf(gz_buf, "%c%c%c%c%c%c%c%c",
+ snprintf(gz_buf, sizeof(gz_buf), "%c%c%c%c%c%c%c%c",
(0xff & (crc >> 0)),
(0xff & (crc >> 8)),
(0xff & (crc >> 16)),

17
www/clearsilver/patches/patch-cgi_cgi_h
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-cgi_cgi_h,v 1.5 2016/04/28 15:34:14 sthen Exp $
--- cgi/cgi.h.orig Thu Dec 1 03:57:32 2005
+++ cgi/cgi.h Thu Apr 28 16:33:48 2016
@@ -267,11 +267,11 @@ FILE *cgi_filehandle (CGI *cgi, const char *form_name)
* removed from future versions in favor of some sort of
* user error mechanism.
* Input: cgi - a pointer to a CGI struct
- * err - a NEOERR (see util/neo_err.h for details)
+ * nerr - a NEOERR (see util/neo_err.h for details)
* Output: None
* Return: None
*/
-void cgi_neo_error (CGI *cgi, NEOERR *err);
+void cgi_neo_error (CGI *cgi, NEOERR *nerr);
/*
* Function: cgi_error - display an error string to the user

11
www/clearsilver/patches/patch-cgi_cgiwrap_c
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-cgi_cgiwrap_c,v 1.3 2008/11/18 20:00:09 okan Exp $
--- cgi/cgiwrap.c.orig Tue Nov 18 14:53:10 2008
+++ cgi/cgiwrap.c Tue Nov 18 14:53:21 2008
@@ -11,7 +11,6 @@
#include "cs_config.h"
-#include <features.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>

11
www/clearsilver/patches/patch-cgi_date_h
View File

@ -1,11 +0,0 @@
--- cgi/date.h.orig Fri Jul 1 03:21:30 2005
+++ cgi/date.h Fri Apr 28 00:04:19 2006
@@ -17,7 +17,7 @@
__BEGIN_DECLS
NEOERR *export_date_tm (HDF *obj, const char *prefix, struct tm *ttm);
-NEOERR *export_date_time_t (HDF *obj, const char *prefix, const char *timezone,
+NEOERR *export_date_time_t (HDF *obj, const char *prefix, const char *neotimezone,
time_t tt);
__END_DECLS

12
www/clearsilver/patches/patch-cgi_html_c
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-cgi_html_c,v 1.5 2016/04/28 15:34:14 sthen Exp $
--- cgi/html.c.orig Fri Oct 20 00:26:35 2006
+++ cgi/html.c Thu Apr 28 16:33:48 2016
@@ -392,7 +392,7 @@ static NEOERR *split_and_convert (const char *src, int
"Unable to allocate memory to convert url");
break;
}
- strcpy(url, "http://");
+ strlcpy(url, "http://", url_len + 1);
strncat(url, src + x, parts[i].end - x - suffix);
}
else

11
www/clearsilver/patches/patch-cs_Makefile
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-cs_Makefile,v 1.2 2006/05/15 17:08:43 fkr Exp $
--- cs/Makefile.orig Thu Feb 2 03:20:49 2006
+++ cs/Makefile Mon May 8 16:54:19 2006
@@ -6,6 +6,7 @@ endif
include $(NEOTONIC_ROOT)/rules.mk
+CFLAGS += -fPIC
CS_LIB = $(LIB_DIR)libneo_cs.a
CS_SRC = csparse.c
CS_OBJ = $(CS_SRC:%.c=%.o)

26
www/clearsilver/patches/patch-cs_csparse_c
View File

@ -1,26 +0,0 @@
--- cs/csparse.c.orig Fri Oct 20 00:26:11 2006
+++ cs/csparse.c Thu Apr 28 16:33:48 2016
@@ -1832,6 +1832,7 @@ static NEOERR *eval_expr_string(CSPARSE *parse, CSARG
{
char *s1, *s2;
int out;
+ size_t need;
result->op_type = CS_TYPE_NUM;
s1 = arg_eval (parse, arg1);
@@ -1906,11 +1907,12 @@ static NEOERR *eval_expr_string(CSPARSE *parse, CSARG
case CS_OP_ADD:
result->op_type = CS_TYPE_STRING;
result->alloc = 1;
- result->s = (char *) calloc ((strlen(s1) + strlen(s2) + 1), sizeof(char));
+ need = strlen(s1) + strlen(s2) + 1;
+ result->s = (char *) calloc (need, sizeof(char));
if (result->s == NULL)
return nerr_raise (NERR_NOMEM, "Unable to allocate memory to concatenate strings in expression: %s + %s", s1, s2);
- strcpy(result->s, s1);
- strcat(result->s, s2);
+ strlcpy(result->s, s1, need);
+ strlcat(result->s, s2, need);
break;
default:
ne_warn ("Unsupported op %s in eval_expr_string", expand_token_type(op, 1));

12
www/clearsilver/patches/patch-perl_Makefile_PL
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-perl_Makefile_PL,v 1.4 2007/02/14 17:42:32 bernd Exp $
--- perl/Makefile.PL.orig Wed Feb 14 12:20:10 2007
+++ perl/Makefile.PL Wed Feb 14 12:20:10 2007
@@ -9,7 +9,7 @@ WriteMakefile(
(ABSTRACT_FROM => 'ClearSilver.pm', # retrieve abstract from module
AUTHOR => 'A. U. Thor <a.u.thor@a.galaxy.far.far.away>') : ()),
# TODO: don't include -lz if we aren't depending on it
- 'LIBS' => ['-L../libs -lneo_cgi -lneo_cs -lneo_utl -lz'],
+ 'LIBS' => ['-L../libs -lneo_cgi -lneo_cs -lneo_utl -lz -lpthread'],
'DEFINE' => '', # e.g., '-DHAVE_SOMETHING'
# Insert -I. if you add *.h files later:
'INC' => '-I../',

17
www/clearsilver/patches/patch-python_setup_py
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-python_setup_py,v 1.4 2008/11/18 20:00:09 okan Exp $
--- python/setup.py.orig Tue Nov 18 14:53:47 2008
+++ python/setup.py Tue Nov 18 14:54:31 2008
@@ -28,11 +28,11 @@ LDSHARED = "gcc -shared"
## Actually, forget that, I'm just going to load and parse the rules.mk
## file and build what I need
-if not os.path.exists("../rules.mk"):
+if not os.path.exists("%%WRKSRC%%/rules.mk"):
raise "You need to run configure first to generate the rules.mk file!"
make_vars = {}
-rules = open("../rules.mk").read()
+rules = open("%%WRKSRC%%/rules.mk").read()
for line in string.split(rules, "\n"):
parts = string.split(line, '=', 1)
if len(parts) != 2: continue

15
www/clearsilver/patches/patch-rules_mk_in
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-rules_mk_in,v 1.3 2012/09/23 19:50:22 jasper Exp $
--- rules.mk.in.orig Fri Dec 2 12:25:19 2005
+++ rules.mk.in Mon May 8 16:54:19 2006
@@ -94,9 +94,9 @@ AR = @AR@ cr
RANLIB = @RANLIB@
DEP_LIBS = $(DLIBS:-l%=$(LIB_DIR)lib%.a)
DBI_LIBS = -ldbi -ldl -lz
-LIBS = @LIBS@
+LIBS = @LIBS@ -lpthread
LS = /bin/ls
-XARGS = xargs -i%
+XARGS = xargs -J%
BUILD_WRAPPERS = @BUILD_WRAPPERS@
EXTRA_UTL_OBJS = @EXTRA_UTL_OBJS@
EXTRA_UTL_SRC = @EXTRA_UTL_SRC@

11
www/clearsilver/patches/patch-util_Makefile
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-util_Makefile,v 1.2 2006/05/15 17:08:43 fkr Exp $
--- util/Makefile.orig Fri Dec 2 11:36:00 2005
+++ util/Makefile Mon May 8 16:54:19 2006
@@ -6,6 +6,7 @@ endif
include $(NEOTONIC_ROOT)/rules.mk
+CFLAGS += -fPIC
UTL_LIB = $(LIB_DIR)libneo_utl.a
UTL_SRC = neo_err.c neo_files.c neo_misc.c neo_rand.c ulist.c neo_hdf.c \
neo_str.c neo_date.c wildmat.c neo_hash.c $(EXTRA_UTL_SRC)

11
www/clearsilver/patches/patch-util_filter_h
View File

@ -1,11 +0,0 @@
--- util/filter.h.orig Thu Jun 30 19:58:05 2005
+++ util/filter.h Thu Apr 28 16:33:48 2016
@@ -84,7 +84,7 @@ NEOERR *filter_create_fd(const char *cmd, int *fdin, i
* pid -> the pid of the sub process
* Returns: NERR_SYSTEM, NERR_IO
*/
-NEOERR *filter_create_fp(const char *cmd, FILE **in, FILE **out, FILE **err,
+NEOERR *filter_create_fp(const char *cmd, FILE **in, FILE **out, FILE **ferr,
pid_t *pid);
__END_DECLS

15
www/clearsilver/patches/patch-util_neo_date_h
View File

@ -1,15 +0,0 @@
--- util/neo_date.h.orig Thu Jun 30 20:58:48 2005
+++ util/neo_date.h Fri Apr 28 00:11:28 2006
@@ -17,10 +17,10 @@
__BEGIN_DECLS
/* UTC time_t -> struct tm in local timezone */
-void neo_time_expand (const time_t tt, const char *timezone, struct tm *ttm);
+void neo_time_expand (const time_t tt, const char *neotimezone, struct tm *ttm);
/* local timezone struct tm -> time_t UTC */
-time_t neo_time_compact (struct tm *ttm, const char *timezone);
+time_t neo_time_compact (struct tm *ttm, const char *neotimezone);
/* To be portable... in seconds */
long neo_tz_offset(struct tm *ttm);

94
www/clearsilver/patches/patch-util_neo_err_h
View File

@ -1,94 +0,0 @@
--- util/neo_err.h.orig Thu Dec 15 22:17:36 2005
+++ util/neo_err.h Thu Apr 28 16:33:48 2016
@@ -105,7 +105,7 @@ NEOERR *nerr_raise_errnof (const char *func, const cha
#define nerr_pass(e) \
nerr_passf(__PRETTY_FUNCTION__,__FILE__,__LINE__,e)
NEOERR *nerr_passf (const char *func, const char *file, int lineno,
- NEOERR *err);
+ NEOERR *nerr);
/* function: nerr_pass_ctx
* description: this function is used to pass an error up a level in the
@@ -127,47 +127,47 @@ NEOERR *nerr_passf (const char *func, const char *file
#define nerr_pass_ctx(e,f,...) \
nerr_pass_ctxf(__PRETTY_FUNCTION__,__FILE__,__LINE__,e,f,__VA_ARGS__)
#endif
-NEOERR *nerr_pass_ctxf (const char *func, const char *file, int lineno, NEOERR *err,
+NEOERR *nerr_pass_ctxf (const char *func, const char *file, int lineno, NEOERR *nerr,
const char *fmt, ...);
/* function: nerr_log_error
* description: currently, this prints out the error to stderr, and
* free's the error chain
*/
-void nerr_log_error (NEOERR *err);
+void nerr_log_error (NEOERR *nerr);
#include "util/neo_str.h"
/* function: nerr_error_string
* description: returns the string associated with an error (the bottom
* level of the error chain)
- * arguments: err - error
+ * arguments: nerr - error
* str - string to which the data is appended
* returns: None - errors appending to the string are ignored
*/
-void nerr_error_string (NEOERR *err, STRING *str);
+void nerr_error_string (NEOERR *nerr, STRING *str);
/* function: nerr_error_traceback
* description: returns the full traceback of the error chain
- * arguments: err - error
+ * arguments: nerr - error
* str - string to which the data is appended
* returns: None - errors appending to the string are ignored
*/
-void nerr_error_traceback (NEOERR *err, STRING *str);
+void nerr_error_traceback (NEOERR *nerr, STRING *str);
/* function: nerr_ignore
* description: you should only call this if you actually handle the
* error (should I rename it?). Free's the error chain.
*/
-void nerr_ignore (NEOERR **err);
+void nerr_ignore (NEOERR **nerr);
/* function: nerr_register
* description: register an error type. This will assign a numeric value
* to the type, and keep track of the "pretty name" for it.
- * arguments: err - pointer to a NERR_TYPE
+ * arguments: nerr - pointer to a NERR_TYPE
* name - pretty name for the error type
* returns: NERR_NOMEM on no memory
*/
-NEOERR *nerr_register (NERR_TYPE *err, const char *name);
+NEOERR *nerr_register (NERR_TYPE *nerr, const char *name);
/* function: nerr_init
* description: initialize the NEOERR system. Can be called more than once.
@@ -186,21 +186,21 @@ NEOERR *nerr_init (void);
* parlance, this would be the equivalent of "catch".
* Typically, you can just compare a NEOERR against STATUS_OK
* or just test for true if you are checking for any error.
- * arguments: err - the NEOERR that has an error.
+ * arguments: nerr - the NEOERR that has an error.
* type - the NEOERR type, as registered with nerr_register
* returns: true on match
*/
-int nerr_match (NEOERR *err, NERR_TYPE type);
+int nerr_match (NEOERR *nerr, NERR_TYPE type);
/* function: nerr_handle
* description: nerr_handle is a convenience function. It is the equivalent
* of nerr_match, but it will also deallocate the error chain
* on a match.
- * arguments: err - pointer to a pointer NEOERR
+ * arguments: nerr - pointer to a pointer NEOERR
* type - the NEOERR type, as registered with nerr_register
* returns: true on match
*/
-int nerr_handle (NEOERR **err, NERR_TYPE type);
+int nerr_handle (NEOERR **nerr, NERR_TYPE type);
__END_DECLS

33
www/clearsilver/patches/patch-util_neo_hdf_c
View File

@ -1,33 +0,0 @@
$OpenBSD: patch-util_neo_hdf_c,v 1.5 2016/04/28 15:34:14 sthen Exp $
--- util/neo_hdf.c.orig Sat Aug 12 00:47:01 2006
+++ util/neo_hdf.c Thu Apr 28 16:33:48 2016
@@ -772,13 +772,14 @@ skip_search:
}
else if (hp->link)
{
- char *new_name = (char *) malloc(strlen(hp->value) + strlen(s) + 1);
+ size_t nn_siz = strlen(hp->value) + strlen(s) + 1;
+ char *new_name = (char *) malloc(nn_siz);
if (new_name == NULL)
{
return nerr_raise(NERR_NOMEM, "Unable to allocate memory");
}
- strcpy(new_name, hp->value);
- strcat(new_name, s);
+ strlcpy(new_name, hp->value, nn_siz);
+ strlcat(new_name, s, nn_siz);
err = _set_value (hdf, new_name, value, dup, wf, link, attr, set_node);
free(new_name);
return nerr_pass(err);
@@ -1211,8 +1212,9 @@ static NEOERR* hdf_dump_cb(HDF *hdf, const char *prefi
{
if (prefix && (dtype == DUMP_TYPE_DOTTED))
{
- p = (char *) malloc (strlen(hdf->name) + strlen(prefix) + 2);
- sprintf (p, "%s.%s", prefix, hdf->name);
+ size_t need = strlen(hdf->name) + strlen(prefix) + 2;
+ p = (char *) malloc (need);
+ snprintf (p, need, "%s.%s", prefix, hdf->name);
err = hdf_dump_cb (hdf, p, dtype, lvl+1, rock, dump_cbf);
free(p);
}

30
www/clearsilver/patches/patch-util_neo_str_c
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-util_neo_str_c,v 1.5 2016/04/28 15:34:14 sthen Exp $
--- util/neo_str.c.orig Mon Aug 7 21:01:53 2006
+++ util/neo_str.c Thu Apr 28 16:33:48 2016
@@ -122,7 +122,7 @@ NEOERR *string_append (STRING *str, const char *buf)
l = strlen(buf);
err = string_check_length (str, l);
if (err != STATUS_OK) return nerr_pass (err);
- strcpy(str->buf + str->len, buf);
+ strlcpy(str->buf + str->len, buf, str->max - str->len);
str->len += l;
return STATUS_OK;
@@ -174,7 +174,7 @@ NEOERR *string_appendvf (STRING *str, const char *fmt,
err = string_check_length (str, bl+1);
if (err != STATUS_OK) return nerr_pass (err);
va_copy(tmp, ap);
- vsprintf (str->buf + str->len, fmt, tmp);
+ vsnprintf (str->buf + str->len, str->max - str->len, fmt, tmp);
str->len += bl;
str->buf[str->len] = '\0';
@@ -581,7 +581,7 @@ char *repr_string_alloc (const char *s)
rs[i++] = '\\';
break;
default:
- sprintf(&(rs[i]), "%03o", (s[x] & 0377));
+ snprintf(&(rs[i]), nl+3-i, "%03o", (s[x] & 0377));
i += 3;
break;
}

11
www/clearsilver/patches/patch-util_rcfs_h
View File

@ -1,11 +0,0 @@
--- util/rcfs.h.orig Thu Jun 30 21:17:19 2005
+++ util/rcfs.h Mon May 8 16:54:19 2006
@@ -22,7 +22,7 @@ NEOERR * rcfs_destroy (RCFS **rcfs);
NEOERR * rcfs_load (const char *path, int version, char **data);
NEOERR * rcfs_save (const char *path, const char *data, const char *user,
- const char *log);
+ const char *neolog);
NEOERR * rcfs_lock (const char *path, int *lock);
void rcfs_unlock (int lock);
NEOERR * rcfs_meta_load (const char *path, HDF **meta);

4
www/clearsilver/pkg/DESCR-main
View File

@ -1,4 +0,0 @@
Clearsilver is a fast, powerful, and language-neutral HTML template
system. In both static content sites and dynamic HTML applications,
it provides a separation between presentation code and application
logic which makes working with your project easier.

1
www/clearsilver/pkg/DESCR-perl
View File

@ -1 +0,0 @@
Perl bindings for clearsilver.

1
www/clearsilver/pkg/DESCR-python
View File

@ -1 +0,0 @@
Python bindings for clearsilver.

157
www/clearsilver/pkg/PLIST-main
View File

@ -1,157 +0,0 @@
@comment $OpenBSD: PLIST-main,v 1.2 2016/04/28 15:57:19 sthen Exp $
@pkgpath www/clearsilver
@pkgpath www/clearsilver,python
@bin bin/cs
@bin bin/cs_static.cgi
@bin bin/cstest
include/ClearSilver/
include/ClearSilver/ClearSilver.h
include/ClearSilver/cgi/
include/ClearSilver/cgi/cgi.h
include/ClearSilver/cgi/cgiwrap.h
include/ClearSilver/cgi/date.h
include/ClearSilver/cgi/html.h
include/ClearSilver/cs/
include/ClearSilver/cs/cs.h
include/ClearSilver/cs_config.h
include/ClearSilver/util/
include/ClearSilver/util/dict.h
include/ClearSilver/util/filter.h
include/ClearSilver/util/neo_date.h
include/ClearSilver/util/neo_err.h
include/ClearSilver/util/neo_files.h
include/ClearSilver/util/neo_hash.h
include/ClearSilver/util/neo_hdf.h
include/ClearSilver/util/neo_misc.h
include/ClearSilver/util/neo_net.h
include/ClearSilver/util/neo_rand.h
include/ClearSilver/util/neo_server.h
include/ClearSilver/util/neo_str.h
include/ClearSilver/util/rcfs.h
include/ClearSilver/util/skiplist.h
include/ClearSilver/util/ulist.h
include/ClearSilver/util/ulocks.h
include/ClearSilver/util/wildmat.h
lib/libneo_cgi.a
lib/libneo_cs.a
lib/libneo_utl.a
@man man/man3/cBroadcast.3
@man man/man3/cCreate.3
@man man/man3/cDestroy.3
@man man/man3/cSignal.3
@man man/man3/cWait.3
@man man/man3/cgi_cookie_authority.3
@man man/man3/cgi_cookie_clear.3
@man man/man3/cgi_cookie_set.3
@man man/man3/cgi_cs_init.3
@man man/man3/cgi_debug_init.3
@man man/man3/cgi_destroy.3
@man man/man3/cgi_display.3
@man man/man3/cgi_error.3
@man man/man3/cgi_filehandle.3
@man man/man3/cgi_init.3
@man man/man3/cgi_neo_error.3
@man man/man3/cgi_output.3
@man man/man3/cgi_parse.3
@man man/man3/cgi_redirect.3
@man man/man3/cgi_redirect_uri.3
@man man/man3/cgi_register_parse_cb.3
@man man/man3/cgi_url_escape.3
@man man/man3/cgi_url_escape_more.3
@man man/man3/cgi_url_unescape.3
@man man/man3/cgi_vredirect.3
@man man/man3/cgiwrap_getenv.3
@man man/man3/cgiwrap_init_emu.3
@man man/man3/cgiwrap_init_std.3
@man man/man3/cgiwrap_iterenv.3
@man man/man3/cgiwrap_putenv.3
@man man/man3/cgiwrap_read.3
@man man/man3/cgiwrap_write.3
@man man/man3/cgiwrap_writef.3
@man man/man3/cgiwrap_writevf.3
@man man/man3/cs_destroy.3
@man man/man3/cs_dump.3
@man man/man3/cs_init.3
@man man/man3/cs_parse_file.3
@man man/man3/cs_parse_string.3
@man man/man3/cs_register_esc_strfunc.3
@man man/man3/cs_register_fileload.3
@man man/man3/cs_register_strfunc.3
@man man/man3/cs_render.3
@man man/man3/dictCleanup.3
@man man/man3/dictCreate.3
@man man/man3/dictDestroy.3
@man man/man3/dictModifyValue.3
@man man/man3/dictNext.3
@man man/man3/dictReleaseLock.3
@man man/man3/dictRemove.3
@man man/man3/dictSearch.3
@man man/man3/dictSetValue.3
@man man/man3/fCreate.3
@man man/man3/fDestroy.3
@man man/man3/fFind.3
@man man/man3/fLock.3
@man man/man3/fUnlock.3
@man man/man3/filter_create_fd.3
@man man/man3/filter_create_fp.3
@man man/man3/filter_wait.3
@man man/man3/hdf_copy.3
@man man/man3/hdf_destroy.3
@man man/man3/hdf_dump.3
@man man/man3/hdf_dump_format.3
@man man/man3/hdf_dump_str.3
@man man/man3/hdf_get_attr.3
@man man/man3/hdf_get_child.3
@man man/man3/hdf_get_copy.3
@man man/man3/hdf_get_int_value.3
@man man/man3/hdf_get_node.3
@man man/man3/hdf_get_obj.3
@man man/man3/hdf_get_value.3
@man man/man3/hdf_get_valuef.3
@man man/man3/hdf_get_valuevf.3
@man man/man3/hdf_init.3
@man man/man3/hdf_obj_attr.3
@man man/man3/hdf_obj_child.3
@man man/man3/hdf_obj_name.3
@man man/man3/hdf_obj_next.3
@man man/man3/hdf_obj_top.3
@man man/man3/hdf_obj_value.3
@man man/man3/hdf_read_string.3
@man man/man3/hdf_read_string_ignore.3
@man man/man3/hdf_register_fileload.3
@man man/man3/hdf_remove_tree.3
@man man/man3/hdf_search_path.3
@man man/man3/hdf_set_attr.3
@man man/man3/hdf_set_buf.3
@man man/man3/hdf_set_copy.3
@man man/man3/hdf_set_int_value.3
@man man/man3/hdf_set_symlink.3
@man man/man3/hdf_set_value.3
@man man/man3/hdf_set_valuef.3
@man man/man3/hdf_sort_obj.3
@man man/man3/hdf_write_file.3
@man man/man3/hdf_write_file_atomic.3
@man man/man3/hdf_write_string.3
@man man/man3/mCreate.3
@man man/man3/mDestroy.3
@man man/man3/mLock.3
@man man/man3/mUnlock.3
@man man/man3/nerr_error_string.3
@man man/man3/nerr_error_traceback.3
@man man/man3/nerr_handle.3
@man man/man3/nerr_ignore.3
@man man/man3/nerr_init.3
@man man/man3/nerr_log_error.3
@man man/man3/nerr_match.3
@man man/man3/nerr_pass.3
@man man/man3/nerr_pass_ctx.3
@man man/man3/nerr_raise.3
@man man/man3/nerr_register.3
@man man/man3/skipDelete.3
@man man/man3/skipFreeList.3
@man man/man3/skipInsert.3
@man man/man3/skipNewList.3
@man man/man3/skipNext.3
@man man/man3/skipRelease.3
@man man/man3/skipSearch.3
@man man/man3/wdb_keys.3

7
www/clearsilver/pkg/PLIST-perl
View File

@ -1,7 +0,0 @@
@comment $OpenBSD: PLIST-perl,v 1.4 2016/04/28 15:57:19 sthen Exp $
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/ClearSilver.pm
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ClearSilver/
libdata/perl5/site_perl/${MACHINE_ARCH}-openbsd/auto/ClearSilver/ClearSilver.so
@man man/man3p/ClearSilver.3p

4
www/clearsilver/pkg/PLIST-python
View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PLIST-python,v 1.1 2011/09/05 17:12:35 okan Exp $
lib/python${MODPY_VERSION}/
lib/python${MODPY_VERSION}/site-packages/
lib/python${MODPY_VERSION}/site-packages/neo_cgi.so