diff --git a/www/glewlwyd/Makefile b/www/glewlwyd/Makefile index e641b555417d..0bdf5515a2e3 100644 --- a/www/glewlwyd/Makefile +++ b/www/glewlwyd/Makefile @@ -1,116 +1,93 @@ PORTNAME= glewlwyd DISTVERSIONPREFIX= v -DISTVERSION= 2.7.1 +DISTVERSION= 2.7.2 CATEGORIES= www -MASTER_SITES= GH MAINTAINER= dvl@FreeBSD.org COMMENT= Single Sign On server, multiple factor authentication LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE -BROKEN_FreeBSD_13= duplicate symbol: global_handler_close_cond -BROKEN_FreeBSD_14= duplicate symbol: global_handler_close_cond - BUILD_DEPENDS= yder>1.4.14:devel/yder \ orcania>2.2.1:devel/orcania \ ulfius>2.7.7:www/ulfius \ hoel>1.4.18:devel/hoel \ oath-toolkit>0:security/oath-toolkit LIB_DEPENDS= libjansson.so:devel/jansson \ libnettle.so:security/nettle \ libhoel.so:devel/hoel \ liboath.so:security/oath-toolkit \ libjwt.so:www/libjwt \ libgnutls.so:security/gnutls \ libconfig.so:devel/libconfig \ - liblber.so:net/openldap24-client + liblber.so:net/openldap24-client \ + librhonabwy.so:security/rhonabwy \ + libiddawc.so:security/iddawc RUN_DEPENDS= yder>1.4.14:devel/yder \ ulfius>2.7.7:www/ulfius \ libjwt>0:www/libjwt \ libcbor>0:devel/libcbor \ libmicrohttpd>0:www/libmicrohttpd \ gnutls>0:security/gnutls \ libconfig>0:devel/libconfig \ orcania>2.2.1:devel/orcania \ oath-toolkit>0:security/oath-toolkit USES= cmake cpe pgsql sqlite USE_GITHUB= yes GH_ACCOUNT= babelouest -GH_TAGNAME= e1ea98a CPE_VENDOR= glewlwyd_project CMAKE_ARGS= -DWITH_JOURNALD=off \ -DWITH_USER_LDAP=off \ -DWITH_CLIENT_LDAP=off \ -DLIBOATH_INCLUDE_DIR=${PREFIX}/include/liboath \ -DLIBCBOR_INCLUDE_DIR=${PREFIX}/include/cbor \ -DLIBCBOR_LIBRARY=${PREFIX}/lib/libcbor.so \ -DWITH_SCHEME_WEBAUTHN=off \ -DDOWNLOAD_DEPENDENCIES=off SUB_FILES= glewlwyd glewlwyd.conf.sample USERS= glewlwyd GROUPS= glewlwyd -USE_LDCONFIG= ${PREFIX}/lib/glewlwyd/client \ - ${PREFIX}/lib/glewlwyd/plugin \ - ${PREFIX}/lib/glewlwyd/scheme \ - ${PREFIX}/lib/glewlwyd/user - -do-install: +post-install: # make all our dirs first ${MKDIR} ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${ETCDIR} ${MKDIR} ${STAGEDIR}${PREFIX}/lib/glewlwyd/client ${MKDIR} ${STAGEDIR}${PREFIX}/lib/glewlwyd/plugin ${MKDIR} ${STAGEDIR}${PREFIX}/lib/glewlwyd/scheme ${MKDIR} ${STAGEDIR}${PREFIX}/lib/glewlwyd/user ${MKDIR} ${STAGEDIR}${WWWDIR} ${INSTALL_SCRIPT} ${WRKDIR}/glewlwyd ${STAGEDIR}${PREFIX}/etc/rc.d/ ${INSTALL_PROGRAM} ${WRKDIR}/.build/glewlwyd ${STAGEDIR}${PREFIX}/sbin/ # move these files so they don't get clobbered during upgrade ${INSTALL_SCRIPT} ${WRKDIR}/glewlwyd.conf.sample ${STAGEDIR}${ETCDIR} ${MV} ${WRKSRC}/webapp/config.json.sample ${STAGEDIR}${ETCDIR}/config.json.sample # remove this file because we're installing a symlink here ${RM} ${STAGEDIR}${DATADIR}/webapp/config.json # create a symlink ${LN} -sf ${ETCDIR}/config.json ${STAGEDIR}${WWWDIR}/config.json - ${INSTALL_LIB} ${WRKDIR}/.build/libclientmoddatabase.so ${STAGEDIR}${PREFIX}/lib/glewlwyd/client - - ${INSTALL_LIB} ${WRKDIR}/.build/libprotocol_oauth2.so ${STAGEDIR}${PREFIX}/lib/glewlwyd/plugin - ${INSTALL_LIB} ${WRKDIR}/.build/libprotocol_oidc.so ${STAGEDIR}${PREFIX}/lib/glewlwyd/plugin - ${INSTALL_LIB} ${WRKDIR}/.build/libprotocol_register.so ${STAGEDIR}${PREFIX}/lib/glewlwyd/plugin - - ${INSTALL_LIB} ${WRKDIR}/.build/libschememodcertificate.so ${STAGEDIR}${PREFIX}/lib/glewlwyd/scheme - ${INSTALL_LIB} ${WRKDIR}/.build/libschememodemail.so ${STAGEDIR}${PREFIX}/lib/glewlwyd/scheme - ${INSTALL_LIB} ${WRKDIR}/.build/libschememodhttp.so ${STAGEDIR}${PREFIX}/lib/glewlwyd/scheme - ${INSTALL_LIB} ${WRKDIR}/.build/libschememodotp.so ${STAGEDIR}${PREFIX}/lib/glewlwyd/scheme - ${INSTALL_LIB} ${WRKDIR}/.build/libschememodpassword.so ${STAGEDIR}${PREFIX}/lib/glewlwyd/scheme - - ${INSTALL_LIB} ${WRKDIR}/.build/libusermoddatabase.so ${STAGEDIR}${PREFIX}/lib/glewlwyd/user - ${INSTALL_LIB} ${WRKDIR}/.build/libusermodhttp.so ${STAGEDIR}${PREFIX}/lib/glewlwyd/user - ${INSTALL_MAN} ${WRKSRC}/CHANGELOG.md ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/README.md ${STAGEDIR}${DATADIR} (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) (cd ${WRKSRC}/webapp && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}) .include diff --git a/www/glewlwyd/distinfo b/www/glewlwyd/distinfo index 4c3382954f83..50799db16920 100644 --- a/www/glewlwyd/distinfo +++ b/www/glewlwyd/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1654455656 -SHA256 (babelouest-glewlwyd-v2.7.1-e1ea98a_GH0.tar.gz) = b4ca26e7b33590711a9015f19e3f71e15a0d24eaca1bdccf9df5207aab57e730 -SIZE (babelouest-glewlwyd-v2.7.1-e1ea98a_GH0.tar.gz) = 5113982 +TIMESTAMP = 1657295914 +SHA256 (babelouest-glewlwyd-v2.7.2_GH0.tar.gz) = fc5efcd78df017daca57930e81cdd4903dbe3fb20628bde2f6790a27ac328175 +SIZE (babelouest-glewlwyd-v2.7.2_GH0.tar.gz) = 5929040 diff --git a/www/glewlwyd/pkg-plist b/www/glewlwyd/pkg-plist index e98adc5f4f01..659edfe22120 100644 --- a/www/glewlwyd/pkg-plist +++ b/www/glewlwyd/pkg-plist @@ -1,88 +1,164 @@ -sbin/glewlwyd +bin/glewlwyd +%%ETCDIR%%/config.json.sample +%%ETCDIR%%/glewlwyd.conf +%%ETCDIR%%/glewlwyd.conf.sample etc/rc.d/glewlwyd -@sample %%ETCDIR%%/glewlwyd.conf.sample -@sample %%ETCDIR%%/config.json.sample lib/glewlwyd/client/libclientmoddatabase.so lib/glewlwyd/plugin/libprotocol_oauth2.so lib/glewlwyd/plugin/libprotocol_oidc.so lib/glewlwyd/plugin/libprotocol_register.so lib/glewlwyd/scheme/libschememodcertificate.so lib/glewlwyd/scheme/libschememodemail.so lib/glewlwyd/scheme/libschememodhttp.so +lib/glewlwyd/scheme/libschememodoauth2.so lib/glewlwyd/scheme/libschememodotp.so lib/glewlwyd/scheme/libschememodpassword.so lib/glewlwyd/user/libusermoddatabase.so lib/glewlwyd/user/libusermodhttp.so +sbin/glewlwyd %%DATADIR%%/CHANGELOG.md %%DATADIR%%/README.md -%%DOCSDIR%%/API.md -%%DOCSDIR%%/CERTIFICATE.md -%%DOCSDIR%%/CLIENT_DATABASE.md -%%DOCSDIR%%/CLIENT_LDAP.md -%%DOCSDIR%%/GETTING_STARTED.md -%%DOCSDIR%%/INSTALL.md -%%DOCSDIR%%/OAUTH2.md -%%DOCSDIR%%/OIDC.md -%%DOCSDIR%%/OTP.md -%%DOCSDIR%%/README.md -%%DOCSDIR%%/SCOPE.md -%%DOCSDIR%%/USER.md -%%DOCSDIR%%/USER_DATABASE.md -%%DOCSDIR%%/USER_HTTP.md -%%DOCSDIR%%/USER_LDAP.md -%%DOCSDIR%%/WEBAUTHN.md -%%DOCSDIR%%/database/README.md -%%DOCSDIR%%/database/init-core.mariadb.sql -%%DOCSDIR%%/database/init-core.postgre.sql -%%DOCSDIR%%/database/init-core.sqlite3.sql -%%DOCSDIR%%/database/init.mariadb.sql -%%DOCSDIR%%/database/init.postgre.sql -%%DOCSDIR%%/database/init.sqlite3.sql -%%DOCSDIR%%/glewlwyd-init -%%DOCSDIR%%/glewlwyd.service +%%DATADIR%%/docs/API.md +%%DATADIR%%/docs/CERTIFICATE.md +%%DATADIR%%/docs/CLIENT_DATABASE.md +%%DATADIR%%/docs/CLIENT_LDAP.md +%%DATADIR%%/docs/EMAIL.md +%%DATADIR%%/docs/GETTING_STARTED.md +%%DATADIR%%/docs/HTTP.md +%%DATADIR%%/docs/INSTALL.md +%%DATADIR%%/docs/OAUTH2.md +%%DATADIR%%/docs/OAUTH2_SCHEME.md +%%DATADIR%%/docs/OIDC.md +%%DATADIR%%/docs/OTP.md +%%DATADIR%%/docs/README.md +%%DATADIR%%/docs/REGISTER.md +%%DATADIR%%/docs/SCOPE.md +%%DATADIR%%/docs/USER.md +%%DATADIR%%/docs/USER_DATABASE.md +%%DATADIR%%/docs/USER_HTTP.md +%%DATADIR%%/docs/USER_LDAP.md +%%DATADIR%%/docs/WEBAUTHN.md +%%DATADIR%%/docs/database/README.md +%%DATADIR%%/docs/database/init-core.mariadb.sql +%%DATADIR%%/docs/database/init-core.postgre.sql +%%DATADIR%%/docs/database/init-core.sqlite3.sql +%%DATADIR%%/docs/database/init.mariadb.sql +%%DATADIR%%/docs/database/init.postgre.sql +%%DATADIR%%/docs/database/init.sqlite3.sql +%%DATADIR%%/docs/database/upgrade-2.2-core.mariadb.sql +%%DATADIR%%/docs/database/upgrade-2.2-core.postgre.sql +%%DATADIR%%/docs/database/upgrade-2.2-core.sqlite3.sql +%%DATADIR%%/docs/database/upgrade-2.3-core.mariadb.sql +%%DATADIR%%/docs/database/upgrade-2.3-core.postgre.sql +%%DATADIR%%/docs/database/upgrade-2.3-core.sqlite3.sql +%%DATADIR%%/docs/database/upgrade-2.4-core.mariadb.sql +%%DATADIR%%/docs/database/upgrade-2.4-core.postgre.sql +%%DATADIR%%/docs/database/upgrade-2.4-core.sqlite3.sql +%%DATADIR%%/docs/database/upgrade-2.5-core.mariadb.sql +%%DATADIR%%/docs/database/upgrade-2.5-core.postgre.sql +%%DATADIR%%/docs/database/upgrade-2.5-core.sqlite3.sql +%%DATADIR%%/docs/database/upgrade-2.6-core.mariadb.sql +%%DATADIR%%/docs/database/upgrade-2.6-core.postgre.sql +%%DATADIR%%/docs/database/upgrade-2.6-core.sqlite3.sql +%%DATADIR%%/docs/database/upgrade-2.7-core.mariadb.sql +%%DATADIR%%/docs/database/upgrade-2.7-core.postgre.sql +%%DATADIR%%/docs/database/upgrade-2.7-core.sqlite3.sql +%%DATADIR%%/docs/fail2ban/README.md +%%DATADIR%%/docs/fail2ban/glewlwyd-log.conf +%%DATADIR%%/docs/fail2ban/glewlwyd-syslog.conf +%%DATADIR%%/docs/fail2ban/jail.local +%%DATADIR%%/docs/glewlwyd-init +%%DATADIR%%/docs/glewlwyd.service +%%DATADIR%%/webapp/admin.js +%%DATADIR%%/webapp/callback.html +%%DATADIR%%/webapp/callback.js +%%DATADIR%%/webapp/config.json.sample +%%DATADIR%%/webapp/css/admin-custom.css +%%DATADIR%%/webapp/css/bootstrap.css +%%DATADIR%%/webapp/css/bootstrap.css.map +%%DATADIR%%/webapp/css/bootstrap.min.css +%%DATADIR%%/webapp/css/bootstrap.min.css.map +%%DATADIR%%/webapp/css/fork-awesome.css +%%DATADIR%%/webapp/css/fork-awesome.min.css +%%DATADIR%%/webapp/css/fork-awesome.min.css.map +%%DATADIR%%/webapp/css/glewlwyd-custom.css +%%DATADIR%%/webapp/css/glewlwyd.css +%%DATADIR%%/webapp/css/login-custom.css +%%DATADIR%%/webapp/css/profile-custom.css +%%DATADIR%%/webapp/css/v5-compat.css +%%DATADIR%%/webapp/css/v5-compat.min.css +%%DATADIR%%/webapp/css/v5-compat.min.css.map +%%DATADIR%%/webapp/favicon.ico +%%DATADIR%%/webapp/fonts/forkawesome-webfont.eot +%%DATADIR%%/webapp/fonts/forkawesome-webfont.svg +%%DATADIR%%/webapp/fonts/forkawesome-webfont.ttf +%%DATADIR%%/webapp/fonts/forkawesome-webfont.woff +%%DATADIR%%/webapp/fonts/forkawesome-webfont.woff2 +%%DATADIR%%/webapp/img/logo-admin.png +%%DATADIR%%/webapp/img/logo-login.png +%%DATADIR%%/webapp/img/logo-profile.png +%%DATADIR%%/webapp/index.html +%%DATADIR%%/webapp/js/bootstrap.js +%%DATADIR%%/webapp/js/bootstrap.js.map +%%DATADIR%%/webapp/js/bootstrap.min.js +%%DATADIR%%/webapp/js/bootstrap.min.js.map +%%DATADIR%%/webapp/js/jquery.js +%%DATADIR%%/webapp/js/jquery.min.js +%%DATADIR%%/webapp/js/popper.js +%%DATADIR%%/webapp/js/popper.min.js +%%DATADIR%%/webapp/locales/de/translations.json +%%DATADIR%%/webapp/locales/en/translations.json +%%DATADIR%%/webapp/locales/fr/translations.json +%%DATADIR%%/webapp/locales/nl/translations.json +%%DATADIR%%/webapp/login.html +%%DATADIR%%/webapp/login.js +%%DATADIR%%/webapp/profile.html +%%DATADIR%%/webapp/profile.js +%%DATADIR%%/webapp/robots.txt +share/man/man8/glewlwyd.8.gz %%WWWDIR%%/admin.js +%%WWWDIR%%/callback.html +%%WWWDIR%%/callback.js %%WWWDIR%%/config.json %%WWWDIR%%/css/admin-custom.css %%WWWDIR%%/css/bootstrap.css +%%WWWDIR%%/css/bootstrap.css.map %%WWWDIR%%/css/bootstrap.min.css -%%WWWDIR%%/css/font-awesome.css -%%WWWDIR%%/css/font-awesome.min.css +%%WWWDIR%%/css/bootstrap.min.css.map +%%WWWDIR%%/css/fork-awesome.css +%%WWWDIR%%/css/fork-awesome.min.css +%%WWWDIR%%/css/fork-awesome.min.css.map %%WWWDIR%%/css/glewlwyd-custom.css %%WWWDIR%%/css/glewlwyd.css %%WWWDIR%%/css/login-custom.css %%WWWDIR%%/css/profile-custom.css +%%WWWDIR%%/css/v5-compat.css +%%WWWDIR%%/css/v5-compat.min.css +%%WWWDIR%%/css/v5-compat.min.css.map %%WWWDIR%%/favicon.ico +%%WWWDIR%%/fonts/forkawesome-webfont.eot +%%WWWDIR%%/fonts/forkawesome-webfont.svg +%%WWWDIR%%/fonts/forkawesome-webfont.ttf +%%WWWDIR%%/fonts/forkawesome-webfont.woff +%%WWWDIR%%/fonts/forkawesome-webfont.woff2 %%WWWDIR%%/img/logo-admin.png %%WWWDIR%%/img/logo-login.png %%WWWDIR%%/img/logo-profile.png %%WWWDIR%%/index.html %%WWWDIR%%/js/bootstrap.js +%%WWWDIR%%/js/bootstrap.js.map %%WWWDIR%%/js/bootstrap.min.js +%%WWWDIR%%/js/bootstrap.min.js.map %%WWWDIR%%/js/jquery.js %%WWWDIR%%/js/jquery.min.js %%WWWDIR%%/js/popper.js %%WWWDIR%%/js/popper.min.js +%%WWWDIR%%/locales/de/translations.json %%WWWDIR%%/locales/en/translations.json %%WWWDIR%%/locales/fr/translations.json %%WWWDIR%%/locales/nl/translations.json %%WWWDIR%%/login.html %%WWWDIR%%/login.js %%WWWDIR%%/profile.html %%WWWDIR%%/profile.js -%%WWWDIR%%/vendors~admin~login~profile.js -%%WWWDIR%%/vendors~profile.js -%%WWWDIR%%/webfonts/fa-brands-400.eot -%%WWWDIR%%/webfonts/fa-brands-400.svg -%%WWWDIR%%/webfonts/fa-brands-400.ttf -%%WWWDIR%%/webfonts/fa-brands-400.woff -%%WWWDIR%%/webfonts/fa-brands-400.woff2 -%%WWWDIR%%/webfonts/fa-regular-400.eot -%%WWWDIR%%/webfonts/fa-regular-400.svg -%%WWWDIR%%/webfonts/fa-regular-400.ttf -%%WWWDIR%%/webfonts/fa-regular-400.woff -%%WWWDIR%%/webfonts/fa-regular-400.woff2 -%%WWWDIR%%/webfonts/fa-solid-900.eot -%%WWWDIR%%/webfonts/fa-solid-900.svg -%%WWWDIR%%/webfonts/fa-solid-900.ttf -%%WWWDIR%%/webfonts/fa-solid-900.woff -%%WWWDIR%%/webfonts/fa-solid-900.woff2 +%%WWWDIR%%/robots.txt