This update is based off kristaps' previous bump for 6.3! I added NO_TEST for good measure (this way we don't have to keep a db.txt up to date)!
This is needed for sysutils/slant (also sent by kristaps) to go in! See here for changes: https://marc.info/?l=openbsd-ports&m=153960499116223&w=2 OK? diff --git a/www/kwebapp/Makefile b/www/kwebapp/Makefile index cf74eeba331..5e00ad7a1d9 100644 --- a/www/kwebapp/Makefile +++ b/www/kwebapp/Makefile @@ -2,7 +2,7 @@ COMMENT = web application source generator -DISTNAME = kwebapp-0.5.6 +DISTNAME = kwebapp-0.6.4 CATEGORIES = www HOMEPAGE = https://kristaps.bsd.lv/kwebapp/ @@ -19,11 +19,10 @@ MASTER_SITES = https://kristaps.bsd.lv/kwebapp/snapshots/ RUN_DEPENDS = databases/ksql \ www/kcgi -TEST_DEPENDS = ${RUN_DEPENDS} -TEST_FLAGS = CFLAGS+=-I${LOCALBASE}/include \ - LDFLAGS+=-L${LOCALBASE}/lib CONFIGURE_STYLE = simple CONFIGURE_ENV = "PREFIX=${PREFIX}" +NO_TEST = Yes + .include <bsd.port.mk> diff --git a/www/kwebapp/distinfo b/www/kwebapp/distinfo index bfab7d47816..19814b0704a 100644 --- a/www/kwebapp/distinfo +++ b/www/kwebapp/distinfo @@ -1,2 +1,2 @@ -SHA256 (kwebapp-0.5.6.tar.gz) = DaDvwKiZSIZb9jH5DtRgknTZIA8/ZJWMGNhizJTOugY= -SIZE (kwebapp-0.5.6.tar.gz) = 119389 +SHA256 (kwebapp-0.6.4.tar.gz) = xcXl4Gnp3hAkzJ5TX0JX8jlRJ4KJN2SKqrOKd/hkn0U= +SIZE (kwebapp-0.6.4.tar.gz) = 132030 diff --git a/www/kwebapp/patches/patch-db_txt b/www/kwebapp/patches/patch-db_txt deleted file mode 100644 index f41c14229f0..00000000000 --- a/www/kwebapp/patches/patch-db_txt +++ /dev/null @@ -1,96 +0,0 @@ -$OpenBSD: patch-db_txt,v 1.1.1.1 2018/03/14 01:49:50 abieber Exp $ - -Index: db.txt ---- db.txt.orig -+++ db.txt -@@ -0,0 +1,90 @@ -+# This is a top-level structure. -+# It's output as a struct in C, a table in SQL, and an object in -+# JavaScript. -+ -+struct company { -+ # The "limit" clause is for input validation. -+ field name text limit gt 0 comment -+ "Name of the organisation."; -+ # SQL primary keys. -+ field id int rowid; -+ field somenum int null comment -+ "Simply a check for null values."; -+ # Operations: a "list" function produces an in-memory -+ # queue of responses. -+ # "Insert" allows us to insert into the table. -+ list somenum isnull; -+ insert; -+ comment "Controlling organisation."; -+}; -+ -+# This is an enumeration. -+# It lets us validate input fields and use -+# better type-safety in the C API. -+# They're also export to JavaScript. -+ -+enum sex { -+ item male comment "Male"; -+ item female comment "Femmale"; -+ item other comment "Other"; -+ comment "Birthsex of individual"; -+}; -+ -+struct user { -+ # Foreign key support. -+ # This will produce a nested "struct company" filled -+ # in with the join on "cid" (see below). -+ field company struct cid comment -+ "This struct will be filled in from an inner join -+ on the \"cid\" variable."; -+ # The foreign key itself. -+ # We also stipulate an action on delete. -+ field cid:company.id int actdel cascade comment -+ "A foreign key reference."; -+ field sex enum sex comment -+ "User's birth sex."; -+ # Passwords are important and often screwed up. -+ # This automatically handles the logic of accepting -+ # passwords and hashing them on insertion. -+ # When we "search" on password fields, the system -+ # will do the hashing for us. -+ field hash password limit gt 0 comment -+ "Password hash. -+ This is passed to inserts and updates as a password, -+ then hashed within the implementation and extracted -+ (in listings and searches) as the hash value."; -+ field email email unique comment -+ "Unique e-mail address."; -+ field image blob null comment -+ "A PNG image or something."; -+ field name text comment -+ "User's full name."; -+ field uid int rowid; -+ iterate name: limit 5 comment -+ "Create a function that searches for users by a given -+ name; and, when found, invokes a callback function -+ provided the user structure."; -+ search email,hash: name creds comment -+ "Search for a unique user with their e-mail and -+ password. -+ This is a quick way to verify that a user has entered -+ the correct password for logging in."; -+ search uid: comment "Lookup by unique identifier."; -+ update hash: uid; -+ update email: uid; -+ insert; -+ comment "A regular user."; -+}; -+ -+struct session { -+ field user struct userid; -+ field userid:user.uid int comment "Associated user."; -+ field token int comment "Random cookie."; -+ field mtime epoch; -+ field id int rowid; -+ iterate user.company.name,mtime: name foo comment -+ "Search for company's logged-in users."; -+ insert; -+ delete id; -+ comment "Authenticated session."; -+}; diff --git a/www/kwebapp/pkg/PLIST b/www/kwebapp/pkg/PLIST index 4a9d376cc38..c72dcdadf62 100644 --- a/www/kwebapp/pkg/PLIST +++ b/www/kwebapp/pkg/PLIST @@ -24,3 +24,6 @@ share/kwebapp/ share/kwebapp/audit.css share/kwebapp/audit.html share/kwebapp/audit.js +share/kwebapp/b64_ntop.c +share/kwebapp/gensalt.c +share/kwebapp/jsmn.c -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
